Rooba
/
pokeemerald
mirror of https://github.com/pret/pokeemerald.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity
Page: Amulet Coin Effects If Anyone In Party is Holding It
Pages
Ability Switcher via special Add A PokeVial Item Add Ability to Avoid Battle Damage in Debug Menu Add Ability to Swap Bikes Whenever Add Choice Specs Scarf hold item effects Add Description Submenu Add Difficulty Mode Add In‐Cart Rumble Add Nuzlocke Challenge Add PC Access in PokeNav Add Physical Special Split Add Sleep Mode Add Thief Ball Add a EV IV Stat Editor UI Add a debug menu Adding Multi region Support Adding Support for Connectivity with Other Hacks Whilst Maintaining Connectivity with Vanilla Adding Time Based Encounters Adding Walking Animations to All NPCs Adding a New Trainer Class Adding a New Trainer Front Picture Adding a Pokémon Type & Disabling the Mystery Type Adding new event object or overworld sprites All Trees Permanently Get Cut Allow All Pokemon to Evolve Without Trading Allow Both Latios and Latias Appear. Allow Feebas to be caught on any Valid Fishing Spot in Route 119 rather than only Three Allow Jumping Over Ledges with Acro Bike Allow Move Relearner to Teach Moves that Pre Evolutions Know Allow Running From Trainer Battles Allow running indoors Amulet Coin Effects If Anyone In Party is Holding It Automatically make the keyboard switch to lowercase after the first character Better White Out Money Calculation Button Press to Skip Copyright Screen Chain Fishing Change Enemy Trainer Parties Depending on Difficulty Change Someone's PC to Lanette's PC from the Start of the Game Change Starter Pokémon Change Time Based Evolution Times Change initial PC items Changing the Battle Music Depending on the Opponent Colored stats by nature in summary screen Converting to FR Tilesets Custom Battle Mugshots Custom Border Dimensions Debugging using gdb (Windows, WSL2, Visual Studio Code mGBA) Debugging using printf Disable Bag Use In Battle Disable Catching Pokemon Disable Pokémon animation on Birch's intro Pokémon Disabling Union Room check when entering Pokémon Centers Dynamic Trade Names Dynamic overworld palette system Enable the Reset RTC Feature Enable trade with FRLG without beating the game Expanding The Metatile Count Extra save space with three lines of code Faster HP Drain Feature Branches Fish Will Now Always Get on Hook Fix AI's Switch In Battle Fix Snow Weather Fixing the aspect ratio of the Pokémon logo on the title screen Forcing Battle Animations for Major Battles Full Screen Start Menu by Archie and Mudskip Gen 6 Exp Share Gen 6 style Exp. Share Alternative Option Get Match Calls Only If Caller Wants a Rematch Get Rid of Battery Run Dry Error Message Get Rid of Pokemon Disobeying You Holding Select Allows For A Second Register Item Home How the Game Works How to Support Savefile Backwards Compatibility How to add a new Pokémon species How to add a new ability How to add a new region map How to create a new regular trainer battle How to delete a map Implement Missing Text Function RESET_FONT Implementing Catch EXP Implementing ipatix's High Quality Audio Mixer Implementing the “textcolor” script command from FRLG and give object events their own text colour Improve Partner Battle Code Improve the Loading of Battle Terrain Improving the WaitForVBlank function Increase money limit Infinite TM usage Instead of Asking to Stop learning a New Move, You'll be Asked to Continue Learning Item Automatically Goes to PC if Bag is Full Keep the Camera from Making Waves LGPE Style Bonus Premier Balls Learn moves upon evolution List Menu Text Coloring Make Cleanse Tag Avoid All Wild Encounters and Usable If Held By Anyone in Your Party; Make PokeDoll Do the Same for Trainers Seeing You Make Daycare Faster at Leveling Pokémon Make Key Items That Cannot Be Used In The Field Not Show A Use or Register Option Make L Button Be Turbo A When L=A Option Is Set Make Ledge Jumps Check Collision Make Move Relearner Teach Egg Moves With A Flag Make Multiple Secret Bases Make Norman's Slaking Have Ability Intimidate Make Pokemon Not Heal When Going into PC Make Pokemon that Require a Fateful Encounter to be Legal to Always Be Set to Legal Make space for EWRAM Data for Summary screen Make the Bag Able to Hold 120 Items Instead of 30 Make the Person in the Intro Match the the Save File Map Based Trainer Battle Music Move Item Multipage Options Menu Name Rater Allows Traded Pokemon to be Renamed New Birch's Briefcase With Fully Custom Starters by Archie and Mudskip New Custom Menu Border Themes (Basic) New Main Menu UI With Mugshot by Archie and Mudskip New Options Plus ‐ Multipage Options Menu with Faster Text, HP‐EXP Bar Speeds and Metric Nickname your Pokémon from the party menu Not showing dex entries until getting the Pokédex Omnidirectional Jump Optimization ‐ Remove Expensive and Redundant `BuildColorMaps()` Function Option to Skip Copyright and Intro Overview: Items and their Effects Overview: The Party Menu Overview∶ The Game Loop Overview∶ The Task System Per Shop\Mart Item Prices Plural Giveitem Pokecenters Disregard Eggs Prompt for reusing Repels Push B in wild battle moves to Run Push B to Toggle Running Shoes Pushing B When Asked To Stop Learning Move Will Cancel Teaching The Move Quickly Run from a Battle by Holding Right While the Wild Pokémon's Name Appears Raise Odds of Catching a Pokemon by Pressing B When the Ball Shakes Random Info, Tips, and Tricks Reflections Remove 'Select' Sound From Specific Map Events Remove Warp Fadescreen Remove badge boosts Remove the backup save file Remove the extra save confirmation Remove the functionally redundant move grammar tables Repeated Field Medicine Use Reuse filler save space for Variables and Flags Revert Brendan May Sprites to Ruby Sapphire Set Metatile IDs From Another Map Set Up Item Balls on a Map Without Needing New Scripts Shifting to Pokémon Already in Battle Exits the Shift Menu Shiny Creation With a Flag Shop Items By Badge Count Show IVs EVs in Summary Screen Show Species That You're Switching For in the Party Menu Show Type Effectiveness In Battle Using Pre Existing Function and Disable in Option Menu Show a throbber animation while the game is saving Shuckle makes Berry Juice Something doesn't work I need help etc. Spawn Invisible Player Speedy Nurse Joy Spinda Second Frame Spot Addition Stair Warps Supplementary Scripting Macros Surfing Dismount Ground Effects Temporarily Replace Player or Enemy Party Pokemon The Basics of Scripting Toggle Trainer Sight Trainer Backsprite Editing Trainer Class Based Poké Balls Trainer Scripts Trainers No Longer Spin to Face You Right As You Pass Them Trigger Map Scripts By Flag Triple layer metatiles Tutorials Tweaking the count of health beeps Uniquely Shuffle Array Update Sitrus Berry's effect to Gen 4 standard Use HMs Without Any Pokemon in your Party Knowing Them Useful Modding Tools Useful Scripting Specials Why You Should (Almost) Always Be Using 32‐Bit Variables in Your Code Why should I use this over binary hacking
2 Amulet Coin Effects If Anyone In Party is Holding It
voloved edited this page 2023-03-05 17:16:01 -05:00

