diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2018-01-04 22:21:39 -0500 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2018-01-04 22:21:39 -0500 |
| commit | 5b5fedfc78a9f2751d001a92c65be86e3ffefcc1 (patch) | |
| tree | e1357a59a3d98cf1e976f948f98d799f87a00bf3 /src/rom3.c | |
| parent | ab06b56532026db85a9cba1c21c8b2235fcdf222 (diff) | |
| parent | f0e98a9204bf19981c0c9652bc9ed82ae95438e4 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeruby into assert
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; |