diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-01-16 15:51:18 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-16 15:51:18 -0500 |
| commit | 2af612486334cddbbe7a7fe7cf04af175ff1302f (patch) | |
| tree | ba5406d16a4b61dd270518859a5d3a254bcd5806 /src/battle_setup.c | |
| parent | 7cddc40bbfcd45994f63db22af305dab4db5491c (diff) | |
| parent | 8b2bf805eab3d1e7ca11eda11d6b409fac431248 (diff) | |
Merge pull request #226 from GriffinRichards/doc-lavender
Document Lavender Town scripts
Diffstat (limited to 'src/battle_setup.c')
| -rw-r--r-- | src/battle_setup.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/battle_setup.c b/src/battle_setup.c index 994ed858a..a46191509 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -276,7 +276,7 @@ static void DoGhostBattle(void) gMain.savedCallback = CB2_EndWildBattle; gBattleTypeFlags = BATTLE_TYPE_GHOST; CreateBattleStartTask(GetWildBattleTransition(), 0); - SetMonData(&gEnemyParty[0], MON_DATA_NICKNAME, gUnknown_841D148); + SetMonData(&gEnemyParty[0], MON_DATA_NICKNAME, gText_Ghost); IncrementGameStat(GAME_STAT_TOTAL_BATTLES); IncrementGameStat(GAME_STAT_WILD_BATTLES); } @@ -321,7 +321,7 @@ void ScrSpecial_StartMarowakBattle(void) gBattleTypeFlags = BATTLE_TYPE_GHOST; } CreateBattleStartTask(GetWildBattleTransition(), 0); - SetMonData(&gEnemyParty[0], MON_DATA_NICKNAME, gUnknown_841D148); + SetMonData(&gEnemyParty[0], MON_DATA_NICKNAME, gText_Ghost); IncrementGameStat(GAME_STAT_TOTAL_BATTLES); IncrementGameStat(GAME_STAT_WILD_BATTLES); } @@ -444,10 +444,11 @@ static void CB2_EndMarowakBattle(void) } else { + // If result is TRUE player didnt defeat Marowak, force player back from stairs if (gBattleOutcome == B_OUTCOME_WON) - gSpecialVar_Result = 0; + gSpecialVar_Result = FALSE; else - gSpecialVar_Result = 1; + gSpecialVar_Result = TRUE; SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic); } } |