diff options
| author | Fontbane <fontbane@gmail.com> | 2019-04-16 10:40:32 -0400 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2019-04-22 17:23:59 -0500 |
| commit | 2c076f1f3e8700e081c39792bd5a756511f86c7d (patch) | |
| tree | 5c42e6715936311c757f37b225fcf38e68419c56 /src | |
| parent | dbdb51e1a50c084a781a9e44dec19dc7b2cea597 (diff) | |
Doc most OnTransitions
Diffstat (limited to 'src')
| -rw-r--r-- | src/battle_setup.c | 2 | ||||
| -rw-r--r-- | src/battle_transition.c | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/battle_setup.c b/src/battle_setup.c index 712098773..288fdb3e9 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -793,7 +793,7 @@ static u8 GetTrainerBattleTransition(void) if (gTrainers[gTrainerBattleOpponent_A].trainerClass == TRAINER_CLASS_ELITE_FOUR) { if (gTrainerBattleOpponent_A == TRAINER_SIDNEY) - return B_TRANSITION_SYDNEY; + return B_TRANSITION_SIDNEY; if (gTrainerBattleOpponent_A == TRAINER_PHOEBE) return B_TRANSITION_PHOEBE; if (gTrainerBattleOpponent_A == TRAINER_GLACIA) diff --git a/src/battle_transition.c b/src/battle_transition.c index 6ad1f57d6..7edb1bd93 100644 --- a/src/battle_transition.c +++ b/src/battle_transition.c @@ -76,7 +76,7 @@ static void Phase2Task_Slice(u8 taskId); static void Phase2Task_WhiteFade(u8 taskId); static void Phase2Task_GridSquares(u8 taskId); static void Phase2Task_Shards(u8 taskId); -static void Phase2Task_Sydney(u8 taskId); +static void Phase2Task_Sidney(u8 taskId); static void Phase2Task_Phoebe(u8 taskId); static void Phase2Task_Glacia(u8 taskId); static void Phase2Task_Drake(u8 taskId); @@ -331,7 +331,7 @@ static const TaskFunc sPhase2_Tasks[B_TRANSITION_COUNT] = Phase2Task_WhiteFade, // 9 Phase2Task_GridSquares, // 10 Phase2Task_Shards, // 11 - Phase2Task_Sydney, // 12 + Phase2Task_Sidney, // 12 Phase2Task_Phoebe, // 13 Phase2Task_Glacia, // 14 Phase2Task_Drake, // 15 @@ -824,7 +824,7 @@ const struct SpritePalette gFieldEffectObjectPaletteInfo10 = gFieldEffectObjectPalette10, 0x1009 }; -static const u16 sMugshotPal_Sydney[] = INCBIN_U16("graphics/battle_transitions/sidney_bg.gbapal"); +static const u16 sMugshotPal_Sidney[] = INCBIN_U16("graphics/battle_transitions/sidney_bg.gbapal"); static const u16 sMugshotPal_Phoebe[] = INCBIN_U16("graphics/battle_transitions/phoebe_bg.gbapal"); static const u16 sMugshotPal_Glacia[] = INCBIN_U16("graphics/battle_transitions/glacia_bg.gbapal"); static const u16 sMugshotPal_Drake[] = INCBIN_U16("graphics/battle_transitions/drake_bg.gbapal"); @@ -834,7 +834,7 @@ static const u16 sMugshotPal_May[] = INCBIN_U16("graphics/battle_transitions/may static const u16 *const sOpponentMugshotsPals[MUGSHOTS_COUNT] = { - sMugshotPal_Sydney, + sMugshotPal_Sidney, sMugshotPal_Phoebe, sMugshotPal_Glacia, sMugshotPal_Drake, @@ -2073,9 +2073,9 @@ static void VBlankCB_Phase2_Wave(void) DmaSet(0, gScanlineEffectRegBuffers[1], ®_WIN0H, 0xA2400001); } -static void Phase2Task_Sydney(u8 taskId) +static void Phase2Task_Sidney(u8 taskId) { - gTasks[taskId].tMugshotId = MUGSHOT_SYDNEY; + gTasks[taskId].tMugshotId = MUGSHOT_SIDNEY; Phase2Task_MugShotTransition(taskId); } |