diff options
| author | huderlem <huderlem@gmail.com> | 2019-10-19 08:08:03 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-19 08:08:03 -0500 |
| commit | d63e99c418de98005eac31ba3e6c1abdd6e3ecaf (patch) | |
| tree | f8352a8edfbc7209588cd783e485ba6b6d2e0b00 /src/battle_tower.c | |
| parent | 11170ce90c0baf77b196e378441d25e7f16e2cf3 (diff) | |
| parent | e97f37077c793a388e3a98c13f09846839e80b22 (diff) | |
Merge pull request #754 from camthesaxman/emerald_diff
resolve more emerald differences
Diffstat (limited to 'src/battle_tower.c')
| -rw-r--r-- | src/battle_tower.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/battle_tower.c b/src/battle_tower.c index 8449b7e42..a5b2df0a6 100644 --- a/src/battle_tower.c +++ b/src/battle_tower.c @@ -1282,7 +1282,7 @@ void sub_81354CC(void) break; } - SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music); + SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic); } void sub_8135534(u8 taskId) @@ -1805,9 +1805,9 @@ void PrintEReaderTrainerGreeting(void) void PrintEReaderTrainerFarewellMessage(void) { - if (gBattleOutcome == BATTLE_DREW) + if (gBattleOutcome == B_OUTCOME_DREW) gStringVar4[0] = EOS; - else if (gBattleOutcome == BATTLE_WON) + else if (gBattleOutcome == B_OUTCOME_WON) PrintBattleTowerTrainerMessage(gSaveBlock2.battleTower.ereaderTrainer.farewellPlayerWon); else PrintBattleTowerTrainerMessage(gSaveBlock2.battleTower.ereaderTrainer.farewellPlayerLost); |