diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/battle_setup.c | 9 | ||||
| -rw-r--r-- | src/pokemon.c | 2 |
2 files changed, 6 insertions, 5 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); } } diff --git a/src/pokemon.c b/src/pokemon.c index 39019421c..1270a25ed 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -6059,7 +6059,7 @@ bool8 CheckBattleTypeGhost(struct Pokemon *mon, u8 battlerId) { GetMonData(mon, MON_DATA_NICKNAME, buffer); StringGetEnd10(buffer); - if (!StringCompare(buffer, gUnknown_841D148)) + if (!StringCompare(buffer, gText_Ghost)) return TRUE; } return FALSE; |