diff options
Diffstat (limited to 'data')
174 files changed, 1203 insertions, 1392 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s index 701056de4..fe43ead3b 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1108,7 +1108,7 @@ EverGrandeCity_HallOfFame_EventScript_2717C1:: @ 82717C1 setflag FLAG_0x87F call EverGrandeCity_HallOfFame_EventScript_271829 compare VAR_0x40CC, 0 - call_if 1, EverGrandeCity_HallOfFame_EventScript_271839 + call_if_eq EverGrandeCity_HallOfFame_EventScript_271839 clearflag FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS call EverGrandeCity_HallOfFame_EventScript_2718CC setflag FLAG_HIDE_SLATEPORT_CITY_STERNS_SHIPYARD_MR_BRINEY @@ -1123,14 +1123,12 @@ EverGrandeCity_HallOfFame_EventScript_2717C1:: @ 82717C1 clearflag FLAG_HIDE_SAFARI_ZONE_SOUTH_EAST_EXPANSION setflag FLAG_HIDE_LILYCOVE_CITY_RIVAL special sub_813BA60 - checkflag FLAG_0x123 - call_if 0, EverGrandeCity_HallOfFame_EventScript_271843 - checkflag FLAG_0x12A - call_if 0, EverGrandeCity_HallOfFame_EventScript_27183F + call_if_unset FLAG_0x123, EverGrandeCity_HallOfFame_EventScript_271843 + call_if_unset FLAG_0x12A, EverGrandeCity_HallOfFame_EventScript_27183F setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM compare VAR_0x40D3, 0 - call_if 1, EverGrandeCity_HallOfFame_EventScript_271851 + call_if_eq EverGrandeCity_HallOfFame_EventScript_271851 return EverGrandeCity_HallOfFame_EventScript_271829:: @ 8271829 @@ -1279,9 +1277,9 @@ OldaleTown_PokemonCenter_1F_EventScript_271954:: @ 8271954 OldaleTown_PokemonCenter_1F_EventScript_27195A:: @ 827195A incrementgamestat 15 compare VAR_0x8004, 0 - call_if 1, OldaleTown_PokemonCenter_1F_EventScript_271987 + call_if_eq OldaleTown_PokemonCenter_1F_EventScript_271987 compare VAR_0x8004, 1 - call_if 1, OldaleTown_PokemonCenter_1F_EventScript_27198D + call_if_eq OldaleTown_PokemonCenter_1F_EventScript_27198D waitmessage call OldaleTown_PokemonCenter_1F_EventScript_271993 goto_if_unset FLAG_0x111, OldaleTown_PokemonCenter_1F_EventScript_271A43 @@ -1403,9 +1401,9 @@ EventScript_271AE3:: @ 8271AE3 checkitemtype VAR_0x8000 call EventScript_271B08 compare VAR_0x8007, 1 - call_if 1, EventScript_271B95 + call_if_eq EventScript_271B95 compare VAR_0x8007, 0 - call_if 1, EventScript_271BA9 + call_if_eq EventScript_271BA9 return EventScript_271B08:: @ 8271B08 @@ -1420,31 +1418,31 @@ EventScript_271B08:: @ 8271B08 EventScript_271B45:: @ 8271B45 bufferstdstring 2, 14 compare VAR_0x8007, 1 - call_if 1, EventScript_271BAF + call_if_eq EventScript_271BAF return EventScript_271B55:: @ 8271B55 bufferstdstring 2, 15 compare VAR_0x8007, 1 - call_if 1, EventScript_271BAF + call_if_eq EventScript_271BAF return EventScript_271B65:: @ 8271B65 bufferstdstring 2, 16 compare VAR_0x8007, 1 - call_if 1, EventScript_271BAF + call_if_eq EventScript_271BAF return EventScript_271B75:: @ 8271B75 bufferstdstring 2, 17 compare VAR_0x8007, 1 - call_if 1, EventScript_271BB3 + call_if_eq EventScript_271BB3 return EventScript_271B85:: @ 8271B85 bufferstdstring 2, 18 compare VAR_0x8007, 1 - call_if 1, EventScript_271BAF + call_if_eq EventScript_271BAF return EventScript_271B95:: @ 8271B95 @@ -1475,9 +1473,9 @@ Std_ObtainDecoration:: @ 8271BB7 EventScript_271BC5:: @ 8271BC5 bufferdecorationname 1, VAR_0x8000 compare VAR_0x8007, 1 - call_if 1, EventScript_271BE0 + call_if_eq EventScript_271BE0 compare VAR_0x8007, 0 - call_if 1, EventScript_271BF7 + call_if_eq EventScript_271BF7 return EventScript_271BE0:: @ 8271BE0 @@ -1504,9 +1502,9 @@ Std_FindItem:: @ 8271BFD checkitemtype VAR_0x8000 call EventScript_271B08 compare VAR_0x8007, 1 - call_if 1, EventScript_271C3A + call_if_eq EventScript_271C3A compare VAR_0x8007, 0 - call_if 1, EventScript_271CA1 + call_if_eq EventScript_271CA1 release return @@ -1516,9 +1514,9 @@ EventScript_271C3A:: @ 8271C3A specialvar VAR_RESULT, sub_81398C0 copyvar VAR_0x8008, VAR_RESULT compare VAR_0x8008, 1 - call_if 1, EventScript_271C8F + call_if_eq EventScript_271C8F compare VAR_0x8008, 0 - call_if 1, EventScript_271C9B + call_if_eq EventScript_271C9B waitfanfare waitmessage bufferitemnameplural 1, VAR_0x8004, 32773 @@ -1660,10 +1658,8 @@ EventScript_271DF9:: @ 8271DF9 EventScript_271E0E:: @ 8271E0E playse SE_PC_LOGIN - checkflag FLAG_SYS_PC_LANETTE - call_if 0, EventScript_271E35 - checkflag FLAG_SYS_PC_LANETTE - call_if 1, EventScript_271E3E + call_if_unset FLAG_SYS_PC_LANETTE, EventScript_271E35 + call_if_set FLAG_SYS_PC_LANETTE, EventScript_271E3E msgbox gUnknown_082726A3, MSGBOX_DEFAULT special ShowPokemonStorageSystem waitstate @@ -2093,21 +2089,21 @@ Route103_EventScript_2720AD:: @ 82720AD goto_if_eq Route101_EventScript_27374E goto_if_set FLAG_SYS_GAME_CLEAR, Route101_EventScript_27211A compare VAR_BIRCH_STATE, 0 - call_if 1, Route101_EventScript_27211A + call_if_eq Route101_EventScript_27211A compare VAR_BIRCH_STATE, 1 - call_if 1, Route101_EventScript_27211A + call_if_eq Route101_EventScript_27211A compare VAR_BIRCH_STATE, 2 - call_if 1, Route101_EventScript_272127 + call_if_eq Route101_EventScript_272127 compare VAR_BIRCH_STATE, 3 - call_if 1, Route101_EventScript_272127 + call_if_eq Route101_EventScript_272127 compare VAR_BIRCH_STATE, 4 - call_if 1, Route101_EventScript_272134 + call_if_eq Route101_EventScript_272134 compare VAR_BIRCH_STATE, 5 - call_if 1, Route101_EventScript_272134 + call_if_eq Route101_EventScript_272134 compare VAR_BIRCH_STATE, 6 - call_if 1, Route101_EventScript_27211A + call_if_eq Route101_EventScript_27211A compare VAR_BIRCH_STATE, 7 - call_if 1, Route101_EventScript_27211A + call_if_eq Route101_EventScript_27211A return Route101_EventScript_27211A:: @ 827211A @@ -2241,9 +2237,9 @@ FarawayIsland_Entrance_EventScript_272250:: @ 8272250 NavelRock_Harbor_EventScript_272250:: @ 8272250 SouthernIsland_Exterior_EventScript_272250:: @ 8272250 compare VAR_FACING, 1 - call_if 1, BattleFrontier_OutsideWest_EventScript_242A21 + call_if_eq BattleFrontier_OutsideWest_EventScript_242A21 compare VAR_FACING, 3 - call_if 1, BattleFrontier_OutsideWest_EventScript_242A2C + call_if_eq BattleFrontier_OutsideWest_EventScript_242A2C delay 30 hideobjectat 255, MAP_PETALBURG_CITY call BattleFrontier_OutsideWest_EventScript_2721E2 @@ -3199,8 +3195,7 @@ EventScript_2736D9:: @ 82736D9 special sub_80B05B4 waitstate fadescreen 1 - checkflag FLAG_0x06C - call_if 1, EventScript_2736F4 + call_if_set FLAG_0x06C, EventScript_2736F4 special sp0C8_whiteout_maybe waitstate end @@ -3384,10 +3379,8 @@ Route119_WeatherInstitute_2F_EventScript_2737A0:: @ 82737A0 RustboroCity_DevonCorp_2F_EventScript_2737A0:: @ 82737A0 bufferboxname 0, 16438 bufferspeciesname 1, VAR_TEMP_1 - checkflag FLAG_SYS_PC_LANETTE - call_if 0, LittlerootTown_ProfessorBirchsLab_EventScript_2737BB - checkflag FLAG_SYS_PC_LANETTE - call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_2737E6 + call_if_unset FLAG_SYS_PC_LANETTE, LittlerootTown_ProfessorBirchsLab_EventScript_2737BB + call_if_set FLAG_SYS_PC_LANETTE, LittlerootTown_ProfessorBirchsLab_EventScript_2737E6 return LittlerootTown_ProfessorBirchsLab_EventScript_2737BB:: @ 82737BB @@ -4518,9 +4511,9 @@ BattleFrontier_BattleTowerLobby_EventScript_28CBD8:: @ 828CBD8 multichoice 20, 8, 45, 1 copyvar VAR_0x8008, VAR_RESULT compare VAR_RESULT, 0 - call_if 1, BattleFrontier_BattleTowerLobby_EventScript_28CC38 + call_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC38 compare VAR_RESULT, 1 - call_if 1, BattleFrontier_BattleTowerLobby_EventScript_28CC41 + call_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC41 msgbox BattleFrontier_BattleTowerLobby_Text_27F97A, MSGBOX_DEFAULT setvar VAR_0x8004, 12 copyvar VAR_0x8005, VAR_0x8009 @@ -9105,9 +9098,9 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_2C40A2:: @ 82C40A2 setvar VAR_0x8004, 25 special CallBattlePikeFunction compare VAR_RESULT, 1 - call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4128 + call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4128 compare VAR_RESULT, 1 - call_if 5, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4136 + call_if_ne BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4136 setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 special CallBattlePikeFunction @@ -9127,9 +9120,9 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_2C40A2:: @ 82C40A2 setvar VAR_0x8004, 3 special CallBattlePikeFunction compare VAR_RESULT, 1 - call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4144 + call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4144 compare VAR_RESULT, 0 - call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C415C + call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C415C waitstate end @@ -9169,9 +9162,9 @@ BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4174:: @ 82C4174 setvar VAR_0x8004, 25 special CallBattlePikeFunction compare VAR_RESULT, 1 - call_if 1, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4128 + call_if_eq BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4128 compare VAR_RESULT, 1 - call_if 5, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4136 + call_if_ne BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4136 setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 special CallBattlePikeFunction @@ -9191,9 +9184,9 @@ BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4174:: @ 82C4174 setvar VAR_0x8004, 3 special CallBattlePikeFunction compare VAR_RESULT, 1 - call_if 1, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4144 + call_if_eq BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4144 compare VAR_RESULT, 0 - call_if 1, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C415C + call_if_eq BattleFrontier_BattlePikeRandomRoom3_EventScript_2C415C waitstate end diff --git a/data/maps/AbandonedShip_Corridors_B1F/scripts.inc b/data/maps/AbandonedShip_Corridors_B1F/scripts.inc index 9e26a7df4..cfdf40163 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/scripts.inc +++ b/data/maps/AbandonedShip_Corridors_B1F/scripts.inc @@ -8,10 +8,8 @@ AbandonedShip_Corridors_B1F_MapScript1_237D8F: @ 8237D8F end AbandonedShip_Corridors_B1F_MapScript1_237D98: @ 8237D98 - checkflag FLAG_0x0EF - call_if 0, AbandonedShip_Corridors_B1F_EventScript_237DAB - checkflag FLAG_0x0EF - call_if 1, AbandonedShip_Corridors_B1F_EventScript_237DB5 + call_if_unset FLAG_0x0EF, AbandonedShip_Corridors_B1F_EventScript_237DAB + call_if_set FLAG_0x0EF, AbandonedShip_Corridors_B1F_EventScript_237DB5 end AbandonedShip_Corridors_B1F_EventScript_237DAB:: @ 8237DAB diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc index ad9166dfa..cb60d7962 100644 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc +++ b/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc @@ -8,22 +8,14 @@ AbandonedShip_HiddenFloorCorridors_MapScript1_238977: @ 8238977 end AbandonedShip_HiddenFloorCorridors_MapScript1_238980: @ 8238980 - checkflag FLAG_0x0F0 - call_if 0, AbandonedShip_HiddenFloorCorridors_EventScript_2389F1 - checkflag FLAG_0x0F1 - call_if 0, AbandonedShip_HiddenFloorCorridors_EventScript_2389FB - checkflag FLAG_0x0F2 - call_if 0, AbandonedShip_HiddenFloorCorridors_EventScript_238A05 - checkflag FLAG_0x0F3 - call_if 0, AbandonedShip_HiddenFloorCorridors_EventScript_238A0F - checkflag FLAG_0x0F0 - call_if 1, AbandonedShip_HiddenFloorCorridors_EventScript_2389C9 - checkflag FLAG_0x0F1 - call_if 1, AbandonedShip_HiddenFloorCorridors_EventScript_2389D3 - checkflag FLAG_0x0F2 - call_if 1, AbandonedShip_HiddenFloorCorridors_EventScript_2389DD - checkflag FLAG_0x0F3 - call_if 1, AbandonedShip_HiddenFloorCorridors_EventScript_2389E7 + call_if_unset FLAG_0x0F0, AbandonedShip_HiddenFloorCorridors_EventScript_2389F1 + call_if_unset FLAG_0x0F1, AbandonedShip_HiddenFloorCorridors_EventScript_2389FB + call_if_unset FLAG_0x0F2, AbandonedShip_HiddenFloorCorridors_EventScript_238A05 + call_if_unset FLAG_0x0F3, AbandonedShip_HiddenFloorCorridors_EventScript_238A0F + call_if_set FLAG_0x0F0, AbandonedShip_HiddenFloorCorridors_EventScript_2389C9 + call_if_set FLAG_0x0F1, AbandonedShip_HiddenFloorCorridors_EventScript_2389D3 + call_if_set FLAG_0x0F2, AbandonedShip_HiddenFloorCorridors_EventScript_2389DD + call_if_set FLAG_0x0F3, AbandonedShip_HiddenFloorCorridors_EventScript_2389E7 end AbandonedShip_HiddenFloorCorridors_EventScript_2389C9:: @ 82389C9 diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc b/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc index 6d3592f2f..f8ecc9001 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc +++ b/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc @@ -11,11 +11,11 @@ AbandonedShip_HiddenFloorRooms_EventScript_238C59:: @ 8238C59 getplayerxy VAR_TEMP_2, VAR_TEMP_3 setvar VAR_TEMP_4, 1 compare VAR_TEMP_2, 21 - call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_238CD1 + call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238CD1 compare VAR_TEMP_2, 36 - call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_238CD7 + call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238CD7 compare VAR_TEMP_3, 2 - call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_238CDD + call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238CDD switch VAR_TEMP_4 case 1, AbandonedShip_HiddenFloorRooms_EventScript_238CE3 case 2, AbandonedShip_HiddenFloorRooms_EventScript_238D0C @@ -45,7 +45,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_238CE3:: @ 8238CE3 dofieldeffect 54 specialvar VAR_RESULT, FoundAbandonedShipRoom4Key compare VAR_RESULT, 0 - call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_238DD3 + call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238DD3 waitfieldeffect 54 delay 10 end @@ -59,7 +59,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_238D0D:: @ 8238D0D goto_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238D32 delay 20 compare VAR_RESULT, 0 - call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_238DB3 + call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238DB3 waitfieldeffect 54 delay 10 end @@ -79,7 +79,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_238D33:: @ 8238D33 dofieldeffect 54 specialvar VAR_RESULT, FoundAbandonedShipRoom6Key compare VAR_RESULT, 0 - call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_238DE3 + call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238DE3 waitfieldeffect 54 delay 10 end @@ -100,7 +100,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_238D6B:: @ 8238D6B dofieldeffect 54 specialvar VAR_RESULT, FoundAbandonedShipRoom2Key compare VAR_RESULT, 0 - call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_238DC3 + call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238DC3 waitfieldeffect 54 delay 10 end diff --git a/data/maps/AncientTomb/scripts.inc b/data/maps/AncientTomb/scripts.inc index 4ad411539..133db13a5 100644 --- a/data/maps/AncientTomb/scripts.inc +++ b/data/maps/AncientTomb/scripts.inc @@ -5,8 +5,7 @@ AncientTomb_MapScripts:: @ 8238FB3 .byte 0 AncientTomb_MapScript1_238FC3: @ 8238FC3 - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, AncientTomb_EventScript_238FCD + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, AncientTomb_EventScript_238FCD end AncientTomb_EventScript_238FCD:: @ 8238FCD @@ -18,8 +17,7 @@ AncientTomb_EventScript_238FCD:: @ 8238FCD AncientTomb_MapScript1_238FE1: @ 8238FE1 setflag FLAG_LANDMARK_ANCIENT_TOMB - checkflag FLAG_0x1BD - call_if 0, AncientTomb_EventScript_238FEE + call_if_unset FLAG_0x1BD, AncientTomb_EventScript_238FEE end AncientTomb_EventScript_238FEE:: @ 8238FEE @@ -27,8 +25,7 @@ AncientTomb_EventScript_238FEE:: @ 8238FEE return AncientTomb_MapScript1_238FF2: @ 8238FF2 - checkflag FLAG_SYS_BRAILLE_FLY - call_if 0, AncientTomb_EventScript_238FFC + call_if_unset FLAG_SYS_BRAILLE_FLY, AncientTomb_EventScript_238FFC end AncientTomb_EventScript_238FFC:: @ 8238FFC diff --git a/data/maps/AquaHideout_B1F/scripts.inc b/data/maps/AquaHideout_B1F/scripts.inc index f49e86818..6a388e625 100644 --- a/data/maps/AquaHideout_B1F/scripts.inc +++ b/data/maps/AquaHideout_B1F/scripts.inc @@ -4,8 +4,7 @@ AquaHideout_B1F_MapScripts:: @ 82339A7 .byte 0 AquaHideout_B1F_MapScript1_2339B2: @ 82339B2 - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, AquaHideout_B1F_EventScript_2339BC + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, AquaHideout_B1F_EventScript_2339BC end AquaHideout_B1F_EventScript_2339BC:: @ 82339BC @@ -16,10 +15,8 @@ AquaHideout_B1F_EventScript_2339BC:: @ 82339BC return AquaHideout_B1F_MapScript1_2339D0: @ 82339D0 - checkflag FLAG_0x1C4 - call_if 0, AquaHideout_B1F_EventScript_2339E3 - checkflag FLAG_0x1C5 - call_if 0, AquaHideout_B1F_EventScript_2339E7 + call_if_unset FLAG_0x1C4, AquaHideout_B1F_EventScript_2339E3 + call_if_unset FLAG_0x1C5, AquaHideout_B1F_EventScript_2339E7 end AquaHideout_B1F_EventScript_2339E3:: @ 82339E3 diff --git a/data/maps/AquaHideout_B2F/scripts.inc b/data/maps/AquaHideout_B2F/scripts.inc index 584a1a3e1..ab120193d 100644 --- a/data/maps/AquaHideout_B2F/scripts.inc +++ b/data/maps/AquaHideout_B2F/scripts.inc @@ -3,8 +3,7 @@ AquaHideout_B2F_MapScripts:: @ 8233DCF .byte 0 AquaHideout_B2F_MapScript1_233DD5: @ 8233DD5 - checkflag FLAG_0x070 - call_if 1, AquaHideout_B2F_EventScript_233DDF + call_if_set FLAG_0x070, AquaHideout_B2F_EventScript_233DDF end AquaHideout_B2F_EventScript_233DDF:: @ 8233DDF diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc index 0caf9c88c..4e25289e6 100644 --- a/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc @@ -155,17 +155,17 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0:: @ 82576B0 setvar VAR_0x8005, 2 special CallFrontierUtilFunc compare VAR_RESULT, 1 - call_if 1, BattleFrontier_BattleArenaBattleRoom_EventScript_257870 + call_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257870 compare VAR_RESULT, 2 - call_if 1, BattleFrontier_BattleArenaBattleRoom_EventScript_257877 + call_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257877 compare VAR_RESULT, 3 - call_if 1, BattleFrontier_BattleArenaBattleRoom_EventScript_25787E + call_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_25787E compare VAR_RESULT, 4 - call_if 1, BattleFrontier_BattleArenaBattleRoom_EventScript_257885 + call_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257885 compare VAR_RESULT, 5 - call_if 1, BattleFrontier_BattleArenaBattleRoom_EventScript_25788C + call_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_25788C compare VAR_RESULT, 6 - call_if 1, BattleFrontier_BattleArenaBattleRoom_EventScript_257893 + call_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257893 call BattleFrontier_BattleArenaBattleRoom_EventScript_23E8E0 compare VAR_RESULT, 1 goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257768 diff --git a/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc b/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc index 700671776..2f6b15823 100644 --- a/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc @@ -215,9 +215,9 @@ BattleFrontier_BattleArenaLobby_EventScript_255F54:: @ 8255F54 setvar VAR_0x8005, 1 special CallFrontierUtilFunc compare VAR_RESULT, 0 - call_if 1, BattleFrontier_BattleArenaLobby_EventScript_256005 + call_if_eq BattleFrontier_BattleArenaLobby_EventScript_256005 compare VAR_RESULT, 1 - call_if 1, BattleFrontier_BattleArenaLobby_EventScript_256050 + call_if_eq BattleFrontier_BattleArenaLobby_EventScript_256050 warp MAP_BATTLE_FRONTIER_BATTLE_ARENA_CORRIDOR, 255, 9, 13 setvar VAR_TEMP_0, 0 waitstate diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc index 6adba167b..986d45073 100644 --- a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc @@ -13,7 +13,7 @@ BattleFrontier_BattleDomeBattleRoom_MapScript1_24BCB1: @ 824BCB1 special CallFrontierUtilFunc copyvar VAR_TEMP_F, VAR_RESULT compare VAR_RESULT, 0 - call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C919 + call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C919 call BattleFrontier_BattleDomeBattleRoom_EventScript_24BCDC end @@ -42,7 +42,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BD0A:: @ 824BD0A lockall call BattleFrontier_BattleDomeBattleRoom_EventScript_24C1BD compare VAR_RESULT, 0 - call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C938 + call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C938 applymovement 1, BattleFrontier_BattleDomeBattleRoom_Movement_2725B4 waitmovement 0 call BattleFrontier_BattleDomeBattleRoom_EventScript_24BFD5 @@ -119,11 +119,11 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BE4F:: @ 824BE4F setvar VAR_0x8004, 4 special CallBattleDomeFunction compare VAR_TEMP_2, 0 - call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BEB1 + call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BEB1 compare VAR_TEMP_2, 1 - call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BEC5 + call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BEC5 compare VAR_TEMP_2, 2 - call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BED9 + call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BED9 playse SE_W227B call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E delay 60 @@ -166,9 +166,9 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BEE0:: @ 824BEE0 applymovement 1, BattleFrontier_BattleDomeBattleRoom_Movement_2725B4 waitmovement 0 compare VAR_TEMP_2, 0 - call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BFC3 + call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BFC3 compare VAR_TEMP_2, 1 - call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BFCC + call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BFCC playse SE_W227B call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E delay 60 @@ -573,7 +573,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C4EF:: @ 824C4EF BattleFrontier_BattleDomeBattleRoom_MapScript1_24C4F0: @ 824C4F0 compare VAR_TEMP_9, 1 - call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C4FC + call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C4FC end BattleFrontier_BattleDomeBattleRoom_EventScript_24C4FC:: @ 824C4FC @@ -582,13 +582,13 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C4FC:: @ 824C4FC BattleFrontier_BattleDomeBattleRoom_EventScript_24C502:: @ 824C502 compare VAR_TEMP_F, 0 - call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C52F + call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C52F compare VAR_TEMP_F, 1 - call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C530 + call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C530 compare VAR_TEMP_F, 2 - call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C594 + call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C594 compare VAR_TEMP_F, 3 - call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C652 + call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C652 return BattleFrontier_BattleDomeBattleRoom_EventScript_24C52F:: @ 824C52F diff --git a/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc b/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc index 416937723..3717e2418 100644 --- a/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc @@ -183,15 +183,15 @@ BattleFrontier_BattleDomeLobby_EventScript_249A47:: @ 8249A47 BattleFrontier_BattleDomeLobby_EventScript_249A59:: @ 8249A59 special SavePlayerParty compare VAR_FRONTIER_BATTLE_MODE, 0 - call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249CFD + call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249CFD compare VAR_FRONTIER_BATTLE_MODE, 1 - call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D06 + call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249D06 BattleFrontier_BattleDomeLobby_EventScript_249A72:: @ 8249A72 compare VAR_FRONTIER_BATTLE_MODE, 0 - call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D0F + call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249D0F compare VAR_FRONTIER_BATTLE_MODE, 1 - call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D15 + call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249D15 waitmessage multichoice 17, 6, 23, 0 switch VAR_RESULT @@ -273,9 +273,9 @@ BattleFrontier_BattleDomeLobby_EventScript_249BC2:: @ 8249BC2 BattleFrontier_BattleDomeLobby_EventScript_249BFA:: @ 8249BFA compare VAR_FRONTIER_BATTLE_MODE, 0 - call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D1B + call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249D1B compare VAR_FRONTIER_BATTLE_MODE, 1 - call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D24 + call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249D24 goto BattleFrontier_BattleDomeLobby_EventScript_249A72 BattleFrontier_BattleDomeLobby_EventScript_249C15:: @ 8249C15 @@ -310,26 +310,26 @@ BattleFrontier_BattleDomeLobby_EventScript_249C6C:: @ 8249C6C BattleFrontier_BattleDomeLobby_EventScript_249C6E:: @ 8249C6E compare VAR_FRONTIER_BATTLE_MODE, 0 - call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249CDD + call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249CDD compare VAR_FRONTIER_BATTLE_MODE, 1 - call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249CE5 + call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249CE5 applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomeLobby_Movement_249D45 waitmovement 0 compare VAR_FRONTIER_BATTLE_MODE, 0 - call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D2D + call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249D2D compare VAR_FRONTIER_BATTLE_MODE, 1 - call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D33 + call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249D33 waitdooranim compare VAR_FRONTIER_BATTLE_MODE, 0 - call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249CED + call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249CED compare VAR_FRONTIER_BATTLE_MODE, 1 - call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249CF5 + call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249CF5 applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomeLobby_Movement_249D4E waitmovement 0 compare VAR_FRONTIER_BATTLE_MODE, 0 - call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D39 + call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249D39 compare VAR_FRONTIER_BATTLE_MODE, 1 - call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D3F + call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249D3F waitdooranim return @@ -435,13 +435,13 @@ BattleFrontier_BattleDomeLobby_EventScript_249D84:: @ 8249D84 setvar VAR_0x8005, 9 special CallBattleDomeFunction compare VAR_RESULT, 0 - call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249DC9 + call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249DC9 compare VAR_RESULT, 1 - call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249DD2 + call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249DD2 compare VAR_RESULT, 2 - call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249DDB + call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249DDB compare VAR_RESULT, 3 - call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249DE4 + call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249DE4 fadescreen 1 setvar VAR_0x8004, 8 special CallBattleDomeFunction diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc index dd0c2ce4c..c80043792 100644 --- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc @@ -9,9 +9,9 @@ BattleFrontier_BattleFactoryBattleRoom_MapScript1_25ADBB: @ 825ADBB special CallFrontierUtilFunc checkplayergender compare VAR_RESULT, 0 - call_if 1, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE25 + call_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE25 compare VAR_RESULT, 1 - call_if 1, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE2B + call_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE2B setvar VAR_0x8004, 9 special CallFrontierUtilFunc copyvar VAR_TEMP_F, VAR_RESULT diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc b/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc index 7548c2a28..6ee39d5fa 100644 --- a/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc @@ -156,15 +156,15 @@ BattleFrontier_BattleFactoryLobby_EventScript_2585DD:: @ 82585DD BattleFrontier_BattleFactoryLobby_EventScript_2585ED:: @ 82585ED special SavePlayerParty compare VAR_FRONTIER_BATTLE_MODE, 0 - call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_2587B1 + call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_2587B1 compare VAR_FRONTIER_BATTLE_MODE, 1 - call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_2587BA + call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_2587BA BattleFrontier_BattleFactoryLobby_EventScript_258606:: @ 8258606 compare VAR_FRONTIER_BATTLE_MODE, 0 - call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_2587C3 + call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_2587C3 compare VAR_FRONTIER_BATTLE_MODE, 1 - call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_2587C9 + call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_2587C9 waitmessage multichoice 17, 6, 23, 0 switch VAR_RESULT @@ -219,9 +219,9 @@ BattleFrontier_BattleFactoryLobby_EventScript_25871A:: @ 825871A msgbox BattleFrontier_BattleFactoryLobby_Text_258CB1, MSGBOX_DEFAULT closemessage compare VAR_FRONTIER_BATTLE_MODE, 0 - call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_25875C + call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_25875C compare VAR_FRONTIER_BATTLE_MODE, 1 - call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_258762 + call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_258762 applymovement VAR_LAST_TALKED, BattleFrontier_BattleFactoryLobby_Movement_2587A7 applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleFactoryLobby_Movement_2587AC waitmovement 0 @@ -240,9 +240,9 @@ BattleFrontier_BattleFactoryLobby_EventScript_258762:: @ 8258762 BattleFrontier_BattleFactoryLobby_EventScript_258768:: @ 8258768 compare VAR_FRONTIER_BATTLE_MODE, 0 - call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_2587CF + call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_2587CF compare VAR_FRONTIER_BATTLE_MODE, 1 - call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_2587D8 + call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_2587D8 goto BattleFrontier_BattleFactoryLobby_EventScript_258606 BattleFrontier_BattleFactoryLobby_EventScript_258783:: @ 8258783 diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc index a79f792eb..9018bbb70 100644 --- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc @@ -56,9 +56,9 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74:: @ 8259B74 closemessage call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_23F2B7 compare VAR_RESULT, 0 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A17C + call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A17C compare VAR_RESULT, 1 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A18B + call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A18B waitmovement 0 warp MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM, 255, 6, 11 waitstate @@ -104,17 +104,17 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C26:: @ 8259C26 setvar VAR_0x8005, 2 special CallFrontierUtilFunc compare VAR_RESULT, 1 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E1D + call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E1D compare VAR_RESULT, 2 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E24 + call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E24 compare VAR_RESULT, 3 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E2B + call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E2B compare VAR_RESULT, 4 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E32 + call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E32 compare VAR_RESULT, 5 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E39 + call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E39 compare VAR_RESULT, 6 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E40 + call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E40 call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_23E8E0 compare VAR_RESULT, 1 goto_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259CC6 @@ -250,41 +250,41 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E69:: @ 8259E69 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E93:: @ 8259E93 msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A3B4, MSGBOX_DEFAULT compare VAR_0x8005, 0 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F62 + call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F62 compare VAR_0x8005, 1 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F6B + call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F6B compare VAR_0x8005, 2 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F74 + call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F74 compare VAR_0x8005, 3 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F7D + call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F7D compare VAR_0x8005, 4 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F86 + call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F86 compare VAR_0x8005, 5 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F8F + call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F8F compare VAR_0x8005, 6 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F98 + call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F98 compare VAR_0x8005, 7 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FA1 + call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FA1 compare VAR_0x8005, 8 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FAA + call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FAA compare VAR_0x8005, 10 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FB3 + call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FB3 compare VAR_0x8005, 11 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FBC + call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FBC compare VAR_0x8005, 12 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FC5 + call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FC5 compare VAR_0x8005, 13 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FCE + call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FCE compare VAR_0x8005, 14 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FD7 + call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FD7 compare VAR_0x8005, 15 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FE0 + call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FE0 compare VAR_0x8005, 16 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FE9 + call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FE9 compare VAR_0x8005, 17 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FF2 + call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FF2 compare VAR_0x8005, 18 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FFB + call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FFB return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F62:: @ 8259F62 @@ -361,23 +361,23 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FFB:: @ 8259FFB BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A004:: @ 825A004 compare VAR_0x8006, 0 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A068 + call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A068 compare VAR_0x8006, 1 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A071 + call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A071 compare VAR_0x8006, 2 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A07A + call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A07A compare VAR_0x8006, 3 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A083 + call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A083 compare VAR_0x8006, 4 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A08C + call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A08C compare VAR_0x8006, 5 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A095 + call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A095 compare VAR_0x8006, 6 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A09E + call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A09E compare VAR_0x8006, 7 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0A7 + call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0A7 compare VAR_0x8006, 8 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B0 + call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B0 return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A068:: @ 825A068 diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc index 569fc3809..086c55b17 100644 --- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc @@ -112,17 +112,17 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A:: @ 824F98A setvar VAR_0x8005, 2 special CallFrontierUtilFunc compare VAR_RESULT, 1 - call_if 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE66 + call_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE66 compare VAR_RESULT, 2 - call_if 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE6D + call_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE6D compare VAR_RESULT, 3 - call_if 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE74 + call_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE74 compare VAR_RESULT, 4 - call_if 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE7B + call_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE7B compare VAR_RESULT, 5 - call_if 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE82 + call_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE82 compare VAR_RESULT, 6 - call_if 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE89 + call_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE89 call BattleFrontier_BattlePalaceBattleRoom_EventScript_23E8E0 compare VAR_RESULT, 1 goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FA42 diff --git a/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc b/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc index fb4503370..071f61a09 100644 --- a/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc +++ b/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc @@ -15,15 +15,15 @@ BattleFrontier_BattlePalaceCorridor_EventScript_24F4B3:: @ 824F4B3 setvar VAR_0x8004, 3 special CallBattlePalaceFunction compare VAR_RESULT, 0 - call_if 1, BattleFrontier_BattlePalaceCorridor_EventScript_24F58B + call_if_eq BattleFrontier_BattlePalaceCorridor_EventScript_24F58B compare VAR_RESULT, 1 - call_if 1, BattleFrontier_BattlePalaceCorridor_EventScript_24F594 + call_if_eq BattleFrontier_BattlePalaceCorridor_EventScript_24F594 compare VAR_RESULT, 2 - call_if 1, BattleFrontier_BattlePalaceCorridor_EventScript_24F59D + call_if_eq BattleFrontier_BattlePalaceCorridor_EventScript_24F59D compare VAR_RESULT, 3 - call_if 1, BattleFrontier_BattlePalaceCorridor_EventScript_24F5A6 + call_if_eq BattleFrontier_BattlePalaceCorridor_EventScript_24F5A6 compare VAR_RESULT, 4 - call_if 1, BattleFrontier_BattlePalaceCorridor_EventScript_24F5AF + call_if_eq BattleFrontier_BattlePalaceCorridor_EventScript_24F5AF closemessage setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc b/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc index 55526526a..170d14ad8 100644 --- a/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc @@ -154,15 +154,15 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D968:: @ 824D968 goto_if_ne BattleFrontier_BattlePalaceLobby_EventScript_24D817 special SavePlayerParty compare VAR_FRONTIER_BATTLE_MODE, 0 - call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DB9E + call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB9E compare VAR_FRONTIER_BATTLE_MODE, 1 - call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DBA7 + call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DBA7 BattleFrontier_BattlePalaceLobby_EventScript_24D999:: @ 824D999 compare VAR_FRONTIER_BATTLE_MODE, 0 - call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DBB0 + call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DBB0 compare VAR_FRONTIER_BATTLE_MODE, 1 - call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DBB6 + call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DBB6 waitmessage multichoice 17, 6, 23, 0 switch VAR_RESULT @@ -299,24 +299,24 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DBB6:: @ 824DBB6 BattleFrontier_BattlePalaceLobby_EventScript_24DBBC:: @ 824DBBC compare VAR_FRONTIER_BATTLE_MODE, 0 - call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DC23 + call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DC23 compare VAR_FRONTIER_BATTLE_MODE, 1 - call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DC29 + call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DC29 applymovement VAR_LAST_TALKED, BattleFrontier_BattlePalaceLobby_Movement_24DC47 applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePalaceLobby_Movement_24DC47 waitmovement 0 compare VAR_FRONTIER_BATTLE_MODE, 0 - call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DC2F + call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DC2F compare VAR_FRONTIER_BATTLE_MODE, 1 - call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DC35 + call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DC35 waitdooranim applymovement VAR_LAST_TALKED, BattleFrontier_BattlePalaceLobby_Movement_24DC49 applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePalaceLobby_Movement_24DC4C waitmovement 0 compare VAR_FRONTIER_BATTLE_MODE, 0 - call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DC3B + call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DC3B compare VAR_FRONTIER_BATTLE_MODE, 1 - call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DC41 + call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DC41 waitdooranim return diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc index 6509310f5..1c810900c 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc @@ -321,9 +321,9 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D605:: @ 825D605 special CallBattlePikeFunction copyvar VAR_0x8004, VAR_RESULT compare VAR_0x8004, 0 - call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D643 + call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D643 compare VAR_0x8004, 1 - call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D6D5 + call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D6D5 msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DD3F, MSGBOX_DEFAULT closemessage releaseall @@ -338,13 +338,13 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D643:: @ 825D643 setvar VAR_0x8004, 11 special CallBattlePikeFunction compare VAR_RESULT, 2 - call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D751 + call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D751 compare VAR_RESULT, 1 - call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D758 + call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D758 compare VAR_RESULT, 3 - call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D75F + call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D75F compare VAR_RESULT, 4 - call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D766 + call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D766 setvar VAR_0x8004, 15 special CallBattlePikeFunction waitstate @@ -375,9 +375,9 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D6D5:: @ 825D6D5 setvar VAR_0x8004, 11 special CallBattlePikeFunction compare VAR_RESULT, 0 - call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D76D + call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D76D compare VAR_RESULT, 1 - call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D774 + call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D774 setvar VAR_0x8004, 15 special CallBattlePikeFunction waitstate @@ -608,9 +608,9 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D83E:: @ 825D83E setvar VAR_0x8004, 13 special CallBattlePikeFunction compare VAR_RESULT, 2 - call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D881 + call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D881 compare VAR_RESULT, 1 - call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D875 + call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D875 playfanfare MUS_ME_ASA waitfanfare msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DABE, MSGBOX_DEFAULT diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc index de410d9c5..1ae42279a 100644 --- a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc @@ -63,7 +63,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_2507D2:: @ 82507D2 BattleFrontier_BattlePyramidLobby_EventScript_2507DA:: @ 82507DA special sub_81B95E0 compare VAR_RESULT, 1 - call_if 1, BattleFrontier_BattlePyramidLobby_EventScript_250DDB + call_if_eq BattleFrontier_BattlePyramidLobby_EventScript_250DDB clearflag FLAG_SPECIAL_FLAG_0x4004 setvar VAR_0x8004, 8 special CallFrontierUtilFunc diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc index c505cf8cb..1e953db23 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc @@ -76,7 +76,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241C2F:: @ 8241C2F setvar VAR_0x8004, 9 special CallFrontierUtilFunc compare VAR_RESULT, 0 - call_if 5, BattleFrontier_BattleTowerBattleRoom_EventScript_241EC3 + call_if_ne BattleFrontier_BattleTowerBattleRoom_EventScript_241EC3 applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_24218D waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_24217E diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc index 9fe2cec0e..d80eda53c 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc @@ -6,9 +6,9 @@ BattleFrontier_BattleTowerBattleRoom2_MapScripts:: @ 8248EE8 BattleFrontier_BattleTowerBattleRoom2_MapScript1_248EF8: @ 8248EF8 compare VAR_FRONTIER_BATTLE_MODE, 2 - call_if 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_248F0F + call_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_248F0F compare VAR_FRONTIER_BATTLE_MODE, 3 - call_if 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_248F2F + call_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_248F2F end BattleFrontier_BattleTowerBattleRoom2_EventScript_248F0F:: @ 8248F0F @@ -158,7 +158,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249121:: @ 8249121 setvar VAR_0x8005, 2 special CallFrontierUtilFunc compare VAR_FRONTIER_BATTLE_MODE, 3 - call_if 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249514 + call_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249514 playfanfare MUS_ME_ASA waitfanfare special HealPlayerParty diff --git a/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc b/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc index 69c61e342..287ed902a 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc @@ -6,9 +6,9 @@ BattleFrontier_BattleTowerCorridor2_MapScripts:: @ 8248D4A BattleFrontier_BattleTowerCorridor2_MapScript1_248D5A: @ 8248D5A compare VAR_FRONTIER_BATTLE_MODE, 2 - call_if 1, BattleFrontier_BattleTowerCorridor2_EventScript_248D71 + call_if_eq BattleFrontier_BattleTowerCorridor2_EventScript_248D71 compare VAR_FRONTIER_BATTLE_MODE, 3 - call_if 1, BattleFrontier_BattleTowerCorridor2_EventScript_248D91 + call_if_eq BattleFrontier_BattleTowerCorridor2_EventScript_248D91 end BattleFrontier_BattleTowerCorridor2_EventScript_248D71:: @ 8248D71 @@ -88,13 +88,13 @@ BattleFrontier_BattleTowerCorridor2_EventScript_248DBC:: @ 8248DBC BattleFrontier_BattleTowerCorridor2_EventScript_248E71:: @ 8248E71 compare VAR_FRONTIER_BATTLE_MODE, 0 - call_if 1, BattleFrontier_BattleTowerCorridor2_EventScript_248E9E + call_if_eq BattleFrontier_BattleTowerCorridor2_EventScript_248E9E compare VAR_FRONTIER_BATTLE_MODE, 1 - call_if 1, BattleFrontier_BattleTowerCorridor2_EventScript_248E9E + call_if_eq BattleFrontier_BattleTowerCorridor2_EventScript_248E9E compare VAR_FRONTIER_BATTLE_MODE, 2 - call_if 1, BattleFrontier_BattleTowerCorridor2_EventScript_248EA8 + call_if_eq BattleFrontier_BattleTowerCorridor2_EventScript_248EA8 compare VAR_FRONTIER_BATTLE_MODE, 3 - call_if 1, BattleFrontier_BattleTowerCorridor2_EventScript_248EB2 + call_if_eq BattleFrontier_BattleTowerCorridor2_EventScript_248EB2 return BattleFrontier_BattleTowerCorridor2_EventScript_248E9E:: @ 8248E9E diff --git a/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc b/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc index 486fc4259..79668a939 100644 --- a/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc @@ -25,13 +25,13 @@ BattleFrontier_BattleTowerElevator_EventScript_2419F0:: @ 82419F0 BattleFrontier_BattleTowerElevator_EventScript_241A28:: @ 8241A28 compare VAR_FRONTIER_BATTLE_MODE, 0 - call_if 1, BattleFrontier_BattleTowerElevator_EventScript_241A55 + call_if_eq BattleFrontier_BattleTowerElevator_EventScript_241A55 compare VAR_FRONTIER_BATTLE_MODE, 1 - call_if 1, BattleFrontier_BattleTowerElevator_EventScript_241A55 + call_if_eq BattleFrontier_BattleTowerElevator_EventScript_241A55 compare VAR_FRONTIER_BATTLE_MODE, 2 - call_if 1, BattleFrontier_BattleTowerElevator_EventScript_241A5F + call_if_eq BattleFrontier_BattleTowerElevator_EventScript_241A5F compare VAR_FRONTIER_BATTLE_MODE, 3 - call_if 1, BattleFrontier_BattleTowerElevator_EventScript_241A72 + call_if_eq BattleFrontier_BattleTowerElevator_EventScript_241A72 return BattleFrontier_BattleTowerElevator_EventScript_241A55:: @ 8241A55 diff --git a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc index dcab741d8..fabae0bf9 100644 --- a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc @@ -213,7 +213,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E8EE:: @ 823E8EE lock faceplayer compare VAR_FRONTIER_BATTLE_MODE, 0 - call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23E930 + call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23E930 message BattleFrontier_BattleTowerLobby_Text_23F737 waitmessage message BattleFrontier_BattleTowerLobby_Text_23F754 @@ -806,13 +806,13 @@ BattleFrontier_BattleTowerLobby_Movement_23F1A0: @ 823F1A0 BattleFrontier_BattleTowerLobby_EventScript_23F1A7:: @ 823F1A7 compare VAR_FRONTIER_BATTLE_MODE, 0 - call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F1D4 + call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F1D4 compare VAR_FRONTIER_BATTLE_MODE, 1 - call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F1D9 + call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F1D9 compare VAR_FRONTIER_BATTLE_MODE, 2 - call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F1DE + call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F1DE compare VAR_FRONTIER_BATTLE_MODE, 3 - call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F1E3 + call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F1E3 return BattleFrontier_BattleTowerLobby_EventScript_23F1D4:: @ 823F1D4 @@ -833,13 +833,13 @@ BattleFrontier_BattleTowerLobby_EventScript_23F1E3:: @ 823F1E3 BattleFrontier_BattleTowerLobby_EventScript_23F1E8:: @ 823F1E8 compare VAR_FRONTIER_BATTLE_MODE, 0 - call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F215 + call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F215 compare VAR_FRONTIER_BATTLE_MODE, 1 - call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F21B + call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F21B compare VAR_FRONTIER_BATTLE_MODE, 2 - call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F221 + call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F221 compare VAR_FRONTIER_BATTLE_MODE, 3 - call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F227 + call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F227 return BattleFrontier_BattleTowerLobby_EventScript_23F215:: @ 823F215 @@ -860,13 +860,13 @@ BattleFrontier_BattleTowerLobby_EventScript_23F227:: @ 823F227 BattleFrontier_BattleTowerLobby_EventScript_23F22D:: @ 823F22D compare VAR_FRONTIER_BATTLE_MODE, 0 - call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F25A + call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F25A compare VAR_FRONTIER_BATTLE_MODE, 1 - call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F260 + call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F260 compare VAR_FRONTIER_BATTLE_MODE, 2 - call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F266 + call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F266 compare VAR_FRONTIER_BATTLE_MODE, 3 - call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F26C + call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F26C return BattleFrontier_BattleTowerLobby_EventScript_23F25A:: @ 823F25A @@ -887,13 +887,13 @@ BattleFrontier_BattleTowerLobby_EventScript_23F26C:: @ 823F26C BattleFrontier_BattleTowerLobby_EventScript_23F272:: @ 823F272 compare VAR_FRONTIER_BATTLE_MODE, 0 - call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F29F + call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F29F compare VAR_FRONTIER_BATTLE_MODE, 1 - call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F2A5 + call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F2A5 compare VAR_FRONTIER_BATTLE_MODE, 2 - call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F2AB + call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F2AB compare VAR_FRONTIER_BATTLE_MODE, 3 - call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F2B1 + call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F2B1 return BattleFrontier_BattleTowerLobby_EventScript_23F29F:: @ 823F29F @@ -972,11 +972,11 @@ BattleFrontier_BattleTowerLobby_EventScript_23F351:: @ 823F351 BattleFrontier_BattleTowerLobby_EventScript_23F366:: @ 823F366 special CloseLink compare VAR_0x8005, 0 - call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F394 + call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F394 compare VAR_0x8005, 1 - call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F39D + call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F39D compare VAR_0x8005, 2 - call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F3A6 + call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F3A6 msgbox BattleFrontier_BattleTowerLobby_Text_2413DE, MSGBOX_DEFAULT release end diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc index 8406cb644..42694a2a4 100644 --- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc @@ -191,9 +191,9 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F36:: @ 8243F36 waitbuttonpress closemessage compare VAR_FACING, 1 - call_if 5, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FD4 + call_if_ne BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FD4 compare VAR_FACING, 1 - call_if 1, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FDF + call_if_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FDF removeobject VAR_LAST_TALKED setflag FLAG_0x152 warpsilent MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM, 255, 10, 3 diff --git a/data/maps/BattleFrontier_Lounge1/scripts.inc b/data/maps/BattleFrontier_Lounge1/scripts.inc index 34434ef05..a12c54334 100644 --- a/data/maps/BattleFrontier_Lounge1/scripts.inc +++ b/data/maps/BattleFrontier_Lounge1/scripts.inc @@ -4,10 +4,8 @@ BattleFrontier_Lounge1_MapScripts:: @ 825E774 BattleFrontier_Lounge1_EventScript_25E775:: @ 825E775 lock faceplayer - checkflag FLAG_0x153 - call_if 0, BattleFrontier_Lounge1_EventScript_25E7AD - checkflag FLAG_0x153 - call_if 1, BattleFrontier_Lounge1_EventScript_25E7B6 + call_if_unset FLAG_0x153, BattleFrontier_Lounge1_EventScript_25E7AD + call_if_set FLAG_0x153, BattleFrontier_Lounge1_EventScript_25E7B6 setflag FLAG_0x153 goto BattleFrontier_Lounge1_EventScript_25E792 end diff --git a/data/maps/BattleFrontier_Lounge2/scripts.inc b/data/maps/BattleFrontier_Lounge2/scripts.inc index 40e5c9332..e8c5db1f7 100644 --- a/data/maps/BattleFrontier_Lounge2/scripts.inc +++ b/data/maps/BattleFrontier_Lounge2/scripts.inc @@ -17,29 +17,29 @@ BattleFrontier_Lounge2_EventScript_26065F:: @ 826065F BattleFrontier_Lounge2_EventScript_26066D:: @ 826066D compare VAR_FRONTIER_MANIAC_FACILITY, 0 - call_if 1, BattleFrontier_Lounge2_EventScript_26070A + call_if_eq BattleFrontier_Lounge2_EventScript_26070A compare VAR_FRONTIER_MANIAC_FACILITY, 1 - call_if 1, BattleFrontier_Lounge2_EventScript_26070F + call_if_eq BattleFrontier_Lounge2_EventScript_26070F compare VAR_FRONTIER_MANIAC_FACILITY, 2 - call_if 1, BattleFrontier_Lounge2_EventScript_260714 + call_if_eq BattleFrontier_Lounge2_EventScript_260714 compare VAR_FRONTIER_MANIAC_FACILITY, 3 - call_if 1, BattleFrontier_Lounge2_EventScript_260719 + call_if_eq BattleFrontier_Lounge2_EventScript_260719 compare VAR_FRONTIER_MANIAC_FACILITY, 4 - call_if 1, BattleFrontier_Lounge2_EventScript_26071E + call_if_eq BattleFrontier_Lounge2_EventScript_26071E compare VAR_FRONTIER_MANIAC_FACILITY, 5 - call_if 1, BattleFrontier_Lounge2_EventScript_260723 + call_if_eq BattleFrontier_Lounge2_EventScript_260723 compare VAR_FRONTIER_MANIAC_FACILITY, 6 - call_if 1, BattleFrontier_Lounge2_EventScript_260728 + call_if_eq BattleFrontier_Lounge2_EventScript_260728 compare VAR_FRONTIER_MANIAC_FACILITY, 7 - call_if 1, BattleFrontier_Lounge2_EventScript_26072D + call_if_eq BattleFrontier_Lounge2_EventScript_26072D compare VAR_FRONTIER_MANIAC_FACILITY, 8 - call_if 1, BattleFrontier_Lounge2_EventScript_260732 + call_if_eq BattleFrontier_Lounge2_EventScript_260732 compare VAR_FRONTIER_MANIAC_FACILITY, 9 - call_if 1, BattleFrontier_Lounge2_EventScript_260737 + call_if_eq BattleFrontier_Lounge2_EventScript_260737 compare VAR_FRONTIER_MANIAC_FACILITY, 3 - call_if 3, BattleFrontier_Lounge2_EventScript_2606F8 + call_if_le BattleFrontier_Lounge2_EventScript_2606F8 compare VAR_FRONTIER_MANIAC_FACILITY, 4 - call_if 4, BattleFrontier_Lounge2_EventScript_260701 + call_if_ge BattleFrontier_Lounge2_EventScript_260701 special sub_8139F20 waitmessage waitbuttonpress diff --git a/data/maps/BattleFrontier_Lounge3/scripts.inc b/data/maps/BattleFrontier_Lounge3/scripts.inc index 3c5b74b4a..4b0b23bc8 100644 --- a/data/maps/BattleFrontier_Lounge3/scripts.inc +++ b/data/maps/BattleFrontier_Lounge3/scripts.inc @@ -85,20 +85,13 @@ BattleFrontier_Lounge3_EventScript_261E96:: @ 8261E96 BattleFrontier_Lounge3_EventScript_261EA0:: @ 8261EA0 setvar VAR_0x8004, 0 - checkflag FLAG_SYS_TOWER_SILVER - call_if 1, BattleFrontier_Lounge3_EventScript_261EE5 - checkflag FLAG_SYS_DOME_SILVER - call_if 1, BattleFrontier_Lounge3_EventScript_261EE5 - checkflag FLAG_SYS_PALACE_SILVER - call_if 1, BattleFrontier_Lounge3_EventScript_261EE5 - checkflag FLAG_SYS_ARENA_SILVER - call_if 1, BattleFrontier_Lounge3_EventScript_261EE5 - checkflag FLAG_SYS_FACTORY_SILVER - call_if 1, BattleFrontier_Lounge3_EventScript_261EE5 - checkflag FLAG_SYS_PIKE_SILVER - call_if 1, BattleFrontier_Lounge3_EventScript_261EE5 - checkflag FLAG_SYS_PYRAMID_SILVER - call_if 1, BattleFrontier_Lounge3_EventScript_261EE5 + call_if_set FLAG_SYS_TOWER_SILVER, BattleFrontier_Lounge3_EventScript_261EE5 + call_if_set FLAG_SYS_DOME_SILVER, BattleFrontier_Lounge3_EventScript_261EE5 + call_if_set FLAG_SYS_PALACE_SILVER, BattleFrontier_Lounge3_EventScript_261EE5 + call_if_set FLAG_SYS_ARENA_SILVER, BattleFrontier_Lounge3_EventScript_261EE5 + call_if_set FLAG_SYS_FACTORY_SILVER, BattleFrontier_Lounge3_EventScript_261EE5 + call_if_set FLAG_SYS_PIKE_SILVER, BattleFrontier_Lounge3_EventScript_261EE5 + call_if_set FLAG_SYS_PYRAMID_SILVER, BattleFrontier_Lounge3_EventScript_261EE5 return BattleFrontier_Lounge3_EventScript_261EE5:: @ 8261EE5 @@ -128,11 +121,11 @@ BattleFrontier_Lounge3_EventScript_261F12:: @ 8261F12 BattleFrontier_Lounge3_EventScript_261F2E:: @ 8261F2E msgbox BattleFrontier_Lounge3_Text_263334, MSGBOX_DEFAULT compare VAR_FRONTIER_GAMBLER_AMOUNT_BET, 0 - call_if 1, BattleFrontier_Lounge3_EventScript_261F80 + call_if_eq BattleFrontier_Lounge3_EventScript_261F80 compare VAR_FRONTIER_GAMBLER_AMOUNT_BET, 1 - call_if 1, BattleFrontier_Lounge3_EventScript_261F8A + call_if_eq BattleFrontier_Lounge3_EventScript_261F8A compare VAR_FRONTIER_GAMBLER_AMOUNT_BET, 2 - call_if 1, BattleFrontier_Lounge3_EventScript_261F94 + call_if_eq BattleFrontier_Lounge3_EventScript_261F94 msgbox BattleFrontier_Lounge3_Text_2633D4, 9 special sub_813A9D0 msgbox BattleFrontier_Lounge3_Text_2633F2, MSGBOX_DEFAULT diff --git a/data/maps/BattleFrontier_OutsideEast/scripts.inc b/data/maps/BattleFrontier_OutsideEast/scripts.inc index 317e818ba..401f5565d 100644 --- a/data/maps/BattleFrontier_OutsideEast/scripts.inc +++ b/data/maps/BattleFrontier_OutsideEast/scripts.inc @@ -4,8 +4,7 @@ BattleFrontier_OutsideEast_MapScripts:: @ 8242C04 .byte 0 BattleFrontier_OutsideEast_MapScript1_242C0F: @ 8242C0F - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, BattleFrontier_OutsideEast_EventScript_242C19 + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, BattleFrontier_OutsideEast_EventScript_242C19 end BattleFrontier_OutsideEast_EventScript_242C19:: @ 8242C19 @@ -18,8 +17,7 @@ BattleFrontier_OutsideEast_EventScript_242C19:: @ 8242C19 BattleFrontier_OutsideEast_MapScript1_242C2D: @ 8242C2D setvar VAR_0x40BC, 0 setflag FLAG_HIDE_BATTLE_TOWER_REPORTER - checkflag FLAG_0x1C6 - call_if 0, BattleFrontier_OutsideEast_EventScript_242C3F + call_if_unset FLAG_0x1C6, BattleFrontier_OutsideEast_EventScript_242C3F end BattleFrontier_OutsideEast_EventScript_242C3F:: @ 8242C3F diff --git a/data/maps/BattleFrontier_OutsideWest/scripts.inc b/data/maps/BattleFrontier_OutsideWest/scripts.inc index 57b81117f..da5724259 100644 --- a/data/maps/BattleFrontier_OutsideWest/scripts.inc +++ b/data/maps/BattleFrontier_OutsideWest/scripts.inc @@ -145,13 +145,13 @@ BattleFrontier_OutsideWest_EventScript_23D57F:: @ 823D57F faceplayer delay 20 compare VAR_FACING, 2 - call_if 1, BattleFrontier_OutsideWest_EventScript_23D5BA + call_if_eq BattleFrontier_OutsideWest_EventScript_23D5BA compare VAR_FACING, 1 - call_if 1, BattleFrontier_OutsideWest_EventScript_23D5C5 + call_if_eq BattleFrontier_OutsideWest_EventScript_23D5C5 compare VAR_FACING, 3 - call_if 1, BattleFrontier_OutsideWest_EventScript_23D5BA + call_if_eq BattleFrontier_OutsideWest_EventScript_23D5BA compare VAR_FACING, 4 - call_if 1, BattleFrontier_OutsideWest_EventScript_23D5BA + call_if_eq BattleFrontier_OutsideWest_EventScript_23D5BA msgbox BattleFrontier_OutsideWest_Text_23DC36, MSGBOX_DEFAULT release end @@ -170,13 +170,13 @@ BattleFrontier_OutsideWest_EventScript_23D5C6:: @ 823D5C6 message BattleFrontier_OutsideWest_Text_23DCB0 waitmessage compare VAR_FACING, 2 - call_if 1, BattleFrontier_OutsideWest_EventScript_23D5FD + call_if_eq BattleFrontier_OutsideWest_EventScript_23D5FD compare VAR_FACING, 1 - call_if 1, BattleFrontier_OutsideWest_EventScript_23D608 + call_if_eq BattleFrontier_OutsideWest_EventScript_23D608 compare VAR_FACING, 3 - call_if 1, BattleFrontier_OutsideWest_EventScript_23D613 + call_if_eq BattleFrontier_OutsideWest_EventScript_23D613 compare VAR_FACING, 4 - call_if 1, BattleFrontier_OutsideWest_EventScript_23D61E + call_if_eq BattleFrontier_OutsideWest_EventScript_23D61E waitbuttonpress release end diff --git a/data/maps/BattleFrontier_ScottsHouse/scripts.inc b/data/maps/BattleFrontier_ScottsHouse/scripts.inc index c9d1c7c5f..9f42bc89e 100644 --- a/data/maps/BattleFrontier_ScottsHouse/scripts.inc +++ b/data/maps/BattleFrontier_ScottsHouse/scripts.inc @@ -173,13 +173,13 @@ BattleFrontier_ScottsHouse_EventScript_263943:: @ 8263943 closemessage delay 30 compare VAR_FACING, 2 - call_if 1, BattleFrontier_ScottsHouse_EventScript_263A13 + call_if_eq BattleFrontier_ScottsHouse_EventScript_263A13 compare VAR_FACING, 1 - call_if 1, BattleFrontier_ScottsHouse_EventScript_263A1E + call_if_eq BattleFrontier_ScottsHouse_EventScript_263A1E compare VAR_FACING, 4 - call_if 1, BattleFrontier_ScottsHouse_EventScript_263A29 + call_if_eq BattleFrontier_ScottsHouse_EventScript_263A29 compare VAR_FACING, 3 - call_if 1, BattleFrontier_ScottsHouse_EventScript_263A34 + call_if_eq BattleFrontier_ScottsHouse_EventScript_263A34 msgbox BattleFrontier_ScottsHouse_Text_263B29, MSGBOX_DEFAULT applymovement 1, BattleFrontier_ScottsHouse_Movement_27259E waitmovement 0 diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc index ce0659165..bdc548162 100644 --- a/data/maps/BirthIsland_Exterior/scripts.inc +++ b/data/maps/BirthIsland_Exterior/scripts.inc @@ -13,10 +13,8 @@ BirthIsland_Exterior_MapScript1_267F29: @ 8267F29 setvar VAR_OBJ_GFX_ID_0, 100 setvar VAR_0x4034, 0 setvar VAR_0x4035, 0 - checkflag FLAG_0x1AD - call_if 1, BirthIsland_Exterior_EventScript_267F4E - checkflag FLAG_0x1AD - call_if 0, BirthIsland_Exterior_EventScript_267F55 + call_if_set FLAG_0x1AD, BirthIsland_Exterior_EventScript_267F4E + call_if_unset FLAG_0x1AD, BirthIsland_Exterior_EventScript_267F55 end BirthIsland_Exterior_EventScript_267F4E:: @ 8267F4E @@ -31,8 +29,7 @@ BirthIsland_Exterior_EventScript_267F55:: @ 8267F55 return BirthIsland_Exterior_MapScript1_267F65: @ 8267F65 - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, BirthIsland_Exterior_EventScript_267F6F + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, BirthIsland_Exterior_EventScript_267F6F end BirthIsland_Exterior_EventScript_267F6F:: @ 8267F6F diff --git a/data/maps/CaveOfOrigin_1F/scripts.inc b/data/maps/CaveOfOrigin_1F/scripts.inc index 42c78d4b7..f42cb92f6 100644 --- a/data/maps/CaveOfOrigin_1F/scripts.inc +++ b/data/maps/CaveOfOrigin_1F/scripts.inc @@ -3,7 +3,6 @@ CaveOfOrigin_1F_MapScripts:: @ 8235768 .byte 0 CaveOfOrigin_1F_MapScript1_23576E: @ 823576E - checkflag FLAG_0x071 - call_if 1, CaveOfOrigin_1F_EventScript_2722C1 + call_if_set FLAG_0x071, CaveOfOrigin_1F_EventScript_2722C1 end diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc index 4b4240833..9ac7e4741 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc @@ -3,7 +3,6 @@ CaveOfOrigin_UnusedRubySapphireMap1_MapScripts:: @ 8235778 .byte 0 CaveOfOrigin_UnusedRubySapphireMap1_MapScript1_23577E: @ 823577E - checkflag FLAG_0x071 - call_if 1, CaveOfOrigin_UnusedRubySapphireMap1_EventScript_2722C1 + call_if_set FLAG_0x071, CaveOfOrigin_UnusedRubySapphireMap1_EventScript_2722C1 end diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc index d73ff8231..5743c7c8c 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc @@ -3,7 +3,6 @@ CaveOfOrigin_UnusedRubySapphireMap2_MapScripts:: @ 8235788 .byte 0 CaveOfOrigin_UnusedRubySapphireMap2_MapScript1_23578E: @ 823578E - checkflag FLAG_0x071 - call_if 1, CaveOfOrigin_UnusedRubySapphireMap2_EventScript_2722C1 + call_if_set FLAG_0x071, CaveOfOrigin_UnusedRubySapphireMap2_EventScript_2722C1 end diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc index 7f4fb2ff1..c831218a4 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc @@ -3,7 +3,6 @@ CaveOfOrigin_UnusedRubySapphireMap3_MapScripts:: @ 8235798 .byte 0 CaveOfOrigin_UnusedRubySapphireMap3_MapScript1_23579E: @ 823579E - checkflag FLAG_0x071 - call_if 1, CaveOfOrigin_UnusedRubySapphireMap3_EventScript_2722C1 + call_if_set FLAG_0x071, CaveOfOrigin_UnusedRubySapphireMap3_EventScript_2722C1 end diff --git a/data/maps/DesertRuins/scripts.inc b/data/maps/DesertRuins/scripts.inc index 87872b6c5..685d8f5cf 100644 --- a/data/maps/DesertRuins/scripts.inc +++ b/data/maps/DesertRuins/scripts.inc @@ -5,8 +5,7 @@ DesertRuins_MapScripts:: @ 822D95B .byte 0 DesertRuins_MapScript1_22D96B: @ 822D96B - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, DesertRuins_EventScript_22D975 + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, DesertRuins_EventScript_22D975 end DesertRuins_EventScript_22D975:: @ 822D975 @@ -17,8 +16,7 @@ DesertRuins_EventScript_22D975:: @ 822D975 return DesertRuins_MapScript1_22D989: @ 822D989 - checkflag FLAG_SYS_BRAILLE_STRENGTH - call_if 0, DesertRuins_EventScript_22D993 + call_if_unset FLAG_SYS_BRAILLE_STRENGTH, DesertRuins_EventScript_22D993 end DesertRuins_EventScript_22D993:: @ 822D993 @@ -32,8 +30,7 @@ DesertRuins_EventScript_22D993:: @ 822D993 DesertRuins_MapScript1_22D9CA: @ 822D9CA setflag FLAG_LANDMARK_DESERT_RUINS - checkflag FLAG_0x1BB - call_if 0, DesertRuins_EventScript_22D9D7 + call_if_unset FLAG_0x1BB, DesertRuins_EventScript_22D9D7 end DesertRuins_EventScript_22D9D7:: @ 822D9D7 diff --git a/data/maps/DewfordTown/scripts.inc b/data/maps/DewfordTown/scripts.inc index 4e1209df5..7e16bbcec 100644 --- a/data/maps/DewfordTown/scripts.inc +++ b/data/maps/DewfordTown/scripts.inc @@ -174,10 +174,8 @@ DewfordTown_EventScript_1E96E7:: @ 81E96E7 clearflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN hideobjectat 4, MAP_DEWFORD_TOWN - checkflag FLAG_0x095 - call_if 0, DewfordTown_EventScript_1E9790 - checkflag FLAG_0x095 - call_if 1, DewfordTown_EventScript_1E9799 + call_if_unset FLAG_0x095, DewfordTown_EventScript_1E9790 + call_if_set FLAG_0x095, DewfordTown_EventScript_1E9799 closemessage copyvar VAR_0x4096, VAR_0x8008 resetobjectpriority 255, MAP_DEWFORD_TOWN diff --git a/data/maps/DewfordTown_Gym/scripts.inc b/data/maps/DewfordTown_Gym/scripts.inc index ffe5b850d..1251c714e 100644 --- a/data/maps/DewfordTown_Gym/scripts.inc +++ b/data/maps/DewfordTown_Gym/scripts.inc @@ -175,7 +175,7 @@ DewfordTown_Gym_EventScript_1FC7F7:: @ 81FC7F7 setflag FLAG_BADGE02_GET addvar VAR_0x4085, 1 compare VAR_0x4085, 6 - call_if 1, DewfordTown_Gym_EventScript_271E84 + call_if_eq DewfordTown_Gym_EventScript_271E84 setvar VAR_0x8008, 2 call DewfordTown_Gym_EventScript_271F43 call DewfordTown_Gym_EventScript_1FC855 diff --git a/data/maps/DewfordTown_Hall/scripts.inc b/data/maps/DewfordTown_Hall/scripts.inc index e41a97bcd..450ccb4ec 100644 --- a/data/maps/DewfordTown_Hall/scripts.inc +++ b/data/maps/DewfordTown_Hall/scripts.inc @@ -218,9 +218,9 @@ DewfordTown_Hall_EventScript_1FD772:: @ 81FD772 DewfordTown_Hall_EventScript_1FD793:: @ 81FD793 compare VAR_FACING, 2 - call_if 1, DewfordTown_Hall_EventScript_1FD7AA + call_if_eq DewfordTown_Hall_EventScript_1FD7AA compare VAR_FACING, 1 - call_if 1, DewfordTown_Hall_EventScript_1FD7B5 + call_if_eq DewfordTown_Hall_EventScript_1FD7B5 return DewfordTown_Hall_EventScript_1FD7AA:: @ 81FD7AA diff --git a/data/maps/EverGrandeCity/scripts.inc b/data/maps/EverGrandeCity/scripts.inc index 5bb85a3c1..75327b839 100644 --- a/data/maps/EverGrandeCity/scripts.inc +++ b/data/maps/EverGrandeCity/scripts.inc @@ -3,8 +3,7 @@ EverGrandeCity_MapScripts:: @ 81E7D1B .byte 0 EverGrandeCity_MapScript1_1E7D21: @ 81E7D21 - checkflag FLAG_SYS_WEATHER_CTRL - call_if 1, EverGrandeCity_EventScript_27207A + call_if_set FLAG_SYS_WEATHER_CTRL, EverGrandeCity_EventScript_27207A end EverGrandeCity_EventScript_1E7D2B:: @ 81E7D2B diff --git a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc index d406df106..d0caaabd9 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc +++ b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc @@ -54,9 +54,9 @@ EverGrandeCity_ChampionsRoom_EventScript_228A61:: @ 8228A61 playse SE_DOOR checkplayergender compare VAR_RESULT, 0 - call_if 1, EverGrandeCity_ChampionsRoom_EventScript_228ABC + call_if_eq EverGrandeCity_ChampionsRoom_EventScript_228ABC compare VAR_RESULT, 1 - call_if 1, EverGrandeCity_ChampionsRoom_EventScript_228AC1 + call_if_eq EverGrandeCity_ChampionsRoom_EventScript_228AC1 addobject 2 call EverGrandeCity_ChampionsRoom_EventScript_228BFD checkplayergender @@ -129,9 +129,9 @@ EverGrandeCity_ChampionsRoom_EventScript_228B30:: @ 8228B30 msgbox EverGrandeCity_ChampionsRoom_Text_2293EB, MSGBOX_DEFAULT checkplayergender compare VAR_RESULT, 0 - call_if 1, EverGrandeCity_ChampionsRoom_EventScript_228BEB + call_if_eq EverGrandeCity_ChampionsRoom_EventScript_228BEB compare VAR_RESULT, 1 - call_if 1, EverGrandeCity_ChampionsRoom_EventScript_228BF4 + call_if_eq EverGrandeCity_ChampionsRoom_EventScript_228BF4 closemessage applymovement 1, EverGrandeCity_ChampionsRoom_Movement_228C3F applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_228C20 diff --git a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc index 3607e79eb..ac768b6ea 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc +++ b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc @@ -24,10 +24,9 @@ EverGrandeCity_DrakesRoom_EventScript_2286C5:: @ 82286C5 end EverGrandeCity_DrakesRoom_MapScript1_2286D2: @ 82286D2 - checkflag FLAG_0x4FE - call_if 1, EverGrandeCity_DrakesRoom_EventScript_2286E7 + call_if_set FLAG_0x4FE, EverGrandeCity_DrakesRoom_EventScript_2286E7 compare VAR_0x409C, 4 - call_if 1, EverGrandeCity_DrakesRoom_EventScript_2286ED + call_if_eq EverGrandeCity_DrakesRoom_EventScript_2286ED end EverGrandeCity_DrakesRoom_EventScript_2286E7:: @ 82286E7 diff --git a/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc index 889a7720e..c369187ad 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc +++ b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc @@ -24,10 +24,9 @@ EverGrandeCity_GlaciasRoom_EventScript_22843B:: @ 822843B end EverGrandeCity_GlaciasRoom_MapScript1_228448: @ 8228448 - checkflag FLAG_0x4FD - call_if 1, EverGrandeCity_GlaciasRoom_EventScript_22845D + call_if_set FLAG_0x4FD, EverGrandeCity_GlaciasRoom_EventScript_22845D compare VAR_0x409C, 3 - call_if 1, EverGrandeCity_GlaciasRoom_EventScript_228463 + call_if_eq EverGrandeCity_GlaciasRoom_EventScript_228463 end EverGrandeCity_GlaciasRoom_EventScript_22845D:: @ 822845D diff --git a/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc index 8ab4a06fb..0e170811b 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc +++ b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc @@ -24,10 +24,9 @@ EverGrandeCity_PhoebesRoom_EventScript_22819D:: @ 822819D end EverGrandeCity_PhoebesRoom_MapScript1_2281AA: @ 82281AA - checkflag FLAG_0x4FC - call_if 1, EverGrandeCity_PhoebesRoom_EventScript_2281BF + call_if_set FLAG_0x4FC, EverGrandeCity_PhoebesRoom_EventScript_2281BF compare VAR_0x409C, 2 - call_if 1, EverGrandeCity_PhoebesRoom_EventScript_2281C5 + call_if_eq EverGrandeCity_PhoebesRoom_EventScript_2281C5 end EverGrandeCity_PhoebesRoom_EventScript_2281BF:: @ 82281BF diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc index 5172ea351..c029571d0 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc @@ -5,8 +5,7 @@ EverGrandeCity_PokemonCenter_1F_MapScripts:: @ 8229A34 EverGrandeCity_PokemonCenter_1F_MapScript1_229A3F: @ 8229A3F setrespawn HEAL_LOCATION_EVER_GRANDE_CITY_1 - checkflag FLAG_0x1CF - call_if 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A4C + call_if_unset FLAG_0x1CF, EverGrandeCity_PokemonCenter_1F_EventScript_229A4C end EverGrandeCity_PokemonCenter_1F_EventScript_229A4C:: @ 8229A4C @@ -36,11 +35,11 @@ EverGrandeCity_PokemonCenter_1F_EventScript_229A79:: @ 8229A79 msgbox EverGrandeCity_PokemonCenter_1F_Text_229BF1, MSGBOX_DEFAULT closemessage compare VAR_FACING, 2 - call_if 1, EverGrandeCity_PokemonCenter_1F_EventScript_229AB6 + call_if_eq EverGrandeCity_PokemonCenter_1F_EventScript_229AB6 compare VAR_FACING, 4 - call_if 1, EverGrandeCity_PokemonCenter_1F_EventScript_229AC1 + call_if_eq EverGrandeCity_PokemonCenter_1F_EventScript_229AC1 compare VAR_FACING, 3 - call_if 1, EverGrandeCity_PokemonCenter_1F_EventScript_229AC1 + call_if_eq EverGrandeCity_PokemonCenter_1F_EventScript_229AC1 addvar VAR_0x40D1, 1 setflag FLAG_0x1CF playse SE_KAIDAN diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc b/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc index 7999ce599..9b9c561eb 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc @@ -6,8 +6,7 @@ EverGrandeCity_PokemonLeague_1F_MapScripts:: @ 82295D2 EverGrandeCity_PokemonLeague_1F_MapScript1_2295DD: @ 82295DD setrespawn HEAL_LOCATION_EVER_GRANDE_CITY_2 setflag FLAG_LANDMARK_POKEMON_LEAGUE - checkflag FLAG_0x107 - call_if 0, EverGrandeCity_PokemonLeague_1F_EventScript_2295ED + call_if_unset FLAG_0x107, EverGrandeCity_PokemonLeague_1F_EventScript_2295ED end EverGrandeCity_PokemonLeague_1F_EventScript_2295ED:: @ 82295ED @@ -51,9 +50,9 @@ EverGrandeCity_PokemonLeague_1F_EventScript_229636:: @ 8229636 goto_if_set FLAG_0x107, EverGrandeCity_PokemonLeague_1F_EventScript_2296BB getplayerxy VAR_TEMP_0, VAR_TEMP_1 compare VAR_TEMP_0, 11 - call_if 4, EverGrandeCity_PokemonLeague_1F_EventScript_229698 + call_if_ge EverGrandeCity_PokemonLeague_1F_EventScript_229698 compare VAR_TEMP_0, 8 - call_if 3, EverGrandeCity_PokemonLeague_1F_EventScript_2296A3 + call_if_le EverGrandeCity_PokemonLeague_1F_EventScript_2296A3 message EverGrandeCity_PokemonLeague_1F_Text_2296E8 waitmessage delay 120 diff --git a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc index b30efae6e..ef6b7efa4 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc +++ b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc @@ -11,10 +11,9 @@ EverGrandeCity_SidneysRoom_MapScript1_227F16: @ 8227F16 end EverGrandeCity_SidneysRoom_MapScript1_227F1D: @ 8227F1D - checkflag FLAG_0x4FB - call_if 1, EverGrandeCity_SidneysRoom_EventScript_227F32 + call_if_set FLAG_0x4FB, EverGrandeCity_SidneysRoom_EventScript_227F32 compare VAR_0x409C, 1 - call_if 1, EverGrandeCity_SidneysRoom_EventScript_227F38 + call_if_eq EverGrandeCity_SidneysRoom_EventScript_227F38 end EverGrandeCity_SidneysRoom_EventScript_227F32:: @ 8227F32 diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc index 79244b381..ca9b449e5 100644 --- a/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc +++ b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc @@ -117,9 +117,9 @@ FallarborTown_BattleTentBattleRoom_EventScript_200A2A:: @ 8200A2A setvar VAR_0x8005, 2 special CallFrontierUtilFunc compare VAR_RESULT, 1 - call_if 1, FallarborTown_BattleTentBattleRoom_EventScript_200B43 + call_if_eq FallarborTown_BattleTentBattleRoom_EventScript_200B43 compare VAR_RESULT, 2 - call_if 1, FallarborTown_BattleTentBattleRoom_EventScript_200B4A + call_if_eq FallarborTown_BattleTentBattleRoom_EventScript_200B4A multichoice 20, 6, 104, 1 switch VAR_RESULT case 0, FallarborTown_BattleTentBattleRoom_EventScript_200AD8 diff --git a/data/maps/FallarborTown_House1/scripts.inc b/data/maps/FallarborTown_House1/scripts.inc index 94dc3e5a7..699f5e4ed 100644 --- a/data/maps/FallarborTown_House1/scripts.inc +++ b/data/maps/FallarborTown_House1/scripts.inc @@ -13,10 +13,8 @@ FallarborTown_House1_EventScript_200F13:: @ 8200F13 end FallarborTown_House1_EventScript_200F38:: @ 8200F38 - checkflag FLAG_TEMP_2 - call_if 0, FallarborTown_House1_EventScript_200F8B - checkflag FLAG_TEMP_2 - call_if 1, FallarborTown_House1_EventScript_200F9C + call_if_unset FLAG_TEMP_2, FallarborTown_House1_EventScript_200F8B + call_if_set FLAG_TEMP_2, FallarborTown_House1_EventScript_200F9C compare VAR_RESULT, 0 goto_if_eq FallarborTown_House1_EventScript_200FA5 msgbox FallarborTown_House1_Text_201159, MSGBOX_DEFAULT diff --git a/data/maps/FarawayIsland_Interior/scripts.inc b/data/maps/FarawayIsland_Interior/scripts.inc index fea57b74b..55fd591e2 100644 --- a/data/maps/FarawayIsland_Interior/scripts.inc +++ b/data/maps/FarawayIsland_Interior/scripts.inc @@ -6,8 +6,7 @@ FarawayIsland_Interior_MapScripts:: @ 8267CFA .byte 0 FarawayIsland_Interior_MapScript1_267D0F: @ 8267D0F - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, FarawayIsland_Interior_EventScript_267D19 + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, FarawayIsland_Interior_EventScript_267D19 end FarawayIsland_Interior_EventScript_267D19:: @ 8267D19 @@ -28,8 +27,7 @@ FarawayIsland_Interior_EventScript_267D4B:: @ 8267D4B return FarawayIsland_Interior_MapScript1_267D54: @ 8267D54 - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, FarawayIsland_Interior_EventScript_267D5E + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, FarawayIsland_Interior_EventScript_267D5E end FarawayIsland_Interior_EventScript_267D5E:: @ 8267D5E @@ -42,8 +40,7 @@ FarawayIsland_Interior_EventScript_267D5E:: @ 8267D5E FarawayIsland_Interior_MapScript1_267D72: @ 8267D72 setvar VAR_0x403A, 0 setvar VAR_TEMP_1, 1 - checkflag FLAG_0x1CA - call_if 0, FarawayIsland_Interior_EventScript_267D86 + call_if_unset FLAG_0x1CA, FarawayIsland_Interior_EventScript_267D86 end FarawayIsland_Interior_EventScript_267D86:: @ 8267D86 @@ -129,13 +126,13 @@ FarawayIsland_Interior_EventScript_267DF2:: @ 8267DF2 waitse playmoncry SPECIES_MEW, 2 compare VAR_FACING, 2 - call_if 1, FarawayIsland_Interior_EventScript_267EAF + call_if_eq FarawayIsland_Interior_EventScript_267EAF compare VAR_FACING, 1 - call_if 1, FarawayIsland_Interior_EventScript_267EBA + call_if_eq FarawayIsland_Interior_EventScript_267EBA compare VAR_FACING, 3 - call_if 1, FarawayIsland_Interior_EventScript_267EC5 + call_if_eq FarawayIsland_Interior_EventScript_267EC5 compare VAR_FACING, 4 - call_if 1, FarawayIsland_Interior_EventScript_267ED0 + call_if_eq FarawayIsland_Interior_EventScript_267ED0 special sub_81D4BEC delay 40 waitmoncry diff --git a/data/maps/FieryPath/scripts.inc b/data/maps/FieryPath/scripts.inc index f0a28345c..3888c61ef 100644 --- a/data/maps/FieryPath/scripts.inc +++ b/data/maps/FieryPath/scripts.inc @@ -3,8 +3,7 @@ FieryPath_MapScripts:: @ 8230F24 .byte 0 FieryPath_MapScript1_230F2A: @ 8230F2A - checkflag FLAG_LANDMARK_FIERY_PATH - call_if 0, FieryPath_EventScript_230F37 + call_if_unset FLAG_LANDMARK_FIERY_PATH, FieryPath_EventScript_230F37 setflag FLAG_LANDMARK_FIERY_PATH end diff --git a/data/maps/FortreeCity_House2/scripts.inc b/data/maps/FortreeCity_House2/scripts.inc index 2b4b1c8b2..db8b14029 100644 --- a/data/maps/FortreeCity_House2/scripts.inc +++ b/data/maps/FortreeCity_House2/scripts.inc @@ -5,8 +5,7 @@ FortreeCity_House2_EventScript_2177CB:: @ 82177CB lock faceplayer goto_if_set FLAG_0x108, FortreeCity_House2_EventScript_21786E - checkflag FLAG_0x076 - call_if 0, FortreeCity_House2_EventScript_217862 + call_if_unset FLAG_0x076, FortreeCity_House2_EventScript_217862 msgbox FortreeCity_House2_Text_2178D6, MSGBOX_DEFAULT multichoice 21, 8, 54, 1 switch VAR_RESULT diff --git a/data/maps/GraniteCave_StevensRoom/scripts.inc b/data/maps/GraniteCave_StevensRoom/scripts.inc index ff594021a..e08dfffd7 100644 --- a/data/maps/GraniteCave_StevensRoom/scripts.inc +++ b/data/maps/GraniteCave_StevensRoom/scripts.inc @@ -11,7 +11,7 @@ GraniteCave_StevensRoom_EventScript_22DC7B:: @ 822DC7B msgbox GraniteCave_StevensRoom_Text_22DDBD, MSGBOX_DEFAULT giveitem_std ITEM_TM47 compare VAR_RESULT, 0 - call_if 1, GraniteCave_StevensRoom_EventScript_22DD3C + call_if_eq GraniteCave_StevensRoom_EventScript_22DD3C msgbox GraniteCave_StevensRoom_Text_22DE6B, MSGBOX_DEFAULT closemessage delay 30 @@ -24,13 +24,13 @@ GraniteCave_StevensRoom_EventScript_22DC7B:: @ 822DC7B msgbox GraniteCave_StevensRoom_Text_22DF8C, MSGBOX_DEFAULT closemessage compare VAR_FACING, 2 - call_if 1, GraniteCave_StevensRoom_EventScript_22DD0D + call_if_eq GraniteCave_StevensRoom_EventScript_22DD0D compare VAR_FACING, 1 - call_if 1, GraniteCave_StevensRoom_EventScript_22DD2A + call_if_eq GraniteCave_StevensRoom_EventScript_22DD2A compare VAR_FACING, 3 - call_if 1, GraniteCave_StevensRoom_EventScript_22DD18 + call_if_eq GraniteCave_StevensRoom_EventScript_22DD18 compare VAR_FACING, 4 - call_if 1, GraniteCave_StevensRoom_EventScript_22DD18 + call_if_eq GraniteCave_StevensRoom_EventScript_22DD18 playse SE_KAIDAN removeobject 1 release diff --git a/data/maps/IslandCave/scripts.inc b/data/maps/IslandCave/scripts.inc index d1c6563e2..218a92205 100644 --- a/data/maps/IslandCave/scripts.inc +++ b/data/maps/IslandCave/scripts.inc @@ -5,8 +5,7 @@ IslandCave_MapScripts:: @ 8238E2A .byte 0 IslandCave_MapScript1_238E3A: @ 8238E3A - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, IslandCave_EventScript_238E44 + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, IslandCave_EventScript_238E44 end IslandCave_EventScript_238E44:: @ 8238E44 @@ -17,8 +16,7 @@ IslandCave_EventScript_238E44:: @ 8238E44 return IslandCave_MapScript1_238E58: @ 8238E58 - checkflag FLAG_SYS_BRAILLE_WAIT - call_if 0, IslandCave_EventScript_238E62 + call_if_unset FLAG_SYS_BRAILLE_WAIT, IslandCave_EventScript_238E62 end IslandCave_EventScript_238E62:: @ 8238E62 @@ -33,8 +31,7 @@ IslandCave_EventScript_238E62:: @ 8238E62 IslandCave_MapScript1_238E99: @ 8238E99 setflag FLAG_LANDMARK_ISLAND_CAVE call IslandCave_EventScript_238F45 - checkflag FLAG_0x1BC - call_if 0, IslandCave_EventScript_238EAB + call_if_unset FLAG_0x1BC, IslandCave_EventScript_238EAB end IslandCave_EventScript_238EAB:: @ 8238EAB @@ -55,8 +52,7 @@ IslandCave_EventScript_238EAF:: @ 8238EAF IslandCave_EventScript_238EEF:: @ 8238EEF lockall - checkflag FLAG_TEMP_3 - call_if 1, IslandCave_EventScript_238F45 + call_if_set FLAG_TEMP_3, IslandCave_EventScript_238F45 goto_if_set FLAG_SYS_BRAILLE_WAIT, IslandCave_EventScript_238F13 braillemessage IslandCave_Braille_2A6CD4 setflag FLAG_TEMP_2 @@ -71,8 +67,7 @@ IslandCave_EventScript_238F13:: @ 8238F13 IslandCave_EventScript_238F1D:: @ 8238F1D lockall - checkflag FLAG_TEMP_3 - call_if 1, IslandCave_EventScript_238F45 + call_if_set FLAG_TEMP_3, IslandCave_EventScript_238F45 braillemessage IslandCave_Braille_2A6CD4 goto_if_set FLAG_SYS_BRAILLE_WAIT, IslandCave_EventScript_238F41 setflag FLAG_TEMP_2 diff --git a/data/maps/JaggedPass/scripts.inc b/data/maps/JaggedPass/scripts.inc index 67d52f9c8..0760cc05a 100644 --- a/data/maps/JaggedPass/scripts.inc +++ b/data/maps/JaggedPass/scripts.inc @@ -7,7 +7,7 @@ JaggedPass_MapScripts:: @ 8230656 JaggedPass_MapScript1_230666: @ 8230666 setstepcallback 1 compare VAR_0x40C8, 0 - call_if 1, JaggedPass_EventScript_230674 + call_if_eq JaggedPass_EventScript_230674 end JaggedPass_EventScript_230674:: @ 8230674 @@ -22,7 +22,7 @@ JaggedPass_EventScript_230685:: @ 8230685 JaggedPass_MapScript1_23068B: @ 823068B compare VAR_0x40BD, 1 - call_if 1, JaggedPass_EventScript_230697 + call_if_eq JaggedPass_EventScript_230697 end JaggedPass_EventScript_230697:: @ 8230697 diff --git a/data/maps/LavaridgeTown/scripts.inc b/data/maps/LavaridgeTown/scripts.inc index a58b92f51..f210a9d11 100644 --- a/data/maps/LavaridgeTown/scripts.inc +++ b/data/maps/LavaridgeTown/scripts.inc @@ -5,16 +5,14 @@ LavaridgeTown_MapScripts:: @ 81EA4D3 LavaridgeTown_MapScript1_1EA4DE: @ 81EA4DE setflag FLAG_VISITED_LAVARIDGE_TOWN - checkflag FLAG_0x06C - call_if 1, LavaridgeTown_EventScript_1EA514 - checkflag FLAG_0x08B - call_if 1, LavaridgeTown_EventScript_1EA53F + call_if_set FLAG_0x06C, LavaridgeTown_EventScript_1EA514 + call_if_set FLAG_0x08B, LavaridgeTown_EventScript_1EA53F call LavaridgeTown_EventScript_271ED7 call LavaridgeTown_EventScript_271EFB compare VAR_0x4053, 1 - call_if 1, LavaridgeTown_EventScript_1EA518 + call_if_eq LavaridgeTown_EventScript_1EA518 compare VAR_0x4053, 1 - call_if 1, LavaridgeTown_EventScript_1EA543 + call_if_eq LavaridgeTown_EventScript_1EA543 end LavaridgeTown_EventScript_1EA514:: @ 81EA514 @@ -50,19 +48,19 @@ LavaridgeTown_EventScript_1EA551:: @ 81EA551 lockall getplayerxy VAR_0x8008, VAR_0x8009 compare VAR_0x8008, 9 - call_if 1, LavaridgeTown_EventScript_1EA63A + call_if_eq LavaridgeTown_EventScript_1EA63A compare VAR_0x8008, 9 - call_if 5, LavaridgeTown_EventScript_1EA65C + call_if_ne LavaridgeTown_EventScript_1EA65C delay 20 checkplayergender compare VAR_RESULT, 0 - call_if 1, LavaridgeTown_EventScript_1EA630 + call_if_eq LavaridgeTown_EventScript_1EA630 compare VAR_RESULT, 1 - call_if 1, LavaridgeTown_EventScript_1EA635 + call_if_eq LavaridgeTown_EventScript_1EA635 compare VAR_0x8008, 9 - call_if 1, LavaridgeTown_EventScript_1EA6A1 + call_if_eq LavaridgeTown_EventScript_1EA6A1 compare VAR_0x8008, 9 - call_if 5, LavaridgeTown_EventScript_1EA6AC + call_if_ne LavaridgeTown_EventScript_1EA6AC checkplayergender compare VAR_RESULT, 0 goto_if_eq LavaridgeTown_EventScript_1EA5B5 @@ -92,9 +90,9 @@ LavaridgeTown_EventScript_1EA5FF:: @ 81EA5FF addobject 7 delay 30 compare VAR_0x8008, 9 - call_if 1, LavaridgeTown_EventScript_1EA6B7 + call_if_eq LavaridgeTown_EventScript_1EA6B7 compare VAR_0x8008, 9 - call_if 5, LavaridgeTown_EventScript_1EA6C9 + call_if_ne LavaridgeTown_EventScript_1EA6C9 removeobject 7 setvar VAR_0x4053, 2 clearflag FLAG_SPECIAL_FLAG_0x4000 diff --git a/data/maps/LavaridgeTown_Gym_1F/scripts.inc b/data/maps/LavaridgeTown_Gym_1F/scripts.inc index d01770fe8..c0c8f1093 100644 --- a/data/maps/LavaridgeTown_Gym_1F/scripts.inc +++ b/data/maps/LavaridgeTown_Gym_1F/scripts.inc @@ -78,7 +78,7 @@ LavaridgeTown_Gym_1F_EventScript_1FE7C1:: @ 81FE7C1 setflag FLAG_BADGE04_GET addvar VAR_0x4085, 1 compare VAR_0x4085, 6 - call_if 1, LavaridgeTown_Gym_1F_EventScript_271E84 + call_if_eq LavaridgeTown_Gym_1F_EventScript_271E84 setvar VAR_0x8008, 4 call LavaridgeTown_Gym_1F_EventScript_271F43 setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLY diff --git a/data/maps/LilycoveCity/scripts.inc b/data/maps/LilycoveCity/scripts.inc index 03eb005b3..515754f8c 100644 --- a/data/maps/LilycoveCity/scripts.inc +++ b/data/maps/LilycoveCity/scripts.inc @@ -7,14 +7,12 @@ LilycoveCity_MapScript1_1E2B47: @ 81E2B47 setflag FLAG_VISITED_LILYCOVE_CITY setvar VAR_0x4086, 0 setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER - checkflag FLAG_SYS_WEATHER_CTRL - call_if 1, LilycoveCity_EventScript_27207A + call_if_set FLAG_SYS_WEATHER_CTRL, LilycoveCity_EventScript_27207A call LilycoveCity_EventScript_271ED7 end LilycoveCity_MapScript1_1E2B61: @ 81E2B61 - checkflag FLAG_0x070 - call_if 0, LilycoveCity_EventScript_1E2B6B + call_if_unset FLAG_0x070, LilycoveCity_EventScript_1E2B6B end LilycoveCity_EventScript_1E2B6B:: @ 81E2B6B @@ -241,10 +239,8 @@ LilycoveCity_EventScript_1E2DDE:: @ 81E2DDE LilycoveCity_EventScript_1E2DF8:: @ 81E2DF8 playbgm MUS_GIRL_SUP, 1 - checkflag FLAG_0x11E - call_if 1, LilycoveCity_EventScript_1E2E48 - checkflag FLAG_0x11E - call_if 0, LilycoveCity_EventScript_1E2E51 + call_if_set FLAG_0x11E, LilycoveCity_EventScript_1E2E48 + call_if_unset FLAG_0x11E, LilycoveCity_EventScript_1E2E51 compare VAR_RESULT, 0 goto_if_eq LilycoveCity_EventScript_1E2E5A msgbox LilycoveCity_Text_1E3234, MSGBOX_DEFAULT @@ -272,10 +268,8 @@ LilycoveCity_EventScript_1E2E5A:: @ 81E2E5A LilycoveCity_EventScript_1E2E6B:: @ 81E2E6B playbgm MUS_BOY_SUP, 1 - checkflag FLAG_0x11E - call_if 1, LilycoveCity_EventScript_1E2EBB - checkflag FLAG_0x11E - call_if 0, LilycoveCity_EventScript_1E2EC4 + call_if_set FLAG_0x11E, LilycoveCity_EventScript_1E2EBB + call_if_unset FLAG_0x11E, LilycoveCity_EventScript_1E2EC4 compare VAR_RESULT, 0 goto_if_eq LilycoveCity_EventScript_1E2ECD msgbox LilycoveCity_Text_1E373C, MSGBOX_DEFAULT @@ -334,12 +328,11 @@ LilycoveCity_EventScript_1E2F2E:: @ 81E2F2E LilycoveCity_EventScript_1E2F3E:: @ 81E2F3E msgbox LilycoveCity_Text_1E32FB, MSGBOX_DEFAULT setvar VAR_RESULT, 0 - checkflag FLAG_BADGE06_GET - call_if 1, LilycoveCity_EventScript_1E2F76 + call_if_set FLAG_BADGE06_GET, LilycoveCity_EventScript_1E2F76 compare VAR_RESULT, 0 - call_if 1, LilycoveCity_EventScript_1E2F86 + call_if_eq LilycoveCity_EventScript_1E2F86 compare VAR_RESULT, 1 - call_if 1, LilycoveCity_EventScript_1E2F8F + call_if_eq LilycoveCity_EventScript_1E2F8F clearflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM clearflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_PICHU_DOLL goto LilycoveCity_EventScript_1E3006 @@ -369,12 +362,11 @@ LilycoveCity_EventScript_1E2FA1:: @ 81E2FA1 LilycoveCity_EventScript_1E2FAA:: @ 81E2FAA msgbox LilycoveCity_Text_1E37D7, MSGBOX_DEFAULT setvar VAR_RESULT, 0 - checkflag FLAG_BADGE06_GET - call_if 1, LilycoveCity_EventScript_1E2F76 + call_if_set FLAG_BADGE06_GET, LilycoveCity_EventScript_1E2F76 compare VAR_RESULT, 0 - call_if 1, LilycoveCity_EventScript_1E2FE2 + call_if_eq LilycoveCity_EventScript_1E2FE2 compare VAR_RESULT, 1 - call_if 1, LilycoveCity_EventScript_1E2FEB + call_if_eq LilycoveCity_EventScript_1E2FEB clearflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM clearflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_SWABLU_DOLL goto LilycoveCity_EventScript_1E3006 @@ -414,9 +406,9 @@ LilycoveCity_EventScript_1E302D:: @ 81E302D faceplayer msgbox LilycoveCity_Text_1E4774, MSGBOX_YESNO compare VAR_RESULT, 1 - call_if 1, LilycoveCity_EventScript_1E304F + call_if_eq LilycoveCity_EventScript_1E304F compare VAR_RESULT, 0 - call_if 1, LilycoveCity_EventScript_1E3058 + call_if_eq LilycoveCity_EventScript_1E3058 release end diff --git a/data/maps/LilycoveCity_ContestLobby/scripts.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc index 46ef88f87..c60e8fdfc 100644 --- a/data/maps/LilycoveCity_ContestLobby/scripts.inc +++ b/data/maps/LilycoveCity_ContestLobby/scripts.inc @@ -58,7 +58,7 @@ LilycoveCity_ContestLobby_EventScript_21A2AA:: @ 821A2AA setvar VAR_0x4099, 0 specialvar VAR_RESULT, GiveMonArtistRibbon compare VAR_RESULT, 1 - call_if 1, LilycoveCity_ContestLobby_EventScript_21A314 + call_if_eq LilycoveCity_ContestLobby_EventScript_21A314 applymovement 4, LilycoveCity_ContestLobby_Movement_21A40F waitmovement 0 removeobject 4 @@ -230,7 +230,7 @@ LilycoveCity_ContestLobby_EventScript_21A47A:: @ 821A47A setvar VAR_0x4099, 0 specialvar VAR_RESULT, GiveMonArtistRibbon compare VAR_RESULT, 1 - call_if 1, LilycoveCity_ContestLobby_EventScript_21A4E4 + call_if_eq LilycoveCity_ContestLobby_EventScript_21A4E4 applymovement 11, LilycoveCity_ContestLobby_Movement_21A53C waitmovement 0 removeobject 11 @@ -760,9 +760,9 @@ LilycoveCity_ContestLobby_EventScript_21AA15:: @ 821AA15 waitmessage copyvar VAR_0x8004, VAR_RESULT compare VAR_TEMP_C, 0 - call_if 1, LilycoveCity_ContestLobby_EventScript_21AABB + call_if_eq LilycoveCity_ContestLobby_EventScript_21AABB compare VAR_TEMP_C, 1 - call_if 1, LilycoveCity_ContestLobby_EventScript_21AAC0 + call_if_eq LilycoveCity_ContestLobby_EventScript_21AAC0 compare VAR_TEMP_C, 2 goto_if_ge LilycoveCity_ContestLobby_EventScript_21A97F compare VAR_RESULT, 4 @@ -842,15 +842,15 @@ LilycoveCity_ContestLobby_EventScript_21AB17:: @ 821AB17 LilycoveCity_ContestLobby_EventScript_21AB4B:: @ 821AB4B compare VAR_CONTEST_CATEGORY, 0 - call_if 1, LilycoveCity_ContestLobby_EventScript_21AB88 + call_if_eq LilycoveCity_ContestLobby_EventScript_21AB88 compare VAR_CONTEST_CATEGORY, 1 - call_if 1, LilycoveCity_ContestLobby_EventScript_21AB8E + call_if_eq LilycoveCity_ContestLobby_EventScript_21AB8E compare VAR_CONTEST_CATEGORY, 2 - call_if 1, LilycoveCity_ContestLobby_EventScript_21AB94 + call_if_eq LilycoveCity_ContestLobby_EventScript_21AB94 compare VAR_CONTEST_CATEGORY, 3 - call_if 1, LilycoveCity_ContestLobby_EventScript_21AB9A + call_if_eq LilycoveCity_ContestLobby_EventScript_21AB9A compare VAR_CONTEST_CATEGORY, 4 - call_if 1, LilycoveCity_ContestLobby_EventScript_21ABA0 + call_if_eq LilycoveCity_ContestLobby_EventScript_21ABA0 goto LilycoveCity_ContestLobby_EventScript_21ABA6 end diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc index 108fbc2f3..2290b7df5 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc @@ -4,10 +4,8 @@ LilycoveCity_CoveLilyMotel_2F_MapScripts:: @ 82186D2 LilycoveCity_CoveLilyMotel_2F_EventScript_2186D3:: @ 82186D3 lock faceplayer - checkflag FLAG_TEMP_2 - call_if 0, LilycoveCity_CoveLilyMotel_2F_EventScript_2186F9 - checkflag FLAG_TEMP_2 - call_if 1, LilycoveCity_CoveLilyMotel_2F_EventScript_21870F + call_if_unset FLAG_TEMP_2, LilycoveCity_CoveLilyMotel_2F_EventScript_2186F9 + call_if_set FLAG_TEMP_2, LilycoveCity_CoveLilyMotel_2F_EventScript_21870F specialvar VAR_RESULT, sub_80C08E4 compare VAR_RESULT, 1 goto_if_eq LilycoveCity_CoveLilyMotel_2F_EventScript_218702 diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc index f96cee275..80a93df47 100644 --- a/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc @@ -5,8 +5,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_220624:: @ 8220624 lock faceplayer setvar VAR_0x8004, 0 - checkflag FLAG_TEMP_2 - call_if 0, LilycoveCity_DepartmentStoreElevator_EventScript_2207FC + call_if_unset FLAG_TEMP_2, LilycoveCity_DepartmentStoreElevator_EventScript_2207FC copyvar VAR_0x8005, VAR_DEPT_STORE_FLOOR special sub_8139B60 message gUnknown_08272C1D diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc index 1487d705a..d5379f96a 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc @@ -5,9 +5,9 @@ LilycoveCity_DepartmentStoreRooftop_MapScripts:: @ 8220207 LilycoveCity_DepartmentStoreRooftop_MapScript1_22020D: @ 822020D getpricereduction 3 compare VAR_RESULT, 1 - call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_220227 + call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220227 compare VAR_RESULT, 0 - call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_22022B + call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_22022B end LilycoveCity_DepartmentStoreRooftop_EventScript_220227:: @ 8220227 @@ -53,7 +53,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_220268:: @ 8220268 faceplayer getpricereduction 3 compare VAR_RESULT, 1 - call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_220282 + call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220282 msgbox LilycoveCity_DepartmentStoreRooftop_Text_220463, MSGBOX_DEFAULT release end @@ -127,22 +127,22 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_220328:: @ 8220328 LilycoveCity_DepartmentStoreRooftop_EventScript_22032F:: @ 822032F compare VAR_TEMP_1, 0 - call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_220305 + call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220305 compare VAR_TEMP_1, 1 - call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_22030C + call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_22030C compare VAR_TEMP_1, 2 - call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_220313 + call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220313 compare VAR_RESULT, 0 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220442 checkitemspace VAR_TEMP_0, 1 compare VAR_RESULT, 0 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220450 compare VAR_TEMP_1, 0 - call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_22031A + call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_22031A compare VAR_TEMP_1, 1 - call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_220321 + call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220321 compare VAR_TEMP_1, 2 - call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_220328 + call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220328 updatemoneybox 0, 0 nop bufferitemname 0, VAR_TEMP_0 diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc index 328a045c7..d2d5f60d6 100644 --- a/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc @@ -36,18 +36,18 @@ LilycoveCity_DepartmentStore_1F_EventScript_21F69C:: @ 821F69C goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_21F7A1 incrementgamestat 46 compare VAR_0x8006, 0 - call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_21F77B + call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_21F77B compare VAR_0x8006, 1 - call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_21F784 + call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_21F784 bufferitemname 0, VAR_0x8005 compare VAR_0x8004, 1 - call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_21F7B9 + call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_21F7B9 compare VAR_0x8004, 2 - call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_21F7C2 + call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_21F7C2 compare VAR_0x8004, 3 - call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_21F7CB + call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_21F7CB compare VAR_0x8004, 4 - call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_21F7D4 + call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_21F7D4 giveitem_std VAR_0x8005 compare VAR_RESULT, 0 goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_21F7DD diff --git a/data/maps/LilycoveCity_Harbor/scripts.inc b/data/maps/LilycoveCity_Harbor/scripts.inc index 03d46b641..f7b07d668 100644 --- a/data/maps/LilycoveCity_Harbor/scripts.inc +++ b/data/maps/LilycoveCity_Harbor/scripts.inc @@ -152,13 +152,13 @@ LilycoveCity_Harbor_EventScript_21E22A:: @ 821E22A LilycoveCity_Harbor_EventScript_21E25C:: @ 821E25C setvar VAR_TEMP_B, 0 compare VAR_TEMP_E, 2 - call_if 1, LilycoveCity_Harbor_EventScript_21E28E + call_if_eq LilycoveCity_Harbor_EventScript_21E28E compare VAR_TEMP_D, 2 - call_if 1, LilycoveCity_Harbor_EventScript_21E294 + call_if_eq LilycoveCity_Harbor_EventScript_21E294 compare VAR_TEMP_C, 2 - call_if 1, LilycoveCity_Harbor_EventScript_21E29A + call_if_eq LilycoveCity_Harbor_EventScript_21E29A compare VAR_TEMP_9, 2 - call_if 1, LilycoveCity_Harbor_EventScript_21E2A0 + call_if_eq LilycoveCity_Harbor_EventScript_21E2A0 return LilycoveCity_Harbor_EventScript_21E28E:: @ 821E28E @@ -180,13 +180,13 @@ LilycoveCity_Harbor_EventScript_21E2A0:: @ 821E2A0 LilycoveCity_Harbor_EventScript_21E2A6:: @ 821E2A6 setvar VAR_TEMP_A, 0 compare VAR_TEMP_E, 1 - call_if 1, LilycoveCity_Harbor_EventScript_21E2D8 + call_if_eq LilycoveCity_Harbor_EventScript_21E2D8 compare VAR_TEMP_D, 1 - call_if 1, LilycoveCity_Harbor_EventScript_21E2DE + call_if_eq LilycoveCity_Harbor_EventScript_21E2DE compare VAR_TEMP_C, 1 - call_if 1, LilycoveCity_Harbor_EventScript_21E2E4 + call_if_eq LilycoveCity_Harbor_EventScript_21E2E4 compare VAR_TEMP_9, 1 - call_if 1, LilycoveCity_Harbor_EventScript_21E2EA + call_if_eq LilycoveCity_Harbor_EventScript_21E2EA return LilycoveCity_Harbor_EventScript_21E2D8:: @ 821E2D8 @@ -254,25 +254,25 @@ LilycoveCity_Harbor_EventScript_21E350:: @ 821E350 applymovement 4, LilycoveCity_Harbor_Movement_27259A waitmovement 0 compare VAR_FACING, 2 - call_if 1, LilycoveCity_Harbor_EventScript_21E656 + call_if_eq LilycoveCity_Harbor_EventScript_21E656 compare VAR_FACING, 4 - call_if 1, LilycoveCity_Harbor_EventScript_21E661 + call_if_eq LilycoveCity_Harbor_EventScript_21E661 addobject 5 compare VAR_FACING, 2 - call_if 1, LilycoveCity_Harbor_EventScript_21E675 + call_if_eq LilycoveCity_Harbor_EventScript_21E675 compare VAR_FACING, 4 - call_if 1, LilycoveCity_Harbor_EventScript_21E680 + call_if_eq LilycoveCity_Harbor_EventScript_21E680 msgbox LilycoveCity_Harbor_Text_2C6951, MSGBOX_DEFAULT compare VAR_FACING, 2 - call_if 1, LilycoveCity_Harbor_EventScript_21E68B + call_if_eq LilycoveCity_Harbor_EventScript_21E68B compare VAR_FACING, 4 - call_if 1, LilycoveCity_Harbor_EventScript_21E696 + call_if_eq LilycoveCity_Harbor_EventScript_21E696 msgbox LilycoveCity_Harbor_Text_2C69AA, MSGBOX_DEFAULT closemessage compare VAR_FACING, 2 - call_if 1, LilycoveCity_Harbor_EventScript_21E6A1 + call_if_eq LilycoveCity_Harbor_EventScript_21E6A1 compare VAR_FACING, 4 - call_if 1, LilycoveCity_Harbor_EventScript_21E6BA + call_if_eq LilycoveCity_Harbor_EventScript_21E6BA setvar VAR_0x8004, 2 call LilycoveCity_Harbor_EventScript_2721E2 warp MAP_FARAWAY_ISLAND_ENTRANCE, 255, 13, 38 @@ -359,9 +359,9 @@ LilycoveCity_Harbor_EventScript_21E514:: @ 821E514 delay 30 removeobject 4 compare VAR_FACING, 2 - call_if 1, LilycoveCity_Harbor_EventScript_21E61B + call_if_eq LilycoveCity_Harbor_EventScript_21E61B compare VAR_FACING, 4 - call_if 1, LilycoveCity_Harbor_EventScript_21E610 + call_if_eq LilycoveCity_Harbor_EventScript_21E610 delay 30 hideobjectat 255, MAP_PETALBURG_CITY setvar VAR_0x8004, 2 @@ -420,9 +420,9 @@ LilycoveCity_Harbor_EventScript_21E5CC:: @ 821E5CC delay 30 hideobjectat VAR_LAST_TALKED, MAP_LILYCOVE_CITY_HARBOR compare VAR_FACING, 2 - call_if 1, LilycoveCity_Harbor_EventScript_21E61B + call_if_eq LilycoveCity_Harbor_EventScript_21E61B compare VAR_FACING, 4 - call_if 1, LilycoveCity_Harbor_EventScript_21E610 + call_if_eq LilycoveCity_Harbor_EventScript_21E610 delay 30 hideobjectat 255, MAP_PETALBURG_CITY setvar VAR_0x8004, 2 diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc index 290efc7be..cf4be3065 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc @@ -74,35 +74,35 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21C829:: @ 821C829 setvar VAR_0x8004, 8 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 0 - call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9B8 + call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C9B8 setvar VAR_0x8004, 9 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 0 - call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9C0 + call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C9C0 setvar VAR_0x8004, 10 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 0 - call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9C8 + call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C9C8 setvar VAR_0x8004, 11 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 0 - call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9D0 + call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C9D0 setvar VAR_0x8004, 12 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 0 - call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9D8 + call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C9D8 setvar VAR_0x8004, 13 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 0 - call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9E0 + call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C9E0 setvar VAR_0x8004, 14 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 0 - call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9E8 + call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C9E8 setvar VAR_0x8004, 15 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 0 - call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9F0 + call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C9F0 end LilycoveCity_PokemonTrainerFanClub_EventScript_21C8DA:: @ 821C8DA @@ -122,35 +122,35 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21C8F5:: @ 821C8F5 setvar VAR_0x8004, 8 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 0 - call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE + call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE setvar VAR_0x8004, 9 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 0 - call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE + call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE setvar VAR_0x8004, 10 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 0 - call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE + call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE setvar VAR_0x8004, 11 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 0 - call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE + call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE setvar VAR_0x8004, 12 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 0 - call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE + call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE setvar VAR_0x8004, 13 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 0 - call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE + call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE setvar VAR_0x8004, 14 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 0 - call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE + call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE setvar VAR_0x8004, 15 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 0 - call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE + call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE compare VAR_0x8005, 5 goto_if_ge LilycoveCity_PokemonTrainerFanClub_EventScript_21C9B4 return diff --git a/data/maps/LittlerootTown/scripts.inc b/data/maps/LittlerootTown/scripts.inc index 001a88327..78a4d9b71 100644 --- a/data/maps/LittlerootTown/scripts.inc +++ b/data/maps/LittlerootTown/scripts.inc @@ -8,23 +8,22 @@ LittlerootTown_MapScript1_1E7DDB: @ 81E7DDB setflag FLAG_VISITED_LITTLEROOT_TOWN call LittlerootTown_EventScript_271ED7 compare VAR_0x4092, 2 - call_if 1, LittlerootTown_EventScript_1E7E67 - checkflag FLAG_0x052 - call_if 0, LittlerootTown_EventScript_1E7E6F + call_if_eq LittlerootTown_EventScript_1E7E67 + call_if_unset FLAG_0x052, LittlerootTown_EventScript_1E7E6F compare VAR_0x4050, 3 - call_if 1, LittlerootTown_EventScript_1E7E92 + call_if_eq LittlerootTown_EventScript_1E7E92 compare VAR_0x4082, 4 - call_if 1, LittlerootTown_EventScript_1E7E5C + call_if_eq LittlerootTown_EventScript_1E7E5C compare VAR_0x408C, 4 - call_if 1, LittlerootTown_EventScript_1E7E5C + call_if_eq LittlerootTown_EventScript_1E7E5C compare VAR_0x40C7, 1 - call_if 1, LittlerootTown_EventScript_1E7E53 + call_if_eq LittlerootTown_EventScript_1E7E53 compare VAR_0x408D, 3 - call_if 1, LittlerootTown_EventScript_1E7E4F + call_if_eq LittlerootTown_EventScript_1E7E4F compare VAR_0x40D3, 1 - call_if 1, LittlerootTown_EventScript_1E7E4B + call_if_eq LittlerootTown_EventScript_1E7E4B compare VAR_0x40D3, 2 - call_if 1, LittlerootTown_EventScript_1E7E45 + call_if_eq LittlerootTown_EventScript_1E7E45 end LittlerootTown_EventScript_1E7E45:: @ 81E7E45 @@ -70,9 +69,9 @@ LittlerootTown_EventScript_1E7E92:: @ 81E7E92 setobjectmovementtype 4, 8 checkplayergender compare VAR_RESULT, 0 - call_if 1, LittlerootTown_EventScript_1E7EB1 + call_if_eq LittlerootTown_EventScript_1E7EB1 compare VAR_RESULT, 1 - call_if 1, LittlerootTown_EventScript_1E7EB9 + call_if_eq LittlerootTown_EventScript_1E7EB9 return LittlerootTown_EventScript_1E7EB1:: @ 81E7EB1 @@ -383,9 +382,9 @@ LittlerootTown_EventScript_1E8163:: @ 81E8163 lockall checkplayergender compare VAR_RESULT, 0 - call_if 1, LittlerootTown_EventScript_1E817D + call_if_eq LittlerootTown_EventScript_1E817D compare VAR_RESULT, 1 - call_if 1, LittlerootTown_EventScript_1E8186 + call_if_eq LittlerootTown_EventScript_1E8186 releaseall end @@ -401,9 +400,9 @@ LittlerootTown_EventScript_1E818F:: @ 81E818F lockall checkplayergender compare VAR_RESULT, 0 - call_if 1, LittlerootTown_EventScript_1E81A9 + call_if_eq LittlerootTown_EventScript_1E81A9 compare VAR_RESULT, 1 - call_if 1, LittlerootTown_EventScript_1E81B2 + call_if_eq LittlerootTown_EventScript_1E81B2 releaseall end @@ -456,27 +455,27 @@ LittlerootTown_EventScript_1E8205:: @ 81E8205 LittlerootTown_EventScript_1E8211:: @ 81E8211 checkplayergender compare VAR_RESULT, 0 - call_if 1, LittlerootTown_EventScript_1E8297 + call_if_eq LittlerootTown_EventScript_1E8297 compare VAR_RESULT, 1 - call_if 1, LittlerootTown_EventScript_1E82A2 + call_if_eq LittlerootTown_EventScript_1E82A2 checkplayergender compare VAR_RESULT, 0 - call_if 1, LittlerootTown_EventScript_1E8281 + call_if_eq LittlerootTown_EventScript_1E8281 compare VAR_RESULT, 1 - call_if 1, LittlerootTown_EventScript_1E828C + call_if_eq LittlerootTown_EventScript_1E828C msgbox LittlerootTown_Text_1E87E1, MSGBOX_DEFAULT closemessage checkplayergender compare VAR_RESULT, 0 - call_if 1, LittlerootTown_EventScript_1E82AD + call_if_eq LittlerootTown_EventScript_1E82AD compare VAR_RESULT, 1 - call_if 1, LittlerootTown_EventScript_1E82F0 + call_if_eq LittlerootTown_EventScript_1E82F0 call LittlerootTown_EventScript_1E8693 checkplayergender compare VAR_RESULT, 0 - call_if 1, LittlerootTown_EventScript_1E8405 + call_if_eq LittlerootTown_EventScript_1E8405 compare VAR_RESULT, 1 - call_if 1, LittlerootTown_EventScript_1E8448 + call_if_eq LittlerootTown_EventScript_1E8448 goto LittlerootTown_EventScript_1E8686 end @@ -502,32 +501,32 @@ LittlerootTown_EventScript_1E82A2:: @ 81E82A2 LittlerootTown_EventScript_1E82AD:: @ 81E82AD compare VAR_0x8008, 0 - call_if 1, LittlerootTown_EventScript_1E8333 + call_if_eq LittlerootTown_EventScript_1E8333 compare VAR_0x8008, 1 - call_if 1, LittlerootTown_EventScript_1E8348 + call_if_eq LittlerootTown_EventScript_1E8348 compare VAR_0x8008, 2 - call_if 1, LittlerootTown_EventScript_1E835D + call_if_eq LittlerootTown_EventScript_1E835D compare VAR_0x8008, 3 - call_if 1, LittlerootTown_EventScript_1E8372 + call_if_eq LittlerootTown_EventScript_1E8372 compare VAR_0x8008, 4 - call_if 1, LittlerootTown_EventScript_1E8387 + call_if_eq LittlerootTown_EventScript_1E8387 compare VAR_0x8008, 5 - call_if 1, LittlerootTown_EventScript_1E839C + call_if_eq LittlerootTown_EventScript_1E839C return LittlerootTown_EventScript_1E82F0:: @ 81E82F0 compare VAR_0x8008, 0 - call_if 1, LittlerootTown_EventScript_1E8333 + call_if_eq LittlerootTown_EventScript_1E8333 compare VAR_0x8008, 1 - call_if 1, LittlerootTown_EventScript_1E8348 + call_if_eq LittlerootTown_EventScript_1E8348 compare VAR_0x8008, 2 - call_if 1, LittlerootTown_EventScript_1E83B1 + call_if_eq LittlerootTown_EventScript_1E83B1 compare VAR_0x8008, 3 - call_if 1, LittlerootTown_EventScript_1E83C6 + call_if_eq LittlerootTown_EventScript_1E83C6 compare VAR_0x8008, 4 - call_if 1, LittlerootTown_EventScript_1E83DB + call_if_eq LittlerootTown_EventScript_1E83DB compare VAR_0x8008, 5 - call_if 1, LittlerootTown_EventScript_1E83F0 + call_if_eq LittlerootTown_EventScript_1E83F0 return LittlerootTown_EventScript_1E8333:: @ 81E8333 @@ -602,32 +601,32 @@ LittlerootTown_EventScript_1E83F0:: @ 81E83F0 LittlerootTown_EventScript_1E8405:: @ 81E8405 compare VAR_0x8008, 0 - call_if 1, LittlerootTown_EventScript_1E848B + call_if_eq LittlerootTown_EventScript_1E848B compare VAR_0x8008, 1 - call_if 1, LittlerootTown_EventScript_1E8496 + call_if_eq LittlerootTown_EventScript_1E8496 compare VAR_0x8008, 2 - call_if 1, LittlerootTown_EventScript_1E84A1 + call_if_eq LittlerootTown_EventScript_1E84A1 compare VAR_0x8008, 3 - call_if 1, LittlerootTown_EventScript_1E84C7 + call_if_eq LittlerootTown_EventScript_1E84C7 compare VAR_0x8008, 4 - call_if 1, LittlerootTown_EventScript_1E84ED + call_if_eq LittlerootTown_EventScript_1E84ED compare VAR_0x8008, 5 - call_if 1, LittlerootTown_EventScript_1E8513 + call_if_eq LittlerootTown_EventScript_1E8513 return LittlerootTown_EventScript_1E8448:: @ 81E8448 compare VAR_0x8008, 0 - call_if 1, LittlerootTown_EventScript_1E848B + call_if_eq LittlerootTown_EventScript_1E848B compare VAR_0x8008, 1 - call_if 1, LittlerootTown_EventScript_1E8496 + call_if_eq LittlerootTown_EventScript_1E8496 compare VAR_0x8008, 2 - call_if 1, LittlerootTown_EventScript_1E8539 + call_if_eq LittlerootTown_EventScript_1E8539 compare VAR_0x8008, 3 - call_if 1, LittlerootTown_EventScript_1E855F + call_if_eq LittlerootTown_EventScript_1E855F compare VAR_0x8008, 4 - call_if 1, LittlerootTown_EventScript_1E8585 + call_if_eq LittlerootTown_EventScript_1E8585 compare VAR_0x8008, 5 - call_if 1, LittlerootTown_EventScript_1E85AB + call_if_eq LittlerootTown_EventScript_1E85AB return LittlerootTown_EventScript_1E848B:: @ 81E848B @@ -891,9 +890,9 @@ LittlerootTown_EventScript_1E863D:: @ 81E863D faceplayer checkplayergender compare VAR_RESULT, 0 - call_if 1, LittlerootTown_EventScript_1E8281 + call_if_eq LittlerootTown_EventScript_1E8281 compare VAR_RESULT, 1 - call_if 1, LittlerootTown_EventScript_1E828C + call_if_eq LittlerootTown_EventScript_1E828C call LittlerootTown_EventScript_1E8693 applymovement 4, LittlerootTown_Movement_2725A6 waitmovement 0 diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc index addccf7cd..9eab32885 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc +++ b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc @@ -6,9 +6,8 @@ LittlerootTown_BrendansHouse_1F_MapScripts:: @ 81F7755 LittlerootTown_BrendansHouse_1F_MapScript1_1F7765: @ 81F7765 compare VAR_0x4092, 6 - call_if 0, LittlerootTown_BrendansHouse_1F_EventScript_1F777A - checkflag FLAG_0x112 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F778D + call_if_lt LittlerootTown_BrendansHouse_1F_EventScript_1F777A + call_if_set FLAG_0x112, LittlerootTown_BrendansHouse_1F_EventScript_1F778D end LittlerootTown_BrendansHouse_1F_EventScript_1F777A:: @ 81F777A @@ -28,11 +27,11 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F779A:: @ 81F779A LittlerootTown_BrendansHouse_1F_MapScript1_1F77A4: @ 81F77A4 compare VAR_0x4092, 3 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F77DE + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F77DE compare VAR_0x4092, 5 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F77C6 + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F77C6 compare VAR_0x4092, 6 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F77D2 + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F77D2 end LittlerootTown_BrendansHouse_1F_EventScript_1F77C6:: @ 81F77C6 @@ -152,22 +151,22 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F78E2:: @ 81F78E2 applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_27259A waitmovement 0 compare VAR_0x8008, 1 - call_if 5, LittlerootTown_BrendansHouse_1F_EventScript_1F7981 + call_if_ne LittlerootTown_BrendansHouse_1F_EventScript_1F7981 playbgm MUS_BOY_SUP, 1 compare VAR_0x8008, 0 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F798C + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F798C compare VAR_0x8008, 1 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F7997 + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F7997 compare VAR_0x8008, 2 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F79A2 + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F79A2 msgbox LittlerootTown_BrendansHouse_1F_Text_1F90B4, MSGBOX_DEFAULT closemessage compare VAR_0x8008, 0 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F79C1 + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F79C1 compare VAR_0x8008, 1 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F79D3 + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F79D3 compare VAR_0x8008, 2 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F79E5 + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F79E5 playse SE_KAIDAN removeobject 7 setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_BRENDAN diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc index 4f6841b2c..096f35c1e 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc +++ b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc @@ -5,11 +5,11 @@ LittlerootTown_BrendansHouse_2F_MapScripts:: @ 81F83E3 LittlerootTown_BrendansHouse_2F_MapScript1_1F83EE: @ 81F83EE compare VAR_0x408D, 2 - call_if 0, LittlerootTown_BrendansHouse_2F_EventScript_1F8457 + call_if_lt LittlerootTown_BrendansHouse_2F_EventScript_1F8457 compare VAR_0x408D, 3 - call_if 4, LittlerootTown_BrendansHouse_2F_EventScript_1F841A + call_if_ge LittlerootTown_BrendansHouse_2F_EventScript_1F841A compare VAR_0x4092, 4 - call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_2926FE + call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_2926FE call LittlerootTown_BrendansHouse_2F_EventScript_275CE1 setvar VAR_0x4089, 0 end @@ -74,13 +74,13 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8497:: @ 81F8497 delay 10 playbgm MUS_BOY_SUP, 1 compare VAR_FACING, 2 - call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1F8507 + call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8507 compare VAR_FACING, 1 - call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1F8536 + call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8536 compare VAR_FACING, 3 - call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1F8565 + call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8565 compare VAR_FACING, 4 - call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1F8594 + call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8594 setvar VAR_0x408D, 3 setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_POKE_BALL clearflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM diff --git a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc index 92c951a11..0f71be46a 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc +++ b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc @@ -6,9 +6,8 @@ LittlerootTown_MaysHouse_1F_MapScripts:: @ 81F88A5 LittlerootTown_MaysHouse_1F_MapScript1_1F88B5: @ 81F88B5 compare VAR_0x4092, 6 - call_if 0, LittlerootTown_MaysHouse_1F_EventScript_1F88CA - checkflag FLAG_0x112 - call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F88DD + call_if_lt LittlerootTown_MaysHouse_1F_EventScript_1F88CA + call_if_set FLAG_0x112, LittlerootTown_MaysHouse_1F_EventScript_1F88DD end LittlerootTown_MaysHouse_1F_EventScript_1F88CA:: @ 81F88CA @@ -28,11 +27,11 @@ LittlerootTown_MaysHouse_1F_EventScript_1F88EA:: @ 81F88EA LittlerootTown_MaysHouse_1F_MapScript1_1F88F4: @ 81F88F4 compare VAR_0x4092, 3 - call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F892E + call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1F892E compare VAR_0x4092, 5 - call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F8916 + call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1F8916 compare VAR_0x4092, 6 - call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F8922 + call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1F8922 end LittlerootTown_MaysHouse_1F_EventScript_1F8916:: @ 81F8916 @@ -189,22 +188,22 @@ LittlerootTown_MaysHouse_1F_EventScript_1F8A8B:: @ 81F8A8B applymovement 7, LittlerootTown_MaysHouse_1F_Movement_27259A waitmovement 0 compare VAR_0x8008, 1 - call_if 5, LittlerootTown_MaysHouse_1F_EventScript_1F8B2A + call_if_ne LittlerootTown_MaysHouse_1F_EventScript_1F8B2A playbgm MUS_GIRL_SUP, 1 compare VAR_0x8008, 0 - call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F8B35 + call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1F8B35 compare VAR_0x8008, 1 - call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F8B40 + call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1F8B40 compare VAR_0x8008, 2 - call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F8B4B + call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1F8B4B msgbox LittlerootTown_MaysHouse_1F_Text_1F8EC6, MSGBOX_DEFAULT closemessage compare VAR_0x8008, 0 - call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F8B6A + call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1F8B6A compare VAR_0x8008, 1 - call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F8B7C + call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1F8B7C compare VAR_0x8008, 2 - call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F8B8E + call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1F8B8E playse SE_KAIDAN removeobject 7 setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_BRENDAN diff --git a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc index f3553b5a0..e0cb7dfe7 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc +++ b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc @@ -5,11 +5,11 @@ LittlerootTown_MaysHouse_2F_MapScripts:: @ 81F9296 LittlerootTown_MaysHouse_2F_MapScript1_1F92A1: @ 81F92A1 compare VAR_0x408D, 2 - call_if 0, LittlerootTown_MaysHouse_2F_EventScript_1F930A + call_if_lt LittlerootTown_MaysHouse_2F_EventScript_1F930A compare VAR_0x408D, 3 - call_if 4, LittlerootTown_MaysHouse_2F_EventScript_1F92CD + call_if_ge LittlerootTown_MaysHouse_2F_EventScript_1F92CD compare VAR_0x4092, 4 - call_if 1, LittlerootTown_MaysHouse_2F_EventScript_2926FE + call_if_eq LittlerootTown_MaysHouse_2F_EventScript_2926FE call LittlerootTown_MaysHouse_2F_EventScript_275CE1 setvar VAR_0x4089, 0 end @@ -75,13 +75,13 @@ LittlerootTown_MaysHouse_2F_EventScript_1F934A:: @ 81F934A delay 10 playbgm MUS_GIRL_SUP, 1 compare VAR_FACING, 2 - call_if 1, LittlerootTown_MaysHouse_2F_EventScript_1F93BA + call_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F93BA compare VAR_FACING, 1 - call_if 1, LittlerootTown_MaysHouse_2F_EventScript_1F93E9 + call_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F93E9 compare VAR_FACING, 3 - call_if 1, LittlerootTown_MaysHouse_2F_EventScript_1F9418 + call_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F9418 compare VAR_FACING, 4 - call_if 1, LittlerootTown_MaysHouse_2F_EventScript_1F9440 + call_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F9440 setvar VAR_0x408D, 3 setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_POKE_BALL clearflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM @@ -272,9 +272,9 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F94F7:: @ 81F94F7 waitmovement 0 checkplayergender compare VAR_RESULT, 0 - call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1F951D + call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F951D compare VAR_RESULT, 1 - call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1F952F + call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F952F setflag FLAG_0x125 releaseall end diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc index 54f6501fe..b68214ddf 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc @@ -172,9 +172,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9E80:: @ 81F9E80 waitmovement 0 checkplayergender compare VAR_RESULT, 0 - call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1F9F32 + call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9F32 compare VAR_RESULT, 1 - call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1F9F3C + call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9F3C playse SE_PC_ON waitse delay 20 @@ -534,9 +534,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA2F8:: @ 81FA2F8 waitmovement 0 checkplayergender compare VAR_RESULT, 0 - call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA352 + call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA352 compare VAR_RESULT, 1 - call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA37F + call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA37F setvar VAR_0x4084, 5 setflag FLAG_0x074 setvar VAR_0x4051, 1 @@ -549,7 +549,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA352:: @ 81FA352 msgbox LittlerootTown_ProfessorBirchsLab_Text_1FADD7, MSGBOX_DEFAULT giveitem_std ITEM_POKE_BALL, 5 compare VAR_RESULT, 0 - call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA3CE + call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA3CE msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAE40, MSGBOX_DEFAULT setvar VAR_RESULT, 0 return @@ -558,7 +558,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA37F:: @ 81FA37F msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAF3F, MSGBOX_DEFAULT giveitem_std ITEM_POKE_BALL, 5 compare VAR_RESULT, 0 - call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA3D7 + call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA3D7 msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAF8E, MSGBOX_DEFAULT setvar VAR_RESULT, 1 return @@ -606,9 +606,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA3EC:: @ 81FA3EC goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA490 checkplayergender compare VAR_RESULT, 0 - call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA428 + call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA428 compare VAR_RESULT, 1 - call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA431 + call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA431 release end @@ -623,9 +623,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA431:: @ 81FA431 LittlerootTown_ProfessorBirchsLab_EventScript_1FA43A:: @ 81FA43A checkplayergender compare VAR_RESULT, 0 - call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA453 + call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA453 compare VAR_RESULT, 1 - call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA45C + call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA45C release end @@ -640,9 +640,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA45C:: @ 81FA45C LittlerootTown_ProfessorBirchsLab_EventScript_1FA465:: @ 81FA465 checkplayergender compare VAR_RESULT, 0 - call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA47E + call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA47E compare VAR_RESULT, 1 - call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA487 + call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA487 release end @@ -657,9 +657,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA487:: @ 81FA487 LittlerootTown_ProfessorBirchsLab_EventScript_1FA490:: @ 81FA490 checkplayergender compare VAR_RESULT, 0 - call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4A9 + call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA4A9 compare VAR_RESULT, 1 - call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4B2 + call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA4B2 release end diff --git a/data/maps/MarineCave_End/scripts.inc b/data/maps/MarineCave_End/scripts.inc index 1a8f5f1ce..d42e0e1d6 100644 --- a/data/maps/MarineCave_End/scripts.inc +++ b/data/maps/MarineCave_End/scripts.inc @@ -4,8 +4,7 @@ MarineCave_End_MapScripts:: @ 823AFDF .byte 0 MarineCave_End_MapScript1_23AFEA: @ 823AFEA - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, MarineCave_End_EventScript_23AFF4 + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, MarineCave_End_EventScript_23AFF4 end MarineCave_End_EventScript_23AFF4:: @ 823AFF4 @@ -16,8 +15,7 @@ MarineCave_End_EventScript_23AFF4:: @ 823AFF4 return MarineCave_End_MapScript1_23B008: @ 823B008 - checkflag FLAG_0x1BE - call_if 0, MarineCave_End_EventScript_23B012 + call_if_unset FLAG_0x1BE, MarineCave_End_EventScript_23B012 end MarineCave_End_EventScript_23B012:: @ 823B012 diff --git a/data/maps/MauvilleCity/scripts.inc b/data/maps/MauvilleCity/scripts.inc index 2dbee0e08..751723f7b 100644 --- a/data/maps/MauvilleCity/scripts.inc +++ b/data/maps/MauvilleCity/scripts.inc @@ -9,8 +9,7 @@ MauvilleCity_MapScript1_1DF38B: @ 81DF38B setflag FLAG_SYS_TV_START clearflag FLAG_0x063 setvar VAR_0x4093, 0 - checkflag FLAG_GOT_TM24_FROM_WATTSON - call_if 1, MauvilleCity_EventScript_1DF3A9 + call_if_set FLAG_GOT_TM24_FROM_WATTSON, MauvilleCity_EventScript_1DF3A9 end MauvilleCity_EventScript_1DF3A9:: @ 81DF3A9 @@ -105,7 +104,7 @@ MauvilleCity_EventScript_1DF452:: @ 81DF452 MauvilleCity_EventScript_1DF4AD:: @ 81DF4AD compare VAR_RESULT, 1 - call_if 1, MauvilleCity_EventScript_1DF63A + call_if_eq MauvilleCity_EventScript_1DF63A compare VAR_RESULT, 0 goto_if_eq MauvilleCity_EventScript_1DF683 closemessage @@ -162,18 +161,18 @@ MauvilleCity_EventScript_1DF593:: @ 81DF593 setvar VAR_0x40F2, 0 setflag FLAG_0x088 compare VAR_FACING, 2 - call_if 1, MauvilleCity_EventScript_1DF5F3 + call_if_eq MauvilleCity_EventScript_1DF5F3 compare VAR_FACING, 4 - call_if 1, MauvilleCity_EventScript_1DF601 + call_if_eq MauvilleCity_EventScript_1DF601 applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_2725AA waitmovement 0 msgbox MauvilleCity_Text_1DFED5, MSGBOX_DEFAULT closemessage addvar VAR_0x40D1, 1 compare VAR_FACING, 2 - call_if 1, MauvilleCity_EventScript_1DF616 + call_if_eq MauvilleCity_EventScript_1DF616 compare VAR_FACING, 4 - call_if 1, MauvilleCity_EventScript_1DF628 + call_if_eq MauvilleCity_EventScript_1DF628 removeobject 11 releaseall end diff --git a/data/maps/MauvilleCity_Gym/scripts.inc b/data/maps/MauvilleCity_Gym/scripts.inc index bc01745c9..335a27f56 100644 --- a/data/maps/MauvilleCity_Gym/scripts.inc +++ b/data/maps/MauvilleCity_Gym/scripts.inc @@ -96,7 +96,7 @@ MauvilleCity_Gym_EventScript_20DF2B:: @ 820DF2B setflag FLAG_BADGE03_GET addvar VAR_0x4085, 1 compare VAR_0x4085, 6 - call_if 1, MauvilleCity_Gym_EventScript_271E84 + call_if_eq MauvilleCity_Gym_EventScript_271E84 setvar VAR_0x8008, 3 call MauvilleCity_Gym_EventScript_271F43 special MauvilleGymSpecial3 diff --git a/data/maps/MeteorFalls_1F_1R/scripts.inc b/data/maps/MeteorFalls_1F_1R/scripts.inc index 42d067a3e..7732e8e7d 100644 --- a/data/maps/MeteorFalls_1F_1R/scripts.inc +++ b/data/maps/MeteorFalls_1F_1R/scripts.inc @@ -3,8 +3,7 @@ MeteorFalls_1F_1R_MapScripts:: @ 822BD2A .byte 0 MeteorFalls_1F_1R_MapScript1_22BD30: @ 822BD30 - checkflag FLAG_SYS_GAME_CLEAR - call_if 1, MeteorFalls_1F_1R_EventScript_22BD3A + call_if_set FLAG_SYS_GAME_CLEAR, MeteorFalls_1F_1R_EventScript_22BD3A end MeteorFalls_1F_1R_EventScript_22BD3A:: @ 822BD3A diff --git a/data/maps/MossdeepCity/scripts.inc b/data/maps/MossdeepCity/scripts.inc index 745790458..54210e809 100644 --- a/data/maps/MossdeepCity/scripts.inc +++ b/data/maps/MossdeepCity/scripts.inc @@ -7,8 +7,7 @@ MossdeepCity_MapScript1_1E4A9C: @ 81E4A9C clearflag FLAG_0x065 clearflag FLAG_0x066 clearflag FLAG_0x067 - checkflag FLAG_SYS_WEATHER_CTRL - call_if 1, MossdeepCity_EventScript_27207A + call_if_set FLAG_SYS_WEATHER_CTRL, MossdeepCity_EventScript_27207A end MossdeepCity_EventScript_1E4AB2:: @ 81E4AB2 @@ -257,9 +256,9 @@ MossdeepCity_EventScript_1E4C85:: @ 81E4C85 msgbox MossdeepCity_Text_1E5453, MSGBOX_DEFAULT closemessage compare VAR_FACING, 2 - call_if 1, MossdeepCity_EventScript_1E4CB0 + call_if_eq MossdeepCity_EventScript_1E4CB0 compare VAR_FACING, 4 - call_if 1, MossdeepCity_EventScript_1E4CC2 + call_if_eq MossdeepCity_EventScript_1E4CC2 addvar VAR_0x40D1, 1 removeobject 16 release diff --git a/data/maps/MossdeepCity_House2/scripts.inc b/data/maps/MossdeepCity_House2/scripts.inc index 863bb4eda..c2c5ff620 100644 --- a/data/maps/MossdeepCity_House2/scripts.inc +++ b/data/maps/MossdeepCity_House2/scripts.inc @@ -20,9 +20,9 @@ MossdeepCity_House2_EventScript_2220F1:: @ 82220F1 setflag FLAG_0x0E0 clearflag FLAG_HIDE_FORTREE_CITY_HOUSE_4_WINGULL compare VAR_FACING, 2 - call_if 1, MossdeepCity_House2_EventScript_222124 + call_if_eq MossdeepCity_House2_EventScript_222124 compare VAR_FACING, 3 - call_if 1, MossdeepCity_House2_EventScript_22212F + call_if_eq MossdeepCity_House2_EventScript_22212F removeobject 3 release end diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc index 109841df3..6d8b7bd47 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc +++ b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc @@ -56,9 +56,9 @@ MossdeepCity_SpaceCenter_1F_EventScript_222FD8:: @ 8222FD8 specialvar VAR_RESULT, GetWeekCount buffernumberstring 0, VAR_RESULT compare VAR_RESULT, 0 - call_if 1, MossdeepCity_SpaceCenter_1F_EventScript_223012 + call_if_eq MossdeepCity_SpaceCenter_1F_EventScript_223012 compare VAR_RESULT, 1 - call_if 4, MossdeepCity_SpaceCenter_1F_EventScript_22301B + call_if_ge MossdeepCity_SpaceCenter_1F_EventScript_22301B closemessage applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A2 waitmovement 0 @@ -78,9 +78,9 @@ MossdeepCity_SpaceCenter_1F_EventScript_223024:: @ 8223024 specialvar VAR_RESULT, GetWeekCount buffernumberstring 0, VAR_RESULT compare VAR_RESULT, 0 - call_if 1, MossdeepCity_SpaceCenter_1F_EventScript_223051 + call_if_eq MossdeepCity_SpaceCenter_1F_EventScript_223051 compare VAR_RESULT, 1 - call_if 4, MossdeepCity_SpaceCenter_1F_EventScript_22305A + call_if_ge MossdeepCity_SpaceCenter_1F_EventScript_22305A closemessage applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A8 waitmovement 0 diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc index c45899f8c..c4b106589 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc +++ b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc @@ -5,9 +5,9 @@ MossdeepCity_SpaceCenter_2F_MapScripts:: @ 8223D58 MossdeepCity_SpaceCenter_2F_MapScript1_223D63: @ 8223D63 compare VAR_0x405D, 2 - call_if 1, MossdeepCity_SpaceCenter_2F_EventScript_223D7A + call_if_eq MossdeepCity_SpaceCenter_2F_EventScript_223D7A compare VAR_0x409F, 2 - call_if 1, MossdeepCity_SpaceCenter_2F_EventScript_223D9F + call_if_eq MossdeepCity_SpaceCenter_2F_EventScript_223D9F end MossdeepCity_SpaceCenter_2F_EventScript_223D7A:: @ 8223D7A @@ -350,9 +350,9 @@ MossdeepCity_SpaceCenter_2F_EventScript_224175:: @ 8224175 lockall checkplayergender compare VAR_RESULT, 0 - call_if 1, MossdeepCity_SpaceCenter_2F_EventScript_224193 + call_if_eq MossdeepCity_SpaceCenter_2F_EventScript_224193 compare VAR_RESULT, 1 - call_if 1, MossdeepCity_SpaceCenter_2F_EventScript_22419A + call_if_eq MossdeepCity_SpaceCenter_2F_EventScript_22419A closemessage clearflag FLAG_0x075 releaseall diff --git a/data/maps/MossdeepCity_StevensHouse/scripts.inc b/data/maps/MossdeepCity_StevensHouse/scripts.inc index b1e794172..8db53c1c6 100644 --- a/data/maps/MossdeepCity_StevensHouse/scripts.inc +++ b/data/maps/MossdeepCity_StevensHouse/scripts.inc @@ -5,8 +5,7 @@ MossdeepCity_StevensHouse_MapScripts:: @ 8222784 .byte 0 MossdeepCity_StevensHouse_MapScript1_222794: @ 8222794 - checkflag FLAG_SYS_GAME_CLEAR - call_if 0, MossdeepCity_StevensHouse_EventScript_22279E + call_if_unset FLAG_SYS_GAME_CLEAR, MossdeepCity_StevensHouse_EventScript_22279E end MossdeepCity_StevensHouse_EventScript_22279E:: @ 822279E @@ -15,7 +14,7 @@ MossdeepCity_StevensHouse_EventScript_22279E:: @ 822279E MossdeepCity_StevensHouse_MapScript1_2227A8: @ 82227A8 compare VAR_0x40C6, 2 - call_if 1, MossdeepCity_StevensHouse_EventScript_2227B4 + call_if_eq MossdeepCity_StevensHouse_EventScript_2227B4 end MossdeepCity_StevensHouse_EventScript_2227B4:: @ 82227B4 diff --git a/data/maps/MtChimney/scripts.inc b/data/maps/MtChimney/scripts.inc index 9b1c29290..6e7331660 100644 --- a/data/maps/MtChimney/scripts.inc +++ b/data/maps/MtChimney/scripts.inc @@ -14,10 +14,8 @@ MtChimney_MapScript1_22EDD2: @ 822EDD2 MtChimney_EventScript_22EDD5:: @ 822EDD5 lock faceplayer - checkflag FLAG_0x0DB - call_if 0, MtChimney_EventScript_22EDF9 - checkflag FLAG_0x0DB - call_if 1, MtChimney_EventScript_22EE02 + call_if_unset FLAG_0x0DB, MtChimney_EventScript_22EDF9 + call_if_set FLAG_0x0DB, MtChimney_EventScript_22EE02 closemessage applymovement 1, MtChimney_Movement_2725A2 waitmovement 0 @@ -59,17 +57,17 @@ MtChimney_EventScript_22EE0B:: @ 822EE0B setobjectxyperm 1, 10, 12 addobject 1 compare VAR_FACING, 4 - call_if 1, MtChimney_EventScript_22EEC7 + call_if_eq MtChimney_EventScript_22EEC7 compare VAR_FACING, 2 - call_if 1, MtChimney_EventScript_22EED2 + call_if_eq MtChimney_EventScript_22EED2 applymovement EVENT_OBJ_ID_PLAYER, MtChimney_Movement_2725A4 waitmovement 0 msgbox MtChimney_Text_22FC3D, MSGBOX_DEFAULT closemessage compare VAR_FACING, 4 - call_if 1, MtChimney_EventScript_22EEDD + call_if_eq MtChimney_EventScript_22EEDD compare VAR_FACING, 2 - call_if 1, MtChimney_EventScript_22EEE8 + call_if_eq MtChimney_EventScript_22EEE8 removeobject 1 setflag FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA setflag FLAG_0x08B @@ -112,7 +110,7 @@ MtChimney_EventScript_22EEF3:: @ 822EEF3 msgbox MtChimney_Text_22FE4D, MSGBOX_DEFAULT checkitemspace ITEM_LAVA_COOKIE, 1 compare VAR_RESULT, 1 - call_if 1, MtChimney_EventScript_22EF5E + call_if_eq MtChimney_EventScript_22EF5E giveitem_std ITEM_LAVA_COOKIE compare VAR_RESULT, 0 goto_if_eq MtChimney_EventScript_22EF51 diff --git a/data/maps/MtChimney_CableCarStation/scripts.inc b/data/maps/MtChimney_CableCarStation/scripts.inc index 06590d78f..8e52438c9 100644 --- a/data/maps/MtChimney_CableCarStation/scripts.inc +++ b/data/maps/MtChimney_CableCarStation/scripts.inc @@ -5,7 +5,7 @@ MtChimney_CableCarStation_MapScripts:: @ 822ABFA MtChimney_CableCarStation_MapScript1_22AC05: @ 822AC05 compare VAR_0x40A3, 1 - call_if 1, MtChimney_CableCarStation_EventScript_22AC11 + call_if_eq MtChimney_CableCarStation_EventScript_22AC11 end MtChimney_CableCarStation_EventScript_22AC11:: @ 822AC11 diff --git a/data/maps/MtPyre_Summit/scripts.inc b/data/maps/MtPyre_Summit/scripts.inc index 63de4d5dd..31ae3348a 100644 --- a/data/maps/MtPyre_Summit/scripts.inc +++ b/data/maps/MtPyre_Summit/scripts.inc @@ -4,7 +4,7 @@ MtPyre_Summit_MapScripts:: @ 8231FF7 MtPyre_Summit_MapScript1_231FFD: @ 8231FFD compare VAR_0x40B9, 2 - call_if 1, MtPyre_Summit_EventScript_232009 + call_if_eq MtPyre_Summit_EventScript_232009 end MtPyre_Summit_EventScript_232009:: @ 8232009 @@ -38,11 +38,11 @@ MtPyre_Summit_EventScript_23203C:: @ 823203C waitmovement 0 delay 50 compare VAR_0x8008, 0 - call_if 1, MtPyre_Summit_EventScript_2320E0 + call_if_eq MtPyre_Summit_EventScript_2320E0 compare VAR_0x8008, 1 - call_if 1, MtPyre_Summit_EventScript_2320EB + call_if_eq MtPyre_Summit_EventScript_2320EB compare VAR_0x8008, 2 - call_if 1, MtPyre_Summit_EventScript_2320EC + call_if_eq MtPyre_Summit_EventScript_2320EC msgbox MtPyre_Summit_Text_23281A, MSGBOX_DEFAULT closemessage fadescreen 1 @@ -58,11 +58,11 @@ MtPyre_Summit_EventScript_23203C:: @ 823203C delay 20 setvar VAR_0x40B9, 1 compare VAR_0x8008, 0 - call_if 1, MtPyre_Summit_EventScript_2320F7 + call_if_eq MtPyre_Summit_EventScript_2320F7 compare VAR_0x8008, 1 - call_if 1, MtPyre_Summit_EventScript_23210C + call_if_eq MtPyre_Summit_EventScript_23210C compare VAR_0x8008, 2 - call_if 1, MtPyre_Summit_EventScript_232117 + call_if_eq MtPyre_Summit_EventScript_232117 msgbox MtPyre_Summit_Text_23290E, MSGBOX_DEFAULT giveitem_std ITEM_MAGMA_EMBLEM setflag FLAG_0x0D4 @@ -134,18 +134,18 @@ MtPyre_Summit_EventScript_23213C:: @ 823213C goto_if_set FLAG_0x09E, MtPyre_Summit_EventScript_232167 msgbox MtPyre_Summit_Text_232E0C, MSGBOX_YESNO compare VAR_RESULT, 1 - call_if 1, MtPyre_Summit_EventScript_232187 + call_if_eq MtPyre_Summit_EventScript_232187 compare VAR_RESULT, 0 - call_if 1, MtPyre_Summit_EventScript_232190 + call_if_eq MtPyre_Summit_EventScript_232190 release end MtPyre_Summit_EventScript_232167:: @ 8232167 msgbox MtPyre_Summit_Text_2331A6, MSGBOX_YESNO compare VAR_RESULT, 1 - call_if 1, MtPyre_Summit_EventScript_232199 + call_if_eq MtPyre_Summit_EventScript_232199 compare VAR_RESULT, 0 - call_if 1, MtPyre_Summit_EventScript_232190 + call_if_eq MtPyre_Summit_EventScript_232190 release end @@ -166,7 +166,7 @@ MtPyre_Summit_EventScript_2321A2:: @ 82321A2 faceplayer goto_if_set FLAG_0x103, MtPyre_Summit_EventScript_2321E2 compare VAR_0x40B9, 3 - call_if 4, MtPyre_Summit_EventScript_2321CB + call_if_ge MtPyre_Summit_EventScript_2321CB goto_if_set FLAG_0x081, MtPyre_Summit_EventScript_2321D8 msgbox MtPyre_Summit_Text_232AD8, MSGBOX_DEFAULT release @@ -211,11 +211,11 @@ MtPyre_Summit_EventScript_232210:: @ 8232210 waitmovement 0 delay 60 compare VAR_0x8008, 0 - call_if 1, MtPyre_Summit_EventScript_2322C4 + call_if_eq MtPyre_Summit_EventScript_2322C4 compare VAR_0x8008, 1 - call_if 1, MtPyre_Summit_EventScript_2322DD + call_if_eq MtPyre_Summit_EventScript_2322DD compare VAR_0x8008, 2 - call_if 1, MtPyre_Summit_EventScript_2322F6 + call_if_eq MtPyre_Summit_EventScript_2322F6 playse SE_PIN applymovement 8, MtPyre_Summit_Movement_272598 waitmovement 0 @@ -223,19 +223,19 @@ MtPyre_Summit_EventScript_232210:: @ 8232210 waitmovement 0 delay 30 compare VAR_0x8008, 0 - call_if 1, MtPyre_Summit_EventScript_23230F + call_if_eq MtPyre_Summit_EventScript_23230F compare VAR_0x8008, 1 - call_if 1, MtPyre_Summit_EventScript_232328 + call_if_eq MtPyre_Summit_EventScript_232328 compare VAR_0x8008, 2 - call_if 1, MtPyre_Summit_EventScript_232341 + call_if_eq MtPyre_Summit_EventScript_232341 msgbox MtPyre_Summit_Text_233183, MSGBOX_DEFAULT closemessage compare VAR_0x8008, 0 - call_if 1, MtPyre_Summit_EventScript_23235A + call_if_eq MtPyre_Summit_EventScript_23235A compare VAR_0x8008, 1 - call_if 1, MtPyre_Summit_EventScript_232376 + call_if_eq MtPyre_Summit_EventScript_232376 compare VAR_0x8008, 2 - call_if 1, MtPyre_Summit_EventScript_232392 + call_if_eq MtPyre_Summit_EventScript_232392 delay 30 applymovement 2, MtPyre_Summit_Movement_2323B6 applymovement 8, MtPyre_Summit_Movement_2323BD diff --git a/data/maps/NavelRock_Bottom/scripts.inc b/data/maps/NavelRock_Bottom/scripts.inc index 70a6fed65..bbe02aadf 100644 --- a/data/maps/NavelRock_Bottom/scripts.inc +++ b/data/maps/NavelRock_Bottom/scripts.inc @@ -4,10 +4,8 @@ NavelRock_Bottom_MapScripts:: @ 8269255 .byte 0 NavelRock_Bottom_MapScript1_269260: @ 8269260 - checkflag FLAG_0x091 - call_if 1, NavelRock_Bottom_EventScript_269273 - checkflag FLAG_0x091 - call_if 0, NavelRock_Bottom_EventScript_269277 + call_if_set FLAG_0x091, NavelRock_Bottom_EventScript_269273 + call_if_unset FLAG_0x091, NavelRock_Bottom_EventScript_269277 end NavelRock_Bottom_EventScript_269273:: @ 8269273 @@ -20,8 +18,7 @@ NavelRock_Bottom_EventScript_269277:: @ 8269277 return NavelRock_Bottom_MapScript1_269284: @ 8269284 - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, NavelRock_Bottom_EventScript_26928E + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, NavelRock_Bottom_EventScript_26928E end NavelRock_Bottom_EventScript_26928E:: @ 826928E diff --git a/data/maps/NavelRock_Top/scripts.inc b/data/maps/NavelRock_Top/scripts.inc index 339158041..61b046daf 100644 --- a/data/maps/NavelRock_Top/scripts.inc +++ b/data/maps/NavelRock_Top/scripts.inc @@ -4,10 +4,8 @@ NavelRock_Top_MapScripts:: @ 8269113 .byte 0 NavelRock_Top_MapScript1_26911E: @ 826911E - checkflag FLAG_0x092 - call_if 1, NavelRock_Top_EventScript_269131 - checkflag FLAG_0x092 - call_if 0, NavelRock_Top_EventScript_26913A + call_if_set FLAG_0x092, NavelRock_Top_EventScript_269131 + call_if_unset FLAG_0x092, NavelRock_Top_EventScript_26913A end NavelRock_Top_EventScript_269131:: @ 8269131 @@ -23,8 +21,7 @@ NavelRock_Top_EventScript_26913A:: @ 826913A return NavelRock_Top_MapScript1_269151: @ 8269151 - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, NavelRock_Top_EventScript_26915B + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, NavelRock_Top_EventScript_26915B end NavelRock_Top_EventScript_26915B:: @ 826915B diff --git a/data/maps/NewMauville_Entrance/scripts.inc b/data/maps/NewMauville_Entrance/scripts.inc index b9b7b5189..d841f0374 100644 --- a/data/maps/NewMauville_Entrance/scripts.inc +++ b/data/maps/NewMauville_Entrance/scripts.inc @@ -5,7 +5,7 @@ NewMauville_Entrance_MapScripts:: @ 82372AD NewMauville_Entrance_MapScript1_2372B8: @ 82372B8 compare VAR_0x40BA, 0 - call_if 1, NewMauville_Entrance_EventScript_2372C4 + call_if_eq NewMauville_Entrance_EventScript_2372C4 end NewMauville_Entrance_EventScript_2372C4:: @ 82372C4 diff --git a/data/maps/NewMauville_Inside/scripts.inc b/data/maps/NewMauville_Inside/scripts.inc index 784d813da..aff38c577 100644 --- a/data/maps/NewMauville_Inside/scripts.inc +++ b/data/maps/NewMauville_Inside/scripts.inc @@ -6,11 +6,10 @@ NewMauville_Inside_MapScripts:: @ 82373D7 NewMauville_Inside_MapScript1_2373E7: @ 82373E7 compare VAR_TEMP_1, 1 - call_if 1, NewMauville_Inside_EventScript_237489 + call_if_eq NewMauville_Inside_EventScript_237489 compare VAR_TEMP_2, 1 - call_if 1, NewMauville_Inside_EventScript_2375D7 - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, NewMauville_Inside_EventScript_237407 + call_if_eq NewMauville_Inside_EventScript_2375D7 + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, NewMauville_Inside_EventScript_237407 end NewMauville_Inside_EventScript_237407:: @ 8237407 @@ -23,12 +22,9 @@ NewMauville_Inside_EventScript_237407:: @ 8237407 NewMauville_Inside_MapScript1_23741B: @ 823741B setvar VAR_TEMP_1, 0 setvar VAR_TEMP_2, 0 - checkflag FLAG_0x1C1 - call_if 0, NewMauville_Inside_EventScript_237441 - checkflag FLAG_0x1C2 - call_if 0, NewMauville_Inside_EventScript_237445 - checkflag FLAG_0x1C3 - call_if 0, NewMauville_Inside_EventScript_237449 + call_if_unset FLAG_0x1C1, NewMauville_Inside_EventScript_237441 + call_if_unset FLAG_0x1C2, NewMauville_Inside_EventScript_237445 + call_if_unset FLAG_0x1C3, NewMauville_Inside_EventScript_237449 end NewMauville_Inside_EventScript_237441:: @ 8237441 @@ -45,7 +41,7 @@ NewMauville_Inside_EventScript_237449:: @ 8237449 NewMauville_Inside_MapScript1_23744D: @ 823744D compare VAR_0x40BA, 2 - call_if 1, NewMauville_Inside_EventScript_23773A + call_if_eq NewMauville_Inside_EventScript_23773A end NewMauville_Inside_EventScript_237459:: @ 8237459 diff --git a/data/maps/OldaleTown/scripts.inc b/data/maps/OldaleTown/scripts.inc index 2b3b76fc5..96863ceed 100644 --- a/data/maps/OldaleTown/scripts.inc +++ b/data/maps/OldaleTown/scripts.inc @@ -5,12 +5,9 @@ OldaleTown_MapScripts:: @ 81E8EA2 OldaleTown_MapScript1_1E8EA8: @ 81E8EA8 call OldaleTown_EventScript_271ED7 setflag FLAG_VISITED_OLDALE_TOWN - checkflag FLAG_0x074 - call_if 0, OldaleTown_EventScript_1E8ED2 - checkflag FLAG_0x084 - call_if 0, OldaleTown_EventScript_1E8EDE - checkflag FLAG_0x074 - call_if 1, OldaleTown_EventScript_1E8ECC + call_if_unset FLAG_0x074, OldaleTown_EventScript_1E8ED2 + call_if_unset FLAG_0x084, OldaleTown_EventScript_1E8EDE + call_if_set FLAG_0x074, OldaleTown_EventScript_1E8ECC end OldaleTown_EventScript_1E8ECC:: @ 81E8ECC @@ -277,9 +274,9 @@ OldaleTown_EventScript_1E910C:: @ 81E910C OldaleTown_EventScript_1E911A:: @ 81E911A closemessage compare VAR_0x8009, 0 - call_if 1, OldaleTown_EventScript_1E9148 + call_if_eq OldaleTown_EventScript_1E9148 compare VAR_0x8009, 1 - call_if 1, OldaleTown_EventScript_1E915E + call_if_eq OldaleTown_EventScript_1E915E applymovement 4, OldaleTown_Movement_1E9177 waitmovement 0 removeobject 4 diff --git a/data/maps/PacifidlogTown_House2/scripts.inc b/data/maps/PacifidlogTown_House2/scripts.inc index 40dc393d0..d0eb88cf2 100644 --- a/data/maps/PacifidlogTown_House2/scripts.inc +++ b/data/maps/PacifidlogTown_House2/scripts.inc @@ -7,10 +7,8 @@ PacifidlogTown_House2_EventScript_203792:: @ 8203792 dodailyevents call PacifidlogTown_House2_EventScript_2037DE goto_if_set FLAG_0x12B, PacifidlogTown_House2_EventScript_20387E - checkflag FLAG_0x12C - call_if 1, PacifidlogTown_House2_EventScript_2037F8 - checkflag FLAG_0x12C - call_if 0, PacifidlogTown_House2_EventScript_203801 + call_if_set FLAG_0x12C, PacifidlogTown_House2_EventScript_2037F8 + call_if_unset FLAG_0x12C, PacifidlogTown_House2_EventScript_203801 setflag FLAG_0x12C specialvar VAR_RESULT, GetLeadMonFriendshipScore compare VAR_RESULT, 4 @@ -25,7 +23,7 @@ PacifidlogTown_House2_EventScript_2037DE:: @ 82037DE goto_if_unset FLAG_0x12B, PacifidlogTown_House2_EventScript_27374E specialvar VAR_RESULT, GetDaysUntilPacifidlogTMAvailable compare VAR_RESULT, 0 - call_if 1, PacifidlogTown_House2_EventScript_203812 + call_if_eq PacifidlogTown_House2_EventScript_203812 return PacifidlogTown_House2_EventScript_2037F8:: @ 82037F8 diff --git a/data/maps/PetalburgCity/scripts.inc b/data/maps/PetalburgCity/scripts.inc index beee8d57e..c7d125208 100644 --- a/data/maps/PetalburgCity/scripts.inc +++ b/data/maps/PetalburgCity/scripts.inc @@ -1,13 +1,13 @@ PetalburgCity_MapScript1_1DC2D7: @ 81DC2D7 setflag FLAG_VISITED_PETALBURG_CITY compare VAR_0x4057, 0 - call_if 1, PetalburgCity_EventScript_1DC307 + call_if_eq PetalburgCity_EventScript_1DC307 compare VAR_0x4057, 2 - call_if 1, PetalburgCity_EventScript_1DC30F + call_if_eq PetalburgCity_EventScript_1DC30F compare VAR_0x4057, 4 - call_if 1, PetalburgCity_EventScript_1DC30F + call_if_eq PetalburgCity_EventScript_1DC30F compare VAR_0x4085, 8 - call_if 1, PetalburgCity_EventScript_1DC316 + call_if_eq PetalburgCity_EventScript_1DC316 end PetalburgCity_EventScript_1DC307:: @ 81DC307 @@ -267,23 +267,23 @@ PetalburgCity_EventScript_1DC4CA:: @ 81DC4CA applymovement 8, PetalburgCity_Movement_27259A waitmovement 0 compare VAR_0x8008, 0 - call_if 1, PetalburgCity_EventScript_1DC57F + call_if_eq PetalburgCity_EventScript_1DC57F compare VAR_0x8008, 1 - call_if 1, PetalburgCity_EventScript_1DC594 + call_if_eq PetalburgCity_EventScript_1DC594 compare VAR_0x8008, 2 - call_if 1, PetalburgCity_EventScript_1DC59F + call_if_eq PetalburgCity_EventScript_1DC59F compare VAR_0x8008, 3 - call_if 1, PetalburgCity_EventScript_1DC5B4 + call_if_eq PetalburgCity_EventScript_1DC5B4 msgbox PetalburgCity_Text_1DC881, MSGBOX_DEFAULT closemessage compare VAR_0x8008, 0 - call_if 1, PetalburgCity_EventScript_1DC5C9 + call_if_eq PetalburgCity_EventScript_1DC5C9 compare VAR_0x8008, 1 - call_if 1, PetalburgCity_EventScript_1DC5DB + call_if_eq PetalburgCity_EventScript_1DC5DB compare VAR_0x8008, 2 - call_if 1, PetalburgCity_EventScript_1DC5ED + call_if_eq PetalburgCity_EventScript_1DC5ED compare VAR_0x8008, 3 - call_if 1, PetalburgCity_EventScript_1DC5FF + call_if_eq PetalburgCity_EventScript_1DC5FF msgbox PetalburgCity_Text_1DC91B, MSGBOX_DEFAULT applymovement 8, PetalburgCity_Movement_2725A8 applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_2725A8 @@ -560,13 +560,13 @@ PetalburgCity_EventScript_1DC6E9:: @ 81DC6E9 msgbox PetalburgCity_Text_1DCC09, MSGBOX_DEFAULT closemessage compare VAR_0x8008, 0 - call_if 1, PetalburgCity_EventScript_1DC78E + call_if_eq PetalburgCity_EventScript_1DC78E compare VAR_0x8008, 1 - call_if 1, PetalburgCity_EventScript_1DC7A0 + call_if_eq PetalburgCity_EventScript_1DC7A0 compare VAR_0x8008, 2 - call_if 1, PetalburgCity_EventScript_1DC7B2 + call_if_eq PetalburgCity_EventScript_1DC7B2 compare VAR_0x8008, 3 - call_if 1, PetalburgCity_EventScript_1DC7C4 + call_if_eq PetalburgCity_EventScript_1DC7C4 setvar VAR_0x40C9, 1 removeobject 9 releaseall diff --git a/data/maps/PetalburgCity_Gym/scripts.inc b/data/maps/PetalburgCity_Gym/scripts.inc index 46d9f46c2..fdc7626f6 100644 --- a/data/maps/PetalburgCity_Gym/scripts.inc +++ b/data/maps/PetalburgCity_Gym/scripts.inc @@ -9,26 +9,26 @@ PetalburgCity_Gym_MapScript1_20489E: @ 820489E compare VAR_0x4085, 6 goto_if_eq PetalburgCity_Gym_EventScript_2048B5 compare VAR_0x4085, 7 - call_if 4, PetalburgCity_Gym_EventScript_2048FF + call_if_ge PetalburgCity_Gym_EventScript_2048FF end PetalburgCity_Gym_EventScript_2048B5:: @ 82048B5 setvar VAR_0x8005, 1 call PetalburgCity_Gym_EventScript_20555E checktrainerflag TRAINER_RANDALL - call_if 1, PetalburgCity_Gym_EventScript_20557F + call_if_eq PetalburgCity_Gym_EventScript_20557F checktrainerflag TRAINER_MARY - call_if 1, PetalburgCity_Gym_EventScript_2055A0 + call_if_eq PetalburgCity_Gym_EventScript_2055A0 checktrainerflag TRAINER_PARKER - call_if 1, PetalburgCity_Gym_EventScript_2055C1 + call_if_eq PetalburgCity_Gym_EventScript_2055C1 checktrainerflag TRAINER_ALEXIA - call_if 1, PetalburgCity_Gym_EventScript_2055E2 + call_if_eq PetalburgCity_Gym_EventScript_2055E2 checktrainerflag TRAINER_GEORGE - call_if 1, PetalburgCity_Gym_EventScript_205603 + call_if_eq PetalburgCity_Gym_EventScript_205603 checktrainerflag TRAINER_JODY - call_if 1, PetalburgCity_Gym_EventScript_205624 + call_if_eq PetalburgCity_Gym_EventScript_205624 checktrainerflag TRAINER_BERKE - call_if 1, PetalburgCity_Gym_EventScript_205645 + call_if_eq PetalburgCity_Gym_EventScript_205645 end PetalburgCity_Gym_EventScript_2048FF:: @ 82048FF @@ -45,11 +45,10 @@ PetalburgCity_Gym_EventScript_2048FF:: @ 82048FF PetalburgCity_Gym_MapScript1_20492D: @ 820492D compare VAR_0x4085, 1 - call_if 1, PetalburgCity_Gym_EventScript_20494D + call_if_eq PetalburgCity_Gym_EventScript_20494D compare VAR_0x4085, 6 - call_if 0, PetalburgCity_Gym_EventScript_204955 - checkflag FLAG_SYS_GAME_CLEAR - call_if 1, PetalburgCity_Gym_EventScript_20495D + call_if_lt PetalburgCity_Gym_EventScript_204955 + call_if_set FLAG_SYS_GAME_CLEAR, PetalburgCity_Gym_EventScript_20495D end PetalburgCity_Gym_EventScript_20494D:: @ 820494D @@ -156,65 +155,65 @@ PetalburgCity_Gym_EventScript_204AAC:: @ 8204AAC addobject 10 playse SE_DOOR compare VAR_0x8008, 0 - call_if 1, PetalburgCity_Gym_EventScript_204C31 + call_if_eq PetalburgCity_Gym_EventScript_204C31 compare VAR_0x8008, 1 - call_if 1, PetalburgCity_Gym_EventScript_204C43 + call_if_eq PetalburgCity_Gym_EventScript_204C43 compare VAR_0x8008, 2 - call_if 1, PetalburgCity_Gym_EventScript_204C5F + call_if_eq PetalburgCity_Gym_EventScript_204C5F compare VAR_0x8008, 3 - call_if 1, PetalburgCity_Gym_EventScript_204C5F + call_if_eq PetalburgCity_Gym_EventScript_204C5F msgbox PetalburgCity_Gym_Text_2058B1, MSGBOX_DEFAULT msgbox PetalburgCity_Gym_Text_2058DB, MSGBOX_DEFAULT msgbox PetalburgCity_Gym_Text_205910, MSGBOX_DEFAULT msgbox PetalburgCity_Gym_Text_2059D8, MSGBOX_DEFAULT compare VAR_0x8008, 0 - call_if 1, PetalburgCity_Gym_EventScript_204CC7 + call_if_eq PetalburgCity_Gym_EventScript_204CC7 compare VAR_0x8008, 1 - call_if 1, PetalburgCity_Gym_EventScript_204CD2 + call_if_eq PetalburgCity_Gym_EventScript_204CD2 compare VAR_0x8008, 2 - call_if 1, PetalburgCity_Gym_EventScript_204CE4 + call_if_eq PetalburgCity_Gym_EventScript_204CE4 compare VAR_0x8008, 3 - call_if 1, PetalburgCity_Gym_EventScript_204CF6 + call_if_eq PetalburgCity_Gym_EventScript_204CF6 msgbox PetalburgCity_Gym_Text_2059E8, MSGBOX_DEFAULT compare VAR_0x8008, 0 - call_if 1, PetalburgCity_Gym_EventScript_204D08 + call_if_eq PetalburgCity_Gym_EventScript_204D08 compare VAR_0x8008, 1 - call_if 1, PetalburgCity_Gym_EventScript_204D13 + call_if_eq PetalburgCity_Gym_EventScript_204D13 compare VAR_0x8008, 2 - call_if 1, PetalburgCity_Gym_EventScript_204D1E + call_if_eq PetalburgCity_Gym_EventScript_204D1E compare VAR_0x8008, 3 - call_if 1, PetalburgCity_Gym_EventScript_204D29 + call_if_eq PetalburgCity_Gym_EventScript_204D29 msgbox PetalburgCity_Gym_Text_205A46, MSGBOX_DEFAULT msgbox PetalburgCity_Gym_Text_205A89, MSGBOX_DEFAULT msgbox PetalburgCity_Gym_Text_205AF4, MSGBOX_DEFAULT compare VAR_0x8008, 0 - call_if 1, PetalburgCity_Gym_EventScript_204D72 + call_if_eq PetalburgCity_Gym_EventScript_204D72 compare VAR_0x8008, 1 - call_if 1, PetalburgCity_Gym_EventScript_204D73 + call_if_eq PetalburgCity_Gym_EventScript_204D73 compare VAR_0x8008, 2 - call_if 1, PetalburgCity_Gym_EventScript_204D7E + call_if_eq PetalburgCity_Gym_EventScript_204D7E compare VAR_0x8008, 3 - call_if 1, PetalburgCity_Gym_EventScript_204D7F + call_if_eq PetalburgCity_Gym_EventScript_204D7F compare VAR_0x8008, 0 - call_if 1, PetalburgCity_Gym_EventScript_204D34 + call_if_eq PetalburgCity_Gym_EventScript_204D34 compare VAR_0x8008, 1 - call_if 1, PetalburgCity_Gym_EventScript_204D3F + call_if_eq PetalburgCity_Gym_EventScript_204D3F compare VAR_0x8008, 2 - call_if 1, PetalburgCity_Gym_EventScript_204D34 + call_if_eq PetalburgCity_Gym_EventScript_204D34 compare VAR_0x8008, 3 - call_if 1, PetalburgCity_Gym_EventScript_204D34 + call_if_eq PetalburgCity_Gym_EventScript_204D34 msgbox PetalburgCity_Gym_Text_205B0F, MSGBOX_DEFAULT closemessage setflag FLAG_SPECIAL_FLAG_0x4001 playbgm MUS_TSURETEK, 0 compare VAR_0x8008, 0 - call_if 1, PetalburgCity_Gym_EventScript_204C78 + call_if_eq PetalburgCity_Gym_EventScript_204C78 compare VAR_0x8008, 1 - call_if 1, PetalburgCity_Gym_EventScript_204C91 + call_if_eq PetalburgCity_Gym_EventScript_204C91 compare VAR_0x8008, 2 - call_if 1, PetalburgCity_Gym_EventScript_204CA3 + call_if_eq PetalburgCity_Gym_EventScript_204CA3 compare VAR_0x8008, 3 - call_if 1, PetalburgCity_Gym_EventScript_204CB5 + call_if_eq PetalburgCity_Gym_EventScript_204CB5 removeobject 10 setflag FLAG_HIDE_PETALBURG_CITY_WALLYS_AUNT setvar VAR_0x4085, 1 @@ -472,30 +471,30 @@ PetalburgCity_Gym_EventScript_204F13:: @ 8204F13 waitmovement 0 delay 10 compare VAR_0x8008, 1 - call_if 1, PetalburgCity_Gym_EventScript_204FED + call_if_eq PetalburgCity_Gym_EventScript_204FED compare VAR_0x8008, 2 - call_if 1, PetalburgCity_Gym_EventScript_205009 + call_if_eq PetalburgCity_Gym_EventScript_205009 compare VAR_0x8008, 3 - call_if 1, PetalburgCity_Gym_EventScript_205025 + call_if_eq PetalburgCity_Gym_EventScript_205025 msgbox PetalburgCity_Gym_Text_206377, MSGBOX_DEFAULT closemessage delay 20 compare VAR_0x8008, 1 - call_if 1, PetalburgCity_Gym_EventScript_204FCC + call_if_eq PetalburgCity_Gym_EventScript_204FCC compare VAR_0x8008, 2 - call_if 1, PetalburgCity_Gym_EventScript_204FD7 + call_if_eq PetalburgCity_Gym_EventScript_204FD7 compare VAR_0x8008, 3 - call_if 1, PetalburgCity_Gym_EventScript_204FE2 + call_if_eq PetalburgCity_Gym_EventScript_204FE2 msgbox PetalburgCity_Gym_Text_2063CA, MSGBOX_DEFAULT closemessage setflag FLAG_SPECIAL_FLAG_0x4001 playbgm MUS_TSURETEK, 0 compare VAR_0x8008, 1 - call_if 1, PetalburgCity_Gym_EventScript_205041 + call_if_eq PetalburgCity_Gym_EventScript_205041 compare VAR_0x8008, 2 - call_if 1, PetalburgCity_Gym_EventScript_20505A + call_if_eq PetalburgCity_Gym_EventScript_20505A compare VAR_0x8008, 3 - call_if 1, PetalburgCity_Gym_EventScript_20506C + call_if_eq PetalburgCity_Gym_EventScript_20506C removeobject 11 setvar VAR_0x4057, 4 clearflag FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE @@ -1077,72 +1076,72 @@ PetalburgCity_Gym_EventScript_205555:: @ 8205555 PetalburgCity_Gym_EventScript_20555E:: @ 820555E setvar VAR_0x8004, 1 compare VAR_0x8005, 0 - call_if 1, PetalburgCity_Gym_EventScript_205746 + call_if_eq PetalburgCity_Gym_EventScript_205746 compare VAR_0x8005, 1 - call_if 1, PetalburgCity_Gym_EventScript_20574B + call_if_eq PetalburgCity_Gym_EventScript_20574B call PetalburgCity_Gym_EventScript_205666 return PetalburgCity_Gym_EventScript_20557F:: @ 820557F setvar VAR_0x8004, 2 compare VAR_0x8005, 0 - call_if 1, PetalburgCity_Gym_EventScript_205746 + call_if_eq PetalburgCity_Gym_EventScript_205746 compare VAR_0x8005, 1 - call_if 1, PetalburgCity_Gym_EventScript_20574B + call_if_eq PetalburgCity_Gym_EventScript_20574B call PetalburgCity_Gym_EventScript_20568B return PetalburgCity_Gym_EventScript_2055A0:: @ 82055A0 setvar VAR_0x8004, 3 compare VAR_0x8005, 0 - call_if 1, PetalburgCity_Gym_EventScript_205746 + call_if_eq PetalburgCity_Gym_EventScript_205746 compare VAR_0x8005, 1 - call_if 1, PetalburgCity_Gym_EventScript_20574B + call_if_eq PetalburgCity_Gym_EventScript_20574B call PetalburgCity_Gym_EventScript_2056B0 return PetalburgCity_Gym_EventScript_2055C1:: @ 82055C1 setvar VAR_0x8004, 4 compare VAR_0x8005, 0 - call_if 1, PetalburgCity_Gym_EventScript_205746 + call_if_eq PetalburgCity_Gym_EventScript_205746 compare VAR_0x8005, 1 - call_if 1, PetalburgCity_Gym_EventScript_20574B + call_if_eq PetalburgCity_Gym_EventScript_20574B call PetalburgCity_Gym_EventScript_2056D5 return PetalburgCity_Gym_EventScript_2055E2:: @ 82055E2 setvar VAR_0x8004, 5 compare VAR_0x8005, 0 - call_if 1, PetalburgCity_Gym_EventScript_205746 + call_if_eq PetalburgCity_Gym_EventScript_205746 compare VAR_0x8005, 1 - call_if 1, PetalburgCity_Gym_EventScript_20574B + call_if_eq PetalburgCity_Gym_EventScript_20574B call PetalburgCity_Gym_EventScript_2056E8 return PetalburgCity_Gym_EventScript_205603:: @ 8205603 setvar VAR_0x8004, 6 compare VAR_0x8005, 0 - call_if 1, PetalburgCity_Gym_EventScript_205746 + call_if_eq PetalburgCity_Gym_EventScript_205746 compare VAR_0x8005, 1 - call_if 1, PetalburgCity_Gym_EventScript_20574B + call_if_eq PetalburgCity_Gym_EventScript_20574B call PetalburgCity_Gym_EventScript_20570D return PetalburgCity_Gym_EventScript_205624:: @ 8205624 setvar VAR_0x8004, 7 compare VAR_0x8005, 0 - call_if 1, PetalburgCity_Gym_EventScript_205746 + call_if_eq PetalburgCity_Gym_EventScript_205746 compare VAR_0x8005, 1 - call_if 1, PetalburgCity_Gym_EventScript_20574B + call_if_eq PetalburgCity_Gym_EventScript_20574B call PetalburgCity_Gym_EventScript_205720 return PetalburgCity_Gym_EventScript_205645:: @ 8205645 setvar VAR_0x8004, 8 compare VAR_0x8005, 0 - call_if 1, PetalburgCity_Gym_EventScript_205746 + call_if_eq PetalburgCity_Gym_EventScript_205746 compare VAR_0x8005, 1 - call_if 1, PetalburgCity_Gym_EventScript_20574B + call_if_eq PetalburgCity_Gym_EventScript_20574B call PetalburgCity_Gym_EventScript_205733 return diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc b/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc index 50d02fa68..1bbeb8fad 100644 --- a/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc @@ -36,11 +36,11 @@ PetalburgCity_PokemonCenter_1F_EventScript_207A1C:: @ 8207A1C PetalburgCity_PokemonCenter_1F_EventScript_207A38:: @ 8207A38 compare VAR_STARTER_MON, 0 - call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_207A5B + call_if_eq PetalburgCity_PokemonCenter_1F_EventScript_207A5B compare VAR_STARTER_MON, 1 - call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_207A64 + call_if_eq PetalburgCity_PokemonCenter_1F_EventScript_207A64 compare VAR_STARTER_MON, 2 - call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_207A6D + call_if_eq PetalburgCity_PokemonCenter_1F_EventScript_207A6D release end diff --git a/data/maps/Route101/scripts.inc b/data/maps/Route101/scripts.inc index eaf9d7118..6ebcdd253 100644 --- a/data/maps/Route101/scripts.inc +++ b/data/maps/Route101/scripts.inc @@ -239,9 +239,9 @@ Route101_EventScript_1EBE16:: @ 81EBE16 clearflag FLAG_SPECIAL_FLAG_0x4000 checkplayergender compare VAR_RESULT, 0 - call_if 1, Route101_EventScript_1EBE85 + call_if_eq Route101_EventScript_1EBE85 compare VAR_RESULT, 1 - call_if 1, Route101_EventScript_1EBE89 + call_if_eq Route101_EventScript_1EBE89 warp MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB, 255, 6, 5 waitstate release diff --git a/data/maps/Route103/scripts.inc b/data/maps/Route103/scripts.inc index bcc1b5a91..6b793286e 100644 --- a/data/maps/Route103/scripts.inc +++ b/data/maps/Route103/scripts.inc @@ -9,8 +9,7 @@ Route103_MapScript1_1EC399: @ 81EC399 end Route103_MapScript1_1EC3A4: @ 81EC3A4 - checkflag FLAG_SYS_GAME_CLEAR - call_if 1, Route103_EventScript_1EC3AE + call_if_set FLAG_SYS_GAME_CLEAR, Route103_EventScript_1EC3AE end Route103_EventScript_1EC3AE:: @ 81EC3AE diff --git a/data/maps/Route104/scripts.inc b/data/maps/Route104/scripts.inc index c2862514e..6f1971d89 100644 --- a/data/maps/Route104/scripts.inc +++ b/data/maps/Route104/scripts.inc @@ -156,7 +156,7 @@ Route104_EventScript_1ECDED:: @ 81ECDED Route104_EventScript_1ECE1C:: @ 81ECE1C msgbox Route104_Text_1EDE3E, MSGBOX_DEFAULT compare VAR_0x8008, 0 - call_if 1, Route104_EventScript_1ECE31 + call_if_eq Route104_EventScript_1ECE31 releaseall end @@ -231,7 +231,7 @@ Route104_EventScript_1ECF09:: @ 81ECF09 Route104_EventScript_1ECF38:: @ 81ECF38 msgbox Route104_Text_1EE120, MSGBOX_DEFAULT compare VAR_0x8008, 0 - call_if 1, Route104_EventScript_1ECE31 + call_if_eq Route104_EventScript_1ECE31 releaseall end diff --git a/data/maps/Route104_MrBrineysHouse/scripts.inc b/data/maps/Route104_MrBrineysHouse/scripts.inc index 179925624..90298a924 100644 --- a/data/maps/Route104_MrBrineysHouse/scripts.inc +++ b/data/maps/Route104_MrBrineysHouse/scripts.inc @@ -5,9 +5,8 @@ Route104_MrBrineysHouse_MapScripts:: @ 8229D2E Route104_MrBrineysHouse_MapScript1_229D34: @ 8229D34 setflag FLAG_LANDMARK_MR_BRINEY_HOUSE compare VAR_0x4090, 1 - call_if 1, Route104_MrBrineysHouse_EventScript_229D50 - checkflag FLAG_0x0BC - call_if 1, Route104_MrBrineysHouse_EventScript_229D4C + call_if_eq Route104_MrBrineysHouse_EventScript_229D50 + call_if_set FLAG_0x0BC, Route104_MrBrineysHouse_EventScript_229D4C end Route104_MrBrineysHouse_EventScript_229D4C:: @ 8229D4C @@ -24,8 +23,7 @@ Route104_MrBrineysHouse_EventScript_229D50:: @ 8229D50 Route104_MrBrineysHouse_EventScript_229D67:: @ 8229D67 lock faceplayer - checkflag FLAG_0x093 - call_if 0, Route104_MrBrineysHouse_EventScript_229D8A + call_if_unset FLAG_0x093, Route104_MrBrineysHouse_EventScript_229D8A goto_if_unset FLAG_0x0BD, Route104_MrBrineysHouse_EventScript_229DE1 goto_if_unset FLAG_0x095, Route104_MrBrineysHouse_EventScript_229DFA goto Route104_MrBrineysHouse_EventScript_229DAE diff --git a/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc b/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc index 9a079d6d7..fc0acf329 100644 --- a/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc +++ b/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc @@ -22,18 +22,18 @@ Route104_PrettyPetalFlowerShop_EventScript_22A373:: @ 822A373 setflag FLAG_0x07F msgbox Route104_PrettyPetalFlowerShop_Text_2A7706, MSGBOX_YESNO compare VAR_RESULT, 1 - call_if 1, Route104_PrettyPetalFlowerShop_EventScript_22A3D2 + call_if_eq Route104_PrettyPetalFlowerShop_EventScript_22A3D2 compare VAR_RESULT, 0 - call_if 1, Route104_PrettyPetalFlowerShop_EventScript_22A3DB + call_if_eq Route104_PrettyPetalFlowerShop_EventScript_22A3DB release end Route104_PrettyPetalFlowerShop_EventScript_22A3B2:: @ 822A3B2 msgbox Route104_PrettyPetalFlowerShop_Text_2A76D9, MSGBOX_YESNO compare VAR_RESULT, 1 - call_if 1, Route104_PrettyPetalFlowerShop_EventScript_22A3D2 + call_if_eq Route104_PrettyPetalFlowerShop_EventScript_22A3D2 compare VAR_RESULT, 0 - call_if 1, Route104_PrettyPetalFlowerShop_EventScript_22A3DB + call_if_eq Route104_PrettyPetalFlowerShop_EventScript_22A3DB release end diff --git a/data/maps/Route105/scripts.inc b/data/maps/Route105/scripts.inc index 3fcc64880..adb8c4f8e 100644 --- a/data/maps/Route105/scripts.inc +++ b/data/maps/Route105/scripts.inc @@ -5,12 +5,11 @@ Route105_MapScripts:: @ 81EE1DB .byte 0 Route105_MapScript1_1EE1EB: @ 81EE1EB - checkflag FLAG_0x0E4 - call_if 0, Route105_EventScript_1EE20B + call_if_unset FLAG_0x0E4, Route105_EventScript_1EE20B compare VAR_0x4037, 9 - call_if 1, Route105_EventScript_2739AB + call_if_eq Route105_EventScript_2739AB compare VAR_0x4037, 10 - call_if 1, Route105_EventScript_273A18 + call_if_eq Route105_EventScript_273A18 end Route105_EventScript_1EE20B:: @ 81EE20B @@ -20,11 +19,11 @@ Route105_EventScript_1EE20B:: @ 81EE20B Route105_MapScript1_1EE21E: @ 81EE21E compare VAR_0x4039, 1 - call_if 1, Route105_EventScript_273D13 + call_if_eq Route105_EventScript_273D13 compare VAR_0x4037, 9 - call_if 1, Route105_EventScript_273D17 + call_if_eq Route105_EventScript_273D17 compare VAR_0x4037, 10 - call_if 1, Route105_EventScript_273D17 + call_if_eq Route105_EventScript_273D17 end Route105_MapScript2_1EE240: @ 81EE240 diff --git a/data/maps/Route110/scripts.inc b/data/maps/Route110/scripts.inc index 16618c9ff..ba7bced21 100644 --- a/data/maps/Route110/scripts.inc +++ b/data/maps/Route110/scripts.inc @@ -12,7 +12,7 @@ Route110_MapScript1_1EF27D: @ 81EF27D call Route110_EventScript_271ED7 call Route110_EventScript_271EFB compare VAR_CYCLING_CHALLENGE_STATE, 1 - call_if 1, Route110_EventScript_1EF293 + call_if_eq Route110_EventScript_1EF293 end Route110_EventScript_1EF293:: @ 81EF293 @@ -380,9 +380,9 @@ Route110_EventScript_1EF76E:: @ 81EF76E lockall checkplayergender compare VAR_RESULT, 0 - call_if 1, Route110_EventScript_1EF7E1 + call_if_eq Route110_EventScript_1EF7E1 compare VAR_RESULT, 1 - call_if 1, Route110_EventScript_1EF7E6 + call_if_eq Route110_EventScript_1EF7E6 applymovement 28, Route110_Movement_2725AA waitmovement 0 applymovement 28, Route110_Movement_272598 @@ -391,11 +391,11 @@ Route110_EventScript_1EF76E:: @ 81EF76E waitmovement 0 delay 30 compare VAR_0x8008, 1 - call_if 1, Route110_EventScript_1EF94E + call_if_eq Route110_EventScript_1EF94E compare VAR_0x8008, 2 - call_if 1, Route110_EventScript_1EF959 + call_if_eq Route110_EventScript_1EF959 compare VAR_0x8008, 3 - call_if 1, Route110_EventScript_1EF964 + call_if_eq Route110_EventScript_1EF964 checkplayergender compare VAR_RESULT, 0 goto_if_eq Route110_EventScript_1EF7EB @@ -479,22 +479,22 @@ Route110_EventScript_1EF8DF:: @ 81EF8DF Route110_EventScript_1EF8EC:: @ 81EF8EC closemessage compare VAR_0x8008, 1 - call_if 1, Route110_EventScript_1EF990 + call_if_eq Route110_EventScript_1EF990 compare VAR_0x8008, 2 - call_if 1, Route110_EventScript_1EF998 + call_if_eq Route110_EventScript_1EF998 compare VAR_0x8008, 3 - call_if 1, Route110_EventScript_1EF9A0 + call_if_eq Route110_EventScript_1EF9A0 setobjectmovementtype 28, 10 setobjectmovementtype 29, 10 removeobject 28 addobject 29 delay 45 compare VAR_0x8008, 1 - call_if 1, Route110_EventScript_1EF96F + call_if_eq Route110_EventScript_1EF96F compare VAR_0x8008, 2 - call_if 1, Route110_EventScript_1EF97A + call_if_eq Route110_EventScript_1EF97A compare VAR_0x8008, 3 - call_if 1, Route110_EventScript_1EF985 + call_if_eq Route110_EventScript_1EF985 removeobject 29 setvar VAR_0x4069, 1 savebgm MUS_DUMMY @@ -621,13 +621,13 @@ Route110_EventScript_1EF9F7:: @ 81EF9F7 applymovement 36, Route110_Movement_27259A waitmovement 0 compare VAR_0x8008, 1 - call_if 1, Route110_EventScript_1EFAD8 + call_if_eq Route110_EventScript_1EFAD8 compare VAR_0x8008, 2 - call_if 1, Route110_EventScript_1EFAE3 + call_if_eq Route110_EventScript_1EFAE3 compare VAR_0x8008, 3 - call_if 1, Route110_EventScript_1EFAEE + call_if_eq Route110_EventScript_1EFAEE compare VAR_0x8008, 4 - call_if 1, Route110_EventScript_1EFAF9 + call_if_eq Route110_EventScript_1EFAF9 msgbox Route110_Text_1F0AB5, MSGBOX_DEFAULT closemessage delay 20 @@ -652,13 +652,13 @@ Route110_EventScript_1EF9F7:: @ 81EF9F7 msgbox Route110_Text_1F0C33, MSGBOX_DEFAULT closemessage compare VAR_0x8008, 1 - call_if 1, Route110_EventScript_1EFB04 + call_if_eq Route110_EventScript_1EFB04 compare VAR_0x8008, 2 - call_if 1, Route110_EventScript_1EFB0F + call_if_eq Route110_EventScript_1EFB0F compare VAR_0x8008, 3 - call_if 1, Route110_EventScript_1EFB1A + call_if_eq Route110_EventScript_1EFB1A compare VAR_0x8008, 4 - call_if 1, Route110_EventScript_1EFB25 + call_if_eq Route110_EventScript_1EFB25 removeobject 36 setvar VAR_0x40DA, 2 releaseall diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc index 2112300a0..a993364e6 100644 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc @@ -4,9 +4,9 @@ Route110_SeasideCyclingRoadSouthEntrance_MapScripts:: @ 826EBA1 Route110_SeasideCyclingRoadSouthEntrance_MapScript1_26EBA7: @ 826EBA7 compare VAR_CYCLING_CHALLENGE_STATE, 3 - call_if 1, Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBBE + call_if_eq Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBBE compare VAR_CYCLING_CHALLENGE_STATE, 2 - call_if 1, Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBBE + call_if_eq Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBBE end Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBBE:: @ 826EBBE @@ -24,7 +24,7 @@ Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBD0:: @ 826EBD0 lockall specialvar VAR_RESULT, GetPlayerAvatarBike compare VAR_RESULT, 2 - call_if 1, Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBF6 + call_if_eq Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBF6 compare VAR_RESULT, 0 goto_if_eq Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBFC setflag FLAG_SYS_CYCLING_ROAD diff --git a/data/maps/Route110_TrickHouseEnd/scripts.inc b/data/maps/Route110_TrickHouseEnd/scripts.inc index 6f1adef4f..8326a7c02 100644 --- a/data/maps/Route110_TrickHouseEnd/scripts.inc +++ b/data/maps/Route110_TrickHouseEnd/scripts.inc @@ -7,7 +7,7 @@ Route110_TrickHouseEnd_MapScripts:: @ 826ACAF Route110_TrickHouseEnd_MapScript1_26ACC4: @ 826ACC4 compare VAR_TEMP_1, 1 - call_if 1, Route110_TrickHouseEnd_EventScript_26AD0D + call_if_eq Route110_TrickHouseEnd_EventScript_26AD0D end Route110_TrickHouseEnd_MapScript1_26ACD0: @ 826ACD0 @@ -62,7 +62,7 @@ Route110_TrickHouseEnd_EventScript_26AD84:: @ 826AD84 setvar VAR_0x40C1, 0 giveitem_std ITEM_RARE_CANDY compare VAR_RESULT, 0 - call_if 1, Route110_TrickHouseEnd_EventScript_26AFEF + call_if_eq Route110_TrickHouseEnd_EventScript_26AFEF msgbox Route110_TrickHouseEnd_Text_26B7EF, MSGBOX_DEFAULT closemessage call Route110_TrickHouseEnd_EventScript_26AFCF @@ -75,7 +75,7 @@ Route110_TrickHouseEnd_EventScript_26ADC0:: @ 826ADC0 setvar VAR_0x40C1, 0 giveitem_std ITEM_TIMER_BALL compare VAR_RESULT, 0 - call_if 1, Route110_TrickHouseEnd_EventScript_26AFEF + call_if_eq Route110_TrickHouseEnd_EventScript_26AFEF msgbox Route110_TrickHouseEnd_Text_26B7EF, MSGBOX_DEFAULT closemessage call Route110_TrickHouseEnd_EventScript_26AFCF @@ -88,7 +88,7 @@ Route110_TrickHouseEnd_EventScript_26ADFC:: @ 826ADFC setvar VAR_0x40C1, 0 giveitem_std ITEM_HARD_STONE compare VAR_RESULT, 0 - call_if 1, Route110_TrickHouseEnd_EventScript_26AFEF + call_if_eq Route110_TrickHouseEnd_EventScript_26AFEF msgbox Route110_TrickHouseEnd_Text_26B7EF, MSGBOX_DEFAULT closemessage call Route110_TrickHouseEnd_EventScript_26AFCF @@ -101,7 +101,7 @@ Route110_TrickHouseEnd_EventScript_26AE38:: @ 826AE38 setvar VAR_0x40C1, 0 giveitem_std ITEM_SMOKE_BALL compare VAR_RESULT, 0 - call_if 1, Route110_TrickHouseEnd_EventScript_26AFEF + call_if_eq Route110_TrickHouseEnd_EventScript_26AFEF msgbox Route110_TrickHouseEnd_Text_26B7EF, MSGBOX_DEFAULT closemessage call Route110_TrickHouseEnd_EventScript_26AFCF @@ -114,7 +114,7 @@ Route110_TrickHouseEnd_EventScript_26AE74:: @ 826AE74 setvar VAR_0x40C1, 0 giveitem_std ITEM_TM12 compare VAR_RESULT, 0 - call_if 1, Route110_TrickHouseEnd_EventScript_26AFEF + call_if_eq Route110_TrickHouseEnd_EventScript_26AFEF msgbox Route110_TrickHouseEnd_Text_26B7EF, MSGBOX_DEFAULT closemessage call Route110_TrickHouseEnd_EventScript_26AFCF @@ -127,7 +127,7 @@ Route110_TrickHouseEnd_EventScript_26AEB0:: @ 826AEB0 setvar VAR_0x40C1, 0 giveitem_std ITEM_MAGNET compare VAR_RESULT, 0 - call_if 1, Route110_TrickHouseEnd_EventScript_26AFEF + call_if_eq Route110_TrickHouseEnd_EventScript_26AFEF msgbox Route110_TrickHouseEnd_Text_26B7EF, MSGBOX_DEFAULT closemessage call Route110_TrickHouseEnd_EventScript_26AFCF @@ -140,7 +140,7 @@ Route110_TrickHouseEnd_EventScript_26AEEC:: @ 826AEEC setvar VAR_0x40C1, 0 giveitem_std ITEM_PP_MAX compare VAR_RESULT, 0 - call_if 1, Route110_TrickHouseEnd_EventScript_26AFEF + call_if_eq Route110_TrickHouseEnd_EventScript_26AFEF msgbox Route110_TrickHouseEnd_Text_26B7EF, MSGBOX_DEFAULT closemessage call Route110_TrickHouseEnd_EventScript_26AFCF @@ -151,13 +151,13 @@ Route110_TrickHouseEnd_EventScript_26AF28:: @ 826AF28 msgbox Route110_TrickHouseEnd_Text_26B3AB, MSGBOX_DEFAULT closemessage compare VAR_FACING, 1 - call_if 1, Route110_TrickHouseEnd_EventScript_26B015 + call_if_eq Route110_TrickHouseEnd_EventScript_26B015 compare VAR_FACING, 2 - call_if 1, Route110_TrickHouseEnd_EventScript_26B020 + call_if_eq Route110_TrickHouseEnd_EventScript_26B020 compare VAR_FACING, 3 - call_if 1, Route110_TrickHouseEnd_EventScript_26B02B + call_if_eq Route110_TrickHouseEnd_EventScript_26B02B compare VAR_FACING, 4 - call_if 1, Route110_TrickHouseEnd_EventScript_26B036 + call_if_eq Route110_TrickHouseEnd_EventScript_26B036 delay 30 msgbox Route110_TrickHouseEnd_Text_26B3FA, MSGBOX_DEFAULT closemessage @@ -168,7 +168,7 @@ Route110_TrickHouseEnd_EventScript_26AF28:: @ 826AF28 setvar VAR_0x40C1, 0 call Route110_TrickHouseEnd_EventScript_26AFA5 compare VAR_RESULT, 0 - call_if 1, Route110_TrickHouseEnd_EventScript_26B002 + call_if_eq Route110_TrickHouseEnd_EventScript_26B002 msgbox Route110_TrickHouseEnd_Text_26B69A, MSGBOX_DEFAULT call Route110_TrickHouseEnd_EventScript_26AFCF special ResetTrickHouseEndRoomFlag diff --git a/data/maps/Route110_TrickHouseEntrance/scripts.inc b/data/maps/Route110_TrickHouseEntrance/scripts.inc index ca9ab75e7..91931a713 100644 --- a/data/maps/Route110_TrickHouseEntrance/scripts.inc +++ b/data/maps/Route110_TrickHouseEntrance/scripts.inc @@ -13,11 +13,11 @@ Route110_TrickHouseEntrance_MapScript1_269A60: @ 8269A60 compare VAR_0x40A6, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_269BB3 compare VAR_0x40A7, 5 - call_if 1, Route110_TrickHouseEntrance_EventScript_269B03 + call_if_eq Route110_TrickHouseEntrance_EventScript_269B03 compare VAR_0x40A7, 3 - call_if 1, Route110_TrickHouseEntrance_EventScript_269B03 + call_if_eq Route110_TrickHouseEntrance_EventScript_269B03 compare VAR_0x40A7, 0 - call_if 1, Route110_TrickHouseEntrance_EventScript_269B03 + call_if_eq Route110_TrickHouseEntrance_EventScript_269B03 switch VAR_0x40A7 case 0, Route110_TrickHouseEntrance_EventScript_269BBB case 1, Route110_TrickHouseEntrance_EventScript_269BC1 @@ -45,56 +45,49 @@ Route110_TrickHouseEntrance_EventScript_269AF3:: @ 8269AF3 Route110_TrickHouseEntrance_EventScript_269B03:: @ 8269B03 setvar VAR_0x40A7, 0 compare VAR_0x4044, 1 - call_if 1, Route110_TrickHouseEntrance_EventScript_269B61 + call_if_eq Route110_TrickHouseEntrance_EventScript_269B61 compare VAR_0x4044, 2 - call_if 1, Route110_TrickHouseEntrance_EventScript_269B6B + call_if_eq Route110_TrickHouseEntrance_EventScript_269B6B compare VAR_0x4044, 3 - call_if 1, Route110_TrickHouseEntrance_EventScript_269B75 + call_if_eq Route110_TrickHouseEntrance_EventScript_269B75 compare VAR_0x4044, 4 - call_if 1, Route110_TrickHouseEntrance_EventScript_269B7F + call_if_eq Route110_TrickHouseEntrance_EventScript_269B7F compare VAR_0x4044, 5 - call_if 1, Route110_TrickHouseEntrance_EventScript_269B89 + call_if_eq Route110_TrickHouseEntrance_EventScript_269B89 compare VAR_0x4044, 6 - call_if 1, Route110_TrickHouseEntrance_EventScript_269B93 + call_if_eq Route110_TrickHouseEntrance_EventScript_269B93 compare VAR_0x4044, 7 - call_if 1, Route110_TrickHouseEntrance_EventScript_269B9D + call_if_eq Route110_TrickHouseEntrance_EventScript_269B9D compare VAR_0x4044, 8 - call_if 1, Route110_TrickHouseEntrance_EventScript_269BA7 + call_if_eq Route110_TrickHouseEntrance_EventScript_269BA7 return Route110_TrickHouseEntrance_EventScript_269B61:: @ 8269B61 - checkflag FLAG_BADGE03_GET - call_if 0, Route110_TrickHouseEntrance_EventScript_269BAD + call_if_unset FLAG_BADGE03_GET, Route110_TrickHouseEntrance_EventScript_269BAD return Route110_TrickHouseEntrance_EventScript_269B6B:: @ 8269B6B - checkflag FLAG_BADGE04_GET - call_if 0, Route110_TrickHouseEntrance_EventScript_269BAD + call_if_unset FLAG_BADGE04_GET, Route110_TrickHouseEntrance_EventScript_269BAD return Route110_TrickHouseEntrance_EventScript_269B75:: @ 8269B75 - checkflag FLAG_BADGE05_GET - call_if 0, Route110_TrickHouseEntrance_EventScript_269BAD + call_if_unset FLAG_BADGE05_GET, Route110_TrickHouseEntrance_EventScript_269BAD return Route110_TrickHouseEntrance_EventScript_269B7F:: @ 8269B7F - checkflag FLAG_BADGE06_GET - call_if 0, Route110_TrickHouseEntrance_EventScript_269BAD + call_if_unset FLAG_BADGE06_GET, Route110_TrickHouseEntrance_EventScript_269BAD return Route110_TrickHouseEntrance_EventScript_269B89:: @ 8269B89 - checkflag FLAG_BADGE07_GET - call_if 0, Route110_TrickHouseEntrance_EventScript_269BAD + call_if_unset FLAG_BADGE07_GET, Route110_TrickHouseEntrance_EventScript_269BAD return Route110_TrickHouseEntrance_EventScript_269B93:: @ 8269B93 - checkflag FLAG_BADGE08_GET - call_if 0, Route110_TrickHouseEntrance_EventScript_269BAD + call_if_unset FLAG_BADGE08_GET, Route110_TrickHouseEntrance_EventScript_269BAD return Route110_TrickHouseEntrance_EventScript_269B9D:: @ 8269B9D - checkflag FLAG_SYS_GAME_CLEAR - call_if 0, Route110_TrickHouseEntrance_EventScript_269BAD + call_if_unset FLAG_SYS_GAME_CLEAR, Route110_TrickHouseEntrance_EventScript_269BAD return Route110_TrickHouseEntrance_EventScript_269BA7:: @ 8269BA7 @@ -213,7 +206,7 @@ Route110_TrickHouseEntrance_EventScript_269CF8:: @ 8269CF8 lockall delay 20 compare VAR_0x4044, 0 - call_if 1, Route110_TrickHouseEntrance_EventScript_269E48 + call_if_eq Route110_TrickHouseEntrance_EventScript_269E48 msgbox Route110_TrickHouseEntrance_Text_26A78C, MSGBOX_DEFAULT closemessage delay 20 @@ -248,21 +241,21 @@ Route110_TrickHouseEntrance_EventScript_269D6E:: @ 8269D6E applymovement EVENT_OBJ_ID_PLAYER, Route110_TrickHouseEntrance_Movement_27259A waitmovement 0 compare VAR_0x4044, 0 - call_if 1, Route110_TrickHouseEntrance_EventScript_269DEE + call_if_eq Route110_TrickHouseEntrance_EventScript_269DEE compare VAR_0x4044, 1 - call_if 1, Route110_TrickHouseEntrance_EventScript_269DF7 + call_if_eq Route110_TrickHouseEntrance_EventScript_269DF7 compare VAR_0x4044, 2 - call_if 1, Route110_TrickHouseEntrance_EventScript_269E00 + call_if_eq Route110_TrickHouseEntrance_EventScript_269E00 compare VAR_0x4044, 3 - call_if 1, Route110_TrickHouseEntrance_EventScript_269E09 + call_if_eq Route110_TrickHouseEntrance_EventScript_269E09 compare VAR_0x4044, 4 - call_if 1, Route110_TrickHouseEntrance_EventScript_269E12 + call_if_eq Route110_TrickHouseEntrance_EventScript_269E12 compare VAR_0x4044, 5 - call_if 1, Route110_TrickHouseEntrance_EventScript_269E1B + call_if_eq Route110_TrickHouseEntrance_EventScript_269E1B compare VAR_0x4044, 6 - call_if 1, Route110_TrickHouseEntrance_EventScript_269E24 + call_if_eq Route110_TrickHouseEntrance_EventScript_269E24 compare VAR_0x4044, 7 - call_if 1, Route110_TrickHouseEntrance_EventScript_269E2D + call_if_eq Route110_TrickHouseEntrance_EventScript_269E2D closemessage setvar VAR_0x40A6, 1 warpsilent MAP_ROUTE110_TRICK_HOUSE_ENTRANCE, 255, 6, 2 @@ -371,7 +364,7 @@ Route110_TrickHouseEntrance_EventScript_269EEF:: @ 8269EEF compare VAR_RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023 compare VAR_RESULT, 0 - call_if 1, Route110_TrickHouseEntrance_EventScript_27205E + call_if_eq Route110_TrickHouseEntrance_EventScript_27205E msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT releaseall end @@ -381,7 +374,7 @@ Route110_TrickHouseEntrance_EventScript_269F1B:: @ 8269F1B compare VAR_RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023 compare VAR_RESULT, 0 - call_if 1, Route110_TrickHouseEntrance_EventScript_27205E + call_if_eq Route110_TrickHouseEntrance_EventScript_27205E msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT releaseall end @@ -391,7 +384,7 @@ Route110_TrickHouseEntrance_EventScript_269F47:: @ 8269F47 compare VAR_RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023 compare VAR_RESULT, 0 - call_if 1, Route110_TrickHouseEntrance_EventScript_27205E + call_if_eq Route110_TrickHouseEntrance_EventScript_27205E msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT releaseall end @@ -401,7 +394,7 @@ Route110_TrickHouseEntrance_EventScript_269F73:: @ 8269F73 compare VAR_RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023 compare VAR_RESULT, 0 - call_if 1, Route110_TrickHouseEntrance_EventScript_27205E + call_if_eq Route110_TrickHouseEntrance_EventScript_27205E msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT releaseall end @@ -411,7 +404,7 @@ Route110_TrickHouseEntrance_EventScript_269F9F:: @ 8269F9F compare VAR_RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023 compare VAR_RESULT, 0 - call_if 1, Route110_TrickHouseEntrance_EventScript_27205E + call_if_eq Route110_TrickHouseEntrance_EventScript_27205E msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT releaseall end @@ -421,7 +414,7 @@ Route110_TrickHouseEntrance_EventScript_269FCB:: @ 8269FCB compare VAR_RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023 compare VAR_RESULT, 0 - call_if 1, Route110_TrickHouseEntrance_EventScript_27205E + call_if_eq Route110_TrickHouseEntrance_EventScript_27205E msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT releaseall end @@ -431,7 +424,7 @@ Route110_TrickHouseEntrance_EventScript_269FF7:: @ 8269FF7 compare VAR_RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023 compare VAR_RESULT, 0 - call_if 1, Route110_TrickHouseEntrance_EventScript_27205E + call_if_eq Route110_TrickHouseEntrance_EventScript_27205E msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT releaseall end @@ -452,7 +445,7 @@ Route110_TrickHouseEntrance_EventScript_26A039:: @ 826A039 compare VAR_RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_26A09A compare VAR_RESULT, 0 - call_if 1, Route110_TrickHouseEntrance_EventScript_272071 + call_if_eq Route110_TrickHouseEntrance_EventScript_272071 msgbox Route110_TrickHouseEntrance_Text_26ABBD, MSGBOX_DEFAULT releaseall end @@ -735,11 +728,11 @@ Route110_TrickHouseEntrance_EventScript_26A3F8:: @ 826A3F8 msgbox Route110_TrickHouseEntrance_Text_26A474, MSGBOX_DEFAULT releaseall compare VAR_0x4044, 0 - call_if 1, Route110_TrickHouseEntrance_EventScript_26A429 + call_if_eq Route110_TrickHouseEntrance_EventScript_26A429 compare VAR_0x4044, 1 - call_if 1, Route110_TrickHouseEntrance_EventScript_26A439 + call_if_eq Route110_TrickHouseEntrance_EventScript_26A439 compare VAR_0x4044, 2 - call_if 1, Route110_TrickHouseEntrance_EventScript_26A449 + call_if_eq Route110_TrickHouseEntrance_EventScript_26A449 setvar VAR_0x40A5, 1 end diff --git a/data/maps/Route110_TrickHousePuzzle2/scripts.inc b/data/maps/Route110_TrickHousePuzzle2/scripts.inc index 7ddf11734..560d10060 100644 --- a/data/maps/Route110_TrickHousePuzzle2/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle2/scripts.inc @@ -5,13 +5,13 @@ Route110_TrickHousePuzzle2_MapScripts:: @ 826BB73 Route110_TrickHousePuzzle2_MapScript1_26BB7E: @ 826BB7E compare VAR_TEMP_1, 1 - call_if 1, Route110_TrickHousePuzzle2_EventScript_26BC29 + call_if_eq Route110_TrickHousePuzzle2_EventScript_26BC29 compare VAR_TEMP_2, 1 - call_if 1, Route110_TrickHousePuzzle2_EventScript_26BC3C + call_if_eq Route110_TrickHousePuzzle2_EventScript_26BC3C compare VAR_TEMP_3, 1 - call_if 1, Route110_TrickHousePuzzle2_EventScript_26BC4F + call_if_eq Route110_TrickHousePuzzle2_EventScript_26BC4F compare VAR_TEMP_4, 1 - call_if 1, Route110_TrickHousePuzzle2_EventScript_26BC62 + call_if_eq Route110_TrickHousePuzzle2_EventScript_26BC62 end Route110_TrickHousePuzzle2_MapScript1_26BBAB: @ 826BBAB diff --git a/data/maps/Route110_TrickHousePuzzle3/scripts.inc b/data/maps/Route110_TrickHousePuzzle3/scripts.inc index 20881326b..b26c5473d 100644 --- a/data/maps/Route110_TrickHousePuzzle3/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle3/scripts.inc @@ -6,9 +6,9 @@ Route110_TrickHousePuzzle3_MapScripts:: @ 826BED8 Route110_TrickHousePuzzle3_MapScript1_26BEE3: @ 826BEE3 call Route110_TrickHousePuzzle3_EventScript_26BF1E compare VAR_TEMP_9, 0 - call_if 1, Route110_TrickHousePuzzle3_EventScript_26BF97 + call_if_eq Route110_TrickHousePuzzle3_EventScript_26BF97 compare VAR_TEMP_9, 1 - call_if 1, Route110_TrickHousePuzzle3_EventScript_26C232 + call_if_eq Route110_TrickHousePuzzle3_EventScript_26C232 end Route110_TrickHousePuzzle3_MapScript1_26BEFF: @ 826BEFF @@ -26,13 +26,13 @@ Route110_TrickHousePuzzle3_EventScript_26BF1E:: @ 826BF1E setmetatile 12, 5, 600, 0 setmetatile 8, 2, 600, 0 compare VAR_TEMP_8, 1 - call_if 1, Route110_TrickHousePuzzle3_EventScript_26BF6F + call_if_eq Route110_TrickHousePuzzle3_EventScript_26BF6F compare VAR_TEMP_8, 2 - call_if 1, Route110_TrickHousePuzzle3_EventScript_26BF79 + call_if_eq Route110_TrickHousePuzzle3_EventScript_26BF79 compare VAR_TEMP_8, 3 - call_if 1, Route110_TrickHousePuzzle3_EventScript_26BF83 + call_if_eq Route110_TrickHousePuzzle3_EventScript_26BF83 compare VAR_TEMP_8, 4 - call_if 1, Route110_TrickHousePuzzle3_EventScript_26BF8D + call_if_eq Route110_TrickHousePuzzle3_EventScript_26BF8D return Route110_TrickHousePuzzle3_EventScript_26BF6F:: @ 826BF6F @@ -242,13 +242,13 @@ Route110_TrickHousePuzzle3_EventScript_26C510:: @ 826C510 setvar VAR_TEMP_3, 0 setvar VAR_TEMP_4, 0 compare VAR_TEMP_8, 1 - call_if 1, Route110_TrickHousePuzzle3_EventScript_26C551 + call_if_eq Route110_TrickHousePuzzle3_EventScript_26C551 compare VAR_TEMP_8, 2 - call_if 1, Route110_TrickHousePuzzle3_EventScript_26C557 + call_if_eq Route110_TrickHousePuzzle3_EventScript_26C557 compare VAR_TEMP_8, 3 - call_if 1, Route110_TrickHousePuzzle3_EventScript_26C55D + call_if_eq Route110_TrickHousePuzzle3_EventScript_26C55D compare VAR_TEMP_8, 4 - call_if 1, Route110_TrickHousePuzzle3_EventScript_26C563 + call_if_eq Route110_TrickHousePuzzle3_EventScript_26C563 return Route110_TrickHousePuzzle3_EventScript_26C551:: @ 826C551 @@ -269,9 +269,9 @@ Route110_TrickHousePuzzle3_EventScript_26C563:: @ 826C563 Route110_TrickHousePuzzle3_EventScript_26C569:: @ 826C569 compare VAR_TEMP_9, 1 - call_if 1, Route110_TrickHousePuzzle3_EventScript_26BF97 + call_if_eq Route110_TrickHousePuzzle3_EventScript_26BF97 compare VAR_TEMP_9, 0 - call_if 1, Route110_TrickHousePuzzle3_EventScript_26C232 + call_if_eq Route110_TrickHousePuzzle3_EventScript_26C232 special DrawWholeMapView compare VAR_TEMP_9, 1 goto_if_eq Route110_TrickHousePuzzle3_EventScript_26C599 diff --git a/data/maps/Route110_TrickHousePuzzle5/scripts.inc b/data/maps/Route110_TrickHousePuzzle5/scripts.inc index 453db6f9a..4c199a993 100644 --- a/data/maps/Route110_TrickHousePuzzle5/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle5/scripts.inc @@ -220,13 +220,13 @@ Route110_TrickHousePuzzle5_EventScript_26CCEB:: @ 826CCEB applymovement 1, Route110_TrickHousePuzzle5_Movement_27259A waitmovement 0 compare VAR_TEMP_9, 1 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D1B4 + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D1B4 compare VAR_TEMP_9, 2 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D1EC + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D1EC compare VAR_TEMP_9, 3 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D224 + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D224 compare VAR_TEMP_9, 4 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D25C + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D25C msgbox Route110_TrickHousePuzzle5_Text_26D6CE, MSGBOX_DEFAULT random 3 switch VAR_RESULT @@ -244,15 +244,15 @@ Route110_TrickHousePuzzle5_EventScript_26CD6A:: @ 826CD6A applymovement 2, Route110_TrickHousePuzzle5_Movement_27259A waitmovement 0 compare VAR_TEMP_9, 1 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D2CC + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D2CC compare VAR_TEMP_9, 2 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D304 + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D304 compare VAR_TEMP_9, 3 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D33C + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D33C compare VAR_TEMP_9, 4 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D374 + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D374 compare VAR_TEMP_9, 5 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D3AC + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D3AC msgbox Route110_TrickHousePuzzle5_Text_26D8EA, MSGBOX_DEFAULT random 3 switch VAR_RESULT @@ -270,13 +270,13 @@ Route110_TrickHousePuzzle5_EventScript_26CDF4:: @ 826CDF4 applymovement 3, Route110_TrickHousePuzzle5_Movement_27259A waitmovement 0 compare VAR_TEMP_9, 1 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D1B4 + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D1B4 compare VAR_TEMP_9, 2 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D1EC + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D1EC compare VAR_TEMP_9, 3 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D224 + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D224 compare VAR_TEMP_9, 4 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D25C + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D25C msgbox Route110_TrickHousePuzzle5_Text_26DA1E, MSGBOX_DEFAULT random 3 switch VAR_RESULT @@ -294,13 +294,13 @@ Route110_TrickHousePuzzle5_EventScript_26CE73:: @ 826CE73 applymovement 4, Route110_TrickHousePuzzle5_Movement_27259A waitmovement 0 compare VAR_TEMP_9, 1 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D1B4 + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D1B4 compare VAR_TEMP_9, 2 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D1EC + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D1EC compare VAR_TEMP_9, 3 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D224 + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D224 compare VAR_TEMP_9, 4 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D25C + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D25C msgbox Route110_TrickHousePuzzle5_Text_26DB4C, MSGBOX_DEFAULT random 3 switch VAR_RESULT @@ -476,132 +476,132 @@ Route110_TrickHousePuzzle5_EventScript_26D1AA:: @ 826D1AA Route110_TrickHousePuzzle5_EventScript_26D1B4:: @ 826D1B4 compare VAR_TEMP_8, 1 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D3E4 + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D3E4 compare VAR_TEMP_8, 2 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D3EF + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D3EF compare VAR_TEMP_8, 3 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D3FA + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D3FA compare VAR_TEMP_8, 4 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D405 + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D405 compare VAR_TEMP_8, 5 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D410 + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D410 return Route110_TrickHousePuzzle5_EventScript_26D1EC:: @ 826D1EC compare VAR_TEMP_8, 1 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D41B + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D41B compare VAR_TEMP_8, 2 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D426 + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D426 compare VAR_TEMP_8, 3 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D431 + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D431 compare VAR_TEMP_8, 4 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D43C + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D43C compare VAR_TEMP_8, 5 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D447 + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D447 return Route110_TrickHousePuzzle5_EventScript_26D224:: @ 826D224 compare VAR_TEMP_8, 1 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D452 + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D452 compare VAR_TEMP_8, 2 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D45D + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D45D compare VAR_TEMP_8, 3 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D468 + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D468 compare VAR_TEMP_8, 4 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D473 + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D473 compare VAR_TEMP_8, 5 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D47E + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D47E return Route110_TrickHousePuzzle5_EventScript_26D25C:: @ 826D25C compare VAR_TEMP_8, 1 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D489 + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D489 compare VAR_TEMP_8, 2 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D494 + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D494 compare VAR_TEMP_8, 3 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D49F + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D49F compare VAR_TEMP_8, 4 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D4AA + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D4AA compare VAR_TEMP_8, 5 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D4B5 + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D4B5 return Route110_TrickHousePuzzle5_EventScript_26D294:: @ 826D294 compare VAR_TEMP_8, 1 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D4C0 + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D4C0 compare VAR_TEMP_8, 2 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D4CB + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D4CB compare VAR_TEMP_8, 3 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D4D6 + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D4D6 compare VAR_TEMP_8, 4 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D4E1 + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D4E1 compare VAR_TEMP_8, 5 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D4EC + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D4EC return Route110_TrickHousePuzzle5_EventScript_26D2CC:: @ 826D2CC compare VAR_TEMP_8, 1 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D4F7 + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D4F7 compare VAR_TEMP_8, 2 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D502 + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D502 compare VAR_TEMP_8, 3 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D50D + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D50D compare VAR_TEMP_8, 4 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D518 + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D518 compare VAR_TEMP_8, 5 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D523 + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D523 return Route110_TrickHousePuzzle5_EventScript_26D304:: @ 826D304 compare VAR_TEMP_8, 1 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D52E + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D52E compare VAR_TEMP_8, 2 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D539 + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D539 compare VAR_TEMP_8, 3 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D544 + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D544 compare VAR_TEMP_8, 4 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D54F + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D54F compare VAR_TEMP_8, 5 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D55A + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D55A return Route110_TrickHousePuzzle5_EventScript_26D33C:: @ 826D33C compare VAR_TEMP_8, 1 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D565 + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D565 compare VAR_TEMP_8, 2 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D570 + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D570 compare VAR_TEMP_8, 3 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D57B + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D57B compare VAR_TEMP_8, 4 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D586 + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D586 compare VAR_TEMP_8, 5 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D591 + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D591 return Route110_TrickHousePuzzle5_EventScript_26D374:: @ 826D374 compare VAR_TEMP_8, 1 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D59C + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D59C compare VAR_TEMP_8, 2 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D5A7 + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D5A7 compare VAR_TEMP_8, 3 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D5B2 + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D5B2 compare VAR_TEMP_8, 4 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D5BD + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D5BD compare VAR_TEMP_8, 5 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D5C8 + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D5C8 return Route110_TrickHousePuzzle5_EventScript_26D3AC:: @ 826D3AC compare VAR_TEMP_8, 1 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D5D3 + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D5D3 compare VAR_TEMP_8, 2 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D5DE + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D5DE compare VAR_TEMP_8, 3 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D5E9 + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D5E9 compare VAR_TEMP_8, 4 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D5F4 + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D5F4 compare VAR_TEMP_8, 5 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D5FF + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D5FF return Route110_TrickHousePuzzle5_EventScript_26D3E4:: @ 826D3E4 diff --git a/data/maps/Route110_TrickHousePuzzle7/scripts.inc b/data/maps/Route110_TrickHousePuzzle7/scripts.inc index ecb52c7ca..76e8ac769 100644 --- a/data/maps/Route110_TrickHousePuzzle7/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle7/scripts.inc @@ -10,16 +10,11 @@ Route110_TrickHousePuzzle7_MapScript1_26E0A6: @ 826E0A6 end Route110_TrickHousePuzzle7_EventScript_26E0AC:: @ 826E0AC - checkflag FLAG_0x0C2 - call_if 1, Route110_TrickHousePuzzle7_EventScript_26E0DA - checkflag FLAG_0x0C3 - call_if 1, Route110_TrickHousePuzzle7_EventScript_26E0ED - checkflag FLAG_0x0C4 - call_if 1, Route110_TrickHousePuzzle7_EventScript_26E100 - checkflag FLAG_0x0C5 - call_if 1, Route110_TrickHousePuzzle7_EventScript_26E113 - checkflag FLAG_0x0C6 - call_if 1, Route110_TrickHousePuzzle7_EventScript_26E126 + call_if_set FLAG_0x0C2, Route110_TrickHousePuzzle7_EventScript_26E0DA + call_if_set FLAG_0x0C3, Route110_TrickHousePuzzle7_EventScript_26E0ED + call_if_set FLAG_0x0C4, Route110_TrickHousePuzzle7_EventScript_26E100 + call_if_set FLAG_0x0C5, Route110_TrickHousePuzzle7_EventScript_26E113 + call_if_set FLAG_0x0C6, Route110_TrickHousePuzzle7_EventScript_26E126 return Route110_TrickHousePuzzle7_EventScript_26E0DA:: @ 826E0DA @@ -87,7 +82,7 @@ Route110_TrickHousePuzzle7_EventScript_26E1B3:: @ 826E1B3 Route110_TrickHousePuzzle7_MapScript1_26E1B4: @ 826E1B4 compare VAR_0x40B6, 1 - call_if 1, Route110_TrickHousePuzzle7_EventScript_26E0AC + call_if_eq Route110_TrickHousePuzzle7_EventScript_26E0AC end Route110_TrickHousePuzzle7_MapScript2_26E1C0: @ 826E1C0 @@ -121,10 +116,8 @@ Route110_TrickHousePuzzle7_EventScript_26E1ED:: @ 826E1ED Route110_TrickHousePuzzle7_EventScript_26E1FE:: @ 826E1FE lockall delay 32 - checkflag FLAG_0x0C2 - call_if 0, Route110_TrickHousePuzzle7_EventScript_26E0DA - checkflag FLAG_0x0C2 - call_if 1, Route110_TrickHousePuzzle7_EventScript_26E139 + call_if_unset FLAG_0x0C2, Route110_TrickHousePuzzle7_EventScript_26E0DA + call_if_set FLAG_0x0C2, Route110_TrickHousePuzzle7_EventScript_26E139 special DrawWholeMapView playse SE_TK_KASYA goto_if_unset FLAG_0x0C2, Route110_TrickHousePuzzle7_EventScript_26E2E9 @@ -134,10 +127,8 @@ Route110_TrickHousePuzzle7_EventScript_26E1FE:: @ 826E1FE Route110_TrickHousePuzzle7_EventScript_26E22D:: @ 826E22D lockall delay 32 - checkflag FLAG_0x0C3 - call_if 0, Route110_TrickHousePuzzle7_EventScript_26E0ED - checkflag FLAG_0x0C3 - call_if 1, Route110_TrickHousePuzzle7_EventScript_26E14C + call_if_unset FLAG_0x0C3, Route110_TrickHousePuzzle7_EventScript_26E0ED + call_if_set FLAG_0x0C3, Route110_TrickHousePuzzle7_EventScript_26E14C special DrawWholeMapView playse SE_TK_KASYA goto_if_unset FLAG_0x0C3, Route110_TrickHousePuzzle7_EventScript_26E2F3 @@ -147,10 +138,8 @@ Route110_TrickHousePuzzle7_EventScript_26E22D:: @ 826E22D Route110_TrickHousePuzzle7_EventScript_26E25C:: @ 826E25C lockall delay 32 - checkflag FLAG_0x0C4 - call_if 0, Route110_TrickHousePuzzle7_EventScript_26E100 - checkflag FLAG_0x0C4 - call_if 1, Route110_TrickHousePuzzle7_EventScript_26E15F + call_if_unset FLAG_0x0C4, Route110_TrickHousePuzzle7_EventScript_26E100 + call_if_set FLAG_0x0C4, Route110_TrickHousePuzzle7_EventScript_26E15F special DrawWholeMapView playse SE_TK_KASYA goto_if_unset FLAG_0x0C4, Route110_TrickHousePuzzle7_EventScript_26E2FD @@ -160,10 +149,8 @@ Route110_TrickHousePuzzle7_EventScript_26E25C:: @ 826E25C Route110_TrickHousePuzzle7_EventScript_26E28B:: @ 826E28B lockall delay 32 - checkflag FLAG_0x0C5 - call_if 0, Route110_TrickHousePuzzle7_EventScript_26E113 - checkflag FLAG_0x0C5 - call_if 1, Route110_TrickHousePuzzle7_EventScript_26E172 + call_if_unset FLAG_0x0C5, Route110_TrickHousePuzzle7_EventScript_26E113 + call_if_set FLAG_0x0C5, Route110_TrickHousePuzzle7_EventScript_26E172 special DrawWholeMapView playse SE_TK_KASYA goto_if_unset FLAG_0x0C5, Route110_TrickHousePuzzle7_EventScript_26E307 @@ -173,10 +160,8 @@ Route110_TrickHousePuzzle7_EventScript_26E28B:: @ 826E28B Route110_TrickHousePuzzle7_EventScript_26E2BA:: @ 826E2BA lockall delay 32 - checkflag FLAG_0x0C6 - call_if 0, Route110_TrickHousePuzzle7_EventScript_26E126 - checkflag FLAG_0x0C6 - call_if 1, Route110_TrickHousePuzzle7_EventScript_26E185 + call_if_unset FLAG_0x0C6, Route110_TrickHousePuzzle7_EventScript_26E126 + call_if_set FLAG_0x0C6, Route110_TrickHousePuzzle7_EventScript_26E185 special DrawWholeMapView playse SE_TK_KASYA goto_if_unset FLAG_0x0C6, Route110_TrickHousePuzzle7_EventScript_26E311 diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc index eca7e2242..0149299c1 100644 --- a/data/maps/Route111/scripts.inc +++ b/data/maps/Route111/scripts.inc @@ -6,10 +6,9 @@ Route111_MapScripts:: @ 81F0CA7 .byte 0 Route111_MapScript1_1F0CBC: @ 81F0CBC - checkflag FLAG_0x0E4 - call_if 0, Route111_EventScript_1F0CD1 + call_if_unset FLAG_0x0E4, Route111_EventScript_1F0CD1 compare VAR_0x40CB, 1 - call_if 1, Route111_EventScript_1F0CE4 + call_if_eq Route111_EventScript_1F0CE4 end Route111_EventScript_1F0CD1:: @ 81F0CD1 @@ -41,12 +40,11 @@ Route111_EventScript_1F0CE4:: @ 81F0CE4 Route111_MapScript1_1F0D87: @ 81F0D87 setvar VAR_0x40D6, 0 special sub_81BE79C - checkflag FLAG_0x14E - call_if 0, Route111_EventScript_1F0E3C + call_if_unset FLAG_0x14E, Route111_EventScript_1F0E3C compare VAR_0x40CB, 1 - call_if 1, Route111_EventScript_1F0DC2 + call_if_eq Route111_EventScript_1F0DC2 compare VAR_0x40CB, 2 - call_if 1, Route111_EventScript_1F0E40 + call_if_eq Route111_EventScript_1F0E40 call Route111_EventScript_1F0DE6 call Route111_EventScript_28CCC7 checktrainerflag TRAINER_VICKY @@ -214,13 +212,13 @@ Route111_EventScript_1F0F45:: @ 81F0F45 msgbox gUnknown_08272C5F, MSGBOX_DEFAULT closemessage compare VAR_0x8004, 0 - call_if 1, Route111_EventScript_1F0F7C + call_if_eq Route111_EventScript_1F0F7C compare VAR_0x8004, 1 - call_if 1, Route111_EventScript_1F0F87 + call_if_eq Route111_EventScript_1F0F87 compare VAR_0x8004, 2 - call_if 1, Route111_EventScript_1F0F92 + call_if_eq Route111_EventScript_1F0F92 compare VAR_0x8004, 3 - call_if 1, Route111_EventScript_1F0F9D + call_if_eq Route111_EventScript_1F0F9D releaseall end diff --git a/data/maps/Route112_CableCarStation/scripts.inc b/data/maps/Route112_CableCarStation/scripts.inc index 2a79faa02..037d7ca05 100644 --- a/data/maps/Route112_CableCarStation/scripts.inc +++ b/data/maps/Route112_CableCarStation/scripts.inc @@ -6,7 +6,7 @@ Route112_CableCarStation_MapScripts:: @ 822AABE Route112_CableCarStation_MapScript1_22AAC9: @ 822AAC9 setescapewarp MAP_ROUTE112, 255, 28, 28 compare VAR_0x40A3, 2 - call_if 1, Route112_CableCarStation_EventScript_22AADD + call_if_eq Route112_CableCarStation_EventScript_22AADD end Route112_CableCarStation_EventScript_22AADD:: @ 822AADD diff --git a/data/maps/Route113_GlassWorkshop/scripts.inc b/data/maps/Route113_GlassWorkshop/scripts.inc index a4487628d..959c27799 100644 --- a/data/maps/Route113_GlassWorkshop/scripts.inc +++ b/data/maps/Route113_GlassWorkshop/scripts.inc @@ -5,7 +5,7 @@ Route113_GlassWorkshop_MapScripts:: @ 826ED03 Route113_GlassWorkshop_MapScript1_26ED09: @ 826ED09 setflag FLAG_LANDMARK_GLASS_WORKSHOP compare VAR_0x40BE, 1 - call_if 1, Route113_GlassWorkshop_EventScript_26ED18 + call_if_eq Route113_GlassWorkshop_EventScript_26ED18 end Route113_GlassWorkshop_EventScript_26ED18:: @ 826ED18 @@ -203,9 +203,9 @@ Route113_GlassWorkshop_EventScript_26F00F:: @ 826F00F fadescreen 0 msgbox Route113_GlassWorkshop_Text_26F688, MSGBOX_DEFAULT compare VAR_0x8009, 0 - call_if 1, Route113_GlassWorkshop_EventScript_26F047 + call_if_eq Route113_GlassWorkshop_EventScript_26F047 compare VAR_0x8009, 1 - call_if 1, Route113_GlassWorkshop_EventScript_26F05F + call_if_eq Route113_GlassWorkshop_EventScript_26F05F setvar VAR_0x40BE, 2 release end @@ -297,9 +297,9 @@ Route113_GlassWorkshop_EventScript_26F15B:: @ 826F15B Route113_GlassWorkshop_EventScript_26F16F:: @ 826F16F msgbox Route113_GlassWorkshop_Text_26F688, MSGBOX_DEFAULT compare VAR_0x8009, 0 - call_if 1, Route113_GlassWorkshop_EventScript_26F047 + call_if_eq Route113_GlassWorkshop_EventScript_26F047 compare VAR_0x8009, 1 - call_if 1, Route113_GlassWorkshop_EventScript_26F05F + call_if_eq Route113_GlassWorkshop_EventScript_26F05F setvar VAR_0x40BE, 2 release end diff --git a/data/maps/Route114/scripts.inc b/data/maps/Route114/scripts.inc index ad5d57c11..b66b54910 100644 --- a/data/maps/Route114/scripts.inc +++ b/data/maps/Route114/scripts.inc @@ -6,18 +6,18 @@ Route114_MapScripts:: @ 81F252F Route114_MapScript1_1F253F: @ 81F253F compare VAR_0x4039, 1 - call_if 1, Route114_EventScript_273D13 + call_if_eq Route114_EventScript_273D13 compare VAR_0x4037, 1 - call_if 1, Route114_EventScript_273D1B + call_if_eq Route114_EventScript_273D1B compare VAR_0x4037, 2 - call_if 1, Route114_EventScript_273D1B + call_if_eq Route114_EventScript_273D1B end Route114_MapScript1_1F2561: @ 81F2561 compare VAR_0x4037, 1 - call_if 1, Route114_EventScript_273913 + call_if_eq Route114_EventScript_273913 compare VAR_0x4037, 2 - call_if 1, Route114_EventScript_273926 + call_if_eq Route114_EventScript_273926 end Route114_MapScript2_1F2578: @ 81F2578 diff --git a/data/maps/Route114_FossilManiacsTunnel/scripts.inc b/data/maps/Route114_FossilManiacsTunnel/scripts.inc index 3a7c3f1cd..850e970e3 100644 --- a/data/maps/Route114_FossilManiacsTunnel/scripts.inc +++ b/data/maps/Route114_FossilManiacsTunnel/scripts.inc @@ -4,8 +4,7 @@ Route114_FossilManiacsTunnel_MapScripts:: @ 822AF28 .byte 0 Route114_FossilManiacsTunnel_MapScript1_22AF33: @ 822AF33 - checkflag FLAG_SYS_GAME_CLEAR - call_if 1, Route114_FossilManiacsTunnel_EventScript_22AF3D + call_if_set FLAG_SYS_GAME_CLEAR, Route114_FossilManiacsTunnel_EventScript_22AF3D end Route114_FossilManiacsTunnel_EventScript_22AF3D:: @ 822AF3D @@ -14,8 +13,7 @@ Route114_FossilManiacsTunnel_EventScript_22AF3D:: @ 822AF3D return Route114_FossilManiacsTunnel_MapScript1_22AF49: @ 822AF49 - checkflag FLAG_SYS_GAME_CLEAR - call_if 0, Route114_FossilManiacsTunnel_EventScript_22AF53 + call_if_unset FLAG_SYS_GAME_CLEAR, Route114_FossilManiacsTunnel_EventScript_22AF53 end Route114_FossilManiacsTunnel_EventScript_22AF53:: @ 822AF53 diff --git a/data/maps/Route114_LanettesHouse/scripts.inc b/data/maps/Route114_LanettesHouse/scripts.inc index 165b9eb01..984bca574 100644 --- a/data/maps/Route114_LanettesHouse/scripts.inc +++ b/data/maps/Route114_LanettesHouse/scripts.inc @@ -36,7 +36,7 @@ Route114_LanettesHouse_EventScript_22B309:: @ 822B309 Route114_LanettesHouse_EventScript_22B327:: @ 822B327 msgbox Route114_LanettesHouse_Text_22B53C, MSGBOX_YESNO compare VAR_RESULT, 1 - call_if 1, Route114_LanettesHouse_EventScript_22B33C + call_if_eq Route114_LanettesHouse_EventScript_22B33C releaseall end diff --git a/data/maps/Route115/scripts.inc b/data/maps/Route115/scripts.inc index 735ffaa5b..560c360af 100644 --- a/data/maps/Route115/scripts.inc +++ b/data/maps/Route115/scripts.inc @@ -6,18 +6,18 @@ Route115_MapScripts:: @ 81F2920 Route115_MapScript1_1F2930: @ 81F2930 compare VAR_0x4037, 3 - call_if 1, Route115_EventScript_273939 + call_if_eq Route115_EventScript_273939 compare VAR_0x4037, 4 - call_if 1, Route115_EventScript_27394C + call_if_eq Route115_EventScript_27394C end Route115_MapScript1_1F2947: @ 81F2947 compare VAR_0x4039, 1 - call_if 1, Route115_EventScript_273D13 + call_if_eq Route115_EventScript_273D13 compare VAR_0x4037, 3 - call_if 1, Route115_EventScript_273D1B + call_if_eq Route115_EventScript_273D1B compare VAR_0x4037, 4 - call_if 1, Route115_EventScript_273D1B + call_if_eq Route115_EventScript_273D1B end Route115_MapScript2_1F2969: @ 81F2969 diff --git a/data/maps/Route116/scripts.inc b/data/maps/Route116/scripts.inc index 32c8d2a40..519bc0447 100644 --- a/data/maps/Route116/scripts.inc +++ b/data/maps/Route116/scripts.inc @@ -5,14 +5,13 @@ Route116_MapScripts:: @ 81F2C0C .byte 0 Route116_MapScript1_1F2C1C: @ 81F2C1C - checkflag FLAG_0x08F - call_if 1, Route116_EventScript_1F2C47 + call_if_set FLAG_0x08F, Route116_EventScript_1F2C47 compare VAR_0x4039, 1 - call_if 1, Route116_EventScript_273D13 + call_if_eq Route116_EventScript_273D13 compare VAR_0x4037, 5 - call_if 1, Route116_EventScript_273D1B + call_if_eq Route116_EventScript_273D1B compare VAR_0x4037, 6 - call_if 1, Route116_EventScript_273D1B + call_if_eq Route116_EventScript_273D1B end Route116_EventScript_1F2C47:: @ 81F2C47 @@ -21,9 +20,9 @@ Route116_EventScript_1F2C47:: @ 81F2C47 Route116_MapScript1_1F2C4F: @ 81F2C4F compare VAR_0x4037, 5 - call_if 1, Route116_EventScript_27395F + call_if_eq Route116_EventScript_27395F compare VAR_0x4037, 6 - call_if 1, Route116_EventScript_273972 + call_if_eq Route116_EventScript_273972 end Route116_MapScript2_1F2C66: @ 81F2C66 @@ -65,13 +64,13 @@ Route116_EventScript_1F2CBB:: @ 81F2CBB msgbox Route116_Text_1F3521, MSGBOX_DEFAULT closemessage compare VAR_FACING, 2 - call_if 1, Route116_EventScript_1F2D15 + call_if_eq Route116_EventScript_1F2D15 compare VAR_FACING, 1 - call_if 1, Route116_EventScript_1F2D15 + call_if_eq Route116_EventScript_1F2D15 compare VAR_FACING, 3 - call_if 1, Route116_EventScript_1F2D15 + call_if_eq Route116_EventScript_1F2D15 compare VAR_FACING, 4 - call_if 1, Route116_EventScript_1F2D20 + call_if_eq Route116_EventScript_1F2D20 removeobject VAR_LAST_TALKED clearflag FLAG_HIDE_RUSTBORO_CITY_DEVON_CORP_3F_EMPLOYEE setflag FLAG_0x100 @@ -198,13 +197,13 @@ Route116_EventScript_1F2E1B:: @ 81F2E1B Route116_EventScript_1F2E2A:: @ 81F2E2A delay 20 compare VAR_FACING, 2 - call_if 1, Route116_EventScript_1F2E5E + call_if_eq Route116_EventScript_1F2E5E compare VAR_FACING, 1 - call_if 1, Route116_EventScript_1F2E5E + call_if_eq Route116_EventScript_1F2E5E compare VAR_FACING, 3 - call_if 1, Route116_EventScript_1F2E5E + call_if_eq Route116_EventScript_1F2E5E compare VAR_FACING, 4 - call_if 1, Route116_EventScript_1F2E69 + call_if_eq Route116_EventScript_1F2E69 removeobject VAR_LAST_TALKED release end diff --git a/data/maps/Route118/scripts.inc b/data/maps/Route118/scripts.inc index 09d188971..91067e786 100644 --- a/data/maps/Route118/scripts.inc +++ b/data/maps/Route118/scripts.inc @@ -7,18 +7,18 @@ Route118_MapScripts:: @ 81F3DBC Route118_MapScript1_1F3DCC: @ 81F3DCC call Route118_EventScript_28CCC7 compare VAR_0x4039, 1 - call_if 1, Route118_EventScript_273D13 + call_if_eq Route118_EventScript_273D13 compare VAR_0x4037, 7 - call_if 1, Route118_EventScript_273D1B + call_if_eq Route118_EventScript_273D1B compare VAR_0x4037, 8 - call_if 1, Route118_EventScript_273D1B + call_if_eq Route118_EventScript_273D1B end Route118_MapScript1_1F3DF3: @ 81F3DF3 compare VAR_0x4037, 7 - call_if 1, Route118_EventScript_273985 + call_if_eq Route118_EventScript_273985 compare VAR_0x4037, 8 - call_if 1, Route118_EventScript_273998 + call_if_eq Route118_EventScript_273998 end Route118_MapScript2_1F3E0A: @ 81F3E0A @@ -102,11 +102,11 @@ Route118_EventScript_1F3EE4:: @ 81F3EE4 msgbox Route118_Text_1F40BE, MSGBOX_DEFAULT closemessage compare VAR_0x8008, 0 - call_if 1, Route118_EventScript_1F3F28 + call_if_eq Route118_EventScript_1F3F28 compare VAR_0x8008, 1 - call_if 1, Route118_EventScript_1F3F3A + call_if_eq Route118_EventScript_1F3F3A compare VAR_0x8008, 2 - call_if 1, Route118_EventScript_1F3F4C + call_if_eq Route118_EventScript_1F3F4C setvar VAR_0x4071, 1 removeobject 19 releaseall diff --git a/data/maps/Route119/scripts.inc b/data/maps/Route119/scripts.inc index dc63f64df..229db6da5 100644 --- a/data/maps/Route119/scripts.inc +++ b/data/maps/Route119/scripts.inc @@ -4,8 +4,7 @@ Route119_MapScripts:: @ 81F4424 .byte 0 Route119_MapScript1_1F442F: @ 81F442F - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, Route119_EventScript_1F4439 + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, Route119_EventScript_1F4439 end Route119_EventScript_1F4439:: @ 81F4439 @@ -19,7 +18,7 @@ Route119_MapScript1_1F444D: @ 81F444D call Route119_EventScript_271ED7 call Route119_EventScript_271EFB compare VAR_WEATHER_INSTITUTE_STATE, 1 - call_if 1, Route119_EventScript_1F4466 + call_if_eq Route119_EventScript_1F4466 special SetRoute119Weather end @@ -44,21 +43,21 @@ Route119_EventScript_1F4488:: @ 81F4488 addobject 25 checkplayergender compare VAR_RESULT, 0 - call_if 1, Route119_EventScript_1F4501 + call_if_eq Route119_EventScript_1F4501 compare VAR_RESULT, 1 - call_if 1, Route119_EventScript_1F4506 + call_if_eq Route119_EventScript_1F4506 delay 65 compare VAR_TEMP_1, 1 - call_if 1, Route119_EventScript_1F46C6 + call_if_eq Route119_EventScript_1F46C6 compare VAR_TEMP_1, 2 - call_if 1, Route119_EventScript_1F46D1 + call_if_eq Route119_EventScript_1F46D1 applymovement EVENT_OBJ_ID_PLAYER, Route119_Movement_2725AA waitmovement 0 delay 30 compare VAR_TEMP_1, 1 - call_if 1, Route119_EventScript_1F4700 + call_if_eq Route119_EventScript_1F4700 compare VAR_TEMP_1, 2 - call_if 1, Route119_EventScript_1F470F + call_if_eq Route119_EventScript_1F470F removeobject 25 addobject 16 delay 30 @@ -146,25 +145,25 @@ Route119_EventScript_1F45FF:: @ 81F45FF Route119_EventScript_1F460F:: @ 81F460F closemessage compare VAR_TEMP_1, 1 - call_if 1, Route119_EventScript_1F4700 + call_if_eq Route119_EventScript_1F4700 compare VAR_TEMP_1, 2 - call_if 1, Route119_EventScript_1F470F + call_if_eq Route119_EventScript_1F470F removeobject 16 addobject 25 delay 30 compare VAR_TEMP_1, 1 - call_if 1, Route119_EventScript_1F46DC + call_if_eq Route119_EventScript_1F46DC compare VAR_TEMP_1, 2 - call_if 1, Route119_EventScript_1F46EE + call_if_eq Route119_EventScript_1F46EE removeobject 25 setvar VAR_0x4072, 1 savebgm MUS_DUMMY fadedefaultbgm delay 60 compare VAR_TEMP_1, 1 - call_if 1, Route119_EventScript_1F46A0 + call_if_eq Route119_EventScript_1F46A0 compare VAR_TEMP_1, 2 - call_if 1, Route119_EventScript_1F46A8 + call_if_eq Route119_EventScript_1F46A8 addobject 43 applymovement 43, Route119_Movement_1F4752 waitmovement 0 @@ -172,9 +171,9 @@ Route119_EventScript_1F460F:: @ 81F460F msgbox Route119_Text_1F4E60, MSGBOX_DEFAULT closemessage compare VAR_TEMP_1, 1 - call_if 1, Route119_EventScript_1F46B0 + call_if_eq Route119_EventScript_1F46B0 compare VAR_TEMP_1, 2 - call_if 1, Route119_EventScript_1F46BB + call_if_eq Route119_EventScript_1F46BB removeobject 43 releaseall end diff --git a/data/maps/Route119_WeatherInstitute_1F/scripts.inc b/data/maps/Route119_WeatherInstitute_1F/scripts.inc index 1131c42b2..b0426ea2e 100644 --- a/data/maps/Route119_WeatherInstitute_1F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_1F/scripts.inc @@ -4,7 +4,7 @@ Route119_WeatherInstitute_1F_MapScripts:: @ 826FA86 Route119_WeatherInstitute_1F_MapScript1_26FA8C: @ 826FA8C compare VAR_WEATHER_INSTITUTE_STATE, 0 - call_if 1, Route119_WeatherInstitute_1F_EventScript_26FA98 + call_if_eq Route119_WeatherInstitute_1F_EventScript_26FA98 end Route119_WeatherInstitute_1F_EventScript_26FA98:: @ 826FA98 @@ -32,10 +32,8 @@ Route119_WeatherInstitute_1F_EventScript_26FAC8:: @ 826FAC8 faceplayer goto_if_unset FLAG_SYS_GAME_CLEAR, Route119_WeatherInstitute_1F_EventScript_26FB05 setvar VAR_0x8004, 0 - checkflag FLAG_0x1BE - call_if 1, Route119_WeatherInstitute_1F_EventScript_26FAFF - checkflag FLAG_0x1BF - call_if 1, Route119_WeatherInstitute_1F_EventScript_26FAFF + call_if_set FLAG_0x1BE, Route119_WeatherInstitute_1F_EventScript_26FAFF + call_if_set FLAG_0x1BF, Route119_WeatherInstitute_1F_EventScript_26FAFF compare VAR_0x8004, 2 goto_if_eq Route119_WeatherInstitute_1F_EventScript_26FB05 msgbox Route119_WeatherInstitute_1F_Text_26FDE8, MSGBOX_DEFAULT diff --git a/data/maps/Route119_WeatherInstitute_2F/scripts.inc b/data/maps/Route119_WeatherInstitute_2F/scripts.inc index 8cc69383a..6d54e62ad 100644 --- a/data/maps/Route119_WeatherInstitute_2F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_2F/scripts.inc @@ -4,11 +4,10 @@ Route119_WeatherInstitute_2F_MapScripts:: @ 826FF1E Route119_WeatherInstitute_2F_MapScript1_26FF24: @ 826FF24 compare VAR_WEATHER_INSTITUTE_STATE, 0 - call_if 1, Route119_WeatherInstitute_2F_EventScript_26FF44 + call_if_eq Route119_WeatherInstitute_2F_EventScript_26FF44 compare VAR_WEATHER_INSTITUTE_STATE, 1 - call_if 1, Route119_WeatherInstitute_2F_EventScript_26FF50 - checkflag FLAG_SYS_GAME_CLEAR - call_if 1, Route119_WeatherInstitute_2F_EventScript_26FF5C + call_if_eq Route119_WeatherInstitute_2F_EventScript_26FF50 + call_if_set FLAG_SYS_GAME_CLEAR, Route119_WeatherInstitute_2F_EventScript_26FF5C end Route119_WeatherInstitute_2F_EventScript_26FF44:: @ 826FF44 @@ -139,14 +138,11 @@ Route119_WeatherInstitute_2F_EventScript_2700F7:: @ 82700F7 Route119_WeatherInstitute_2F_EventScript_27010A:: @ 827010A setvar VAR_0x8004, 0 - checkflag FLAG_0x1BE - call_if 1, Route119_WeatherInstitute_2F_EventScript_270160 - checkflag FLAG_0x1BF - call_if 1, Route119_WeatherInstitute_2F_EventScript_270160 + call_if_set FLAG_0x1BE, Route119_WeatherInstitute_2F_EventScript_270160 + call_if_set FLAG_0x1BF, Route119_WeatherInstitute_2F_EventScript_270160 compare VAR_0x8004, 2 goto_if_eq Route119_WeatherInstitute_2F_EventScript_270166 - checkflag FLAG_TEMP_2 - call_if 0, Route119_WeatherInstitute_2F_EventScript_270159 + call_if_unset FLAG_TEMP_2, Route119_WeatherInstitute_2F_EventScript_270159 specialvar VAR_RESULT, sub_813B374 compare VAR_RESULT, 1 goto_if_eq Route119_WeatherInstitute_2F_EventScript_27014F diff --git a/data/maps/Route120/scripts.inc b/data/maps/Route120/scripts.inc index 4c4a086d8..ccd77b4cc 100644 --- a/data/maps/Route120/scripts.inc +++ b/data/maps/Route120/scripts.inc @@ -5,23 +5,22 @@ Route120_MapScripts:: @ 81F53EC .byte 0 Route120_MapScript1_1F53FC: @ 81F53FC - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, Route120_EventScript_1F5406 + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, Route120_EventScript_1F5406 end Route120_EventScript_1F5406:: @ 81F5406 compare VAR_0x8009, 0 - call_if 1, Route120_EventScript_1F5449 + call_if_eq Route120_EventScript_1F5449 compare VAR_0x8009, 1 - call_if 1, Route120_EventScript_1F5460 + call_if_eq Route120_EventScript_1F5460 compare VAR_0x8009, 2 - call_if 1, Route120_EventScript_1F5460 + call_if_eq Route120_EventScript_1F5460 compare VAR_0x8009, 3 - call_if 1, Route120_EventScript_1F5460 + call_if_eq Route120_EventScript_1F5460 compare VAR_0x8009, 4 - call_if 1, Route120_EventScript_1F5460 + call_if_eq Route120_EventScript_1F5460 compare VAR_0x8009, 5 - call_if 1, Route120_EventScript_1F5460 + call_if_eq Route120_EventScript_1F5460 return Route120_EventScript_1F5449:: @ 81F5449 @@ -40,12 +39,9 @@ Route120_EventScript_1F5460:: @ 81F5460 return Route120_MapScript1_1F5474: @ 81F5474 - checkflag FLAG_0x0E4 - call_if 0, Route120_EventScript_1F5490 - checkflag FLAG_0x11D - call_if 1, Route120_EventScript_1F54A3 - checkflag FLAG_0x11D - call_if 0, Route120_EventScript_1F54C8 + call_if_unset FLAG_0x0E4, Route120_EventScript_1F5490 + call_if_set FLAG_0x11D, Route120_EventScript_1F54A3 + call_if_unset FLAG_0x11D, Route120_EventScript_1F54C8 end Route120_EventScript_1F5490:: @ 81F5490 @@ -106,9 +102,9 @@ Route120_EventScript_1F5527:: @ 81F5527 goto_if_set FLAG_0x92E, Route120_EventScript_1F5625 msgbox Route120_Text_2A70C7, MSGBOX_YESNO compare VAR_RESULT, 1 - call_if 1, Route120_EventScript_1F562F + call_if_eq Route120_EventScript_1F562F compare VAR_RESULT, 0 - call_if 1, Route120_EventScript_1F5638 + call_if_eq Route120_EventScript_1F5638 specialvar VAR_RESULT, GetPlayerTrainerIdOnesDigit switch VAR_RESULT case 0, Route120_EventScript_1F55CA @@ -197,9 +193,9 @@ Route120_EventScript_1F568B:: @ 81F568B msgbox Route120_Text_1F5B0F, MSGBOX_DEFAULT closemessage compare VAR_FACING, 2 - call_if 1, Route120_EventScript_1F57A3 + call_if_eq Route120_EventScript_1F57A3 compare VAR_FACING, 3 - call_if 1, Route120_EventScript_1F57AE + call_if_eq Route120_EventScript_1F57AE applymovement 31, Route120_Movement_2725A4 waitmovement 0 delay 20 diff --git a/data/maps/Route124/scripts.inc b/data/maps/Route124/scripts.inc index 374c64f4c..97aa6f4be 100644 --- a/data/maps/Route124/scripts.inc +++ b/data/maps/Route124/scripts.inc @@ -3,8 +3,7 @@ Route124_MapScripts:: @ 81F656C .byte 0 Route124_MapScript1_1F6572: @ 81F6572 - checkflag FLAG_SYS_WEATHER_CTRL - call_if 1, Route124_EventScript_27207A + call_if_set FLAG_SYS_WEATHER_CTRL, Route124_EventScript_27207A end Route124_EventScript_1F657C:: @ 81F657C diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc b/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc index d392d692d..4fa64e6b9 100644 --- a/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc +++ b/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc @@ -31,16 +31,16 @@ Route124_DivingTreasureHuntersHouse_EventScript_270A72:: @ 8270A72 setvar VAR_TEMP_1, 0 checkitem ITEM_RED_SHARD, 1 compare VAR_RESULT, 1 - call_if 1, Route124_DivingTreasureHuntersHouse_EventScript_270AB8 + call_if_eq Route124_DivingTreasureHuntersHouse_EventScript_270AB8 checkitem ITEM_YELLOW_SHARD, 1 compare VAR_RESULT, 1 - call_if 1, Route124_DivingTreasureHuntersHouse_EventScript_270ABE + call_if_eq Route124_DivingTreasureHuntersHouse_EventScript_270ABE checkitem ITEM_BLUE_SHARD, 1 compare VAR_RESULT, 1 - call_if 1, Route124_DivingTreasureHuntersHouse_EventScript_270AC4 + call_if_eq Route124_DivingTreasureHuntersHouse_EventScript_270AC4 checkitem ITEM_GREEN_SHARD, 1 compare VAR_RESULT, 1 - call_if 1, Route124_DivingTreasureHuntersHouse_EventScript_270ACA + call_if_eq Route124_DivingTreasureHuntersHouse_EventScript_270ACA return Route124_DivingTreasureHuntersHouse_EventScript_270AB8:: @ 8270AB8 diff --git a/data/maps/Route125/scripts.inc b/data/maps/Route125/scripts.inc index 1aee88596..e5ad32697 100644 --- a/data/maps/Route125/scripts.inc +++ b/data/maps/Route125/scripts.inc @@ -5,21 +5,20 @@ Route125_MapScripts:: @ 81F6748 .byte 0 Route125_MapScript1_1F6758: @ 81F6758 - checkflag FLAG_SYS_WEATHER_CTRL - call_if 1, Route125_EventScript_27207A + call_if_set FLAG_SYS_WEATHER_CTRL, Route125_EventScript_27207A compare VAR_0x4039, 1 - call_if 1, Route125_EventScript_273D13 + call_if_eq Route125_EventScript_273D13 compare VAR_0x4037, 11 - call_if 1, Route125_EventScript_273D17 + call_if_eq Route125_EventScript_273D17 compare VAR_0x4037, 12 - call_if 1, Route125_EventScript_273D17 + call_if_eq Route125_EventScript_273D17 end Route125_MapScript1_1F6783: @ 81F6783 compare VAR_0x4037, 11 - call_if 1, Route125_EventScript_273A85 + call_if_eq Route125_EventScript_273A85 compare VAR_0x4037, 12 - call_if 1, Route125_EventScript_273AF2 + call_if_eq Route125_EventScript_273AF2 end Route125_MapScript2_1F679A: @ 81F679A diff --git a/data/maps/Route126/scripts.inc b/data/maps/Route126/scripts.inc index df8e289a6..4fa47e0bb 100644 --- a/data/maps/Route126/scripts.inc +++ b/data/maps/Route126/scripts.inc @@ -3,8 +3,7 @@ Route126_MapScripts:: @ 81F68C6 .byte 0 Route126_MapScript1_1F68CC: @ 81F68CC - checkflag FLAG_SYS_WEATHER_CTRL - call_if 1, Route126_EventScript_27207A + call_if_set FLAG_SYS_WEATHER_CTRL, Route126_EventScript_27207A end Route126_EventScript_1F68D6:: @ 81F68D6 diff --git a/data/maps/Route127/scripts.inc b/data/maps/Route127/scripts.inc index 4407a1157..28f20bfb3 100644 --- a/data/maps/Route127/scripts.inc +++ b/data/maps/Route127/scripts.inc @@ -5,21 +5,20 @@ Route127_MapScripts:: @ 81F69D9 .byte 0 Route127_MapScript1_1F69E9: @ 81F69E9 - checkflag FLAG_SYS_WEATHER_CTRL - call_if 1, Route127_EventScript_27207A + call_if_set FLAG_SYS_WEATHER_CTRL, Route127_EventScript_27207A compare VAR_0x4039, 1 - call_if 1, Route127_EventScript_273D13 + call_if_eq Route127_EventScript_273D13 compare VAR_0x4037, 13 - call_if 1, Route127_EventScript_273D17 + call_if_eq Route127_EventScript_273D17 compare VAR_0x4037, 14 - call_if 1, Route127_EventScript_273D17 + call_if_eq Route127_EventScript_273D17 end Route127_MapScript1_1F6A14: @ 81F6A14 compare VAR_0x4037, 13 - call_if 1, Route127_EventScript_273B5F + call_if_eq Route127_EventScript_273B5F compare VAR_0x4037, 14 - call_if 1, Route127_EventScript_273BCC + call_if_eq Route127_EventScript_273BCC end Route127_MapScript2_1F6A2B: @ 81F6A2B diff --git a/data/maps/Route128/scripts.inc b/data/maps/Route128/scripts.inc index feeb134e0..bb4f8d150 100644 --- a/data/maps/Route128/scripts.inc +++ b/data/maps/Route128/scripts.inc @@ -4,8 +4,7 @@ Route128_MapScripts:: @ 81F6B38 .byte 0 Route128_MapScript1_1F6B43: @ 81F6B43 - checkflag FLAG_SYS_WEATHER_CTRL - call_if 1, Route128_EventScript_27207A + call_if_set FLAG_SYS_WEATHER_CTRL, Route128_EventScript_27207A end Route128_MapScript2_1F6B4D: @ 81F6B4D diff --git a/data/maps/Route129/scripts.inc b/data/maps/Route129/scripts.inc index b58e9ddd4..177dc626a 100644 --- a/data/maps/Route129/scripts.inc +++ b/data/maps/Route129/scripts.inc @@ -6,25 +6,24 @@ Route129_MapScripts:: @ 81F7284 Route129_MapScript1_1F7294: @ 81F7294 compare VAR_0x4037, 15 - call_if 1, Route129_EventScript_273C39 + call_if_eq Route129_EventScript_273C39 compare VAR_0x4037, 16 - call_if 1, Route129_EventScript_273CA6 + call_if_eq Route129_EventScript_273CA6 end Route129_MapScript1_1F72AB: @ 81F72AB compare VAR_0x4039, 1 - call_if 1, Route129_EventScript_273D13 + call_if_eq Route129_EventScript_273D13 compare VAR_0x405E, 4 - call_if 4, Route129_EventScript_1F72D8 + call_if_ge Route129_EventScript_1F72D8 compare VAR_0x4037, 15 - call_if 1, Route129_EventScript_273D17 + call_if_eq Route129_EventScript_273D17 compare VAR_0x4037, 16 - call_if 1, Route129_EventScript_273D17 + call_if_eq Route129_EventScript_273D17 end Route129_EventScript_1F72D8:: @ 81F72D8 - checkflag FLAG_SYS_WEATHER_CTRL - call_if 1, Route129_EventScript_27207A + call_if_set FLAG_SYS_WEATHER_CTRL, Route129_EventScript_27207A return Route129_MapScript2_1F72E2: @ 81F72E2 diff --git a/data/maps/Route130/scripts.inc b/data/maps/Route130/scripts.inc index 57d5b199b..5c7696eb7 100644 --- a/data/maps/Route130/scripts.inc +++ b/data/maps/Route130/scripts.inc @@ -4,7 +4,7 @@ Route130_MapScripts:: @ 81F735F Route130_MapScript1_1F7365: @ 81F7365 compare VAR_0x405E, 4 - call_if 4, Route130_EventScript_1F73B5 + call_if_ge Route130_EventScript_1F73B5 specialvar VAR_RESULT, IsMirageIslandPresent compare VAR_RESULT, 1 goto_if_eq Route130_EventScript_1F73B1 @@ -31,8 +31,7 @@ Route130_EventScript_1F73B1:: @ 81F73B1 end Route130_EventScript_1F73B5:: @ 81F73B5 - checkflag FLAG_SYS_WEATHER_CTRL - call_if 1, Route130_EventScript_27207A + call_if_set FLAG_SYS_WEATHER_CTRL, Route130_EventScript_27207A return Route130_EventScript_1F73BF:: @ 81F73BF diff --git a/data/maps/Route131/scripts.inc b/data/maps/Route131/scripts.inc index 618d17fdb..da36f4001 100644 --- a/data/maps/Route131/scripts.inc +++ b/data/maps/Route131/scripts.inc @@ -4,7 +4,7 @@ Route131_MapScripts:: @ 81F7404 Route131_MapScript1_1F740A: @ 81F740A compare VAR_0x405E, 4 - call_if 4, Route131_EventScript_1F741F + call_if_ge Route131_EventScript_1F741F call Route131_EventScript_1F741B end @@ -13,8 +13,7 @@ Route131_EventScript_1F741B:: @ 81F741B return Route131_EventScript_1F741F:: @ 81F741F - checkflag FLAG_SYS_WEATHER_CTRL - call_if 1, Route131_EventScript_27207A + call_if_set FLAG_SYS_WEATHER_CTRL, Route131_EventScript_27207A return Route131_EventScript_1F7429:: @ 81F7429 diff --git a/data/maps/RustboroCity/scripts.inc b/data/maps/RustboroCity/scripts.inc index 8dfda64bf..941f73161 100644 --- a/data/maps/RustboroCity/scripts.inc +++ b/data/maps/RustboroCity/scripts.inc @@ -7,7 +7,7 @@ RustboroCity_MapScript1_1E06C8: @ 81E06C8 setflag FLAG_VISITED_RUSTBORO_CITY call RustboroCity_EventScript_271ED7 compare VAR_0x405A, 6 - call_if 1, RustboroCity_EventScript_1E0707 + call_if_eq RustboroCity_EventScript_1E0707 getplayerxy VAR_TEMP_0, VAR_TEMP_1 compare VAR_0x405A, 6 goto_if_eq RustboroCity_EventScript_1E06EC @@ -485,13 +485,13 @@ RustboroCity_EventScript_1E0B22:: @ 81E0B22 RustboroCity_EventScript_1E0B2E:: @ 81E0B2E compare VAR_TEMP_1, 0 - call_if 1, RustboroCity_EventScript_1E0B6F + call_if_eq RustboroCity_EventScript_1E0B6F compare VAR_TEMP_1, 1 - call_if 1, RustboroCity_EventScript_1E0B9B + call_if_eq RustboroCity_EventScript_1E0B9B compare VAR_TEMP_1, 2 - call_if 1, RustboroCity_EventScript_1E0BC7 + call_if_eq RustboroCity_EventScript_1E0BC7 compare VAR_TEMP_1, 3 - call_if 1, RustboroCity_EventScript_1E0BF3 + call_if_eq RustboroCity_EventScript_1E0BF3 setflag FLAG_0x09F setvar VAR_0x405A, 3 moveobjectoffscreen 9 @@ -579,19 +579,19 @@ RustboroCity_EventScript_1E0C4F:: @ 81E0C4F RustboroCity_EventScript_1E0C5B:: @ 81E0C5B compare VAR_TEMP_1, 0 - call_if 1, RustboroCity_EventScript_1E0CDC + call_if_eq RustboroCity_EventScript_1E0CDC compare VAR_TEMP_1, 1 - call_if 1, RustboroCity_EventScript_1E0D08 + call_if_eq RustboroCity_EventScript_1E0D08 compare VAR_TEMP_1, 2 - call_if 1, RustboroCity_EventScript_1E0D34 + call_if_eq RustboroCity_EventScript_1E0D34 compare VAR_TEMP_1, 3 - call_if 1, RustboroCity_EventScript_1E0D60 + call_if_eq RustboroCity_EventScript_1E0D60 compare VAR_TEMP_1, 4 - call_if 1, RustboroCity_EventScript_1E0D96 + call_if_eq RustboroCity_EventScript_1E0D96 msgbox RustboroCity_Text_1E194D, MSGBOX_DEFAULT giveitem_std ITEM_GREAT_BALL compare VAR_RESULT, 0 - call_if 1, RustboroCity_EventScript_1E0CD3 + call_if_eq RustboroCity_EventScript_1E0CD3 msgbox RustboroCity_Text_1E1A21, MSGBOX_DEFAULT closemessage setflag FLAG_0x090 @@ -669,8 +669,7 @@ RustboroCity_EventScript_1E0D96:: @ 81E0D96 RustboroCity_EventScript_1E0DB8:: @ 81E0DB8 lockall - checkflag FLAG_0x120 - call_if 0, RustboroCity_EventScript_1E0DD1 + call_if_unset FLAG_0x120, RustboroCity_EventScript_1E0DD1 applymovement 14, RustboroCity_Movement_27259E waitmovement 0 goto RustboroCity_EventScript_1E0FF3 @@ -872,7 +871,7 @@ RustboroCity_EventScript_1E1092:: @ 81E1092 RustboroCity_EventScript_1E10C1:: @ 81E10C1 msgbox RustboroCity_Text_1E1CE7, MSGBOX_DEFAULT compare VAR_0x8008, 0 - call_if 1, RustboroCity_EventScript_1E10D6 + call_if_eq RustboroCity_EventScript_1E10D6 releaseall end @@ -941,7 +940,7 @@ RustboroCity_EventScript_1E1191:: @ 81E1191 RustboroCity_EventScript_1E11C0:: @ 81E11C0 msgbox RustboroCity_Text_1E2002, MSGBOX_DEFAULT compare VAR_0x8008, 0 - call_if 1, RustboroCity_EventScript_1E10D6 + call_if_eq RustboroCity_EventScript_1E10D6 releaseall end diff --git a/data/maps/RustboroCity_DevonCorp_1F/scripts.inc b/data/maps/RustboroCity_DevonCorp_1F/scripts.inc index 20aae64a0..bbfd1bd53 100644 --- a/data/maps/RustboroCity_DevonCorp_1F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_1F/scripts.inc @@ -3,8 +3,7 @@ RustboroCity_DevonCorp_1F_MapScripts:: @ 8211245 .byte 0 RustboroCity_DevonCorp_1F_MapScript1_21124B: @ 821124B - checkflag FLAG_0x090 - call_if 0, RustboroCity_DevonCorp_1F_EventScript_211255 + call_if_unset FLAG_0x090, RustboroCity_DevonCorp_1F_EventScript_211255 end RustboroCity_DevonCorp_1F_EventScript_211255:: @ 8211255 diff --git a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc index a83df171e..8ce86352d 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc @@ -4,7 +4,7 @@ RustboroCity_DevonCorp_2F_MapScripts:: @ 8211857 RustboroCity_DevonCorp_2F_MapScript1_21185D: @ 821185D compare VAR_0x40C4, 1 - call_if 1, RustboroCity_DevonCorp_2F_EventScript_211869 + call_if_eq RustboroCity_DevonCorp_2F_EventScript_211869 end RustboroCity_DevonCorp_2F_EventScript_211869:: @ 8211869 @@ -15,7 +15,7 @@ RustboroCity_DevonCorp_2F_EventScript_21186F:: @ 821186F lock faceplayer compare VAR_0x40C4, 1 - call_if 1, RustboroCity_DevonCorp_2F_EventScript_211869 + call_if_eq RustboroCity_DevonCorp_2F_EventScript_211869 msgbox RustboroCity_DevonCorp_2F_Text_211BFB, MSGBOX_DEFAULT release end @@ -24,7 +24,7 @@ RustboroCity_DevonCorp_2F_EventScript_211886:: @ 8211886 lock faceplayer compare VAR_0x40C4, 1 - call_if 1, RustboroCity_DevonCorp_2F_EventScript_211869 + call_if_eq RustboroCity_DevonCorp_2F_EventScript_211869 goto_if_set FLAG_0x11F, RustboroCity_DevonCorp_2F_EventScript_2118A6 msgbox RustboroCity_DevonCorp_2F_Text_211C50, MSGBOX_DEFAULT release @@ -39,7 +39,7 @@ RustboroCity_DevonCorp_2F_EventScript_2118B0:: @ 82118B0 lock faceplayer compare VAR_0x40C4, 1 - call_if 1, RustboroCity_DevonCorp_2F_EventScript_211869 + call_if_eq RustboroCity_DevonCorp_2F_EventScript_211869 goto_if_set FLAG_0x0BC, RustboroCity_DevonCorp_2F_EventScript_2118D0 msgbox RustboroCity_DevonCorp_2F_Text_211D9F, MSGBOX_DEFAULT release @@ -54,7 +54,7 @@ RustboroCity_DevonCorp_2F_EventScript_2118DA:: @ 82118DA lock faceplayer compare VAR_0x40C4, 1 - call_if 1, RustboroCity_DevonCorp_2F_EventScript_211869 + call_if_eq RustboroCity_DevonCorp_2F_EventScript_211869 msgbox RustboroCity_DevonCorp_2F_Text_211EE0, MSGBOX_DEFAULT release end @@ -280,7 +280,7 @@ RustboroCity_DevonCorp_2F_EventScript_211BCF:: @ 8211BCF lock faceplayer compare VAR_0x40C4, 1 - call_if 1, RustboroCity_DevonCorp_2F_EventScript_211869 + call_if_eq RustboroCity_DevonCorp_2F_EventScript_211869 compare VAR_0x405A, 6 goto_if_ge RustboroCity_DevonCorp_2F_EventScript_211BF1 msgbox RustboroCity_DevonCorp_2F_Text_212338, MSGBOX_DEFAULT diff --git a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc index a13d38a18..316252a85 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc @@ -6,7 +6,7 @@ RustboroCity_DevonCorp_3F_MapScripts:: @ 821242D RustboroCity_DevonCorp_3F_MapScript1_21243D: @ 821243D compare VAR_0x408F, 0 - call_if 1, RustboroCity_DevonCorp_3F_EventScript_212449 + call_if_eq RustboroCity_DevonCorp_3F_EventScript_212449 end RustboroCity_DevonCorp_3F_EventScript_212449:: @ 8212449 diff --git a/data/maps/RustboroCity_Gym/scripts.inc b/data/maps/RustboroCity_Gym/scripts.inc index 2308c0292..170ae4324 100644 --- a/data/maps/RustboroCity_Gym/scripts.inc +++ b/data/maps/RustboroCity_Gym/scripts.inc @@ -23,7 +23,7 @@ RustboroCity_Gym_EventScript_212F66:: @ 8212F66 setvar VAR_0x8008, 1 call RustboroCity_Gym_EventScript_271F43 compare VAR_0x4085, 6 - call_if 1, RustboroCity_Gym_EventScript_271E84 + call_if_eq RustboroCity_Gym_EventScript_271E84 goto RustboroCity_Gym_EventScript_212FA4 end diff --git a/data/maps/RustboroCity_PokemonSchool/scripts.inc b/data/maps/RustboroCity_PokemonSchool/scripts.inc index 93a29241e..2bba066b2 100644 --- a/data/maps/RustboroCity_PokemonSchool/scripts.inc +++ b/data/maps/RustboroCity_PokemonSchool/scripts.inc @@ -79,9 +79,9 @@ RustboroCity_PokemonSchool_EventScript_213F95:: @ 8213F95 faceplayer goto_if_set FLAG_0x113, RustboroCity_PokemonSchool_EventScript_213FFB compare VAR_FACING, 4 - call_if 1, RustboroCity_PokemonSchool_EventScript_213FE5 + call_if_eq RustboroCity_PokemonSchool_EventScript_213FE5 compare VAR_FACING, 3 - call_if 1, RustboroCity_PokemonSchool_EventScript_213FF0 + call_if_eq RustboroCity_PokemonSchool_EventScript_213FF0 msgbox RustboroCity_PokemonSchool_Text_214433, MSGBOX_DEFAULT giveitem_std ITEM_QUICK_CLAW compare VAR_RESULT, 0 diff --git a/data/maps/RusturfTunnel/scripts.inc b/data/maps/RusturfTunnel/scripts.inc index 3d41fad99..8985f5b43 100644 --- a/data/maps/RusturfTunnel/scripts.inc +++ b/data/maps/RusturfTunnel/scripts.inc @@ -10,7 +10,7 @@ RusturfTunnel_MapScript2_22CE32: @ 822CE32 RusturfTunnel_MapScript1_22CE44: @ 822CE44 compare VAR_RUSTURF_TUNNEL_STATE, 2 - call_if 1, RusturfTunnel_EventScript_22CE50 + call_if_eq RusturfTunnel_EventScript_22CE50 end RusturfTunnel_EventScript_22CE50:: @ 822CE50 @@ -51,35 +51,35 @@ RusturfTunnel_EventScript_22CE99:: @ 822CE99 RusturfTunnel_EventScript_22CEAE:: @ 822CEAE lockall compare VAR_TEMP_1, 1 - call_if 1, RusturfTunnel_EventScript_22CFA7 + call_if_eq RusturfTunnel_EventScript_22CFA7 compare VAR_TEMP_1, 2 - call_if 1, RusturfTunnel_EventScript_22CFBC + call_if_eq RusturfTunnel_EventScript_22CFBC compare VAR_TEMP_1, 3 - call_if 1, RusturfTunnel_EventScript_22CFC7 + call_if_eq RusturfTunnel_EventScript_22CFC7 call RusturfTunnel_EventScript_22CFFF msgbox RusturfTunnel_Text_22D65C, MSGBOX_DEFAULT compare VAR_TEMP_1, 2 - call_if 1, RusturfTunnel_EventScript_22CFC8 + call_if_eq RusturfTunnel_EventScript_22CFC8 compare VAR_TEMP_1, 3 - call_if 1, RusturfTunnel_EventScript_22CFC8 + call_if_eq RusturfTunnel_EventScript_22CFC8 giveitem_std ITEM_HM04 setflag FLAG_0x06A msgbox RusturfTunnel_Text_22D6D2, MSGBOX_DEFAULT closemessage compare VAR_TEMP_1, 1 - call_if 1, RusturfTunnel_EventScript_22CF5D + call_if_eq RusturfTunnel_EventScript_22CF5D compare VAR_TEMP_1, 2 - call_if 1, RusturfTunnel_EventScript_22CF6F + call_if_eq RusturfTunnel_EventScript_22CF6F compare VAR_TEMP_1, 3 - call_if 1, RusturfTunnel_EventScript_22CF8B + call_if_eq RusturfTunnel_EventScript_22CF8B msgbox RusturfTunnel_Text_22D745, MSGBOX_DEFAULT closemessage compare VAR_TEMP_1, 1 - call_if 1, RusturfTunnel_EventScript_22CFD4 + call_if_eq RusturfTunnel_EventScript_22CFD4 compare VAR_TEMP_1, 2 - call_if 1, RusturfTunnel_EventScript_22CFE6 + call_if_eq RusturfTunnel_EventScript_22CFE6 compare VAR_TEMP_1, 3 - call_if 1, RusturfTunnel_EventScript_22CFE6 + call_if_eq RusturfTunnel_EventScript_22CFE6 call RusturfTunnel_EventScript_272216 releaseall end diff --git a/data/maps/SSTidalCorridor/scripts.inc b/data/maps/SSTidalCorridor/scripts.inc index 6fd607f51..86d85fccc 100644 --- a/data/maps/SSTidalCorridor/scripts.inc +++ b/data/maps/SSTidalCorridor/scripts.inc @@ -125,8 +125,7 @@ SSTidalCorridor_EventScript_23C119:: @ 823C119 SSTidalCorridor_EventScript_23C13B:: @ 823C13B setrespawn HEAL_LOCATION_LILYCOVE_CITY msgbox SSTidalCorridor_Text_23C64F, MSGBOX_DEFAULT - checkflag FLAG_0x104 - call_if 1, SSTidalCorridor_EventScript_23C179 + call_if_set FLAG_0x104, SSTidalCorridor_EventScript_23C179 warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11 waitstate release @@ -135,8 +134,7 @@ SSTidalCorridor_EventScript_23C13B:: @ 823C13B SSTidalCorridor_EventScript_23C15A:: @ 823C15A setrespawn HEAL_LOCATION_SLATEPORT_CITY msgbox SSTidalCorridor_Text_23C64F, MSGBOX_DEFAULT - checkflag FLAG_0x104 - call_if 1, SSTidalCorridor_EventScript_23C179 + call_if_set FLAG_0x104, SSTidalCorridor_EventScript_23C179 warp MAP_SLATEPORT_CITY_HARBOR, 255, 8, 11 waitstate release diff --git a/data/maps/SafariZone_South/scripts.inc b/data/maps/SafariZone_South/scripts.inc index 813c72022..06b050f67 100644 --- a/data/maps/SafariZone_South/scripts.inc +++ b/data/maps/SafariZone_South/scripts.inc @@ -20,7 +20,7 @@ SafariZone_South_EventScript_23D28E:: @ 823D28E SafariZone_South_MapScript1_23D2B1: @ 823D2B1 compare VAR_0x40A4, 2 - call_if 1, SafariZone_South_EventScript_23D2BD + call_if_eq SafariZone_South_EventScript_23D2BD end SafariZone_South_EventScript_23D2BD:: @ 823D2BD diff --git a/data/maps/SeafloorCavern_Entrance/scripts.inc b/data/maps/SeafloorCavern_Entrance/scripts.inc index 8fa90b274..9bbb9cbdc 100644 --- a/data/maps/SeafloorCavern_Entrance/scripts.inc +++ b/data/maps/SeafloorCavern_Entrance/scripts.inc @@ -19,11 +19,11 @@ SeafloorCavern_Entrance_EventScript_234485:: @ 8234485 waitmovement 0 delay 20 compare VAR_FACING, 3 - call_if 1, SeafloorCavern_Entrance_EventScript_23452E + call_if_eq SeafloorCavern_Entrance_EventScript_23452E compare VAR_FACING, 4 - call_if 1, SeafloorCavern_Entrance_EventScript_234523 + call_if_eq SeafloorCavern_Entrance_EventScript_234523 compare VAR_FACING, 2 - call_if 1, SeafloorCavern_Entrance_EventScript_234539 + call_if_eq SeafloorCavern_Entrance_EventScript_234539 delay 30 setvar VAR_0x40D9, 1 moveobjectoffscreen 1 @@ -36,11 +36,11 @@ SeafloorCavern_Entrance_EventScript_234485:: @ 8234485 SeafloorCavern_Entrance_EventScript_2344ED:: @ 82344ED compare VAR_FACING, 3 - call_if 1, SeafloorCavern_Entrance_EventScript_23452E + call_if_eq SeafloorCavern_Entrance_EventScript_23452E compare VAR_FACING, 4 - call_if 1, SeafloorCavern_Entrance_EventScript_234523 + call_if_eq SeafloorCavern_Entrance_EventScript_234523 compare VAR_FACING, 2 - call_if 1, SeafloorCavern_Entrance_EventScript_234539 + call_if_eq SeafloorCavern_Entrance_EventScript_234539 msgbox SeafloorCavern_Entrance_Text_2346C8, MSGBOX_DEFAULT closemessage applymovement 1, SeafloorCavern_Entrance_Movement_2725A6 diff --git a/data/maps/SealedChamber_OuterRoom/scripts.inc b/data/maps/SealedChamber_OuterRoom/scripts.inc index a46e1e275..4b461a684 100644 --- a/data/maps/SealedChamber_OuterRoom/scripts.inc +++ b/data/maps/SealedChamber_OuterRoom/scripts.inc @@ -14,8 +14,7 @@ SealedChamber_OuterRoom_MapScript1_239127: @ 8239127 end SealedChamber_OuterRoom_MapScript1_23912B: @ 823912B - checkflag FLAG_SYS_BRAILLE_DIG - call_if 0, SealedChamber_OuterRoom_EventScript_239135 + call_if_unset FLAG_SYS_BRAILLE_DIG, SealedChamber_OuterRoom_EventScript_239135 end SealedChamber_OuterRoom_EventScript_239135:: @ 8239135 diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc b/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc index 459507bc2..5f95bf8ed 100644 --- a/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc @@ -19,8 +19,7 @@ ShoalCave_LowTideEntranceRoom_EventScript_236DD9:: @ 8236DD9 lock faceplayer dodailyevents - checkflag FLAG_SYS_SHOAL_ITEM - call_if 1, ShoalCave_LowTideEntranceRoom_EventScript_236ED9 + call_if_set FLAG_SYS_SHOAL_ITEM, ShoalCave_LowTideEntranceRoom_EventScript_236ED9 checkitem ITEM_SHOAL_SALT, 4 compare VAR_RESULT, 0 goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_236E9B @@ -32,7 +31,7 @@ ShoalCave_LowTideEntranceRoom_EventScript_236DD9:: @ 8236DD9 goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_236ECF checkitemspace ITEM_SHELL_BELL, 1 compare VAR_RESULT, 0 - call_if 1, ShoalCave_LowTideEntranceRoom_EventScript_236E69 + call_if_eq ShoalCave_LowTideEntranceRoom_EventScript_236E69 compare VAR_RESULT, 2 goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_236E91 msgbox ShoalCave_LowTideEntranceRoom_Text_2A7FAC, MSGBOX_DEFAULT diff --git a/data/maps/SkyPillar_1F/scripts.inc b/data/maps/SkyPillar_1F/scripts.inc index 6afc5aa64..3d76a9fe2 100644 --- a/data/maps/SkyPillar_1F/scripts.inc +++ b/data/maps/SkyPillar_1F/scripts.inc @@ -4,7 +4,7 @@ SkyPillar_1F_MapScripts:: @ 8239615 SkyPillar_1F_MapScript1_23961B: @ 823961B compare VAR_0x40CA, 2 - call_if 0, SkyPillar_1F_EventScript_239627 + call_if_lt SkyPillar_1F_EventScript_239627 end SkyPillar_1F_EventScript_239627:: @ 8239627 diff --git a/data/maps/SkyPillar_2F/scripts.inc b/data/maps/SkyPillar_2F/scripts.inc index c15f1f8c4..0474a829c 100644 --- a/data/maps/SkyPillar_2F/scripts.inc +++ b/data/maps/SkyPillar_2F/scripts.inc @@ -6,7 +6,7 @@ SkyPillar_2F_MapScripts:: @ 823962B SkyPillar_2F_MapScript1_23963B: @ 823963B compare VAR_0x40CA, 2 - call_if 0, SkyPillar_2F_EventScript_23964C + call_if_lt SkyPillar_2F_EventScript_23964C copyvar VAR_ICE_STEP_COUNT, 0x1 end diff --git a/data/maps/SkyPillar_3F/scripts.inc b/data/maps/SkyPillar_3F/scripts.inc index 0ddae05b2..777d53b62 100644 --- a/data/maps/SkyPillar_3F/scripts.inc +++ b/data/maps/SkyPillar_3F/scripts.inc @@ -4,7 +4,7 @@ SkyPillar_3F_MapScripts:: @ 823965B SkyPillar_3F_MapScript1_239661: @ 8239661 compare VAR_0x40CA, 2 - call_if 0, SkyPillar_3F_EventScript_23966D + call_if_lt SkyPillar_3F_EventScript_23966D end SkyPillar_3F_EventScript_23966D:: @ 823966D diff --git a/data/maps/SkyPillar_4F/scripts.inc b/data/maps/SkyPillar_4F/scripts.inc index 3884864d7..262492169 100644 --- a/data/maps/SkyPillar_4F/scripts.inc +++ b/data/maps/SkyPillar_4F/scripts.inc @@ -6,7 +6,7 @@ SkyPillar_4F_MapScripts:: @ 8239671 SkyPillar_4F_MapScript1_239681: @ 8239681 compare VAR_0x40CA, 2 - call_if 0, SkyPillar_4F_EventScript_239692 + call_if_lt SkyPillar_4F_EventScript_239692 copyvar VAR_ICE_STEP_COUNT, 0x1 end diff --git a/data/maps/SkyPillar_5F/scripts.inc b/data/maps/SkyPillar_5F/scripts.inc index 8e08fb2bd..41546899f 100644 --- a/data/maps/SkyPillar_5F/scripts.inc +++ b/data/maps/SkyPillar_5F/scripts.inc @@ -4,7 +4,7 @@ SkyPillar_5F_MapScripts:: @ 82396A2 SkyPillar_5F_MapScript1_2396A8: @ 82396A8 compare VAR_0x40CA, 2 - call_if 0, SkyPillar_5F_EventScript_2396B4 + call_if_lt SkyPillar_5F_EventScript_2396B4 return SkyPillar_5F_EventScript_2396B4:: @ 82396B4 diff --git a/data/maps/SkyPillar_Outside/scripts.inc b/data/maps/SkyPillar_Outside/scripts.inc index 95f229bcf..4f5680522 100644 --- a/data/maps/SkyPillar_Outside/scripts.inc +++ b/data/maps/SkyPillar_Outside/scripts.inc @@ -6,9 +6,9 @@ SkyPillar_Outside_MapScripts:: @ 82392A8 SkyPillar_Outside_MapScript1_2392B8: @ 82392B8 compare VAR_0x405E, 3 - call_if 1, SkyPillar_Outside_EventScript_2392CF + call_if_eq SkyPillar_Outside_EventScript_2392CF compare VAR_0x405E, 4 - call_if 4, SkyPillar_Outside_EventScript_2392D3 + call_if_ge SkyPillar_Outside_EventScript_2392D3 end SkyPillar_Outside_EventScript_2392CF:: @ 82392CF @@ -16,13 +16,11 @@ SkyPillar_Outside_EventScript_2392CF:: @ 82392CF return SkyPillar_Outside_EventScript_2392D3:: @ 82392D3 - checkflag FLAG_SYS_WEATHER_CTRL - call_if 1, SkyPillar_Outside_EventScript_27207A + call_if_set FLAG_SYS_WEATHER_CTRL, SkyPillar_Outside_EventScript_27207A return SkyPillar_Outside_MapScript1_2392DD: @ 82392DD - checkflag FLAG_0x137 - call_if 1, SkyPillar_Outside_EventScript_2392E7 + call_if_set FLAG_0x137, SkyPillar_Outside_EventScript_2392E7 end SkyPillar_Outside_EventScript_2392E7:: @ 82392E7 diff --git a/data/maps/SkyPillar_Top/scripts.inc b/data/maps/SkyPillar_Top/scripts.inc index b611ae2db..1ac3cf486 100644 --- a/data/maps/SkyPillar_Top/scripts.inc +++ b/data/maps/SkyPillar_Top/scripts.inc @@ -5,8 +5,7 @@ SkyPillar_Top_MapScripts:: @ 82396B8 .byte 0 SkyPillar_Top_MapScript1_2396C8: @ 82396C8 - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, SkyPillar_Top_EventScript_2396D2 + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, SkyPillar_Top_EventScript_2396D2 end SkyPillar_Top_EventScript_2396D2:: @ 82396D2 @@ -18,9 +17,9 @@ SkyPillar_Top_EventScript_2396D2:: @ 82396D2 SkyPillar_Top_MapScript1_2396E6: @ 82396E6 compare VAR_0x40CA, 2 - call_if 0, SkyPillar_Top_EventScript_2396FD + call_if_lt SkyPillar_Top_EventScript_2396FD compare VAR_0x40CA, 2 - call_if 4, SkyPillar_Top_EventScript_239705 + call_if_ge SkyPillar_Top_EventScript_239705 end SkyPillar_Top_EventScript_2396FD:: @ 82396FD @@ -29,8 +28,7 @@ SkyPillar_Top_EventScript_2396FD:: @ 82396FD return SkyPillar_Top_EventScript_239705:: @ 8239705 - checkflag FLAG_0x1C0 - call_if 0, SkyPillar_Top_EventScript_23970F + call_if_unset FLAG_0x1C0, SkyPillar_Top_EventScript_23970F return SkyPillar_Top_EventScript_23970F:: @ 823970F diff --git a/data/maps/SlateportCity/scripts.inc b/data/maps/SlateportCity/scripts.inc index 5180c47e9..a28d74fa2 100644 --- a/data/maps/SlateportCity/scripts.inc +++ b/data/maps/SlateportCity/scripts.inc @@ -7,9 +7,9 @@ SlateportCity_MapScript1_1DCC6C: @ 81DCC6C setvar VAR_0x40AA, 0 call SlateportCity_EventScript_1DCC8D compare VAR_0x4058, 1 - call_if 1, SlateportCity_EventScript_1DCC99 + call_if_eq SlateportCity_EventScript_1DCC99 compare VAR_0x40D2, 1 - call_if 1, SlateportCity_EventScript_1DCCE7 + call_if_eq SlateportCity_EventScript_1DCCE7 end SlateportCity_EventScript_1DCC8D:: @ 81DCC8D @@ -144,10 +144,10 @@ SlateportCity_EventScript_1DCDE4:: @ 81DCDE4 msgbox SlateportCity_Text_1DD68A, MSGBOX_DEFAULT specialvar VAR_RESULT, LeadMonHasEffortRibbon compare VAR_RESULT, 1 - call_if 1, SlateportCity_EventScript_1DCE38 + call_if_eq SlateportCity_EventScript_1DCE38 specialvar VAR_RESULT, Special_AreLeadMonEVsMaxedOut compare VAR_RESULT, 0 - call_if 1, SlateportCity_EventScript_1DCE2E + call_if_eq SlateportCity_EventScript_1DCE2E msgbox SlateportCity_Text_1DD697, MSGBOX_DEFAULT playfanfare MUS_FANFA4 message SlateportCity_Text_1DD6E3 @@ -171,7 +171,7 @@ SlateportCity_EventScript_1DCE42:: @ 81DCE42 lock faceplayer compare VAR_0x4058, 1 - call_if 1, SlateportCity_EventScript_1DCE59 + call_if_eq SlateportCity_EventScript_1DCE59 msgbox SlateportCity_Text_1DD81A, MSGBOX_DEFAULT release end @@ -185,7 +185,7 @@ SlateportCity_EventScript_1DCE63:: @ 81DCE63 lock faceplayer compare VAR_0x4058, 1 - call_if 1, SlateportCity_EventScript_1DCE7A + call_if_eq SlateportCity_EventScript_1DCE7A msgbox SlateportCity_Text_1DD8A6, MSGBOX_DEFAULT release end @@ -199,7 +199,7 @@ SlateportCity_EventScript_1DCE84:: @ 81DCE84 lock faceplayer compare VAR_0x4058, 1 - call_if 1, SlateportCity_EventScript_1DCEA4 + call_if_eq SlateportCity_EventScript_1DCEA4 goto_if_set FLAG_0x060, SlateportCity_EventScript_1DCEAE msgbox SlateportCity_Text_1DD93D, MSGBOX_DEFAULT release @@ -219,7 +219,7 @@ SlateportCity_EventScript_1DCEB8:: @ 81DCEB8 lock faceplayer compare VAR_0x4058, 1 - call_if 1, SlateportCity_EventScript_1DCECF + call_if_eq SlateportCity_EventScript_1DCECF msgbox SlateportCity_Text_1DDA34, MSGBOX_DEFAULT release end @@ -243,7 +243,7 @@ SlateportCity_EventScript_1DCEF6:: @ 81DCEF6 lock faceplayer compare VAR_0x4058, 1 - call_if 1, SlateportCity_EventScript_1DCF0D + call_if_eq SlateportCity_EventScript_1DCF0D msgbox SlateportCity_Text_1DDB21, MSGBOX_DEFAULT release end @@ -324,7 +324,7 @@ SlateportCity_EventScript_1DCFBB:: @ 81DCFBB lock faceplayer compare VAR_0x4058, 1 - call_if 1, SlateportCity_EventScript_1DCFD2 + call_if_eq SlateportCity_EventScript_1DCFD2 msgbox SlateportCity_Text_1DE10E, MSGBOX_DEFAULT release end diff --git a/data/maps/SlateportCity_BattleTentCorridor/scripts.inc b/data/maps/SlateportCity_BattleTentCorridor/scripts.inc index bc2027855..5ae3a5eb7 100644 --- a/data/maps/SlateportCity_BattleTentCorridor/scripts.inc +++ b/data/maps/SlateportCity_BattleTentCorridor/scripts.inc @@ -72,9 +72,9 @@ SlateportCity_BattleTentCorridor_EventScript_208F0D:: @ 8208F0D setvar VAR_0x8005, 2 special CallFrontierUtilFunc compare VAR_RESULT, 1 - call_if 1, SlateportCity_BattleTentCorridor_EventScript_209014 + call_if_eq SlateportCity_BattleTentCorridor_EventScript_209014 compare VAR_RESULT, 2 - call_if 1, SlateportCity_BattleTentCorridor_EventScript_20901B + call_if_eq SlateportCity_BattleTentCorridor_EventScript_20901B multichoice 20, 6, 104, 1 switch VAR_RESULT case 0, SlateportCity_BattleTentCorridor_EventScript_208FBB diff --git a/data/maps/SlateportCity_Harbor/scripts.inc b/data/maps/SlateportCity_Harbor/scripts.inc index 8d513fc07..e030036bb 100644 --- a/data/maps/SlateportCity_Harbor/scripts.inc +++ b/data/maps/SlateportCity_Harbor/scripts.inc @@ -6,9 +6,8 @@ SlateportCity_Harbor_MapScript1_20C983: @ 820C983 setescapewarp MAP_SLATEPORT_CITY, 255, 28, 13 setvar VAR_TEMP_1, 0 compare VAR_0x40A0, 1 - call_if 1, SlateportCity_Harbor_EventScript_20C9A9 - checkflag FLAG_SYS_GAME_CLEAR - call_if 1, SlateportCity_Harbor_EventScript_20C9A5 + call_if_eq SlateportCity_Harbor_EventScript_20C9A9 + call_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_Harbor_EventScript_20C9A5 end SlateportCity_Harbor_EventScript_20C9A5:: @ 820C9A5 @@ -67,13 +66,13 @@ SlateportCity_Harbor_EventScript_20C9F5:: @ 820C9F5 setflag FLAG_0x061 setflag FLAG_HIDE_LILCOVE_MOTEL_SCOTT compare VAR_0x8008, 0 - call_if 1, SlateportCity_Harbor_EventScript_20CA89 + call_if_eq SlateportCity_Harbor_EventScript_20CA89 compare VAR_0x8008, 1 - call_if 1, SlateportCity_Harbor_EventScript_20CA9E + call_if_eq SlateportCity_Harbor_EventScript_20CA9E compare VAR_0x8008, 2 - call_if 1, SlateportCity_Harbor_EventScript_20CAB3 + call_if_eq SlateportCity_Harbor_EventScript_20CAB3 compare VAR_0x8008, 3 - call_if 1, SlateportCity_Harbor_EventScript_20CAB3 + call_if_eq SlateportCity_Harbor_EventScript_20CAB3 msgbox SlateportCity_Harbor_Text_20D35A, MSGBOX_DEFAULT closemessage setflag FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_1_BLOCKING_ENTRANCE @@ -232,9 +231,9 @@ SlateportCity_Harbor_EventScript_20CBE9:: @ 820CBE9 delay 30 hideobjectat VAR_LAST_TALKED, MAP_SLATEPORT_CITY_HARBOR compare VAR_FACING, 2 - call_if 1, SlateportCity_Harbor_EventScript_20CC42 + call_if_eq SlateportCity_Harbor_EventScript_20CC42 compare VAR_FACING, 4 - call_if 1, SlateportCity_Harbor_EventScript_20CC37 + call_if_eq SlateportCity_Harbor_EventScript_20CC37 delay 30 hideobjectat 255, MAP_PETALBURG_CITY setvar VAR_0x8004, 5 @@ -270,10 +269,8 @@ SlateportCity_Harbor_EventScript_20CC52:: @ 820CC52 faceplayer goto_if_unset FLAG_SYS_GAME_CLEAR, SlateportCity_Harbor_EventScript_20CC89 setvar VAR_0x8004, 0 - checkflag FLAG_0x1BE - call_if 1, SlateportCity_Harbor_EventScript_20CC93 - checkflag FLAG_0x1BF - call_if 1, SlateportCity_Harbor_EventScript_20CC93 + call_if_set FLAG_0x1BE, SlateportCity_Harbor_EventScript_20CC93 + call_if_set FLAG_0x1BF, SlateportCity_Harbor_EventScript_20CC93 compare VAR_0x8004, 2 goto_if_eq SlateportCity_Harbor_EventScript_20CC89 msgbox SlateportCity_Harbor_Text_20D08E, MSGBOX_DEFAULT diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc index 016b21f14..387ffdabf 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc +++ b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc @@ -17,21 +17,21 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BB00:: @ 820BB00 applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_20BCF5 waitmovement 0 compare VAR_FACING, 1 - call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_20BC92 + call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_20BC92 compare VAR_FACING, 4 - call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_20BC92 + call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_20BC92 msgbox SlateportCity_OceanicMuseum_2F_Text_20BE40, MSGBOX_DEFAULT compare VAR_FACING, 4 - call_if 5, SlateportCity_OceanicMuseum_2F_EventScript_20BC9D + call_if_ne SlateportCity_OceanicMuseum_2F_EventScript_20BC9D msgbox SlateportCity_OceanicMuseum_2F_Text_20BE69, MSGBOX_DEFAULT msgbox SlateportCity_OceanicMuseum_2F_Text_20BE93, MSGBOX_DEFAULT closemessage applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_20BCE2 waitmovement 0 compare VAR_FACING, 1 - call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_20BCA8 + call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_20BCA8 compare VAR_FACING, 3 - call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_20BCB3 + call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_20BCB3 trainerbattle_no_intro TRAINER_GRUNT_14, SlateportCity_OceanicMuseum_2F_Text_20BEE2 msgbox SlateportCity_OceanicMuseum_2F_Text_20BEFA, MSGBOX_DEFAULT closemessage @@ -82,7 +82,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BB00:: @ 820BB00 removeobject 1 setflag FLAG_HIDE_ROUTE_110_TEAM_AQUA compare VAR_0x40DA, 0 - call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_20BC8C + call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_20BC8C setflag FLAG_0x095 clearflag FLAG_HIDE_ROUTE_116_DEVON_EMPLOYEE setflag FLAG_HIDE_RUSTBORO_CITY_DEVON_CORP_3F_EMPLOYEE diff --git a/data/maps/SlateportCity_PokemonFanClub/scripts.inc b/data/maps/SlateportCity_PokemonFanClub/scripts.inc index d3a652cf5..35fcde577 100644 --- a/data/maps/SlateportCity_PokemonFanClub/scripts.inc +++ b/data/maps/SlateportCity_PokemonFanClub/scripts.inc @@ -5,8 +5,7 @@ SlateportCity_PokemonFanClub_EventScript_209E96:: @ 8209E96 lock faceplayer goto_if_unset FLAG_0x155, SlateportCity_PokemonFanClub_EventScript_20A152 - checkflag FLAG_0x156 - call_if 0, SlateportCity_PokemonFanClub_EventScript_20A172 + call_if_unset FLAG_0x156, SlateportCity_PokemonFanClub_EventScript_20A172 switch VAR_0x40B7 case 0, SlateportCity_PokemonFanClub_EventScript_209ED2 case 1, SlateportCity_PokemonFanClub_EventScript_209EE5 @@ -22,18 +21,13 @@ SlateportCity_PokemonFanClub_EventScript_209ED2:: @ 8209ED2 SlateportCity_PokemonFanClub_EventScript_209EE5:: @ 8209EE5 setvar VAR_TEMP_2, 0 - checkflag FLAG_0x0CC - call_if 1, SlateportCity_PokemonFanClub_EventScript_209FD0 - checkflag FLAG_0x0CB - call_if 1, SlateportCity_PokemonFanClub_EventScript_209FD0 - checkflag FLAG_0x0CA - call_if 1, SlateportCity_PokemonFanClub_EventScript_209FD0 - checkflag FLAG_0x0C9 - call_if 1, SlateportCity_PokemonFanClub_EventScript_209FD0 - checkflag FLAG_0x0C8 - call_if 1, SlateportCity_PokemonFanClub_EventScript_209FD0 + call_if_set FLAG_0x0CC, SlateportCity_PokemonFanClub_EventScript_209FD0 + call_if_set FLAG_0x0CB, SlateportCity_PokemonFanClub_EventScript_209FD0 + call_if_set FLAG_0x0CA, SlateportCity_PokemonFanClub_EventScript_209FD0 + call_if_set FLAG_0x0C9, SlateportCity_PokemonFanClub_EventScript_209FD0 + call_if_set FLAG_0x0C8, SlateportCity_PokemonFanClub_EventScript_209FD0 compare VAR_TEMP_2, 5 - call_if 1, SlateportCity_PokemonFanClub_EventScript_209FCA + call_if_eq SlateportCity_PokemonFanClub_EventScript_209FCA compare VAR_0x40B7, 2 goto_if_eq SlateportCity_PokemonFanClub_EventScript_209F3B msgbox SlateportCity_PokemonFanClub_Text_20A62A, MSGBOX_DEFAULT @@ -48,16 +42,11 @@ SlateportCity_PokemonFanClub_EventScript_209F3B:: @ 8209F3B SlateportCity_PokemonFanClub_EventScript_209F45:: @ 8209F45 msgbox SlateportCity_PokemonFanClub_Text_20A65F, MSGBOX_DEFAULT setvar VAR_TEMP_1, 0 - checkflag FLAG_0x0CC - call_if 0, SlateportCity_PokemonFanClub_EventScript_20A13B - checkflag FLAG_0x0CB - call_if 0, SlateportCity_PokemonFanClub_EventScript_20A124 - checkflag FLAG_0x0CA - call_if 0, SlateportCity_PokemonFanClub_EventScript_20A10D - checkflag FLAG_0x0C9 - call_if 0, SlateportCity_PokemonFanClub_EventScript_20A0F6 - checkflag FLAG_0x0C8 - call_if 0, SlateportCity_PokemonFanClub_EventScript_20A0DF + call_if_unset FLAG_0x0CC, SlateportCity_PokemonFanClub_EventScript_20A13B + call_if_unset FLAG_0x0CB, SlateportCity_PokemonFanClub_EventScript_20A124 + call_if_unset FLAG_0x0CA, SlateportCity_PokemonFanClub_EventScript_20A10D + call_if_unset FLAG_0x0C9, SlateportCity_PokemonFanClub_EventScript_20A0F6 + call_if_unset FLAG_0x0C8, SlateportCity_PokemonFanClub_EventScript_20A0DF bufferleadmonspeciesname 0 switch VAR_TEMP_1 case 0, SlateportCity_PokemonFanClub_EventScript_209FD6 @@ -145,7 +134,7 @@ SlateportCity_PokemonFanClub_EventScript_20A0D5:: @ 820A0D5 SlateportCity_PokemonFanClub_EventScript_20A0DF:: @ 820A0DF specialvar VAR_RESULT, CheckLeadMonCool compare VAR_RESULT, 1 - call_if 1, SlateportCity_PokemonFanClub_EventScript_20A0F0 + call_if_eq SlateportCity_PokemonFanClub_EventScript_20A0F0 return SlateportCity_PokemonFanClub_EventScript_20A0F0:: @ 820A0F0 @@ -155,7 +144,7 @@ SlateportCity_PokemonFanClub_EventScript_20A0F0:: @ 820A0F0 SlateportCity_PokemonFanClub_EventScript_20A0F6:: @ 820A0F6 specialvar VAR_RESULT, CheckLeadMonBeauty compare VAR_RESULT, 1 - call_if 1, SlateportCity_PokemonFanClub_EventScript_20A107 + call_if_eq SlateportCity_PokemonFanClub_EventScript_20A107 return SlateportCity_PokemonFanClub_EventScript_20A107:: @ 820A107 @@ -165,7 +154,7 @@ SlateportCity_PokemonFanClub_EventScript_20A107:: @ 820A107 SlateportCity_PokemonFanClub_EventScript_20A10D:: @ 820A10D specialvar VAR_RESULT, CheckLeadMonCute compare VAR_RESULT, 1 - call_if 1, SlateportCity_PokemonFanClub_EventScript_20A11E + call_if_eq SlateportCity_PokemonFanClub_EventScript_20A11E return SlateportCity_PokemonFanClub_EventScript_20A11E:: @ 820A11E @@ -175,7 +164,7 @@ SlateportCity_PokemonFanClub_EventScript_20A11E:: @ 820A11E SlateportCity_PokemonFanClub_EventScript_20A124:: @ 820A124 specialvar VAR_RESULT, CheckLeadMonSmart compare VAR_RESULT, 1 - call_if 1, SlateportCity_PokemonFanClub_EventScript_20A135 + call_if_eq SlateportCity_PokemonFanClub_EventScript_20A135 return SlateportCity_PokemonFanClub_EventScript_20A135:: @ 820A135 @@ -185,7 +174,7 @@ SlateportCity_PokemonFanClub_EventScript_20A135:: @ 820A135 SlateportCity_PokemonFanClub_EventScript_20A13B:: @ 820A13B specialvar VAR_RESULT, CheckLeadMonTough compare VAR_RESULT, 1 - call_if 1, SlateportCity_PokemonFanClub_EventScript_20A14C + call_if_eq SlateportCity_PokemonFanClub_EventScript_20A14C return SlateportCity_PokemonFanClub_EventScript_20A14C:: @ 820A14C diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc index 88bcad1ff..38b60e430 100644 --- a/data/maps/SootopolisCity/scripts.inc +++ b/data/maps/SootopolisCity/scripts.inc @@ -7,11 +7,9 @@ SootopolisCity_MapScripts:: @ 81E565C .byte 0 SootopolisCity_MapScript1_1E5676: @ 81E5676 - checkflag FLAG_0x09E - call_if 0, SootopolisCity_EventScript_1E56E5 + call_if_unset FLAG_0x09E, SootopolisCity_EventScript_1E56E5 goto_if_unset FLAG_0x081, SootopolisCity_EventScript_1E5692 - checkflag FLAG_0x09E - call_if 0, SootopolisCity_EventScript_1E5693 + call_if_unset FLAG_0x09E, SootopolisCity_EventScript_1E5693 end SootopolisCity_EventScript_1E5692:: @ 81E5692 @@ -36,31 +34,31 @@ SootopolisCity_EventScript_1E56E5:: @ 81E56E5 SootopolisCity_MapScript1_1E56EF: @ 81E56EF setflag FLAG_VISITED_SOOTOPOLIS_CITY compare VAR_0x405E, 1 - call_if 1, SootopolisCity_EventScript_1E5781 + call_if_eq SootopolisCity_EventScript_1E5781 compare VAR_0x40CA, 1 - call_if 1, SootopolisCity_EventScript_1E5781 + call_if_eq SootopolisCity_EventScript_1E5781 call SootopolisCity_EventScript_1E5805 call SootopolisCity_EventScript_1E57B2 compare VAR_0x405E, 1 - call_if 1, SootopolisCity_EventScript_1E5785 + call_if_eq SootopolisCity_EventScript_1E5785 compare VAR_0x405E, 2 - call_if 1, SootopolisCity_EventScript_1E5785 + call_if_eq SootopolisCity_EventScript_1E5785 compare VAR_0x405E, 3 - call_if 1, SootopolisCity_EventScript_1E5785 + call_if_eq SootopolisCity_EventScript_1E5785 compare VAR_0x405E, 4 - call_if 1, SootopolisCity_EventScript_1E5785 + call_if_eq SootopolisCity_EventScript_1E5785 compare VAR_0x405E, 5 - call_if 1, SootopolisCity_EventScript_1E5785 + call_if_eq SootopolisCity_EventScript_1E5785 compare VAR_0x405E, 2 - call_if 1, SootopolisCity_EventScript_1E5842 + call_if_eq SootopolisCity_EventScript_1E5842 compare VAR_0x405E, 3 - call_if 1, SootopolisCity_EventScript_1E5842 + call_if_eq SootopolisCity_EventScript_1E5842 compare VAR_0x405E, 4 - call_if 1, SootopolisCity_EventScript_1E585B + call_if_eq SootopolisCity_EventScript_1E585B compare VAR_0x405E, 5 - call_if 1, SootopolisCity_EventScript_1E5871 + call_if_eq SootopolisCity_EventScript_1E5871 compare VAR_0x405E, 6 - call_if 1, SootopolisCity_EventScript_1E58D3 + call_if_eq SootopolisCity_EventScript_1E58D3 end SootopolisCity_EventScript_1E5781:: @ 81E5781 @@ -143,11 +141,11 @@ SootopolisCity_EventScript_1E5871:: @ 81E5871 setobjectxyperm 16, 33, 35 setobjectxyperm 17, 34, 35 compare VAR_0x40D8, 0 - call_if 1, SootopolisCity_EventScript_1E58AF + call_if_eq SootopolisCity_EventScript_1E58AF compare VAR_0x40D8, 1 - call_if 1, SootopolisCity_EventScript_1E58BB + call_if_eq SootopolisCity_EventScript_1E58BB compare VAR_0x40D8, 2 - call_if 1, SootopolisCity_EventScript_1E58C7 + call_if_eq SootopolisCity_EventScript_1E58C7 return SootopolisCity_EventScript_1E58AF:: @ 81E58AF @@ -175,9 +173,9 @@ SootopolisCity_MapScript2_1E58DB: @ 81E58DB SootopolisCity_EventScript_1E58E5:: @ 81E58E5 compare VAR_0x40CA, 1 - call_if 1, SootopolisCity_EventScript_1E58FC + call_if_eq SootopolisCity_EventScript_1E58FC compare VAR_0x40CA, 2 - call_if 1, SootopolisCity_EventScript_1E5901 + call_if_eq SootopolisCity_EventScript_1E5901 end SootopolisCity_EventScript_1E58FC:: @ 81E58FC @@ -931,8 +929,7 @@ SootopolisCity_EventScript_1E6166:: @ 81E6166 lockall applymovement 7, SootopolisCity_Movement_27259E waitmovement 0 - checkflag FLAG_0x133 - call_if 0, SootopolisCity_EventScript_1E61CC + call_if_unset FLAG_0x133, SootopolisCity_EventScript_1E61CC compare VAR_0x405E, 2 goto_if_eq SootopolisCity_EventScript_1E61AE compare VAR_0x405E, 3 @@ -963,9 +960,9 @@ SootopolisCity_EventScript_1E61CC:: @ 81E61CC msgbox SootopolisCity_Text_1E75CB, MSGBOX_DEFAULT closemessage compare VAR_FACING, 3 - call_if 1, SootopolisCity_EventScript_1E6243 + call_if_eq SootopolisCity_EventScript_1E6243 compare VAR_FACING, 2 - call_if 1, SootopolisCity_EventScript_1E6255 + call_if_eq SootopolisCity_EventScript_1E6255 msgbox SootopolisCity_Text_1E7737, MSGBOX_DEFAULT closemessage applymovement 7, SootopolisCity_Movement_1E62D4 @@ -1358,11 +1355,11 @@ SootopolisCity_EventScript_1E646F:: @ 81E646F msgbox SootopolisCity_Text_1E7B86, MSGBOX_DEFAULT closemessage compare VAR_FACING, 2 - call_if 1, SootopolisCity_EventScript_1E64B2 + call_if_eq SootopolisCity_EventScript_1E64B2 compare VAR_FACING, 4 - call_if 1, SootopolisCity_EventScript_1E64B2 + call_if_eq SootopolisCity_EventScript_1E64B2 compare VAR_FACING, 3 - call_if 1, SootopolisCity_EventScript_1E64C5 + call_if_eq SootopolisCity_EventScript_1E64C5 release end diff --git a/data/maps/SootopolisCity_House2/scripts.inc b/data/maps/SootopolisCity_House2/scripts.inc index 676ec4ed2..9e45a09bf 100644 --- a/data/maps/SootopolisCity_House2/scripts.inc +++ b/data/maps/SootopolisCity_House2/scripts.inc @@ -6,9 +6,9 @@ SootopolisCity_House2_EventScript_226A77:: @ 8226A77 faceplayer msgbox SootopolisCity_House2_Text_226AAB, MSGBOX_YESNO compare VAR_RESULT, 1 - call_if 1, SootopolisCity_House2_EventScript_226A99 + call_if_eq SootopolisCity_House2_EventScript_226A99 compare VAR_RESULT, 0 - call_if 1, SootopolisCity_House2_EventScript_226AA2 + call_if_eq SootopolisCity_House2_EventScript_226AA2 release end diff --git a/data/maps/SootopolisCity_House6/scripts.inc b/data/maps/SootopolisCity_House6/scripts.inc index 366525a10..499c01893 100644 --- a/data/maps/SootopolisCity_House6/scripts.inc +++ b/data/maps/SootopolisCity_House6/scripts.inc @@ -7,7 +7,7 @@ SootopolisCity_House6_EventScript_226F5C:: @ 8226F5C goto_if_set FLAG_0x0F5, SootopolisCity_House6_EventScript_226FA3 msgbox SootopolisCity_House6_Text_226FC3, MSGBOX_YESNO compare VAR_RESULT, 0 - call_if 1, SootopolisCity_House6_EventScript_226F99 + call_if_eq SootopolisCity_House6_EventScript_226F99 msgbox SootopolisCity_House6_Text_227034, MSGBOX_DEFAULT givedecoration_std 117 compare VAR_RESULT, 0 diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc index 8a9e6ccc3..18b573fbd 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc @@ -7,9 +7,9 @@ SootopolisCity_MysteryEventsHouse_1F_MapScript1_22795E: @ 822795E setvar VAR_0x8004, 16 special CallFrontierUtilFunc compare VAR_RESULT, 0 - call_if 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_22797D + call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_22797D compare VAR_0x40C0, 0 - call_if 5, SootopolisCity_MysteryEventsHouse_1F_EventScript_227991 + call_if_ne SootopolisCity_MysteryEventsHouse_1F_EventScript_227991 end SootopolisCity_MysteryEventsHouse_1F_EventScript_22797D:: @ 822797D @@ -40,11 +40,11 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7:: @ 82279B7 applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_MysteryEventsHouse_1F_Movement_2725A6 waitmovement 0 compare VAR_0x40C0, 1 - call_if 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_227A04 + call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227A04 compare VAR_0x40C0, 2 - call_if 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_227A0D + call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227A0D compare VAR_0x40C0, 3 - call_if 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_227A16 + call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227A16 special LoadPlayerParty setvar VAR_0x40C0, 0 releaseall @@ -110,11 +110,11 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_227A58:: @ 8227A58 msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227D21, MSGBOX_DEFAULT closemessage compare VAR_FACING, 2 - call_if 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_227AFE + call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AFE compare VAR_FACING, 4 - call_if 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_227B10 + call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227B10 compare VAR_FACING, 3 - call_if 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_227B22 + call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227B22 warp MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F, 255, 3, 1 waitstate release diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc index 452f2e15c..0de8651d7 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc @@ -23,11 +23,11 @@ SootopolisCity_MysteryEventsHouse_B1F_EventScript_227E68:: @ 8227E68 special DoSpecialTrainerBattle waitstate compare VAR_RESULT, 3 - call_if 1, SootopolisCity_MysteryEventsHouse_B1F_EventScript_227ECF + call_if_eq SootopolisCity_MysteryEventsHouse_B1F_EventScript_227ECF compare VAR_RESULT, 1 - call_if 1, SootopolisCity_MysteryEventsHouse_B1F_EventScript_227EDD + call_if_eq SootopolisCity_MysteryEventsHouse_B1F_EventScript_227EDD compare VAR_RESULT, 2 - call_if 1, SootopolisCity_MysteryEventsHouse_B1F_EventScript_227EE8 + call_if_eq SootopolisCity_MysteryEventsHouse_B1F_EventScript_227EE8 closemessage special HealPlayerParty applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_MysteryEventsHouse_B1F_Movement_227EF9 diff --git a/data/maps/SouthernIsland_Interior/scripts.inc b/data/maps/SouthernIsland_Interior/scripts.inc index 02013869c..49c893fa8 100644 --- a/data/maps/SouthernIsland_Interior/scripts.inc +++ b/data/maps/SouthernIsland_Interior/scripts.inc @@ -4,8 +4,7 @@ SouthernIsland_Interior_MapScripts:: @ 8242A45 .byte 0 SouthernIsland_Interior_MapScript1_242A50: @ 8242A50 - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, SouthernIsland_Interior_EventScript_242A5A + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, SouthernIsland_Interior_EventScript_242A5A end SouthernIsland_Interior_EventScript_242A5A:: @ 8242A5A @@ -17,9 +16,9 @@ SouthernIsland_Interior_EventScript_242A5A:: @ 8242A5A SouthernIsland_Interior_MapScript1_242A6E: @ 8242A6E compare VAR_0x40D5, 0 - call_if 1, SouthernIsland_Interior_EventScript_242A8A + call_if_eq SouthernIsland_Interior_EventScript_242A8A compare VAR_0x40D5, 0 - call_if 5, SouthernIsland_Interior_EventScript_242A95 + call_if_ne SouthernIsland_Interior_EventScript_242A95 call SouthernIsland_Interior_EventScript_242AA0 end @@ -79,9 +78,9 @@ SouthernIsland_Interior_EventScript_242AD0:: @ 8242AD0 special RemoveCameraObject setvar VAR_LAST_TALKED, 2 compare VAR_0x40D5, 0 - call_if 1, SouthernIsland_Interior_EventScript_242BA4 + call_if_eq SouthernIsland_Interior_EventScript_242BA4 compare VAR_0x40D5, 0 - call_if 5, SouthernIsland_Interior_EventScript_242BB7 + call_if_ne SouthernIsland_Interior_EventScript_242BB7 setflag FLAG_SYS_CTRL_OBJ_DELETE special BattleSetup_StartLatiBattle waitstate diff --git a/data/maps/TerraCave_End/scripts.inc b/data/maps/TerraCave_End/scripts.inc index cf9782bb5..bd057eac6 100644 --- a/data/maps/TerraCave_End/scripts.inc +++ b/data/maps/TerraCave_End/scripts.inc @@ -4,8 +4,7 @@ TerraCave_End_MapScripts:: @ 823B0B0 .byte 0 TerraCave_End_MapScript1_23B0BB: @ 823B0BB - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, TerraCave_End_EventScript_23B0C5 + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, TerraCave_End_EventScript_23B0C5 end TerraCave_End_EventScript_23B0C5:: @ 823B0C5 @@ -16,8 +15,7 @@ TerraCave_End_EventScript_23B0C5:: @ 823B0C5 return TerraCave_End_MapScript1_23B0D9: @ 823B0D9 - checkflag FLAG_0x1BF - call_if 0, TerraCave_End_EventScript_23B0E3 + call_if_unset FLAG_0x1BF, TerraCave_End_EventScript_23B0E3 end TerraCave_End_EventScript_23B0E3:: @ 823B0E3 diff --git a/data/maps/TrainerHill_Entrance/scripts.inc b/data/maps/TrainerHill_Entrance/scripts.inc index 702f9cc93..f62be2f1a 100644 --- a/data/maps/TrainerHill_Entrance/scripts.inc +++ b/data/maps/TrainerHill_Entrance/scripts.inc @@ -46,7 +46,7 @@ TrainerHill_Entrance_MapScript1_26811B: @ 826811B TrainerHill_Entrance_MapScript1_268128: @ 8268128 compare VAR_TEMP_D, 17 - call_if 1, TrainerHill_Entrance_EventScript_268134 + call_if_eq TrainerHill_Entrance_EventScript_268134 end TrainerHill_Entrance_EventScript_268134:: @ 8268134 @@ -136,7 +136,7 @@ TrainerHill_Entrance_EventScript_268229:: @ 8268229 setvar VAR_0x8004, 13 special sp194_trainer_tower compare VAR_RESULT, 0 - call_if 1, TrainerHill_Entrance_EventScript_26832E + call_if_eq TrainerHill_Entrance_EventScript_26832E setvar VAR_0x8004, 8 special sp194_trainer_tower compare VAR_RESULT, 1 diff --git a/data/maps/Underwater_SeafloorCavern/scripts.inc b/data/maps/Underwater_SeafloorCavern/scripts.inc index 050970f3e..4d5865511 100644 --- a/data/maps/Underwater_SeafloorCavern/scripts.inc +++ b/data/maps/Underwater_SeafloorCavern/scripts.inc @@ -14,8 +14,7 @@ Underwater_SeafloorCavern_EventScript_234358:: @ 8234358 end Underwater_SeafloorCavern_MapScript1_23435C: @ 823435C - checkflag FLAG_0x081 - call_if 1, Underwater_SeafloorCavern_EventScript_234366 + call_if_set FLAG_0x081, Underwater_SeafloorCavern_EventScript_234366 end Underwater_SeafloorCavern_EventScript_234366:: @ 8234366 diff --git a/data/maps/UnknownMap_25_34/scripts.inc b/data/maps/UnknownMap_25_34/scripts.inc index 7c6fe1c5b..5bb734781 100644 --- a/data/maps/UnknownMap_25_34/scripts.inc +++ b/data/maps/UnknownMap_25_34/scripts.inc @@ -20,15 +20,15 @@ LinkContestRoom1_EventScript_23B7AF:: @ 823B7AF call LinkContestRoom1_EventScript_27A133 special ScriptGetMultiplayerId compare VAR_RESULT, 0 - call_if 1, LinkContestRoom1_EventScript_23B7EF + call_if_eq LinkContestRoom1_EventScript_23B7EF compare VAR_RESULT, 1 - call_if 1, LinkContestRoom1_EventScript_23B7F3 + call_if_eq LinkContestRoom1_EventScript_23B7F3 compare VAR_RESULT, 2 - call_if 1, LinkContestRoom1_EventScript_23B7F7 + call_if_eq LinkContestRoom1_EventScript_23B7F7 compare VAR_RESULT, 3 - call_if 1, LinkContestRoom1_EventScript_23B7FB + call_if_eq LinkContestRoom1_EventScript_23B7FB compare VAR_RESULT, 4 - call_if 1, LinkContestRoom1_EventScript_23B7FF + call_if_eq LinkContestRoom1_EventScript_23B7FF return LinkContestRoom1_EventScript_23B7EF:: @ 823B7EF @@ -53,7 +53,7 @@ LinkContestRoom1_EventScript_23B7FF:: @ 823B7FF LinkContestRoom1_MapScript1_23B803: @ 823B803 compare VAR_TEMP_9, 1 - call_if 1, LinkContestRoom1_EventScript_23B80F + call_if_eq LinkContestRoom1_EventScript_23B80F end LinkContestRoom1_EventScript_23B80F:: @ 823B80F diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc index a42ee04cd..21494c8a6 100644 --- a/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc +++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc @@ -95,9 +95,9 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_20243C:: @ 820243C setvar VAR_0x8005, 2 special CallFrontierUtilFunc compare VAR_RESULT, 1 - call_if 1, VerdanturfTown_BattleTentBattleRoom_EventScript_202565 + call_if_eq VerdanturfTown_BattleTentBattleRoom_EventScript_202565 compare VAR_RESULT, 2 - call_if 1, VerdanturfTown_BattleTentBattleRoom_EventScript_20256C + call_if_eq VerdanturfTown_BattleTentBattleRoom_EventScript_20256C multichoice 20, 6, 104, 1 switch VAR_RESULT case 0, VerdanturfTown_BattleTentBattleRoom_EventScript_2024EA diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc index 7cebd6e72..edf45de9c 100644 --- a/data/maps/VictoryRoad_1F/scripts.inc +++ b/data/maps/VictoryRoad_1F/scripts.inc @@ -4,9 +4,9 @@ VictoryRoad_1F_MapScripts:: @ 8235D7A VictoryRoad_1F_MapScript1_235D80: @ 8235D80 compare VAR_0x40C3, 1 - call_if 1, VictoryRoad_1F_EventScript_235D97 + call_if_eq VictoryRoad_1F_EventScript_235D97 compare VAR_0x40C3, 2 - call_if 1, VictoryRoad_1F_EventScript_235DA3 + call_if_eq VictoryRoad_1F_EventScript_235DA3 end VictoryRoad_1F_EventScript_235D97:: @ 8235D97 diff --git a/data/scripts/apprentice.inc b/data/scripts/apprentice.inc index ca4dd657b..034732db2 100644 --- a/data/scripts/apprentice.inc +++ b/data/scripts/apprentice.inc @@ -92,9 +92,9 @@ BattleFrontier_BattleTowerLobby_EventScript_2B69D3: apprentice_menu APPRENTICE_ASK_2SPECIES copyvar VAR_0x8005, VAR_RESULT compare VAR_0x8005, 0 - call_if 1, BattleFrontier_BattleTowerLobby_EventScript_2B6ABA + call_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B6ABA compare VAR_0x8005, 1 - call_if 1, BattleFrontier_BattleTowerLobby_EventScript_2B6AC0 + call_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B6AC0 setvar VAR_0x8004, 12 special CallApprenticeFunction copyvar VAR_0x8006, VAR_RESULT @@ -105,7 +105,7 @@ BattleFrontier_BattleTowerLobby_EventScript_2B69D3: setvar VAR_0x8004, 12 special CallApprenticeFunction compare VAR_RESULT, 3 - call_if 1, BattleFrontier_BattleTowerLobby_EventScript_2B6AC6 + call_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B6AC6 setvar VAR_0x8004, 16 setvar VAR_0x8005, 0 copyvar VAR_0x8006, VAR_0x8007 @@ -217,9 +217,9 @@ BattleFrontier_BattleTowerLobby_EventScript_2B6C77: apprentice_menu APPRENTICE_ASK_MOVES copyvar VAR_0x8005, VAR_RESULT compare VAR_0x8005, 0 - call_if 1, BattleFrontier_BattleTowerLobby_EventScript_2B6D50 + call_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B6D50 compare VAR_0x8005, 1 - call_if 1, BattleFrontier_BattleTowerLobby_EventScript_2B6D56 + call_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B6D56 setvar VAR_0x8004, 17 special CallApprenticeFunction setvar VAR_0x8004, 5 diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 11c368610..12b63ce05 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -1603,9 +1603,9 @@ MossdeepCity_GameCorner_1F_EventScript_277E55:: @ 8277E55 compare VAR_RESULT, 0 goto_if_eq MossdeepCity_GameCorner_1F_EventScript_2772F9 compare VAR_0x8005, 0 - call_if 1, MossdeepCity_GameCorner_1F_EventScript_277E84 + call_if_eq MossdeepCity_GameCorner_1F_EventScript_277E84 compare VAR_0x8005, 1 - call_if 1, MossdeepCity_GameCorner_1F_EventScript_277E8D + call_if_eq MossdeepCity_GameCorner_1F_EventScript_277E8D goto MossdeepCity_GameCorner_1F_EventScript_2772F9 end diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index 1224a0ebe..927d61439 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -3,10 +3,8 @@ LilycoveCity_ContestLobby_EventScript_279CC5:: @ 8279CC5 faceplayer compare VAR_0x408A, 0 goto_if_ne LilycoveCity_ContestLobby_EventScript_279D13 - checkflag FLAG_0x05F - call_if 1, LilycoveCity_ContestLobby_EventScript_279CEA - checkflag FLAG_0x05F - call_if 0, LilycoveCity_ContestLobby_EventScript_279CF3 + call_if_set FLAG_0x05F, LilycoveCity_ContestLobby_EventScript_279CEA + call_if_unset FLAG_0x05F, LilycoveCity_ContestLobby_EventScript_279CF3 goto LilycoveCity_ContestLobby_EventScript_279D5A end @@ -486,15 +484,15 @@ LinkContestRoom1_EventScript_27A2D5:: @ 827A2D5 LinkContestRoom1_EventScript_27A34F:: @ 827A34F special sub_80F82FC compare VAR_0x4088, 1 - call_if 1, LinkContestRoom1_EventScript_27A454 + call_if_eq LinkContestRoom1_EventScript_27A454 compare VAR_0x4088, 2 - call_if 1, LinkContestRoom1_EventScript_27A4B2 + call_if_eq LinkContestRoom1_EventScript_27A4B2 compare VAR_0x4088, 3 - call_if 1, LinkContestRoom1_EventScript_27A510 + call_if_eq LinkContestRoom1_EventScript_27A510 compare VAR_0x4088, 4 - call_if 1, LinkContestRoom1_EventScript_27A56E + call_if_eq LinkContestRoom1_EventScript_27A56E compare VAR_0x4088, 5 - call_if 1, LinkContestRoom1_EventScript_27A5CC + call_if_eq LinkContestRoom1_EventScript_27A5CC setvar VAR_TEMP_1, 9 setvar VAR_TEMP_2, 9 setvar VAR_TEMP_3, 9 @@ -504,7 +502,7 @@ LinkContestRoom1_EventScript_27A34F:: @ 827A34F setvar VAR_TEMP_7, 9 setvar VAR_TEMP_8, 9 compare VAR_TEMP_0, 0 - call_if 2, LinkContestRoom1_EventScript_27A3E5 + call_if_gt LinkContestRoom1_EventScript_27A3E5 setvar VAR_TEMP_1, 0 setvar VAR_TEMP_2, 0 setvar VAR_TEMP_3, 0 @@ -519,21 +517,21 @@ LinkContestRoom1_EventScript_27A3E5:: @ 827A3E5 setvar VAR_RESULT, 8 special ScriptRandom compare VAR_RESULT, 0 - call_if 1, LinkContestRoom1_EventScript_27A65A + call_if_eq LinkContestRoom1_EventScript_27A65A compare VAR_RESULT, 1 - call_if 1, LinkContestRoom1_EventScript_27A67E + call_if_eq LinkContestRoom1_EventScript_27A67E compare VAR_RESULT, 2 - call_if 1, LinkContestRoom1_EventScript_27A6A2 + call_if_eq LinkContestRoom1_EventScript_27A6A2 compare VAR_RESULT, 3 - call_if 1, LinkContestRoom1_EventScript_27A6C6 + call_if_eq LinkContestRoom1_EventScript_27A6C6 compare VAR_RESULT, 4 - call_if 1, LinkContestRoom1_EventScript_27A6EA + call_if_eq LinkContestRoom1_EventScript_27A6EA compare VAR_RESULT, 5 - call_if 1, LinkContestRoom1_EventScript_27A70E + call_if_eq LinkContestRoom1_EventScript_27A70E compare VAR_RESULT, 6 - call_if 1, LinkContestRoom1_EventScript_27A732 + call_if_eq LinkContestRoom1_EventScript_27A732 compare VAR_RESULT, 7 - call_if 1, LinkContestRoom1_EventScript_27A756 + call_if_eq LinkContestRoom1_EventScript_27A756 compare VAR_TEMP_0, 0 goto_if_gt LinkContestRoom1_EventScript_27A3E5 waitmovement 0 @@ -999,7 +997,7 @@ LinkContestRoom1_EventScript_27AA1B:: @ 827AA1B addvar VAR_TEMP_1, 1 lockall compare VAR_0x4088, 1 - call_if 2, LinkContestRoom1_EventScript_27AA6F + call_if_gt LinkContestRoom1_EventScript_27AA6F applymovement 9, LinkContestRoom1_Movement_27AD3B applymovement 12, LinkContestRoom1_Movement_27AD3F applymovement 7, LinkContestRoom1_Movement_27AD3B @@ -1204,7 +1202,7 @@ LinkContestRoom1_EventScript_27AC5E:: @ 827AC5E LinkContestRoom1_EventScript_27AC77:: @ 827AC77 compare VAR_0x4088, 2 - call_if 1, LinkContestRoom1_EventScript_27ABCE + call_if_eq LinkContestRoom1_EventScript_27ABCE specialvar VAR_RESULT, sub_80F7F7C compare VAR_RESULT, 0 goto_if_eq LinkContestRoom1_EventScript_27ACDF diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index 5195598b1..057a2fa07 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -48,7 +48,7 @@ Route117_EventScript_291C9D:: @ 8291C9D Route117_EventScript_291CB7:: @ 8291CB7 specialvar VAR_RESULT, sub_8071614 compare VAR_RESULT, 1 - call_if 1, Route117_EventScript_291CC8 + call_if_eq Route117_EventScript_291CC8 return Route117_EventScript_291CC8:: @ 8291CC8 @@ -162,7 +162,7 @@ Route117_PokemonDayCare_EventScript_291E15:: @ 8291E15 Route117_PokemonDayCare_EventScript_291E1E:: @ 8291E1E specialvar VAR_RESULT, GetNumLevelsGainedFromDaycare compare VAR_RESULT, 0 - call_if 5, Route117_PokemonDayCare_EventScript_291E15 + call_if_ne Route117_PokemonDayCare_EventScript_291E15 return Route117_PokemonDayCare_EventScript_291E2F:: @ 8291E2F diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc index bcb8e517c..39de44ba6 100644 --- a/data/scripts/gabby_and_ty.inc +++ b/data/scripts/gabby_and_ty.inc @@ -215,11 +215,11 @@ Route111_EventScript_28CF56:: @ 828CF56 special GabbyAndTyBeforeInterview special GabbyAndTySetScriptVarsToEventObjectLocalIds compare VAR_FACING, 2 - call_if 1, Route111_EventScript_28CF94 + call_if_eq Route111_EventScript_28CF94 compare VAR_FACING, 1 - call_if 1, Route111_EventScript_28CF9F + call_if_eq Route111_EventScript_28CF9F compare VAR_FACING, 4 - call_if 1, Route111_EventScript_28CFB1 + call_if_eq Route111_EventScript_28CFB1 goto_if_set FLAG_TEMP_1, Route111_EventScript_28D0EE msgbox Route111_Text_28B042, MSGBOX_YESNO goto Route111_EventScript_28D0A7 @@ -248,11 +248,11 @@ Route120_EventScript_28CFC3:: @ 828CFC3 special GabbyAndTyBeforeInterview special GabbyAndTySetScriptVarsToEventObjectLocalIds compare VAR_FACING, 2 - call_if 1, Route111_EventScript_28CF94 + call_if_eq Route111_EventScript_28CF94 compare VAR_FACING, 1 - call_if 1, Route111_EventScript_28CF9F + call_if_eq Route111_EventScript_28CF9F compare VAR_FACING, 4 - call_if 1, Route111_EventScript_28CFB1 + call_if_eq Route111_EventScript_28CFB1 goto_if_set FLAG_TEMP_1, Route111_EventScript_28D0EE specialvar VAR_RESULT, GabbyAndTyGetLastQuote compare VAR_RESULT, 0 diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index 48f95ae05..f9c6cf24e 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -9,9 +9,9 @@ LittlerootTown_MaysHouse_1F_EventScript_292704:: @ 8292704 applymovement VAR_0x8004, LittlerootTown_BrendansHouse_1F_Movement_27259E waitmovement 0 compare VAR_0x8005, 0 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_29274D + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_29274D compare VAR_0x8005, 1 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292758 + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292758 msgbox LittlerootTown_BrendansHouse_1F_Text_1F7A46, MSGBOX_DEFAULT closemessage setvar VAR_0x4092, 4 @@ -69,9 +69,9 @@ LittlerootTown_MaysHouse_2F_EventScript_292799:: @ 8292799 setflag FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_2 checkplayergender compare VAR_RESULT, 0 - call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_2927DF + call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_2927DF compare VAR_RESULT, 1 - call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_29280F + call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_29280F playse SE_KAIDAN removeobject VAR_0x8008 releaseall @@ -439,13 +439,13 @@ LittlerootTown_MaysHouse_1F_EventScript_292AF2:: @ 8292AF2 lockall checkplayergender compare VAR_RESULT, 0 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292C76 + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292C76 compare VAR_RESULT, 1 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292C86 + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292C86 compare VAR_0x8008, 0 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292D08 + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292D08 compare VAR_0x8008, 1 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292D13 + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292D13 applymovement VAR_0x8009, LittlerootTown_BrendansHouse_1F_Movement_27259E waitmovement 0 playse SE_PIN @@ -455,32 +455,32 @@ LittlerootTown_MaysHouse_1F_EventScript_292AF2:: @ 8292AF2 waitmovement 0 delay 20 compare VAR_0x8008, 0 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292C96 + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292C96 compare VAR_0x8008, 1 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292CA1 + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292CA1 msgbox LittlerootTown_BrendansHouse_1F_Text_1F800E, MSGBOX_DEFAULT giveitem_std ITEM_SS_TICKET msgbox LittlerootTown_BrendansHouse_1F_Text_1F80FE, MSGBOX_DEFAULT closemessage delay 20 compare VAR_0x8008, 0 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292CAC + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292CAC compare VAR_0x8008, 1 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292CC1 + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292CC1 msgbox LittlerootTown_BrendansHouse_1F_Text_1F815B, MSGBOX_DEFAULT closemessage compare VAR_0x8008, 0 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292CD6 + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292CD6 compare VAR_0x8008, 1 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292CEF + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292CEF playse SE_DOOR removeobject VAR_0x8009 setflag FLAG_0x123 delay 30 compare VAR_0x8008, 0 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292D48 + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292D48 compare VAR_0x8008, 1 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292D5D + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292D5D delay 20 msgbox LittlerootTown_BrendansHouse_1F_Text_1F81B9, MSGBOX_DEFAULT closemessage @@ -488,24 +488,24 @@ LittlerootTown_MaysHouse_1F_EventScript_292AF2:: @ 8292AF2 special TurnOnTVScreen delay 60 compare VAR_0x8008, 0 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292D72 + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292D72 compare VAR_0x8008, 1 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292D7D + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292D7D msgbox LittlerootTown_BrendansHouse_1F_Text_1F824B, MSGBOX_DEFAULT closemessage compare VAR_0x8008, 0 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292D1E + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292D1E compare VAR_0x8008, 1 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292D33 + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292D33 msgbox LittlerootTown_BrendansHouse_1F_Text_1F826F, MSGBOX_DEFAULT closemessage clearflag FLAG_SYS_TV_LATI setflag FLAG_0x0FF special TurnOffTVScreen compare VAR_0x8008, 0 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292D88 + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292D88 compare VAR_0x8008, 1 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292D9D + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292D9D msgbox LittlerootTown_BrendansHouse_1F_Text_1F8351, MSGBOX_DEFAULT multichoice 22, 8, 108, 1 copyvar VAR_0x8004, VAR_RESULT diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index c75bb8dbb..834fc38a2 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -492,7 +492,7 @@ LilycoveCity_ContestLobby_EventScript_293F28: @ 8293F28 LilycoveCity_ContestLobby_EventScript_293F64: @ 8293F64 msgbox LilycoveCity_ContestLobby_Text_2C43FA, MSGBOX_YESNO compare VAR_RESULT, 0 - call_if 1, LilycoveCity_ContestLobby_EventScript_293F85 + call_if_eq LilycoveCity_ContestLobby_EventScript_293F85 msgbox LilycoveCity_ContestLobby_Text_2C451B, MSGBOX_DEFAULT goto EventScript_StartBlending end diff --git a/data/scripts/secret_base.inc b/data/scripts/secret_base.inc index db471545d..ff5e53a06 100644 --- a/data/scripts/secret_base.inc +++ b/data/scripts/secret_base.inc @@ -1016,11 +1016,11 @@ SecretBase_RedCave1_EventScript_276286:: @ 8276286 special DoSpecialTrainerBattle waitstate compare VAR_RESULT, 3 - call_if 1, SecretBase_RedCave1_EventScript_2762BD + call_if_eq SecretBase_RedCave1_EventScript_2762BD compare VAR_RESULT, 1 - call_if 1, SecretBase_RedCave1_EventScript_2762C1 + call_if_eq SecretBase_RedCave1_EventScript_2762C1 compare VAR_RESULT, 2 - call_if 1, SecretBase_RedCave1_EventScript_2762C5 + call_if_eq SecretBase_RedCave1_EventScript_2762C5 special HealPlayerParty release end diff --git a/data/scripts/secret_power_tm.inc b/data/scripts/secret_power_tm.inc index 7116462c1..072d154f0 100644 --- a/data/scripts/secret_power_tm.inc +++ b/data/scripts/secret_power_tm.inc @@ -52,11 +52,11 @@ Route111_EventScript_27661E:: @ 827661E setflag FLAG_0x060 clearflag FLAG_HIDE_SLATEPORT_CITY_TM_SALESMAN compare VAR_FACING, 3 - call_if 1, Route111_EventScript_27666A + call_if_eq Route111_EventScript_27666A compare VAR_FACING, 4 - call_if 1, Route111_EventScript_27666A + call_if_eq Route111_EventScript_27666A compare VAR_FACING, 2 - call_if 1, Route111_EventScript_276675 + call_if_eq Route111_EventScript_276675 removeobject VAR_LAST_TALKED release end |