diff options
Diffstat (limited to 'src/battle_controller_wally.c')
-rw-r--r-- | src/battle_controller_wally.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/battle_controller_wally.c b/src/battle_controller_wally.c index f7e9831a7..1a3a2d53d 100644 --- a/src/battle_controller_wally.c +++ b/src/battle_controller_wally.c @@ -31,8 +31,6 @@ #include "constants/songs.h" #include "constants/trainers.h" -extern u16 gBattle_BG0_X; -extern u16 gBattle_BG0_Y; extern s32 gUnknown_0203CD70; extern struct UnusedControllerStruct gUnknown_02022D0C; @@ -442,7 +440,7 @@ static void WallyHandleGetMonData(void) else { monToCheck = gBattleBufferA[gActiveBattler][2]; - for (i = 0; i < 6; i++) + for (i = 0; i < PARTY_SIZE; i++) { if (monToCheck & 1) size += CopyWallyMonData(i, monData + size); @@ -776,7 +774,7 @@ static void WallyHandleSetMonData(void) else { monToCheck = gBattleBufferA[gActiveBattler][2]; - for (i = 0; i < 6; i++) + for (i = 0; i < PARTY_SIZE; i++) { if (monToCheck & 1) SetWallyMonData(i); @@ -1437,7 +1435,7 @@ static void WallyHandleIntroTrainerBallThrow(void) gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 50; gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = -40; gSprites[gBattlerSpriteIds[gActiveBattler]].data[4] = gSprites[gBattlerSpriteIds[gActiveBattler]].pos1.y; - gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_80A6EEC; + gSprites[gBattlerSpriteIds[gActiveBattler]].callback = StartAnimLinearTranslation; gSprites[gBattlerSpriteIds[gActiveBattler]].data[5] = gActiveBattler; StoreSpriteCallbackInData6(&gSprites[gBattlerSpriteIds[gActiveBattler]], sub_805CC00); |