diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-06-19 23:39:22 -0500 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-06-19 23:39:22 -0500 |
| commit | a97a040dc17e05c2ad8ede7c2192173ac3724632 (patch) | |
| tree | caf44c64eb985bae96864e5e8fe8cd4bd025ae76 /src/battle_setup.c | |
| parent | 87bd7f4484dcccd2f87791d9c4654b52216675ca (diff) | |
| parent | 102f5b1e15e7295e30a3cebfbbad3c8af4cc1d37 (diff) | |
merge upstream
Diffstat (limited to 'src/battle_setup.c')
| -rw-r--r-- | src/battle_setup.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/battle_setup.c b/src/battle_setup.c index e4e83dfa1..adcbe8eaa 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -49,7 +49,7 @@ EWRAM_DATA u8 *gTrainerBattleEndScript = NULL; extern u16 gBattleTypeFlags; extern u16 gScriptLastTalked; -extern u8 gUnknown_02024D26; +extern u8 gBattleOutcome; extern struct MapObject gMapObjects[]; @@ -574,7 +574,7 @@ void HandleWildBattleEnd(void) CpuFill16(0, (void *)BG_PLTT, BG_PLTT_SIZE); ResetOamRange(0, 128); - if (battle_exit_is_player_defeat(gUnknown_02024D26) == TRUE) + if (battle_exit_is_player_defeat(gBattleOutcome) == TRUE) { SetMainCallback2(CB2_WhiteOut); } @@ -590,7 +590,7 @@ void HandleScriptedWildBattleEnd(void) CpuFill16(0, (void *)BG_PLTT, BG_PLTT_SIZE); ResetOamRange(0, 128); - if (battle_exit_is_player_defeat(gUnknown_02024D26) == TRUE) + if (battle_exit_is_player_defeat(gBattleOutcome) == TRUE) SetMainCallback2(CB2_WhiteOut); else SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music); @@ -1051,7 +1051,7 @@ void sub_808260C(void) { SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music); // link battle? } - else if (battle_exit_is_player_defeat(gUnknown_02024D26) == TRUE) + else if (battle_exit_is_player_defeat(gBattleOutcome) == TRUE) { SetMainCallback2(CB2_WhiteOut); } @@ -1068,7 +1068,7 @@ void do_choose_name_or_words_screen(void) { SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music); // link battle? } - else if (battle_exit_is_player_defeat(gUnknown_02024D26) == TRUE) + else if (battle_exit_is_player_defeat(gBattleOutcome) == TRUE) { SetMainCallback2(CB2_WhiteOut); } |