diff options
Diffstat (limited to 'data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc')
| -rw-r--r-- | data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc index 651fe0c76..6cf717fe5 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc @@ -10,20 +10,20 @@ CinnabarIsland_PokemonLab_Lounge_EventScript_16E2C2:: @ 816E2C2 faceplayer setvar VAR_0x8008, 6 call EventScript_1A8CAD - checkflag FLAG_0x274 - goto_if_eq EventScript_16E334 + checkflag FLAG_DID_ESPHERE_TRADE + goto_if TRUE, EventScript_16E334 msgbox gUnknown_81A59FE, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16E31C + goto_if eq, EventScript_16E31C call EventScript_1A8CBD compare_var_to_value VAR_0x8004, 6 - goto_if 4, EventScript_16E31C + goto_if ge, EventScript_16E31C call EventScript_1A8CC9 compare_var_to_var VAR_RESULT, VAR_0x8009 - goto_if 5, EventScript_16E326 + goto_if ne, EventScript_16E326 call EventScript_1A8CD9 msgbox gUnknown_81A5A9D - setflag FLAG_0x274 + setflag FLAG_DID_ESPHERE_TRADE release end @@ -50,28 +50,28 @@ CinnabarIsland_PokemonLab_Lounge_EventScript_16E33E:: @ 816E33E copyvar VAR_0x8004, VAR_0x8008 specialvar VAR_RESULT, sub_8053A9C copyvar VAR_0x8009, VAR_RESULT - checkflag FLAG_0x275 - goto_if_eq EventScript_16E3D4 + checkflag FLAG_DID_TANGENY_TRADE + goto_if TRUE, EventScript_16E3D4 msgbox gUnknown_81A5AD6, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16E3BC - special sub_80BF8FC + goto_if eq, EventScript_16E3BC + special Special_ChooseMonFromParty waitstate copyvar VAR_0x800A, VAR_0x8004 compare_var_to_value VAR_0x8004, 6 - goto_if 4, EventScript_16E3BC + goto_if ge, EventScript_16E3BC copyvar VAR_0x8005, VAR_0x800A specialvar VAR_RESULT, sub_8053D2C copyvar VAR_0x800B, VAR_RESULT compare_var_to_var VAR_RESULT, VAR_0x8009 - goto_if 5, EventScript_16E3C6 + goto_if ne, EventScript_16E3C6 copyvar VAR_0x8004, VAR_0x8008 copyvar VAR_0x8005, VAR_0x800A special sub_8053D68 special sub_8054440 waitstate msgbox gUnknown_81A5B4A - setflag FLAG_0x275 + setflag FLAG_DID_TANGENY_TRADE release end |