From 16e0d8089194a8d098da47c7a7b07fbc4dcc0292 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 27 Dec 2017 13:15:01 -0600 Subject: Port battle_anim changes from pokeemerald --- src/rom3.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/rom3.c') diff --git a/src/rom3.c b/src/rom3.c index dd520a839..b29bc7428 100644 --- a/src/rom3.c +++ b/src/rom3.c @@ -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) -- cgit v1.2.3 From cd2b75a677bf15756734222a9a57f0f9153fc918 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sat, 30 Dec 2017 11:03:18 -0600 Subject: Sync battle_script changes with pokeemerald --- src/rom3.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/rom3.c') diff --git a/src/rom3.c b/src/rom3.c index b29bc7428..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; @@ -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; -- cgit v1.2.3