diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2017-10-31 13:57:29 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-31 13:57:29 -0500 |
| commit | 63210c07897e86953bf093397eee5a33e95b8c91 (patch) | |
| tree | c5d4f93c251472daa4cded616da3141448a37e6b /src/battle_2.c | |
| parent | 4cb8528d94216f69c4a37d470c1d5f3487a87239 (diff) | |
| parent | 6cb1c4fd6e7c52e528f36e3511ac4b4db4dbb2ee (diff) | |
Merge pull request #96 from DizzyEggg/decompile_evo_scene_graphics
Decompile Evolution graphics/scene
Diffstat (limited to 'src/battle_2.c')
| -rw-r--r-- | src/battle_2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle_2.c b/src/battle_2.c index fd1b88b48..24b43bdbd 100644 --- a/src/battle_2.c +++ b/src/battle_2.c @@ -85,7 +85,7 @@ extern u16 gTrainerBattleOpponent_B; extern struct BattleEnigmaBerry gEnigmaBerries[BATTLE_BANKS_COUNT]; extern void (*gPreBattleCallback1)(void); extern void (*gBattleMainFunc)(void); -extern void (*gUnknown_030061E8)(void); +extern void (*gCB2_AfterEvolution)(void); extern struct UnknownPokemonStruct2 gUnknown_02022FF8[3]; // what is it used for? extern struct UnknownPokemonStruct2* gUnknown_02023058; // what is it used for? extern u8 gUnknown_02039B28[]; // possibly a struct? @@ -4938,7 +4938,7 @@ static void HandleEndTurn_FinishBattle(void) BeginFastPaletteFade(3); FadeOutMapMusic(5); gBattleMainFunc = FreeResetData_ReturnToOvOrDoEvolutions; - gUnknown_030061E8 = BattleMainCB2; + gCB2_AfterEvolution = BattleMainCB2; } else { |