diff options
| author | Cameron Hall <camthesaxman@users.noreply.github.com> | 2018-01-15 17:44:14 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-15 17:44:14 -0600 |
| commit | ed152b1566fa5c39ee72ca190c49fbfe30708036 (patch) | |
| tree | f076f5757059c44f6bcb92f1cc80077053bc8831 /src/battle/battle_4.c | |
| parent | dc527246c870d1d634467c17ec7609e9dc18206b (diff) | |
| parent | 3295ffbd5bcd75d586e3f6dde7469cad1fce2c85 (diff) | |
Merge pull request #537 from camthesaxman/decompile_pokemon_item_effect
decompile pokemon_item_effect.s
Diffstat (limited to 'src/battle/battle_4.c')
| -rw-r--r-- | src/battle/battle_4.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle/battle_4.c b/src/battle/battle_4.c index ae8f94130..6b048f0ab 100644 --- a/src/battle/battle_4.c +++ b/src/battle/battle_4.c @@ -147,7 +147,7 @@ void ReshowBattleScreenAfterMenu(void); void BattleMainCB2(void); void AddMoney(u32* moneySaveblock, u32 to_give); u8 CountAliveMons(u8 caseID); -void sub_803E1B0(struct Pokemon*, u16 item, u8 partyID, u8 r3, u8 sp); +void PokemonUseItemEffects(struct Pokemon*, u16 item, u8 partyID, u8 r3, u8 sp); u8 CanRunFromBattle(void); u8 GetMoveTarget(u16 move, u8 targetbyte); //get target of move u8 CastformDataTypeChange(u8 bank); @@ -11996,7 +11996,7 @@ static void atk74_hpthresholds2(void) static void atk75_useitemonopponent(void) { gBankInMenu = gBankAttacker; - sub_803E1B0(&gEnemyParty[gBattlePartyID[gBankAttacker]], gLastUsedItem, gBattlePartyID[gBankAttacker], 0, 1); + PokemonUseItemEffects(&gEnemyParty[gBattlePartyID[gBankAttacker]], gLastUsedItem, gBattlePartyID[gBankAttacker], 0, 1); gBattlescriptCurrInstr += 1; } |