diff options
Diffstat (limited to 'data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc')
| -rw-r--r-- | data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc b/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc index f3c9c7c3f..d1496398b 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc +++ b/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc @@ -1,18 +1,17 @@ IndigoPlateau_PokemonCenter_1F_MapScripts:: @ 816EA5A - map_script 3, IndigoPlateau_PokemonCenter_1F_MapScript1_16EA65 - map_script 5, IndigoPlateau_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_TRANSITION, IndigoPlateau_PokemonCenter_1F_OnTransition + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 -IndigoPlateau_PokemonCenter_1F_MapScript1_16EA65:: @ 816EA65 +IndigoPlateau_PokemonCenter_1F_OnTransition:: @ 816EA65 setrespawn SPAWN_INDIGO_PLATEAU specialvar VAR_RESULT, IsNationalPokedexEnabled - compare_var_to_value VAR_RESULT, 1 - call_if eq, EventScript_16EA79 + compare VAR_RESULT, TRUE + call_if_eq EventScript_16EA79 end EventScript_16EA79:: @ 816EA79 - checkflag FLAG_SYS_CAN_LINK_WITH_RS - goto_if TRUE, EventScript_1A77A9 + goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_Return setobjectxyperm 4, 4, 2 return @@ -20,15 +19,14 @@ IndigoPlateau_PokemonCenter_1F_EventScript_16EA8A:: @ 816EA8A lock faceplayer specialvar VAR_RESULT, IsNationalPokedexEnabled - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_16EAA6 + compare VAR_RESULT, TRUE + goto_if_eq EventScript_16EAA6 msgbox gUnknown_819A8D8 release end EventScript_16EAA6:: @ 816EAA6 - checkflag FLAG_SYS_CAN_LINK_WITH_RS - goto_if TRUE, EventScript_16EAB9 + goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_16EAB9 msgbox gUnknown_819A943 release end @@ -39,19 +37,19 @@ EventScript_16EAB9:: @ 816EAB9 end IndigoPlateau_PokemonCenter_1F_EventScript_16EAC3:: @ 816EAC3 - msgbox gUnknown_819A837, 2 + msgbox gUnknown_819A837, MSGBOX_NPC end IndigoPlateau_PokemonCenter_1F_EventScript_16EACC:: @ 816EACC special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + compare VAR_RESULT, 2 + goto_if_eq EventScript_1A7AE0 lock faceplayer - message Text_1A6211 + message Text_MayIHelpYou waitmessage pokemart Items_16EAF4 - msgbox gUnknown_81A5190 + msgbox Text_PleaseComeAgain release end @@ -71,6 +69,6 @@ Items_16EAF4:: @ 816EAF4 IndigoPlateau_PokemonCenter_1F_EventScript_16EB06:: @ 816EB06 lock faceplayer - call EventScript_1A6578 + call EventScript_PkmnCenterNurse release end |