by devolov

Goal: Have the effect of the Amulet coin work if anyone in the party is holding it, not just Pokemon that partook in the battle.

------------------------------ src/battle_main.c ------------------------------
index 01e390f43..c666ea504 100644
@@ -122,8 +122,9 @@ static void HandleEndTurn_RanFromBattle(void);
 static void HandleEndTurn_MonFled(void);
 static void HandleEndTurn_FinishBattle(void);
 static void SpriteCB_UnusedBattleInit(struct Sprite *sprite);
 static void SpriteCB_UnusedBattleInit_Main(struct Sprite *sprite);
+static bool8 partyMonHoldDoublePrizeEffect(void);
 
 EWRAM_DATA u16 gBattle_BG0_X = 0;
 EWRAM_DATA u16 gBattle_BG0_Y = 0;
 EWRAM_DATA u16 gBattle_BG1_X = 0;
@@ -3289,9 +3290,12 @@ static void BattleStartClearSetData(void)
     gBattleStruct->safariPkblThrowCounter = 0;
     *(&gBattleStruct->safariCatchFactor) = gSpeciesInfo[GetMonData(&gEnemyParty[0], MON_DATA_SPECIES)].catchRate * 100 / 1275;
     gBattleStruct->safariEscapeFactor = 3;
     gBattleStruct->wildVictorySong = 0;
-    gBattleStruct->moneyMultiplier = 1;
+    if (partyMonHoldDoublePrizeEffect())
+        gBattleStruct->moneyMultiplier = 2;
+    else
+        gBattleStruct->moneyMultiplier = 1;
 
     for (i = 0; i < 8; i++)
     {
         *((u8 *)gBattleStruct->lastTakenMove + i) = MOVE_NONE;
@@ -5478,4 +5482,15 @@ void RunBattleScriptCommands(void)

    if (gBattleControllerExecFlags == 0)
        gBattleScriptingCommandsTable[gBattlescriptCurrInstr[0]]();
}

+static bool8 partyMonHoldDoublePrizeEffect(void){
+    int i;
+    for (i = 0; i < PARTY_SIZE; i++){
+        u8 item = GetMonData(&gPlayerParty[i], MON_DATA_HELD_ITEM);
+        if (ItemId_GetHoldEffect(item) == HOLD_EFFECT_DOUBLE_PRIZE){
+            return TRUE;
+        }
+    }
+    return FALSE;   
+}
+

------------------------------ src/battle_util.c ------------------------------
index 7e4c2bc0f..466b7d911 100644
@@ -3288,12 +3288,8 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn)
     {
     case ITEMEFFECT_ON_SWITCH_IN:
         switch (battlerHoldEffect)
         {
-        case HOLD_EFFECT_DOUBLE_PRIZE:
-            if (GetBattlerSide(battlerId) == B_SIDE_PLAYER)
-                gBattleStruct->moneyMultiplier = 2;
-            break;
         case HOLD_EFFECT_RESTORE_STATS:
             for (i = 0; i < NUM_BATTLE_STATS; i++)
             {
                 if (gBattleMons[battlerId].statStages[i] < DEFAULT_STAT_STAGE)

Go to top