From 9cf5376c966915f928ae166125fc1fa835128c43 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 21 Aug 2023 09:43:01 +0200 Subject: [PATCH] use GetBattlerParty in LoadMonSprite --- include/battle_controllers.h | 2 +- src/battle_controller_link_opponent.c | 2 +- src/battle_controller_link_partner.c | 2 +- src/battle_controller_opponent.c | 2 +- src/battle_controller_player_partner.c | 2 +- src/battle_controller_recorded_opponent.c | 2 +- src/battle_controller_recorded_player.c | 2 +- src/battle_controllers.c | 3 ++- 8 files changed, 9 insertions(+), 8 deletions(-) diff --git a/include/battle_controllers.h b/include/battle_controllers.h index e9498ec018..ff4a8c6e59 100644 --- a/include/battle_controllers.h +++ b/include/battle_controllers.h @@ -267,7 +267,7 @@ void BtlController_HandleGetMonData(u32 battler); void BtlController_HandleGetRawMonData(u32 battler); void BtlController_HandleSetMonData(u32 battler); void BtlController_HandleSetRawMonData(u32 battler); -void BtlController_HandleLoadMonSprite(u32 battler, struct Pokemon *party, void (*controllerCallback)(u32 battler)); +void BtlController_HandleLoadMonSprite(u32 battler, void (*controllerCallback)(u32 battler)); void BtlController_HandleSwitchInAnim(u32 battler, bool32 isPlayerSide, void (*controllerCallback)(u32 battler)); void BtlController_HandleReturnMonToBall(u32 battler); void BtlController_HandleDrawTrainerPic(u32 battlerId, u32 trainerPicId, bool32 isFrontPic, s16 xPos, s16 yPos, s32 subpriority); diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c index 60ef924b9d..4f1c3da976 100644 --- a/src/battle_controller_link_opponent.c +++ b/src/battle_controller_link_opponent.c @@ -381,7 +381,7 @@ static void LinkOpponentBufferExecCompleted(u32 battler) static void LinkOpponentHandleLoadMonSprite(u32 battler) { - BtlController_HandleLoadMonSprite(battler, gEnemyParty, TryShinyAnimAfterMonAnim); + BtlController_HandleLoadMonSprite(battler, TryShinyAnimAfterMonAnim); } static void LinkOpponentHandleSwitchInAnim(u32 battler) diff --git a/src/battle_controller_link_partner.c b/src/battle_controller_link_partner.c index b08e8c0873..c4b4e2112c 100644 --- a/src/battle_controller_link_partner.c +++ b/src/battle_controller_link_partner.c @@ -207,7 +207,7 @@ static void LinkPartnerBufferExecCompleted(u32 battler) static void LinkPartnerHandleLoadMonSprite(u32 battler) { - BtlController_HandleLoadMonSprite(battler, gPlayerParty, WaitForMonAnimAfterLoad); + BtlController_HandleLoadMonSprite(battler, WaitForMonAnimAfterLoad); } static void LinkPartnerHandleSwitchInAnim(u32 battler) diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c index 2a89148d37..912ae68f2b 100644 --- a/src/battle_controller_opponent.c +++ b/src/battle_controller_opponent.c @@ -398,7 +398,7 @@ static void OpponentBufferExecCompleted(u32 battler) static void OpponentHandleLoadMonSprite(u32 battler) { - BtlController_HandleLoadMonSprite(battler, gEnemyParty, TryShinyAnimAfterMonAnim); + BtlController_HandleLoadMonSprite(battler, TryShinyAnimAfterMonAnim); } static void OpponentHandleSwitchInAnim(u32 battler) diff --git a/src/battle_controller_player_partner.c b/src/battle_controller_player_partner.c index 3ad0939094..3f6014302b 100644 --- a/src/battle_controller_player_partner.c +++ b/src/battle_controller_player_partner.c @@ -278,7 +278,7 @@ static void PlayerPartnerBufferExecCompleted(u32 battler) static void PlayerPartnerHandleLoadMonSprite(u32 battler) { - BtlController_HandleLoadMonSprite(battler, gPlayerParty, WaitForMonAnimAfterLoad); + BtlController_HandleLoadMonSprite(battler, WaitForMonAnimAfterLoad); } static void PlayerPartnerHandleSwitchInAnim(u32 battler) diff --git a/src/battle_controller_recorded_opponent.c b/src/battle_controller_recorded_opponent.c index 611ca630ff..4789708887 100644 --- a/src/battle_controller_recorded_opponent.c +++ b/src/battle_controller_recorded_opponent.c @@ -375,7 +375,7 @@ static void SwitchIn_TryShinyAnim(u32 battler) static void RecordedOpponentHandleLoadMonSprite(u32 battler) { - BtlController_HandleLoadMonSprite(battler, gEnemyParty, TryShinyAnimAfterMonAnim); + BtlController_HandleLoadMonSprite(battler, TryShinyAnimAfterMonAnim); } static void RecordedOpponentHandleSwitchInAnim(u32 battler) diff --git a/src/battle_controller_recorded_player.c b/src/battle_controller_recorded_player.c index dd2abe87ff..aac42824c7 100644 --- a/src/battle_controller_recorded_player.c +++ b/src/battle_controller_recorded_player.c @@ -357,7 +357,7 @@ static void RecordedPlayerBufferExecCompleted(u32 battler) static void RecordedPlayerHandleLoadMonSprite(u32 battler) { - BtlController_HandleLoadMonSprite(battler, gPlayerParty, WaitForMonAnimAfterLoad); + BtlController_HandleLoadMonSprite(battler, WaitForMonAnimAfterLoad); } static void RecordedPlayerHandleSwitchInAnim(u32 battler) diff --git a/src/battle_controllers.c b/src/battle_controllers.c index 08308046f0..41e8f4d083 100644 --- a/src/battle_controllers.c +++ b/src/battle_controllers.c @@ -2417,8 +2417,9 @@ void BtlController_HandleSetRawMonData(u32 battler) BattleControllerComplete(battler); } -void BtlController_HandleLoadMonSprite(u32 battler, struct Pokemon *party, void (*controllerCallback)(u32 battler)) +void BtlController_HandleLoadMonSprite(u32 battler, void (*controllerCallback)(u32 battler)) { + struct Pokemon *party = GetBattlerParty(battler); u16 species = GetMonData(&party[gBattlerPartyIndexes[battler]], MON_DATA_SPECIES); BattleLoadMonSpriteGfx(&party[gBattlerPartyIndexes[battler]], battler);