From 1b0cfb075723af7b457ec118eca2888df449bf9e Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 18 Nov 2018 20:00:36 +0100 Subject: Party Size and Num Stats --- src/battle_controller_opponent.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/battle_controller_opponent.c') diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c index 54726229d..2daee71db 100644 --- a/src/battle_controller_opponent.c +++ b/src/battle_controller_opponent.c @@ -541,7 +541,7 @@ static void OpponentHandleGetMonData(void) else { monToCheck = gBattleBufferA[gActiveBattler][2]; - for (i = 0; i < 6; i++) + for (i = 0; i < PARTY_SIZE; i++) { if (monToCheck & 1) size += GetOpponentMonData(i, monData + size); @@ -884,7 +884,7 @@ static void OpponentHandleSetMonData(void) else { monToCheck = gBattleBufferA[gActiveBattler][2]; - for (i = 0; i < 6; i++) + for (i = 0; i < PARTY_SIZE; i++) { if (monToCheck & 1) SetOpponentMonData(i); -- cgit v1.2.3 From 72f0a079a9221e314e7eecf0e920313bf83d32ac Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Mon, 19 Nov 2018 09:28:55 -0600 Subject: Decompile all of battle_anim_utility_funcs --- src/battle_controller_opponent.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/battle_controller_opponent.c') diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c index 2daee71db..72dfb7e6b 100644 --- a/src/battle_controller_opponent.c +++ b/src/battle_controller_opponent.c @@ -33,8 +33,6 @@ #include "constants/songs.h" #include "constants/trainers.h" -extern u16 gBattle_BG0_X; -extern u16 gBattle_BG0_Y; extern struct MusicPlayerInfo gMPlayInfo_BGM; extern struct UnusedControllerStruct gUnknown_02022D0C; -- cgit v1.2.3 From 5947e0d229cde5e00224b3c8aff91e27f0d06dfc Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sun, 25 Nov 2018 17:00:18 -0600 Subject: Decompile rock --- src/battle_controller_opponent.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/battle_controller_opponent.c') diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c index 72dfb7e6b..403cc5eed 100644 --- a/src/battle_controller_opponent.c +++ b/src/battle_controller_opponent.c @@ -1381,7 +1381,7 @@ static void OpponentHandleTrainerSlideBack(void) gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 35; gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = 280; gSprites[gBattlerSpriteIds[gActiveBattler]].data[4] = gSprites[gBattlerSpriteIds[gActiveBattler]].pos1.y; - gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_80A6EEC; + gSprites[gBattlerSpriteIds[gActiveBattler]].callback = StartAnimLinearTranslation; StoreSpriteCallbackInData6(&gSprites[gBattlerSpriteIds[gActiveBattler]], SpriteCallbackDummy); gBattlerControllerFuncs[gActiveBattler] = sub_805F240; } @@ -1855,7 +1855,7 @@ static void OpponentHandleIntroTrainerBallThrow(void) gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 35; gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = 280; gSprites[gBattlerSpriteIds[gActiveBattler]].data[4] = gSprites[gBattlerSpriteIds[gActiveBattler]].pos1.y; - gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_80A6EEC; + gSprites[gBattlerSpriteIds[gActiveBattler]].callback = StartAnimLinearTranslation; StoreSpriteCallbackInData6(&gSprites[gBattlerSpriteIds[gActiveBattler]], sub_806280C); -- cgit v1.2.3