diff options
Diffstat (limited to 'src/battle_main.c')
| -rw-r--r-- | src/battle_main.c | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/src/battle_main.c b/src/battle_main.c index b34beeb98..040d42ef9 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -113,11 +113,14 @@ extern u16 gUnknown_02024DE8; extern u8 gActionSelectionCursor[]; extern u8 gMoveSelectionCursor[]; extern u8 gUnknown_02038470[]; -extern MainCallback gPreBattleCallback1; +MainCallback gPreBattleCallback1; +u8 gUnknown_03004344; +u8 gUnknown_03004348; extern void (*gBattleMainFunc)(void); -extern u8 gLeveledUpInBattle; -extern void (*gBattlerControllerFuncs[])(void); -extern u8 gHealthboxSpriteIds[]; +u8 gLeveledUpInBattle; +void (*gBattlerControllerFuncs[MAX_BATTLERS_COUNT])(void); +u8 gHealthboxSpriteIds[MAX_BATTLERS_COUNT]; +u8 gUnknown_0300434C[MAX_BATTLERS_COUNT]; extern u16 gBattleTypeFlags; extern u8 gReservedSpritePaletteCount; extern u16 gTrainerBattleOpponent; @@ -163,6 +166,7 @@ extern u8 gNumSafariBalls; extern u8 gUnknown_081FA70C[][3]; extern u8 gUnknown_081FA71B[]; extern u8 gUnknown_081FA71F[]; +struct BattleResults gBattleResults; void BattleMainCB1(void); static void BattlePrepIntroSlide(void); @@ -241,9 +245,8 @@ void CB2_InitBattleInternal(void) gScanlineEffectRegBuffers[0][i] = 0xF0; gScanlineEffectRegBuffers[1][i] = 0xF0; } - for (i = 80; i < 160; i++) + for (; i < 160; i++) { - asm(""::"r"(i)); // Needed to stop the compiler from optimizing out the loop counter gScanlineEffectRegBuffers[0][i] = 0xFF10; gScanlineEffectRegBuffers[1][i] = 0xFF10; } @@ -1185,7 +1188,7 @@ void sub_800FE20(struct Sprite *sprite) { StartSpriteAffineAnim(sprite, 1); sprite->callback = sub_800FDB0; - PlaySE(SE_BT_START); + PlaySE(SE_MUGSHOT); } void sub_800FE40(u8 taskId) @@ -1289,9 +1292,8 @@ void c2_8011A1C(void) gScanlineEffectRegBuffers[0][i] = 0xF0; gScanlineEffectRegBuffers[1][i] = 0xF0; } - for (i = 80; i < 160; i++) + for (; i < 160; i++) { - asm(""::"r"(i)); // Needed to stop the compiler from optimizing out the loop counter gScanlineEffectRegBuffers[0][i] = 0xFF10; gScanlineEffectRegBuffers[1][i] = 0xFF10; } @@ -4944,7 +4946,7 @@ void HandleEndTurn_BattleWon(void) { case TRAINER_CLASS_ELITE_FOUR: case TRAINER_CLASS_CHAMPION: - PlayBGM(MUS_KACHI5); + PlayBGM(MUS_VICTORY_LEAGUE); break; case TRAINER_CLASS_TEAM_AQUA: case TRAINER_CLASS_TEAM_MAGMA: @@ -4952,13 +4954,13 @@ void HandleEndTurn_BattleWon(void) case TRAINER_CLASS_AQUA_LEADER: case TRAINER_CLASS_MAGMA_ADMIN: case TRAINER_CLASS_MAGMA_LEADER: - PlayBGM(MUS_KACHI4); + PlayBGM(MUS_VICTORY_AQUA_MAGMA); break; case TRAINER_CLASS_LEADER: - PlayBGM(MUS_KACHI3); + PlayBGM(MUS_VICTORY_GYM_LEADER); break; default: - PlayBGM(MUS_KACHI1); + PlayBGM(MUS_VICTORY_TRAINER); break; } } @@ -5621,7 +5623,7 @@ void HandleAction_GoNear(void) void HandleAction_SafriZoneRun(void) { gBattlerAttacker = gBattlerByTurnOrder[gCurrentTurnActionNumber]; - PlaySE(SE_NIGERU); + PlaySE(SE_FLEE); gCurrentTurnActionNumber = gBattlersCount; gBattleOutcome = B_OUTCOME_RAN; } |