diff options
Diffstat (limited to 'data/maps')
130 files changed, 659 insertions, 659 deletions
diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc index 99ab46150..a6abc033b 100644 --- a/data/maps/BirthIsland_Exterior/scripts.inc +++ b/data/maps/BirthIsland_Exterior/scripts.inc @@ -14,9 +14,9 @@ BirthIsland_Exterior_MapScript1_165217:: @ 8165217 setvar VAR_0x4026, 0 setvar VAR_0x403E, 0 checkflag FLAG_0x2E4 - call_if 1, EventScript_16523C + call_if eq, EventScript_16523C checkflag FLAG_0x2E4 - call_if 0, EventScript_165243 + call_if lt, EventScript_165243 end EventScript_16523C:: @ 816523C @@ -33,13 +33,13 @@ EventScript_165243:: @ 8165243 BirthIsland_Exterior_MapScript2_165253:: @ 8165253 checkflag FLAG_0x807 - call_if 1, EventScript_16525D + call_if eq, EventScript_16525D end EventScript_16525D:: @ 816525D specialvar VAR_RESULT, sub_80CA74C compare_var_to_value VAR_RESULT, 7 - goto_if 5, EventScript_1A77A9 + goto_if ne, EventScript_1A77A9 removeobject 2 return diff --git a/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc b/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc index 3f92e7018..23df9bc9b 100644 --- a/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc @@ -5,7 +5,7 @@ CeladonCity_DepartmentStore_Elevator_EventScript_16C153:: @ 816C153 lockall setvar VAR_0x8004, 3 checkflag FLAG_TEMP_2 - call_if 0, EventScript_1A7AB9 + call_if lt, EventScript_1A7AB9 copyvar VAR_0x8005, VAR_0x403A special sub_80CB580 message Text_1A535C diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc index 9bdd93dee..3fc81021d 100644 --- a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc @@ -18,13 +18,13 @@ EventScript_16BCF6:: @ 816BCF6 setvar VAR_0x4001, 0 checkitem ITEM_FRESH_WATER, 1 compare_var_to_value VAR_RESULT, 1 - call_if 1, EventScript_16BD2C + call_if eq, EventScript_16BD2C checkitem ITEM_SODA_POP, 1 compare_var_to_value VAR_RESULT, 1 - call_if 1, EventScript_16BD32 + call_if eq, EventScript_16BD32 checkitem ITEM_LEMONADE, 1 compare_var_to_value VAR_RESULT, 1 - call_if 1, EventScript_16BD38 + call_if eq, EventScript_16BD38 return EventScript_16BD2C:: @ 816BD2C @@ -161,11 +161,11 @@ EventScript_16BF7C:: @ 816BF7C giveitem VAR_0x8009, 1, 8 call EventScript_1A6675 compare_var_to_value VAR_0x8008, ITEM_FRESH_WATER - call_if 1, EventScript_16BFDE + call_if eq, EventScript_16BFDE compare_var_to_value VAR_0x8008, ITEM_SODA_POP - call_if 1, EventScript_16BFEA + call_if eq, EventScript_16BFEA compare_var_to_value VAR_0x8008, ITEM_LEMONADE - call_if 1, EventScript_16BFF6 + call_if eq, EventScript_16BFF6 release end @@ -267,11 +267,11 @@ EventScript_16C0CB:: @ 816C0CB compare_var_to_value VAR_RESULT, 0 goto_if_eq EventScript_16C13F compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_16C0B6 + call_if eq, EventScript_16C0B6 compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_16C0BD + call_if eq, EventScript_16C0BD compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_16C0C4 + call_if eq, EventScript_16C0C4 updatemoneybox 0, 0, 0 getitemname 0, VAR_0x4000 playse SE_JIHANKI diff --git a/data/maps/CeladonCity_GameCorner/scripts.inc b/data/maps/CeladonCity_GameCorner/scripts.inc index 3fa97339a..85df99071 100644 --- a/data/maps/CeladonCity_GameCorner/scripts.inc +++ b/data/maps/CeladonCity_GameCorner/scripts.inc @@ -4,7 +4,7 @@ CeladonCity_GameCorner_MapScripts:: @ 816C646 CeladonCity_GameCorner_MapScript1_16C64C:: @ 816C64C checkflag FLAG_0x26D - call_if 0, EventScript_16C656 + call_if lt, EventScript_16C656 end EventScript_16C656:: @ 816C656 @@ -40,7 +40,7 @@ CeladonCity_GameCorner_EventScript_16C68D:: @ 816C68D EventScript_16C6E6:: @ 816C6E6 checkflag FLAG_GOT_COIN_CASE - goto_if 0, EventScript_16C790 + goto_if lt, EventScript_16C790 compare_var_to_value VAR_0x8009, 0 goto_if_eq EventScript_16C734 compare_var_to_value VAR_0x8009, 1 @@ -50,7 +50,7 @@ EventScript_16C6E6:: @ 816C6E6 EventScript_16C706:: @ 816C706 checkcoins VAR_0x4001 compare_var_to_value VAR_0x4001, 9500 - goto_if 4, EventScript_16C79E + goto_if ge, EventScript_16C79E checkmoney 10000, 0 compare_var_to_value VAR_RESULT, 0 goto_if_eq EventScript_16C7AC @@ -62,7 +62,7 @@ EventScript_16C706:: @ 816C706 EventScript_16C734:: @ 816C734 checkcoins VAR_0x4001 compare_var_to_value VAR_0x4001, 9950 - goto_if 4, EventScript_16C79E + goto_if ge, EventScript_16C79E checkmoney 1000, 0 compare_var_to_value VAR_RESULT, 0 goto_if_eq EventScript_16C7AC @@ -135,10 +135,10 @@ CeladonCity_GameCorner_EventScript_16C7E7:: @ 816C7E7 goto_if_eq EventScript_16C849 msgbox gUnknown_8196AF3 checkflag FLAG_GOT_COIN_CASE - goto_if 0, EventScript_16C839 + goto_if lt, EventScript_16C839 checkcoins VAR_0x4001 compare_var_to_value VAR_0x4001, 9990 - goto_if 4, EventScript_16C82B + goto_if ge, EventScript_16C82B givecoins 10 textcolor 3 msgbox gUnknown_8196B0D @@ -199,10 +199,10 @@ CeladonCity_GameCorner_EventScript_16C89E:: @ 816C89E goto_if_eq EventScript_16C8F0 msgbox gUnknown_8196D2B checkflag FLAG_GOT_COIN_CASE - goto_if 0, EventScript_16C839 + goto_if lt, EventScript_16C839 checkcoins VAR_0x4001 compare_var_to_value VAR_0x4001, 9980 - goto_if 4, EventScript_16C8E2 + goto_if ge, EventScript_16C8E2 givecoins 20 textcolor 3 msgbox gUnknown_8196D47 @@ -229,10 +229,10 @@ CeladonCity_GameCorner_EventScript_16C8FE:: @ 816C8FE goto_if_eq EventScript_16C950 msgbox gUnknown_8196DB7 checkflag FLAG_GOT_COIN_CASE - goto_if 0, EventScript_16C839 + goto_if lt, EventScript_16C839 checkcoins VAR_0x4001 compare_var_to_value VAR_0x4001, 9980 - goto_if 4, EventScript_16C942 + goto_if ge, EventScript_16C942 givecoins 20 textcolor 3 msgbox gUnknown_8196DF8 @@ -264,7 +264,7 @@ EventScript_16C96A:: @ 816C96A EventScript_16C96C:: @ 816C96C checkflag FLAG_GOT_COIN_CASE - goto_if 0, EventScript_16CAA0 + goto_if lt, EventScript_16CAA0 msgbox gUnknown_8196F46, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 goto_if_eq EventScript_16C96A @@ -413,7 +413,7 @@ CeladonCity_GameCorner_EventScript_16CAAA:: @ 816CAAA lockall msgbox gUnknown_8196EDC checkflag FLAG_0x26D - call_if 0, EventScript_16CABE + call_if lt, EventScript_16CABE releaseall end @@ -437,9 +437,9 @@ EventScript_16CB10:: @ 816CB10 msgbox gUnknown_8196E9B closemessage compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_16CB34 + call_if eq, EventScript_16CB34 compare_var_to_value VAR_FACING, 3 - call_if 5, EventScript_16CB3F + call_if ne, EventScript_16CB3F removeobject 11 release end diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc index 4a60c9814..9eab86b9f 100644 --- a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc +++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc @@ -13,7 +13,7 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_16CB88:: @ 816CB88 lock faceplayer checkflag FLAG_GOT_COIN_CASE - goto_if 0, EventScript_16CD99 + goto_if lt, EventScript_16CD99 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 goto_if_eq EventScript_1A7AE0 @@ -78,7 +78,7 @@ EventScript_16CC65:: @ 816CC65 goto_if_eq EventScript_16CC10 checkcoins VAR_RESULT compare_var_to_var VAR_RESULT, VAR_0x4002 - goto_if 0, EventScript_16CDA5 + goto_if lt, EventScript_16CDA5 textcolor 3 switch VAR_0x4001 case SPECIES_ABRA, EventScript_16CCD4 @@ -192,7 +192,7 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_16CE1D:: @ 816CE1D lock faceplayer checkflag FLAG_GOT_COIN_CASE - goto_if 0, EventScript_16CD99 + goto_if lt, EventScript_16CD99 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 goto_if_eq EventScript_1A7AE0 @@ -269,7 +269,7 @@ EventScript_16CF3F:: @ 816CF3F getitemname 0, VAR_0x4001 checkcoins VAR_RESULT compare_var_to_var VAR_RESULT, VAR_0x4002 - goto_if 0, EventScript_16CDA5 + goto_if lt, EventScript_16CDA5 checkitemspace VAR_0x4001, 1 compare_var_to_value VAR_RESULT, 0 goto_if_eq EventScript_16CF79 @@ -290,7 +290,7 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_16CF88:: @ 816CF88 lock faceplayer checkflag FLAG_GOT_COIN_CASE - goto_if 0, EventScript_16CD99 + goto_if lt, EventScript_16CD99 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 goto_if_eq EventScript_1A7AE0 diff --git a/data/maps/CeladonCity_Gym/scripts.inc b/data/maps/CeladonCity_Gym/scripts.inc index c99525178..48858a58b 100644 --- a/data/maps/CeladonCity_Gym/scripts.inc +++ b/data/maps/CeladonCity_Gym/scripts.inc @@ -5,7 +5,7 @@ CeladonCity_Gym_EventScript_16D061:: @ 816D061 famechecker FAMECHECKER_ERIKA, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 trainerbattle 1, TRAINER_LEADER_ERIKA, 0, Text_197114, Text_197260, EventScript_16D0A0 checkflag FLAG_0x293 - goto_if 0, EventScript_16D0C6 + goto_if lt, EventScript_16D0C6 famechecker FAMECHECKER_ERIKA, 4 msgbox gUnknown_81972B8 release diff --git a/data/maps/CeruleanCave_B1F/scripts.inc b/data/maps/CeruleanCave_B1F/scripts.inc index a9e13651c..dfe553dba 100644 --- a/data/maps/CeruleanCave_B1F/scripts.inc +++ b/data/maps/CeruleanCave_B1F/scripts.inc @@ -5,19 +5,19 @@ CeruleanCave_B1F_MapScripts:: @ 81624BE CeruleanCave_B1F_MapScript1_1624C9:: @ 81624C9 checkflag FLAG_0x807 - call_if 1, EventScript_1624D3 + call_if eq, EventScript_1624D3 end EventScript_1624D3:: @ 81624D3 specialvar VAR_RESULT, sub_80CA74C compare_var_to_value VAR_RESULT, 7 - goto_if 5, EventScript_1A77A9 + goto_if ne, EventScript_1A77A9 removeobject VAR_LAST_TALKED return CeruleanCave_B1F_MapScript2_1624E7:: @ 81624E7 checkflag FLAG_0x2BC - call_if 0, EventScript_1624F1 + call_if lt, EventScript_1624F1 end EventScript_1624F1:: @ 81624F1 diff --git a/data/maps/CeruleanCity/scripts.inc b/data/maps/CeruleanCity/scripts.inc index f863a5178..f8f47bbb2 100644 --- a/data/maps/CeruleanCity/scripts.inc +++ b/data/maps/CeruleanCity/scripts.inc @@ -5,7 +5,7 @@ CeruleanCity_MapScripts:: @ 8166471 CeruleanCity_MapScript1_166477:: @ 8166477 setworldmapflag FLAG_WORLD_MAP_CERULEAN_CITY checkflag FLAG_GOT_SS_TICKET - call_if 0, EventScript_166484 + call_if lt, EventScript_166484 end EventScript_166484:: @ 8166484 @@ -44,21 +44,21 @@ EventScript_1664CC:: @ 81664CC msgbox gUnknown_817EAD7 setvar VAR_LAST_TALKED, 8 compare_var_to_value VAR_STARTER_MON, 2 - call_if 1, EventScript_166582 + call_if eq, EventScript_166582 compare_var_to_value VAR_STARTER_MON, 1 - call_if 1, EventScript_16658D + call_if eq, EventScript_16658D compare_var_to_value VAR_STARTER_MON, 0 - call_if 1, EventScript_166598 + call_if eq, EventScript_166598 famechecker FAMECHECKER_BILL, 0 msgbox gUnknown_817EB95 closemessage playbgm MUS_RIVAL2, 0 compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_1665A3 + call_if eq, EventScript_1665A3 compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_1665A3 + call_if eq, EventScript_1665A3 compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_1665B5 + call_if eq, EventScript_1665B5 msgbox gUnknown_817ECD4 setvar VAR_MAP_SCENE_CERULEAN_CITY_RIVAL, 1 setflag FLAG_0x29B @@ -284,11 +284,11 @@ CeruleanCity_EventScript_16674F:: @ 816674F random 3 copyvar VAR_0x8008, VAR_RESULT compare_var_to_value VAR_0x8008, 0 - call_if 1, EventScript_1667B0 + call_if eq, EventScript_1667B0 compare_var_to_value VAR_0x8008, 1 - call_if 1, EventScript_1667B6 + call_if eq, EventScript_1667B6 compare_var_to_value VAR_0x8008, 2 - call_if 1, EventScript_1667BC + call_if eq, EventScript_1667BC waitmessage delay 40 playse SE_PIN @@ -296,11 +296,11 @@ CeruleanCity_EventScript_16674F:: @ 816674F waitmovement 0 delay 30 compare_var_to_value VAR_0x8008, 0 - call_if 1, EventScript_1667C2 + call_if eq, EventScript_1667C2 compare_var_to_value VAR_0x8008, 1 - call_if 1, EventScript_1667CB + call_if eq, EventScript_1667CB compare_var_to_value VAR_0x8008, 2 - call_if 1, EventScript_1667D4 + call_if eq, EventScript_1667D4 release end @@ -333,13 +333,13 @@ CeruleanCity_EventScript_1667DD:: @ 81667DD random 4 copyvar VAR_0x8008, VAR_RESULT compare_var_to_value VAR_0x8008, 0 - call_if 1, EventScript_166814 + call_if eq, EventScript_166814 compare_var_to_value VAR_0x8008, 1 - call_if 1, EventScript_16681D + call_if eq, EventScript_16681D compare_var_to_value VAR_0x8008, 2 - call_if 1, EventScript_166826 + call_if eq, EventScript_166826 compare_var_to_value VAR_0x8008, 3 - call_if 1, EventScript_16682F + call_if eq, EventScript_16682F release end diff --git a/data/maps/CeruleanCity_Gym/scripts.inc b/data/maps/CeruleanCity_Gym/scripts.inc index c535e9850..f049f3167 100644 --- a/data/maps/CeruleanCity_Gym/scripts.inc +++ b/data/maps/CeruleanCity_Gym/scripts.inc @@ -5,7 +5,7 @@ CeruleanCity_Gym_EventScript_16AAA1:: @ 816AAA1 famechecker FAMECHECKER_MISTY, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 trainerbattle 1, TRAINER_LEADER_MISTY, 0, Text_1921EF, Text_19242D, EventScript_16AAD3 checkflag FLAG_0x297 - goto_if 0, EventScript_16AAF9 + goto_if lt, EventScript_16AAF9 msgbox gUnknown_81922BF release end diff --git a/data/maps/CeruleanCity_House3/scripts.inc b/data/maps/CeruleanCity_House3/scripts.inc index 1d7af5b1a..40f1a8104 100644 --- a/data/maps/CeruleanCity_House3/scripts.inc +++ b/data/maps/CeruleanCity_House3/scripts.inc @@ -17,10 +17,10 @@ CeruleanCity_House3_EventScript_16A9B1:: @ 816A9B1 goto_if_eq EventScript_16AA0B call EventScript_1A8CBD compare_var_to_value VAR_0x8004, 6 - goto_if 4, EventScript_16AA0B + goto_if ge, EventScript_16AA0B call EventScript_1A8CC9 compare_var_to_var VAR_RESULT, VAR_0x8009 - goto_if 5, EventScript_16AA15 + goto_if ne, EventScript_16AA15 call EventScript_1A8CD9 msgbox gUnknown_81A5A9D setflag FLAG_DID_ZYNX_TRADE diff --git a/data/maps/CeruleanCity_House5/scripts.inc b/data/maps/CeruleanCity_House5/scripts.inc index d7d3e0222..d929a38e6 100644 --- a/data/maps/CeruleanCity_House5/scripts.inc +++ b/data/maps/CeruleanCity_House5/scripts.inc @@ -10,7 +10,7 @@ CeruleanCity_House5_EventScript_16AE50:: @ 816AE50 compare_var_to_value VAR_RESULT, 0 goto_if_eq EventScript_16AEAD checkflag FLAG_0x847 - goto_if 0, EventScript_16AEA3 + goto_if lt, EventScript_16AEA3 msgbox gUnknown_8193003 setflag FLAG_0x2BB giveitem ITEM_POWDER_JAR diff --git a/data/maps/CinnabarIsland/scripts.inc b/data/maps/CinnabarIsland/scripts.inc index b2e7e48ae..8325073e3 100644 --- a/data/maps/CinnabarIsland/scripts.inc +++ b/data/maps/CinnabarIsland/scripts.inc @@ -7,11 +7,11 @@ CinnabarIsland_MapScript1_166EE1:: @ 8166EE1 setworldmapflag FLAG_WORLD_MAP_CINNABAR_ISLAND call EventScript_166F5E compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND, 1 - call_if 1, EventScript_166F24 + call_if eq, EventScript_166F24 compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND, 3 - call_if 1, EventScript_166F52 + call_if eq, EventScript_166F52 compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND_2, 1 - call_if 1, EventScript_166F0B + call_if eq, EventScript_166F0B end EventScript_166F0B:: @ 8166F0B @@ -25,7 +25,7 @@ EventScript_166F0B:: @ 8166F0B EventScript_166F24:: @ 8166F24 getplayerxy VAR_0x8004, VAR_0x8005 compare_var_to_value VAR_0x8004, 18 - goto_if 4, EventScript_166F4A + goto_if ge, EventScript_166F4A setflag FLAG_TEMP_2 setobjectxyperm 3, 18, 12 setobjectmovementtype 3, 7 @@ -94,18 +94,18 @@ EventScript_166FCD:: @ 8166FCD lockall textcolor 0 checkflag FLAG_TEMP_2 - call_if 0, EventScript_167032 + call_if lt, EventScript_167032 checkflag FLAG_TEMP_2 - call_if 1, EventScript_16703D + call_if eq, EventScript_16703D playse SE_PIN applymovement 3, Movement_1A75DB waitmovement 0 applymovement 3, Movement_1A75DD waitmovement 0 checkflag FLAG_TEMP_2 - call_if 0, EventScript_167048 + call_if lt, EventScript_167048 checkflag FLAG_TEMP_2 - call_if 1, EventScript_167053 + call_if eq, EventScript_167053 msgbox gUnknown_8180C90 msgbox gUnknown_8180CAA, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 @@ -147,9 +147,9 @@ EventScript_167078:: @ 8167078 msgbox gUnknown_8180DF8 closemessage checkflag FLAG_TEMP_2 - call_if 0, EventScript_1670A0 + call_if lt, EventScript_1670A0 checkflag FLAG_TEMP_2 - call_if 1, EventScript_1670B3 + call_if eq, EventScript_1670B3 removeobject 3 setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 2 clearflag FLAG_HIDE_CINNABAR_POKECENTER_BILL @@ -202,18 +202,18 @@ Movement_1670E2:: @ 81670E2 EventScript_1670E6:: @ 81670E6 checkflag FLAG_TEMP_2 - call_if 1, EventScript_167142 + call_if eq, EventScript_167142 addobject 4 checkflag FLAG_TEMP_2 - call_if 0, EventScript_167154 + call_if lt, EventScript_167154 checkflag FLAG_TEMP_2 - call_if 1, EventScript_167166 + call_if eq, EventScript_167166 msgbox gUnknown_8180EAD closemessage checkflag FLAG_TEMP_2 - call_if 0, EventScript_167171 + call_if lt, EventScript_167171 checkflag FLAG_TEMP_2 - call_if 1, EventScript_167183 + call_if eq, EventScript_167183 setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 2 removeobject 3 delay 40 diff --git a/data/maps/CinnabarIsland_Gym/scripts.inc b/data/maps/CinnabarIsland_Gym/scripts.inc index 9a60aaf42..156e7f101 100644 --- a/data/maps/CinnabarIsland_Gym/scripts.inc +++ b/data/maps/CinnabarIsland_Gym/scripts.inc @@ -6,17 +6,17 @@ CinnabarIsland_Gym_MapScript1_16D951:: @ 816D951 checkflag FLAG_DEFEATED_BLAINE goto_if_eq EventScript_16D991 checkflag FLAG_0x265 - call_if 1, EventScript_16D9B0 + call_if eq, EventScript_16D9B0 checkflag FLAG_0x267 - call_if 1, EventScript_16D9B6 + call_if eq, EventScript_16D9B6 checkflag FLAG_0x268 - call_if 1, EventScript_16D9BC + call_if eq, EventScript_16D9BC checkflag FLAG_0x269 - call_if 1, EventScript_16D9C2 + call_if eq, EventScript_16D9C2 checkflag FLAG_0x26A - call_if 1, EventScript_16D9C8 + call_if eq, EventScript_16D9C8 checkflag FLAG_0x26B - call_if 1, EventScript_16D9CE + call_if eq, EventScript_16D9CE end EventScript_16D991:: @ 816D991 @@ -56,7 +56,7 @@ CinnabarIsland_Gym_EventScript_16D9D4:: @ 816D9D4 famechecker FAMECHECKER_BLAINE, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 trainerbattle 1, TRAINER_LEADER_BLAINE, 0, Text_199543, Text_1995FA, EventScript_16DA06 checkflag FLAG_GOT_TM38_FROM_BLAINE - goto_if 0, EventScript_16DA34 + goto_if lt, EventScript_16DA34 msgbox gUnknown_819971D release end @@ -101,7 +101,7 @@ CinnabarIsland_Gym_EventScript_16DA96:: @ 816DA96 EventScript_16DAB1:: @ 816DAB1 checkflag FLAG_0x267 - call_if 0, EventScript_16DABC + call_if lt, EventScript_16DABC release end @@ -117,7 +117,7 @@ CinnabarIsland_Gym_EventScript_16DAC2:: @ 816DAC2 EventScript_16DAEA:: @ 816DAEA checkflag FLAG_0x269 - call_if 0, EventScript_16DAF5 + call_if lt, EventScript_16DAF5 release end @@ -132,7 +132,7 @@ CinnabarIsland_Gym_EventScript_16DAFB:: @ 816DAFB EventScript_16DB16:: @ 816DB16 checkflag FLAG_0x26B - call_if 0, EventScript_16DB21 + call_if lt, EventScript_16DB21 release end @@ -147,7 +147,7 @@ CinnabarIsland_Gym_EventScript_16DB27:: @ 816DB27 EventScript_16DB42:: @ 816DB42 checkflag FLAG_0x265 - call_if 0, EventScript_16DB4D + call_if lt, EventScript_16DB4D release end @@ -162,7 +162,7 @@ CinnabarIsland_Gym_EventScript_16DB53:: @ 816DB53 EventScript_16DB6E:: @ 816DB6E checkflag FLAG_0x268 - call_if 0, EventScript_16DB79 + call_if lt, EventScript_16DB79 release end @@ -177,7 +177,7 @@ CinnabarIsland_Gym_EventScript_16DB7F:: @ 816DB7F EventScript_16DB9A:: @ 816DB9A checkflag FLAG_0x26A - call_if 0, EventScript_16DBA5 + call_if lt, EventScript_16DBA5 release end @@ -270,15 +270,15 @@ EventScript_16DC68:: @ 816DC68 EventScript_16DC6A:: @ 816DC6A call EventScript_16DC34 checktrainerflag TRAINER_BURGLAR_QUINN - goto_if 0, EventScript_16DC7A + goto_if lt, EventScript_16DC7A releaseall end EventScript_16DC7A:: @ 816DC7A compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_16DCB4 + call_if eq, EventScript_16DCB4 compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_16DCC6 + call_if eq, EventScript_16DCC6 textcolor 0 msgbox gUnknown_819983F trainerbattle 3, TRAINER_BURGLAR_QUINN, 0, Text_199870 @@ -349,15 +349,15 @@ EventScript_16DD31:: @ 816DD31 EventScript_16DD41:: @ 816DD41 call EventScript_16DC34 checktrainerflag TRAINER_SUPER_NERD_AVERY - goto_if 0, EventScript_16DD51 + goto_if lt, EventScript_16DD51 releaseall end EventScript_16DD51:: @ 816DD51 compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_16DD8B + call_if eq, EventScript_16DD8B compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_16DD9D + call_if eq, EventScript_16DD9D textcolor 0 msgbox gUnknown_81998BD trainerbattle 3, TRAINER_SUPER_NERD_AVERY, 0, Text_1998ED @@ -437,15 +437,15 @@ EventScript_16DE0F:: @ 816DE0F EventScript_16DE1F:: @ 816DE1F call EventScript_16DC34 checktrainerflag TRAINER_BURGLAR_RAMON - goto_if 0, EventScript_16DE2F + goto_if lt, EventScript_16DE2F releaseall end EventScript_16DE2F:: @ 816DE2F compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_16DE69 + call_if eq, EventScript_16DE69 compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_16DE7B + call_if eq, EventScript_16DE7B textcolor 0 msgbox gUnknown_8199948 trainerbattle 3, TRAINER_BURGLAR_RAMON, 0, Text_199973 @@ -516,15 +516,15 @@ EventScript_16DEE6:: @ 816DEE6 EventScript_16DEF6:: @ 816DEF6 call EventScript_16DC34 checktrainerflag TRAINER_SUPER_NERD_DEREK - goto_if 0, EventScript_16DF06 + goto_if lt, EventScript_16DF06 releaseall end EventScript_16DF06:: @ 816DF06 compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_16DF40 + call_if eq, EventScript_16DF40 compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_16DF52 + call_if eq, EventScript_16DF52 textcolor 0 msgbox gUnknown_81999B7 trainerbattle 3, TRAINER_SUPER_NERD_DEREK, 0, Text_1999DB @@ -595,15 +595,15 @@ EventScript_16DFBD:: @ 816DFBD EventScript_16DFCD:: @ 816DFCD call EventScript_16DC34 checktrainerflag TRAINER_BURGLAR_DUSTY - goto_if 0, EventScript_16DFDD + goto_if lt, EventScript_16DFDD releaseall end EventScript_16DFDD:: @ 816DFDD compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_16E017 + call_if eq, EventScript_16E017 compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_16E029 + call_if eq, EventScript_16E029 textcolor 0 msgbox gUnknown_8199A7F trainerbattle 3, TRAINER_BURGLAR_DUSTY, 0, Text_199AB9 @@ -674,15 +674,15 @@ EventScript_16E094:: @ 816E094 EventScript_16E0A4:: @ 816E0A4 call EventScript_16DC34 checktrainerflag TRAINER_SUPER_NERD_ZAC - goto_if 0, EventScript_16E0B4 + goto_if lt, EventScript_16E0B4 releaseall end EventScript_16E0B4:: @ 816E0B4 compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_16E0EE + call_if eq, EventScript_16E0EE compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_16E100 + call_if eq, EventScript_16E100 textcolor 0 msgbox gUnknown_8199AFC trainerbattle 3, TRAINER_SUPER_NERD_ZAC, 0, Text_199B16 diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc index ae4c986bf..cac88d282 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc @@ -40,11 +40,11 @@ CinnabarIsland_PokemonCenter_1F_EventScript_16E90A:: @ 816E90A setflag FLAG_HIDE_CINNABAR_POKECENTER_BILL delay 20 compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_16E96F + call_if eq, EventScript_16E96F compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_16E981 + call_if eq, EventScript_16E981 compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_16E993 + call_if eq, EventScript_16E993 removeobject 7 setvar VAR_MAP_SCENE_CINNABAR_ISLAND_2, 1 clearflag FLAG_HIDE_CINNABAR_BILL diff --git a/data/maps/CinnabarIsland_PokemonLab_Entrance/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_Entrance/scripts.inc index f8f4bcbc6..780103629 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Entrance/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonLab_Entrance/scripts.inc @@ -4,7 +4,7 @@ CinnabarIsland_PokemonLab_Entrance_MapScripts:: @ 816E273 CinnabarIsland_PokemonLab_Entrance_MapScript1_16E279:: @ 816E279 compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 1 - call_if 1, EventScript_16E285 + call_if eq, EventScript_16E285 end EventScript_16E285:: @ 816E285 diff --git a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc index 18f18f6d2..d04b27089 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc @@ -13,10 +13,10 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E401:: @ 816E401 goto_if_eq EventScript_16E45B call EventScript_1A8CBD compare_var_to_value VAR_0x8004, 6 - goto_if 4, EventScript_16E45B + goto_if ge, EventScript_16E45B call EventScript_1A8CC9 compare_var_to_var VAR_RESULT, VAR_0x8009 - goto_if 5, EventScript_16E465 + goto_if ne, EventScript_16E465 call EventScript_1A8CD9 msgbox gUnknown_81A59DA setflag FLAG_0x276 @@ -44,7 +44,7 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E47D:: @ 816E47D faceplayer setvar VAR_RESULT, 0 checkflag FLAG_REVIVED_AMBER - call_if 1, EventScript_16E8A1 + call_if eq, EventScript_16E8A1 compare_var_to_value VAR_RESULT, 1 goto_if_eq EventScript_16E897 compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 2 @@ -66,7 +66,7 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E47D:: @ 816E47D EventScript_16E4EC:: @ 816E4EC checkflag FLAG_0x273 - goto_if 0, EventScript_16E534 + goto_if lt, EventScript_16E534 checkflag FLAG_REVIVED_HELIX goto_if_eq EventScript_16E534 setvar VAR_RESULT, 1 @@ -74,7 +74,7 @@ EventScript_16E4EC:: @ 816E4EC EventScript_16E504:: @ 816E504 checkflag FLAG_0x272 - goto_if 0, EventScript_16E534 + goto_if lt, EventScript_16E534 checkflag FLAG_REVIVED_DOME goto_if_eq EventScript_16E534 setvar VAR_RESULT, 1 @@ -82,7 +82,7 @@ EventScript_16E504:: @ 816E504 EventScript_16E51C:: @ 816E51C checkflag FLAG_0x25E - goto_if 0, EventScript_16E534 + goto_if lt, EventScript_16E534 checkflag FLAG_REVIVED_AMBER goto_if_eq EventScript_16E534 setvar VAR_RESULT, 1 @@ -310,12 +310,12 @@ EventScript_16E8A1:: @ 816E8A1 EventScript_16E8B9:: @ 816E8B9 checkflag FLAG_REVIVED_HELIX - goto_if 0, EventScript_16E534 + goto_if lt, EventScript_16E534 setvar VAR_RESULT, 1 return EventScript_16E8C8:: @ 816E8C8 checkflag FLAG_REVIVED_DOME - goto_if 0, EventScript_16E534 + goto_if lt, EventScript_16E534 setvar VAR_RESULT, 1 return diff --git a/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc index 651fe0c76..df5da6603 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc @@ -17,10 +17,10 @@ CinnabarIsland_PokemonLab_Lounge_EventScript_16E2C2:: @ 816E2C2 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 @@ -59,12 +59,12 @@ CinnabarIsland_PokemonLab_Lounge_EventScript_16E33E:: @ 816E33E 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 diff --git a/data/maps/FiveIsland_LostCave_Room10/scripts.inc b/data/maps/FiveIsland_LostCave_Room10/scripts.inc index 212740c6b..cd9123743 100644 --- a/data/maps/FiveIsland_LostCave_Room10/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Room10/scripts.inc @@ -5,7 +5,7 @@ FiveIsland_LostCave_Room10_MapScripts:: @ 8164C2D FiveIsland_LostCave_Room10_MapScript1_164C38:: @ 8164C38 checktrainerflag TRAINER_LADY_SELPHY - call_if 1, EventScript_164C42 + call_if eq, EventScript_164C42 end EventScript_164C42:: @ 8164C42 diff --git a/data/maps/FiveIsland_Meadow/scripts.inc b/data/maps/FiveIsland_Meadow/scripts.inc index 0caa8bcfe..d2ee2e4cb 100644 --- a/data/maps/FiveIsland_Meadow/scripts.inc +++ b/data/maps/FiveIsland_Meadow/scripts.inc @@ -4,7 +4,7 @@ FiveIsland_Meadow_MapScripts:: @ 8168932 FiveIsland_Meadow_MapScript1_168938:: @ 8168938 checkflag FLAG_0x2D6 - call_if 1, EventScript_168983 + call_if eq, EventScript_168983 end FiveIsland_Meadow_EventScript_168942:: @ 8168942 diff --git a/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc b/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc index 4f9abcadd..1b174b1cf 100644 --- a/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc +++ b/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc @@ -13,7 +13,7 @@ FiveIsland_ResortGorgeous_House_EventScript_171EBE:: @ 8171EBE compare_var_to_value VAR_STORAGE_UNKNOWN, 65535 goto_if_eq EventScript_171F0B compare_var_to_value VAR_STORAGE_UNKNOWN, 0 - goto_if 5, EventScript_171F19 + goto_if ne, EventScript_171F19 msgbox gUnknown_81A42A0 goto EventScript_171EFE end @@ -53,13 +53,13 @@ EventScript_171F34:: @ 8171F34 msgbox gUnknown_81A4566 closemessage compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_171FCD + call_if eq, EventScript_171FCD compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_171FE9 + call_if eq, EventScript_171FE9 compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_171FFE + call_if eq, EventScript_171FFE compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_17201A + call_if eq, EventScript_17201A moveobjectoffscreen 2 msgbox gUnknown_81A458E giveitem VAR_0x403B diff --git a/data/maps/FiveIsland_RocketWarehouse/scripts.inc b/data/maps/FiveIsland_RocketWarehouse/scripts.inc index d7bc829a7..294b33cb1 100644 --- a/data/maps/FiveIsland_RocketWarehouse/scripts.inc +++ b/data/maps/FiveIsland_RocketWarehouse/scripts.inc @@ -9,7 +9,7 @@ FiveIsland_RocketWarehouse_MapScript2_163F39:: @ 8163F39 FiveIsland_RocketWarehouse_MapScript1_163F3D:: @ 8163F3D checktrainerflag TRAINER_TEAM_ROCKET_ADMIN - call_if 1, EventScript_163F47 + call_if eq, EventScript_163F47 end EventScript_163F47:: @ 8163F47 @@ -79,7 +79,7 @@ FiveIsland_RocketWarehouse_EventScript_164014:: @ 8164014 EventScript_16402F:: @ 816402F getplayerxy VAR_0x8004, VAR_0x8005 compare_var_to_value VAR_0x8004, 24 - call_if 3, EventScript_164065 + call_if le, EventScript_164065 msgbox gUnknown_817BA64 closemessage fadescreen 1 @@ -113,29 +113,29 @@ EventScript_1640A2:: @ 81640A2 getplayerxy VAR_0x8004, VAR_0x8005 specialvar VAR_RESULT, GetPlayerFacingDirection compare_var_to_value VAR_RESULT, 2 - call_if 1, EventScript_16412E + call_if eq, EventScript_16412E msgbox gUnknown_817B7AE closemessage compare_var_to_value VAR_0x8004, 24 - call_if 3, EventScript_164144 + call_if le, EventScript_164144 compare_var_to_value VAR_0x8004, 25 - call_if 1, EventScript_16414F + call_if eq, EventScript_16414F compare_var_to_value VAR_0x8004, 26 - call_if 1, EventScript_16415A + call_if eq, EventScript_16415A compare_var_to_value VAR_0x8004, 27 - call_if 1, EventScript_16415A + call_if eq, EventScript_16415A playse SE_PIN call EventScript_163F47 special DrawWholeMapView waitse compare_var_to_value VAR_0x8004, 24 - call_if 3, EventScript_164165 + call_if le, EventScript_164165 compare_var_to_value VAR_0x8004, 25 - call_if 1, EventScript_164165 + call_if eq, EventScript_164165 compare_var_to_value VAR_0x8004, 26 - call_if 1, EventScript_164165 + call_if eq, EventScript_164165 compare_var_to_value VAR_0x8004, 27 - call_if 1, EventScript_164170 + call_if eq, EventScript_164170 msgbox gUnknown_817B7FA release end diff --git a/data/maps/FourIsland/scripts.inc b/data/maps/FourIsland/scripts.inc index 8256c4765..03a785e02 100644 --- a/data/maps/FourIsland/scripts.inc +++ b/data/maps/FourIsland/scripts.inc @@ -6,7 +6,7 @@ FourIsland_MapScripts:: @ 8167CAE FourIsland_MapScript1_167CB9:: @ 8167CB9 setworldmapflag FLAG_WORLD_MAP_FOUR_ISLAND compare_var_to_value VAR_MAP_SCENE_FOUR_ISLAND, 0 - call_if 1, EventScript_167CCD + call_if eq, EventScript_167CCD call EventScript_167CD1 end @@ -16,7 +16,7 @@ EventScript_167CCD:: @ 8167CCD EventScript_167CD1:: @ 8167CD1 checkflag FLAG_PENDING_DAYCARE_EGG - goto_if 0, EventScript_167CE1 + goto_if lt, EventScript_167CE1 setobjectxyperm 1, 16, 14 EventScript_167CE1:: @ 8167CE1 @@ -105,7 +105,7 @@ EventScript_167D9B:: @ 8167D9B EventScript_167DD1:: @ 8167DD1 specialvar VAR_RESULT, CalculatePlayerPartyCount compare_var_to_value VAR_RESULT, 6 - goto_if 5, EventScript_167DEB + goto_if ne, EventScript_167DEB msgbox gUnknown_81BF6F0 release end diff --git a/data/maps/FourIsland_IcefallCave_Back/scripts.inc b/data/maps/FourIsland_IcefallCave_Back/scripts.inc index d67ab3124..eadc1f469 100644 --- a/data/maps/FourIsland_IcefallCave_Back/scripts.inc +++ b/data/maps/FourIsland_IcefallCave_Back/scripts.inc @@ -4,7 +4,7 @@ FourIsland_IcefallCave_Back_MapScripts:: @ 8163D82 FourIsland_IcefallCave_Back_MapScript1_163D88:: @ 8163D88 compare_var_to_value VAR_MAP_SCENE_ICEFALL_CAVE_BACK, 1 - call_if 1, EventScript_163D94 + call_if eq, EventScript_163D94 end EventScript_163D94:: @ 8163D94 diff --git a/data/maps/FourIsland_PokemonDayCare/scripts.inc b/data/maps/FourIsland_PokemonDayCare/scripts.inc index 394b29334..a272aa5b3 100644 --- a/data/maps/FourIsland_PokemonDayCare/scripts.inc +++ b/data/maps/FourIsland_PokemonDayCare/scripts.inc @@ -30,7 +30,7 @@ EventScript_171993:: @ 8171993 special ChooseSendDaycareMon waitstate compare_var_to_value VAR_0x8004, 6 - goto_if 4, EventScript_1719F7 + goto_if ge, EventScript_1719F7 specialvar VAR_RESULT, CountPartyAliveNonEggMons_IgnoreVar0x8004Slot compare_var_to_value VAR_RESULT, 0 goto_if_eq EventScript_171A24 @@ -81,7 +81,7 @@ EventScript_171A38:: @ 8171A38 EventScript_171A41:: @ 8171A41 specialvar VAR_RESULT, GetNumLevelsGainedFromDaycare compare_var_to_value VAR_RESULT, 0 - call_if 5, EventScript_171A38 + call_if ne, EventScript_171A38 return EventScript_171A52:: @ 8171A52 diff --git a/data/maps/FuchsiaCity/scripts.inc b/data/maps/FuchsiaCity/scripts.inc index 78ed21f61..0d4369de9 100644 --- a/data/maps/FuchsiaCity/scripts.inc +++ b/data/maps/FuchsiaCity/scripts.inc @@ -5,9 +5,9 @@ FuchsiaCity_MapScripts:: @ 8166D75 FuchsiaCity_MapScript1_166D7B:: @ 8166D7B setworldmapflag FLAG_WORLD_MAP_FUCHSIA_CITY checkflag FLAG_0x272 - call_if 1, EventScript_166D91 + call_if eq, EventScript_166D91 checkflag FLAG_0x272 - call_if 0, EventScript_166D97 + call_if lt, EventScript_166D97 end EventScript_166D91:: @ 8166D91 diff --git a/data/maps/FuchsiaCity_Building1/scripts.inc b/data/maps/FuchsiaCity_Building1/scripts.inc index ec6548214..30405e80e 100644 --- a/data/maps/FuchsiaCity_Building1/scripts.inc +++ b/data/maps/FuchsiaCity_Building1/scripts.inc @@ -10,9 +10,9 @@ FuchsiaCity_Building1_EventScript_16D74C:: @ 816D74C goto_if_eq EventScript_16D780 msgbox gUnknown_8198DF9, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - call_if 1, EventScript_16D7E8 + call_if eq, EventScript_16D7E8 compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_16D7F1 + call_if eq, EventScript_16D7F1 release end @@ -26,9 +26,9 @@ EventScript_16D780:: @ 816D780 call EventScript_1A6675 checkplayergender compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_16D7D6 + call_if eq, EventScript_16D7D6 compare_var_to_value VAR_RESULT, 1 - call_if 1, EventScript_16D7DF + call_if eq, EventScript_16D7DF additem ITEM_HM04, 1 giveitemfanfaremsg gUnknown_8199068, ITEM_HM04 setflag FLAG_GOT_HM04 diff --git a/data/maps/FuchsiaCity_Gym/scripts.inc b/data/maps/FuchsiaCity_Gym/scripts.inc index e387effbb..d3e2df509 100644 --- a/data/maps/FuchsiaCity_Gym/scripts.inc +++ b/data/maps/FuchsiaCity_Gym/scripts.inc @@ -5,7 +5,7 @@ FuchsiaCity_Gym_EventScript_16D54E:: @ 816D54E famechecker FAMECHECKER_KOGA, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 trainerbattle 1, TRAINER_LEADER_KOGA, 0, Text_19832E, Text_198444, EventScript_16D580 checkflag FLAG_0x259 - goto_if 0, EventScript_16D5A6 + goto_if lt, EventScript_16D5A6 msgbox gUnknown_8198481 release end diff --git a/data/maps/FuchsiaCity_House3/scripts.inc b/data/maps/FuchsiaCity_House3/scripts.inc index e295ad46d..0cdb899b9 100644 --- a/data/maps/FuchsiaCity_House3/scripts.inc +++ b/data/maps/FuchsiaCity_House3/scripts.inc @@ -15,7 +15,7 @@ EventScript_16D8B0:: @ 816D8B0 special sub_80BF8FC waitstate compare_var_to_value VAR_0x8004, 6 - goto_if 4, EventScript_16D941 + goto_if ge, EventScript_16D941 special sub_80BFC14 compare_var_to_value VAR_RESULT, 1 goto_if_eq EventScript_16D937 diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc index d9bcea13d..326dba64c 100644 --- a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc +++ b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc @@ -127,11 +127,11 @@ EventScript_16D3CA:: @ 816D3CA .byte 0 .byte 0 compare_var_to_value VAR_0x4002, 0 - call_if 1, EventScript_16D44C + call_if eq, EventScript_16D44C compare_var_to_value VAR_0x4002, 1 - call_if 1, EventScript_16D441 + call_if eq, EventScript_16D441 compare_var_to_value VAR_0x4002, 2 - call_if 1, EventScript_16D457 + call_if eq, EventScript_16D457 special EnterSafariMode setvar VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 2 warp MAP_SAFARI_ZONE_CENTER, 255, 26, 30 @@ -156,7 +156,7 @@ EventScript_16D457:: @ 816D457 EventScript_16D462:: @ 816D462 countpokemon compare_var_to_value VAR_RESULT, 6 - goto_if 5, EventScript_1A77A9 + goto_if ne, EventScript_1A77A9 specialvar VAR_RESULT, sub_80CABD0 compare_var_to_value VAR_RESULT, 1 goto_if_eq EventScript_1A77A9 diff --git a/data/maps/IndigoPlateau_Exterior/scripts.inc b/data/maps/IndigoPlateau_Exterior/scripts.inc index a3112a2cf..aaeb0436f 100644 --- a/data/maps/IndigoPlateau_Exterior/scripts.inc +++ b/data/maps/IndigoPlateau_Exterior/scripts.inc @@ -6,7 +6,7 @@ IndigoPlateau_Exterior_MapScripts:: @ 816723B IndigoPlateau_Exterior_MapScript1_167246:: @ 8167246 setworldmapflag FLAG_WORLD_MAP_INDIGO_PLATEAU_EXTERIOR compare_var_to_value VAR_MAP_SCENE_INDIGO_PLATEAU_EXTERIOR, 1 - call_if 1, EventScript_167255 + call_if eq, EventScript_167255 end EventScript_167255:: @ 8167255 diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc b/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc index 048ca96d6..387180de0 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc +++ b/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc @@ -7,7 +7,7 @@ IndigoPlateau_PokemonCenter_1F_MapScript1_16EA65:: @ 816EA65 setrespawn SPAWN_INDIGO_PLATEAU specialvar VAR_RESULT, IsNationalPokedexEnabled compare_var_to_value VAR_RESULT, 1 - call_if 1, EventScript_16EA79 + call_if eq, EventScript_16EA79 end EventScript_16EA79:: @ 816EA79 diff --git a/data/maps/LavenderTown_House2/scripts.inc b/data/maps/LavenderTown_House2/scripts.inc index 0a5c708ab..f8d668e83 100644 --- a/data/maps/LavenderTown_House2/scripts.inc +++ b/data/maps/LavenderTown_House2/scripts.inc @@ -16,9 +16,9 @@ EventScript_16B287:: @ 816B287 special sub_80BF8FC waitstate compare_var_to_value VAR_0x8004, 6 - goto_if 0, EventScript_16B2B4 + goto_if lt, EventScript_16B2B4 compare_var_to_value VAR_0x8004, 6 - goto_if 4, EventScript_16B2AA + goto_if ge, EventScript_16B2AA end EventScript_16B2AA:: @ 816B2AA diff --git a/data/maps/MtEmber_Exterior/scripts.inc b/data/maps/MtEmber_Exterior/scripts.inc index 9aa791184..7c17eaa54 100644 --- a/data/maps/MtEmber_Exterior/scripts.inc +++ b/data/maps/MtEmber_Exterior/scripts.inc @@ -6,7 +6,7 @@ MtEmber_Exterior_MapScripts:: @ 8163946 MtEmber_Exterior_MapScript1_163951:: @ 8163951 setworldmapflag FLAG_WORLD_MAP_MT_EMBER_EXTERIOR compare_var_to_value VAR_MAP_SCENE_MT_EMBER_EXTERIOR, 2 - call_if 1, EventScript_163960 + call_if eq, EventScript_163960 end EventScript_163960:: @ 8163960 @@ -16,7 +16,7 @@ EventScript_163960:: @ 8163960 MtEmber_Exterior_MapScript2_163969:: @ 8163969 compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4 - call_if 4, EventScript_163975 + call_if ge, EventScript_163975 end EventScript_163975:: @ 8163975 diff --git a/data/maps/MtEmber_Summit/scripts.inc b/data/maps/MtEmber_Summit/scripts.inc index d1330d5ce..90816ad4a 100644 --- a/data/maps/MtEmber_Summit/scripts.inc +++ b/data/maps/MtEmber_Summit/scripts.inc @@ -5,19 +5,19 @@ MtEmber_Summit_MapScripts:: @ 8163AFC MtEmber_Summit_MapScript2_163B07:: @ 8163B07 checkflag FLAG_0x807 - call_if 1, EventScript_163B11 + call_if eq, EventScript_163B11 end EventScript_163B11:: @ 8163B11 specialvar VAR_RESULT, sub_80CA74C compare_var_to_value VAR_RESULT, 7 - goto_if 5, EventScript_1A77A9 + goto_if ne, EventScript_1A77A9 removeobject VAR_LAST_TALKED return MtEmber_Summit_MapScript1_163B25:: @ 8163B25 checkflag FLAG_0x2BD - call_if 0, EventScript_163B2F + call_if lt, EventScript_163B2F end EventScript_163B2F:: @ 8163B2F diff --git a/data/maps/MtMoon_B2F/scripts.inc b/data/maps/MtMoon_B2F/scripts.inc index 5792deb38..b8a4d1efb 100644 --- a/data/maps/MtMoon_B2F/scripts.inc +++ b/data/maps/MtMoon_B2F/scripts.inc @@ -4,7 +4,7 @@ MtMoon_B2F_MapScripts:: @ 8160699 MtMoon_B2F_MapScript1_16069F:: @ 816069F checkflag FLAG_GOT_FOSSIL_FROM_MT_MOON - call_if 0, EventScript_1606A9 + call_if lt, EventScript_1606A9 end EventScript_1606A9:: @ 81606A9 diff --git a/data/maps/NavelRock_Base/scripts.inc b/data/maps/NavelRock_Base/scripts.inc index 9d8d892f2..c36118bb4 100644 --- a/data/maps/NavelRock_Base/scripts.inc +++ b/data/maps/NavelRock_Base/scripts.inc @@ -5,9 +5,9 @@ NavelRock_Base_MapScripts:: @ 81650E7 NavelRock_Base_MapScript1_1650F2:: @ 81650F2 checkflag FLAG_0x2F2 - call_if 1, EventScript_165105 + call_if eq, EventScript_165105 checkflag FLAG_0x2F2 - call_if 0, EventScript_165109 + call_if lt, EventScript_165109 end EventScript_165105:: @ 8165105 @@ -22,13 +22,13 @@ EventScript_165109:: @ 8165109 NavelRock_Base_MapScript2_165116:: @ 8165116 checkflag FLAG_0x807 - call_if 1, EventScript_165120 + call_if eq, EventScript_165120 end EventScript_165120:: @ 8165120 specialvar VAR_RESULT, sub_80CA74C compare_var_to_value VAR_RESULT, 7 - goto_if 5, EventScript_1A77A9 + goto_if ne, EventScript_1A77A9 removeobject 1 return diff --git a/data/maps/NavelRock_Summit/scripts.inc b/data/maps/NavelRock_Summit/scripts.inc index ad89031bb..250334b91 100644 --- a/data/maps/NavelRock_Summit/scripts.inc +++ b/data/maps/NavelRock_Summit/scripts.inc @@ -5,9 +5,9 @@ NavelRock_Summit_MapScripts:: @ 8164F9F NavelRock_Summit_MapScript1_164FAA:: @ 8164FAA checkflag FLAG_0x2F3 - call_if 1, EventScript_164FBD + call_if eq, EventScript_164FBD checkflag FLAG_0x2F3 - call_if 0, EventScript_164FC6 + call_if lt, EventScript_164FC6 end EventScript_164FBD:: @ 8164FBD @@ -25,13 +25,13 @@ EventScript_164FC6:: @ 8164FC6 NavelRock_Summit_MapScript2_164FDD:: @ 8164FDD checkflag FLAG_0x807 - call_if 1, EventScript_164FE7 + call_if eq, EventScript_164FE7 end EventScript_164FE7:: @ 8164FE7 specialvar VAR_RESULT, sub_80CA74C compare_var_to_value VAR_RESULT, 7 - goto_if 5, EventScript_1A77A9 + goto_if ne, EventScript_1A77A9 removeobject 1 return diff --git a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc index 32f26b119..d325b9010 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc @@ -7,9 +7,9 @@ OneIsland_PokemonCenter_1F_MapScripts:: @ 8170BF8 OneIsland_PokemonCenter_1F_MapScript3_170C0D:: @ 8170C0D compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 - call_if 4, EventScript_170C22 + call_if ge, EventScript_170C22 checkflag FLAG_0x844 - call_if 1, EventScript_170C36 + call_if eq, EventScript_170C36 end EventScript_170C22:: @ 8170C22 @@ -29,11 +29,11 @@ EventScript_170C36:: @ 8170C36 OneIsland_PokemonCenter_1F_MapScript1_170C4E:: @ 8170C4E setrespawn SPAWN_ONE_ISLAND compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 6 - call_if 1, EventScript_170C73 + call_if eq, EventScript_170C73 compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 0 - call_if 1, EventScript_170C79 + call_if eq, EventScript_170C79 compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 2 - call_if 1, EventScript_170C90 + call_if eq, EventScript_170C90 end EventScript_170C73:: @ 8170C73 @@ -85,9 +85,9 @@ EventScript_170CB1:: @ 8170CB1 applymovement 255, Movement_1A75EB waitmovement 0 checkflag FLAG_SYS_GAME_CLEAR - call_if 1, EventScript_170E34 + call_if eq, EventScript_170E34 checkflag FLAG_SYS_GAME_CLEAR - call_if 0, EventScript_170E3D + call_if lt, EventScript_170E3D applymovement 3, Movement_1A75ED waitmovement 0 msgbox gUnknown_81A0E17 @@ -113,9 +113,9 @@ EventScript_170CB1:: @ 8170CB1 giveitemfanfaremsg gUnknown_81A231B, ITEM_TRI_PASS, 1, MUS_FAN5 msgbox gUnknown_81A1150 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 - call_if 4, EventScript_170E46 + call_if ge, EventScript_170E46 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 - call_if 0, EventScript_170E58 + call_if lt, EventScript_170E58 setflag FLAG_0x845 msgbox gUnknown_81A1230 closemessage @@ -467,13 +467,13 @@ EventScript_1711DA:: @ 81711DA msgbox gUnknown_81A13B8 closemessage compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_1712E4 + call_if eq, EventScript_1712E4 compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_1712EF + call_if eq, EventScript_1712EF compare_var_to_value VAR_0x4001, 3 - call_if 1, EventScript_1712FA + call_if eq, EventScript_1712FA compare_var_to_value VAR_0x4001, 4 - call_if 1, EventScript_171305 + call_if eq, EventScript_171305 delay 10 msgbox gUnknown_81A13CB applymovement 255, Movement_1A75ED diff --git a/data/maps/PalletTown/scripts.inc b/data/maps/PalletTown/scripts.inc index a93511b60..860b6e508 100644 --- a/data/maps/PalletTown/scripts.inc +++ b/data/maps/PalletTown/scripts.inc @@ -6,18 +6,18 @@ PalletTown_MapScripts:: @ 816545A PalletTown_MapScript1_165465:: @ 8165465 setworldmapflag FLAG_WORLD_MAP_PALLET_TOWN checkflag FLAG_0x291 - call_if 1, EventScript_165488 + call_if eq, EventScript_165488 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 0 - call_if 1, EventScript_1654A8 + call_if eq, EventScript_1654A8 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1 - call_if 1, EventScript_1654A2 + call_if eq, EventScript_1654A2 end EventScript_165488:: @ 8165488 checkflag FLAG_PALLET_TOWN_LADY_MOVED_FROM_SIGN - goto_if 0, EventScript_1A77A9 + goto_if lt, EventScript_1A77A9 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1 - goto_if 4, EventScript_1A77A9 + goto_if ge, EventScript_1A77A9 setvar VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1 return @@ -51,7 +51,7 @@ EventScript_1654D8:: @ 81654D8 applymovement 3, Movement_1655AF waitmovement 0 checkflag FLAG_WORLD_MAP_ONE_ISLAND - goto_if 0, EventScript_1655A1 + goto_if lt, EventScript_1655A1 msgbox gUnknown_817D8BF setvar VAR_0x8004, 0 specialvar VAR_RESULT, Special_GetPokedexCount @@ -60,7 +60,7 @@ EventScript_1654D8:: @ 81654D8 getnumberstring 0, VAR_0x8008 getnumberstring 1, VAR_0x8009 compare_var_to_value VAR_0x8009, 60 - goto_if 0, EventScript_165593 + goto_if lt, EventScript_165593 msgbox gUnknown_817D9AA closemessage playbgm MUS_ANNAI, 0 @@ -200,17 +200,17 @@ EventScript_165605:: @ 8165605 delay 30 addobject 3 compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_1656B8 + call_if eq, EventScript_1656B8 compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_1656C3 + call_if eq, EventScript_1656C3 delay 30 msgbox gUnknown_817D74A closemessage delay 30 compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_1656CE + call_if eq, EventScript_1656CE compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_1656E0 + call_if eq, EventScript_1656E0 opendoor 16, 13 waitdooranim applymovement 3, Movement_16572E @@ -393,9 +393,9 @@ PalletTown_EventScript_16575C:: @ 816575C msgbox gUnknown_81B1C9F closemessage compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_1657D7 + call_if eq, EventScript_1657D7 compare_var_to_value VAR_FACING, 4 - call_if 5, EventScript_1657E2 + call_if ne, EventScript_1657E2 moveobjectoffscreen 1 setflag FLAG_TEMP_2 release diff --git a/data/maps/PalletTown_GarysHouse/scripts.inc b/data/maps/PalletTown_GarysHouse/scripts.inc index 1298689f5..e01aea334 100644 --- a/data/maps/PalletTown_GarysHouse/scripts.inc +++ b/data/maps/PalletTown_GarysHouse/scripts.inc @@ -4,9 +4,9 @@ PalletTown_GarysHouse_MapScripts:: @ 8168D27 PalletTown_GarysHouse_MapScript1_168D2D:: @ 8168D2D compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 - call_if 0, EventScript_168D44 + call_if lt, EventScript_168D44 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 - call_if 4, EventScript_168D50 + call_if ge, EventScript_168D50 end EventScript_168D44:: @ 8168D44 @@ -31,7 +31,7 @@ PalletTown_GarysHouse_EventScript_168D56:: @ 8168D56 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 1 goto_if_eq EventScript_168EF6 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1 - goto_if 4, EventScript_168DAF + goto_if ge, EventScript_168DAF msgbox gUnknown_818D58C closemessage applymovement 1, Movement_1A75E5 @@ -50,7 +50,7 @@ EventScript_168DB9:: @ 8168DB9 goto_if_eq EventScript_1A7AE0 special sub_8112364 compare_var_to_value VAR_0x4025, 500 - goto_if 0, EventScript_168E46 + goto_if lt, EventScript_168E46 msgbox gUnknown_818D7D3, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 goto_if_eq EventScript_168E3C @@ -60,7 +60,7 @@ EventScript_168DB9:: @ 8168DB9 lock faceplayer compare_var_to_value VAR_0x8004, 6 - goto_if 4, EventScript_168E3C + goto_if ge, EventScript_168E3C specialvar VAR_RESULT, sub_80CAD54 compare_var_to_value VAR_RESULT, SPECIES_EGG goto_if_eq EventScript_168E32 diff --git a/data/maps/PalletTown_PlayersHouse_1F/scripts.inc b/data/maps/PalletTown_PlayersHouse_1F/scripts.inc index 89eabeea1..e988c9c9c 100644 --- a/data/maps/PalletTown_PlayersHouse_1F/scripts.inc +++ b/data/maps/PalletTown_PlayersHouse_1F/scripts.inc @@ -8,9 +8,9 @@ PalletTown_PlayersHouse_1F_EventScript_168C09:: @ 8168C09 goto_if_eq EventScript_168C4A checkplayergender compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_168C38 + call_if eq, EventScript_168C38 compare_var_to_value VAR_RESULT, 1 - call_if 1, EventScript_168C41 + call_if eq, EventScript_168C41 closemessage applymovement 1, Movement_1A75E5 waitmovement 0 @@ -44,9 +44,9 @@ PalletTown_PlayersHouse_1F_EventScript_168C62:: @ 8168C62 EventScript_168C78:: @ 8168C78 checkplayergender compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_168C91 + call_if eq, EventScript_168C91 compare_var_to_value VAR_RESULT, 1 - call_if 1, EventScript_168C9A + call_if eq, EventScript_168C9A releaseall end diff --git a/data/maps/PalletTown_PlayersHouse_2F/scripts.inc b/data/maps/PalletTown_PlayersHouse_2F/scripts.inc index 51865301c..3b7d6876f 100644 --- a/data/maps/PalletTown_PlayersHouse_2F/scripts.inc +++ b/data/maps/PalletTown_PlayersHouse_2F/scripts.inc @@ -5,7 +5,7 @@ PalletTown_PlayersHouse_2F_MapScripts:: @ 8168CA3 PalletTown_PlayersHouse_2F_MapScript1_168CAE:: @ 8168CAE compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PLAYERS_HOUSE_2F, 0 - call_if 1, EventScript_168CBA + call_if eq, EventScript_168CBA end EventScript_168CBA:: @ 8168CBA diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc index ba871583c..865b72335 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc +++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc @@ -7,13 +7,13 @@ PalletTown_ProfessorOaksLab_MapScripts:: @ 8168F7E PalletTown_ProfessorOaksLab_MapScript1_168F8E:: @ 8168F8E setflag FLAG_0x2CF compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1 - call_if 1, EventScript_168FC6 + call_if eq, EventScript_168FC6 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 7 - call_if 1, EventScript_168FD5 + call_if eq, EventScript_168FD5 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 8 - call_if 1, EventScript_168FC0 + call_if eq, EventScript_168FC0 checkflag FLAG_GOT_POKEBALLS_FROM_OAK_AFTER_22_RIVAL - call_if 1, EventScript_168FBC + call_if eq, EventScript_168FBC end EventScript_168FBC:: @ 8168FBC @@ -67,32 +67,32 @@ EventScript_169035:: @ 8169035 msgbox gUnknown_818EE60 closemessage compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_169174 + call_if eq, EventScript_169174 compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_1691BB + call_if eq, EventScript_1691BB compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_169194 + call_if eq, EventScript_169194 compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_169194 + call_if eq, EventScript_169194 msgbox gUnknown_818EF59 fadedefaultbgm msgbox gUnknown_818F004 compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_1691DB + call_if eq, EventScript_1691DB compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_1691E6 + call_if eq, EventScript_1691E6 textcolor 3 msgbox gUnknown_818F062 closemessage call EventScript_1A6675 compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_1691F1 + call_if eq, EventScript_1691F1 compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_1691FC + call_if eq, EventScript_1691FC compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_169215 + call_if eq, EventScript_169215 compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_169227 + call_if eq, EventScript_169227 addobject 9 addobject 10 delay 30 @@ -102,13 +102,13 @@ EventScript_169035:: @ 8169035 removeobject 10 delay 30 compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_169845 + call_if eq, EventScript_169845 compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_169850 + call_if eq, EventScript_169850 compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_16985B + call_if eq, EventScript_16985B compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_16986D + call_if eq, EventScript_16986D textcolor 3 playfanfare MUS_FAN5 message Text_18F0E8 @@ -121,13 +121,13 @@ EventScript_169035:: @ 8169035 closemessage playbgm MUS_RIVAL2, 0 compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_169B69 + call_if eq, EventScript_169B69 compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_169B7B + call_if eq, EventScript_169B7B compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_169B7B + call_if eq, EventScript_169B7B compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_169B7B + call_if eq, EventScript_169B7B removeobject 8 fadedefaultbgm setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 8 @@ -493,11 +493,11 @@ EventScript_1694C2:: @ 81694C2 closemessage playbgm MUS_RIVAL2, 0 compare_var_to_value VAR_0x4002, 1 - call_if 1, EventScript_169504 + call_if eq, EventScript_169504 compare_var_to_value VAR_0x4002, 2 - call_if 1, EventScript_169516 + call_if eq, EventScript_169516 compare_var_to_value VAR_0x4002, 3 - call_if 1, EventScript_169528 + call_if eq, EventScript_169528 removeobject 8 playse SE_KAIDAN fadedefaultbgm @@ -608,7 +608,7 @@ PalletTown_ProfessorOaksLab_EventScript_169595:: @ 8169595 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 6 goto_if_eq EventScript_1698D6 compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 1 - goto_if 4, EventScript_16961E + goto_if ge, EventScript_16961E compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 4 goto_if_eq EventScript_169614 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 @@ -646,13 +646,13 @@ EventScript_16961E:: @ 816961E msgbox gUnknown_818DE8D closemessage compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_169A82 + call_if eq, EventScript_169A82 compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_169AC1 + call_if eq, EventScript_169AC1 compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_169A9E + call_if eq, EventScript_169A9E compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_169A9E + call_if eq, EventScript_169A9E fadedefaultbgm msgbox gUnknown_818DE99 closemessage @@ -663,23 +663,23 @@ EventScript_16961E:: @ 816961E applymovement 4, Movement_1A75DD waitmovement 0 compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_169ADD + call_if eq, EventScript_169ADD compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_169B14 + call_if eq, EventScript_169B14 compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_169AF5 + call_if eq, EventScript_169AF5 compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_169B86 + call_if eq, EventScript_169B86 msgbox gUnknown_818E508 closemessage compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_169882 + call_if eq, EventScript_169882 compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_16988D + call_if eq, EventScript_16988D compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_1698A6 + call_if eq, EventScript_1698A6 compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_1698B8 + call_if eq, EventScript_1698B8 msgbox gUnknown_818E536 closemessage delay 40 @@ -692,13 +692,13 @@ EventScript_16961E:: @ 816961E removeobject 10 delay 25 compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_169845 + call_if eq, EventScript_169845 compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_169850 + call_if eq, EventScript_169850 compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_16985B + call_if eq, EventScript_16985B compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_16986D + call_if eq, EventScript_16986D delay 10 textcolor 3 playfanfare MUS_FAN5 @@ -717,24 +717,24 @@ EventScript_16961E:: @ 816961E msgbox gUnknown_818E784 msgbox gUnknown_818DEC8 compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_169B33 + call_if eq, EventScript_169B33 compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_169B45 + call_if eq, EventScript_169B45 compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_169B57 + call_if eq, EventScript_169B57 compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_169B57 + call_if eq, EventScript_169B57 msgbox gUnknown_818DEF3 closemessage playbgm MUS_RIVAL2, 0 compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_169B69 + call_if eq, EventScript_169B69 compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_169B7B + call_if eq, EventScript_169B7B compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_169B7B + call_if eq, EventScript_169B7B compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_169B7B + call_if eq, EventScript_169B7B removeobject 8 fadedefaultbgm setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 6 @@ -857,13 +857,13 @@ EventScript_169913:: @ 8169913 message Text_1A7291 waitmessage compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_169964 + call_if eq, EventScript_169964 compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_16996F + call_if eq, EventScript_16996F compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_16997A + call_if eq, EventScript_16997A compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_169985 + call_if eq, EventScript_169985 applymovement 4, Movement_1A75E1 waitmovement 0 closemessage @@ -971,9 +971,9 @@ EventScript_1699CE:: @ 81699CE call EventScript_1A737B closemessage compare_var_to_value VAR_0x8009, 60 - goto_if 0, EventScript_1699F9 + goto_if lt, EventScript_1699F9 checkflag FLAG_WORLD_MAP_ONE_ISLAND - goto_if 0, EventScript_1699F9 + goto_if lt, EventScript_1699F9 delay 30 msgbox gUnknown_818EDF5 goto EventScript_169035 @@ -1000,7 +1000,7 @@ EventScript_1699FB:: @ 81699FB EventScript_169A34:: @ 8169A34 compare_var_to_value VAR_MAP_SCENE_ROUTE22, 2 - goto_if 4, EventScript_169A45 + goto_if ge, EventScript_169A45 goto EventScript_169A6E end @@ -1154,7 +1154,7 @@ PalletTown_ProfessorOaksLab_EventScript_169BAB:: @ 8169BAB setvar VAR_OAKSLAB_RIVAL_STARTER_SPECIES, SPECIES_CHARMANDER setvar VAR_OAKSLAB_RIVAL_STARTER_OBJID, 7 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 - goto_if 4, EventScript_169DE4 + goto_if ge, EventScript_169DE4 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2 goto_if_eq EventScript_169BE1 msgbox gUnknown_818EA19 @@ -1270,7 +1270,7 @@ Movement_RivalTakesHisStarter:: @ 8169D2F waitfanfare setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 checkflag FLAG_PALLET_TOWN_LADY_MOVED_FROM_SIGN - call_if 1, EventScript_169D5C + call_if eq, EventScript_169D5C release end @@ -1314,7 +1314,7 @@ PalletTown_ProfessorOaksLab_EventScript_169D78:: @ 8169D78 setvar VAR_OAKSLAB_RIVAL_STARTER_SPECIES, SPECIES_BULBASAUR setvar VAR_OAKSLAB_RIVAL_STARTER_OBJID, 5 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 - goto_if 4, EventScript_169DE4 + goto_if ge, EventScript_169DE4 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2 goto_if_eq EventScript_169BE1 msgbox gUnknown_818EA19 @@ -1329,7 +1329,7 @@ PalletTown_ProfessorOaksLab_EventScript_169DAE:: @ 8169DAE setvar VAR_OAKSLAB_RIVAL_STARTER_SPECIES, SPECIES_SQUIRTLE setvar VAR_OAKSLAB_RIVAL_STARTER_OBJID, 6 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 - goto_if 4, EventScript_169DE4 + goto_if ge, EventScript_169DE4 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2 goto_if_eq EventScript_169BE1 msgbox gUnknown_818EA19 @@ -1394,7 +1394,7 @@ PalletTown_ProfessorOaksLab_EventScript_169E71:: @ 8169E71 PalletTown_ProfessorOaksLab_EventScript_169E7A:: @ 8169E7A lockall compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 6 - goto_if 4, EventScript_169E90 + goto_if ge, EventScript_169E90 msgbox gUnknown_818EA84 releaseall end diff --git a/data/maps/PewterCity/scripts.inc b/data/maps/PewterCity/scripts.inc index 6d61fd0a1..6e50aefda 100644 --- a/data/maps/PewterCity/scripts.inc +++ b/data/maps/PewterCity/scripts.inc @@ -14,7 +14,7 @@ PewterCity_EventScript_165B9D:: @ 8165B9D closemessage playbgm MUS_ANNAI, 0 compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_165BD3 + call_if eq, EventScript_165BD3 msgbox gUnknown_817E6C7 closemessage applymovement 5, Movement_165D83 @@ -446,11 +446,11 @@ EventScript_165DBE:: @ 8165DBE closemessage playbgm MUS_ANNAI, 0 compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_165E0A + call_if eq, EventScript_165E0A compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_165E26 + call_if eq, EventScript_165E26 compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_165E42 + call_if eq, EventScript_165E42 msgbox gUnknown_817E6C7 closemessage applymovement 5, Movement_165D83 @@ -1039,13 +1039,13 @@ PewterCity_EventScript_16607E:: @ 816607E delay 10 playbgm MUS_ANNAI, 0 compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_1660EE + call_if eq, EventScript_1660EE compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_166100 + call_if eq, EventScript_166100 compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_166112 + call_if eq, EventScript_166112 compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_166124 + call_if eq, EventScript_166124 msgbox gUnknown_817E5AC closemessage delay 10 @@ -1417,11 +1417,11 @@ PewterCity_EventScript_1662D1:: @ 81662D1 EventScript_1662DE:: @ 81662DE textcolor 0 compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_1663CA + call_if eq, EventScript_1663CA compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_1663CA + call_if eq, EventScript_1663CA compare_var_to_value VAR_0x4001, 3 - call_if 1, EventScript_1663CA + call_if eq, EventScript_1663CA waitse playse SE_PIN applymovement 7, Movement_1A75DB @@ -1430,13 +1430,13 @@ EventScript_1662DE:: @ 81662DE waitmovement 0 msgbox gUnknown_817E902 compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_1663D5 + call_if eq, EventScript_1663D5 compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_1663DA + call_if eq, EventScript_1663DA compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_1663E6 + call_if eq, EventScript_1663E6 compare_var_to_value VAR_0x4001, 3 - call_if 1, EventScript_1663FC + call_if eq, EventScript_1663FC msgbox gUnknown_817E90C textcolor 3 playfanfare MUS_FAN5 @@ -1452,13 +1452,13 @@ EventScript_1662DE:: @ 81662DE msgbox gUnknown_817EA06 closemessage compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_166412 + call_if eq, EventScript_166412 compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_16641D + call_if eq, EventScript_16641D compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_166428 + call_if eq, EventScript_166428 compare_var_to_value VAR_0x4001, 3 - call_if 1, EventScript_166433 + call_if eq, EventScript_166433 delay 30 textcolor 3 msgbox gUnknown_817EA36 diff --git a/data/maps/PewterCity_Gym/scripts.inc b/data/maps/PewterCity_Gym/scripts.inc index f3b88fc00..96982e762 100644 --- a/data/maps/PewterCity_Gym/scripts.inc +++ b/data/maps/PewterCity_Gym/scripts.inc @@ -5,7 +5,7 @@ PewterCity_Gym_EventScript_16A593:: @ 816A593 famechecker FAMECHECKER_BROCK, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 trainerbattle 1, TRAINER_LEADER_BROCK, 0, Text_190CD4, Text_190E4F, EventScript_16A5C5 checkflag FLAG_0x254 - goto_if 0, EventScript_16A5F3 + goto_if lt, EventScript_16A5F3 msgbox gUnknown_819110F release end diff --git a/data/maps/PewterCity_Museum_1F/scripts.inc b/data/maps/PewterCity_Museum_1F/scripts.inc index 3b83cbf3a..75bb76b8e 100644 --- a/data/maps/PewterCity_Museum_1F/scripts.inc +++ b/data/maps/PewterCity_Museum_1F/scripts.inc @@ -82,11 +82,11 @@ EventScript_16A402:: @ 816A402 goto_if_eq EventScript_16A476 closemessage compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_16A455 + call_if eq, EventScript_16A455 compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_16A460 + call_if eq, EventScript_16A460 compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_16A46B + call_if eq, EventScript_16A46B playse SE_SHOP takemoney 50, 0 updatemoneybox 0, 0, 0 diff --git a/data/maps/PokemonLeague_AgathasRoom/scripts.inc b/data/maps/PokemonLeague_AgathasRoom/scripts.inc index 3e7a3b9cc..f06e28e73 100644 --- a/data/maps/PokemonLeague_AgathasRoom/scripts.inc +++ b/data/maps/PokemonLeague_AgathasRoom/scripts.inc @@ -12,9 +12,9 @@ PokemonLeague_AgathasRoom_MapScript1_162825:: @ 8162825 PokemonLeague_AgathasRoom_MapScript2_162830:: @ 8162830 checkflag FLAG_DEFEATED_AGATHA - call_if 1, EventScript_16284B + call_if eq, EventScript_16284B compare_var_to_value VAR_MAP_SCENE_POKEMON_LEAGUE, 3 - call_if 1, EventScript_162845 + call_if eq, EventScript_162845 end EventScript_162845:: @ 8162845 @@ -54,15 +54,15 @@ PokemonLeague_AgathasRoom_EventScript_162877:: @ 8162877 famechecker FAMECHECKER_AGATHA, 4 famechecker FAMECHECKER_OAK, 4 checkflag FLAG_SYS_GAME_CLEAR - call_if 0, EventScript_1628E9 + call_if lt, EventScript_1628E9 checkflag FLAG_SYS_GAME_CLEAR - call_if 1, EventScript_1628F2 + call_if eq, EventScript_1628F2 setflag FLAG_TEMP_3 setflag FLAG_TEMP_5 checkflag FLAG_0x844 - call_if 0, EventScript_1628FB + call_if lt, EventScript_1628FB checkflag FLAG_0x844 - call_if 1, EventScript_162906 + call_if eq, EventScript_162906 clearflag FLAG_TEMP_5 goto EventScript_16291B diff --git a/data/maps/PokemonLeague_BrunosRoom/scripts.inc b/data/maps/PokemonLeague_BrunosRoom/scripts.inc index 3e007f7e0..a6196699f 100644 --- a/data/maps/PokemonLeague_BrunosRoom/scripts.inc +++ b/data/maps/PokemonLeague_BrunosRoom/scripts.inc @@ -12,9 +12,9 @@ PokemonLeague_BrunosRoom_MapScript1_16269A:: @ 816269A PokemonLeague_BrunosRoom_MapScript2_1626A5:: @ 81626A5 checkflag FLAG_DEFEATED_BRUNO - call_if 1, EventScript_1626C0 + call_if eq, EventScript_1626C0 compare_var_to_value VAR_MAP_SCENE_POKEMON_LEAGUE, 2 - call_if 1, EventScript_1626BA + call_if eq, EventScript_1626BA end EventScript_1626BA:: @ 81626BA @@ -53,15 +53,15 @@ PokemonLeague_BrunosRoom_EventScript_1626EC:: @ 81626EC famechecker FAMECHECKER_BRUNO, 0 famechecker FAMECHECKER_BRUNO, 1 checkflag FLAG_SYS_GAME_CLEAR - call_if 0, EventScript_162751 + call_if lt, EventScript_162751 checkflag FLAG_SYS_GAME_CLEAR - call_if 1, EventScript_16275A + call_if eq, EventScript_16275A setflag FLAG_TEMP_3 setflag FLAG_TEMP_5 checkflag FLAG_0x844 - call_if 0, EventScript_162763 + call_if lt, EventScript_162763 checkflag FLAG_0x844 - call_if 1, EventScript_16276E + call_if eq, EventScript_16276E clearflag FLAG_TEMP_5 goto EventScript_1627B0 @@ -88,13 +88,13 @@ EventScript_162779:: @ 8162779 msgbox gUnknown_8178420 closemessage compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_1627FA + call_if eq, EventScript_1627FA compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_1627EF + call_if eq, EventScript_1627EF compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_162805 + call_if eq, EventScript_162805 compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_162805 + call_if eq, EventScript_162805 release end @@ -104,13 +104,13 @@ EventScript_1627B0:: @ 81627B0 msgbox gUnknown_8178420 closemessage compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_1627FA + call_if eq, EventScript_1627FA compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_1627EF + call_if eq, EventScript_1627EF compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_162805 + call_if eq, EventScript_162805 compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_162805 + call_if eq, EventScript_162805 release end diff --git a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc index f3835ed30..61e86d7c7 100644 --- a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc +++ b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc @@ -8,11 +8,11 @@ PokemonLeague_ChampionsRoom_MapScript2_162AF2:: @ 8162AF2 setvar VAR_0x8004, 4 call EventScript_1A75D5 compare_var_to_value VAR_STARTER_MON, 2 - call_if 1, EventScript_162B1E + call_if eq, EventScript_162B1E compare_var_to_value VAR_STARTER_MON, 1 - call_if 1, EventScript_162B31 + call_if eq, EventScript_162B31 compare_var_to_value VAR_STARTER_MON, 0 - call_if 1, EventScript_162B44 + call_if eq, EventScript_162B44 end EventScript_162B1E:: @ 8162B1E @@ -60,9 +60,9 @@ EventScript_162B76:: @ 8162B76 waitmovement 0 delay 20 checkflag FLAG_SYS_GAME_CLEAR - call_if 0, EventScript_162CB3 + call_if lt, EventScript_162CB3 checkflag FLAG_SYS_GAME_CLEAR - call_if 1, EventScript_162CBC + call_if eq, EventScript_162CBC special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 goto_if_eq EventScript_162C68 @@ -70,9 +70,9 @@ EventScript_162B76:: @ 8162B76 setflag FLAG_TEMP_5 savebgm MUS_WIN_GYM checkflag FLAG_0x844 - call_if 0, EventScript_162C6F + call_if lt, EventScript_162C6F checkflag FLAG_0x844 - call_if 1, EventScript_162C91 + call_if eq, EventScript_162C91 setflag FLAG_TEMP_4 clearflag FLAG_TEMP_5 setflag FLAG_DEFEATED_CHAMP @@ -117,20 +117,20 @@ EventScript_162C68:: @ 8162C68 EventScript_162C6F:: @ 8162C6F compare_var_to_value VAR_STARTER_MON, 2 - call_if 1, EventScript_162CC5 + call_if eq, EventScript_162CC5 compare_var_to_value VAR_STARTER_MON, 1 - call_if 1, EventScript_162CD0 + call_if eq, EventScript_162CD0 compare_var_to_value VAR_STARTER_MON, 0 - call_if 1, EventScript_162CDB + call_if eq, EventScript_162CDB return EventScript_162C91:: @ 8162C91 compare_var_to_value VAR_STARTER_MON, 2 - call_if 1, EventScript_162CE6 + call_if eq, EventScript_162CE6 compare_var_to_value VAR_STARTER_MON, 1 - call_if 1, EventScript_162CF1 + call_if eq, EventScript_162CF1 compare_var_to_value VAR_STARTER_MON, 0 - call_if 1, EventScript_162CFC + call_if eq, EventScript_162CFC return EventScript_162CB3:: @ 8162CB3 diff --git a/data/maps/PokemonLeague_LancesRoom/scripts.inc b/data/maps/PokemonLeague_LancesRoom/scripts.inc index a4c04a9ad..723445fb5 100644 --- a/data/maps/PokemonLeague_LancesRoom/scripts.inc +++ b/data/maps/PokemonLeague_LancesRoom/scripts.inc @@ -12,9 +12,9 @@ PokemonLeague_LancesRoom_MapScript1_162942:: @ 8162942 PokemonLeague_LancesRoom_MapScript2_16294D:: @ 816294D compare_var_to_value VAR_MAP_SCENE_POKEMON_LEAGUE, 4 - call_if 1, EventScript_162962 + call_if eq, EventScript_162962 checkflag FLAG_DEFEATED_LANCE - call_if 1, EventScript_162968 + call_if eq, EventScript_162968 end EventScript_162962:: @ 8162962 @@ -107,15 +107,15 @@ PokemonLeague_LancesRoom_EventScript_162A14:: @ 8162A14 famechecker FAMECHECKER_LANCE, 0 famechecker FAMECHECKER_LANCE, 1 checkflag FLAG_SYS_GAME_CLEAR - call_if 0, EventScript_162A79 + call_if lt, EventScript_162A79 checkflag FLAG_SYS_GAME_CLEAR - call_if 1, EventScript_162A82 + call_if eq, EventScript_162A82 setflag FLAG_TEMP_3 setflag FLAG_TEMP_5 checkflag FLAG_0x844 - call_if 0, EventScript_162A8B + call_if lt, EventScript_162A8B checkflag FLAG_0x844 - call_if 1, EventScript_162A96 + call_if eq, EventScript_162A96 clearflag FLAG_TEMP_5 goto EventScript_162AAB diff --git a/data/maps/PokemonLeague_LoreleisRoom/scripts.inc b/data/maps/PokemonLeague_LoreleisRoom/scripts.inc index fab311386..71f79b865 100644 --- a/data/maps/PokemonLeague_LoreleisRoom/scripts.inc +++ b/data/maps/PokemonLeague_LoreleisRoom/scripts.inc @@ -13,9 +13,9 @@ PokemonLeague_LoreleisRoom_MapScript1_162586:: @ 8162586 PokemonLeague_LoreleisRoom_MapScript2_162591:: @ 8162591 checkflag FLAG_DEFEATED_LORELEI - call_if 1, EventScript_1625AC + call_if eq, EventScript_1625AC compare_var_to_value VAR_MAP_SCENE_POKEMON_LEAGUE, 1 - call_if 1, EventScript_1625A6 + call_if eq, EventScript_1625A6 end EventScript_1625A6:: @ 81625A6 @@ -58,15 +58,15 @@ PokemonLeague_LoreleisRoom_EventScript_1625DC:: @ 81625DC famechecker FAMECHECKER_LORELEI, 0 famechecker FAMECHECKER_LORELEI, 1 checkflag FLAG_0x844 - call_if 0, EventScript_162641 + call_if lt, EventScript_162641 checkflag FLAG_0x844 - call_if 1, EventScript_16264A + call_if eq, EventScript_16264A setflag FLAG_TEMP_3 setflag FLAG_TEMP_5 checkflag FLAG_0x844 - call_if 0, EventScript_162653 + call_if lt, EventScript_162653 checkflag FLAG_0x844 - call_if 1, EventScript_16265E + call_if eq, EventScript_16265E clearflag FLAG_TEMP_5 goto EventScript_162673 diff --git a/data/maps/PokemonMansion_1F/scripts.inc b/data/maps/PokemonMansion_1F/scripts.inc index 73a502e68..0abae5e5c 100644 --- a/data/maps/PokemonMansion_1F/scripts.inc +++ b/data/maps/PokemonMansion_1F/scripts.inc @@ -5,7 +5,7 @@ PokemonMansion_1F_MapScripts:: @ 81621F9 PokemonMansion_1F_MapScript1_162204:: @ 8162204 checkflag FLAG_0x26C - call_if 1, EventScript_1A7B7A + call_if eq, EventScript_1A7B7A end PokemonMansion_1F_MapScript2_16220E:: @ 816220E diff --git a/data/maps/PokemonMansion_2F/scripts.inc b/data/maps/PokemonMansion_2F/scripts.inc index ca69db5c1..96de39434 100644 --- a/data/maps/PokemonMansion_2F/scripts.inc +++ b/data/maps/PokemonMansion_2F/scripts.inc @@ -4,7 +4,7 @@ PokemonMansion_2F_MapScripts:: @ 8162254 PokemonMansion_2F_MapScript1_16225A:: @ 816225A checkflag FLAG_0x26C - call_if 1, EventScript_1A7D3E + call_if eq, EventScript_1A7D3E end PokemonMansion_2F_EventScript_162264:: @ 8162264 diff --git a/data/maps/PokemonMansion_3F/scripts.inc b/data/maps/PokemonMansion_3F/scripts.inc index 6aaa14918..0d1aa8158 100644 --- a/data/maps/PokemonMansion_3F/scripts.inc +++ b/data/maps/PokemonMansion_3F/scripts.inc @@ -4,7 +4,7 @@ PokemonMansion_3F_MapScripts:: @ 81622A1 PokemonMansion_3F_MapScript1_1622A7:: @ 81622A7 checkflag FLAG_0x26C - call_if 1, EventScript_1A7E72 + call_if eq, EventScript_1A7E72 end PokemonMansion_3F_EventScript_1622B1:: @ 81622B1 diff --git a/data/maps/PokemonMansion_B1F/scripts.inc b/data/maps/PokemonMansion_B1F/scripts.inc index 923fac42d..c9d9123d8 100644 --- a/data/maps/PokemonMansion_B1F/scripts.inc +++ b/data/maps/PokemonMansion_B1F/scripts.inc @@ -4,7 +4,7 @@ PokemonMansion_B1F_MapScripts:: @ 81622FC PokemonMansion_B1F_MapScript1_162302:: @ 8162302 checkflag FLAG_0x26C - call_if 1, EventScript_1A7F4C + call_if eq, EventScript_1A7F4C end PokemonMansion_B1F_EventScript_16230C:: @ 816230C diff --git a/data/maps/PokemonTower_2F/scripts.inc b/data/maps/PokemonTower_2F/scripts.inc index 13de9b5a4..bed73386b 100644 --- a/data/maps/PokemonTower_2F/scripts.inc +++ b/data/maps/PokemonTower_2F/scripts.inc @@ -21,9 +21,9 @@ EventScript_1632A7:: @ 81632A7 textcolor 0 playbgm MUS_RIVAL1, 0 compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_163339 + call_if eq, EventScript_163339 compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_16334B + call_if eq, EventScript_16334B applymovement 1, Movement_1A75DB waitmovement 0 applymovement 1, Movement_1A75DD @@ -31,18 +31,18 @@ EventScript_1632A7:: @ 81632A7 msgbox gUnknown_8179CFF setvar VAR_LAST_TALKED, 1 compare_var_to_value VAR_STARTER_MON, 2 - call_if 1, EventScript_16335D + call_if eq, EventScript_16335D compare_var_to_value VAR_STARTER_MON, 1 - call_if 1, EventScript_163368 + call_if eq, EventScript_163368 compare_var_to_value VAR_STARTER_MON, 0 - call_if 1, EventScript_163373 + call_if eq, EventScript_163373 msgbox gUnknown_8179DD4 closemessage playbgm MUS_RIVAL2, 0 compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_16337E + call_if eq, EventScript_16337E compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_163389 + call_if eq, EventScript_163389 playse SE_KAIDAN delay 25 fadedefaultbgm diff --git a/data/maps/PowerPlant/scripts.inc b/data/maps/PowerPlant/scripts.inc index c749b4227..d4222d23a 100644 --- a/data/maps/PowerPlant/scripts.inc +++ b/data/maps/PowerPlant/scripts.inc @@ -5,24 +5,24 @@ PowerPlant_MapScripts:: @ 8163764 PowerPlant_MapScript1_16376F:: @ 816376F checkflag FLAG_0x807 - call_if 1, EventScript_163779 + call_if eq, EventScript_163779 end EventScript_163779:: @ 8163779 specialvar VAR_RESULT, sub_80CA74C compare_var_to_value VAR_RESULT, 7 - goto_if 5, EventScript_1A77A9 + goto_if ne, EventScript_1A77A9 removeobject VAR_LAST_TALKED return PowerPlant_MapScript2_16378D:: @ 816378D setworldmapflag FLAG_WORLD_MAP_POWER_PLANT checkflag FLAG_0x2BF - call_if 0, EventScript_1637AC + call_if lt, EventScript_1637AC checkflag FLAG_0x2D0 - call_if 0, EventScript_1637B0 + call_if lt, EventScript_1637B0 checkflag FLAG_0x2D1 - call_if 0, EventScript_1637B4 + call_if lt, EventScript_1637B4 end EventScript_1637AC:: @ 81637AC diff --git a/data/maps/RocketHideout_B1F/scripts.inc b/data/maps/RocketHideout_B1F/scripts.inc index d3aa5a382..1e8f1b9d2 100644 --- a/data/maps/RocketHideout_B1F/scripts.inc +++ b/data/maps/RocketHideout_B1F/scripts.inc @@ -5,7 +5,7 @@ RocketHideout_B1F_MapScripts:: @ 8161195 RocketHideout_B1F_MapScript1_1611A0:: @ 81611A0 checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_12 - call_if 0, EventScript_161233 + call_if lt, EventScript_161233 end RocketHideout_B1F_MapScript2_1611AA:: @ 81611AA diff --git a/data/maps/RocketHideout_B4F/scripts.inc b/data/maps/RocketHideout_B4F/scripts.inc index 78b0225f7..1b8fb0a4d 100644 --- a/data/maps/RocketHideout_B4F/scripts.inc +++ b/data/maps/RocketHideout_B4F/scripts.inc @@ -5,11 +5,11 @@ RocketHideout_B4F_MapScripts:: @ 81612E8 RocketHideout_B4F_MapScript1_1612EE:: @ 81612EE setvar VAR_0x4001, 0 checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_16 - call_if 1, EventScript_161311 + call_if eq, EventScript_161311 checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_17 - call_if 1, EventScript_161311 + call_if eq, EventScript_161311 compare_var_to_value VAR_0x4001, 2 - call_if 5, EventScript_16146A + call_if ne, EventScript_16146A end EventScript_161311:: @ 8161311 @@ -79,13 +79,13 @@ RocketHideout_B4F_EventScript_1613CE:: @ 81613CE EventScript_1613E9:: @ 81613E9 setvar VAR_0x4001, 0 checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_16 - call_if 1, EventScript_161311 + call_if eq, EventScript_161311 checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_17 - call_if 1, EventScript_161311 + call_if eq, EventScript_161311 compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_1614A1 + call_if eq, EventScript_1614A1 compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_161462 + call_if eq, EventScript_161462 release end @@ -97,13 +97,13 @@ RocketHideout_B4F_EventScript_161418:: @ 8161418 EventScript_161433:: @ 8161433 setvar VAR_0x4001, 0 checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_16 - call_if 1, EventScript_161311 + call_if eq, EventScript_161311 checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_17 - call_if 1, EventScript_161311 + call_if eq, EventScript_161311 compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_1614A1 + call_if eq, EventScript_1614A1 compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_161462 + call_if eq, EventScript_161462 release end diff --git a/data/maps/RocketHideout_Elevator/scripts.inc b/data/maps/RocketHideout_Elevator/scripts.inc index 0cf3b5b0b..f0ba02f22 100644 --- a/data/maps/RocketHideout_Elevator/scripts.inc +++ b/data/maps/RocketHideout_Elevator/scripts.inc @@ -4,10 +4,10 @@ RocketHideout_Elevator_MapScripts:: @ 81614D8 RocketHideout_Elevator_EventScript_1614D9:: @ 81614D9 lockall checkflag FLAG_0x2A5 - goto_if 0, EventScript_16161B + goto_if lt, EventScript_16161B setvar VAR_0x8004, 2 checkflag FLAG_TEMP_2 - call_if 0, EventScript_1A7AB9 + call_if lt, EventScript_1A7AB9 copyvar VAR_0x8005, VAR_0x403A special sub_80CB580 message Text_1A535C diff --git a/data/maps/Route10_PokemonCenter_1F/scripts.inc b/data/maps/Route10_PokemonCenter_1F/scripts.inc index 7d47d07df..a6da22234 100644 --- a/data/maps/Route10_PokemonCenter_1F/scripts.inc +++ b/data/maps/Route10_PokemonCenter_1F/scripts.inc @@ -41,7 +41,7 @@ Route10_PokemonCenter_1F_EventScript_16FC65:: @ 816FC65 getnumberstring 2, VAR_0x8006 call EventScript_16FCF1 compare_var_to_value VAR_0x8006, 20 - goto_if 0, EventScript_1A7ABD + goto_if lt, EventScript_1A7ABD msgbox gUnknown_819E733 checkitemspace ITEM_EVERSTONE, 1 compare_var_to_value VAR_RESULT, 0 diff --git a/data/maps/Route11_EastEntrance_2F/scripts.inc b/data/maps/Route11_EastEntrance_2F/scripts.inc index 334e71ec4..5b18d37c9 100644 --- a/data/maps/Route11_EastEntrance_2F/scripts.inc +++ b/data/maps/Route11_EastEntrance_2F/scripts.inc @@ -30,10 +30,10 @@ Route11_EastEntrance_2F_EventScript_16FD5C:: @ 816FD5C goto_if_eq EventScript_16FDB6 call EventScript_1A8CBD compare_var_to_value VAR_0x8004, 6 - goto_if 4, EventScript_16FDB6 + goto_if ge, EventScript_16FDB6 call EventScript_1A8CC9 compare_var_to_var VAR_RESULT, VAR_0x8009 - goto_if 5, EventScript_16FDC0 + goto_if ne, EventScript_16FDC0 call EventScript_1A8CD9 msgbox gUnknown_81A59DA setflag FLAG_0x251 @@ -70,7 +70,7 @@ Route11_EastEntrance_2F_EventScript_16FDD8:: @ 816FDD8 getnumberstring 2, VAR_0x8006 call EventScript_16FE64 compare_var_to_value VAR_0x8006, 30 - goto_if 0, EventScript_1A7ABD + goto_if lt, EventScript_1A7ABD msgbox gUnknown_819EAE4 checkitemspace ITEM_ITEMFINDER, 1 compare_var_to_value VAR_RESULT, 0 diff --git a/data/maps/Route12/scripts.inc b/data/maps/Route12/scripts.inc index d1640fd70..2ba49dc11 100644 --- a/data/maps/Route12/scripts.inc +++ b/data/maps/Route12/scripts.inc @@ -4,7 +4,7 @@ Route12_MapScripts:: @ 8168000 Route12_MapScript1_168006:: @ 8168006 checkflag FLAG_0x807 - call_if 1, EventScript_168010 + call_if eq, EventScript_168010 end EventScript_168010:: @ 8168010 @@ -15,7 +15,7 @@ Route12_EventScript_168014:: @ 8168014 lock faceplayer checkflag FLAG_GOT_POKE_FLUTE - goto_if 0, EventScript_168099 + goto_if lt, EventScript_168099 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 goto_if_eq EventScript_1A7AE0 diff --git a/data/maps/Route12_FishingHouse/scripts.inc b/data/maps/Route12_FishingHouse/scripts.inc index d4472473f..95efdf164 100644 --- a/data/maps/Route12_FishingHouse/scripts.inc +++ b/data/maps/Route12_FishingHouse/scripts.inc @@ -45,7 +45,7 @@ EventScript_16FF7F:: @ 816FF7F waitstate copyvar VAR_RESULT, VAR_0x8004 compare_var_to_value VAR_RESULT, 6 - goto_if 4, EventScript_16FFFF + goto_if ge, EventScript_16FFFF special sub_80A0984 compare_var_to_value VAR_RESULT, 1 goto_if_eq EventScript_170001 @@ -74,14 +74,14 @@ EventScript_170001:: @ 8170001 EventScript_17000B:: @ 817000B checkflag FLAG_0x29C - goto_if 0, EventScript_170031 + goto_if lt, EventScript_170031 msgbox gUnknown_819F40A release end EventScript_17001E:: @ 817001E checkflag FLAG_0x29C - goto_if 0, EventScript_170031 + goto_if lt, EventScript_170031 msgbox gUnknown_819F3CB release end diff --git a/data/maps/Route12_NorthEntrance_2F/scripts.inc b/data/maps/Route12_NorthEntrance_2F/scripts.inc index 3c8727208..29f825824 100644 --- a/data/maps/Route12_NorthEntrance_2F/scripts.inc +++ b/data/maps/Route12_NorthEntrance_2F/scripts.inc @@ -16,9 +16,9 @@ Route12_NorthEntrance_2F_EventScript_16FE8A:: @ 816FE8A goto_if_eq EventScript_16FF01 checkplayergender compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_16FEE5 + call_if eq, EventScript_16FEE5 compare_var_to_value VAR_RESULT, 1 - call_if 1, EventScript_16FEEE + call_if eq, EventScript_16FEEE checkitemspace ITEM_TM27, 1 compare_var_to_value VAR_RESULT, 0 goto_if_eq EventScript_16FEF7 diff --git a/data/maps/Route15_WestEntrance_2F/scripts.inc b/data/maps/Route15_WestEntrance_2F/scripts.inc index 1e06c0394..122b8dcc9 100644 --- a/data/maps/Route15_WestEntrance_2F/scripts.inc +++ b/data/maps/Route15_WestEntrance_2F/scripts.inc @@ -31,7 +31,7 @@ Route15_WestEntrance_2F_EventScript_1700B9:: @ 81700B9 getnumberstring 2, VAR_0x8006 call EventScript_170145 compare_var_to_value VAR_0x8006, 50 - goto_if 0, EventScript_1A7ABD + goto_if lt, EventScript_1A7ABD msgbox gUnknown_819F6AA checkitemspace ITEM_EXP_SHARE, 1 compare_var_to_value VAR_RESULT, 0 diff --git a/data/maps/Route16/scripts.inc b/data/maps/Route16/scripts.inc index 5ac1f9184..00105aae8 100644 --- a/data/maps/Route16/scripts.inc +++ b/data/maps/Route16/scripts.inc @@ -6,7 +6,7 @@ Route16_MapScripts:: @ 81680E5 Route16_MapScript1_1680F5:: @ 81680F5 checkflag FLAG_0x807 - call_if 1, EventScript_1680FF + call_if eq, EventScript_1680FF end EventScript_1680FF:: @ 81680FF @@ -15,7 +15,7 @@ EventScript_1680FF:: @ 81680FF Route16_MapScript2_168103:: @ 8168103 compare_var_to_value VAR_MAP_SCENE_ROUTE16, 1 - call_if 1, EventScript_16810F + call_if eq, EventScript_16810F end EventScript_16810F:: @ 816810F @@ -34,7 +34,7 @@ Route16_EventScript_168121:: @ 8168121 lock faceplayer checkflag FLAG_GOT_POKE_FLUTE - goto_if 0, EventScript_1681A3 + goto_if lt, EventScript_1681A3 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 goto_if_eq EventScript_1A7AE0 diff --git a/data/maps/Route16_NorthEntrance_1F/scripts.inc b/data/maps/Route16_NorthEntrance_1F/scripts.inc index c30f309fd..ff05102c5 100644 --- a/data/maps/Route16_NorthEntrance_1F/scripts.inc +++ b/data/maps/Route16_NorthEntrance_1F/scripts.inc @@ -5,7 +5,7 @@ Route16_NorthEntrance_1F_MapScripts:: @ 81701C2 Route16_NorthEntrance_1F_MapScript1_1701C8:: @ 81701C8 clearflag FLAG_0x830 checkflag FLAG_0x271 - call_if 1, EventScript_1701D5 + call_if eq, EventScript_1701D5 end EventScript_1701D5:: @ 81701D5 @@ -54,13 +54,13 @@ EventScript_170220:: @ 8170220 waitmovement 0 delay 20 compare_var_to_value VAR_0x8008, 1 - call_if 1, EventScript_170279 + call_if eq, EventScript_170279 compare_var_to_value VAR_0x8008, 2 - call_if 1, EventScript_170284 + call_if eq, EventScript_170284 compare_var_to_value VAR_0x8008, 3 - call_if 1, EventScript_17028F + call_if eq, EventScript_17028F compare_var_to_value VAR_0x8008, 4 - call_if 1, EventScript_17029A + call_if eq, EventScript_17029A msgbox gUnknown_819F95F closemessage applymovement 255, Movement_1702B3 diff --git a/data/maps/Route16_NorthEntrance_2F/scripts.inc b/data/maps/Route16_NorthEntrance_2F/scripts.inc index 6fa870c27..dfaf5455b 100644 --- a/data/maps/Route16_NorthEntrance_2F/scripts.inc +++ b/data/maps/Route16_NorthEntrance_2F/scripts.inc @@ -31,7 +31,7 @@ Route16_NorthEntrance_2F_EventScript_1702E3:: @ 81702E3 getnumberstring 2, VAR_0x8006 call EventScript_17036F compare_var_to_value VAR_0x8006, 40 - goto_if 0, EventScript_1A7ABD + goto_if lt, EventScript_1A7ABD msgbox gUnknown_819FC15 checkitemspace ITEM_AMULET_COIN, 1 compare_var_to_value VAR_RESULT, 0 diff --git a/data/maps/Route18/scripts.inc b/data/maps/Route18/scripts.inc index 548fdeeb6..6467cb6c3 100644 --- a/data/maps/Route18/scripts.inc +++ b/data/maps/Route18/scripts.inc @@ -5,7 +5,7 @@ Route18_MapScripts:: @ 81681F6 Route18_MapScript1_168201:: @ 8168201 compare_var_to_value VAR_MAP_SCENE_ROUTE16, 1 - call_if 1, EventScript_16820D + call_if eq, EventScript_16820D end EventScript_16820D:: @ 816820D diff --git a/data/maps/Route18_EastEntrance_1F/scripts.inc b/data/maps/Route18_EastEntrance_1F/scripts.inc index 70a8d196b..b73ce6c07 100644 --- a/data/maps/Route18_EastEntrance_1F/scripts.inc +++ b/data/maps/Route18_EastEntrance_1F/scripts.inc @@ -5,7 +5,7 @@ Route18_EastEntrance_1F_MapScripts:: @ 8170378 Route18_EastEntrance_1F_MapScript1_17037E:: @ 817037E clearflag FLAG_0x830 checkflag FLAG_0x271 - call_if 1, EventScript_17038B + call_if eq, EventScript_17038B end EventScript_17038B:: @ 817038B @@ -54,13 +54,13 @@ EventScript_1703D6:: @ 81703D6 waitmovement 0 delay 20 compare_var_to_value VAR_0x8008, 1 - call_if 1, EventScript_17042F + call_if eq, EventScript_17042F compare_var_to_value VAR_0x8008, 2 - call_if 1, EventScript_17043A + call_if eq, EventScript_17043A compare_var_to_value VAR_0x8008, 3 - call_if 1, EventScript_170445 + call_if eq, EventScript_170445 compare_var_to_value VAR_0x8008, 4 - call_if 1, EventScript_170450 + call_if eq, EventScript_170450 msgbox gUnknown_819FD0C closemessage applymovement 255, Movement_170469 diff --git a/data/maps/Route18_EastEntrance_2F/scripts.inc b/data/maps/Route18_EastEntrance_2F/scripts.inc index 204a0f879..2515ae5ba 100644 --- a/data/maps/Route18_EastEntrance_2F/scripts.inc +++ b/data/maps/Route18_EastEntrance_2F/scripts.inc @@ -21,10 +21,10 @@ Route18_EastEntrance_2F_EventScript_17047E:: @ 817047E goto_if_eq EventScript_1704D8 call EventScript_1A8CBD compare_var_to_value VAR_0x8004, 6 - goto_if 4, EventScript_1704D8 + goto_if ge, EventScript_1704D8 call EventScript_1A8CC9 compare_var_to_var VAR_RESULT, VAR_0x8009 - goto_if 5, EventScript_1704E2 + goto_if ne, EventScript_1704E2 call EventScript_1A8CD9 msgbox gUnknown_81A59DA setflag FLAG_0x257 diff --git a/data/maps/Route20/scripts.inc b/data/maps/Route20/scripts.inc index f0f304435..a1a9f1982 100644 --- a/data/maps/Route20/scripts.inc +++ b/data/maps/Route20/scripts.inc @@ -4,9 +4,9 @@ Route20_MapScripts:: @ 816823B Route20_MapScript1_168241:: @ 8168241 checkflag FLAG_0x2D2 - call_if 0, EventScript_168254 + call_if lt, EventScript_168254 checkflag FLAG_0x2D3 - call_if 0, EventScript_16826D + call_if lt, EventScript_16826D end EventScript_168254:: @ 8168254 diff --git a/data/maps/Route22/scripts.inc b/data/maps/Route22/scripts.inc index 930665e21..37a9f5393 100644 --- a/data/maps/Route22/scripts.inc +++ b/data/maps/Route22/scripts.inc @@ -32,29 +32,29 @@ EventScript_1682BE:: @ 81682BE playbgm MUS_RIVAL1, 0 addobject 1 compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_168350 + call_if eq, EventScript_168350 compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_168350 + call_if eq, EventScript_168350 compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_16835B + call_if eq, EventScript_16835B delay 6 msgbox gUnknown_8188890 compare_var_to_value VAR_STARTER_MON, 2 - call_if 1, EventScript_16836D + call_if eq, EventScript_16836D compare_var_to_value VAR_STARTER_MON, 1 - call_if 1, EventScript_16837C + call_if eq, EventScript_16837C compare_var_to_value VAR_STARTER_MON, 0 - call_if 1, EventScript_16838B + call_if eq, EventScript_16838B msgbox gUnknown_8188974 closemessage delay 10 playbgm MUS_RIVAL2, 0 compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_16839A + call_if eq, EventScript_16839A compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_16839A + call_if eq, EventScript_16839A compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_1683A5 + call_if eq, EventScript_1683A5 fadedefaultbgm removeobject 1 setvar VAR_MAP_SCENE_ROUTE22, 2 @@ -198,19 +198,19 @@ EventScript_16841F:: @ 816841F playbgm MUS_RIVAL1, 0 addobject 1 compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_16849C + call_if eq, EventScript_16849C compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_16849C + call_if eq, EventScript_16849C compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_1684A7 + call_if eq, EventScript_1684A7 msgbox gUnknown_8188A3C setvar VAR_LAST_TALKED, 1 compare_var_to_value VAR_STARTER_MON, 2 - call_if 1, EventScript_1684B9 + call_if eq, EventScript_1684B9 compare_var_to_value VAR_STARTER_MON, 1 - call_if 1, EventScript_1684C4 + call_if eq, EventScript_1684C4 compare_var_to_value VAR_STARTER_MON, 0 - call_if 1, EventScript_1684CF + call_if eq, EventScript_1684CF msgbox gUnknown_8188B29 closemessage delay 10 diff --git a/data/maps/Route24/scripts.inc b/data/maps/Route24/scripts.inc index aee471392..bf51af987 100644 --- a/data/maps/Route24/scripts.inc +++ b/data/maps/Route24/scripts.inc @@ -39,9 +39,9 @@ Route24_EventScript_16866C:: @ 816866C EventScript_168678:: @ 8168678 textcolor 0 compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_1686FD + call_if eq, EventScript_1686FD compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_168708 + call_if eq, EventScript_168708 applymovement 255, Movement_1A75EB waitmovement 0 msgbox gUnknown_8188C3C @@ -81,7 +81,7 @@ EventScript_168713:: @ 8168713 applymovement 255, Movement_168743 waitmovement 0 compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_168733 + call_if eq, EventScript_168733 release end diff --git a/data/maps/Route25_SeaCottage/scripts.inc b/data/maps/Route25_SeaCottage/scripts.inc index 3ec7fc1c4..5dca7b67a 100644 --- a/data/maps/Route25_SeaCottage/scripts.inc +++ b/data/maps/Route25_SeaCottage/scripts.inc @@ -4,9 +4,9 @@ Route25_SeaCottage_MapScripts:: @ 8170523 Route25_SeaCottage_MapScript1_170529:: @ 8170529 checkflag FLAG_HELPED_BILL_IN_SEA_COTTAGE - call_if 0, EventScript_17053C + call_if lt, EventScript_17053C checkflag FLAG_GOT_SS_TICKET - call_if 1, EventScript_170547 + call_if eq, EventScript_170547 end EventScript_17053C:: @ 817053C @@ -46,18 +46,18 @@ EventScript_17058E:: @ 817058E EventScript_17059C:: @ 817059C compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_170600 + call_if eq, EventScript_170600 msgbox gUnknown_819FFD3 closemessage delay 10 compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_17062A + call_if eq, EventScript_17062A compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_170635 + call_if eq, EventScript_170635 compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_170635 + call_if eq, EventScript_170635 compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_170635 + call_if eq, EventScript_170635 opendoor 10, 3 waitdooranim applymovement 2, Movement_1706DB @@ -73,9 +73,9 @@ EventScript_17059C:: @ 817059C EventScript_170600:: @ 8170600 checkplayergender compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_170618 + call_if eq, EventScript_170618 compare_var_to_value VAR_RESULT, 1 - call_if 1, EventScript_170621 + call_if eq, EventScript_170621 return EventScript_170618:: @ 8170618 @@ -105,9 +105,9 @@ EventScript_17064A:: @ 817064A famechecker FAMECHECKER_BILL, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 checkplayergender compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_1706AC + call_if eq, EventScript_1706AC compare_var_to_value VAR_RESULT, 1 - call_if 1, EventScript_1706B5 + call_if eq, EventScript_1706B5 checkitemspace ITEM_SS_TICKET, 1 compare_var_to_value VAR_RESULT, 0 goto_if_eq EventScript_1706BE diff --git a/data/maps/Route2_EastBuilding/scripts.inc b/data/maps/Route2_EastBuilding/scripts.inc index ae08ce8bc..77ec8ad08 100644 --- a/data/maps/Route2_EastBuilding/scripts.inc +++ b/data/maps/Route2_EastBuilding/scripts.inc @@ -15,7 +15,7 @@ Route2_EastBuilding_EventScript_16F67F:: @ 816F67F getnumberstring 2, VAR_0x8006 call EventScript_16F70B compare_var_to_value VAR_0x8006, 10 - goto_if 0, EventScript_1A7ABD + goto_if lt, EventScript_1A7ABD msgbox gUnknown_819D74E checkitemspace ITEM_HM05, 1 compare_var_to_value VAR_RESULT, 0 diff --git a/data/maps/Route2_House/scripts.inc b/data/maps/Route2_House/scripts.inc index e1ee8cd71..f36bc7e83 100644 --- a/data/maps/Route2_House/scripts.inc +++ b/data/maps/Route2_House/scripts.inc @@ -17,10 +17,10 @@ Route2_House_EventScript_16F602:: @ 816F602 goto_if_eq EventScript_16F65C call EventScript_1A8CBD compare_var_to_value VAR_0x8004, 6 - goto_if 4, EventScript_16F65C + goto_if ge, EventScript_16F65C call EventScript_1A8CC9 compare_var_to_var VAR_RESULT, VAR_0x8009 - goto_if 5, EventScript_16F666 + goto_if ne, EventScript_16F666 call EventScript_1A8CD9 msgbox gUnknown_81A59DA setflag FLAG_DID_MIMIEN_TRADE diff --git a/data/maps/Route5_SouthEntrance/scripts.inc b/data/maps/Route5_SouthEntrance/scripts.inc index a065877db..dd2c80612 100644 --- a/data/maps/Route5_SouthEntrance/scripts.inc +++ b/data/maps/Route5_SouthEntrance/scripts.inc @@ -45,11 +45,11 @@ EventScript_16F963:: @ 816F963 msgbox gUnknown_819E09B closemessage compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_16F99C + call_if eq, EventScript_16F99C compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_16F9A7 + call_if eq, EventScript_16F9A7 compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_16F9B2 + call_if eq, EventScript_16F9B2 msgbox gUnknown_819E0C1 setvar VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES, 1 releaseall diff --git a/data/maps/Route6_NorthEntrance/scripts.inc b/data/maps/Route6_NorthEntrance/scripts.inc index 88aca79a9..3b8270ea6 100644 --- a/data/maps/Route6_NorthEntrance/scripts.inc +++ b/data/maps/Route6_NorthEntrance/scripts.inc @@ -45,11 +45,11 @@ EventScript_16FA29:: @ 816FA29 msgbox gUnknown_819E1D1 closemessage compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_16FA62 + call_if eq, EventScript_16FA62 compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_16FA6D + call_if eq, EventScript_16FA6D compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_16FA78 + call_if eq, EventScript_16FA78 msgbox gUnknown_819E1F7 setvar VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES, 1 releaseall diff --git a/data/maps/Route7_EastEntrance/scripts.inc b/data/maps/Route7_EastEntrance/scripts.inc index a07ed8e8a..1c06c9d24 100644 --- a/data/maps/Route7_EastEntrance/scripts.inc +++ b/data/maps/Route7_EastEntrance/scripts.inc @@ -45,11 +45,11 @@ EventScript_16FAF0:: @ 816FAF0 msgbox gUnknown_819E307 closemessage compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_16FB29 + call_if eq, EventScript_16FB29 compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_16FB34 + call_if eq, EventScript_16FB34 compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_16FB3F + call_if eq, EventScript_16FB3F msgbox gUnknown_819E32D setvar VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES, 1 releaseall diff --git a/data/maps/Route8_WestEntrance/scripts.inc b/data/maps/Route8_WestEntrance/scripts.inc index 60f525e79..d12f6ddd1 100644 --- a/data/maps/Route8_WestEntrance/scripts.inc +++ b/data/maps/Route8_WestEntrance/scripts.inc @@ -55,11 +55,11 @@ EventScript_16FBCC:: @ 816FBCC msgbox gUnknown_819E43D closemessage compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_16FC05 + call_if eq, EventScript_16FC05 compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_16FC10 + call_if eq, EventScript_16FC10 compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_16FC1B + call_if eq, EventScript_16FC1B msgbox gUnknown_819E463 setvar VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES, 1 releaseall diff --git a/data/maps/SSAnne_2F_Corridor/scripts.inc b/data/maps/SSAnne_2F_Corridor/scripts.inc index 652501f5b..c5ce60d07 100644 --- a/data/maps/SSAnne_2F_Corridor/scripts.inc +++ b/data/maps/SSAnne_2F_Corridor/scripts.inc @@ -36,29 +36,29 @@ EventScript_160903:: @ 8160903 waitmovement 0 delay 20 compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_1609AD + call_if eq, EventScript_1609AD compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_1609B8 + call_if eq, EventScript_1609B8 compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_1609CA + call_if eq, EventScript_1609CA msgbox gUnknown_8173035 setvar VAR_LAST_TALKED, 1 compare_var_to_value VAR_STARTER_MON, 2 - call_if 1, EventScript_1609DC + call_if eq, EventScript_1609DC compare_var_to_value VAR_STARTER_MON, 1 - call_if 1, EventScript_1609E7 + call_if eq, EventScript_1609E7 compare_var_to_value VAR_STARTER_MON, 0 - call_if 1, EventScript_1609F2 + call_if eq, EventScript_1609F2 msgbox gUnknown_8173164 closemessage delay 10 playbgm MUS_RIVAL2, 0 compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_1609FD + call_if eq, EventScript_1609FD compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_160A08 + call_if eq, EventScript_160A08 compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_160A13 + call_if eq, EventScript_160A13 fadedefaultbgm removeobject 1 setvar VAR_MAP_SCENE_S_S_ANNE_2F_CORRIDOR, 1 diff --git a/data/maps/SSAnne_Exterior/scripts.inc b/data/maps/SSAnne_Exterior/scripts.inc index 8b622c54a..15cc43b1f 100644 --- a/data/maps/SSAnne_Exterior/scripts.inc +++ b/data/maps/SSAnne_Exterior/scripts.inc @@ -15,9 +15,9 @@ SSAnne_Exterior_160859:: @ 8160859 lockall getplayerxy VAR_0x8004, VAR_0x8005 compare_var_to_value VAR_0x8005, 6 - call_if 3, EventScript_1608A1 + call_if le, EventScript_1608A1 compare_var_to_value VAR_0x8005, 7 - call_if 4, EventScript_1608AC + call_if ge, EventScript_1608AC fadenewbgm MUS_NAMINORI delay 50 special Special_SSAnneDepartureCutscene diff --git a/data/maps/SSAnne_Kitchen/scripts.inc b/data/maps/SSAnne_Kitchen/scripts.inc index b1b60056d..8ab022028 100644 --- a/data/maps/SSAnne_Kitchen/scripts.inc +++ b/data/maps/SSAnne_Kitchen/scripts.inc @@ -20,11 +20,11 @@ SSAnne_Kitchen_EventScript_160ACE:: @ 8160ACE random 3 copyvar VAR_0x8008, VAR_RESULT compare_var_to_value VAR_0x8008, 0 - call_if 1, EventScript_160B03 + call_if eq, EventScript_160B03 compare_var_to_value VAR_0x8008, 1 - call_if 1, EventScript_160B0C + call_if eq, EventScript_160B0C compare_var_to_value VAR_0x8008, 2 - call_if 1, EventScript_160B15 + call_if eq, EventScript_160B15 release end diff --git a/data/maps/SaffronCity/scripts.inc b/data/maps/SaffronCity/scripts.inc index 3be402afb..a4036b837 100644 --- a/data/maps/SaffronCity/scripts.inc +++ b/data/maps/SaffronCity/scripts.inc @@ -5,7 +5,7 @@ SaffronCity_MapScripts:: @ 816735F SaffronCity_MapScript1_167365:: @ 8167365 setworldmapflag FLAG_WORLD_MAP_SAFFRON_CITY checkflag FLAG_RESCUED_MR_FUJI - call_if 0, EventScript_167372 + call_if lt, EventScript_167372 end EventScript_167372:: @ 8167372 diff --git a/data/maps/SaffronCity_Gym/scripts.inc b/data/maps/SaffronCity_Gym/scripts.inc index 48b98f533..5d085824d 100644 --- a/data/maps/SaffronCity_Gym/scripts.inc +++ b/data/maps/SaffronCity_Gym/scripts.inc @@ -5,7 +5,7 @@ SaffronCity_Gym_EventScript_16EDD8:: @ 816EDD8 famechecker FAMECHECKER_SABRINA, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 trainerbattle 1, TRAINER_LEADER_SABRINA, 0, Text_19B53C, Text_19B602, EventScript_16EE0A checkflag FLAG_0x29A - goto_if 0, EventScript_16EE3D + goto_if lt, EventScript_16EE3D msgbox gUnknown_819B7F2 release end diff --git a/data/maps/SaffronCity_House1_2F/scripts.inc b/data/maps/SaffronCity_House1_2F/scripts.inc index 8a6227b38..116f68ec3 100644 --- a/data/maps/SaffronCity_House1_2F/scripts.inc +++ b/data/maps/SaffronCity_House1_2F/scripts.inc @@ -29,9 +29,9 @@ SaffronCity_House1_2F_EventScript_16EB7B:: @ 816EB7B goto_if_eq EventScript_1C4CF6 checkplayergender compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_16EBB7 + call_if eq, EventScript_16EBB7 compare_var_to_value VAR_RESULT, 1 - call_if 1, EventScript_16EBC0 + call_if eq, EventScript_16EBC0 release end diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc b/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc index dce3faa1b..c7667ce6a 100644 --- a/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc +++ b/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc @@ -82,35 +82,35 @@ EventScript_16F15B:: @ 816F15B setvar VAR_0x8004, 0 specialvar VAR_RESULT, sub_8113364 compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_16F207 + call_if eq, EventScript_16F207 setvar VAR_0x8004, 1 specialvar VAR_RESULT, sub_8113364 compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_16F213 + call_if eq, EventScript_16F213 setvar VAR_0x8004, 2 specialvar VAR_RESULT, sub_8113364 compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_16F21F + call_if eq, EventScript_16F21F setvar VAR_0x8004, 3 specialvar VAR_RESULT, sub_8113364 compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_16F22B + call_if eq, EventScript_16F22B setvar VAR_0x8004, 4 specialvar VAR_RESULT, sub_8113364 compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_16F237 + call_if eq, EventScript_16F237 setvar VAR_0x8004, 5 specialvar VAR_RESULT, sub_8113364 compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_16F243 + call_if eq, EventScript_16F243 setvar VAR_0x8004, 6 specialvar VAR_RESULT, sub_8113364 compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_16F24F + call_if eq, EventScript_16F24F setvar VAR_0x8004, 7 specialvar VAR_RESULT, sub_8113364 compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_16F25B + call_if eq, EventScript_16F25B end EventScript_16F207:: @ 816F207 diff --git a/data/maps/SeafoamIslands_B3F/scripts.inc b/data/maps/SeafoamIslands_B3F/scripts.inc index bc906077b..2bae9bea7 100644 --- a/data/maps/SeafoamIslands_B3F/scripts.inc +++ b/data/maps/SeafoamIslands_B3F/scripts.inc @@ -5,19 +5,19 @@ SeafoamIslands_B3F_MapScripts:: @ 8162F4F SeafoamIslands_B3F_MapScript1_162F5A:: @ 8162F5A checkflag FLAG_0x2D2 - call_if 0, EventScript_162F6D + call_if lt, EventScript_162F6D checkflag FLAG_0x2D2 - call_if 1, EventScript_162F94 + call_if eq, EventScript_162F94 end EventScript_162F6D:: @ 8162F6D setvar VAR_0x4002, 0 checkflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_1 - call_if 0, EventScript_162FF0 + call_if lt, EventScript_162FF0 checkflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_2 - call_if 0, EventScript_162FF0 + call_if lt, EventScript_162FF0 compare_var_to_value VAR_0x4002, 2 - call_if 1, EventScript_162F90 + call_if eq, EventScript_162F90 return EventScript_162F90:: @ 8162F90 @@ -36,16 +36,16 @@ EventScript_162FA2:: @ 8162FA2 lockall setvar VAR_0x4002, 0 checkflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_1 - call_if 0, EventScript_162FF0 + call_if lt, EventScript_162FF0 checkflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_2 - call_if 0, EventScript_162FF0 + call_if lt, EventScript_162FF0 compare_var_to_value VAR_0x4002, 2 goto_if_eq EventScript_16300C getplayerxy VAR_0x8008, VAR_0x8009 compare_var_to_value VAR_0x8008, 24 - call_if 0, EventScript_162FF6 + call_if lt, EventScript_162FF6 compare_var_to_value VAR_0x8008, 24 - call_if 4, EventScript_163001 + call_if ge, EventScript_163001 setvar VAR_MAP_SCENE_SEAFOAM_ISLANDS_B4F, 1 warp MAP_SEAFOAM_ISLANDS_B4F, 255, 27, 21 waitstate diff --git a/data/maps/SeafoamIslands_B4F/scripts.inc b/data/maps/SeafoamIslands_B4F/scripts.inc index 2d597e6a0..01fc354d3 100644 --- a/data/maps/SeafoamIslands_B4F/scripts.inc +++ b/data/maps/SeafoamIslands_B4F/scripts.inc @@ -8,33 +8,33 @@ SeafoamIslands_B4F_MapScripts:: @ 816302E SeafoamIslands_B4F_MapScript2_163048:: @ 8163048 checkflag FLAG_0x807 - call_if 1, EventScript_163052 + call_if eq, EventScript_163052 end EventScript_163052:: @ 8163052 specialvar VAR_RESULT, sub_80CA74C compare_var_to_value VAR_RESULT, 7 - goto_if 5, EventScript_1A77A9 + goto_if ne, EventScript_1A77A9 removeobject VAR_LAST_TALKED return SeafoamIslands_B4F_MapScript1_163066:: @ 8163066 checkflag FLAG_0x2BE - call_if 0, EventScript_1630AD + call_if lt, EventScript_1630AD checkflag FLAG_0x2D3 - call_if 0, EventScript_163082 + call_if lt, EventScript_163082 checkflag FLAG_0x2D3 - call_if 1, EventScript_1630A9 + call_if eq, EventScript_1630A9 end EventScript_163082:: @ 8163082 setvar VAR_0x4002, 0 checkflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_1 - call_if 0, EventScript_163169 + call_if lt, EventScript_163169 checkflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_2 - call_if 0, EventScript_163169 + call_if lt, EventScript_163169 compare_var_to_value VAR_0x4002, 2 - call_if 1, EventScript_1630A5 + call_if eq, EventScript_1630A5 return EventScript_1630A5:: @ 81630A5 @@ -52,9 +52,9 @@ EventScript_1630AD:: @ 81630AD SeafoamIslands_B4F_MapScript3_1630B1:: @ 81630B1 setvar VAR_0x4002, 0 checkflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_1 - call_if 0, EventScript_163169 + call_if lt, EventScript_163169 checkflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_2 - call_if 0, EventScript_163169 + call_if lt, EventScript_163169 compare_var_to_value VAR_0x4002, 2 goto_if_eq EventScript_1630D4 end @@ -96,16 +96,16 @@ EventScript_163121:: @ 8163121 lockall setvar VAR_0x4002, 0 checkflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_1 - call_if 0, EventScript_163169 + call_if lt, EventScript_163169 checkflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_2 - call_if 0, EventScript_163169 + call_if lt, EventScript_163169 compare_var_to_value VAR_0x4002, 2 goto_if_eq EventScript_163185 getplayerxy VAR_0x8008, VAR_0x8009 compare_var_to_value VAR_0x8008, 9 - call_if 0, EventScript_16316F + call_if lt, EventScript_16316F compare_var_to_value VAR_0x8008, 9 - call_if 4, EventScript_16317A + call_if ge, EventScript_16317A special sub_805D1A8 setvar VAR_0x4001, 0 releaseall diff --git a/data/maps/SevenIsland_House_Room1/scripts.inc b/data/maps/SevenIsland_House_Room1/scripts.inc index 107b91ad7..760416ed2 100644 --- a/data/maps/SevenIsland_House_Room1/scripts.inc +++ b/data/maps/SevenIsland_House_Room1/scripts.inc @@ -6,9 +6,9 @@ SevenIsland_House_Room1_MapScripts:: @ 817088A SevenIsland_House_Room1_MapScript1_170895:: @ 8170895 special ValidateEReaderTrainer compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_1708AF + call_if eq, EventScript_1708AF compare_var_to_value VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 0 - call_if 5, EventScript_1708C3 + call_if ne, EventScript_1708C3 end EventScript_1708AF:: @ 81708AF @@ -40,11 +40,11 @@ EventScript_1708E9:: @ 1708E9 applymovement 255, Movement_1A75E9 waitmovement 0 compare_var_to_value VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 1 - call_if 1, EventScript_170938 + call_if eq, EventScript_170938 compare_var_to_value VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 2 - call_if 1, EventScript_170941 + call_if eq, EventScript_170941 compare_var_to_value VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 3 - call_if 1, EventScript_17094A + call_if eq, EventScript_17094A special LoadPlayerParty setvar VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 0 releaseall @@ -76,7 +76,7 @@ SevenIsland_House_Room1_EventScript_170958:: @ 8170958 faceplayer special ValidateEReaderTrainer compare_var_to_value VAR_RESULT, 1 - call_if 1, EventScript_17097D + call_if eq, EventScript_17097D compare_var_to_value VAR_0x4001, 1 goto_if_eq EventScript_170987 msgbox gUnknown_81A049B @@ -109,11 +109,11 @@ EventScript_170987:: @ 8170987 msgbox gUnknown_81A07C4 closemessage compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_170A2D + call_if eq, EventScript_170A2D compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_170A3F + call_if eq, EventScript_170A3F compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_170A51 + call_if eq, EventScript_170A51 warp MAP_SEVEN_ISLAND_HOUSE_ROOM2, 255, 3, 1 waitstate release diff --git a/data/maps/SevenIsland_House_Room2/scripts.inc b/data/maps/SevenIsland_House_Room2/scripts.inc index 236c95be3..d77eda077 100644 --- a/data/maps/SevenIsland_House_Room2/scripts.inc +++ b/data/maps/SevenIsland_House_Room2/scripts.inc @@ -23,11 +23,11 @@ EventScript_170A97:: @ 8170A97 special sub_80E6900 waitstate compare_var_to_value VAR_RESULT, 3 - call_if 1, EventScript_170AFE + call_if eq, EventScript_170AFE compare_var_to_value VAR_RESULT, 1 - call_if 1, EventScript_170B0C + call_if eq, EventScript_170B0C compare_var_to_value VAR_RESULT, 2 - call_if 1, EventScript_170B17 + call_if eq, EventScript_170B17 closemessage special sp000_heal_pokemon applymovement 255, Movement_170B28 diff --git a/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/scripts.inc b/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/scripts.inc index b1cf1bc89..b1e5689cc 100644 --- a/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/scripts.inc +++ b/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/scripts.inc @@ -5,7 +5,7 @@ SevenIsland_SeavaultCanyon_TanobyKey_MapScripts:: @ 8164DCC SevenIsland_SeavaultCanyon_TanobyKey_MapScript1_164DD2:: @ 8164DD2 setworldmapflag FLAG_WORLD_MAP_SEVEN_ISLAND_SEAVAULT_CANYON_TANOBY_KEY checkflag FLAG_0x849 - call_if 1, EventScript_164E07 + call_if eq, EventScript_164E07 setvar VAR_0x4001, 0 setvar VAR_0x4002, 0 setvar VAR_0x4003, 0 diff --git a/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc b/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc index 82bdfc411..38e2c01e4 100644 --- a/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc +++ b/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc @@ -21,7 +21,7 @@ SevenIsland_SevaultCanyon_House_EventScript_172183:: @ 8172183 closemessage call EventScript_1A6675 compare_var_to_value VAR_FACING, 1 - call_if 5, EventScript_172206 + call_if ne, EventScript_172206 delay 30 playbgm MUS_P_SCHOOL, 0 applymovement 255, Movement_172231 diff --git a/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc b/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc index 0a82a7f24..6755ce61c 100644 --- a/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc @@ -7,7 +7,7 @@ SevenIsland_TrainerTower_Elevator_EventScript_164B03:: @ 8164B03 lockall setvar VAR_0x8004, 6 checkflag FLAG_TEMP_2 - call_if 0, EventScript_1A7AB9 + call_if lt, EventScript_1A7AB9 copyvar VAR_0x8005, VAR_0x403A special sub_80CB580 message Text_1A535C diff --git a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc b/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc index 858ff3c97..9bbdef6bf 100644 --- a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc @@ -31,7 +31,7 @@ SevenIsland_TrainerTower_Lobby_MapScript2_164887:: @ 8164887 SevenIsland_TrainerTower_Lobby_MapScript4_164897:: @ 8164897 compare_var_to_value VAR_0x400D, 17 - call_if 1, EventScript_1648A3 + call_if eq, EventScript_1648A3 end EventScript_1648A3:: @ 81648A3 diff --git a/data/maps/SilphCo_10F/scripts.inc b/data/maps/SilphCo_10F/scripts.inc index 255acde62..3cee38763 100644 --- a/data/maps/SilphCo_10F/scripts.inc +++ b/data/maps/SilphCo_10F/scripts.inc @@ -4,14 +4,14 @@ SilphCo_10F_MapScripts:: @ 8161D86 SilphCo_10F_MapScript1_161D8C:: @ 8161D8C checkflag FLAG_0x28C - call_if 0, EventScript_1A84D6 + call_if lt, EventScript_1A84D6 end SilphCo_10F_EventScript_161D96:: @ 8161D96 lock faceplayer compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if 4, EventScript_161DAD + goto_if ge, EventScript_161DAD msgbox gUnknown_8176DBA release end diff --git a/data/maps/SilphCo_11F/scripts.inc b/data/maps/SilphCo_11F/scripts.inc index f29d06787..5de78bb27 100644 --- a/data/maps/SilphCo_11F/scripts.inc +++ b/data/maps/SilphCo_11F/scripts.inc @@ -4,7 +4,7 @@ SilphCo_11F_MapScripts:: @ 8161DEE SilphCo_11F_MapScript1_161DF4:: @ 8161DF4 checkflag FLAG_0x28D - call_if 0, EventScript_1A8504 + call_if lt, EventScript_1A8504 end SilphCo_11F_EventScript_161DFE:: @ 8161DFE @@ -14,9 +14,9 @@ SilphCo_11F_EventScript_161DFE:: @ 8161DFE goto_if_eq EventScript_161E75 checkplayergender compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_161E59 + call_if eq, EventScript_161E59 compare_var_to_value VAR_RESULT, 1 - call_if 1, EventScript_161E62 + call_if eq, EventScript_161E62 checkitemspace ITEM_MASTER_BALL, 1 compare_var_to_value VAR_RESULT, 0 goto_if_eq EventScript_161E6B @@ -73,9 +73,9 @@ EventScript_161EA0:: @ 8161EA0 msgbox gUnknown_8177108 closemessage compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_161F00 + call_if eq, EventScript_161F00 compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_161F12 + call_if eq, EventScript_161F12 setvar VAR_LAST_TALKED, 3 trainerbattle 3, TRAINER_BOSS_GIOVANNI_2, 0, Text_1771AB msgbox gUnknown_81771C2 diff --git a/data/maps/SilphCo_2F/scripts.inc b/data/maps/SilphCo_2F/scripts.inc index c969b91c3..002d3291a 100644 --- a/data/maps/SilphCo_2F/scripts.inc +++ b/data/maps/SilphCo_2F/scripts.inc @@ -4,9 +4,9 @@ SilphCo_2F_MapScripts:: @ 8161641 SilphCo_2F_MapScript1_161647:: @ 8161647 checkflag FLAG_0x27A - call_if 0, EventScript_1A8149 + call_if lt, EventScript_1A8149 checkflag FLAG_0x27B - call_if 0, EventScript_1A8177 + call_if lt, EventScript_1A8177 end SilphCo_2F_EventScript_16165A:: @ 816165A diff --git a/data/maps/SilphCo_3F/scripts.inc b/data/maps/SilphCo_3F/scripts.inc index b5cdacdff..52c1f847b 100644 --- a/data/maps/SilphCo_3F/scripts.inc +++ b/data/maps/SilphCo_3F/scripts.inc @@ -4,16 +4,16 @@ SilphCo_3F_MapScripts:: @ 81616C5 SilphCo_3F_MapScript1_1616CB:: @ 81616CB checkflag FLAG_0x27C - call_if 0, EventScript_1A81A5 + call_if lt, EventScript_1A81A5 checkflag FLAG_0x27D - call_if 0, EventScript_1A81DC + call_if lt, EventScript_1A81DC end SilphCo_3F_EventScript_1616DE:: @ 81616DE lock faceplayer compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if 4, EventScript_1616F5 + goto_if ge, EventScript_1616F5 msgbox gUnknown_81758AD release end diff --git a/data/maps/SilphCo_4F/scripts.inc b/data/maps/SilphCo_4F/scripts.inc index efa92d1f8..be241084e 100644 --- a/data/maps/SilphCo_4F/scripts.inc +++ b/data/maps/SilphCo_4F/scripts.inc @@ -4,16 +4,16 @@ SilphCo_4F_MapScripts:: @ 8161736 SilphCo_4F_MapScript1_16173C:: @ 816173C checkflag FLAG_0x27E - call_if 0, EventScript_1A8213 + call_if lt, EventScript_1A8213 checkflag FLAG_0x27F - call_if 0, EventScript_1A8241 + call_if lt, EventScript_1A8241 end SilphCo_4F_EventScript_16174F:: @ 816174F lock faceplayer compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if 4, EventScript_161766 + goto_if ge, EventScript_161766 msgbox gUnknown_81759F5 release end diff --git a/data/maps/SilphCo_5F/scripts.inc b/data/maps/SilphCo_5F/scripts.inc index 4a040e83e..42164eb7e 100644 --- a/data/maps/SilphCo_5F/scripts.inc +++ b/data/maps/SilphCo_5F/scripts.inc @@ -4,18 +4,18 @@ SilphCo_5F_MapScripts:: @ 81617BE SilphCo_5F_MapScript1_1617C4:: @ 81617C4 checkflag FLAG_0x280 - call_if 0, EventScript_1A826F + call_if lt, EventScript_1A826F checkflag FLAG_0x281 - call_if 0, EventScript_1A82A6 + call_if lt, EventScript_1A82A6 checkflag FLAG_0x282 - call_if 0, EventScript_1A82DD + call_if lt, EventScript_1A82DD end SilphCo_5F_EventScript_1617E0:: @ 81617E0 lock faceplayer compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if 4, EventScript_1617F7 + goto_if ge, EventScript_1617F7 msgbox gUnknown_8175B70 release end diff --git a/data/maps/SilphCo_6F/scripts.inc b/data/maps/SilphCo_6F/scripts.inc index 139781594..4caa7936c 100644 --- a/data/maps/SilphCo_6F/scripts.inc +++ b/data/maps/SilphCo_6F/scripts.inc @@ -4,14 +4,14 @@ SilphCo_6F_MapScripts:: @ 8161881 SilphCo_6F_MapScript1_161887:: @ 8161887 checkflag FLAG_0x283 - call_if 0, EventScript_1A8314 + call_if lt, EventScript_1A8314 end SilphCo_6F_EventScript_161891:: @ 8161891 lock faceplayer compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if 4, EventScript_1618A8 + goto_if ge, EventScript_1618A8 msgbox gUnknown_817607E release end @@ -25,7 +25,7 @@ SilphCo_6F_EventScript_1618B2:: @ 81618B2 lock faceplayer compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if 4, EventScript_1618C9 + goto_if ge, EventScript_1618C9 msgbox gUnknown_8175F24 release end @@ -39,7 +39,7 @@ SilphCo_6F_EventScript_1618D3:: @ 81618D3 lock faceplayer compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if 4, EventScript_1618EA + goto_if ge, EventScript_1618EA msgbox gUnknown_8175F70 release end @@ -53,7 +53,7 @@ SilphCo_6F_EventScript_1618F4:: @ 81618F4 lock faceplayer compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if 4, EventScript_16190B + goto_if ge, EventScript_16190B msgbox gUnknown_8175FAA release end @@ -67,7 +67,7 @@ SilphCo_6F_EventScript_161915:: @ 8161915 lock faceplayer compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if 4, EventScript_16192C + goto_if ge, EventScript_16192C msgbox gUnknown_8176012 release end diff --git a/data/maps/SilphCo_7F/scripts.inc b/data/maps/SilphCo_7F/scripts.inc index 180495d09..871f2fdd7 100644 --- a/data/maps/SilphCo_7F/scripts.inc +++ b/data/maps/SilphCo_7F/scripts.inc @@ -5,16 +5,16 @@ SilphCo_7F_MapScripts:: @ 8161984 SilphCo_7F_MapScript1_16198F:: @ 816198F checkflag FLAG_0x284 - call_if 0, EventScript_1A834B + call_if lt, EventScript_1A834B checkflag FLAG_0x285 - call_if 0, EventScript_1A8379 + call_if lt, EventScript_1A8379 checkflag FLAG_0x286 - call_if 0, EventScript_1A83A7 + call_if lt, EventScript_1A83A7 end SilphCo_7F_MapScript2_1619AB:: @ 81619AB compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 - call_if 4, EventScript_1619B7 + call_if ge, EventScript_1619B7 end EventScript_1619B7:: @ 81619B7 @@ -47,24 +47,24 @@ EventScript_1619D4:: @ 81619D4 waitmovement 0 msgbox gUnknown_8176710 compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_161A73 + call_if eq, EventScript_161A73 compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_161A7F + call_if eq, EventScript_161A7F msgbox gUnknown_8176727 setvar VAR_LAST_TALKED, 1 compare_var_to_value VAR_STARTER_MON, 2 - call_if 1, EventScript_161A80 + call_if eq, EventScript_161A80 compare_var_to_value VAR_STARTER_MON, 1 - call_if 1, EventScript_161A8B + call_if eq, EventScript_161A8B compare_var_to_value VAR_STARTER_MON, 0 - call_if 1, EventScript_161A96 + call_if eq, EventScript_161A96 msgbox gUnknown_8176827 closemessage playbgm MUS_RIVAL2, 0 compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_161AA1 + call_if eq, EventScript_161AA1 compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_161AAC + call_if eq, EventScript_161AAC playse SE_TK_WARPIN fadedefaultbgm removeobject 1 @@ -200,7 +200,7 @@ SilphCo_7F_EventScript_161B97:: @ 8161B97 lock faceplayer compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if 4, EventScript_161BAE + goto_if ge, EventScript_161BAE msgbox gUnknown_8176444 release end @@ -214,7 +214,7 @@ SilphCo_7F_EventScript_161BB8:: @ 8161BB8 lock faceplayer compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if 4, EventScript_161BCF + goto_if ge, EventScript_161BCF msgbox gUnknown_81764C2 release end @@ -228,7 +228,7 @@ SilphCo_7F_EventScript_161BD9:: @ 8161BD9 lock faceplayer compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if 4, EventScript_161BF0 + goto_if ge, EventScript_161BF0 msgbox gUnknown_8176532 release end diff --git a/data/maps/SilphCo_8F/scripts.inc b/data/maps/SilphCo_8F/scripts.inc index a089a5583..4654d0bc7 100644 --- a/data/maps/SilphCo_8F/scripts.inc +++ b/data/maps/SilphCo_8F/scripts.inc @@ -4,14 +4,14 @@ SilphCo_8F_MapScripts:: @ 8161C5F SilphCo_8F_MapScript1_161C65:: @ 8161C65 checkflag FLAG_0x287 - call_if 0, EventScript_1A83D5 + call_if lt, EventScript_1A83D5 end SilphCo_8F_EventScript_161C6F:: @ 8161C6F lock faceplayer compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if 4, EventScript_161C86 + goto_if ge, EventScript_161C86 msgbox gUnknown_817696D release end diff --git a/data/maps/SilphCo_9F/scripts.inc b/data/maps/SilphCo_9F/scripts.inc index 689102cef..72299d021 100644 --- a/data/maps/SilphCo_9F/scripts.inc +++ b/data/maps/SilphCo_9F/scripts.inc @@ -4,20 +4,20 @@ SilphCo_9F_MapScripts:: @ 8161CDE SilphCo_9F_MapScript1_161CE4:: @ 8161CE4 checkflag FLAG_0x288 - call_if 0, EventScript_1A840C + call_if lt, EventScript_1A840C checkflag FLAG_0x289 - call_if 0, EventScript_1A8443 + call_if lt, EventScript_1A8443 checkflag FLAG_0x28A - call_if 0, EventScript_1A847A + call_if lt, EventScript_1A847A checkflag FLAG_0x28B - call_if 0, EventScript_1A84A8 + call_if lt, EventScript_1A84A8 end SilphCo_9F_EventScript_161D09:: @ 8161D09 lock faceplayer compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if 4, EventScript_161D2E + goto_if ge, EventScript_161D2E msgbox gUnknown_8176B54 closemessage call EventScript_1A6C26 diff --git a/data/maps/SilphCo_Elevator/scripts.inc b/data/maps/SilphCo_Elevator/scripts.inc index f20ffa8c0..826e83658 100644 --- a/data/maps/SilphCo_Elevator/scripts.inc +++ b/data/maps/SilphCo_Elevator/scripts.inc @@ -5,7 +5,7 @@ SilphCo_Elevator_EventScript_161F6F:: @ 8161F6F lockall setvar VAR_0x8004, 1 checkflag FLAG_TEMP_2 - call_if 0, EventScript_1A7AB9 + call_if lt, EventScript_1A7AB9 copyvar VAR_0x8005, VAR_0x403A special sub_80CB580 message Text_1A535C diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc b/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc index 618a5dd4c..85a3d01d6 100644 --- a/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc +++ b/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc @@ -17,13 +17,13 @@ SixIsland_DottedHole_SapphireRoom_EventScript_1641B5:: @ 81641B5 waitmovement 0 playse SE_W070 compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_16430F + call_if eq, EventScript_16430F compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_16430F + call_if eq, EventScript_16430F compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_16431A + call_if eq, EventScript_16431A compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_16431A + call_if eq, EventScript_16431A setvar VAR_0x8004, 3 setvar VAR_0x8005, 0 setvar VAR_0x8006, 12 @@ -31,43 +31,43 @@ SixIsland_DottedHole_SapphireRoom_EventScript_1641B5:: @ 81641B5 special sub_80CAC28 delay 60 compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_164325 + call_if eq, EventScript_164325 compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_164330 + call_if eq, EventScript_164330 compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_16433B + call_if eq, EventScript_16433B compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_164346 + call_if eq, EventScript_164346 textcolor 0 msgbox gUnknown_817BD97 closemessage compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_164351 + call_if eq, EventScript_164351 compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_164366 + call_if eq, EventScript_164366 compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_16437B + call_if eq, EventScript_16437B compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_164390 + call_if eq, EventScript_164390 removeobject 1 compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_1642F9 + call_if eq, EventScript_1642F9 compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_1642F9 + call_if eq, EventScript_1642F9 compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_164304 + call_if eq, EventScript_164304 compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_164304 + call_if eq, EventScript_164304 msgbox gUnknown_817BDD4 closemessage compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_1643A5 + call_if eq, EventScript_1643A5 compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_1643B7 + call_if eq, EventScript_1643B7 compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_1643C9 + call_if eq, EventScript_1643C9 compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_1643DB + call_if eq, EventScript_1643DB playse SE_KAIDAN delay 35 removeobject 2 diff --git a/data/maps/SixIsland_PatternBush/scripts.inc b/data/maps/SixIsland_PatternBush/scripts.inc index 4655002aa..fb1ee80ad 100644 --- a/data/maps/SixIsland_PatternBush/scripts.inc +++ b/data/maps/SixIsland_PatternBush/scripts.inc @@ -6,9 +6,9 @@ SixIsland_PatternBush_MapScript1_16455F:: @ 816455F setworldmapflag FLAG_WORLD_MAP_SIX_ISLAND_PATTERN_BUSH getplayerxy VAR_0x4001, VAR_0x4002 compare_var_to_value VAR_0x4001, 50 - call_if 4, EventScript_16457E + call_if ge, EventScript_16457E compare_var_to_value VAR_0x4001, 49 - call_if 3, EventScript_164587 + call_if le, EventScript_164587 end EventScript_16457E:: @ 816457E diff --git a/data/maps/SixIsland_PokemonCenter_1F/scripts.inc b/data/maps/SixIsland_PokemonCenter_1F/scripts.inc index dd1293f79..1ad4df1ed 100644 --- a/data/maps/SixIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/SixIsland_PokemonCenter_1F/scripts.inc @@ -7,7 +7,7 @@ SixIsland_PokemonCenter_1F_MapScripts:: @ 8171D6A SixIsland_PokemonCenter_1F_MapScript1_171D7A:: @ 8171D7A setrespawn SPAWN_SIX_ISLAND compare_var_to_value VAR_MAP_SCENE_SIX_ISLAND_POKEMON_CENTER_1F, 0 - call_if 1, EventScript_171D89 + call_if eq, EventScript_171D89 end EventScript_171D89:: @ 8171D89 diff --git a/data/maps/SixIsland_RuinValley/scripts.inc b/data/maps/SixIsland_RuinValley/scripts.inc index 11c1b730f..250791d52 100644 --- a/data/maps/SixIsland_RuinValley/scripts.inc +++ b/data/maps/SixIsland_RuinValley/scripts.inc @@ -4,7 +4,7 @@ SixIsland_RuinValley_MapScripts:: @ 8168B53 SixIsland_RuinValley_MapScript1_168B59:: @ 8168B59 checkflag FLAG_0x2E3 - call_if 1, EventScript_168B63 + call_if eq, EventScript_168B63 end EventScript_168B63:: @ 8168B63 diff --git a/data/maps/SixIsland_WaterPath_House1/scripts.inc b/data/maps/SixIsland_WaterPath_House1/scripts.inc index f9df42396..e25a96044 100644 --- a/data/maps/SixIsland_WaterPath_House1/scripts.inc +++ b/data/maps/SixIsland_WaterPath_House1/scripts.inc @@ -18,7 +18,7 @@ SixIsland_WaterPath_House1_EventScript_17206D:: @ 817206D waitstate copyvar VAR_RESULT, VAR_0x8004 compare_var_to_value VAR_RESULT, 6 - goto_if 4, EventScript_1720EF + goto_if ge, EventScript_1720EF special sub_80A0930 compare_var_to_value VAR_RESULT, 1 goto_if_eq EventScript_1720F1 @@ -47,14 +47,14 @@ EventScript_1720F1:: @ 81720F1 EventScript_1720FB:: @ 81720FB checkflag FLAG_0x2D9 - goto_if 0, EventScript_172121 + goto_if lt, EventScript_172121 msgbox gUnknown_81A4B7A release end EventScript_17210E:: @ 817210E checkflag FLAG_0x2D9 - goto_if 0, EventScript_172121 + goto_if lt, EventScript_172121 msgbox gUnknown_81A4B39 release end diff --git a/data/maps/ThreeIsland/scripts.inc b/data/maps/ThreeIsland/scripts.inc index eaa84fb15..8f671ef90 100644 --- a/data/maps/ThreeIsland/scripts.inc +++ b/data/maps/ThreeIsland/scripts.inc @@ -5,9 +5,9 @@ ThreeIsland_MapScripts:: @ 81677AD ThreeIsland_MapScript1_1677B3:: @ 81677B3 setworldmapflag FLAG_WORLD_MAP_THREE_ISLAND checkflag FLAG_0x2A3 - call_if 1, EventScript_1677CB + call_if eq, EventScript_1677CB compare_var_to_value VAR_MAP_SCENE_THREE_ISLAND, 4 - call_if 1, EventScript_1677CF + call_if eq, EventScript_1677CF end EventScript_1677CB:: @ 81677CB @@ -65,36 +65,36 @@ EventScript_167865:: @ 8167865 EventScript_16786F:: @ 816786F compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_167947 + call_if eq, EventScript_167947 compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_167947 + call_if eq, EventScript_167947 applymovement 1, Movement_167A1B waitmovement 0 msgbox gUnknown_81820C0 compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_167952 + call_if eq, EventScript_167952 compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_167952 + call_if eq, EventScript_167952 compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_16795D + call_if eq, EventScript_16795D applymovement 5, Movement_167A19 waitmovement 0 msgbox gUnknown_8182125 compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_167931 + call_if eq, EventScript_167931 compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_167931 + call_if eq, EventScript_167931 compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_167973 + call_if eq, EventScript_167973 applymovement 2, Movement_167A1B waitmovement 0 msgbox gUnknown_81821A9 compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_167952 + call_if eq, EventScript_167952 compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_167952 + call_if eq, EventScript_167952 compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_16795D + call_if eq, EventScript_16795D applymovement 4, Movement_167A19 waitmovement 0 msgbox gUnknown_81821DC @@ -123,14 +123,14 @@ EventScript_167952:: @ 8167952 EventScript_16795D:: @ 816795D getplayerxy VAR_0x8004, VAR_0x8005 compare_var_to_value VAR_0x8004, 9 - goto_if 4, EventScript_167931 + goto_if ge, EventScript_167931 goto EventScript_167952 end EventScript_167973:: @ 8167973 getplayerxy VAR_0x8004, VAR_0x8005 compare_var_to_value VAR_0x8004, 9 - goto_if 4, EventScript_167947 + goto_if ge, EventScript_167947 goto EventScript_167931 end @@ -257,15 +257,15 @@ EventScript_167A59:: @ 8167A59 closemessage delay 45 compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_167BC6 + call_if eq, EventScript_167BC6 compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_167BD8 + call_if eq, EventScript_167BD8 compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_167BEA + call_if eq, EventScript_167BEA compare_var_to_value VAR_0x4001, 3 - call_if 1, EventScript_167C03 + call_if eq, EventScript_167C03 compare_var_to_value VAR_0x4001, 4 - call_if 1, EventScript_167C1C + call_if eq, EventScript_167C1C playbgm MUS_SHOUNEN, 0 msgbox gUnknown_8182623 setvar VAR_LAST_TALKED, 3 diff --git a/data/maps/ThreeIsland_BerryForest/scripts.inc b/data/maps/ThreeIsland_BerryForest/scripts.inc index b57c94f1d..8a0fd3acf 100644 --- a/data/maps/ThreeIsland_BerryForest/scripts.inc +++ b/data/maps/ThreeIsland_BerryForest/scripts.inc @@ -31,7 +31,7 @@ ThreeIsland_BerryForest_EventScript_163C83:: @ 8163C83 msgbox gUnknown_817AEE1 giveitem ITEM_IAPAPA_BERRY compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_163D19 + call_if eq, EventScript_163D19 special sub_80CA6DC msgbox gUnknown_817AF3B closemessage diff --git a/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc b/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc index 7cdedc60c..4bd0d675f 100644 --- a/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc +++ b/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc @@ -7,9 +7,9 @@ ThreeIsland_DunsparceTunnel_MapScript1_164D2C:: @ 8164D2C specialvar VAR_RESULT, IsNationalPokedexEnabled copyvar VAR_0x8008, VAR_RESULT compare_var_to_value VAR_0x8008, 1 - call_if 1, EventScript_164D50 + call_if eq, EventScript_164D50 compare_var_to_value VAR_0x8008, 0 - call_if 1, EventScript_164D54 + call_if eq, EventScript_164D54 end EventScript_164D50:: @ 8164D50 diff --git a/data/maps/ThreeIsland_Port/scripts.inc b/data/maps/ThreeIsland_Port/scripts.inc index 17851408b..b101c5ead 100644 --- a/data/maps/ThreeIsland_Port/scripts.inc +++ b/data/maps/ThreeIsland_Port/scripts.inc @@ -11,9 +11,9 @@ ThreeIsland_Port_EventScript_168796:: @ 8168796 lock faceplayer compare_var_to_value VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 2 - goto_if 4, EventScript_1687B8 + goto_if ge, EventScript_1687B8 compare_var_to_value VAR_MAP_SCENE_THREE_ISLAND, 4 - goto_if 4, EventScript_1687C2 + goto_if ge, EventScript_1687C2 msgbox gUnknown_818A307 release end diff --git a/data/maps/TwoIsland/scripts.inc b/data/maps/TwoIsland/scripts.inc index dffb46302..b09f1b0c0 100644 --- a/data/maps/TwoIsland/scripts.inc +++ b/data/maps/TwoIsland/scripts.inc @@ -20,27 +20,27 @@ EventScript_167576:: @ 8167576 EventScript_167597:: @ 8167597 checkflag FLAG_0x29D - goto_if 0, EventScript_1675EE + goto_if lt, EventScript_1675EE checkflag FLAG_0x29E - goto_if 0, EventScript_1675F4 + goto_if lt, EventScript_1675F4 checkflag FLAG_0x29F - goto_if 0, EventScript_1675FD + goto_if lt, EventScript_1675FD goto EventScript_167606 end EventScript_1675B8:: @ 81675B8 checkflag FLAG_0x29D - goto_if 0, EventScript_1675EE + goto_if lt, EventScript_1675EE checkflag FLAG_0x2A3 - goto_if 0, EventScript_1675EE + goto_if lt, EventScript_1675EE checkflag FLAG_0x29E - goto_if 0, EventScript_1675F4 + goto_if lt, EventScript_1675F4 goto EventScript_1675FD end EventScript_1675D9:: @ 81675D9 checkflag FLAG_0x29D - goto_if 0, EventScript_1675EE + goto_if lt, EventScript_1675EE goto EventScript_1675F4 end diff --git a/data/maps/TwoIsland_House/scripts.inc b/data/maps/TwoIsland_House/scripts.inc index 87c9a8583..2ad326b08 100644 --- a/data/maps/TwoIsland_House/scripts.inc +++ b/data/maps/TwoIsland_House/scripts.inc @@ -21,10 +21,10 @@ TwoIsland_House_EventScript_171619:: @ 8171619 EventScript_17164F:: @ 817164F checkitem ITEM_BIG_MUSHROOM, 1 compare_var_to_value VAR_RESULT, 1 - call_if 1, EventScript_1717A8 + call_if eq, EventScript_1717A8 checkitem ITEM_TINY_MUSHROOM, 2 compare_var_to_value VAR_RESULT, 1 - call_if 1, EventScript_1717AC + call_if eq, EventScript_1717AC checkflag FLAG_TEMP_2 goto_if_eq EventScript_171687 checkflag FLAG_TEMP_3 @@ -34,13 +34,13 @@ EventScript_17164F:: @ 817164F EventScript_171687:: @ 8171687 checkflag FLAG_TEMP_3 - call_if 1, EventScript_1717B0 + call_if eq, EventScript_1717B0 goto EventScript_1716A5 end EventScript_171696:: @ 8171696 checkflag FLAG_TEMP_2 - call_if 1, EventScript_1717B0 + call_if eq, EventScript_1717B0 goto EventScript_1716A5 end @@ -56,7 +56,7 @@ EventScript_1716BE:: @ 81716BE special sub_80BF93C waitstate compare_var_to_value VAR_0x8004, 6 - goto_if 4, EventScript_17179E + goto_if ge, EventScript_17179E special sub_80BFC14 compare_var_to_value VAR_RESULT, 1 goto_if_eq EventScript_171790 diff --git a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc index e4ed31f53..add8fcace 100644 --- a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc +++ b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc @@ -7,7 +7,7 @@ TwoIsland_JoyfulGameCorner_MapScripts:: @ 81713D0 TwoIsland_JoyfulGameCorner_MapScript1_1713E5:: @ 81713E5 checkflag FLAG_0x2FB - call_if 1, EventScript_1713EF + call_if eq, EventScript_1713EF end EventScript_1713EF:: @ 81713EF diff --git a/data/maps/UndergroundPath_NorthEntrance/scripts.inc b/data/maps/UndergroundPath_NorthEntrance/scripts.inc index 3090d4141..f54e710e6 100644 --- a/data/maps/UndergroundPath_NorthEntrance/scripts.inc +++ b/data/maps/UndergroundPath_NorthEntrance/scripts.inc @@ -13,10 +13,10 @@ UndergroundPath_NorthEntrance_EventScript_160E39:: @ 8160E39 goto_if_eq EventScript_160E93 call EventScript_1A8CBD compare_var_to_value VAR_0x8004, 6 - goto_if 4, EventScript_160E93 + goto_if ge, EventScript_160E93 call EventScript_1A8CC9 compare_var_to_var VAR_RESULT, VAR_0x8009 - goto_if 5, EventScript_160E9D + goto_if ne, EventScript_160E9D call EventScript_1A8CD9 msgbox gUnknown_81A5B4A setflag FLAG_DID_MS_NIDO_TRADE diff --git a/data/maps/VermilionCity/scripts.inc b/data/maps/VermilionCity/scripts.inc index 2cae8b884..4ec5c4ee2 100644 --- a/data/maps/VermilionCity/scripts.inc +++ b/data/maps/VermilionCity/scripts.inc @@ -23,7 +23,7 @@ Movement_166903:: @ 8166903 VermilionCity_MapScript1_166906:: @ 8166906 setworldmapflag FLAG_WORLD_MAP_VERMILION_CITY checkflag FLAG_0x2F9 - call_if 1, EventScript_166913 + call_if eq, EventScript_166913 end EventScript_166913:: @ 8166913 @@ -59,7 +59,7 @@ VermilionCity_EventScript_166941:: @ 8166941 EventScript_166958:: @ 8166958 checkflag FLAG_0x84A - goto_if 0, EventScript_1A77B0 + goto_if lt, EventScript_1A77B0 checkitem ITEM_MYSTIC_TICKET, 1 compare_var_to_value VAR_RESULT, 0 goto_if_eq EventScript_1A77B0 @@ -68,7 +68,7 @@ EventScript_166958:: @ 8166958 EventScript_166977:: @ 8166977 checkflag FLAG_0x84B - goto_if 0, EventScript_1A77B0 + goto_if lt, EventScript_1A77B0 checkitem ITEM_AURORA_TICKET, 1 compare_var_to_value VAR_RESULT, 0 goto_if_eq EventScript_1A77B0 @@ -78,9 +78,9 @@ EventScript_166977:: @ 8166977 EventScript_166996:: @ 8166996 setvar VAR_0x8004, 0 compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 - goto_if 4, EventScript_1669BB + goto_if ge, EventScript_1669BB compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 1 - goto_if 4, EventScript_166B3B + goto_if ge, EventScript_166B3B msgbox gUnknown_817FB10 release end @@ -107,7 +107,7 @@ EventScript_1669FD:: @ 81669FD compare_var_to_value VAR_RESULT, 1 goto_if_eq EventScript_166AB1 checkflag FLAG_0x2F0 - call_if 0, EventScript_166A53 + call_if lt, EventScript_166A53 message Text_17FCC1 waitmessage multichoice 17, 6, 54, 0 @@ -125,7 +125,7 @@ EventScript_166A53:: @ 8166A53 EventScript_166A5F:: @ 8166A5F checkflag FLAG_0x2F1 - call_if 0, EventScript_166AA5 + call_if lt, EventScript_166AA5 message Text_17FCC1 waitmessage multichoice 13, 6, 55, 0 @@ -143,9 +143,9 @@ EventScript_166AA5:: @ 8166AA5 EventScript_166AB1:: @ 8166AB1 checkflag FLAG_0x2F0 - call_if 0, EventScript_166A53 + call_if lt, EventScript_166A53 checkflag FLAG_0x2F1 - call_if 0, EventScript_166AA5 + call_if lt, EventScript_166AA5 message Text_17FCC1 waitmessage multichoice 13, 5, 56, 0 @@ -213,7 +213,7 @@ EventScript_166BA0:: @ 8166BA0 goto_if_eq EventScript_166BED msgbox gUnknown_817FA3C checkflag FLAG_GOT_SS_TICKET - goto_if 0, EventScript_166BDE + goto_if lt, EventScript_166BDE msgbox gUnknown_817FA77 setvar VAR_VERMILION_CITY_TICKET_CHECK_TRIGGER, 1 releaseall @@ -228,9 +228,9 @@ EventScript_166BDE:: @ 8166BDE EventScript_166BED:: @ 8166BED setvar VAR_0x8004, 0 compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 - goto_if 4, EventScript_1669BB + goto_if ge, EventScript_1669BB compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 1 - goto_if 4, EventScript_166B3B + goto_if ge, EventScript_166B3B msgbox gUnknown_817FB10 closemessage goto EventScript_1A9108 diff --git a/data/maps/VermilionCity_Gym/scripts.inc b/data/maps/VermilionCity_Gym/scripts.inc index 10f9c6d85..78b023c7b 100644 --- a/data/maps/VermilionCity_Gym/scripts.inc +++ b/data/maps/VermilionCity_Gym/scripts.inc @@ -5,9 +5,9 @@ VermilionCity_Gym_MapScripts:: @ 816B69E VermilionCity_Gym_MapScript1_16B6A9:: @ 816B6A9 checkflag FLAG_TEMP_1 - call_if 1, EventScript_16B6BC + call_if eq, EventScript_16B6BC checkflag FLAG_0x264 - call_if 1, EventScript_16B717 + call_if eq, EventScript_16B717 end EventScript_16B6BC:: @ 816B6BC @@ -211,7 +211,7 @@ VermilionCity_Gym_EventScript_16B94A:: @ 816B94A famechecker FAMECHECKER_LTSURGE, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 trainerbattle 1, TRAINER_LEADER_LT_SURGE, 0, Text_194BA4, Text_194E03, EventScript_16B97C checkflag FLAG_GOT_TM34_FROM_SURGE - goto_if 0, EventScript_16B9AF + goto_if lt, EventScript_16B9AF msgbox gUnknown_8194C8E release end @@ -219,7 +219,7 @@ VermilionCity_Gym_EventScript_16B94A:: @ 816B94A EventScript_16B97C:: @ 816B97C famechecker FAMECHECKER_LTSURGE, 1 checkflag FLAG_GOT_HM05 - call_if 0, EventScript_16B9AB + call_if lt, EventScript_16B9AB clearflag FLAG_HIDE_FAME_CHECKER_LT_SURGE_JOURNAL setflag FLAG_DEFEATED_LT_SURGE setflag FLAG_BADGE03_GET diff --git a/data/maps/VermilionCity_House2/scripts.inc b/data/maps/VermilionCity_House2/scripts.inc index 30e5496d5..9b347c9bb 100644 --- a/data/maps/VermilionCity_House2/scripts.inc +++ b/data/maps/VermilionCity_House2/scripts.inc @@ -13,10 +13,10 @@ VermilionCity_House2_EventScript_16B5D7:: @ 816B5D7 goto_if_eq EventScript_16B631 call EventScript_1A8CBD compare_var_to_value VAR_0x8004, 6 - goto_if 4, EventScript_16B631 + goto_if ge, EventScript_16B631 call EventScript_1A8CC9 compare_var_to_var VAR_RESULT, VAR_0x8009 - goto_if 5, EventScript_16B63B + goto_if ne, EventScript_16B63B call EventScript_1A8CD9 msgbox gUnknown_8194A44 setflag FLAG_DID_CH_DING_TRADE diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc index 67cf54017..14b30547f 100644 --- a/data/maps/VictoryRoad_1F/scripts.inc +++ b/data/maps/VictoryRoad_1F/scripts.inc @@ -5,7 +5,7 @@ VictoryRoad_1F_MapScripts:: @ 8160F05 VictoryRoad_1F_MapScript1_160F10:: @ 8160F10 compare_var_to_value VAR_MAP_SCENE_VICTORY_ROAD_1F, 100 - call_if 5, EventScript_160F1C + call_if ne, EventScript_160F1C end EventScript_160F1C:: @ 8160F1C diff --git a/data/maps/VictoryRoad_2F/scripts.inc b/data/maps/VictoryRoad_2F/scripts.inc index 7831e662f..f53e2fcd6 100644 --- a/data/maps/VictoryRoad_2F/scripts.inc +++ b/data/maps/VictoryRoad_2F/scripts.inc @@ -4,9 +4,9 @@ VictoryRoad_2F_MapScripts:: @ 8160F92 VictoryRoad_2F_MapScript1_160F98:: @ 8160F98 compare_var_to_value VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER1, 100 - call_if 5, EventScript_160FAF + call_if ne, EventScript_160FAF compare_var_to_value VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER2, 100 - call_if 5, EventScript_160FC2 + call_if ne, EventScript_160FC2 end EventScript_160FAF:: @ 8160FAF diff --git a/data/maps/VictoryRoad_3F/scripts.inc b/data/maps/VictoryRoad_3F/scripts.inc index 6710153dc..87e115235 100644 --- a/data/maps/VictoryRoad_3F/scripts.inc +++ b/data/maps/VictoryRoad_3F/scripts.inc @@ -4,7 +4,7 @@ VictoryRoad_3F_MapScripts:: @ 81610AA VictoryRoad_3F_MapScript1_1610B0:: @ 81610B0 compare_var_to_value VAR_MAP_SCENE_VICTORY_ROAD_3F, 100 - call_if 5, EventScript_1610BC + call_if ne, EventScript_1610BC end EventScript_1610BC:: @ 81610BC diff --git a/data/maps/ViridianCity/scripts.inc b/data/maps/ViridianCity/scripts.inc index 60301d9e4..03a3db88d 100644 --- a/data/maps/ViridianCity/scripts.inc +++ b/data/maps/ViridianCity/scripts.inc @@ -5,13 +5,13 @@ ViridianCity_MapScripts:: @ 81658D3 ViridianCity_MapScript1_1658D9:: @ 81658D9 setworldmapflag FLAG_WORLD_MAP_VIRIDIAN_CITY compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 0 - call_if 1, EventScript_165920 + call_if eq, EventScript_165920 compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 1 - call_if 1, EventScript_16590F + call_if eq, EventScript_16590F compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 2 - call_if 4, EventScript_165909 + call_if ge, EventScript_165909 compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_GYM_DOOR, 0 - call_if 1, EventScript_165931 + call_if eq, EventScript_165931 end EventScript_165909:: @ 8165909 @@ -32,17 +32,17 @@ EventScript_165920:: @ 8165920 EventScript_165931:: @ 8165931 checkflag FLAG_BADGE02_GET - goto_if 0, EventScript_1A77A9 + goto_if lt, EventScript_1A77A9 checkflag FLAG_BADGE03_GET - goto_if 0, EventScript_1A77A9 + goto_if lt, EventScript_1A77A9 checkflag FLAG_BADGE04_GET - goto_if 0, EventScript_1A77A9 + goto_if lt, EventScript_1A77A9 checkflag FLAG_BADGE05_GET - goto_if 0, EventScript_1A77A9 + goto_if lt, EventScript_1A77A9 checkflag FLAG_BADGE06_GET - goto_if 0, EventScript_1A77A9 + goto_if lt, EventScript_1A77A9 checkflag FLAG_BADGE07_GET - goto_if 0, EventScript_1A77A9 + goto_if lt, EventScript_1A77A9 setvar VAR_MAP_SCENE_VIRIDIAN_CITY_GYM_DOOR, 1 return @@ -110,7 +110,7 @@ ViridianCity_EventScript_1659F6:: @ 81659F6 checkflag FLAG_BADGE01_GET goto_if_eq EventScript_165A23 compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 2 - goto_if 4, EventScript_165A4A + goto_if ge, EventScript_165A4A compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 1 goto_if_eq EventScript_165A54 compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 0 diff --git a/data/maps/ViridianCity_Gym/scripts.inc b/data/maps/ViridianCity_Gym/scripts.inc index 47e4c00b2..8b470aa84 100644 --- a/data/maps/ViridianCity_Gym/scripts.inc +++ b/data/maps/ViridianCity_Gym/scripts.inc @@ -5,7 +5,7 @@ ViridianCity_Gym_EventScript_169ECA:: @ 8169ECA famechecker FAMECHECKER_GIOVANNI, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 trainerbattle 1, TRAINER_LEADER_GIOVANNI, 0, Text_18F352, Text_18F43F, EventScript_169F04 checkflag FLAG_0x298 - goto_if 0, EventScript_169F2F + goto_if lt, EventScript_169F2F msgbox gUnknown_818F4A2 closemessage fadescreen 1 diff --git a/data/maps/ViridianCity_Mart/scripts.inc b/data/maps/ViridianCity_Mart/scripts.inc index 07c280442..81e13fb1f 100644 --- a/data/maps/ViridianCity_Mart/scripts.inc +++ b/data/maps/ViridianCity_Mart/scripts.inc @@ -5,7 +5,7 @@ ViridianCity_Mart_MapScripts:: @ 816A1D3 ViridianCity_Mart_MapScript1_16A1DE:: @ 816A1DE checkflag FLAG_SYS_POKEDEX_GET - goto_if 0, EventScript_16A1E8 + goto_if lt, EventScript_16A1E8 end EventScript_16A1E8:: @ 816A1E8 |