diff options
Diffstat (limited to 'data/scripts')
| -rw-r--r-- | data/scripts/abnormal_weather.inc | 2 | ||||
| -rw-r--r-- | data/scripts/cable_club.inc | 4 | ||||
| -rw-r--r-- | data/scripts/trainer_battle.inc | 9 |
3 files changed, 7 insertions, 8 deletions
diff --git a/data/scripts/abnormal_weather.inc b/data/scripts/abnormal_weather.inc index 88da0405f..16f8af41f 100644 --- a/data/scripts/abnormal_weather.inc +++ b/data/scripts/abnormal_weather.inc @@ -172,7 +172,7 @@ AbnormalWeather_StartGroudonWeather:: @ 8273D1B AbnormalWeather_EventScript_EndEventAndCleanup_1:: @ 8273D1F lockall - compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_KYOGRE_LOCATIONS_START + compare VAR_ABNORMAL_WEATHER_LOCATION, MARINE_CAVE_LOCATIONS_START goto_if_ge AbnormalWeather_EventScript_ShowRainEndedMessage goto AbnormalWeather_EventScript_ShowSunEndedMessage end diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index d671dc95b..6d5702f74 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -39,10 +39,10 @@ CableClub_EventScript_DistributeEonTicket:: @ 8276B23 checkitem ITEM_EON_TICKET, 1 compare VAR_RESULT, TRUE goto_if_eq CableClub_EventScript_AlreadyGotEonTicket - goto_if_set FLAG_SYS_HAS_EON_TICKET, CableClub_EventScript_AlreadyGotEonTicket + goto_if_set FLAG_ENABLE_SHIP_SOUTHERN_ISLAND, CableClub_EventScript_AlreadyGotEonTicket msgbox Mevent_Text_TheresATicketForYou, MSGBOX_DEFAULT giveitem ITEM_EON_TICKET - setflag FLAG_SYS_HAS_EON_TICKET + setflag FLAG_ENABLE_SHIP_SOUTHERN_ISLAND setvar VAR_DISTRIBUTE_EON_TICKET, 0 msgbox Mevent_Text_TryUsingItAtLilycovePort, MSGBOX_DEFAULT release diff --git a/data/scripts/trainer_battle.inc b/data/scripts/trainer_battle.inc index d609fcc93..aa96e7b35 100644 --- a/data/scripts/trainer_battle.inc +++ b/data/scripts/trainer_battle.inc @@ -44,7 +44,7 @@ EventScript_NotEnoughMonsForDoubleBattle:: @ 82713BA EventScript_NoDoubleTrainerBattle:: @ 82713C1 gotopostbattlescript -EventScript_DoTainerBattle:: @ 82713C2 +EventScript_DoNoIntroTrainerBattle:: @ 82713C2 applymovement VAR_LAST_TALKED, Movement_RevealTrainer waitmovement 0 special SetUpTrainerEncounterMusic @@ -54,7 +54,7 @@ EventScript_DoTainerBattle:: @ 82713C2 EventScript_TryDoRematchBattle:: @ 82713D1 call EventScript_RevealTrainer specialvar VAR_RESULT, IsTrainerReadyForRematch - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq EventScript_NoRematchTrainerBattle special SetUpTrainerEncounterMusic special SetUpTrainerMovement @@ -70,7 +70,7 @@ EventScript_NoRematchTrainerBattle:: @ 82713F7 EventScript_TryDoDoubleRematchBattle:: @ 82713F8 specialvar VAR_RESULT, IsTrainerReadyForRematch - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq EventScript_NoDoubleRematchTrainerBattle special HasEnoughMonsForDoubleBattle compare VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS @@ -113,7 +113,7 @@ EventScript_ShowTrainerIntroMsg:: @ 827143C EventScript_DoTrainerBattle:: @ 8271454 trainerbattlebegin - @ Pointless check, possibly used for debugging? + @ Below battle mode check only needed in FRLG specialvar VAR_RESULT, GetTrainerBattleMode compare VAR_RESULT, TRAINER_BATTLE_SINGLE goto_if_eq EventScript_EndTrainerBattle @@ -125,7 +125,6 @@ EventScript_DoTrainerBattle:: @ 8271454 goto_if_eq EventScript_EndTrainerBattle compare VAR_RESULT, TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE_NO_MUSIC goto_if_eq EventScript_EndTrainerBattle - EventScript_EndTrainerBattle:: @ 8271491 gotobeatenscript releaseall |