diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-04 18:50:53 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-04 18:50:53 -0500 |
| commit | eff6795887cc27f2c5139df9a6da70f4f02338b4 (patch) | |
| tree | f91be2b0b7194b4ddff13f4935a0edafc4284a43 /src/rom3.c | |
| parent | 3ea9cff2c67b3db195c3326afc56fa0662c2327a (diff) | |
| parent | b1a7733c1cead8ed3d4a58c42d638afd0ead8ab0 (diff) | |
Merge branch 'master' into unk_text_8095904
Diffstat (limited to 'src/rom3.c')
| -rw-r--r-- | src/rom3.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/rom3.c b/src/rom3.c index dd520a839..cdc66989c 100644 --- a/src/rom3.c +++ b/src/rom3.c @@ -35,7 +35,7 @@ extern u8 gNoOfAllBanks; extern u16 gBattlePartyID[]; extern u8 gBanksBySide[]; extern u16 gCurrentMove; -extern u16 gUnknown_02024BE8; +extern u16 gChosenMove; extern u16 gLastUsedItem; extern u8 gLastUsedAbility; extern u8 gBankAttacker; @@ -80,7 +80,7 @@ void setup_poochyena_battle(void) } sub_800B858(); gBattleExecBuffer = 0; - battle_anim_clear_some_data(); + ClearBattleAnimationVars(); ClearBattleMonForms(); BattleAI_HandleItemUseBeforeAISetup(); if (gBattleTypeFlags & BATTLE_TYPE_FIRST_BATTLE) @@ -745,7 +745,7 @@ void EmitPrintString(u8 a, u16 stringID) stringInfo = (struct StringInfoBattle*)(&gBattleBuffersTransferData[4]); stringInfo->currentMove = gCurrentMove; - stringInfo->lastMove = gUnknown_02024BE8; + stringInfo->lastMove = gChosenMove; stringInfo->lastItem = gLastUsedItem; stringInfo->lastAbility = gLastUsedAbility; stringInfo->scrActive = BATTLE_STRUCT->scriptingActive; @@ -777,7 +777,7 @@ void EmitPrintStringPlayerOnly(u8 a, u16 stringID) stringInfo = (struct StringInfoBattle*)(&gBattleBuffersTransferData[4]); stringInfo->currentMove = gCurrentMove; - stringInfo->lastMove = gUnknown_02024BE8; + stringInfo->lastMove = gChosenMove; stringInfo->lastItem = gLastUsedItem; stringInfo->lastAbility = gLastUsedAbility; stringInfo->scrActive = BATTLE_STRUCT->scriptingActive; |