diff options
| author | Melody <melody@pallet.town> | 2018-12-21 20:28:24 -0500 |
|---|---|---|
| committer | Melody <melody@pallet.town> | 2018-12-21 20:28:24 -0500 |
| commit | ac2e4adf2da2f30a741556e20e5bc9a494997581 (patch) | |
| tree | 1a05a202cfece044d546094581d8463a9b6e452c | |
| parent | 87fd6b8dc21b37b656f16e3f11832c6951328750 (diff) | |
improve goto_if macros
273 files changed, 2555 insertions, 3036 deletions
diff --git a/asm/macros/event.inc b/asm/macros/event.inc index c815f3753..074a22443 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -1557,17 +1557,47 @@ @ Supplementary - .macro goto_eq dest:req + .macro goto_if_unset flag, dest + checkflag \flag + goto_if 0, \dest + .endm + + .macro goto_if_set flag, dest + checkflag \flag goto_if 1, \dest .endm + .macro goto_if_lt dest @ LESS THAN + goto_if 0, \dest + .endm + + .macro goto_if_eq dest @ EQUAL + goto_if 1, \dest + .endm + + .macro goto_if_gt dest @ GREATER THAN + goto_if 2, \dest + .endm + + .macro goto_if_le dest @ LESS THAN OR EQUAL + goto_if 3, \dest + .endm + + .macro goto_if_ge dest @ GREATER THAN OR EQUAL + goto_if 4, \dest + .endm + + .macro goto_if_ne dest @ NOT EQUAL + goto_if 5, \dest + .endm + .macro switch var:req copyvar 0x8000, \var .endm .macro case condition:req, dest:req compare 0x8000, \condition - goto_eq \dest + goto_if_eq \dest .endm @ Message box types diff --git a/data/event_scripts.s b/data/event_scripts.s index 557515c70..701056de4 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -450,8 +450,7 @@ EventScript_SecretBasePC:: @ 823B4BB EventScript_23B4D3:: @ 823B4D3 message Text_27681A waitmessage - checkflag FLAG_0x10C - goto_eq EventScript_23B4EF + goto_if_set FLAG_0x10C, EventScript_23B4EF goto EventScript_23B531 end @@ -482,7 +481,7 @@ EventScript_23B531:: @ 823B531 EventScript_23B568:: @ 823B568 msgbox Text_2766AA, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq EventScript_23B4D3 + goto_if_eq EventScript_23B4D3 closemessage special sub_80E9AC0 releaseall @@ -528,13 +527,13 @@ gUnknown_0823B5E9:: @ 823B5E9 EventScript_23B5F0:: @ 823B5F0 special sub_80E9BDC compare VAR_RESULT, 1 - goto_eq EventScript_23B62F + goto_if_eq EventScript_23B62F compare VAR_RESULT, 2 - goto_eq EventScript_23B652 + goto_if_eq EventScript_23B652 special sub_80E980C msgbox Text_276707, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq EventScript_23B5A1 + goto_if_eq EventScript_23B5A1 msgbox Text_2767D1, MSGBOX_SIGN special sub_80E9C2C special DoSecretBasePCTurnOffEffect @@ -544,7 +543,7 @@ EventScript_23B5F0:: @ 823B5F0 EventScript_23B62F:: @ 823B62F msgbox Text_276731, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq EventScript_23B5A1 + goto_if_eq EventScript_23B5A1 msgbox Text_2767E9, MSGBOX_SIGN special sub_80E9C2C special DoSecretBasePCTurnOffEffect @@ -594,13 +593,13 @@ EventScript_SecretBaseSandOrnament:: @ 823B684 EventScript_SecretBaseShieldOrToyTV:: @ 823B68C special GetShieldToyTVDecorationInfo compare VAR_RESULT, 0 - goto_eq EventScript_23B6BC + goto_if_eq EventScript_23B6BC compare VAR_RESULT, 1 - goto_eq EventScript_23B6C5 + goto_if_eq EventScript_23B6C5 compare VAR_RESULT, 2 - goto_eq EventScript_23B6CE + goto_if_eq EventScript_23B6CE compare VAR_RESULT, 3 - goto_eq EventScript_23B6D7 + goto_if_eq EventScript_23B6D7 end EventScript_23B6BC:: @ 823B6BC @@ -1167,11 +1166,11 @@ EventScript_WhiteOut:: @ 8271857 EventScript_271862:: @ 8271862 compare VAR_0x4096, 1 - goto_eq EverGrandeCity_HallOfFame_EventScript_271884 + goto_if_eq EverGrandeCity_HallOfFame_EventScript_271884 compare VAR_0x4096, 2 - goto_eq EverGrandeCity_HallOfFame_EventScript_27189A + goto_if_eq EverGrandeCity_HallOfFame_EventScript_27189A compare VAR_0x4096, 3 - goto_eq EverGrandeCity_HallOfFame_EventScript_2718B3 + goto_if_eq EverGrandeCity_HallOfFame_EventScript_2718B3 end EverGrandeCity_HallOfFame_EventScript_271884:: @ 8271884 @@ -1223,16 +1222,11 @@ PetalburgCity_PokemonCenter_1F_EventScript_2718DE:: @ 82718DE RustboroCity_PokemonCenter_1F_EventScript_2718DE:: @ 82718DE SlateportCity_PokemonCenter_1F_EventScript_2718DE:: @ 82718DE VerdanturfTown_PokemonCenter_1F_EventScript_2718DE:: @ 82718DE - checkflag FLAG_0x0BC - goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_27374E - checkflag FLAG_0x4F4 - goto_eq OldaleTown_PokemonCenter_1F_EventScript_27374E - checkflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT - goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_27190C - checkflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN - goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_271912 - checkflag FLAG_HIDE_ROUTE_108_MR_BRINEY - goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_271918 + goto_if_unset FLAG_0x0BC, OldaleTown_PokemonCenter_1F_EventScript_27374E + goto_if_set FLAG_0x4F4, OldaleTown_PokemonCenter_1F_EventScript_27374E + goto_if_unset FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT, OldaleTown_PokemonCenter_1F_EventScript_27190C + goto_if_unset FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN, OldaleTown_PokemonCenter_1F_EventScript_271912 + goto_if_unset FLAG_HIDE_ROUTE_108_MR_BRINEY, OldaleTown_PokemonCenter_1F_EventScript_271918 return OldaleTown_PokemonCenter_1F_EventScript_27190C:: @ 827190C @@ -1270,12 +1264,12 @@ VerdanturfTown_PokemonCenter_1F_EventScript_27191E:: @ 827191E setvar VAR_0x8004, 0 specialvar VAR_RESULT, sub_80C2E40 compare VAR_RESULT, 4 - goto_eq OldaleTown_PokemonCenter_1F_EventScript_271A68 + goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_271A68 msgbox gUnknown_082726EB, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq OldaleTown_PokemonCenter_1F_EventScript_27195A + goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_27195A compare VAR_RESULT, 0 - goto_eq OldaleTown_PokemonCenter_1F_EventScript_271954 + goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_271954 end OldaleTown_PokemonCenter_1F_EventScript_271954:: @ 8271954 @@ -1290,8 +1284,7 @@ OldaleTown_PokemonCenter_1F_EventScript_27195A:: @ 827195A call_if 1, OldaleTown_PokemonCenter_1F_EventScript_27198D waitmessage call OldaleTown_PokemonCenter_1F_EventScript_271993 - checkflag FLAG_0x111 - goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_271A43 + goto_if_unset FLAG_0x111, OldaleTown_PokemonCenter_1F_EventScript_271A43 goto OldaleTown_PokemonCenter_1F_EventScript_2719B1 end @@ -1316,18 +1309,18 @@ OldaleTown_PokemonCenter_1F_EventScript_271993:: @ 8271993 OldaleTown_PokemonCenter_1F_EventScript_2719B1:: @ 82719B1 specialvar VAR_RESULT, sub_8139ED0 compare VAR_RESULT, 0 - goto_eq OldaleTown_PokemonCenter_1F_EventScript_2719E2 + goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_2719E2 specialvar VAR_RESULT, sp182_move_string copyvar VAR_0x8008, VAR_RESULT compare VAR_0x8008, 0 - goto_eq OldaleTown_PokemonCenter_1F_EventScript_2719E2 + goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_2719E2 compare VAR_0x8008, 1 - goto_eq OldaleTown_PokemonCenter_1F_EventScript_271A19 + goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_271A19 end OldaleTown_PokemonCenter_1F_EventScript_2719E2:: @ 82719E2 compare VAR_0x8004, 1 - goto_eq OldaleTown_PokemonCenter_1F_EventScript_271A03 + goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_271A03 message gUnknown_08272798 waitmessage applymovement VAR_0x800B, OldaleTown_PokemonCenter_1F_Movement_271AD0 @@ -1344,8 +1337,7 @@ OldaleTown_PokemonCenter_1F_EventScript_271A03:: @ 8271A03 return OldaleTown_PokemonCenter_1F_EventScript_271A19:: @ 8271A19 - checkflag FLAG_0x880 - goto_eq OldaleTown_PokemonCenter_1F_EventScript_2719E2 + goto_if_set FLAG_0x880, OldaleTown_PokemonCenter_1F_EventScript_2719E2 msgbox gUnknown_08272798, MSGBOX_DEFAULT setflag FLAG_0x880 message OldaleTown_PokemonCenter_1F_Text_278A48 @@ -1358,9 +1350,9 @@ OldaleTown_PokemonCenter_1F_EventScript_271A19:: @ 8271A19 OldaleTown_PokemonCenter_1F_EventScript_271A43:: @ 8271A43 specialvar VAR_RESULT, IsPokerusInParty compare VAR_RESULT, 1 - goto_eq OldaleTown_PokemonCenter_1F_EventScript_271A5F + goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_271A5F compare VAR_RESULT, 0 - goto_eq OldaleTown_PokemonCenter_1F_EventScript_2719B1 + goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_2719B1 end OldaleTown_PokemonCenter_1F_EventScript_271A5F:: @ 8271A5F @@ -1369,8 +1361,7 @@ OldaleTown_PokemonCenter_1F_EventScript_271A5F:: @ 8271A5F return OldaleTown_PokemonCenter_1F_EventScript_271A68:: @ 8271A68 - checkflag FLAG_0x159 - goto_eq OldaleTown_PokemonCenter_1F_EventScript_271AAC + goto_if_set FLAG_0x159, OldaleTown_PokemonCenter_1F_EventScript_271AAC setflag FLAG_0x159 msgbox gUnknown_082727F5, MSGBOX_DEFAULT playse SE_PIN @@ -1380,14 +1371,14 @@ OldaleTown_PokemonCenter_1F_EventScript_271A68:: @ 8271A68 waitmovement 0 msgbox gUnknown_08272860, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq OldaleTown_PokemonCenter_1F_EventScript_271AC5 + goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_271AC5 message gUnknown_08272A07 return OldaleTown_PokemonCenter_1F_EventScript_271AAC:: @ 8271AAC msgbox gUnknown_08272982, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq OldaleTown_PokemonCenter_1F_EventScript_271AC5 + goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_271AC5 message gUnknown_08272A07 return @@ -1534,7 +1525,7 @@ EventScript_271C3A:: @ 8271C3A setvar VAR_0x8004, 12 special CallBattlePyramidFunction compare VAR_RESULT, 1 - goto_eq EventScript_271C86 + goto_if_eq EventScript_271C86 msgbox gUnknown_08272A9A, MSGBOX_DEFAULT return @@ -1566,9 +1557,9 @@ EventScript_HiddenItemScript:: @ 8271CB7 checkitemtype VAR_0x8005 call EventScript_271B08 compare VAR_0x8007, 1 - goto_eq EventScript_271CE8 + goto_if_eq EventScript_271CE8 compare VAR_0x8007, 0 - goto_eq EventScript_271D47 + goto_if_eq EventScript_271D47 end EventScript_271CE8:: @ 8271CE8 @@ -1576,9 +1567,9 @@ EventScript_271CE8:: @ 8271CE8 copyvar VAR_0x8004, VAR_0x8005 specialvar VAR_RESULT, sub_81398C0 compare VAR_RESULT, 1 - goto_eq EventScript_271D0E + goto_if_eq EventScript_271D0E compare VAR_RESULT, 0 - goto_eq EventScript_271D1F + goto_if_eq EventScript_271D1F end EventScript_271D0E:: @ 8271D0E @@ -1615,9 +1606,9 @@ EventScript_271D5E:: @ 8271D5E faceplayer msgbox Text_27260D, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq EventScript_271D83 + goto_if_eq EventScript_271D83 compare VAR_RESULT, 0 - goto_eq EventScript_271D89 + goto_if_eq EventScript_271D89 goto EventScript_271D89 EventScript_271D83:: @ 8271D83 @@ -1695,8 +1686,7 @@ EventScript_271E47:: @ 8271E47 end EventScript_271E54:: @ 8271E54 - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, EventScript_271E47 + goto_if_unset FLAG_SYS_GAME_CLEAR, EventScript_271E47 playse SE_PC_LOGIN special AccessHallOfFamePC waitstate @@ -1777,13 +1767,13 @@ Route109_EventScript_271E95:: @ 8271E95 EventScript_UseSurf:: @ 8271EA0 checkpartymove MOVE_SURF compare VAR_RESULT, 6 - goto_eq EventScript_271ED6 + goto_if_eq EventScript_271ED6 bufferpartymonnick 0, VAR_RESULT setfieldeffectargument 0, VAR_RESULT lockall msgbox gUnknown_08272FD6, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq EventScript_271ED5 + goto_if_eq EventScript_271ED5 msgbox gUnknown_0827300D, MSGBOX_DEFAULT dofieldeffect FLDEFF_USE_SURF @@ -1806,9 +1796,9 @@ Route119_EventScript_271ED7:: @ 8271ED7 RustboroCity_EventScript_271ED7:: @ 8271ED7 checkplayergender compare VAR_RESULT, 0 - goto_eq RustboroCity_EventScript_271EEF + goto_if_eq RustboroCity_EventScript_271EEF compare VAR_RESULT, 1 - goto_eq RustboroCity_EventScript_271EF5 + goto_if_eq RustboroCity_EventScript_271EF5 end RustboroCity_EventScript_271EEF:: @ 8271EEF @@ -1824,9 +1814,9 @@ Route110_EventScript_271EFB:: @ 8271EFB Route119_EventScript_271EFB:: @ 8271EFB checkplayergender compare VAR_RESULT, 0 - goto_eq LavaridgeTown_EventScript_271F13 + goto_if_eq LavaridgeTown_EventScript_271F13 compare VAR_RESULT, 1 - goto_eq LavaridgeTown_EventScript_271F19 + goto_if_eq LavaridgeTown_EventScript_271F19 end LavaridgeTown_EventScript_271F13:: @ 8271F13 @@ -1840,9 +1830,9 @@ LavaridgeTown_EventScript_271F19:: @ 8271F19 EventScript_271F1F:: @ 8271F1F checkplayergender compare VAR_RESULT, 0 - goto_eq EventScript_271F37 + goto_if_eq EventScript_271F37 compare VAR_RESULT, 1 - goto_eq EventScript_271F3D + goto_if_eq EventScript_271F3D end EventScript_271F37:: @ 8271F37 @@ -2100,9 +2090,8 @@ LittlerootTown_ProfessorBirchsLab_EventScript_2720AD:: @ 82720AD Route101_EventScript_2720AD:: @ 82720AD Route103_EventScript_2720AD:: @ 82720AD compare VAR_0x4085, 0 - goto_eq Route101_EventScript_27374E - checkflag FLAG_SYS_GAME_CLEAR - goto_eq Route101_EventScript_27211A + 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 compare VAR_BIRCH_STATE, 1 @@ -2147,15 +2136,13 @@ Route101_EventScript_272141:: @ 8272141 Route103_EventScript_272141:: @ 8272141 lock faceplayer - checkflag FLAG_HAS_MATCH_CALL - goto_if 0, Route101_EventScript_272155 - checkflag FLAG_0x119 - goto_if 0, Route101_EventScript_1FA2D2 + goto_if_unset FLAG_HAS_MATCH_CALL, Route101_EventScript_272155 + goto_if_unset FLAG_0x119, Route101_EventScript_1FA2D2 Route101_EventScript_272155:: @ 8272155 msgbox gUnknown_082A5C9C, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq Route101_EventScript_27216F + goto_if_eq Route101_EventScript_27216F call Route101_EventScript_272184 release end @@ -2184,7 +2171,7 @@ Route101_EventScript_272184:: @ 8272184 msgbox gUnknown_082A5D2C, MSGBOX_DEFAULT call Route101_EventScript_272179 compare VAR_0x800A, 0 - goto_eq Route101_EventScript_27374E + goto_if_eq Route101_EventScript_27374E setvar VAR_0x8004, 1 specialvar VAR_RESULT, ScriptGetPokedexInfo copyvar VAR_0x8008, VAR_0x8005 @@ -2363,7 +2350,7 @@ Route119_EventScript_272336:: @ 8272336 Route120_EventScript_272336:: @ 8272336 checkitem ITEM_DEVON_SCOPE, 1 compare VAR_RESULT, 1 - goto_eq Route119_EventScript_272350 + goto_if_eq Route119_EventScript_272350 msgbox Route119_Text_1F5D00, MSGBOX_DEFAULT release end @@ -2371,7 +2358,7 @@ Route120_EventScript_272336:: @ 8272336 Route119_EventScript_272350:: @ 8272350 msgbox Route119_Text_1F5D23, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq Route119_EventScript_272365 + goto_if_eq Route119_EventScript_272365 release end @@ -2392,11 +2379,11 @@ Route119_EventScript_272365:: @ 8272365 clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 1 - goto_eq Route119_EventScript_2723C1 + goto_if_eq Route119_EventScript_2723C1 compare VAR_RESULT, 4 - goto_eq Route119_EventScript_2723C1 + goto_if_eq Route119_EventScript_2723C1 compare VAR_RESULT, 5 - goto_eq Route119_EventScript_2723C1 + goto_if_eq Route119_EventScript_2723C1 release end @@ -3199,9 +3186,9 @@ EventScript_Poison:: @ 82736BC special ExecuteWhiteOut waitstate compare VAR_RESULT, 1 - goto_eq EventScript_2736D9 + goto_if_eq EventScript_2736D9 compare VAR_RESULT, 2 - goto_eq EventScript_2736F8 + goto_if_eq EventScript_2736F8 releaseall end @@ -3229,17 +3216,17 @@ EventScript_2736F8:: @ 82736F8 setvar VAR_0x8004, 16 special CallBattlePikeFunction compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4222 + goto_if_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4222 setvar VAR_0x8004, 12 special CallBattlePyramidFunction compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattlePyramidTop_EventScript_252B42 + goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42 compare VAR_RESULT, 2 - goto_eq BattleFrontier_BattlePyramidTop_EventScript_252B42 + goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42 setvar VAR_0x8004, 10 special sp194_trainer_tower compare VAR_RESULT, 1 - goto_eq TrainerHill_1F_EventScript_2C83C9 + goto_if_eq TrainerHill_1F_EventScript_2C83C9 special sub_80B05B4 waitstate fadescreen 1 @@ -3406,7 +3393,7 @@ RustboroCity_DevonCorp_2F_EventScript_2737A0:: @ 82737A0 LittlerootTown_ProfessorBirchsLab_EventScript_2737BB:: @ 82737BB specialvar VAR_RESULT, sub_813B21C compare VAR_RESULT, 1 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_2737D4 + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_2737D4 msgbox gText_PkmnTransferredSomeonesPC, MSGBOX_DEFAULT return @@ -3419,7 +3406,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_2737D4:: @ 82737D4 LittlerootTown_ProfessorBirchsLab_EventScript_2737E6:: @ 82737E6 specialvar VAR_RESULT, sub_813B21C compare VAR_RESULT, 1 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_2737FF + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_2737FF msgbox gText_PkmnTransferredLanettesPC, MSGBOX_DEFAULT return @@ -3441,27 +3428,25 @@ EventScript_Questionnaire:: @ 827381B lockall msgbox gUnknown_0827339F, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq EventScript_2738FD + goto_if_eq EventScript_2738FD setvar VAR_0x8004, 20 call MauvilleCity_PokemonCenter_1F_EventScript_271E7C lock faceplayer specialvar VAR_0x8008, sub_813B490 compare VAR_0x8004, 1 - goto_eq EventScript_27386D + goto_if_eq EventScript_27386D compare VAR_0x8004, 2 - goto_eq EventScript_2738B5 + goto_if_eq EventScript_2738B5 compare VAR_RESULT, 0 - goto_eq EventScript_2738FD + goto_if_eq EventScript_2738FD compare VAR_RESULT, 1 - goto_eq EventScript_2738FF + goto_if_eq EventScript_2738FF end EventScript_27386D:: @ 827386D - checkflag FLAG_SYS_POKEDEX_GET - goto_if 0, EventScript_2738FF - checkflag FLAG_SYS_MYSTERY_EVENT_ENABLE - goto_eq EventScript_2738FF + goto_if_unset FLAG_SYS_POKEDEX_GET, EventScript_2738FF + goto_if_set FLAG_SYS_MYSTERY_EVENT_ENABLE, EventScript_2738FF applymovement VAR_0x8008, BattleFrontier_Mart_Movement_2725B0 waitmovement 0 playse SE_PIN @@ -3476,10 +3461,8 @@ EventScript_27386D:: @ 827386D end EventScript_2738B5:: @ 82738B5 - checkflag FLAG_SYS_POKEDEX_GET - goto_if 0, EventScript_2738FF - checkflag FLAG_SYS_MYSTERY_GIFT_ENABLE - goto_eq EventScript_2738FF + goto_if_unset FLAG_SYS_POKEDEX_GET, EventScript_2738FF + goto_if_set FLAG_SYS_MYSTERY_GIFT_ENABLE, EventScript_2738FF applymovement VAR_0x8008, BattleFrontier_Mart_Movement_2725B0 waitmovement 0 playse SE_PIN @@ -3694,7 +3677,7 @@ gUnknown_08273D1F:: @ 8273D1F gUnknown_08273D1F:: @ 8273D1F lockall compare VAR_0x4037, 9 - goto_if 4, Route105_EventScript_273D51 + goto_if_ge Route105_EventScript_273D51 goto Route105_EventScript_273D5F end @@ -3964,7 +3947,7 @@ Std_RegisteredInMatchCall:: @ 82742C9 EventScript_TryGetTrainerScript:: @ 82742E6 special ShouldTryGetTrainerScript compare VAR_RESULT, 1 - goto_eq EventScript_GotoTrainerScript + goto_if_eq EventScript_GotoTrainerScript releaseall end @@ -4263,13 +4246,13 @@ SlateportCity_PokemonFanClub_EventScript_28C7F0:: @ 828C7F0 setvar VAR_0x8005, 1 special InterviewBefore compare VAR_RESULT, 1 - goto_eq SlateportCity_PokemonFanClub_EventScript_28C879 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_28C879 copyvar VAR_0x8009, VAR_0x8006 msgbox SlateportCity_PokemonFanClub_Text_280674, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq SlateportCity_PokemonFanClub_EventScript_28C827 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_28C827 compare VAR_RESULT, 0 - goto_eq SlateportCity_PokemonFanClub_EventScript_28C85C + goto_if_eq SlateportCity_PokemonFanClub_EventScript_28C85C end SlateportCity_PokemonFanClub_EventScript_28C827:: @ 828C827 @@ -4281,9 +4264,9 @@ SlateportCity_PokemonFanClub_EventScript_28C827:: @ 828C827 lock faceplayer compare VAR_RESULT, 1 - goto_eq SlateportCity_PokemonFanClub_EventScript_28C866 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_28C866 compare VAR_RESULT, 0 - goto_eq SlateportCity_PokemonFanClub_EventScript_28C85C + goto_if_eq SlateportCity_PokemonFanClub_EventScript_28C85C end SlateportCity_PokemonFanClub_EventScript_28C85C:: @ 828C85C @@ -4308,24 +4291,23 @@ SlateportCity_OceanicMuseum_1F_EventScript_28C883:: @ 828C883 setvar VAR_0x8005, 2 special InterviewBefore compare VAR_RESULT, 1 - goto_eq SlateportCity_OceanicMuseum_1F_EventScript_28C939 + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_28C939 copyvar VAR_0x8009, VAR_0x8006 - checkflag FLAG_0x069 - goto_eq SlateportCity_OceanicMuseum_1F_EventScript_28C8C8 + goto_if_set FLAG_0x069, SlateportCity_OceanicMuseum_1F_EventScript_28C8C8 setflag FLAG_0x069 msgbox SlateportCity_OceanicMuseum_1F_Text_2811A0, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq SlateportCity_OceanicMuseum_1F_EventScript_28C8E7 + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_28C8E7 compare VAR_RESULT, 0 - goto_eq SlateportCity_OceanicMuseum_1F_EventScript_28C91C + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_28C91C end SlateportCity_OceanicMuseum_1F_EventScript_28C8C8:: @ 828C8C8 msgbox SlateportCity_OceanicMuseum_1F_Text_28126D, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq SlateportCity_OceanicMuseum_1F_EventScript_28C8E7 + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_28C8E7 compare VAR_RESULT, 0 - goto_eq SlateportCity_OceanicMuseum_1F_EventScript_28C91C + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_28C91C end SlateportCity_OceanicMuseum_1F_EventScript_28C8E7:: @ 828C8E7 @@ -4337,9 +4319,9 @@ SlateportCity_OceanicMuseum_1F_EventScript_28C8E7:: @ 828C8E7 lock faceplayer compare VAR_RESULT, 1 - goto_eq SlateportCity_OceanicMuseum_1F_EventScript_28C926 + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_28C926 compare VAR_RESULT, 0 - goto_eq SlateportCity_OceanicMuseum_1F_EventScript_28C91C + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_28C91C end SlateportCity_OceanicMuseum_1F_EventScript_28C91C:: @ 828C91C @@ -4363,17 +4345,17 @@ SlateportCity_PokemonFanClub_EventScript_28C943:: @ 828C943 faceplayer specialvar VAR_RESULT, sub_80EF8F8 compare VAR_RESULT, 0 - goto_eq SlateportCity_PokemonFanClub_EventScript_28C7F0 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_28C7F0 setvar VAR_0x8005, 3 special InterviewBefore compare VAR_RESULT, 1 - goto_eq SlateportCity_PokemonFanClub_EventScript_28CA4F + goto_if_eq SlateportCity_PokemonFanClub_EventScript_28CA4F copyvar VAR_0x8009, VAR_0x8006 msgbox SlateportCity_PokemonFanClub_Text_280270, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq SlateportCity_PokemonFanClub_EventScript_28C98C + goto_if_eq SlateportCity_PokemonFanClub_EventScript_28C98C compare VAR_RESULT, 0 - goto_eq SlateportCity_PokemonFanClub_EventScript_28CA45 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_28CA45 end SlateportCity_PokemonFanClub_EventScript_28C98C:: @ 828C98C @@ -4409,14 +4391,14 @@ SlateportCity_PokemonFanClub_EventScript_28C9ED:: @ 828C9ED lock faceplayer compare VAR_RESULT, 0 - goto_eq SlateportCity_PokemonFanClub_EventScript_28CA45 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_28CA45 msgbox SlateportCity_PokemonFanClub_Text_2804AC, MSGBOX_DEFAULT setvar VAR_0x8006, 1 call SlateportCity_PokemonFanClub_EventScript_271E7C lock faceplayer compare VAR_RESULT, 0 - goto_eq SlateportCity_PokemonFanClub_EventScript_28CA45 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_28CA45 msgbox SlateportCity_PokemonFanClub_Text_280523, MSGBOX_DEFAULT copyvar VAR_0x8007, VAR_0x800A setvar VAR_0x8005, 3 @@ -4436,18 +4418,17 @@ SlateportCity_PokemonFanClub_EventScript_28CA4F:: @ 828CA4F LilycoveCity_ContestLobby_EventScript_28CA59:: @ 828CA59 lock faceplayer - checkflag FLAG_TEMP_2 - goto_eq LilycoveCity_ContestLobby_EventScript_28CB21 + goto_if_set FLAG_TEMP_2, LilycoveCity_ContestLobby_EventScript_28CB21 setvar VAR_0x8005, 6 special InterviewBefore compare VAR_RESULT, 1 - goto_eq LilycoveCity_ContestLobby_EventScript_28CB21 + goto_if_eq LilycoveCity_ContestLobby_EventScript_28CB21 copyvar VAR_0x8009, VAR_0x8006 msgbox LilycoveCity_ContestLobby_Text_27EF15, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq LilycoveCity_ContestLobby_EventScript_28CA9B + goto_if_eq LilycoveCity_ContestLobby_EventScript_28CA9B compare VAR_RESULT, 0 - goto_eq LilycoveCity_ContestLobby_EventScript_28CAD0 + goto_if_eq LilycoveCity_ContestLobby_EventScript_28CAD0 end LilycoveCity_ContestLobby_EventScript_28CA9B:: @ 828CA9B @@ -4459,9 +4440,9 @@ LilycoveCity_ContestLobby_EventScript_28CA9B:: @ 828CA9B lock faceplayer compare VAR_RESULT, 1 - goto_eq LilycoveCity_ContestLobby_EventScript_28CADA + goto_if_eq LilycoveCity_ContestLobby_EventScript_28CADA compare VAR_RESULT, 0 - goto_eq LilycoveCity_ContestLobby_EventScript_28CAD0 + goto_if_eq LilycoveCity_ContestLobby_EventScript_28CAD0 end LilycoveCity_ContestLobby_EventScript_28CAD0:: @ 828CAD0 @@ -4480,7 +4461,7 @@ LilycoveCity_ContestLobby_EventScript_28CADA:: @ 828CADA lock faceplayer compare VAR_RESULT, 0 - goto_eq LilycoveCity_ContestLobby_EventScript_28CAD0 + goto_if_eq LilycoveCity_ContestLobby_EventScript_28CAD0 msgbox LilycoveCity_ContestLobby_Text_27F0EC, MSGBOX_DEFAULT setflag FLAG_TEMP_2 setvar VAR_0x8005, 6 @@ -4494,11 +4475,11 @@ LilycoveCity_ContestLobby_EventScript_28CB21:: @ 828CB21 LilycoveCity_ContestLobby_EventScript_28CB2B:: @ 828CB2B compare VAR_0x4086, 2 - goto_if 5, LilycoveCity_ContestLobby_EventScript_28CB95 + goto_if_ne LilycoveCity_ContestLobby_EventScript_28CB95 setvar VAR_0x8005, 6 special InterviewBefore compare VAR_RESULT, 1 - goto_eq LilycoveCity_ContestLobby_EventScript_28CB95 + goto_if_eq LilycoveCity_ContestLobby_EventScript_28CB95 switch VAR_0x4088 case 0, LilycoveCity_ContestLobby_EventScript_28CB95 case 2, LilycoveCity_ContestLobby_EventScript_28CB91 @@ -4518,18 +4499,17 @@ LilycoveCity_ContestLobby_EventScript_28CB95:: @ 828CB95 BattleFrontier_BattleTowerLobby_EventScript_28CB96:: @ 828CB96 lock faceplayer - checkflag FLAG_TEMP_2 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_28CC7A + goto_if_set FLAG_TEMP_2, BattleFrontier_BattleTowerLobby_EventScript_28CC7A setvar VAR_0x8005, 7 special InterviewBefore compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_28CC7A + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC7A copyvar VAR_0x8009, VAR_0x8006 msgbox BattleFrontier_BattleTowerLobby_Text_27F704, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_28CBD8 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CBD8 compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_28CC2E + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC2E end BattleFrontier_BattleTowerLobby_EventScript_28CBD8:: @ 828CBD8 @@ -4548,9 +4528,9 @@ BattleFrontier_BattleTowerLobby_EventScript_28CBD8:: @ 828CBD8 lock faceplayer compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_28CC4A + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC4A compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_28CC70 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC70 end BattleFrontier_BattleTowerLobby_EventScript_28CC2E:: @ 828CC2E @@ -4568,7 +4548,7 @@ BattleFrontier_BattleTowerLobby_EventScript_28CC41:: @ 828CC41 BattleFrontier_BattleTowerLobby_EventScript_28CC4A:: @ 828CC4A compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_28CC70 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC70 msgbox BattleFrontier_BattleTowerLobby_Text_27F9FD, MSGBOX_DEFAULT setflag FLAG_TEMP_2 copyvar VAR_0x8004, VAR_0x8008 @@ -4588,11 +4568,11 @@ BattleFrontier_BattleTowerLobby_EventScript_28CC7A:: @ 828CC7A BattleFrontier_BattleTowerLobby_EventScript_28CC84:: @ 828CC84 compare VAR_0x40BC, 0 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_28CCA6 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CCA6 setvar VAR_0x8005, 7 special InterviewBefore compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_28CCA6 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CCA6 clearflag FLAG_HIDE_BATTLE_TOWER_REPORTER return @@ -4698,11 +4678,11 @@ Text_RepelWoreOff: @ 82A4B33 MauvilleCity_GameCorner_EventScript_2A5AB1:: @ 82A5AB1 checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_210456 + goto_if_eq MauvilleCity_GameCorner_EventScript_210456 setvar VAR_0x8004, 0 getpricereduction 2 compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_2A5B0D + goto_if_eq MauvilleCity_GameCorner_EventScript_2A5B0D addvar VAR_0x8004, 128 goto MauvilleCity_GameCorner_EventScript_2A5B0D end @@ -4710,11 +4690,11 @@ MauvilleCity_GameCorner_EventScript_2A5AB1:: @ 82A5AB1 MauvilleCity_GameCorner_EventScript_2A5ADF:: @ 82A5ADF checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_210456 + goto_if_eq MauvilleCity_GameCorner_EventScript_210456 setvar VAR_0x8004, 1 getpricereduction 2 compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_2A5B0D + goto_if_eq MauvilleCity_GameCorner_EventScript_2A5B0D addvar VAR_0x8004, 128 goto MauvilleCity_GameCorner_EventScript_2A5B0D end @@ -4816,11 +4796,11 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A8395:: @ 82A8395 msgbox LilycoveCity_PokemonCenter_1F_Text_2A8A69, MSGBOX_DEFAULT specialvar VAR_RESULT, sub_818DBE8 compare VAR_RESULT, 0 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A83D0 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A83D0 compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A83C6 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A83C6 compare VAR_RESULT, 2 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8510 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8510 end LilycoveCity_PokemonCenter_1F_EventScript_2A83C6:: @ 82A83C6 @@ -4833,9 +4813,9 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A83D0:: @ 82A83D0 msgbox LilycoveCity_PokemonCenter_1F_Text_2A8A7D, MSGBOX_DEFAULT specialvar VAR_RESULT, sub_818DC60 compare VAR_RESULT, 0 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8435 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8435 compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A83F7 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A83F7 end LilycoveCity_PokemonCenter_1F_EventScript_2A83F7:: @ 82A83F7 @@ -4843,9 +4823,9 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A83F7:: @ 82A83F7 special sub_818DD14 specialvar VAR_RESULT, sub_818DD54 compare VAR_RESULT, 0 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8419 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8419 compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8427 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8427 end LilycoveCity_PokemonCenter_1F_EventScript_2A8419:: @ 82A8419 @@ -4861,9 +4841,9 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A8427:: @ 82A8427 LilycoveCity_PokemonCenter_1F_EventScript_2A8435:: @ 82A8435 msgbox LilycoveCity_PokemonCenter_1F_Text_2A8B69, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8454 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8454 compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A845E + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A845E end LilycoveCity_PokemonCenter_1F_EventScript_2A8454:: @ 82A8454 @@ -4882,25 +4862,25 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A846C:: @ 82A846C special sub_818DD78 waitstate compare VAR_RESULT, 0 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A848E + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A848E compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A84AD + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A84AD end LilycoveCity_PokemonCenter_1F_EventScript_2A848E:: @ 82A848E msgbox LilycoveCity_PokemonCenter_1F_Text_2A8BEE, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8454 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8454 compare VAR_RESULT, 0 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A846C + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A846C end LilycoveCity_PokemonCenter_1F_EventScript_2A84AD:: @ 82A84AD specialvar VAR_RESULT, sub_818DE44 compare VAR_RESULT, 0 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A84C9 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A84C9 compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A84D6 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A84D6 end LilycoveCity_PokemonCenter_1F_EventScript_2A84C9:: @ 82A84C9 @@ -4912,9 +4892,9 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A84C9:: @ 82A84C9 LilycoveCity_PokemonCenter_1F_EventScript_2A84D6:: @ 82A84D6 specialvar VAR_RESULT, sub_818DE5C compare VAR_RESULT, 0 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A84F2 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A84F2 compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A84FF + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A84FF end LilycoveCity_PokemonCenter_1F_EventScript_2A84F2:: @ 82A84F2 @@ -4935,9 +4915,9 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A8510:: @ 82A8510 msgbox LilycoveCity_PokemonCenter_1F_Text_2A8D5D, MSGBOX_DEFAULT giveitem_std VAR_0x8004 compare VAR_RESULT, 0 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8545 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8545 compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A854F + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A854F end LilycoveCity_PokemonCenter_1F_EventScript_2A8545:: @ 82A8545 @@ -4956,29 +4936,29 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A8554:: @ 82A8554 msgbox LilycoveCity_PokemonCenter_1F_Text_2A8E2B, MSGBOX_DEFAULT specialvar VAR_RESULT, sub_818E038 compare VAR_RESULT, 0 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8585 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8585 compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A85AC + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A85AC compare VAR_RESULT, 2 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A86EC + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A86EC end LilycoveCity_PokemonCenter_1F_EventScript_2A8585:: @ 82A8585 specialvar VAR_RESULT, sub_818E06C compare VAR_RESULT, 0 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A85C8 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A85C8 compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A85D2 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A85D2 compare VAR_RESULT, 2 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A85E0 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A85E0 end LilycoveCity_PokemonCenter_1F_EventScript_2A85AC:: @ 82A85AC specialvar VAR_RESULT, sub_818E2D8 compare VAR_RESULT, 0 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8759 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8759 compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A85C8 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A85C8 end LilycoveCity_PokemonCenter_1F_EventScript_2A85C8:: @ 82A85C8 @@ -5000,9 +4980,9 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A85EE:: @ 82A85EE setvar VAR_0x8004, 0 msgbox LilycoveCity_PokemonCenter_1F_Text_2A8EEC, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A861C + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A861C compare VAR_RESULT, 0 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8612 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8612 end LilycoveCity_PokemonCenter_1F_EventScript_2A8612:: @ 82A8612 @@ -5013,15 +4993,15 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A8612:: @ 82A8612 LilycoveCity_PokemonCenter_1F_EventScript_2A861C:: @ 82A861C special sub_818E3BC compare VAR_0x8004, 0 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A864C + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A864C compare VAR_0x8004, 15 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8656 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8656 LilycoveCity_PokemonCenter_1F_EventScript_2A8635:: @ 82A8635 compare VAR_RESULT, 0 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8660 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8660 compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8689 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8689 end LilycoveCity_PokemonCenter_1F_EventScript_2A864C:: @ 82A864C @@ -5039,9 +5019,9 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A8656:: @ 82A8656 LilycoveCity_PokemonCenter_1F_EventScript_2A8660:: @ 82A8660 msgbox LilycoveCity_PokemonCenter_1F_Text_2A8F7E, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A867F + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A867F compare VAR_RESULT, 0 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A861C + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A861C end LilycoveCity_PokemonCenter_1F_EventScript_2A867F:: @ 82A867F @@ -5054,9 +5034,9 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A8689:: @ 82A8689 msgbox LilycoveCity_PokemonCenter_1F_Text_2A8F4D, MSGBOX_DEFAULT specialvar VAR_RESULT, sub_818E308 compare VAR_RESULT, 0 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A86C7 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A86C7 compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A86B0 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A86B0 end LilycoveCity_PokemonCenter_1F_EventScript_2A86B0:: @ 82A86B0 @@ -5081,9 +5061,9 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A86C7:: @ 82A86C7 LilycoveCity_PokemonCenter_1F_EventScript_2A86EC:: @ 82A86EC specialvar VAR_RESULT, sub_818E298 compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8708 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8708 compare VAR_RESULT, 0 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8716 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8716 end LilycoveCity_PokemonCenter_1F_EventScript_2A8708:: @ 82A8708 @@ -5102,7 +5082,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A8724:: @ 82A8724 special sub_818E37C giveitem_std VAR_0x8005 compare VAR_RESULT, 0 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A874C + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A874C goto LilycoveCity_PokemonCenter_1F_EventScript_2A8759 end @@ -5115,9 +5095,9 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A874C:: @ 82A874C LilycoveCity_PokemonCenter_1F_EventScript_2A8759:: @ 82A8759 msgbox LilycoveCity_PokemonCenter_1F_Text_2A90FB, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8785 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8785 compare VAR_RESULT, 0 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8778 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8778 end LilycoveCity_PokemonCenter_1F_EventScript_2A8778:: @ 82A8778 @@ -5135,17 +5115,17 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A878D:: @ 82A878D special sub_818E3E0 waitstate compare VAR_RESULT, 0 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A87AF + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A87AF compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A87CE + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A87CE end LilycoveCity_PokemonCenter_1F_EventScript_2A87AF:: @ 82A87AF msgbox LilycoveCity_PokemonCenter_1F_Text_2A9212, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8778 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8778 compare VAR_RESULT, 0 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A878D + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A878D end LilycoveCity_PokemonCenter_1F_EventScript_2A87CE:: @ 82A87CE @@ -5159,16 +5139,16 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A87E1:: @ 82A87E1 special sub_818E47C waitstate compare VAR_RESULT, 0 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A87F8 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A87F8 goto LilycoveCity_PokemonCenter_1F_EventScript_2A8817 end LilycoveCity_PokemonCenter_1F_EventScript_2A87F8:: @ 82A87F8 msgbox LilycoveCity_PokemonCenter_1F_Text_2A92D3, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8778 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8778 compare VAR_RESULT, 0 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A87E1 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A87E1 end LilycoveCity_PokemonCenter_1F_EventScript_2A8817:: @ 82A8817 @@ -5185,17 +5165,17 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A882A:: @ 82A882A msgbox LilycoveCity_PokemonCenter_1F_Text_2A93A7, MSGBOX_DEFAULT specialvar VAR_RESULT, sub_818E8B4 compare VAR_RESULT, 0 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8850 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8850 compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A886C + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A886C end LilycoveCity_PokemonCenter_1F_EventScript_2A8850:: @ 82A8850 specialvar VAR_RESULT, sub_818E8E0 compare VAR_RESULT, 0 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8876 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8876 compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A886C + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A886C end LilycoveCity_PokemonCenter_1F_EventScript_2A886C:: @ 82A886C @@ -5208,12 +5188,12 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A8876:: @ 82A8876 msgbox LilycoveCity_PokemonCenter_1F_Text_2A93F4, MSGBOX_DEFAULT checkitem ITEM_POKEBLOCK_CASE, 1 compare VAR_RESULT, 0 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A89AE + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A89AE msgbox LilycoveCity_PokemonCenter_1F_Text_2A94E8, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A88B0 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A88B0 compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A88BA + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A88BA end LilycoveCity_PokemonCenter_1F_EventScript_2A88B0:: @ 82A88B0 @@ -5226,17 +5206,17 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A88BA:: @ 82A88BA special sub_818E92C waitstate compare VAR_RESULT, 65535 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A88D7 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A88D7 compare VAR_RESULT, 65535 - goto_if 5, LilycoveCity_PokemonCenter_1F_EventScript_2A88F6 + goto_if_ne LilycoveCity_PokemonCenter_1F_EventScript_2A88F6 end LilycoveCity_PokemonCenter_1F_EventScript_2A88D7:: @ 82A88D7 msgbox LilycoveCity_PokemonCenter_1F_Text_2A9537, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A88B0 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A88B0 compare VAR_RESULT, 0 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A88BA + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A88BA end LilycoveCity_PokemonCenter_1F_EventScript_2A88F6:: @ 82A88F6 @@ -5258,7 +5238,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A890A:: @ 82A890A delay 120 waitmoncry compare VAR_0x8004, 1 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A893F + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A893F goto LilycoveCity_PokemonCenter_1F_EventScript_2A894C end @@ -5272,9 +5252,9 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A894C:: @ 82A894C waitmovement 0 delay 60 compare VAR_0x8004, 0 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8970 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8970 compare VAR_0x8004, 1 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A897E + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A897E end LilycoveCity_PokemonCenter_1F_EventScript_2A8970:: @ 82A8970 @@ -5291,7 +5271,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A897E:: @ 82A897E LilycoveCity_PokemonCenter_1F_EventScript_2A898F:: @ 82A898F specialvar VAR_RESULT, sub_818E8E0 compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A89A1 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A89A1 release end @@ -5336,15 +5316,15 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A89C7:: @ 82A89C7 special sub_818E914 special sub_818E960 compare VAR_RESULT, 0 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8A0A + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8A0A compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8A1D + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8A1D compare VAR_RESULT, 2 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8A30 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8A30 compare VAR_RESULT, 3 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8A43 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8A43 compare VAR_RESULT, 4 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8A56 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8A56 end LilycoveCity_PokemonCenter_1F_EventScript_2A8A0A:: @ 82A8A0A @@ -9008,13 +8988,13 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EE8:: @ 82C3EE8 setvar VAR_0x8004, 5 special CallBattlePikeFunction compare VAR_RESULT, 3 - goto_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F35 + goto_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F35 compare VAR_RESULT, 6 - goto_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F35 + goto_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F35 compare VAR_RESULT, 7 - goto_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F35 + goto_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F35 compare VAR_RESULT, 8 - goto_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F3F + goto_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F3F hideobjectat 2, MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1 setvar VAR_TEMP_4, 1 turnobject 255, 2 @@ -9246,9 +9226,9 @@ BattleFrontier_BattlePikeThreePathRoom_MapScript1_2C423E: @ 82C423E setvar VAR_0x8005, 0 special CallFrontierUtilFunc compare VAR_RESULT, 2 - goto_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_2C426B + goto_if_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_2C426B compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_2C426B + goto_if_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_2C426B call BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4271 BattleFrontier_BattlePikeThreePathRoom_EventScript_2C426B:: @ 82C426B @@ -10084,19 +10064,18 @@ PacifidlogTown_PokemonCenter_1F_Text_2C7E7A: @ 82C7E7A SlateportCity_PokemonFanClub_EventScript_2C7F16:: @ 82C7F16 lock faceplayer - checkflag FLAG_0x1B1 - goto_eq SlateportCity_PokemonFanClub_EventScript_2C7F74 + goto_if_set FLAG_0x1B1, SlateportCity_PokemonFanClub_EventScript_2C7F74 msgbox SlateportCity_PokemonFanClub_Text_2C6E37, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq SlateportCity_PokemonFanClub_EventScript_2C7F6A + goto_if_eq SlateportCity_PokemonFanClub_EventScript_2C7F6A call SlateportCity_PokemonFanClub_EventScript_2C832D compare VAR_RESULT, 0 - goto_eq SlateportCity_PokemonFanClub_EventScript_2C7F6A + goto_if_eq SlateportCity_PokemonFanClub_EventScript_2C7F6A msgbox SlateportCity_PokemonFanClub_Text_2C6F66, MSGBOX_DEFAULT setvar VAR_0x8005, 23 call SlateportCity_PokemonFanClub_EventScript_2C8326 compare VAR_RESULT, 0 - goto_eq SlateportCity_PokemonFanClub_EventScript_2C7F6A + goto_if_eq SlateportCity_PokemonFanClub_EventScript_2C7F6A setflag FLAG_0x1B1 goto SlateportCity_PokemonFanClub_EventScript_2C7F74 end @@ -10114,19 +10093,18 @@ SlateportCity_PokemonFanClub_EventScript_2C7F74:: @ 82C7F74 MauvilleCity_EventScript_2C7F7E:: @ 82C7F7E lock faceplayer - checkflag FLAG_0x1B2 - goto_eq MauvilleCity_EventScript_2C7FDC + goto_if_set FLAG_0x1B2, MauvilleCity_EventScript_2C7FDC msgbox MauvilleCity_Text_2C6FDB, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq MauvilleCity_EventScript_2C7FD2 + goto_if_eq MauvilleCity_EventScript_2C7FD2 call MauvilleCity_EventScript_2C832D compare VAR_RESULT, 0 - goto_eq MauvilleCity_EventScript_2C7FD2 + goto_if_eq MauvilleCity_EventScript_2C7FD2 msgbox MauvilleCity_Text_2C70F3, MSGBOX_DEFAULT setvar VAR_0x8005, 16 call MauvilleCity_EventScript_2C8326 compare VAR_RESULT, 0 - goto_eq MauvilleCity_EventScript_2C7FD2 + goto_if_eq MauvilleCity_EventScript_2C7FD2 setflag FLAG_0x1B2 goto MauvilleCity_EventScript_2C7FDC end @@ -10144,19 +10122,18 @@ MauvilleCity_EventScript_2C7FDC:: @ 82C7FDC VerdanturfTown_PokemonCenter_1F_EventScript_2C7FE6:: @ 82C7FE6 lock faceplayer - checkflag FLAG_0x1B3 - goto_eq VerdanturfTown_PokemonCenter_1F_EventScript_2C8044 + goto_if_set FLAG_0x1B3, VerdanturfTown_PokemonCenter_1F_EventScript_2C8044 msgbox VerdanturfTown_PokemonCenter_1F_Text_2C7174, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq VerdanturfTown_PokemonCenter_1F_EventScript_2C803A + goto_if_eq VerdanturfTown_PokemonCenter_1F_EventScript_2C803A call VerdanturfTown_PokemonCenter_1F_EventScript_2C832D compare VAR_RESULT, 0 - goto_eq VerdanturfTown_PokemonCenter_1F_EventScript_2C803A + goto_if_eq VerdanturfTown_PokemonCenter_1F_EventScript_2C803A msgbox VerdanturfTown_PokemonCenter_1F_Text_2C7243, MSGBOX_DEFAULT setvar VAR_0x8005, 29 call VerdanturfTown_PokemonCenter_1F_EventScript_2C8326 compare VAR_RESULT, 0 - goto_eq VerdanturfTown_PokemonCenter_1F_EventScript_2C803A + goto_if_eq VerdanturfTown_PokemonCenter_1F_EventScript_2C803A setflag FLAG_0x1B3 goto VerdanturfTown_PokemonCenter_1F_EventScript_2C8044 end @@ -10174,19 +10151,18 @@ VerdanturfTown_PokemonCenter_1F_EventScript_2C8044:: @ 82C8044 LavaridgeTown_House_EventScript_2C804E:: @ 82C804E lock faceplayer - checkflag FLAG_0x1B4 - goto_eq LavaridgeTown_House_EventScript_2C80AC + goto_if_set FLAG_0x1B4, LavaridgeTown_House_EventScript_2C80AC msgbox LavaridgeTown_House_Text_2C72B6, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq LavaridgeTown_House_EventScript_2C80A2 + goto_if_eq LavaridgeTown_House_EventScript_2C80A2 call LavaridgeTown_House_EventScript_2C832D compare VAR_RESULT, 0 - goto_eq LavaridgeTown_House_EventScript_2C80A2 + goto_if_eq LavaridgeTown_House_EventScript_2C80A2 msgbox LavaridgeTown_House_Text_2C73B1, MSGBOX_DEFAULT setvar VAR_0x8005, 7 call LavaridgeTown_House_EventScript_2C8326 compare VAR_RESULT, 0 - goto_eq LavaridgeTown_House_EventScript_2C80A2 + goto_if_eq LavaridgeTown_House_EventScript_2C80A2 setflag FLAG_0x1B4 goto LavaridgeTown_House_EventScript_2C80AC end @@ -10204,19 +10180,18 @@ LavaridgeTown_House_EventScript_2C80AC:: @ 82C80AC FallarborTown_Mart_EventScript_2C80B6:: @ 82C80B6 lock faceplayer - checkflag FLAG_0x1B5 - goto_eq FallarborTown_Mart_EventScript_2C8114 + goto_if_set FLAG_0x1B5, FallarborTown_Mart_EventScript_2C8114 msgbox FallarborTown_Mart_Text_2C7449, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq FallarborTown_Mart_EventScript_2C810A + goto_if_eq FallarborTown_Mart_EventScript_2C810A call FallarborTown_Mart_EventScript_2C832D compare VAR_RESULT, 0 - goto_eq FallarborTown_Mart_EventScript_2C810A + goto_if_eq FallarborTown_Mart_EventScript_2C810A msgbox FallarborTown_Mart_Text_2C7582, MSGBOX_DEFAULT setvar VAR_0x8005, 8 call FallarborTown_Mart_EventScript_2C8326 compare VAR_RESULT, 0 - goto_eq FallarborTown_Mart_EventScript_2C810A + goto_if_eq FallarborTown_Mart_EventScript_2C810A setflag FLAG_0x1B5 goto FallarborTown_Mart_EventScript_2C8114 end @@ -10234,19 +10209,18 @@ FallarborTown_Mart_EventScript_2C8114:: @ 82C8114 FortreeCity_House2_EventScript_2C811E:: @ 82C811E lock faceplayer - checkflag FLAG_0x1B6 - goto_eq FortreeCity_House2_EventScript_2C817C + goto_if_set FLAG_0x1B6, FortreeCity_House2_EventScript_2C817C msgbox FortreeCity_House2_Text_2C7637, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq FortreeCity_House2_EventScript_2C8172 + goto_if_eq FortreeCity_House2_EventScript_2C8172 call FortreeCity_House2_EventScript_2C832D compare VAR_RESULT, 0 - goto_eq FortreeCity_House2_EventScript_2C8172 + goto_if_eq FortreeCity_House2_EventScript_2C8172 msgbox FortreeCity_House2_Text_2C7721, MSGBOX_DEFAULT setvar VAR_0x8005, 24 call FortreeCity_House2_EventScript_2C8326 compare VAR_RESULT, 0 - goto_eq FortreeCity_House2_EventScript_2C8172 + goto_if_eq FortreeCity_House2_EventScript_2C8172 setflag FLAG_0x1B6 goto FortreeCity_House2_EventScript_2C817C end @@ -10264,19 +10238,18 @@ FortreeCity_House2_EventScript_2C817C:: @ 82C817C LilycoveCity_DepartmentStoreRooftop_EventScript_2C8186:: @ 82C8186 lock faceplayer - checkflag FLAG_0x1B7 - goto_eq LilycoveCity_DepartmentStoreRooftop_EventScript_2C81E4 + goto_if_set FLAG_0x1B7, LilycoveCity_DepartmentStoreRooftop_EventScript_2C81E4 msgbox LilycoveCity_DepartmentStoreRooftop_Text_2C77C6, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq LilycoveCity_DepartmentStoreRooftop_EventScript_2C81DA + goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_2C81DA call LilycoveCity_DepartmentStoreRooftop_EventScript_2C832D compare VAR_RESULT, 0 - goto_eq LilycoveCity_DepartmentStoreRooftop_EventScript_2C81DA + goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_2C81DA msgbox LilycoveCity_DepartmentStoreRooftop_Text_2C7911, MSGBOX_DEFAULT setvar VAR_0x8005, 14 call LilycoveCity_DepartmentStoreRooftop_EventScript_2C8326 compare VAR_RESULT, 0 - goto_eq LilycoveCity_DepartmentStoreRooftop_EventScript_2C81DA + goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_2C81DA setflag FLAG_0x1B7 goto LilycoveCity_DepartmentStoreRooftop_EventScript_2C81E4 end @@ -10294,19 +10267,18 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_2C81E4:: @ 82C81E4 MossdeepCity_EventScript_2C81EE:: @ 82C81EE lock faceplayer - checkflag FLAG_0x1B8 - goto_eq MossdeepCity_EventScript_2C824C + goto_if_set FLAG_0x1B8, MossdeepCity_EventScript_2C824C msgbox MossdeepCity_Text_2C79A6, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq MossdeepCity_EventScript_2C8242 + goto_if_eq MossdeepCity_EventScript_2C8242 call MossdeepCity_EventScript_2C832D compare VAR_RESULT, 0 - goto_eq MossdeepCity_EventScript_2C8242 + goto_if_eq MossdeepCity_EventScript_2C8242 msgbox MossdeepCity_Text_2C7B0D, MSGBOX_DEFAULT setvar VAR_0x8005, 15 call MossdeepCity_EventScript_2C8326 compare VAR_RESULT, 0 - goto_eq MossdeepCity_EventScript_2C8242 + goto_if_eq MossdeepCity_EventScript_2C8242 setflag FLAG_0x1B8 goto MossdeepCity_EventScript_2C824C end @@ -10324,19 +10296,18 @@ MossdeepCity_EventScript_2C824C:: @ 82C824C SootopolisCity_PokemonCenter_1F_EventScript_2C8256:: @ 82C8256 lock faceplayer - checkflag FLAG_0x1B9 - goto_eq SootopolisCity_PokemonCenter_1F_EventScript_2C82B4 + goto_if_set FLAG_0x1B9, SootopolisCity_PokemonCenter_1F_EventScript_2C82B4 msgbox SootopolisCity_PokemonCenter_1F_Text_2C7B8E, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq SootopolisCity_PokemonCenter_1F_EventScript_2C82AA + goto_if_eq SootopolisCity_PokemonCenter_1F_EventScript_2C82AA call SootopolisCity_PokemonCenter_1F_EventScript_2C832D compare VAR_RESULT, 0 - goto_eq SootopolisCity_PokemonCenter_1F_EventScript_2C82AA + goto_if_eq SootopolisCity_PokemonCenter_1F_EventScript_2C82AA msgbox SootopolisCity_PokemonCenter_1F_Text_2C7C98, MSGBOX_DEFAULT setvar VAR_0x8005, 4 call SootopolisCity_PokemonCenter_1F_EventScript_2C8326 compare VAR_RESULT, 0 - goto_eq SootopolisCity_PokemonCenter_1F_EventScript_2C82AA + goto_if_eq SootopolisCity_PokemonCenter_1F_EventScript_2C82AA setflag FLAG_0x1B9 goto SootopolisCity_PokemonCenter_1F_EventScript_2C82B4 end @@ -10354,19 +10325,18 @@ SootopolisCity_PokemonCenter_1F_EventScript_2C82B4:: @ 82C82B4 PacifidlogTown_PokemonCenter_1F_EventScript_2C82BE:: @ 82C82BE lock faceplayer - checkflag FLAG_0x1BA - goto_eq PacifidlogTown_PokemonCenter_1F_EventScript_2C831C + goto_if_set FLAG_0x1BA, PacifidlogTown_PokemonCenter_1F_EventScript_2C831C msgbox PacifidlogTown_PokemonCenter_1F_Text_2C7CFA, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq PacifidlogTown_PokemonCenter_1F_EventScript_2C8312 + goto_if_eq PacifidlogTown_PokemonCenter_1F_EventScript_2C8312 call PacifidlogTown_PokemonCenter_1F_EventScript_2C832D compare VAR_RESULT, 0 - goto_eq PacifidlogTown_PokemonCenter_1F_EventScript_2C8312 + goto_if_eq PacifidlogTown_PokemonCenter_1F_EventScript_2C8312 msgbox PacifidlogTown_PokemonCenter_1F_Text_2C7E40, MSGBOX_DEFAULT setvar VAR_0x8005, 12 call PacifidlogTown_PokemonCenter_1F_EventScript_2C8326 compare VAR_RESULT, 0 - goto_eq PacifidlogTown_PokemonCenter_1F_EventScript_2C8312 + goto_if_eq PacifidlogTown_PokemonCenter_1F_EventScript_2C8312 setflag FLAG_0x1BA goto PacifidlogTown_PokemonCenter_1F_EventScript_2C831C end @@ -10422,11 +10392,11 @@ TrainerHill_Roof_MapScript1_2C8336: @ 82C8336 setvar VAR_0x8005, 5 special CallFrontierUtilFunc compare VAR_RESULT, 2 - goto_eq TrainerHill_1F_EventScript_2C83C9 + goto_if_eq TrainerHill_1F_EventScript_2C83C9 compare VAR_RESULT, 3 - goto_eq TrainerHill_1F_EventScript_2C83C9 + goto_if_eq TrainerHill_1F_EventScript_2C83C9 compare VAR_RESULT, 9 - goto_eq TrainerHill_1F_EventScript_2C83C9 + goto_if_eq TrainerHill_1F_EventScript_2C83C9 end TrainerHill_1F_MapScript2_2C8372: @ 82C8372 @@ -10460,7 +10430,7 @@ TrainerHill_1F_EventScript_2C83A6:: @ 82C83A6 setvar VAR_0x8004, 9 special sp194_trainer_tower compare VAR_RESULT, 1 - goto_eq TrainerHill_1F_EventScript_2C83BF + goto_if_eq TrainerHill_1F_EventScript_2C83BF end TrainerHill_1F_EventScript_2C83BF:: @ 82C83BF diff --git a/data/maps/AbandonedShip_CaptainsOffice/scripts.inc b/data/maps/AbandonedShip_CaptainsOffice/scripts.inc index e40ddad1e..796b91c02 100644 --- a/data/maps/AbandonedShip_CaptainsOffice/scripts.inc +++ b/data/maps/AbandonedShip_CaptainsOffice/scripts.inc @@ -4,13 +4,11 @@ AbandonedShip_CaptainsOffice_MapScripts:: @ 82387E1 AbandonedShip_CaptainsOffice_EventScript_2387E2:: @ 82387E2 lock faceplayer - checkflag FLAG_TRADED_SCANNER_TO_STERN - goto_eq AbandonedShip_CaptainsOffice_EventScript_23881A + goto_if_set FLAG_TRADED_SCANNER_TO_STERN, AbandonedShip_CaptainsOffice_EventScript_23881A checkitem ITEM_SCANNER, 1 compare VAR_RESULT, 1 - goto_eq AbandonedShip_CaptainsOffice_EventScript_238810 - checkflag FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_4_SCANNER - goto_eq AbandonedShip_CaptainsOffice_EventScript_23881A + goto_if_eq AbandonedShip_CaptainsOffice_EventScript_238810 + goto_if_set FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_4_SCANNER, AbandonedShip_CaptainsOffice_EventScript_23881A msgbox AbandonedShip_CaptainsOffice_Text_238824, MSGBOX_DEFAULT release end diff --git a/data/maps/AbandonedShip_Corridors_B1F/scripts.inc b/data/maps/AbandonedShip_Corridors_B1F/scripts.inc index 4715e5566..9e26a7df4 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/scripts.inc +++ b/data/maps/AbandonedShip_Corridors_B1F/scripts.inc @@ -28,11 +28,10 @@ AbandonedShip_Corridors_B1F_EventScript_237DBF:: @ 8237DBF AbandonedShip_Corridors_B1F_EventScript_237DC8:: @ 8237DC8 lockall - checkflag FLAG_0x0EF - goto_eq AbandonedShip_Corridors_B1F_EventScript_237E09 + goto_if_set FLAG_0x0EF, AbandonedShip_Corridors_B1F_EventScript_237E09 checkitem ITEM_STORAGE_KEY, 1 compare VAR_RESULT, 0 - goto_eq AbandonedShip_Corridors_B1F_EventScript_237DFF + goto_if_eq AbandonedShip_Corridors_B1F_EventScript_237DFF msgbox AbandonedShip_Corridors_B1F_Text_237F4B, MSGBOX_DEFAULT playse SE_PIN takeitem ITEM_STORAGE_KEY, 1 diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc index e3c3ced5c..ad9166dfa 100644 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc +++ b/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc @@ -60,11 +60,10 @@ AbandonedShip_HiddenFloorCorridors_EventScript_238A0F:: @ 8238A0F AbandonedShip_HiddenFloorCorridors_EventScript_238A19:: @ 8238A19 lockall - checkflag FLAG_0x0F0 - goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B1D + goto_if_set FLAG_0x0F0, AbandonedShip_HiddenFloorCorridors_EventScript_238B1D checkitem ITEM_ROOM_1_KEY, 1 compare VAR_RESULT, 0 - goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238AF5 + goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_238AF5 msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, MSGBOX_DEFAULT playse SE_PIN takeitem ITEM_ROOM_1_KEY, 1 @@ -76,11 +75,10 @@ AbandonedShip_HiddenFloorCorridors_EventScript_238A19:: @ 8238A19 AbandonedShip_HiddenFloorCorridors_EventScript_238A50:: @ 8238A50 lockall - checkflag FLAG_0x0F1 - goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B1D + goto_if_set FLAG_0x0F1, AbandonedShip_HiddenFloorCorridors_EventScript_238B1D checkitem ITEM_ROOM_2_KEY, 1 compare VAR_RESULT, 0 - goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238AFF + goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_238AFF msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, MSGBOX_DEFAULT playse SE_PIN takeitem ITEM_ROOM_2_KEY, 1 @@ -92,11 +90,10 @@ AbandonedShip_HiddenFloorCorridors_EventScript_238A50:: @ 8238A50 AbandonedShip_HiddenFloorCorridors_EventScript_238A87:: @ 8238A87 lockall - checkflag FLAG_0x0F2 - goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B1D + goto_if_set FLAG_0x0F2, AbandonedShip_HiddenFloorCorridors_EventScript_238B1D checkitem ITEM_ROOM_4_KEY, 1 compare VAR_RESULT, 0 - goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B09 + goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B09 msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, MSGBOX_DEFAULT playse SE_PIN takeitem ITEM_ROOM_4_KEY, 1 @@ -108,11 +105,10 @@ AbandonedShip_HiddenFloorCorridors_EventScript_238A87:: @ 8238A87 AbandonedShip_HiddenFloorCorridors_EventScript_238ABE:: @ 8238ABE lockall - checkflag FLAG_0x0F3 - goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B1D + goto_if_set FLAG_0x0F3, AbandonedShip_HiddenFloorCorridors_EventScript_238B1D checkitem ITEM_ROOM_6_KEY, 1 compare VAR_RESULT, 0 - goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B13 + goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B13 msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, MSGBOX_DEFAULT playse SE_PIN takeitem ITEM_ROOM_6_KEY, 1 diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc b/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc index c89163af2..6d3592f2f 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc +++ b/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc @@ -56,7 +56,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_238D0C:: @ 8238D0C AbandonedShip_HiddenFloorRooms_EventScript_238D0D:: @ 8238D0D specialvar VAR_RESULT, FoundAbandonedShipRoom1Key compare VAR_RESULT, 1 - goto_eq AbandonedShip_HiddenFloorRooms_EventScript_238D32 + goto_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238D32 delay 20 compare VAR_RESULT, 0 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_238DB3 diff --git a/data/maps/AbandonedShip_Rooms2_1F/scripts.inc b/data/maps/AbandonedShip_Rooms2_1F/scripts.inc index 5c934f263..ec382e56c 100644 --- a/data/maps/AbandonedShip_Rooms2_1F/scripts.inc +++ b/data/maps/AbandonedShip_Rooms2_1F/scripts.inc @@ -5,7 +5,7 @@ AbandonedShip_Rooms2_1F_EventScript_2380A7:: @ 82380A7 trainerbattle_double TRAINER_KIRA_AND_DAN_1, AbandonedShip_Rooms2_1F_Text_23819D, AbandonedShip_Rooms2_1F_Text_2381DA, AbandonedShip_Rooms2_1F_Text_238257, AbandonedShip_Rooms2_1F_EventScript_2380D7 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq AbandonedShip_Rooms2_1F_EventScript_2380F0 + goto_if_eq AbandonedShip_Rooms2_1F_EventScript_2380F0 msgbox AbandonedShip_Rooms2_1F_Text_23820F, MSGBOX_DEFAULT release end @@ -25,7 +25,7 @@ AbandonedShip_Rooms2_1F_EventScript_23810B:: @ 823810B trainerbattle_double TRAINER_KIRA_AND_DAN_1, AbandonedShip_Rooms2_1F_Text_2382A4, AbandonedShip_Rooms2_1F_Text_2382F4, AbandonedShip_Rooms2_1F_Text_23836F, AbandonedShip_Rooms2_1F_EventScript_23813B specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq AbandonedShip_Rooms2_1F_EventScript_238154 + goto_if_eq AbandonedShip_Rooms2_1F_EventScript_238154 msgbox AbandonedShip_Rooms2_1F_Text_23830A, MSGBOX_DEFAULT release end diff --git a/data/maps/AbandonedShip_Rooms_1F/scripts.inc b/data/maps/AbandonedShip_Rooms_1F/scripts.inc index d64c027a3..5797ed5fb 100644 --- a/data/maps/AbandonedShip_Rooms_1F/scripts.inc +++ b/data/maps/AbandonedShip_Rooms_1F/scripts.inc @@ -14,7 +14,7 @@ AbandonedShip_Rooms_1F_EventScript_237AB3:: @ 8237AB3 trainerbattle_single TRAINER_THALIA_1, AbandonedShip_Rooms_1F_Text_237B76, AbandonedShip_Rooms_1F_Text_237BB8, AbandonedShip_Rooms_1F_EventScript_237ADF specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq AbandonedShip_Rooms_1F_EventScript_237AFE + goto_if_eq AbandonedShip_Rooms_1F_EventScript_237AFE msgbox AbandonedShip_Rooms_1F_Text_237BDB, MSGBOX_DEFAULT release end diff --git a/data/maps/AncientTomb/scripts.inc b/data/maps/AncientTomb/scripts.inc index f3c42b690..4ad411539 100644 --- a/data/maps/AncientTomb/scripts.inc +++ b/data/maps/AncientTomb/scripts.inc @@ -12,7 +12,7 @@ AncientTomb_MapScript1_238FC3: @ 8238FC3 AncientTomb_EventScript_238FCD:: @ 8238FCD specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if 5, AncientTomb_EventScript_27374E + goto_if_ne AncientTomb_EventScript_27374E removeobject VAR_LAST_TALKED return @@ -42,8 +42,7 @@ AncientTomb_EventScript_238FFC:: @ 8238FFC AncientTomb_EventScript_239033:: @ 8239033 lockall - checkflag FLAG_SYS_BRAILLE_FLY - goto_eq AncientTomb_EventScript_239046 + goto_if_set FLAG_SYS_BRAILLE_FLY, AncientTomb_EventScript_239046 braillemessage AncientTomb_Braille_2A6D06 waitbuttonpress hidebox2 @@ -77,11 +76,11 @@ AncientTomb_EventScript_23905A:: @ 823905A clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 1 - goto_eq AncientTomb_EventScript_2390A1 + goto_if_eq AncientTomb_EventScript_2390A1 compare VAR_RESULT, 4 - goto_eq AncientTomb_EventScript_2390AA + goto_if_eq AncientTomb_EventScript_2390AA compare VAR_RESULT, 5 - goto_eq AncientTomb_EventScript_2390AA + goto_if_eq AncientTomb_EventScript_2390AA setflag FLAG_0x1BD release end diff --git a/data/maps/AquaHideout_1F/scripts.inc b/data/maps/AquaHideout_1F/scripts.inc index 8eb5e60b9..0b44908e0 100644 --- a/data/maps/AquaHideout_1F/scripts.inc +++ b/data/maps/AquaHideout_1F/scripts.inc @@ -4,10 +4,8 @@ AquaHideout_1F_MapScripts:: @ 8233493 AquaHideout_1F_EventScript_233494:: @ 8233494 lock faceplayer - checkflag FLAG_0x06F - goto_eq AquaHideout_1F_EventScript_2334BC - checkflag FLAG_0x0D4 - goto_eq AquaHideout_1F_EventScript_2334B2 + goto_if_set FLAG_0x06F, AquaHideout_1F_EventScript_2334BC + goto_if_set FLAG_0x0D4, AquaHideout_1F_EventScript_2334B2 msgbox AquaHideout_1F_Text_23351D, MSGBOX_DEFAULT release end @@ -25,10 +23,8 @@ AquaHideout_1F_EventScript_2334BC:: @ 82334BC AquaHideout_1F_EventScript_2334C6:: @ 82334C6 lock faceplayer - checkflag FLAG_0x06F - goto_eq AquaHideout_1F_EventScript_2334EE - checkflag FLAG_0x0D4 - goto_eq AquaHideout_1F_EventScript_2334E4 + goto_if_set FLAG_0x06F, AquaHideout_1F_EventScript_2334EE + goto_if_set FLAG_0x0D4, AquaHideout_1F_EventScript_2334E4 msgbox AquaHideout_1F_Text_233739, MSGBOX_DEFAULT release end diff --git a/data/maps/AquaHideout_B1F/scripts.inc b/data/maps/AquaHideout_B1F/scripts.inc index 9c660d8b1..f49e86818 100644 --- a/data/maps/AquaHideout_B1F/scripts.inc +++ b/data/maps/AquaHideout_B1F/scripts.inc @@ -11,7 +11,7 @@ AquaHideout_B1F_MapScript1_2339B2: @ 82339B2 AquaHideout_B1F_EventScript_2339BC:: @ 82339BC specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if 5, AquaHideout_B1F_EventScript_27374E + goto_if_ne AquaHideout_B1F_EventScript_27374E removeobject VAR_LAST_TALKED return @@ -43,11 +43,11 @@ AquaHideout_B1F_EventScript_2339EB:: @ 82339EB clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 1 - goto_eq AquaHideout_B1F_EventScript_233A2F + goto_if_eq AquaHideout_B1F_EventScript_233A2F compare VAR_RESULT, 4 - goto_eq AquaHideout_B1F_EventScript_233A2F + goto_if_eq AquaHideout_B1F_EventScript_233A2F compare VAR_RESULT, 5 - goto_eq AquaHideout_B1F_EventScript_233A2F + goto_if_eq AquaHideout_B1F_EventScript_233A2F setflag FLAG_0x1C4 release end @@ -70,11 +70,11 @@ AquaHideout_B1F_EventScript_233A38:: @ 8233A38 clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 1 - goto_eq AquaHideout_B1F_EventScript_233A7C + goto_if_eq AquaHideout_B1F_EventScript_233A7C compare VAR_RESULT, 4 - goto_eq AquaHideout_B1F_EventScript_233A7C + goto_if_eq AquaHideout_B1F_EventScript_233A7C compare VAR_RESULT, 5 - goto_eq AquaHideout_B1F_EventScript_233A7C + goto_if_eq AquaHideout_B1F_EventScript_233A7C setflag FLAG_0x1C5 release end diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc index 660e13947..0caf9c88c 100644 --- a/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc @@ -18,9 +18,9 @@ BattleFrontier_BattleArenaBattleRoom_MapScript1_2574A0: @ 82574A0 BattleFrontier_BattleArenaBattleRoom_EventScript_2574AE:: @ 82574AE checkplayergender compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_2574C6 + goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_2574C6 compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_2574CC + goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_2574CC return BattleFrontier_BattleArenaBattleRoom_EventScript_2574C6:: @ 82574C6 @@ -44,7 +44,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_2574DC:: @ 82574DC setvar VAR_0x8005, 2 special CallFrontierUtilFunc compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_25752E + goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_25752E applymovement 5, BattleFrontier_BattleArenaBattleRoom_Movement_257C08 applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BEB setvar VAR_TEMP_2, 1 @@ -150,7 +150,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0:: @ 82576B0 special CallFrontierUtilFunc copyvar VAR_TEMP_F, VAR_RESULT compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattleArenaBattleRoom_EventScript_2578BC + goto_if_ne BattleFrontier_BattleArenaBattleRoom_EventScript_2578BC setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 special CallFrontierUtilFunc @@ -168,7 +168,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0:: @ 82576B0 call_if 1, BattleFrontier_BattleArenaBattleRoom_EventScript_257893 call BattleFrontier_BattleArenaBattleRoom_EventScript_23E8E0 compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257768 + goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257768 multichoice 19, 4, 103, 1 switch VAR_RESULT case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_25783A @@ -276,7 +276,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_25789A:: @ 825789A BattleFrontier_BattleArenaBattleRoom_EventScript_2578BC:: @ 82578BC compare VAR_TEMP_2, 1 - goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_2578D4 + goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_2578D4 msgbox BattleFrontier_BattleArenaBattleRoom_Text_257F45, MSGBOX_DEFAULT setvar VAR_TEMP_2, 1 @@ -285,7 +285,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_2578D4:: @ 82578D4 waitmessage call BattleFrontier_BattleArenaBattleRoom_EventScript_23E8E0 compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_25792B + goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_25792B multichoice 19, 4, 103, 1 switch VAR_RESULT case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_257961 @@ -334,7 +334,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257961:: @ 8257961 setvar VAR_0x8005, 7 special CallFrontierUtilFunc compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattleArenaBattleRoom_EventScript_257A3F + goto_if_ne BattleFrontier_BattleArenaBattleRoom_EventScript_257A3F msgbox BattleFrontier_BattleArenaBattleRoom_Text_25801C, MSGBOX_DEFAULT closemessage setvar VAR_0x8004, 2 @@ -352,7 +352,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257A3F:: @ 8257A3F msgbox BattleFrontier_BattleArenaBattleRoom_Text_25810D, MSGBOX_DEFAULT call BattleFrontier_BattleArenaBattleRoom_EventScript_257B5E compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257A5C + goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257A5C goto BattleFrontier_BattleArenaBattleRoom_EventScript_2575DB BattleFrontier_BattleArenaBattleRoom_EventScript_257A5C:: @ 8257A5C @@ -360,7 +360,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257A5C:: @ 8257A5C setvar VAR_0x8004, 12 special CallFrontierUtilFunc compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattleArenaBattleRoom_EventScript_257852 + goto_if_ne BattleFrontier_BattleArenaBattleRoom_EventScript_257852 applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BF1 waitmovement 0 msgbox BattleFrontier_BattleArenaBattleRoom_Text_25813F, MSGBOX_DEFAULT @@ -378,7 +378,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257AA5:: @ 8257AA5 setvar VAR_0x8005, 7 special CallFrontierUtilFunc compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattleArenaBattleRoom_EventScript_257AF8 + goto_if_ne BattleFrontier_BattleArenaBattleRoom_EventScript_257AF8 msgbox BattleFrontier_BattleArenaBattleRoom_Text_258213, MSGBOX_DEFAULT closemessage setvar VAR_0x8004, 2 @@ -396,7 +396,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257AF8:: @ 8257AF8 msgbox BattleFrontier_BattleArenaBattleRoom_Text_2582F9, MSGBOX_DEFAULT call BattleFrontier_BattleArenaBattleRoom_EventScript_257B5E compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257B15 + goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257B15 goto BattleFrontier_BattleArenaBattleRoom_EventScript_2575DB BattleFrontier_BattleArenaBattleRoom_EventScript_257B15:: @ 8257B15 @@ -404,7 +404,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257B15:: @ 8257B15 setvar VAR_0x8004, 12 special CallFrontierUtilFunc compare VAR_RESULT, 2 - goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257852 + goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257852 applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BF1 waitmovement 0 msgbox BattleFrontier_BattleArenaBattleRoom_Text_258323, MSGBOX_DEFAULT diff --git a/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc b/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc index 79044d471..700671776 100644 --- a/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc @@ -50,7 +50,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255CCF:: @ 8255CCF setvar VAR_0x8004, 10 special CallFrontierUtilFunc compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleArenaLobby_EventScript_255CF0 + goto_if_eq BattleFrontier_BattleArenaLobby_EventScript_255CF0 msgbox BattleFrontier_BattleArenaLobby_Text_2568E7, MSGBOX_DEFAULT goto BattleFrontier_BattleArenaLobby_EventScript_255CF8 @@ -98,7 +98,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255D59:: @ 8255D59 waitse call BattleFrontier_BattleArenaLobby_EventScript_23E8E0 compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleArenaLobby_EventScript_255DBF + goto_if_eq BattleFrontier_BattleArenaLobby_EventScript_255DBF message BattleFrontier_BattleArenaLobby_Text_256B19 waitmessage multichoicedefault 20, 8, 94, 1, 0 @@ -157,7 +157,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255E47:: @ 8255E47 setvar VAR_0x8004, 15 special CallFrontierUtilFunc compare VAR_0x8004, 1 - goto_eq BattleFrontier_BattleArenaLobby_EventScript_255FAC + goto_if_eq BattleFrontier_BattleArenaLobby_EventScript_255FAC setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT @@ -170,7 +170,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255E47:: @ 8255E47 special sub_80F9490 waitstate compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleArenaLobby_EventScript_255FF8 + goto_if_eq BattleFrontier_BattleArenaLobby_EventScript_255FF8 msgbox BattleFrontier_BattleArenaLobby_Text_2564CE, MSGBOX_YESNO switch VAR_RESULT case 0, BattleFrontier_BattleArenaLobby_EventScript_255FF8 @@ -202,7 +202,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255EE8:: @ 8255EE8 call BattleFrontier_BattleArenaLobby_EventScript_27134F setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleArenaLobby_EventScript_255FE1 + goto_if_eq BattleFrontier_BattleArenaLobby_EventScript_255FE1 BattleFrontier_BattleArenaLobby_EventScript_255F54:: @ 8255F54 special SavePlayerParty diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc index 9b4c045d8..6adba167b 100644 --- a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc @@ -21,9 +21,9 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_24BCDC:: @ 824BCDC BattleFrontier_BattleDomeBattleRoom_EventScript_24BCDC:: @ 824BCDC checkplayergender compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BCF4 + goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BCF4 compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BCFA + goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BCFA return BattleFrontier_BattleDomeBattleRoom_EventScript_24BCF4:: @ 824BCF4 @@ -50,9 +50,9 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BD0A:: @ 824BD0A closemessage showobjectat 13, MAP_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM compare VAR_TEMP_F, 3 - goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24BD4E + goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_24BD4E compare VAR_TEMP_E, 0 - goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24BD5A + goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_24BD5A BattleFrontier_BattleDomeBattleRoom_EventScript_24BD4E:: @ 824BD4E applymovement 13, BattleFrontier_BattleDomeBattleRoom_Movement_24C775 @@ -66,9 +66,9 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BD61:: @ 824BD61 call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E waitmovement 0 compare VAR_TEMP_F, 3 - goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24BD82 + goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_24BD82 compare VAR_TEMP_E, 0 - goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24C1CB + goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_24C1CB BattleFrontier_BattleDomeBattleRoom_EventScript_24BD82:: @ 824BD82 setvar VAR_0x8004, 4 @@ -107,7 +107,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BDF7:: @ 824BDF7 applymovement 9, BattleFrontier_BattleDomeBattleRoom_Movement_24C96B waitmovement 0 compare VAR_TEMP_2, 2 - goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BE4F + goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BE4F setvar VAR_0x8004, 19 special CallBattleDomeFunction switch VAR_RESULT @@ -229,17 +229,17 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BFD5:: @ 824BFD5 setvar VAR_0x8005, 6 special CallBattleDomeFunction compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C023 + goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C023 setvar VAR_0x8004, 1 setvar VAR_0x8005, 7 special CallBattleDomeFunction compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C076 + goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C076 setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 special CallBattleDomeFunction compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C16A + goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C16A goto BattleFrontier_BattleDomeBattleRoom_EventScript_24C0C9 return @@ -303,7 +303,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C0C2:: @ 824C0C2 BattleFrontier_BattleDomeBattleRoom_EventScript_24C0C9:: @ 824C0C9 compare VAR_TEMP_F, 3 - goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24C105 + goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_24C105 switch VAR_TEMP_E case 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C158 case 2, BattleFrontier_BattleDomeBattleRoom_EventScript_24C161 @@ -430,7 +430,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C211:: @ 824C211 setvar VAR_0x8005, 7 special CallFrontierUtilFunc compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24C2B9 + goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_24C2B9 msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CFAE, MSGBOX_DEFAULT setvar VAR_0x8004, 2 setvar VAR_0x8005, 7 @@ -450,7 +450,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C2B9:: @ 824C2B9 setvar VAR_0x8004, 12 special CallFrontierUtilFunc compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62 + goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62 closemessage applymovement 15, BattleFrontier_BattleDomeBattleRoom_Movement_24C82B waitmovement 0 @@ -469,7 +469,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C346:: @ 824C346 setvar VAR_0x8005, 7 special CallFrontierUtilFunc compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24C373 + goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_24C373 msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D319, MSGBOX_DEFAULT setvar VAR_0x8004, 2 setvar VAR_0x8005, 7 @@ -489,7 +489,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C373:: @ 824C373 setvar VAR_0x8004, 12 special CallFrontierUtilFunc compare VAR_RESULT, 2 - goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62 + goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62 closemessage applymovement 15, BattleFrontier_BattleDomeBattleRoom_Movement_24C82B waitmovement 0 @@ -556,12 +556,12 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C48B:: @ 824C48B setvar VAR_0x8005, 2 special CallFrontierUtilFunc compare VAR_RESULT, 3 - goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24C4EF + goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_24C4EF setvar VAR_0x8004, 9 special CallFrontierUtilFunc copyvar VAR_TEMP_E, VAR_RESULT compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C4EF + goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C4EF call BattleFrontier_BattleDomeBattleRoom_EventScript_242170 setobjectxyperm 15, 13, 9 removeobject 15 @@ -952,7 +952,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C8F5:: @ 824C8F5 BattleFrontier_BattleDomePreBattleRoom_EventScript_24C8F5:: @ 824C8F5 copyvar VAR_RESULT, VAR_FRONTIER_BATTLE_MODE compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24C90F + goto_if_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24C90F warp MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY, 255, 5, 11 waitstate end @@ -966,14 +966,14 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C919:: @ 824C919 random 2 copyvar VAR_TEMP_D, VAR_RESULT compare VAR_TEMP_D, 0 - goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_27374E + goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_27374E setobjectxyperm 6, 2, 0 setobjectmovementtype 6, 10 return BattleFrontier_BattleDomeBattleRoom_EventScript_24C938:: @ 824C938 compare VAR_TEMP_D, 0 - goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_27374E + goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_27374E applymovement 6, BattleFrontier_BattleDomeBattleRoom_Movement_24C95E return diff --git a/data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc b/data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc index f69e7b633..ac43ee9a4 100644 --- a/data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc @@ -13,7 +13,7 @@ BattleFrontier_BattleDomeCorridor_EventScript_24B10E:: @ 824B10E setvar VAR_0x8005, 1 special CallFrontierUtilFunc compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleDomeCorridor_EventScript_24B161 + goto_if_eq BattleFrontier_BattleDomeCorridor_EventScript_24B161 applymovement 1, BattleFrontier_BattleDomeCorridor_Movement_24B1B2 applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomeCorridor_Movement_24B1A1 waitmovement 0 diff --git a/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc b/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc index 9e906433a..416937723 100644 --- a/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc @@ -62,7 +62,7 @@ BattleFrontier_BattleDomeLobby_EventScript_24989B:: @ 824989B setvar VAR_0x8004, 10 special CallFrontierUtilFunc compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleDomeLobby_EventScript_2498C1 + goto_if_eq BattleFrontier_BattleDomeLobby_EventScript_2498C1 msgbox BattleFrontier_BattleDomeLobby_Text_24A4E9, MSGBOX_DEFAULT goto BattleFrontier_BattleDomeLobby_EventScript_2498C9 @@ -128,7 +128,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249991:: @ 8249991 waitse call BattleFrontier_BattleDomeLobby_EventScript_23E8E0 compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleDomeLobby_EventScript_2499E9 + goto_if_eq BattleFrontier_BattleDomeLobby_EventScript_2499E9 message BattleFrontier_BattleDomeLobby_Text_24AE17 waitmessage multichoicedefault 20, 8, 94, 1, 0 @@ -210,7 +210,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249ABF:: @ 8249ABF setvar VAR_0x8004, 15 special CallFrontierUtilFunc compare VAR_0x8004, 1 - goto_eq BattleFrontier_BattleDomeLobby_EventScript_249C15 + goto_if_eq BattleFrontier_BattleDomeLobby_EventScript_249C15 setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT @@ -223,7 +223,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249ABF:: @ 8249ABF special sub_80F9490 waitstate compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleDomeLobby_EventScript_249C61 + goto_if_eq BattleFrontier_BattleDomeLobby_EventScript_249C61 msgbox BattleFrontier_BattleDomeLobby_Text_24A1C6, MSGBOX_YESNO switch VAR_RESULT case 0, BattleFrontier_BattleDomeLobby_EventScript_249C61 @@ -251,7 +251,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249B60:: @ 8249B60 call BattleFrontier_BattleDomeLobby_EventScript_27134F setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleDomeLobby_EventScript_249C4A + goto_if_eq BattleFrontier_BattleDomeLobby_EventScript_249C4A setvar VAR_0x8004, 22 special CallBattleDomeFunction diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc index 8e4a8c944..b75c6062a 100644 --- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc @@ -18,7 +18,7 @@ BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B218: @ 824B218 BattleFrontier_BattleDomePreBattleRoom_EventScript_24B222:: @ 824B222 compare VAR_0x8006, 1 - goto_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5C7 + goto_if_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5C7 setvar VAR_0x8004, 2 setvar VAR_0x8005, 6 setvar VAR_0x8006, 1 @@ -34,7 +34,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F:: @ 824B24F switch VAR_RESULT call BattleFrontier_BattleDomePreBattleRoom_EventScript_23E8E0 compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B2C1 + goto_if_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B2C1 multichoice 16, 0, 73, 1 switch VAR_RESULT case 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3DD @@ -159,7 +159,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B46D:: @ 824B46D setvar VAR_0x8004, 21 special CallFrontierUtilFunc compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F + goto_if_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F setvar VAR_0x8004, 2 setvar VAR_0x8005, 8 special CallBattleDomeFunction @@ -219,15 +219,13 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B54C:: @ 824B54C return BattleFrontier_BattleDomePreBattleRoom_EventScript_24B58B:: @ 824B58B - checkflag FLAG_TEMP_1 - goto_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5B5 + goto_if_set FLAG_TEMP_1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5B5 msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BB2E, MSGBOX_DEFAULT setflag FLAG_TEMP_1 return BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5A0:: @ 824B5A0 - checkflag FLAG_TEMP_1 - goto_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5BE + goto_if_set FLAG_TEMP_1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5BE msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BBAC, MSGBOX_DEFAULT setflag FLAG_TEMP_1 return diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc index 4298f7579..dd0c2ce4c 100644 --- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc @@ -16,7 +16,7 @@ BattleFrontier_BattleFactoryBattleRoom_MapScript1_25ADBB: @ 825ADBB special CallFrontierUtilFunc copyvar VAR_TEMP_F, VAR_RESULT compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25ADF3 + goto_if_ne BattleFrontier_BattleFactoryBattleRoom_EventScript_25ADF3 end BattleFrontier_BattleFactoryBattleRoom_EventScript_25ADF3:: @ 825ADF3 @@ -32,7 +32,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE0A:: @ 825AE0A setvar VAR_TEMP_1, 1 hideobjectat 255, MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM compare VAR_TEMP_F, 0 - goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE24 + goto_if_ne BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE24 hideobjectat 2, MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE24:: @ 825AE24 @@ -63,7 +63,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE3B:: @ 825AE3B BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE67:: @ 825AE67 compare VAR_TEMP_F, 0 - goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE3B + goto_if_ne BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE3B applymovement 8, BattleFrontier_BattleFactoryBattleRoom_Movement_25B17B applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleFactoryBattleRoom_Movement_25B17B waitmovement 0 @@ -78,7 +78,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE67:: @ 825AE67 BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEA7:: @ 825AEA7 compare VAR_TEMP_F, 0 - goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF9C + goto_if_ne BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF9C setvar VAR_0x8004, 5 special CallBattlePalaceFunction lockall @@ -111,7 +111,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF0F:: @ 825AF0F setvar VAR_0x8005, 3 special CallBattleFactoryFunction compare VAR_RESULT, 9999 - goto_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF3E + goto_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF3E addvar VAR_RESULT, 1 setorcopyvar VAR_0x8006, VAR_RESULT setvar VAR_0x8004, 2 @@ -152,7 +152,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF9C:: @ 825AF9C setvar VAR_0x8005, 7 special CallFrontierUtilFunc compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AFEF + goto_if_ne BattleFrontier_BattleFactoryBattleRoom_EventScript_25AFEF msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B1FB, MSGBOX_DEFAULT setvar VAR_0x8004, 2 setvar VAR_0x8005, 7 @@ -162,14 +162,14 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AFEF:: @ 825AFEF msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B3F1, MSGBOX_DEFAULT call BattleFrontier_BattleFactoryBattleRoom_EventScript_25B0E0 compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25B00C + goto_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25B00C goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEF8 BattleFrontier_BattleFactoryBattleRoom_EventScript_25B00C:: @ 825B00C setvar VAR_0x8004, 12 special CallFrontierUtilFunc compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105 + goto_if_ne BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105 msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B42D, MSGBOX_DEFAULT closemessage applymovement 8, BattleFrontier_BattleFactoryBattleRoom_Movement_25B182 @@ -188,7 +188,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B051:: @ 825B051 setvar VAR_0x8005, 7 special CallFrontierUtilFunc compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25B07E + goto_if_ne BattleFrontier_BattleFactoryBattleRoom_EventScript_25B07E msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B517, MSGBOX_DEFAULT setvar VAR_0x8004, 2 setvar VAR_0x8005, 7 @@ -198,14 +198,14 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B07E:: @ 825B07E msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B5CF, MSGBOX_DEFAULT call BattleFrontier_BattleFactoryBattleRoom_EventScript_25B0E0 compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25B09B + goto_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25B09B goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEF8 BattleFrontier_BattleFactoryBattleRoom_EventScript_25B09B:: @ 825B09B setvar VAR_0x8004, 12 special CallFrontierUtilFunc compare VAR_RESULT, 2 - goto_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105 + goto_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105 msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B5E7, MSGBOX_DEFAULT waitmessage applymovement 8, BattleFrontier_BattleFactoryBattleRoom_Movement_25B182 @@ -237,7 +237,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105:: @ 825B105 setvar VAR_0x8005, 3 special CallBattleFactoryFunction compare VAR_RESULT, 9999 - goto_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF3E + goto_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF3E addvar VAR_RESULT, 1 setorcopyvar VAR_0x8006, VAR_RESULT setvar VAR_0x8004, 2 @@ -247,7 +247,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105:: @ 825B105 setvar VAR_0x8005, 1 special CallBattleFactoryFunction compare VAR_RESULT, 9999 - goto_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF43 + goto_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF43 addvar VAR_RESULT, 1 setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 @@ -293,7 +293,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B190:: @ 825B190 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25B190:: @ 825B190 copyvar VAR_RESULT, VAR_FRONTIER_BATTLE_MODE compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25B1AA + goto_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25B1AA warp MAP_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY, 255, 4, 8 waitstate end diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc b/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc index ab6e3ee84..7548c2a28 100644 --- a/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc @@ -56,7 +56,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_25849B:: @ 825849B setvar VAR_0x8004, 10 special CallFrontierUtilFunc compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleFactoryLobby_EventScript_2584BD + goto_if_eq BattleFrontier_BattleFactoryLobby_EventScript_2584BD msgbox BattleFrontier_BattleFactoryLobby_Text_258D93, MSGBOX_DEFAULT waitmessage goto BattleFrontier_BattleFactoryLobby_EventScript_2584C6 @@ -103,7 +103,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_258506:: @ 8258506 BattleFrontier_BattleFactoryLobby_EventScript_25853B:: @ 825853B call BattleFrontier_BattleFactoryLobby_EventScript_23E8E0 compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleFactoryLobby_EventScript_258582 + goto_if_eq BattleFrontier_BattleFactoryLobby_EventScript_258582 message BattleFrontier_BattleFactoryLobby_Text_259388 waitmessage multichoicedefault 20, 8, 94, 1, 0 @@ -211,7 +211,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_2586B9:: @ 82586B9 call BattleFrontier_BattleFactoryLobby_EventScript_27134F setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleFactoryLobby_EventScript_258783 + goto_if_eq BattleFrontier_BattleFactoryLobby_EventScript_258783 setvar VAR_0x8006, 0 BattleFrontier_BattleFactoryLobby_EventScript_25871A:: @ 825871A diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc index 683b633ff..a79f792eb 100644 --- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc @@ -10,7 +10,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_MapScript2_259AC5: @ 8259AC5 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259ACF:: @ 8259ACF setvar VAR_TEMP_1, 1 compare VAR_0x8006, 1 - goto_if 5, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259AEA + goto_if_ne BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259AEA setobjectxy 1, 8, 7 turnobject 1, 1 @@ -24,13 +24,13 @@ BattleFrontier_BattleFactoryPreBattleRoom_MapScript2_259AEF: @ 8259AEF BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259AF9:: @ 8259AF9 compare VAR_0x8006, 1 - goto_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259BA5 + goto_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259BA5 setvar VAR_TEMP_0, 1 applymovement 1, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1AC applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A19A waitmovement 0 compare VAR_0x8006, 2 - goto_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E69 + goto_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E69 setvar VAR_0x8004, 13 special CallBattleFactoryFunction setvar VAR_0x8004, 12 @@ -76,7 +76,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259BA5:: @ 8259BA5 setvar VAR_0x8004, 9 special CallFrontierUtilFunc compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C26 + goto_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C26 playse 263 waitse msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AC15, MSGBOX_DEFAULT @@ -97,7 +97,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13:: @ 8259C13 setvar VAR_0x8004, 9 special CallFrontierUtilFunc compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B9 + goto_if_ne BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B9 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C26:: @ 8259C26 setvar VAR_0x8004, 1 @@ -117,7 +117,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C26:: @ 8259C26 call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E40 call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_23E8E0 compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259CC6 + goto_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259CC6 multichoice 19, 4, 103, 1 switch VAR_RESULT case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D98 @@ -186,7 +186,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259DF2:: @ 8259DF2 special CallBattleFactoryFunction waitstate compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74 + goto_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74 setvar VAR_0x8004, 8 special CallBattleFactoryFunction msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AB6C, MSGBOX_DEFAULT @@ -421,7 +421,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B9:: @ 825A0B9 waitmessage call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_23E8E0 compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A110 + goto_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A110 multichoice 19, 4, 103, 1 switch VAR_RESULT case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A146 diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc index c377d9580..569fc3809 100644 --- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc @@ -13,9 +13,9 @@ BattleFrontier_BattlePalaceBattleRoom_MapScript1_24F825: @ 824F825 BattleFrontier_BattlePalaceBattleRoom_EventScript_24F833:: @ 824F833 checkplayergender compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24F84B + goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24F84B compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24F856 + goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24F856 return BattleFrontier_BattlePalaceBattleRoom_EventScript_24F84B:: @ 824F84B @@ -38,7 +38,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24F86B:: @ 824F86B setvar VAR_0x8005, 2 special CallFrontierUtilFunc compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8B5 + goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8B5 applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE9B waitmovement 0 applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEAC @@ -107,7 +107,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A:: @ 824F98A special CallFrontierUtilFunc copyvar VAR_TEMP_F, VAR_RESULT compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB61 + goto_if_ne BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB61 setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 special CallFrontierUtilFunc @@ -125,7 +125,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A:: @ 824F98A call_if 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE89 call BattleFrontier_BattlePalaceBattleRoom_EventScript_23E8E0 compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FA42 + goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FA42 multichoice 19, 4, 103, 1 switch VAR_RESULT case 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB14 @@ -199,7 +199,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB3F:: @ 824FB3F BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB61:: @ 824FB61 compare VAR_TEMP_2, 1 - goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB79 + goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB79 msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2500DD, MSGBOX_DEFAULT setvar VAR_TEMP_2, 1 @@ -208,7 +208,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB79:: @ 824FB79 waitmessage call BattleFrontier_BattlePalaceBattleRoom_EventScript_23E8E0 compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FBD0 + goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FBD0 multichoice 19, 4, 103, 1 switch VAR_RESULT case 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FC06 @@ -248,7 +248,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FC06:: @ 824FC06 setvar VAR_0x8005, 7 special CallFrontierUtilFunc compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCAA + goto_if_ne BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCAA msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2501C1, MSGBOX_DEFAULT setvar VAR_0x8004, 2 setvar VAR_0x8005, 7 @@ -258,7 +258,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCAA:: @ 824FCAA msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2502C4, MSGBOX_DEFAULT call BattleFrontier_BattlePalaceBattleRoom_EventScript_24FDF7 compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCC7 + goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCC7 goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8FA BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCC7:: @ 824FCC7 @@ -267,7 +267,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCC7:: @ 824FCC7 setvar VAR_0x8004, 12 special CallFrontierUtilFunc compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28 + goto_if_ne BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28 msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2502FF, MSGBOX_DEFAULT applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE99 applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEAC @@ -291,7 +291,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD3A:: @ 824FD3A setvar VAR_0x8005, 7 special CallFrontierUtilFunc compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD67 + goto_if_ne BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD67 msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250485, MSGBOX_DEFAULT setvar VAR_0x8004, 2 setvar VAR_0x8005, 7 @@ -301,7 +301,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD67:: @ 824FD67 msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250572, MSGBOX_DEFAULT call BattleFrontier_BattlePalaceBattleRoom_EventScript_24FDF7 compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD84 + goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD84 goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8FA BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD84:: @ 824FD84 @@ -310,7 +310,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD84:: @ 824FD84 setvar VAR_0x8004, 12 special CallFrontierUtilFunc compare VAR_RESULT, 2 - goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28 + goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28 msgbox BattleFrontier_BattlePalaceBattleRoom_Text_25057E, MSGBOX_DEFAULT applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE99 applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEAC @@ -461,7 +461,7 @@ BattleFrontier_BattlePalaceBattleRoom_Movement_24FEB6: @ 824FEB6 BattleFrontier_BattlePalaceBattleRoom_EventScript_24FEBB:: @ 824FEBB copyvar VAR_RESULT, VAR_FRONTIER_BATTLE_MODE compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FED5 + goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FED5 warp MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY, 255, 5, 7 waitstate end diff --git a/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc b/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc index 98c6f8092..fb4503370 100644 --- a/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc +++ b/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc @@ -29,7 +29,7 @@ BattleFrontier_BattlePalaceCorridor_EventScript_24F4B3:: @ 824F4B3 setvar VAR_0x8005, 1 special CallFrontierUtilFunc compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattlePalaceCorridor_EventScript_24F553 + goto_if_eq BattleFrontier_BattlePalaceCorridor_EventScript_24F553 applymovement 1, BattleFrontier_BattlePalaceCorridor_Movement_24F5BD applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePalaceCorridor_Movement_24F5C4 waitmovement 0 diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc b/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc index 223dbc45a..55526526a 100644 --- a/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc @@ -50,7 +50,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D817:: @ 824D817 setvar VAR_0x8004, 10 special CallFrontierUtilFunc compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattlePalaceLobby_EventScript_24D838 + goto_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24D838 msgbox BattleFrontier_BattlePalaceLobby_Text_24E497, MSGBOX_DEFAULT goto BattleFrontier_BattlePalaceLobby_EventScript_24D840 @@ -98,7 +98,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D8A1:: @ 824D8A1 waitse call BattleFrontier_BattlePalaceLobby_EventScript_23E8E0 compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattlePalaceLobby_EventScript_24D907 + goto_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24D907 message BattleFrontier_BattlePalaceLobby_Text_24EF16 waitmessage multichoicedefault 20, 8, 94, 1, 0 @@ -151,7 +151,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D968:: @ 824D968 setvar VAR_0x8005, 0 special CallBattlePalaceFunction compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattlePalaceLobby_EventScript_24D817 + goto_if_ne BattleFrontier_BattlePalaceLobby_EventScript_24D817 special SavePlayerParty compare VAR_FRONTIER_BATTLE_MODE, 0 call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DB9E @@ -181,7 +181,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D9E6:: @ 824D9E6 setvar VAR_0x8004, 15 special CallFrontierUtilFunc compare VAR_0x8004, 1 - goto_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB45 + goto_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB45 setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT @@ -194,7 +194,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D9E6:: @ 824D9E6 special sub_80F9490 waitstate compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB91 + goto_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB91 msgbox BattleFrontier_BattlePalaceLobby_Text_24E3C8, MSGBOX_YESNO switch VAR_RESULT case 0, BattleFrontier_BattlePalaceLobby_EventScript_24DB91 @@ -226,7 +226,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DA87:: @ 824DA87 call BattleFrontier_BattlePalaceLobby_EventScript_27134F setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB7A + goto_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB7A BattleFrontier_BattlePalaceLobby_EventScript_24DAF3:: @ 824DAF3 special SavePlayerParty @@ -243,7 +243,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DAF3:: @ 824DAF3 BattleFrontier_BattlePalaceLobby_EventScript_24DB20:: @ 824DB20 compare VAR_FRONTIER_BATTLE_MODE, 1 - goto_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB38 + goto_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB38 msgbox BattleFrontier_BattlePalaceLobby_Text_24DE17, MSGBOX_DEFAULT goto BattleFrontier_BattlePalaceLobby_EventScript_24D999 diff --git a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc index 82ff5b3ae..c2d5c2eb5 100644 --- a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc @@ -52,7 +52,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B762:: @ 825B762 setvar VAR_0x8004, 10 special CallFrontierUtilFunc compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattlePikeLobby_EventScript_25B784 + goto_if_eq BattleFrontier_BattlePikeLobby_EventScript_25B784 msgbox BattleFrontier_BattlePikeLobby_Text_25C18A, MSGBOX_DEFAULT waitmessage goto BattleFrontier_BattlePikeLobby_EventScript_25B78D @@ -150,7 +150,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B8BB:: @ 825B8BB setvar VAR_0x8004, 15 special CallFrontierUtilFunc compare VAR_0x8004, 1 - goto_eq BattleFrontier_BattlePikeLobby_EventScript_25BA27 + goto_if_eq BattleFrontier_BattlePikeLobby_EventScript_25BA27 setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT @@ -163,7 +163,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B8BB:: @ 825B8BB special sub_80F9490 waitstate compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePikeLobby_EventScript_25BA73 + goto_if_eq BattleFrontier_BattlePikeLobby_EventScript_25BA73 msgbox BattleFrontier_BattlePikeLobby_Text_25C0D8, MSGBOX_YESNO switch VAR_RESULT case 0, BattleFrontier_BattlePikeLobby_EventScript_25BA73 @@ -200,7 +200,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B95C:: @ 825B95C setvar VAR_0x8004, 26 special CallBattlePikeFunction compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePikeLobby_EventScript_25BA5C + goto_if_eq BattleFrontier_BattlePikeLobby_EventScript_25BA5C special SavePlayerParty setvar VAR_0x8004, 3 setvar VAR_0x8005, 3 diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc index eea909b9c..6509310f5 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc @@ -146,7 +146,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2FB:: @ 825D2FB setvar VAR_0x8005, 7 special CallFrontierUtilFunc compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3BD + goto_if_ne BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3BD msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DED2, MSGBOX_DEFAULT setvar VAR_0x8004, 2 setvar VAR_0x8005, 7 @@ -156,14 +156,14 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3BD:: @ 825D3BD msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DF71, MSGBOX_DEFAULT call BattleFrontier_BattlePikeRandomRoom1_EventScript_25D77B compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3DA + goto_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3DA goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D20A BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3DA:: @ 825D3DA setvar VAR_0x8004, 12 special CallFrontierUtilFunc compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D + goto_if_ne BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DFA2, MSGBOX_DEFAULT waitmessage playfanfare MUS_ME_SYMBOLGET @@ -181,7 +181,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D416:: @ 825D416 setvar VAR_0x8005, 7 special CallFrontierUtilFunc compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D443 + goto_if_ne BattleFrontier_BattlePikeRandomRoom1_EventScript_25D443 msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E02C, MSGBOX_DEFAULT setvar VAR_0x8004, 2 setvar VAR_0x8005, 7 @@ -191,14 +191,14 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D443:: @ 825D443 msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E0E8, MSGBOX_DEFAULT call BattleFrontier_BattlePikeRandomRoom1_EventScript_25D77B compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D460 + goto_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D460 goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D20A BattleFrontier_BattlePikeRandomRoom1_EventScript_25D460:: @ 825D460 setvar VAR_0x8004, 12 special CallFrontierUtilFunc compare VAR_RESULT, 2 - goto_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D + goto_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E0F6, MSGBOX_DEFAULT waitmessage playfanfare MUS_ME_SYMBOLGET diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc index b00b41fd7..4138eebfd 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc @@ -39,9 +39,9 @@ BattleFrontier_BattlePikeRandomRoom3_MapScript1_25E47A: @ 825E47A setvar VAR_0x8005, 5 special CallFrontierUtilFunc compare VAR_RESULT, 2 - goto_eq BattleFrontier_BattlePikeRandomRoom3_EventScript_25E4A3 + goto_if_eq BattleFrontier_BattlePikeRandomRoom3_EventScript_25E4A3 compare VAR_RESULT, 3 - goto_eq BattleFrontier_BattlePikeRandomRoom3_EventScript_25E4A3 + goto_if_eq BattleFrontier_BattlePikeRandomRoom3_EventScript_25E4A3 end BattleFrontier_BattlePikeRandomRoom3_EventScript_25E4A3:: @ 825E4A3 diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc index ab40b6ff0..a92caecfd 100644 --- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc @@ -169,7 +169,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA78:: @ 825CA78 setvar VAR_0x8004, 17 special CallBattlePikeFunction compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA91 + goto_if_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA91 setvar VAR_TEMP_5, 255 end @@ -192,7 +192,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25CABB:: @ 825CABB setvar VAR_0x8004, 19 special CallBattlePikeFunction compare VAR_RESULT, 4 - goto_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_25CBC2 + goto_if_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_25CBC2 lock faceplayer msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CE69, MSGBOX_YESNO diff --git a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/scripts.inc b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/scripts.inc index 91a42ebde..4fa8d142a 100644 --- a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/scripts.inc +++ b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/scripts.inc @@ -15,29 +15,29 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F07D:: @ 825F07D BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A:: @ 825F08A specialvar VAR_TEMP_1, sub_813AA04 compare VAR_TEMP_1, VAR_0x8008 - goto_if 4, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F0C9 + goto_if_ge BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F0C9 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE86, MSGBOX_DEFAULT compare VAR_TEMP_2, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 + goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 compare VAR_TEMP_2, 1 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E + goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E compare VAR_TEMP_2, 2 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 + goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F0C9:: @ 825F0C9 compare VAR_TEMP_2, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F0E5 + goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F0E5 compare VAR_TEMP_2, 1 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F0E5 + goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F0E5 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F12A end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F0E5:: @ 825F0E5 checkdecorspace VAR_0x8009 compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F11D + goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F11D copyvar VAR_0x8004, VAR_0x8008 special sub_813A9A4 givedecoration VAR_0x8009 @@ -45,7 +45,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F0E5:: @ 825F0E5 playse SE_REGI msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE45, MSGBOX_DEFAULT compare VAR_TEMP_2, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 + goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E end @@ -58,7 +58,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F11D:: @ 825F11D BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F12A:: @ 825F12A checkitemspace VAR_0x8009, 1 compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F166 + goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F166 copyvar VAR_0x8004, VAR_0x8008 special sub_813A9A4 giveitem VAR_0x8009, 1 @@ -66,7 +66,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F12A:: @ 825F12A playse SE_REGI msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE72, MSGBOX_DEFAULT compare VAR_TEMP_2, 2 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 + goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 end @@ -108,7 +108,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185:: @ 825F185 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F21E:: @ 825F21E msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F8B6, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 + goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 setvar VAR_0x8008, 16 setvar VAR_0x8009, 75 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A @@ -117,7 +117,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F21E:: @ 825F21E BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F241:: @ 825F241 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F8E6, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 + goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 setvar VAR_0x8008, 32 setvar VAR_0x8009, 103 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A @@ -126,7 +126,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F241:: @ 825F241 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F264:: @ 825F264 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F917, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 + goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 setvar VAR_0x8008, 32 setvar VAR_0x8009, 87 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A @@ -135,7 +135,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F264:: @ 825F264 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F287:: @ 825F287 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F949, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 + goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 setvar VAR_0x8008, 48 setvar VAR_0x8009, 79 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A @@ -144,7 +144,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F287:: @ 825F287 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F2AA:: @ 825F2AA msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F979, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 + goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 setvar VAR_0x8008, 48 setvar VAR_0x8009, 84 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A @@ -153,7 +153,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F2AA:: @ 825F2AA BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F2CD:: @ 825F2CD msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F9A9, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 + goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 setvar VAR_0x8008, 48 setvar VAR_0x8009, 85 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A @@ -162,7 +162,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F2CD:: @ 825F2CD BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F2F0:: @ 825F2F0 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F9DB, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 + goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 setvar VAR_0x8008, 48 setvar VAR_0x8009, 86 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A @@ -171,7 +171,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F2F0:: @ 825F2F0 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F313:: @ 825F313 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FA0A, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 + goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 setvar VAR_0x8008, 80 setvar VAR_0x8009, 80 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A @@ -180,7 +180,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F313:: @ 825F313 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F336:: @ 825F336 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FA3D, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 + goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 setvar VAR_0x8008, 80 setvar VAR_0x8009, 81 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A @@ -189,7 +189,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F336:: @ 825F336 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F359:: @ 825F359 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FA70, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 + goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 setvar VAR_0x8008, 80 setvar VAR_0x8009, 82 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A @@ -222,7 +222,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E:: @ 825F38E BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F3F0:: @ 825F3F0 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FAA2, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E + goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E setvar VAR_0x8008, 128 setvar VAR_0x8009, 113 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A @@ -231,7 +231,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F3F0:: @ 825F3F0 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F413:: @ 825F413 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FAD2, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E + goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E setvar VAR_0x8008, 128 setvar VAR_0x8009, 111 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A @@ -240,7 +240,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F413:: @ 825F413 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F436:: @ 825F436 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB03, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E + goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E setvar VAR_0x8008, 256 setvar VAR_0x8009, 114 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A @@ -249,7 +249,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F436:: @ 825F436 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F459:: @ 825F459 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB35, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E + goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E setvar VAR_0x8008, 256 setvar VAR_0x8009, 115 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A @@ -258,7 +258,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F459:: @ 825F459 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F47C:: @ 825F47C msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB68, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E + goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E setvar VAR_0x8008, 256 setvar VAR_0x8009, 116 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A @@ -292,7 +292,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1:: @ 825F4B1 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F51E:: @ 825F51E msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB9B, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 + goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 setvar VAR_0x8008, 1 setvar VAR_0x8009, 64 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A @@ -301,7 +301,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F51E:: @ 825F51E BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F541:: @ 825F541 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FBC7, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 + goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 setvar VAR_0x8008, 1 setvar VAR_0x8009, 67 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A @@ -310,7 +310,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F541:: @ 825F541 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F564:: @ 825F564 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FBF3, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 + goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 setvar VAR_0x8008, 1 setvar VAR_0x8009, 65 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A @@ -319,7 +319,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F564:: @ 825F564 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F587:: @ 825F587 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC1C, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 + goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 setvar VAR_0x8008, 1 setvar VAR_0x8009, 70 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A @@ -328,7 +328,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F587:: @ 825F587 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5AA:: @ 825F5AA msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC45, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 + goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 setvar VAR_0x8008, 1 setvar VAR_0x8009, 66 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A @@ -337,7 +337,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5AA:: @ 825F5AA BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5CD:: @ 825F5CD msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC70, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 + goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 setvar VAR_0x8008, 1 setvar VAR_0x8009, 63 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A @@ -374,7 +374,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602:: @ 825F602 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F690:: @ 825F690 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE17, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 + goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 setvar VAR_0x8008, 48 setvar VAR_0x8009, 200 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A @@ -383,7 +383,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F690:: @ 825F690 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6B3:: @ 825F6B3 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FCCB, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 + goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 setvar VAR_0x8008, 48 setvar VAR_0x8009, 180 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A @@ -392,7 +392,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6B3:: @ 825F6B3 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6D6:: @ 825F6D6 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FCFA, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 + goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 setvar VAR_0x8008, 48 setvar VAR_0x8009, 183 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A @@ -401,7 +401,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6D6:: @ 825F6D6 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6F9:: @ 825F6F9 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FD29, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 + goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 setvar VAR_0x8008, 48 setvar VAR_0x8009, 185 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A @@ -410,7 +410,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6F9:: @ 825F6F9 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F71C:: @ 825F71C msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC9A, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 + goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 setvar VAR_0x8008, 64 setvar VAR_0x8009, 179 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A @@ -419,7 +419,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F71C:: @ 825F71C BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F73F:: @ 825F73F msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FD59, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 + goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 setvar VAR_0x8008, 64 setvar VAR_0x8009, 186 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A @@ -428,7 +428,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F73F:: @ 825F73F BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F762:: @ 825F762 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FD89, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 + goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 setvar VAR_0x8008, 64 setvar VAR_0x8009, 187 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A @@ -437,7 +437,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F762:: @ 825F762 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F785:: @ 825F785 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FDB9, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 + goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 setvar VAR_0x8008, 64 setvar VAR_0x8009, 196 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A @@ -446,7 +446,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F785:: @ 825F785 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7A8:: @ 825F7A8 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FDE8, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 + goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 setvar VAR_0x8008, 64 setvar VAR_0x8009, 198 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc b/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc index d6d53bc2f..558f6e416 100644 --- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc +++ b/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc @@ -22,7 +22,7 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252A77:: @ 8252A77 special CallBattlePyramidFunction delay 2 compare VAR_RESULT, 2 - goto_if 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252A77 + goto_if_ne BattleFrontier_BattlePyramidEmptySquare_EventScript_252A77 setvar VAR_TEMP_D, 0 releaseall end @@ -50,17 +50,17 @@ BattleFrontier_BattlePyramidEmptySquare_MapScript1_252AA2: @ 8252AA2 setvar VAR_0x8005, 5 special CallFrontierUtilFunc compare VAR_RESULT, 4 - goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39 + goto_if_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39 compare VAR_RESULT, 5 - goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39 + goto_if_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39 compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39 + goto_if_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39 compare VAR_RESULT, 2 - goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B42 + goto_if_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B42 compare VAR_RESULT, 3 - goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B42 + goto_if_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B42 compare VAR_RESULT, 9 - goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B42 + goto_if_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B42 setvar VAR_0x8004, 14 setvar VAR_0x8005, 8 special CallFrontierUtilFunc @@ -135,7 +135,7 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252BE8:: @ 8252BE8 copyvar VAR_0x8006, VAR_RESULT special CallFrontierUtilFunc compare VAR_RESULT, 7 - goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252C45 + goto_if_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252C45 setvar VAR_0x8004, 6 special CallBattlePyramidFunction setvar VAR_0x8004, 2 @@ -167,7 +167,7 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A:: @ 8252C6A special CallBattlePyramidFunction callstd STD_FIND_ITEM compare VAR_0x8007, 0 - goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252C87 + goto_if_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252C87 setvar VAR_0x8004, 8 special CallBattlePyramidFunction diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc index c2c32e0b1..de410d9c5 100644 --- a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc @@ -53,7 +53,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_2507B1:: @ 82507B1 setvar VAR_0x8004, 10 special CallFrontierUtilFunc compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattlePyramidLobby_EventScript_2507D2 + goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_2507D2 msgbox BattleFrontier_BattlePyramidLobby_Text_2517B5, MSGBOX_DEFAULT goto BattleFrontier_BattlePyramidLobby_EventScript_2507DA @@ -154,7 +154,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250904:: @ 8250904 setvar VAR_0x8004, 15 special CallFrontierUtilFunc compare VAR_0x8004, 1 - goto_eq BattleFrontier_BattlePyramidLobby_EventScript_250A75 + goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_250A75 setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT @@ -167,7 +167,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250904:: @ 8250904 special sub_80F9490 waitstate compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePyramidLobby_EventScript_250AC1 + goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_250AC1 msgbox BattleFrontier_BattlePyramidLobby_Text_2514E6, MSGBOX_YESNO switch VAR_RESULT case 0, BattleFrontier_BattlePyramidLobby_EventScript_250AC1 @@ -203,7 +203,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_2509A5:: @ 82509A5 call BattleFrontier_BattlePyramidLobby_EventScript_27134F setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePyramidLobby_EventScript_250AAA + goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_250AAA BattleFrontier_BattlePyramidLobby_EventScript_250A21:: @ 8250A21 special SavePlayerParty @@ -286,7 +286,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250B28:: @ 8250B28 setvar VAR_0x8005, 5 special CallBattlePyramidFunction compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattlePyramidLobby_EventScript_250B53 + goto_if_ne BattleFrontier_BattlePyramidLobby_EventScript_250B53 setvar VAR_RESULT, 0 goto BattleFrontier_BattlePyramidLobby_EventScript_250BA4 return @@ -304,7 +304,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250B66:: @ 8250B66 setvar VAR_0x8005, 6 special CallBattlePyramidFunction compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattlePyramidLobby_EventScript_250B91 + goto_if_ne BattleFrontier_BattlePyramidLobby_EventScript_250B91 setvar VAR_RESULT, 0 goto BattleFrontier_BattlePyramidLobby_EventScript_250BA4 return @@ -441,7 +441,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250D56:: @ 8250D56 setvar VAR_0x8005, 1 special CallBattlePyramidFunction compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePyramidLobby_EventScript_250D94 + goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_250D94 msgbox BattleFrontier_BattlePyramidLobby_Text_2515AD, MSGBOX_DEFAULT goto BattleFrontier_BattlePyramidLobby_EventScript_250D9C @@ -497,7 +497,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250DDB:: @ 8250DDB setflag FLAG_SPECIAL_FLAG_0x4004 special sub_81C6A94 compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePyramidLobby_EventScript_250E00 + goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_250E00 message BattleFrontier_BattlePyramidLobby_Text_2518C6 waitmessage goto BattleFrontier_BattlePyramidLobby_EventScript_250E09 @@ -535,7 +535,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250E50:: @ 8250E50 BattleFrontier_BattlePyramidLobby_EventScript_250E60:: @ 8250E60 special sub_81B95E0 compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattlePyramidLobby_EventScript_250E6F + goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_250E6F return BattleFrontier_BattlePyramidLobby_EventScript_250E6F:: @ 8250E6F diff --git a/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc b/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc index a3a004d6b..1dc58363e 100644 --- a/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc +++ b/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc @@ -21,7 +21,7 @@ BattleFrontier_BattlePyramidTop_EventScript_2550D8:: @ 82550D8 setvar VAR_TEMP_1, 1 turnobject 255, 2 compare VAR_TEMP_C, 0 - goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_2550F3 + goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_2550F3 setobjectxyperm 2, 0, 0 BattleFrontier_BattlePyramidTop_EventScript_2550F3:: @ 82550F3 @@ -31,7 +31,7 @@ BattleFrontier_BattlePyramidTop_MapScript1_2550F4: @ 82550F4 setvar VAR_0x8004, 9 special CallFrontierUtilFunc compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePyramidTop_EventScript_25510C + goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_25510C call BattleFrontier_BattlePyramidTop_EventScript_242170 BattleFrontier_BattlePyramidTop_EventScript_25510C:: @ 825510C @@ -46,11 +46,11 @@ BattleFrontier_BattlePyramidTop_EventScript_25510C:: @ 825510C setvar VAR_0x8005, 5 special CallFrontierUtilFunc compare VAR_RESULT, 2 - goto_eq BattleFrontier_BattlePyramidTop_EventScript_252B42 + goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42 compare VAR_RESULT, 3 - goto_eq BattleFrontier_BattlePyramidTop_EventScript_252B42 + goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42 compare VAR_RESULT, 9 - goto_eq BattleFrontier_BattlePyramidTop_EventScript_252B42 + goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42 end BattleFrontier_BattlePyramidTop_MapScript2_25516E: @ 825516E @@ -89,9 +89,9 @@ BattleFrontier_BattlePyramidTop_EventScript_2551D0:: @ 82551D0 lock faceplayer compare VAR_TEMP_D, 0 - goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_255236 + goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_255236 compare VAR_TEMP_C, 0 - goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_255240 + goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_255240 msgbox BattleFrontier_BattlePyramidTop_Text_255410, MSGBOX_DEFAULT closemessage applymovement 1, BattleFrontier_BattlePyramidTop_Movement_2553FD @@ -137,7 +137,7 @@ BattleFrontier_BattlePyramidTop_EventScript_255256:: @ 8255256 setvar VAR_0x8005, 7 special CallFrontierUtilFunc compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_2552D0 + goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_2552D0 special SpawnCameraObject applymovement EVENT_OBJ_ID_CAMERA, BattleFrontier_BattlePyramidTop_Movement_25540C waitmovement 0 @@ -161,14 +161,14 @@ BattleFrontier_BattlePyramidTop_EventScript_2552DA:: @ 82552DA call BattleFrontier_BattlePyramidTop_EventScript_2553ED playbgm MUS_PYRAMID_TOP, 0 compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattlePyramidTop_EventScript_2552FB + goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_2552FB goto BattleFrontier_BattlePyramidTop_EventScript_252B42 BattleFrontier_BattlePyramidTop_EventScript_2552FB:: @ 82552FB setvar VAR_0x8004, 12 special CallFrontierUtilFunc compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_25521A + goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_25521A msgbox BattleFrontier_BattlePyramidTop_Text_255873, MSGBOX_DEFAULT playfanfare MUS_ME_SYMBOLGET message BattleFrontier_BattlePyramidTop_Text_2558E9 @@ -184,7 +184,7 @@ BattleFrontier_BattlePyramidTop_EventScript_255335:: @ 8255335 setvar VAR_0x8005, 7 special CallFrontierUtilFunc compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_255388 + goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_255388 special SpawnCameraObject applymovement EVENT_OBJ_ID_CAMERA, BattleFrontier_BattlePyramidTop_Movement_25540C waitmovement 0 @@ -208,14 +208,14 @@ BattleFrontier_BattlePyramidTop_EventScript_255392:: @ 8255392 call BattleFrontier_BattlePyramidTop_EventScript_2553ED playbgm MUS_PYRAMID_TOP, 0 compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattlePyramidTop_EventScript_2553B3 + goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_2553B3 goto BattleFrontier_BattlePyramidTop_EventScript_252B42 BattleFrontier_BattlePyramidTop_EventScript_2553B3:: @ 82553B3 setvar VAR_0x8004, 12 special CallFrontierUtilFunc compare VAR_RESULT, 2 - goto_eq BattleFrontier_BattlePyramidTop_EventScript_25521A + goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_25521A msgbox BattleFrontier_BattlePyramidTop_Text_255ACD, MSGBOX_DEFAULT playfanfare MUS_ME_SYMBOLGET message BattleFrontier_BattlePyramidTop_Text_255B59 diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc index d8e3d3ce6..c505cf8cb 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc @@ -24,7 +24,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241B6C:: @ 8241B6C setvar VAR_0x8005, 2 special CallFrontierUtilFunc compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241BC3 + goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241BC3 applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_24218D waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_24217E @@ -91,14 +91,14 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F:: @ 8241C8F special CallFrontierUtilFunc copyvar VAR_TEMP_F, VAR_RESULT compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattleTowerBattleRoom_EventScript_241F0A + goto_if_ne BattleFrontier_BattleTowerBattleRoom_EventScript_241F0A setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 special CallFrontierUtilFunc call BattleFrontier_BattleTowerBattleRoom_EventScript_241E44 call BattleFrontier_BattleTowerBattleRoom_EventScript_23E8E0 compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241D0A + goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241D0A multichoice 19, 4, 103, 1 switch VAR_RESULT case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_241DDC @@ -246,7 +246,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241EC3:: @ 8241EC3 BattleFrontier_BattleTowerBattleRoom_EventScript_241F0A:: @ 8241F0A compare VAR_TEMP_2, 1 - goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241F22 + goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241F22 msgbox BattleFrontier_BattleTowerBattleRoom_Text_2424C2, MSGBOX_DEFAULT setvar VAR_TEMP_2, 1 @@ -255,7 +255,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241F22:: @ 8241F22 waitmessage call BattleFrontier_BattleTowerBattleRoom_EventScript_23E8E0 compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241F79 + goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241F79 multichoice 19, 4, 103, 1 switch VAR_RESULT case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_241FAF @@ -290,7 +290,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241FAF:: @ 8241FAF setvar VAR_0x8005, 7 special CallFrontierUtilFunc compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattleTowerBattleRoom_EventScript_242029 + goto_if_ne BattleFrontier_BattleTowerBattleRoom_EventScript_242029 msgbox BattleFrontier_BattleTowerBattleRoom_Text_242579, MSGBOX_DEFAULT setvar VAR_0x8004, 2 setvar VAR_0x8005, 7 @@ -300,7 +300,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_242029:: @ 8242029 msgbox BattleFrontier_BattleTowerBattleRoom_Text_24268C, MSGBOX_DEFAULT call BattleFrontier_BattleTowerBattleRoom_EventScript_24210E compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_242046 + goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_242046 goto BattleFrontier_BattleTowerBattleRoom_EventScript_241C03 BattleFrontier_BattleTowerBattleRoom_EventScript_242046:: @ 8242046 @@ -308,7 +308,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_242046:: @ 8242046 setvar VAR_0x8004, 12 special CallFrontierUtilFunc compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6 + goto_if_ne BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6 msgbox BattleFrontier_BattleTowerBattleRoom_Text_2426B4, MSGBOX_DEFAULT playfanfare MUS_ME_SYMBOLGET message BattleFrontier_BattleTowerBattleRoom_Text_24270E @@ -324,7 +324,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_242085:: @ 8242085 setvar VAR_0x8005, 7 special CallFrontierUtilFunc compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattleTowerBattleRoom_EventScript_2420B2 + goto_if_ne BattleFrontier_BattleTowerBattleRoom_EventScript_2420B2 msgbox BattleFrontier_BattleTowerBattleRoom_Text_2427F9, MSGBOX_DEFAULT setvar VAR_0x8004, 2 setvar VAR_0x8005, 7 @@ -334,7 +334,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_2420B2:: @ 82420B2 msgbox BattleFrontier_BattleTowerBattleRoom_Text_2428E0, MSGBOX_DEFAULT call BattleFrontier_BattleTowerBattleRoom_EventScript_24210E compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_2420CF + goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_2420CF goto BattleFrontier_BattleTowerBattleRoom_EventScript_241C03 BattleFrontier_BattleTowerBattleRoom_EventScript_2420CF:: @ 82420CF @@ -342,7 +342,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_2420CF:: @ 82420CF setvar VAR_0x8004, 12 special CallFrontierUtilFunc compare VAR_RESULT, 2 - goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6 + goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6 msgbox BattleFrontier_BattleTowerBattleRoom_Text_2428F7, MSGBOX_DEFAULT playfanfare MUS_ME_SYMBOLGET message BattleFrontier_BattleTowerBattleRoom_Text_242932 @@ -368,7 +368,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_24210E:: @ 824210E waitstate copyvar VAR_0x8004, VAR_FRONTIER_BATTLE_MODE compare VAR_0x8004, 3 - goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_24215A + goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_24215A setvar VAR_0x8004, 18 special CallFrontierUtilFunc special HealPlayerParty @@ -486,11 +486,11 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_2421B8:: @ 82421B8 BattleFrontier_BattleTowerBattleRoom_EventScript_2421B8:: @ 82421B8 copyvar VAR_RESULT, VAR_FRONTIER_BATTLE_MODE compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_2421E8 + goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_2421E8 compare VAR_RESULT, 2 - goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_2421F2 + goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_2421F2 compare VAR_RESULT, 3 - goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_2421FC + goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_2421FC warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 255, 6, 6 waitstate end diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc index fa17ef5af..9fe2cec0e 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc @@ -16,7 +16,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_248F0F:: @ 8248F0F special sub_8161F74 checkplayergender compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_248F29 + goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_248F29 setvar VAR_OBJ_GFX_ID_F, 0 return @@ -49,7 +49,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_248F4D:: @ 8248F4D setvar VAR_0x8005, 2 special CallFrontierUtilFunc compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_248FB4 + goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_248FB4 applymovement 2, BattleFrontier_BattleTowerBattleRoom2_Movement_24953E applymovement 3, BattleFrontier_BattleTowerBattleRoom2_Movement_24953E waitmovement 0 @@ -71,7 +71,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_248FB4:: @ 8248FB4 applymovement 4, BattleFrontier_BattleTowerBattleRoom2_Movement_24952E waitmovement 0 compare VAR_FRONTIER_BATTLE_MODE, 3 - goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249026 + goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249026 setvar VAR_0x8004, 7 setvar VAR_0x8005, 0 special sub_8161F74 @@ -143,7 +143,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_2490AA:: @ 82490AA applymovement 6, BattleFrontier_BattleTowerBattleRoom2_Movement_249524 waitmovement 0 compare VAR_FRONTIER_BATTLE_MODE, 3 - goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249118 + goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249118 msgbox BattleFrontier_BattleTowerBattleRoom2_Text_242217, MSGBOX_DEFAULT goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249121 @@ -169,10 +169,10 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249143:: @ 8249143 special CallFrontierUtilFunc call BattleFrontier_BattleTowerBattleRoom2_EventScript_2492FD compare VAR_FRONTIER_BATTLE_MODE, 3 - goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249283 + goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249283 call BattleFrontier_BattleTowerBattleRoom2_EventScript_23E8E0 compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_2491B1 + goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_2491B1 multichoice 19, 4, 103, 1 switch VAR_RESULT case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_249283 @@ -257,7 +257,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_2492DB:: @ 82492DB BattleFrontier_BattleTowerBattleRoom2_EventScript_2492FD:: @ 82492FD compare VAR_FRONTIER_BATTLE_MODE, 3 - goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_24937E + goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_24937E copyvar VAR_TEMP_F, VAR_RESULT switch VAR_TEMP_F case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249354 @@ -349,8 +349,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249412:: @ 8249412 return BattleFrontier_BattleTowerBattleRoom2_EventScript_249417:: @ 8249417 - checkflag FLAG_TEMP_2 - goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249457 + goto_if_set FLAG_TEMP_2, BattleFrontier_BattleTowerBattleRoom2_EventScript_249457 multichoice 19, 6, 105, 1 switch VAR_RESULT case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_249483 @@ -375,7 +374,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249483:: @ 8249483 special sub_813B568 waitstate compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattleTowerBattleRoom2_EventScript_24907E + goto_if_ne BattleFrontier_BattleTowerBattleRoom2_EventScript_24907E goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249412 end @@ -396,7 +395,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_2494DD:: @ 82494DD waitmessage multichoicedefault 20, 8, 94, 1, 0 compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_2494FA + goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_2494FA goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249143 end diff --git a/data/maps/BattleFrontier_BattleTowerCorridor/scripts.inc b/data/maps/BattleFrontier_BattleTowerCorridor/scripts.inc index b0a9624f8..55e21dedb 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerCorridor/scripts.inc @@ -5,7 +5,7 @@ BattleFrontier_BattleTowerCorridor_MapScripts:: @ 8241AAA BattleFrontier_BattleTowerCorridor_MapScript1_241AB5: @ 8241AB5 compare VAR_0x8006, 1 - goto_eq BattleFrontier_BattleTowerCorridor_EventScript_241AD3 + goto_if_eq BattleFrontier_BattleTowerCorridor_EventScript_241AD3 setmetatile 12, 0, 519, 0 setmetatile 12, 1, 527, 0 end @@ -22,7 +22,7 @@ BattleFrontier_BattleTowerCorridor_MapScript2_241AE6: @ 8241AE6 BattleFrontier_BattleTowerCorridor_EventScript_241AF0:: @ 8241AF0 setvar VAR_TEMP_0, 1 compare VAR_0x8006, 1 - goto_eq BattleFrontier_BattleTowerCorridor_EventScript_241B16 + goto_if_eq BattleFrontier_BattleTowerCorridor_EventScript_241B16 applymovement 1, BattleFrontier_BattleTowerCorridor_Movement_241B3A applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerCorridor_Movement_241B39 waitmovement 0 diff --git a/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc b/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc index d28fa105d..69c61e342 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc @@ -16,7 +16,7 @@ BattleFrontier_BattleTowerCorridor2_EventScript_248D71:: @ 8248D71 special sub_8161F74 checkplayergender compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleTowerCorridor2_EventScript_248D8B + goto_if_eq BattleFrontier_BattleTowerCorridor2_EventScript_248D8B setvar VAR_OBJ_GFX_ID_F, 0 return diff --git a/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc b/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc index aa0fa97ff..486fc4259 100644 --- a/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc @@ -40,8 +40,7 @@ BattleFrontier_BattleTowerElevator_EventScript_241A55:: @ 8241A55 return BattleFrontier_BattleTowerElevator_EventScript_241A5F:: @ 8241A5F - checkflag FLAG_0x152 - goto_if 0, BattleFrontier_BattleTowerElevator_EventScript_241A7C + goto_if_unset FLAG_0x152, BattleFrontier_BattleTowerElevator_EventScript_241A7C warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2, 255, 7, 2 waitstate return diff --git a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc index ec649dd9f..dcab741d8 100644 --- a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc @@ -14,9 +14,8 @@ BattleFrontier_BattleTowerLobby_MapScript1_23E694: @ 823E694 setvar VAR_0x8004, 10 special CallApprenticeFunction compare VAR_0x8004, 0 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23E6B5 - checkflag FLAG_0x934 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23E6C1 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23E6B5 + goto_if_set FLAG_0x934, BattleFrontier_BattleTowerLobby_EventScript_23E6C1 BattleFrontier_BattleTowerLobby_EventScript_23E6B5:: @ 823E6B5 clearflag FLAG_HIDE_APPRENTICE @@ -79,7 +78,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E758:: @ 823E758 setvar VAR_0x8004, 10 special CallFrontierUtilFunc compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23E778 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23E778 message BattleFrontier_BattleTowerLobby_Text_23F60D waitmessage goto BattleFrontier_BattleTowerLobby_EventScript_23E780 @@ -91,7 +90,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E780:: @ 823E780 setvar VAR_0x8004, 5 special sub_8161F74 compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23E7A5 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23E7A5 message BattleFrontier_BattleTowerLobby_Text_23F844 waitmessage playfanfare MUS_FANFA4 @@ -108,7 +107,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E7A5:: @ 823E7A5 setvar VAR_0x8005, 1 special sub_8161F74 compare VAR_RESULT, 49 - goto_if 5, BattleFrontier_BattleTowerLobby_EventScript_23E7E2 + goto_if_ne BattleFrontier_BattleTowerLobby_EventScript_23E7E2 msgbox BattleFrontier_BattleTowerLobby_Text_23F79D, MSGBOX_DEFAULT BattleFrontier_BattleTowerLobby_EventScript_23E7E2:: @ 823E7E2 @@ -120,14 +119,13 @@ BattleFrontier_BattleTowerLobby_EventScript_23E7E2:: @ 823E7E2 BattleFrontier_BattleTowerLobby_EventScript_23E7F2:: @ 823E7F2 compare VAR_FRONTIER_BATTLE_MODE, 2 - goto_if 5, BattleFrontier_BattleTowerLobby_EventScript_23E81E - checkflag FLAG_0x152 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23E81E + goto_if_ne BattleFrontier_BattleTowerLobby_EventScript_23E81E + goto_if_set FLAG_0x152, BattleFrontier_BattleTowerLobby_EventScript_23E81E setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 special sub_8161F74 compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattleTowerLobby_EventScript_23E830 + goto_if_ne BattleFrontier_BattleTowerLobby_EventScript_23E830 BattleFrontier_BattleTowerLobby_EventScript_23E81E:: @ 823E81E setvar VAR_0x8004, 2 @@ -161,7 +159,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E84D:: @ 823E84D waitse call BattleFrontier_BattleTowerLobby_EventScript_23E8E0 compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23E8DF + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23E8DF message BattleFrontier_BattleTowerLobby_Text_23FE3C waitmessage multichoicedefault 20, 8, 94, 1, 0 @@ -184,7 +182,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E8B4:: @ 823E8B4 setvar VAR_0x8004, 19 special CallFrontierUtilFunc compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23E8D7 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23E8D7 playse SE_SAVE msgbox BattleFrontier_BattleTowerLobby_Text_2423CD, MSGBOX_DEFAULT goto BattleFrontier_BattleTowerLobby_EventScript_23E8DF @@ -264,7 +262,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E984:: @ 823E984 setvar VAR_0x8004, 15 special CallFrontierUtilFunc compare VAR_0x8004, 1 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT @@ -277,7 +275,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E984:: @ 823E984 special sub_80F9490 waitstate compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E3 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E3 msgbox BattleFrontier_BattleTowerLobby_Text_23FDC7, MSGBOX_YESNO switch VAR_RESULT case 0, BattleFrontier_BattleTowerLobby_EventScript_23F0E3 @@ -305,7 +303,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EA2A:: @ 823EA2A call BattleFrontier_BattleTowerLobby_EventScript_27134F setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0 incrementgamestat 30 setvar VAR_0x40BC, 1 goto BattleFrontier_BattleTowerLobby_EventScript_23F0F3 @@ -344,7 +342,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EAED:: @ 823EAED setvar VAR_0x8004, 15 special CallFrontierUtilFunc compare VAR_0x8004, 1 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT @@ -357,7 +355,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EAED:: @ 823EAED special sub_80F9490 waitstate compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E3 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E3 msgbox BattleFrontier_BattleTowerLobby_Text_23FDC7, MSGBOX_YESNO switch VAR_RESULT case 0, BattleFrontier_BattleTowerLobby_EventScript_23F0E3 @@ -385,7 +383,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EB93:: @ 823EB93 call BattleFrontier_BattleTowerLobby_EventScript_27134F setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0 incrementgamestat 30 setvar VAR_0x40BC, 0 goto BattleFrontier_BattleTowerLobby_EventScript_23F0F3 @@ -425,7 +423,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EC59:: @ 823EC59 setvar VAR_0x8004, 15 special CallFrontierUtilFunc compare VAR_0x8004, 1 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT @@ -438,7 +436,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EC59:: @ 823EC59 special sub_80F9490 waitstate compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E3 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E3 msgbox BattleFrontier_BattleTowerLobby_Text_23FDC7, MSGBOX_YESNO switch VAR_RESULT case 0, BattleFrontier_BattleTowerLobby_EventScript_23F0E3 @@ -466,7 +464,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23ECFF:: @ 823ECFF call BattleFrontier_BattleTowerLobby_EventScript_27134F setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0 incrementgamestat 30 setvar VAR_0x40BC, 0 goto BattleFrontier_BattleTowerLobby_EventScript_23F0F3 @@ -505,7 +503,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EDC2:: @ 823EDC2 setvar VAR_0x8004, 15 special CallFrontierUtilFunc compare VAR_0x8004, 1 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT @@ -518,7 +516,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EDC2:: @ 823EDC2 special sub_80F9490 waitstate compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E3 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E3 msgbox BattleFrontier_BattleTowerLobby_Text_23FDC7, MSGBOX_YESNO switch VAR_RESULT case 0, BattleFrontier_BattleTowerLobby_EventScript_23F0E3 @@ -549,11 +547,11 @@ BattleFrontier_BattleTowerLobby_EventScript_23EE68:: @ 823EE68 call BattleFrontier_BattleTowerLobby_EventScript_27134F setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0 incrementgamestat 30 specialvar VAR_RESULT, IsWirelessAdapterConnected compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F3E8 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F3E8 goto BattleFrontier_BattleTowerLobby_EventScript_23F2C5 end @@ -606,9 +604,9 @@ BattleFrontier_BattleTowerLobby_EventScript_23EF80:: @ 823EF80 BattleFrontier_BattleTowerLobby_EventScript_23EF8A:: @ 823EF8A compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23EFA1 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23EFA1 compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23EFAB + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23EFAB end BattleFrontier_BattleTowerLobby_EventScript_23EFA1:: @ 823EFA1 @@ -744,7 +742,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F108:: @ 823F108 special sub_8161F74 delay 1 compare VAR_RESULT, 6 - goto_if 5, BattleFrontier_BattleTowerLobby_EventScript_23F108 + goto_if_ne BattleFrontier_BattleTowerLobby_EventScript_23F108 call BattleFrontier_BattleTowerLobby_EventScript_23F135 clearflag FLAG_0x077 warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_ELEVATOR, 255, 1, 6 @@ -755,7 +753,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F108:: @ 823F108 BattleFrontier_BattleTowerLobby_EventScript_23F135:: @ 823F135 call BattleFrontier_BattleTowerLobby_EventScript_23F1A7 compare VAR_FRONTIER_BATTLE_MODE, 3 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F152 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F152 msgbox BattleFrontier_BattleTowerLobby_Text_23FE11, MSGBOX_DEFAULT goto BattleFrontier_BattleTowerLobby_EventScript_23F15B @@ -935,25 +933,25 @@ BattleFrontier_BattleTowerLobby_EventScript_23F2C5:: @ 823F2C5 special sub_80B2DA4 waitstate compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F3AF + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F3AF compare VAR_RESULT, 2 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_2772D2 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_2772D2 compare VAR_RESULT, 3 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F327 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F327 compare VAR_RESULT, 4 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F351 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F351 compare VAR_RESULT, 5 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E6 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E6 compare VAR_RESULT, 6 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_2772C5 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_2772C5 compare VAR_RESULT, 11 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F366 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F366 end BattleFrontier_BattleTowerLobby_EventScript_23F327:: @ 823F327 special CloseLink compare VAR_0x8005, 3 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F33F + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F33F msgbox BattleFrontier_BattleTowerLobby_Text_278255, MSGBOX_DEFAULT release end @@ -1035,26 +1033,26 @@ BattleFrontier_BattleTowerLobby_EventScript_23F3F3:: @ 823F3F3 BattleFrontier_BattleTowerLobby_EventScript_23F430:: @ 823F430 call BattleFrontier_BattleTowerLobby_EventScript_277B30 compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F496 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F496 compare VAR_RESULT, 5 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F3F3 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F3F3 compare VAR_RESULT, 8 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F430 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F430 compare VAR_RESULT, 11 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F366 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F366 release return BattleFrontier_BattleTowerLobby_EventScript_23F463:: @ 823F463 call BattleFrontier_BattleTowerLobby_EventScript_277B35 compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F496 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F496 compare VAR_RESULT, 5 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F3F3 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F3F3 compare VAR_RESULT, 8 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F463 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F463 compare VAR_RESULT, 11 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F366 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F366 release return diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc index 03bb7be63..8406cb644 100644 --- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc @@ -11,8 +11,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DA7: @ 8243DA7 end BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DB0: @ 8243DB0 - checkflag FLAG_0x152 - goto_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243DDA + goto_if_set FLAG_0x152, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243DDA clearflag FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_1 clearflag FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_2 clearflag FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_3 @@ -89,7 +88,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E7A:: @ 8243E7A waitmessage multichoicedefault 20, 8, 94, 1, 0 compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E9D + goto_if_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E9D msgbox BattleFrontier_BattleTowerMultiBattleRoom_Text_24410C, MSGBOX_DEFAULT release end @@ -166,8 +165,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F29:: @ 8243F29 end BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F36:: @ 8243F36 - checkflag FLAG_0x152 - goto_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FC3 + goto_if_set FLAG_0x152, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FC3 setvar VAR_0x8004, 11 setvar VAR_0x8005, 0 special sub_8161F74 diff --git a/data/maps/BattleFrontier_Lounge1/scripts.inc b/data/maps/BattleFrontier_Lounge1/scripts.inc index ea1ae17a0..34434ef05 100644 --- a/data/maps/BattleFrontier_Lounge1/scripts.inc +++ b/data/maps/BattleFrontier_Lounge1/scripts.inc @@ -16,9 +16,9 @@ BattleFrontier_Lounge1_EventScript_25E792:: @ 825E792 special sub_81B94B0 waitstate compare VAR_0x8004, 255 - goto_if 5, BattleFrontier_Lounge1_EventScript_25E7BF + goto_if_ne BattleFrontier_Lounge1_EventScript_25E7BF compare VAR_0x8004, 255 - goto_eq BattleFrontier_Lounge1_EventScript_25E943 + goto_if_eq BattleFrontier_Lounge1_EventScript_25E943 end BattleFrontier_Lounge1_EventScript_25E7AD:: @ 825E7AD @@ -32,16 +32,16 @@ BattleFrontier_Lounge1_EventScript_25E7B6:: @ 825E7B6 BattleFrontier_Lounge1_EventScript_25E7BF:: @ 825E7BF specialvar VAR_RESULT, ScriptGetPartyMonSpecies compare VAR_RESULT, 412 - goto_eq BattleFrontier_Lounge1_EventScript_25E7FF + goto_if_eq BattleFrontier_Lounge1_EventScript_25E7FF special sub_8139D98 compare VAR_0x8005, 90 - goto_if 3, BattleFrontier_Lounge1_EventScript_25E87F + goto_if_le BattleFrontier_Lounge1_EventScript_25E87F compare VAR_0x8005, 120 - goto_if 3, BattleFrontier_Lounge1_EventScript_25E88D + goto_if_le BattleFrontier_Lounge1_EventScript_25E88D compare VAR_0x8005, 150 - goto_if 3, BattleFrontier_Lounge1_EventScript_25E89B + goto_if_le BattleFrontier_Lounge1_EventScript_25E89B compare VAR_0x8005, 151 - goto_if 4, BattleFrontier_Lounge1_EventScript_25E8A9 + goto_if_ge BattleFrontier_Lounge1_EventScript_25E8A9 end BattleFrontier_Lounge1_EventScript_25E7FF:: @ 825E7FF @@ -51,28 +51,28 @@ BattleFrontier_Lounge1_EventScript_25E7FF:: @ 825E7FF BattleFrontier_Lounge1_EventScript_25E80D:: @ 825E80D compare VAR_0x8006, 0 - goto_eq BattleFrontier_Lounge1_EventScript_25E8B7 + goto_if_eq BattleFrontier_Lounge1_EventScript_25E8B7 compare VAR_0x8006, 1 - goto_eq BattleFrontier_Lounge1_EventScript_25E8C5 + goto_if_eq BattleFrontier_Lounge1_EventScript_25E8C5 compare VAR_0x8006, 2 - goto_eq BattleFrontier_Lounge1_EventScript_25E8D3 + goto_if_eq BattleFrontier_Lounge1_EventScript_25E8D3 compare VAR_0x8006, 3 - goto_eq BattleFrontier_Lounge1_EventScript_25E8E1 + goto_if_eq BattleFrontier_Lounge1_EventScript_25E8E1 compare VAR_0x8006, 4 - goto_eq BattleFrontier_Lounge1_EventScript_25E8EF + goto_if_eq BattleFrontier_Lounge1_EventScript_25E8EF compare VAR_0x8006, 5 - goto_eq BattleFrontier_Lounge1_EventScript_25E8FD + goto_if_eq BattleFrontier_Lounge1_EventScript_25E8FD end BattleFrontier_Lounge1_EventScript_25E850:: @ 825E850 compare VAR_0x8007, 15 - goto_if 3, BattleFrontier_Lounge1_EventScript_25E90B + goto_if_le BattleFrontier_Lounge1_EventScript_25E90B compare VAR_0x8007, 25 - goto_if 3, BattleFrontier_Lounge1_EventScript_25E919 + goto_if_le BattleFrontier_Lounge1_EventScript_25E919 compare VAR_0x8007, 30 - goto_if 3, BattleFrontier_Lounge1_EventScript_25E927 + goto_if_le BattleFrontier_Lounge1_EventScript_25E927 compare VAR_0x8007, 31 - goto_if 4, BattleFrontier_Lounge1_EventScript_25E935 + goto_if_ge BattleFrontier_Lounge1_EventScript_25E935 end BattleFrontier_Lounge1_EventScript_25E87D:: @ 825E87D diff --git a/data/maps/BattleFrontier_Lounge2/scripts.inc b/data/maps/BattleFrontier_Lounge2/scripts.inc index a044e3439..40e5c9332 100644 --- a/data/maps/BattleFrontier_Lounge2/scripts.inc +++ b/data/maps/BattleFrontier_Lounge2/scripts.inc @@ -4,8 +4,7 @@ BattleFrontier_Lounge2_MapScripts:: @ 8260642 BattleFrontier_Lounge2_EventScript_260643:: @ 8260643 lock faceplayer - checkflag FLAG_0x154 - goto_eq BattleFrontier_Lounge2_EventScript_26065F + goto_if_set FLAG_0x154, BattleFrontier_Lounge2_EventScript_26065F setflag FLAG_0x154 msgbox BattleFrontier_Lounge2_Text_260766, MSGBOX_DEFAULT goto BattleFrontier_Lounge2_EventScript_26066D diff --git a/data/maps/BattleFrontier_Lounge3/scripts.inc b/data/maps/BattleFrontier_Lounge3/scripts.inc index 26cbeebcf..3c5b74b4a 100644 --- a/data/maps/BattleFrontier_Lounge3/scripts.inc +++ b/data/maps/BattleFrontier_Lounge3/scripts.inc @@ -4,11 +4,10 @@ BattleFrontier_Lounge3_MapScripts:: @ 8261D82 BattleFrontier_Lounge3_EventScript_261D83:: @ 8261D83 lock faceplayer - checkflag FLAG_0x157 - goto_eq BattleFrontier_Lounge3_EventScript_261EF9 + goto_if_set FLAG_0x157, BattleFrontier_Lounge3_EventScript_261EF9 call BattleFrontier_Lounge3_EventScript_261EA0 compare VAR_0x8004, 2 - goto_if 3, BattleFrontier_Lounge3_EventScript_261EEB + goto_if_le BattleFrontier_Lounge3_EventScript_261EEB setflag FLAG_0x157 msgbox BattleFrontier_Lounge3_Text_262061, MSGBOX_DEFAULT goto BattleFrontier_Lounge3_EventScript_261DAF @@ -20,10 +19,10 @@ BattleFrontier_Lounge3_EventScript_261DAF:: @ 8261DAF waitbuttonpress msgbox BattleFrontier_Lounge3_Text_262A60, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq BattleFrontier_Lounge3_EventScript_261FA5 + goto_if_eq BattleFrontier_Lounge3_EventScript_261FA5 msgbox BattleFrontier_Lounge3_Text_262ABD, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq BattleFrontier_Lounge3_EventScript_261FA5 + goto_if_eq BattleFrontier_Lounge3_EventScript_261FA5 message BattleFrontier_Lounge3_Text_262B42 waitmessage special sub_813A958 @@ -59,7 +58,7 @@ BattleFrontier_Lounge3_EventScript_261E46:: @ 8261E46 BattleFrontier_Lounge3_EventScript_261E51:: @ 8261E51 specialvar VAR_TEMP_1, sub_813AA04 compare VAR_TEMP_1, VAR_0x8008 - goto_if 4, BattleFrontier_Lounge3_EventScript_261E75 + goto_if_ge BattleFrontier_Lounge3_EventScript_261E75 msgbox BattleFrontier_Lounge3_Text_262B6E, MSGBOX_DEFAULT message BattleFrontier_Lounge3_Text_262B42 waitmessage @@ -114,15 +113,15 @@ BattleFrontier_Lounge3_EventScript_261EEB:: @ 8261EEB BattleFrontier_Lounge3_EventScript_261EF9:: @ 8261EF9 msgbox BattleFrontier_Lounge3_Text_26346B, MSGBOX_DEFAULT compare VAR_FRONTIER_GAMBLER_PLACED_BET_F, 1 - goto_if 4, BattleFrontier_Lounge3_EventScript_261F12 + goto_if_ge BattleFrontier_Lounge3_EventScript_261F12 goto BattleFrontier_Lounge3_EventScript_261DAF end BattleFrontier_Lounge3_EventScript_261F12:: @ 8261F12 compare VAR_FRONTIER_GAMBLER_PLACED_BET_F, 1 - goto_eq BattleFrontier_Lounge3_EventScript_261F9E + goto_if_eq BattleFrontier_Lounge3_EventScript_261F9E compare VAR_FRONTIER_GAMBLER_PLACED_BET_F, 2 - goto_eq BattleFrontier_Lounge3_EventScript_261F2E + goto_if_eq BattleFrontier_Lounge3_EventScript_261F2E goto BattleFrontier_Lounge3_EventScript_261F71 end diff --git a/data/maps/BattleFrontier_Lounge5/scripts.inc b/data/maps/BattleFrontier_Lounge5/scripts.inc index 65a5d2556..7a8bd1929 100644 --- a/data/maps/BattleFrontier_Lounge5/scripts.inc +++ b/data/maps/BattleFrontier_Lounge5/scripts.inc @@ -6,16 +6,16 @@ BattleFrontier_Lounge5_EventScript_2645C6:: @ 82645C6 faceplayer msgbox BattleFrontier_Lounge5_Text_264632, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq BattleFrontier_Lounge5_EventScript_26460D + goto_if_eq BattleFrontier_Lounge5_EventScript_26460D special sub_81B94B0 waitstate lock faceplayer compare VAR_0x8004, 255 - goto_eq BattleFrontier_Lounge5_EventScript_26460D + goto_if_eq BattleFrontier_Lounge5_EventScript_26460D specialvar VAR_RESULT, ScriptGetPartyMonSpecies compare VAR_RESULT, 412 - goto_eq BattleFrontier_Lounge5_EventScript_264603 + goto_if_eq BattleFrontier_Lounge5_EventScript_264603 special sub_813A7B8 waitmessage waitbuttonpress diff --git a/data/maps/BattleFrontier_Lounge6/scripts.inc b/data/maps/BattleFrontier_Lounge6/scripts.inc index 495a604d4..3c1852283 100644 --- a/data/maps/BattleFrontier_Lounge6/scripts.inc +++ b/data/maps/BattleFrontier_Lounge6/scripts.inc @@ -4,25 +4,24 @@ BattleFrontier_Lounge6_MapScripts:: @ 8264FEC BattleFrontier_Lounge6_EventScript_264FED:: @ 8264FED lock faceplayer - checkflag FLAG_0x09C - goto_eq BattleFrontier_Lounge6_EventScript_265083 + goto_if_set FLAG_0x09C, BattleFrontier_Lounge6_EventScript_265083 setvar VAR_0x8008, 3 copyvar VAR_0x8004, VAR_0x8008 specialvar VAR_RESULT, sub_807E73C copyvar VAR_0x8009, VAR_RESULT msgbox BattleFrontier_Lounge6_Text_26508D, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq BattleFrontier_Lounge6_EventScript_26506B + goto_if_eq BattleFrontier_Lounge6_EventScript_26506B special sub_81B94B0 waitstate copyvar VAR_0x800A, VAR_0x8004 compare VAR_0x8004, 255 - goto_eq BattleFrontier_Lounge6_EventScript_26506B + goto_if_eq BattleFrontier_Lounge6_EventScript_26506B copyvar VAR_0x8005, VAR_0x800A specialvar VAR_RESULT, sub_807E9D4 copyvar VAR_0x800B, VAR_RESULT compare VAR_RESULT, VAR_0x8009 - goto_if 5, BattleFrontier_Lounge6_EventScript_265075 + goto_if_ne BattleFrontier_Lounge6_EventScript_265075 copyvar VAR_0x8004, VAR_0x8008 copyvar VAR_0x8005, VAR_0x800A special sub_807EA10 diff --git a/data/maps/BattleFrontier_Lounge7/scripts.inc b/data/maps/BattleFrontier_Lounge7/scripts.inc index f395a27bc..0f9376125 100644 --- a/data/maps/BattleFrontier_Lounge7/scripts.inc +++ b/data/maps/BattleFrontier_Lounge7/scripts.inc @@ -5,8 +5,7 @@ BattleFrontier_Lounge7_EventScript_265255:: @ 8265255 lock faceplayer setvar VAR_TEMP_C, 9 - checkflag FLAG_0x15A - goto_eq BattleFrontier_Lounge7_EventScript_265276 + goto_if_set FLAG_0x15A, BattleFrontier_Lounge7_EventScript_265276 msgbox BattleFrontier_Lounge7_Text_2656ED, MSGBOX_DEFAULT setflag FLAG_0x15A goto BattleFrontier_Lounge7_EventScript_265284 @@ -120,8 +119,7 @@ BattleFrontier_Lounge7_EventScript_265445:: @ 8265445 lock faceplayer setvar VAR_TEMP_C, 10 - checkflag FLAG_0x15B - goto_eq BattleFrontier_Lounge7_EventScript_265466 + goto_if_set FLAG_0x15B, BattleFrontier_Lounge7_EventScript_265466 msgbox BattleFrontier_Lounge7_Text_265A6C, MSGBOX_DEFAULT setflag FLAG_0x15B goto BattleFrontier_Lounge7_EventScript_265474 @@ -251,10 +249,10 @@ BattleFrontier_Lounge7_EventScript_26564F:: @ 826564F copyvar VAR_0x8004, VAR_TEMP_C msgbox BattleFrontier_Lounge7_Text_265921, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq BattleFrontier_Lounge7_EventScript_2656CA + goto_if_eq BattleFrontier_Lounge7_EventScript_2656CA specialvar VAR_TEMP_1, sub_813AA04 compare VAR_TEMP_1, VAR_0x8008 - goto_if 4, BattleFrontier_Lounge7_EventScript_265696 + goto_if_ge BattleFrontier_Lounge7_EventScript_265696 msgbox BattleFrontier_Lounge7_Text_265997, MSGBOX_DEFAULT goto BattleFrontier_Lounge7_EventScript_2656CA end @@ -268,7 +266,7 @@ BattleFrontier_Lounge7_EventScript_265696:: @ 8265696 special sub_81B892C waitstate compare VAR_RESULT, 0 - goto_eq BattleFrontier_Lounge7_EventScript_265645 + goto_if_eq BattleFrontier_Lounge7_EventScript_265645 msgbox BattleFrontier_Lounge7_Text_2659C7, MSGBOX_DEFAULT copyvar VAR_0x8004, VAR_0x8008 special sub_813A9A4 @@ -277,7 +275,7 @@ BattleFrontier_Lounge7_EventScript_265696:: @ 8265696 BattleFrontier_Lounge7_EventScript_2656CA:: @ 82656CA compare VAR_TEMP_E, 0 - goto_eq BattleFrontier_Lounge7_EventScript_26532F + goto_if_eq BattleFrontier_Lounge7_EventScript_26532F goto BattleFrontier_Lounge7_EventScript_26551F end diff --git a/data/maps/BattleFrontier_OutsideEast/scripts.inc b/data/maps/BattleFrontier_OutsideEast/scripts.inc index bc154052d..317e818ba 100644 --- a/data/maps/BattleFrontier_OutsideEast/scripts.inc +++ b/data/maps/BattleFrontier_OutsideEast/scripts.inc @@ -11,7 +11,7 @@ BattleFrontier_OutsideEast_MapScript1_242C0F: @ 8242C0F BattleFrontier_OutsideEast_EventScript_242C19:: @ 8242C19 specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if 5, BattleFrontier_OutsideEast_EventScript_27374E + goto_if_ne BattleFrontier_OutsideEast_EventScript_27374E removeobject VAR_LAST_TALKED return @@ -136,11 +136,11 @@ BattleFrontier_OutsideEast_EventScript_242CFC:: @ 8242CFC clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 1 - goto_eq BattleFrontier_OutsideEast_EventScript_242D60 + goto_if_eq BattleFrontier_OutsideEast_EventScript_242D60 compare VAR_RESULT, 4 - goto_eq BattleFrontier_OutsideEast_EventScript_242D60 + goto_if_eq BattleFrontier_OutsideEast_EventScript_242D60 compare VAR_RESULT, 5 - goto_eq BattleFrontier_OutsideEast_EventScript_242D60 + goto_if_eq BattleFrontier_OutsideEast_EventScript_242D60 setflag FLAG_0x1C6 release end @@ -223,8 +223,7 @@ BattleFrontier_OutsideEast_EventScript_242DE0:: @ 8242DE0 BattleFrontier_OutsideEast_EventScript_242DE9:: @ 8242DE9 lock faceplayer - checkflag FLAG_0x1C6 - goto_eq BattleFrontier_OutsideEast_EventScript_242DFE + goto_if_set FLAG_0x1C6, BattleFrontier_OutsideEast_EventScript_242DFE msgbox BattleFrontier_OutsideEast_Text_243C2C, MSGBOX_DEFAULT release end diff --git a/data/maps/BattleFrontier_OutsideWest/scripts.inc b/data/maps/BattleFrontier_OutsideWest/scripts.inc index b01b0eb2d..57b81117f 100644 --- a/data/maps/BattleFrontier_OutsideWest/scripts.inc +++ b/data/maps/BattleFrontier_OutsideWest/scripts.inc @@ -13,7 +13,7 @@ BattleFrontier_OutsideWest_EventScript_23D3F0:: @ 823D3F0 msgbox BattleFrontier_OutsideWest_Text_23D808, MSGBOX_DEFAULT checkitem ITEM_SS_TICKET, 1 compare VAR_RESULT, 0 - goto_eq BattleFrontier_OutsideWest_EventScript_23D44E + goto_if_eq BattleFrontier_OutsideWest_EventScript_23D44E message BattleFrontier_OutsideWest_Text_23D89D waitmessage goto BattleFrontier_OutsideWest_EventScript_23D416 @@ -36,7 +36,7 @@ BattleFrontier_OutsideWest_EventScript_23D44E:: @ 823D44E BattleFrontier_OutsideWest_EventScript_23D458:: @ 823D458 msgbox BattleFrontier_OutsideWest_Text_23D8F2, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq BattleFrontier_OutsideWest_EventScript_23D4AE + goto_if_eq BattleFrontier_OutsideWest_EventScript_23D4AE msgbox BattleFrontier_OutsideWest_Text_23D94B, MSGBOX_DEFAULT call BattleFrontier_OutsideWest_EventScript_23D4BA warp MAP_SLATEPORT_CITY_HARBOR, 255, 8, 11 @@ -47,7 +47,7 @@ BattleFrontier_OutsideWest_EventScript_23D458:: @ 823D458 BattleFrontier_OutsideWest_EventScript_23D483:: @ 823D483 msgbox BattleFrontier_OutsideWest_Text_23D90E, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq BattleFrontier_OutsideWest_EventScript_23D4AE + goto_if_eq BattleFrontier_OutsideWest_EventScript_23D4AE msgbox BattleFrontier_OutsideWest_Text_23D94B, MSGBOX_DEFAULT call BattleFrontier_OutsideWest_EventScript_23D4BA warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11 @@ -227,7 +227,7 @@ BattleFrontier_OutsideWest_EventScript_23D635:: @ 823D635 msgbox BattleFrontier_OutsideWest_Text_23DD3B, MSGBOX_DEFAULT random 2 compare VAR_RESULT, 1 - goto_eq BattleFrontier_OutsideWest_EventScript_23D653 + goto_if_eq BattleFrontier_OutsideWest_EventScript_23D653 goto BattleFrontier_OutsideWest_EventScript_23D65D end diff --git a/data/maps/BattleFrontier_RankingHall/scripts.inc b/data/maps/BattleFrontier_RankingHall/scripts.inc index f6a7715d1..5f8a6c44e 100644 --- a/data/maps/BattleFrontier_RankingHall/scripts.inc +++ b/data/maps/BattleFrontier_RankingHall/scripts.inc @@ -87,7 +87,7 @@ BattleFrontier_RankingHall_EventScript_25E54A:: @ 825E54A faceplayer msgbox BattleFrontier_RankingHall_Text_25E666, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq BattleFrontier_RankingHall_EventScript_25E569 + goto_if_eq BattleFrontier_RankingHall_EventScript_25E569 msgbox BattleFrontier_RankingHall_Text_25E6B6, MSGBOX_DEFAULT release end diff --git a/data/maps/BattleFrontier_ScottsHouse/scripts.inc b/data/maps/BattleFrontier_ScottsHouse/scripts.inc index 6824df384..c9d1c7c5f 100644 --- a/data/maps/BattleFrontier_ScottsHouse/scripts.inc +++ b/data/maps/BattleFrontier_ScottsHouse/scripts.inc @@ -4,76 +4,54 @@ BattleFrontier_ScottsHouse_MapScripts:: @ 82636A7 BattleFrontier_ScottsHouse_EventScript_2636A8:: @ 82636A8 lock faceplayer - checkflag FLAG_TEMP_4 - goto_eq BattleFrontier_ScottsHouse_EventScript_2637DA - checkflag FLAG_TEMP_3 - goto_eq BattleFrontier_ScottsHouse_EventScript_2638AA - checkflag FLAG_TEMP_2 - goto_eq BattleFrontier_ScottsHouse_EventScript_263939 + goto_if_set FLAG_TEMP_4, BattleFrontier_ScottsHouse_EventScript_2637DA + goto_if_set FLAG_TEMP_3, BattleFrontier_ScottsHouse_EventScript_2638AA + goto_if_set FLAG_TEMP_2, BattleFrontier_ScottsHouse_EventScript_263939 goto BattleFrontier_ScottsHouse_EventScript_2636CB end BattleFrontier_ScottsHouse_EventScript_2636CB:: @ 82636CB - checkflag FLAG_0x1D1 - goto_if 0, BattleFrontier_ScottsHouse_EventScript_263943 - checkflag FLAG_0x05C - goto_if 0, BattleFrontier_ScottsHouse_EventScript_263704 - checkflag FLAG_0x1D2 - goto_if 0, BattleFrontier_ScottsHouse_EventScript_26376A + goto_if_unset FLAG_0x1D1, BattleFrontier_ScottsHouse_EventScript_263943 + goto_if_unset FLAG_0x05C, BattleFrontier_ScottsHouse_EventScript_263704 + goto_if_unset FLAG_0x1D2, BattleFrontier_ScottsHouse_EventScript_26376A goto BattleFrontier_ScottsHouse_EventScript_2636EC end BattleFrontier_ScottsHouse_EventScript_2636EC:: @ 82636EC - checkflag FLAG_0x0ED - goto_if 0, BattleFrontier_ScottsHouse_EventScript_26381B - checkflag FLAG_0x0EE - goto_if 0, BattleFrontier_ScottsHouse_EventScript_2638B4 + goto_if_unset FLAG_0x0ED, BattleFrontier_ScottsHouse_EventScript_26381B + goto_if_unset FLAG_0x0EE, BattleFrontier_ScottsHouse_EventScript_2638B4 goto BattleFrontier_ScottsHouse_EventScript_2637E4 end BattleFrontier_ScottsHouse_EventScript_263704:: @ 8263704 - checkflag FLAG_SYS_TOWER_SILVER - goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC - checkflag FLAG_SYS_DOME_SILVER - goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC - checkflag FLAG_SYS_PALACE_SILVER - goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC - checkflag FLAG_SYS_ARENA_SILVER - goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC - checkflag FLAG_SYS_FACTORY_SILVER - goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC - checkflag FLAG_SYS_PIKE_SILVER - goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC - checkflag FLAG_SYS_PYRAMID_SILVER - goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC + goto_if_unset FLAG_SYS_TOWER_SILVER, BattleFrontier_ScottsHouse_EventScript_2636EC + goto_if_unset FLAG_SYS_DOME_SILVER, BattleFrontier_ScottsHouse_EventScript_2636EC + goto_if_unset FLAG_SYS_PALACE_SILVER, BattleFrontier_ScottsHouse_EventScript_2636EC + goto_if_unset FLAG_SYS_ARENA_SILVER, BattleFrontier_ScottsHouse_EventScript_2636EC + goto_if_unset FLAG_SYS_FACTORY_SILVER, BattleFrontier_ScottsHouse_EventScript_2636EC + goto_if_unset FLAG_SYS_PIKE_SILVER, BattleFrontier_ScottsHouse_EventScript_2636EC + goto_if_unset FLAG_SYS_PYRAMID_SILVER, BattleFrontier_ScottsHouse_EventScript_2636EC msgbox BattleFrontier_ScottsHouse_Text_2640BC, MSGBOX_DEFAULT giveitem_std ITEM_LANSAT_BERRY compare VAR_RESULT, 0 - goto_eq BattleFrontier_ScottsHouse_EventScript_2637D0 + goto_if_eq BattleFrontier_ScottsHouse_EventScript_2637D0 setflag FLAG_0x05C setflag FLAG_TEMP_4 release end BattleFrontier_ScottsHouse_EventScript_26376A:: @ 826376A - checkflag FLAG_SYS_TOWER_GOLD - goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC - checkflag FLAG_SYS_DOME_GOLD - goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC - checkflag FLAG_SYS_PALACE_GOLD - goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC - checkflag FLAG_SYS_ARENA_GOLD - goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC - checkflag FLAG_SYS_FACTORY_GOLD - goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC - checkflag FLAG_SYS_PIKE_GOLD - goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC - checkflag FLAG_SYS_PYRAMID_GOLD - goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC + goto_if_unset FLAG_SYS_TOWER_GOLD, BattleFrontier_ScottsHouse_EventScript_2636EC + goto_if_unset FLAG_SYS_DOME_GOLD, BattleFrontier_ScottsHouse_EventScript_2636EC + goto_if_unset FLAG_SYS_PALACE_GOLD, BattleFrontier_ScottsHouse_EventScript_2636EC + goto_if_unset FLAG_SYS_ARENA_GOLD, BattleFrontier_ScottsHouse_EventScript_2636EC + goto_if_unset FLAG_SYS_FACTORY_GOLD, BattleFrontier_ScottsHouse_EventScript_2636EC + goto_if_unset FLAG_SYS_PIKE_GOLD, BattleFrontier_ScottsHouse_EventScript_2636EC + goto_if_unset FLAG_SYS_PYRAMID_GOLD, BattleFrontier_ScottsHouse_EventScript_2636EC msgbox BattleFrontier_ScottsHouse_Text_264216, MSGBOX_DEFAULT giveitem_std ITEM_STARF_BERRY compare VAR_RESULT, 0 - goto_eq BattleFrontier_ScottsHouse_EventScript_2637D0 + goto_if_eq BattleFrontier_ScottsHouse_EventScript_2637D0 setflag FLAG_0x1D2 setflag FLAG_TEMP_4 release @@ -92,9 +70,9 @@ BattleFrontier_ScottsHouse_EventScript_2637DA:: @ 82637DA BattleFrontier_ScottsHouse_EventScript_2637E4:: @ 82637E4 random 3 compare VAR_RESULT, 1 - goto_eq BattleFrontier_ScottsHouse_EventScript_263807 + goto_if_eq BattleFrontier_ScottsHouse_EventScript_263807 compare VAR_RESULT, 2 - goto_eq BattleFrontier_ScottsHouse_EventScript_263811 + goto_if_eq BattleFrontier_ScottsHouse_EventScript_263811 msgbox BattleFrontier_ScottsHouse_Text_263DDD, MSGBOX_DEFAULT release end @@ -119,7 +97,7 @@ BattleFrontier_ScottsHouse_EventScript_26381B:: @ 826381B setvar VAR_0x8005, 1 special sub_8161F74 compare VAR_RESULT, 50 - goto_if 4, BattleFrontier_ScottsHouse_EventScript_26387A + goto_if_ge BattleFrontier_ScottsHouse_EventScript_26387A setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 setvar VAR_0x8006, 1 @@ -128,7 +106,7 @@ BattleFrontier_ScottsHouse_EventScript_26381B:: @ 826381B setvar VAR_0x8005, 1 special sub_8161F74 compare VAR_RESULT, 50 - goto_if 4, BattleFrontier_ScottsHouse_EventScript_26387A + goto_if_ge BattleFrontier_ScottsHouse_EventScript_26387A goto BattleFrontier_ScottsHouse_EventScript_2637E4 end @@ -136,7 +114,7 @@ BattleFrontier_ScottsHouse_EventScript_26387A:: @ 826387A msgbox BattleFrontier_ScottsHouse_Text_264412, MSGBOX_DEFAULT givedecoration_std 42 compare VAR_RESULT, 0 - goto_eq BattleFrontier_ScottsHouse_EventScript_2638A0 + goto_if_eq BattleFrontier_ScottsHouse_EventScript_2638A0 setflag FLAG_0x0ED setflag FLAG_TEMP_3 goto BattleFrontier_ScottsHouse_EventScript_2638AA @@ -162,7 +140,7 @@ BattleFrontier_ScottsHouse_EventScript_2638B4:: @ 82638B4 setvar VAR_0x8005, 1 special sub_8161F74 compare VAR_RESULT, 100 - goto_if 4, BattleFrontier_ScottsHouse_EventScript_263913 + goto_if_ge BattleFrontier_ScottsHouse_EventScript_263913 setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 setvar VAR_0x8006, 1 @@ -171,7 +149,7 @@ BattleFrontier_ScottsHouse_EventScript_2638B4:: @ 82638B4 setvar VAR_0x8005, 1 special sub_8161F74 compare VAR_RESULT, 100 - goto_if 4, BattleFrontier_ScottsHouse_EventScript_263913 + goto_if_ge BattleFrontier_ScottsHouse_EventScript_263913 goto BattleFrontier_ScottsHouse_EventScript_2637E4 end @@ -179,7 +157,7 @@ BattleFrontier_ScottsHouse_EventScript_263913:: @ 8263913 msgbox BattleFrontier_ScottsHouse_Text_26449F, MSGBOX_DEFAULT givedecoration_std 43 compare VAR_RESULT, 0 - goto_eq BattleFrontier_ScottsHouse_EventScript_2638A0 + goto_if_eq BattleFrontier_ScottsHouse_EventScript_2638A0 setflag FLAG_0x0EE setflag FLAG_TEMP_3 goto BattleFrontier_ScottsHouse_EventScript_2638AA @@ -207,11 +185,11 @@ BattleFrontier_ScottsHouse_EventScript_263943:: @ 8263943 waitmovement 0 msgbox BattleFrontier_ScottsHouse_Text_263BD4, MSGBOX_DEFAULT compare VAR_0x40D1, 13 - goto_eq BattleFrontier_ScottsHouse_EventScript_2639BC + goto_if_eq BattleFrontier_ScottsHouse_EventScript_2639BC compare VAR_0x40D1, 9 - goto_if 4, BattleFrontier_ScottsHouse_EventScript_2639CB + goto_if_ge BattleFrontier_ScottsHouse_EventScript_2639CB compare VAR_0x40D1, 6 - goto_if 4, BattleFrontier_ScottsHouse_EventScript_2639DA + goto_if_ge BattleFrontier_ScottsHouse_EventScript_2639DA goto BattleFrontier_ScottsHouse_EventScript_2639E9 end diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc index 7bd9c1e60..ce0659165 100644 --- a/data/maps/BirthIsland_Exterior/scripts.inc +++ b/data/maps/BirthIsland_Exterior/scripts.inc @@ -25,8 +25,7 @@ BirthIsland_Exterior_EventScript_267F4E:: @ 8267F4E return BirthIsland_Exterior_EventScript_267F55:: @ 8267F55 - checkflag FLAG_0x1AC - goto_eq BirthIsland_Exterior_EventScript_27374E + goto_if_set FLAG_0x1AC, BirthIsland_Exterior_EventScript_27374E clearflag FLAG_HIDE_BIRTH_ISLAND_DEOXYS_TRIANGLE clearflag FLAG_0x8D4 return @@ -39,7 +38,7 @@ BirthIsland_Exterior_MapScript1_267F65: @ 8267F65 BirthIsland_Exterior_EventScript_267F6F:: @ 8267F6F specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if 5, BirthIsland_Exterior_EventScript_27374E + goto_if_ne BirthIsland_Exterior_EventScript_27374E removeobject 2 return @@ -93,11 +92,11 @@ BirthIsland_Exterior_EventScript_267FC1:: @ 8267FC1 clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 1 - goto_eq BirthIsland_Exterior_EventScript_26803B + goto_if_eq BirthIsland_Exterior_EventScript_26803B compare VAR_RESULT, 4 - goto_eq BirthIsland_Exterior_EventScript_268049 + goto_if_eq BirthIsland_Exterior_EventScript_268049 compare VAR_RESULT, 5 - goto_eq BirthIsland_Exterior_EventScript_268049 + goto_if_eq BirthIsland_Exterior_EventScript_268049 setflag FLAG_0x1AD release end diff --git a/data/maps/BirthIsland_Harbor/scripts.inc b/data/maps/BirthIsland_Harbor/scripts.inc index dc3407e33..1a5ef87ec 100644 --- a/data/maps/BirthIsland_Harbor/scripts.inc +++ b/data/maps/BirthIsland_Harbor/scripts.inc @@ -6,7 +6,7 @@ BirthIsland_Harbor_EventScript_26805D:: @ 826805D faceplayer msgbox BirthIsland_Harbor_Text_2C6B90, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq BirthIsland_Harbor_EventScript_2680A2 + goto_if_eq BirthIsland_Harbor_EventScript_2680A2 msgbox BirthIsland_Harbor_Text_2A6A5D, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, BirthIsland_Harbor_Movement_2725AA diff --git a/data/maps/DesertRuins/scripts.inc b/data/maps/DesertRuins/scripts.inc index 760336d91..87872b6c5 100644 --- a/data/maps/DesertRuins/scripts.inc +++ b/data/maps/DesertRuins/scripts.inc @@ -12,7 +12,7 @@ DesertRuins_MapScript1_22D96B: @ 822D96B DesertRuins_EventScript_22D975:: @ 822D975 specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if 5, DesertRuins_EventScript_27374E + goto_if_ne DesertRuins_EventScript_27374E removeobject VAR_LAST_TALKED return @@ -42,8 +42,7 @@ DesertRuins_EventScript_22D9D7:: @ 822D9D7 DesertRuins_EventScript_22D9DB:: @ 822D9DB lockall - checkflag FLAG_SYS_BRAILLE_STRENGTH - goto_eq DesertRuins_EventScript_22D9EE + goto_if_set FLAG_SYS_BRAILLE_STRENGTH, DesertRuins_EventScript_22D9EE braillemessage DesertRuins_Braille_2A6CA0 waitbuttonpress hidebox2 @@ -77,11 +76,11 @@ DesertRuins_EventScript_22DA02:: @ 822DA02 clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 1 - goto_eq DesertRuins_EventScript_22DA49 + goto_if_eq DesertRuins_EventScript_22DA49 compare VAR_RESULT, 4 - goto_eq DesertRuins_EventScript_22DA52 + goto_if_eq DesertRuins_EventScript_22DA52 compare VAR_RESULT, 5 - goto_eq DesertRuins_EventScript_22DA52 + goto_if_eq DesertRuins_EventScript_22DA52 setflag FLAG_0x1BB release end diff --git a/data/maps/DesertUnderpass/scripts.inc b/data/maps/DesertUnderpass/scripts.inc index 486bd2577..d9913cb76 100644 --- a/data/maps/DesertUnderpass/scripts.inc +++ b/data/maps/DesertUnderpass/scripts.inc @@ -9,10 +9,8 @@ DesertUnderpass_MapScript1_23AF3D: @ 823AF3D DesertUnderpass_EventScript_23AF41:: @ 823AF41 lock faceplayer - checkflag FLAG_0x14F - goto_eq DesertUnderpass_EventScript_23AF57 - checkflag FLAG_0x150 - goto_eq DesertUnderpass_EventScript_23AF68 + goto_if_set FLAG_0x14F, DesertUnderpass_EventScript_23AF57 + goto_if_set FLAG_0x150, DesertUnderpass_EventScript_23AF68 release end diff --git a/data/maps/DewfordTown/scripts.inc b/data/maps/DewfordTown/scripts.inc index 66e2bb9f9..4e1209df5 100644 --- a/data/maps/DewfordTown/scripts.inc +++ b/data/maps/DewfordTown/scripts.inc @@ -9,8 +9,7 @@ DewfordTown_MapScript1_1E950D: @ 81E950D DewfordTown_EventScript_1E9511:: @ 81E9511 lock faceplayer - checkflag FLAG_0x0BD - goto_if 0, DewfordTown_EventScript_1E9585 + goto_if_unset FLAG_0x0BD, DewfordTown_EventScript_1E9585 message DewfordTown_Text_1E9C8A waitmessage multichoicedefault 21, 6, 0, 2, 0 @@ -44,7 +43,7 @@ DewfordTown_EventScript_1E957A:: @ 81E957A DewfordTown_EventScript_1E9585:: @ 81E9585 msgbox DewfordTown_Text_1E9B24, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq DewfordTown_EventScript_1E95A2 + goto_if_eq DewfordTown_EventScript_1E95A2 msgbox DewfordTown_Text_1E9BD9, MSGBOX_DEFAULT release end @@ -74,13 +73,12 @@ DewfordTown_EventScript_1E95CC:: @ 81E95CC DewfordTown_EventScript_1E95D5:: @ 81E95D5 lock faceplayer - checkflag FLAG_0x101 - goto_eq DewfordTown_EventScript_1E962A + goto_if_set FLAG_0x101, DewfordTown_EventScript_1E962A msgbox DewfordTown_Text_1E9DD1, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq DewfordTown_EventScript_1E95FF + goto_if_eq DewfordTown_EventScript_1E95FF compare VAR_RESULT, 0 - goto_eq DewfordTown_EventScript_1E9620 + goto_if_eq DewfordTown_EventScript_1E9620 end DewfordTown_EventScript_1E95FF:: @ 81E95FF @@ -101,9 +99,9 @@ DewfordTown_EventScript_1E962A:: @ 81E962A waitmessage multichoice 20, 8, 50, 1 compare VAR_RESULT, 0 - goto_eq DewfordTown_EventScript_1E964C + goto_if_eq DewfordTown_EventScript_1E964C compare VAR_RESULT, 1 - goto_eq DewfordTown_EventScript_1E9656 + goto_if_eq DewfordTown_EventScript_1E9656 end DewfordTown_EventScript_1E964C:: @ 81E964C @@ -600,9 +598,9 @@ DewfordTown_EventScript_1E9922:: @ 81E9922 call DewfordTown_EventScript_271E8B msgbox DewfordTown_Text_1EA136, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq DewfordTown_EventScript_1E9948 + goto_if_eq DewfordTown_EventScript_1E9948 compare VAR_RESULT, 0 - goto_eq DewfordTown_EventScript_1E9952 + goto_if_eq DewfordTown_EventScript_1E9952 end DewfordTown_EventScript_1E9948:: @ 81E9948 @@ -617,15 +615,15 @@ DewfordTown_EventScript_1E9952:: @ 81E9952 lock faceplayer compare VAR_RESULT, 1 - goto_eq DewfordTown_EventScript_1E997D + goto_if_eq DewfordTown_EventScript_1E997D compare VAR_RESULT, 0 - goto_eq DewfordTown_EventScript_1E9994 + goto_if_eq DewfordTown_EventScript_1E9994 end DewfordTown_EventScript_1E997D:: @ 81E997D incrementgamestat 2 compare VAR_0x8004, 0 - goto_eq DewfordTown_EventScript_1E999E + goto_if_eq DewfordTown_EventScript_1E999E msgbox DewfordTown_Text_1EA2AA, MSGBOX_DEFAULT release end diff --git a/data/maps/DewfordTown_Gym/scripts.inc b/data/maps/DewfordTown_Gym/scripts.inc index 703888e98..ffe5b850d 100644 --- a/data/maps/DewfordTown_Gym/scripts.inc +++ b/data/maps/DewfordTown_Gym/scripts.inc @@ -8,21 +8,21 @@ DewfordTown_Gym_MapScript1_1FC642: @ 81FC642 DewfordTown_Gym_EventScript_1FC648:: @ 81FC648 checktrainerflag TRAINER_BRAWLY_1 - goto_eq DewfordTown_Gym_EventScript_1FC6A2 + goto_if_eq DewfordTown_Gym_EventScript_1FC6A2 call DewfordTown_Gym_EventScript_1FC768 copyvar VAR_0x8001, VAR_0x8000 compare VAR_0x8000, 0 - goto_eq DewfordTown_Gym_EventScript_1FC6BE + goto_if_eq DewfordTown_Gym_EventScript_1FC6BE compare VAR_0x8000, 1 - goto_eq DewfordTown_Gym_EventScript_1FC6BA + goto_if_eq DewfordTown_Gym_EventScript_1FC6BA compare VAR_0x8000, 2 - goto_eq DewfordTown_Gym_EventScript_1FC6B6 + goto_if_eq DewfordTown_Gym_EventScript_1FC6B6 compare VAR_0x8000, 3 - goto_eq DewfordTown_Gym_EventScript_1FC6B2 + goto_if_eq DewfordTown_Gym_EventScript_1FC6B2 compare VAR_0x8000, 4 - goto_eq DewfordTown_Gym_EventScript_1FC6AE + goto_if_eq DewfordTown_Gym_EventScript_1FC6AE compare VAR_0x8000, 5 - goto_eq DewfordTown_Gym_EventScript_1FC6AA + goto_if_eq DewfordTown_Gym_EventScript_1FC6AA goto DewfordTown_Gym_EventScript_1FC6A6 DewfordTown_Gym_EventScript_1FC6A2:: @ 81FC6A2 @@ -61,20 +61,20 @@ DewfordTown_Gym_EventScript_1FC6C2:: @ 81FC6C2 call DewfordTown_Gym_EventScript_1FC768 nop1 compare VAR_0x8000, VAR_0x8001 - goto_eq DewfordTown_Gym_EventScript_1FC71A + goto_if_eq DewfordTown_Gym_EventScript_1FC71A copyvar VAR_0x8001, VAR_0x8000 compare VAR_0x8000, 1 - goto_eq DewfordTown_Gym_EventScript_1FC71B + goto_if_eq DewfordTown_Gym_EventScript_1FC71B compare VAR_0x8000, 2 - goto_eq DewfordTown_Gym_EventScript_1FC726 + goto_if_eq DewfordTown_Gym_EventScript_1FC726 compare VAR_0x8000, 3 - goto_eq DewfordTown_Gym_EventScript_1FC731 + goto_if_eq DewfordTown_Gym_EventScript_1FC731 compare VAR_0x8000, 4 - goto_eq DewfordTown_Gym_EventScript_1FC73C + goto_if_eq DewfordTown_Gym_EventScript_1FC73C compare VAR_0x8000, 5 - goto_eq DewfordTown_Gym_EventScript_1FC747 + goto_if_eq DewfordTown_Gym_EventScript_1FC747 compare VAR_0x8000, 6 - goto_eq DewfordTown_Gym_EventScript_1FC752 + goto_if_eq DewfordTown_Gym_EventScript_1FC752 DewfordTown_Gym_EventScript_1FC71A:: @ 81FC71A return @@ -124,32 +124,32 @@ DewfordTown_Gym_EventScript_1FC75D:: @ 81FC75D DewfordTown_Gym_EventScript_1FC768:: @ 81FC768 setvar VAR_0x8000, 0 checktrainerflag TRAINER_TAKAO - goto_if 0, DewfordTown_Gym_EventScript_1FC77B + goto_if_lt DewfordTown_Gym_EventScript_1FC77B addvar VAR_0x8000, 1 DewfordTown_Gym_EventScript_1FC77B:: @ 81FC77B checktrainerflag TRAINER_JOCELYN - goto_if 0, DewfordTown_Gym_EventScript_1FC789 + goto_if_lt DewfordTown_Gym_EventScript_1FC789 addvar VAR_0x8000, 1 DewfordTown_Gym_EventScript_1FC789:: @ 81FC789 checktrainerflag TRAINER_LAURA - goto_if 0, DewfordTown_Gym_EventScript_1FC797 + goto_if_lt DewfordTown_Gym_EventScript_1FC797 addvar VAR_0x8000, 1 DewfordTown_Gym_EventScript_1FC797:: @ 81FC797 checktrainerflag TRAINER_BRENDEN - goto_if 0, DewfordTown_Gym_EventScript_1FC7A5 + goto_if_lt DewfordTown_Gym_EventScript_1FC7A5 addvar VAR_0x8000, 1 DewfordTown_Gym_EventScript_1FC7A5:: @ 81FC7A5 checktrainerflag TRAINER_CRISTIAN - goto_if 0, DewfordTown_Gym_EventScript_1FC7B3 + goto_if_lt DewfordTown_Gym_EventScript_1FC7B3 addvar VAR_0x8000, 1 DewfordTown_Gym_EventScript_1FC7B3:: @ 81FC7B3 checktrainerflag TRAINER_LILITH - goto_if 0, DewfordTown_Gym_EventScript_1FC7C1 + goto_if_lt DewfordTown_Gym_EventScript_1FC7C1 addvar VAR_0x8000, 1 DewfordTown_Gym_EventScript_1FC7C1:: @ 81FC7C1 @@ -159,9 +159,8 @@ DewfordTown_Gym_EventScript_1FC7C2:: @ 81FC7C2 trainerbattle_single TRAINER_BRAWLY_1, DewfordTown_Gym_Text_1FCF44, DewfordTown_Gym_Text_1FD008, DewfordTown_Gym_EventScript_1FC7F7, NO_MUSIC specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq DewfordTown_Gym_EventScript_1FC89C - checkflag FLAG_0x0A6 - goto_if 0, DewfordTown_Gym_EventScript_1FC878 + goto_if_eq DewfordTown_Gym_EventScript_1FC89C + goto_if_unset FLAG_0x0A6, DewfordTown_Gym_EventScript_1FC878 msgbox DewfordTown_Gym_Text_1FD20D, MSGBOX_DEFAULT release end @@ -196,7 +195,7 @@ DewfordTown_Gym_EventScript_1FC7F7:: @ 81FC7F7 DewfordTown_Gym_EventScript_1FC855:: @ 81FC855 giveitem_std ITEM_TM08 compare VAR_RESULT, 0 - goto_eq DewfordTown_Gym_EventScript_27205E + goto_if_eq DewfordTown_Gym_EventScript_27205E msgbox DewfordTown_Gym_Text_1FD181, MSGBOX_DEFAULT setflag FLAG_0x0A6 return @@ -204,7 +203,7 @@ DewfordTown_Gym_EventScript_1FC855:: @ 81FC855 DewfordTown_Gym_EventScript_1FC878:: @ 81FC878 giveitem_std ITEM_TM08 compare VAR_RESULT, 0 - goto_eq DewfordTown_Gym_EventScript_272054 + goto_if_eq DewfordTown_Gym_EventScript_272054 msgbox DewfordTown_Gym_Text_1FD181, MSGBOX_DEFAULT setflag FLAG_0x0A6 release @@ -278,8 +277,7 @@ DewfordTown_Gym_EventScript_1FC97C:: @ 81FC97C DewfordTown_Gym_EventScript_1FC983:: @ 81FC983 lock faceplayer - checkflag FLAG_0x4F1 - goto_eq DewfordTown_Gym_EventScript_1FC998 + goto_if_set FLAG_0x4F1, DewfordTown_Gym_EventScript_1FC998 msgbox DewfordTown_Gym_Text_1FC9D6, MSGBOX_DEFAULT release end @@ -291,15 +289,13 @@ DewfordTown_Gym_EventScript_1FC998:: @ 81FC998 DewfordTown_Gym_EventScript_1FC9A2:: @ 81FC9A2 lockall - checkflag FLAG_BADGE02_GET - goto_eq DewfordTown_Gym_EventScript_1FC9C2 + goto_if_set FLAG_BADGE02_GET, DewfordTown_Gym_EventScript_1FC9C2 goto DewfordTown_Gym_EventScript_1FC9CC end DewfordTown_Gym_EventScript_1FC9B2:: @ 81FC9B2 lockall - checkflag FLAG_BADGE02_GET - goto_eq DewfordTown_Gym_EventScript_1FC9C2 + goto_if_set FLAG_BADGE02_GET, DewfordTown_Gym_EventScript_1FC9C2 goto DewfordTown_Gym_EventScript_1FC9CC end diff --git a/data/maps/DewfordTown_Hall/scripts.inc b/data/maps/DewfordTown_Hall/scripts.inc index 3a75fca12..e41a97bcd 100644 --- a/data/maps/DewfordTown_Hall/scripts.inc +++ b/data/maps/DewfordTown_Hall/scripts.inc @@ -7,7 +7,7 @@ DewfordTown_Hall_EventScript_1FD4D0:: @ 81FD4D0 call DewfordTown_Hall_EventScript_271E8B special TrendyPhraseIsOld compare VAR_RESULT, 1 - goto_eq DewfordTown_Hall_EventScript_1FD4EF + goto_if_eq DewfordTown_Hall_EventScript_1FD4EF msgbox DewfordTown_Hall_Text_1FD818, MSGBOX_DEFAULT release end @@ -32,9 +32,9 @@ DewfordTown_Hall_EventScript_1FD50A:: @ 81FD50A special sub_811EF6C msgbox DewfordTown_Hall_Text_1FD948, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq DewfordTown_Hall_EventScript_1FD533 + goto_if_eq DewfordTown_Hall_EventScript_1FD533 compare VAR_RESULT, 0 - goto_eq DewfordTown_Hall_EventScript_1FD53D + goto_if_eq DewfordTown_Hall_EventScript_1FD53D end DewfordTown_Hall_EventScript_1FD533:: @ 81FD533 @@ -192,14 +192,14 @@ DewfordTown_Hall_EventScript_1FD73A:: @ 81FD73A applymovement 8, DewfordTown_Hall_Movement_1FD7D6 waitmovement 0 compare VAR_0x8008, 0 - goto_eq DewfordTown_Hall_EventScript_1FD75B + goto_if_eq DewfordTown_Hall_EventScript_1FD75B compare VAR_0x8008, 1 - goto_eq DewfordTown_Hall_EventScript_1FD771 + goto_if_eq DewfordTown_Hall_EventScript_1FD771 end DewfordTown_Hall_EventScript_1FD75B:: @ 81FD75B compare VAR_FACING, 4 - goto_eq DewfordTown_Hall_EventScript_1FD739 + goto_if_eq DewfordTown_Hall_EventScript_1FD739 applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Hall_Movement_2725A8 waitmovement 0 return @@ -211,9 +211,9 @@ DewfordTown_Hall_EventScript_1FD772:: @ 81FD772 applymovement 7, DewfordTown_Hall_Movement_1FD7D8 waitmovement 0 compare VAR_0x8008, 0 - goto_eq DewfordTown_Hall_EventScript_1FD793 + goto_if_eq DewfordTown_Hall_EventScript_1FD793 compare VAR_0x8008, 1 - goto_eq DewfordTown_Hall_EventScript_1FD7C0 + goto_if_eq DewfordTown_Hall_EventScript_1FD7C0 end DewfordTown_Hall_EventScript_1FD793:: @ 81FD793 @@ -235,7 +235,7 @@ DewfordTown_Hall_EventScript_1FD7B5:: @ 81FD7B5 DewfordTown_Hall_EventScript_1FD7C0:: @ 81FD7C0 compare VAR_FACING, 3 - goto_eq DewfordTown_Hall_EventScript_1FD739 + goto_if_eq DewfordTown_Hall_EventScript_1FD739 applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Hall_Movement_2725A4 waitmovement 0 return @@ -252,12 +252,11 @@ DewfordTown_Hall_EventScript_1FD7DA:: @ 81FD7DA lock faceplayer call DewfordTown_Hall_EventScript_271E8B - checkflag FLAG_RECEIVED_TM_36 - goto_eq DewfordTown_Hall_EventScript_1FD80E + goto_if_set FLAG_RECEIVED_TM_36, DewfordTown_Hall_EventScript_1FD80E msgbox DewfordTown_Hall_Text_1FE142, MSGBOX_DEFAULT giveitem_std ITEM_TM36 compare VAR_RESULT, 0 - goto_eq DewfordTown_Hall_EventScript_272054 + goto_if_eq DewfordTown_Hall_EventScript_272054 setflag FLAG_RECEIVED_TM_36 release end diff --git a/data/maps/DewfordTown_House2/scripts.inc b/data/maps/DewfordTown_House2/scripts.inc index c0de82dac..cff58306e 100644 --- a/data/maps/DewfordTown_House2/scripts.inc +++ b/data/maps/DewfordTown_House2/scripts.inc @@ -4,12 +4,11 @@ DewfordTown_House2_MapScripts:: @ 81FE22D DewfordTown_House2_EventScript_1FE22E:: @ 81FE22E lock faceplayer - checkflag FLAG_0x121 - goto_eq DewfordTown_House2_EventScript_1FE267 + goto_if_set FLAG_0x121, DewfordTown_House2_EventScript_1FE267 msgbox DewfordTown_House2_Text_1FE27A, MSGBOX_DEFAULT giveitem_std ITEM_SILK_SCARF compare VAR_RESULT, 0 - goto_eq DewfordTown_House2_EventScript_1FE25D + goto_if_eq DewfordTown_House2_EventScript_1FE25D setflag FLAG_0x121 release end diff --git a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc index 4b51399eb..d406df106 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc +++ b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc @@ -61,9 +61,9 @@ EverGrandeCity_ChampionsRoom_EventScript_228A61:: @ 8228A61 call EverGrandeCity_ChampionsRoom_EventScript_228BFD checkplayergender compare VAR_RESULT, 0 - goto_eq EverGrandeCity_ChampionsRoom_EventScript_228AC6 + goto_if_eq EverGrandeCity_ChampionsRoom_EventScript_228AC6 compare VAR_RESULT, 1 - goto_eq EverGrandeCity_ChampionsRoom_EventScript_228AFB + goto_if_eq EverGrandeCity_ChampionsRoom_EventScript_228AFB end EverGrandeCity_ChampionsRoom_EventScript_228ABC:: @ 8228ABC diff --git a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc index b50e715aa..3607e79eb 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc +++ b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc @@ -41,8 +41,7 @@ EverGrandeCity_DrakesRoom_EventScript_2286ED:: @ 82286ED EverGrandeCity_DrakesRoom_EventScript_2286F3:: @ 82286F3 lock faceplayer - checkflag FLAG_0x4FE - goto_eq EverGrandeCity_DrakesRoom_EventScript_22871A + goto_if_set FLAG_0x4FE, EverGrandeCity_DrakesRoom_EventScript_22871A playbgm MUS_SITENNOU, 0 msgbox EverGrandeCity_DrakesRoom_Text_22873E, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_DRAKE, EverGrandeCity_DrakesRoom_Text_228895 diff --git a/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc index 141881cf9..889a7720e 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc +++ b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc @@ -41,8 +41,7 @@ EverGrandeCity_GlaciasRoom_EventScript_228463:: @ 8228463 EverGrandeCity_GlaciasRoom_EventScript_228469:: @ 8228469 lock faceplayer - checkflag FLAG_0x4FD - goto_eq EverGrandeCity_GlaciasRoom_EventScript_228490 + goto_if_set FLAG_0x4FD, EverGrandeCity_GlaciasRoom_EventScript_228490 playbgm MUS_SITENNOU, 0 msgbox EverGrandeCity_GlaciasRoom_Text_2284AC, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_GLACIA, EverGrandeCity_GlaciasRoom_Text_2285B4 diff --git a/data/maps/EverGrandeCity_HallOfFame/scripts.inc b/data/maps/EverGrandeCity_HallOfFame/scripts.inc index 5fd0ff139..f037f247a 100644 --- a/data/maps/EverGrandeCity_HallOfFame/scripts.inc +++ b/data/maps/EverGrandeCity_HallOfFame/scripts.inc @@ -45,9 +45,9 @@ EverGrandeCity_HallOfFame_EventScript_229850:: @ 8229850 call EverGrandeCity_HallOfFame_EventScript_2717C1 checkplayergender compare VAR_RESULT, 0 - goto_eq EverGrandeCity_HallOfFame_EventScript_2298E9 + goto_if_eq EverGrandeCity_HallOfFame_EventScript_2298E9 compare VAR_RESULT, 1 - goto_eq EverGrandeCity_HallOfFame_EventScript_2298F5 + goto_if_eq EverGrandeCity_HallOfFame_EventScript_2298F5 end EverGrandeCity_HallOfFame_EventScript_2298E9:: @ 82298E9 diff --git a/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc index 165c985ac..8ab4a06fb 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc +++ b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc @@ -41,8 +41,7 @@ EverGrandeCity_PhoebesRoom_EventScript_2281C5:: @ 82281C5 EverGrandeCity_PhoebesRoom_EventScript_2281CB:: @ 82281CB lock faceplayer - checkflag FLAG_0x4FC - goto_eq EverGrandeCity_PhoebesRoom_EventScript_2281F2 + goto_if_set FLAG_0x4FC, EverGrandeCity_PhoebesRoom_EventScript_2281F2 playbgm MUS_SITENNOU, 0 msgbox EverGrandeCity_PhoebesRoom_Text_22820E, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_PHOEBE, EverGrandeCity_PhoebesRoom_Text_228325 diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc index 3fb16a5ab..5172ea351 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc @@ -10,8 +10,7 @@ EverGrandeCity_PokemonCenter_1F_MapScript1_229A3F: @ 8229A3F end EverGrandeCity_PokemonCenter_1F_EventScript_229A4C:: @ 8229A4C - checkflag FLAG_BADGE06_GET - goto_if 0, EverGrandeCity_PokemonCenter_1F_EventScript_27374E + goto_if_unset FLAG_BADGE06_GET, EverGrandeCity_PokemonCenter_1F_EventScript_27374E clearflag FLAG_HIDE_EVER_GRANDE_POKEMON_CENTER_1F_SCOTT return diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc b/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc index bc27878ab..7999ce599 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc @@ -48,8 +48,7 @@ EverGrandeCity_PokemonLeague_1F_Pokemart_229624: @ 8229624 EverGrandeCity_PokemonLeague_1F_EventScript_229636:: @ 8229636 lockall - checkflag FLAG_0x107 - goto_eq EverGrandeCity_PokemonLeague_1F_EventScript_2296BB + 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 @@ -58,8 +57,7 @@ EverGrandeCity_PokemonLeague_1F_EventScript_229636:: @ 8229636 message EverGrandeCity_PokemonLeague_1F_Text_2296E8 waitmessage delay 120 - checkflag FLAG_BADGE06_GET - goto_if 0, EverGrandeCity_PokemonLeague_1F_EventScript_2296AE + goto_if_unset FLAG_BADGE06_GET, EverGrandeCity_PokemonLeague_1F_EventScript_2296AE closemessage applymovement 3, EverGrandeCity_PokemonLeague_1F_Movement_2296E2 applymovement 4, EverGrandeCity_PokemonLeague_1F_Movement_2296E5 diff --git a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc index b283f166e..b30efae6e 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc +++ b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc @@ -48,8 +48,7 @@ EverGrandeCity_SidneysRoom_EventScript_227F57:: @ 8227F57 EverGrandeCity_SidneysRoom_EventScript_227F64:: @ 8227F64 lock faceplayer - checkflag FLAG_0x4FB - goto_eq EverGrandeCity_SidneysRoom_EventScript_227F8B + goto_if_set FLAG_0x4FB, EverGrandeCity_SidneysRoom_EventScript_227F8B playbgm MUS_SITENNOU, 0 msgbox EverGrandeCity_SidneysRoom_Text_227FA7, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_SIDNEY, EverGrandeCity_SidneysRoom_Text_2280A2 diff --git a/data/maps/FallarborTown/scripts.inc b/data/maps/FallarborTown/scripts.inc index 7a9d0b444..7b157c5f3 100644 --- a/data/maps/FallarborTown/scripts.inc +++ b/data/maps/FallarborTown/scripts.inc @@ -11,8 +11,7 @@ FallarborTown_MapScript1_1EB200: @ 81EB200 FallarborTown_EventScript_1EB20C:: @ 81EB20C lock faceplayer - checkflag FLAG_0x08B - goto_eq FallarborTown_EventScript_1EB221 + goto_if_set FLAG_0x08B, FallarborTown_EventScript_1EB221 msgbox FallarborTown_Text_1EB26B, MSGBOX_DEFAULT release end diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc index f3e1edbbf..79244b381 100644 --- a/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc +++ b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc @@ -11,9 +11,9 @@ FallarborTown_BattleTentBattleRoom_MapScript1_2008A9: @ 82008A9 FallarborTown_BattleTentBattleRoom_EventScript_2008AF:: @ 82008AF checkplayergender compare VAR_RESULT, 0 - goto_eq FallarborTown_BattleTentBattleRoom_EventScript_2008C7 + goto_if_eq FallarborTown_BattleTentBattleRoom_EventScript_2008C7 compare VAR_RESULT, 1 - goto_eq FallarborTown_BattleTentBattleRoom_EventScript_2008D2 + goto_if_eq FallarborTown_BattleTentBattleRoom_EventScript_2008D2 return FallarborTown_BattleTentBattleRoom_EventScript_2008C7:: @ 82008C7 @@ -39,7 +39,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_2008E7:: @ 82008E7 setvar VAR_0x8005, 2 special CallFrontierUtilFunc compare VAR_RESULT, 0 - goto_if 5, FallarborTown_BattleTentBattleRoom_EventScript_200B73 + goto_if_ne FallarborTown_BattleTentBattleRoom_EventScript_200B73 FallarborTown_BattleTentBattleRoom_EventScript_20090F:: @ 820090F setvar VAR_0x8004, 3 @@ -164,7 +164,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_200AF3:: @ 8200AF3 setvar VAR_0x8005, 1 special CallBattleArenaFunction compare VAR_RESULT, 9999 - goto_eq FallarborTown_BattleTentBattleRoom_EventScript_2009B3 + goto_if_eq FallarborTown_BattleTentBattleRoom_EventScript_2009B3 addvar VAR_RESULT, 1 setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 diff --git a/data/maps/FallarborTown_BattleTentLobby/scripts.inc b/data/maps/FallarborTown_BattleTentLobby/scripts.inc index abe8a9202..e7dda07f9 100644 --- a/data/maps/FallarborTown_BattleTentLobby/scripts.inc +++ b/data/maps/FallarborTown_BattleTentLobby/scripts.inc @@ -133,7 +133,7 @@ FallarborTown_BattleTentLobby_EventScript_200001:: @ 8200001 setvar VAR_0x8004, 1 special sub_81B9B80 compare VAR_RESULT, 0 - goto_if 5, FallarborTown_BattleTentLobby_EventScript_1FFF84 + goto_if_ne FallarborTown_BattleTentLobby_EventScript_1FFF84 special SavePlayerParty msgbox FallarborTown_BattleTentLobby_Text_2C47EB, MSGBOX_DEFAULT @@ -154,7 +154,7 @@ FallarborTown_BattleTentLobby_EventScript_20005D:: @ 820005D setvar VAR_0x8004, 15 special CallFrontierUtilFunc compare VAR_0x8004, 1 - goto_eq FallarborTown_BattleTentLobby_EventScript_200176 + goto_if_eq FallarborTown_BattleTentLobby_EventScript_200176 setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 setvar VAR_0x8006, 2 @@ -166,7 +166,7 @@ FallarborTown_BattleTentLobby_EventScript_20005D:: @ 820005D special sub_80F9490 waitstate compare VAR_RESULT, 0 - goto_eq FallarborTown_BattleTentLobby_EventScript_2001C2 + goto_if_eq FallarborTown_BattleTentLobby_EventScript_2001C2 msgbox FallarborTown_BattleTentLobby_Text_2C4B35, MSGBOX_YESNO switch VAR_RESULT case 0, FallarborTown_BattleTentLobby_EventScript_2001C2 @@ -194,7 +194,7 @@ FallarborTown_BattleTentLobby_EventScript_2000E2:: @ 82000E2 call FallarborTown_BattleTentLobby_EventScript_27134F setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 - goto_eq FallarborTown_BattleTentLobby_EventScript_2001AB + goto_if_eq FallarborTown_BattleTentLobby_EventScript_2001AB FallarborTown_BattleTentLobby_EventScript_20013C:: @ 820013C special SavePlayerParty @@ -294,8 +294,7 @@ FallarborTown_BattleTentLobby_EventScript_20021F:: @ 820021F FallarborTown_BattleTentLobby_EventScript_200228:: @ 8200228 lock faceplayer - checkflag FLAG_0x1CD - goto_eq FallarborTown_BattleTentLobby_EventScript_200245 + goto_if_set FLAG_0x1CD, FallarborTown_BattleTentLobby_EventScript_200245 msgbox FallarborTown_BattleTentLobby_Text_200501, MSGBOX_DEFAULT addvar VAR_0x40D1, 1 setflag FLAG_0x1CD diff --git a/data/maps/FallarborTown_House1/scripts.inc b/data/maps/FallarborTown_House1/scripts.inc index 470d80267..94dc3e5a7 100644 --- a/data/maps/FallarborTown_House1/scripts.inc +++ b/data/maps/FallarborTown_House1/scripts.inc @@ -4,11 +4,10 @@ FallarborTown_House1_MapScripts:: @ 8200F12 FallarborTown_House1_EventScript_200F13:: @ 8200F13 lock faceplayer - checkflag FLAG_0x0E5 - goto_eq FallarborTown_House1_EventScript_200FB2 + goto_if_set FLAG_0x0E5, FallarborTown_House1_EventScript_200FB2 checkitem ITEM_METEORITE, 1 compare VAR_RESULT, 1 - goto_eq FallarborTown_House1_EventScript_200F38 + goto_if_eq FallarborTown_House1_EventScript_200F38 msgbox FallarborTown_House1_Text_200FEE, MSGBOX_DEFAULT release end @@ -19,11 +18,11 @@ FallarborTown_House1_EventScript_200F38:: @ 8200F38 checkflag FLAG_TEMP_2 call_if 1, FallarborTown_House1_EventScript_200F9C compare VAR_RESULT, 0 - goto_eq FallarborTown_House1_EventScript_200FA5 + goto_if_eq FallarborTown_House1_EventScript_200FA5 msgbox FallarborTown_House1_Text_201159, MSGBOX_DEFAULT giveitem_std ITEM_TM27 compare VAR_RESULT, 0 - goto_eq FallarborTown_House1_EventScript_272054 + goto_if_eq FallarborTown_House1_EventScript_272054 setvar VAR_0x8004, 280 call FallarborTown_House1_EventScript_2723E4 setflag FLAG_0x0E5 @@ -54,10 +53,8 @@ FallarborTown_House1_EventScript_200FB2:: @ 8200FB2 FallarborTown_House1_EventScript_200FBC:: @ 8200FBC lock faceplayer - checkflag FLAG_0x0E5 - goto_eq FallarborTown_House1_EventScript_200FE4 - checkflag FLAG_0x08B - goto_eq FallarborTown_House1_EventScript_200FDA + goto_if_set FLAG_0x0E5, FallarborTown_House1_EventScript_200FE4 + goto_if_set FLAG_0x08B, FallarborTown_House1_EventScript_200FDA msgbox FallarborTown_House1_Text_2012BC, MSGBOX_DEFAULT release end diff --git a/data/maps/FallarborTown_House2/scripts.inc b/data/maps/FallarborTown_House2/scripts.inc index 2fddd2fd4..962c4f64e 100644 --- a/data/maps/FallarborTown_House2/scripts.inc +++ b/data/maps/FallarborTown_House2/scripts.inc @@ -5,8 +5,7 @@ FallarborTown_House2_EventScript_201383:: @ 8201383 lockall applymovement 1, FallarborTown_House2_Movement_27259E waitmovement 0 - checkflag FLAG_TEMP_1 - goto_eq FallarborTown_House2_EventScript_2013A8 + goto_if_set FLAG_TEMP_1, FallarborTown_House2_EventScript_2013A8 msgbox FallarborTown_House2_Text_20145C, MSGBOX_DEFAULT setflag FLAG_TEMP_1 goto FallarborTown_House2_EventScript_2013A8 @@ -15,7 +14,7 @@ FallarborTown_House2_EventScript_201383:: @ 8201383 FallarborTown_House2_EventScript_2013A8:: @ 82013A8 checkitem ITEM_HEART_SCALE, 1 compare VAR_RESULT, 0 - goto_eq FallarborTown_House2_EventScript_201452 + goto_if_eq FallarborTown_House2_EventScript_201452 msgbox FallarborTown_House2_Text_201541, MSGBOX_YESNO switch VAR_RESULT case 0, FallarborTown_House2_EventScript_201452 @@ -27,12 +26,12 @@ FallarborTown_House2_EventScript_2013D6:: @ 82013D6 special sub_81B951C waitstate compare VAR_0x8004, 255 - goto_eq FallarborTown_House2_EventScript_201452 + goto_if_eq FallarborTown_House2_EventScript_201452 special sub_81B98DC compare VAR_RESULT, 1 - goto_eq FallarborTown_House2_EventScript_201444 + goto_if_eq FallarborTown_House2_EventScript_201444 compare VAR_0x8005, 0 - goto_eq FallarborTown_House2_EventScript_201436 + goto_if_eq FallarborTown_House2_EventScript_201436 goto FallarborTown_House2_EventScript_20140C end @@ -41,7 +40,7 @@ FallarborTown_House2_EventScript_20140C:: @ 820140C special TeachMoveTutorMove waitstate compare VAR_0x8004, 0 - goto_eq FallarborTown_House2_EventScript_2013D6 + goto_if_eq FallarborTown_House2_EventScript_2013D6 msgbox FallarborTown_House2_Text_201627, MSGBOX_DEFAULT takeitem ITEM_HEART_SCALE, 1 goto FallarborTown_House2_EventScript_201452 diff --git a/data/maps/FarawayIsland_Entrance/scripts.inc b/data/maps/FarawayIsland_Entrance/scripts.inc index 1fd5fdd35..512171b37 100644 --- a/data/maps/FarawayIsland_Entrance/scripts.inc +++ b/data/maps/FarawayIsland_Entrance/scripts.inc @@ -21,7 +21,7 @@ FarawayIsland_Entrance_EventScript_267CA2:: @ 8267CA2 faceplayer msgbox FarawayIsland_Entrance_Text_2C6B42, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq FarawayIsland_Entrance_EventScript_267CE7 + goto_if_eq FarawayIsland_Entrance_EventScript_267CE7 msgbox FarawayIsland_Entrance_Text_2A6A5D, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, FarawayIsland_Entrance_Movement_2725AA diff --git a/data/maps/FarawayIsland_Interior/scripts.inc b/data/maps/FarawayIsland_Interior/scripts.inc index 7b62ab578..fea57b74b 100644 --- a/data/maps/FarawayIsland_Interior/scripts.inc +++ b/data/maps/FarawayIsland_Interior/scripts.inc @@ -13,13 +13,13 @@ FarawayIsland_Interior_MapScript1_267D0F: @ 8267D0F FarawayIsland_Interior_EventScript_267D19:: @ 8267D19 specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 1 - goto_eq FarawayIsland_Interior_EventScript_267D4B + goto_if_eq FarawayIsland_Interior_EventScript_267D4B compare VAR_RESULT, 4 - goto_eq FarawayIsland_Interior_EventScript_267D4B + goto_if_eq FarawayIsland_Interior_EventScript_267D4B compare VAR_RESULT, 5 - goto_eq FarawayIsland_Interior_EventScript_267D4B + goto_if_eq FarawayIsland_Interior_EventScript_267D4B compare VAR_RESULT, 10 - goto_eq FarawayIsland_Interior_EventScript_267D4B + goto_if_eq FarawayIsland_Interior_EventScript_267D4B return FarawayIsland_Interior_EventScript_267D4B:: @ 8267D4B @@ -35,7 +35,7 @@ FarawayIsland_Interior_MapScript1_267D54: @ 8267D54 FarawayIsland_Interior_EventScript_267D5E:: @ 8267D5E specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if 5, FarawayIsland_Interior_EventScript_27374E + goto_if_ne FarawayIsland_Interior_EventScript_27374E removeobject VAR_LAST_TALKED return @@ -47,8 +47,7 @@ FarawayIsland_Interior_MapScript1_267D72: @ 8267D72 end FarawayIsland_Interior_EventScript_267D86:: @ 8267D86 - checkflag FLAG_0x1C7 - goto_eq FarawayIsland_Interior_EventScript_27374E + goto_if_set FLAG_0x1C7, FarawayIsland_Interior_EventScript_27374E clearflag FLAG_HIDE_MEW setvar VAR_TEMP_1, 0 return @@ -150,13 +149,13 @@ FarawayIsland_Interior_EventScript_267DF2:: @ 8267DF2 clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 1 - goto_eq FarawayIsland_Interior_EventScript_267E96 + goto_if_eq FarawayIsland_Interior_EventScript_267E96 compare VAR_RESULT, 4 - goto_eq FarawayIsland_Interior_EventScript_267EA4 + goto_if_eq FarawayIsland_Interior_EventScript_267EA4 compare VAR_RESULT, 5 - goto_eq FarawayIsland_Interior_EventScript_267EA4 + goto_if_eq FarawayIsland_Interior_EventScript_267EA4 compare VAR_RESULT, 10 - goto_eq FarawayIsland_Interior_EventScript_267EA4 + goto_if_eq FarawayIsland_Interior_EventScript_267EA4 setflag FLAG_0x1CA release end diff --git a/data/maps/FortreeCity/scripts.inc b/data/maps/FortreeCity/scripts.inc index 948f443d2..d1c80c9f9 100644 --- a/data/maps/FortreeCity/scripts.inc +++ b/data/maps/FortreeCity/scripts.inc @@ -18,8 +18,7 @@ FortreeCity_EventScript_1E25B6:: @ 81E25B6 FortreeCity_EventScript_1E25BF:: @ 81E25BF lock faceplayer - checkflag FLAG_0x127 - goto_eq FortreeCity_EventScript_1E25D4 + goto_if_set FLAG_0x127, FortreeCity_EventScript_1E25D4 msgbox FortreeCity_Text_1E2738, MSGBOX_DEFAULT release end @@ -58,7 +57,7 @@ FortreeCity_EventScript_1E2614:: @ 81E2614 faceplayer checkitem ITEM_DEVON_SCOPE, 1 compare VAR_RESULT, 1 - goto_eq FortreeCity_EventScript_1E2630 + goto_if_eq FortreeCity_EventScript_1E2630 msgbox FortreeCity_Text_1E29E5, MSGBOX_DEFAULT release end @@ -66,7 +65,7 @@ FortreeCity_EventScript_1E2614:: @ 81E2614 FortreeCity_EventScript_1E2630:: @ 81E2630 msgbox FortreeCity_Text_1E2A08, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq FortreeCity_EventScript_1E2645 + goto_if_eq FortreeCity_EventScript_1E2645 release end diff --git a/data/maps/FortreeCity_Gym/scripts.inc b/data/maps/FortreeCity_Gym/scripts.inc index c56f0cbdb..f45d87c58 100644 --- a/data/maps/FortreeCity_Gym/scripts.inc +++ b/data/maps/FortreeCity_Gym/scripts.inc @@ -19,9 +19,8 @@ FortreeCity_Gym_EventScript_2165C8:: @ 82165C8 trainerbattle_single TRAINER_WINONA_1, FortreeCity_Gym_Text_216D75, FortreeCity_Gym_Text_216E60, FortreeCity_Gym_EventScript_2165FD, NO_MUSIC specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq FortreeCity_Gym_EventScript_21668D - checkflag FLAG_0x0AA - goto_if 0, FortreeCity_Gym_EventScript_216646 + goto_if_eq FortreeCity_Gym_EventScript_21668D + goto_if_unset FLAG_0x0AA, FortreeCity_Gym_EventScript_216646 msgbox FortreeCity_Gym_Text_217071, MSGBOX_DEFAULT release end @@ -52,7 +51,7 @@ FortreeCity_Gym_EventScript_2165FD:: @ 82165FD FortreeCity_Gym_EventScript_216646:: @ 8216646 giveitem_std ITEM_TM40 compare VAR_RESULT, 0 - goto_eq FortreeCity_Gym_EventScript_272054 + goto_if_eq FortreeCity_Gym_EventScript_272054 msgbox FortreeCity_Gym_Text_216FEC, MSGBOX_DEFAULT setflag FLAG_0x0AA release @@ -61,7 +60,7 @@ FortreeCity_Gym_EventScript_216646:: @ 8216646 FortreeCity_Gym_EventScript_21666A:: @ 821666A giveitem_std ITEM_TM40 compare VAR_RESULT, 0 - goto_eq FortreeCity_Gym_EventScript_27205E + goto_if_eq FortreeCity_Gym_EventScript_27205E msgbox FortreeCity_Gym_Text_216FEC, MSGBOX_DEFAULT setflag FLAG_0x0AA return @@ -104,8 +103,7 @@ FortreeCity_Gym_EventScript_21671B:: @ 821671B FortreeCity_Gym_EventScript_216732:: @ 8216732 lock faceplayer - checkflag FLAG_0x4F5 - goto_eq FortreeCity_Gym_EventScript_216747 + goto_if_set FLAG_0x4F5, FortreeCity_Gym_EventScript_216747 msgbox FortreeCity_Gym_Text_216785, MSGBOX_DEFAULT release end @@ -117,15 +115,13 @@ FortreeCity_Gym_EventScript_216747:: @ 8216747 FortreeCity_Gym_EventScript_216751:: @ 8216751 lockall - checkflag FLAG_BADGE06_GET - goto_eq FortreeCity_Gym_EventScript_216771 + goto_if_set FLAG_BADGE06_GET, FortreeCity_Gym_EventScript_216771 goto FortreeCity_Gym_EventScript_21677B end FortreeCity_Gym_EventScript_216761:: @ 8216761 lockall - checkflag FLAG_BADGE06_GET - goto_eq FortreeCity_Gym_EventScript_216771 + goto_if_set FLAG_BADGE06_GET, FortreeCity_Gym_EventScript_216771 goto FortreeCity_Gym_EventScript_21677B end diff --git a/data/maps/FortreeCity_House1/scripts.inc b/data/maps/FortreeCity_House1/scripts.inc index 52a9793c3..44651ae0d 100644 --- a/data/maps/FortreeCity_House1/scripts.inc +++ b/data/maps/FortreeCity_House1/scripts.inc @@ -4,25 +4,24 @@ FortreeCity_House1_MapScripts:: @ 82162BA FortreeCity_House1_EventScript_2162BB:: @ 82162BB lock faceplayer - checkflag FLAG_0x09B - goto_eq FortreeCity_House1_EventScript_216355 + goto_if_set FLAG_0x09B, FortreeCity_House1_EventScript_216355 setvar VAR_0x8008, 1 copyvar VAR_0x8004, VAR_0x8008 specialvar VAR_RESULT, sub_807E73C copyvar VAR_0x8009, VAR_RESULT msgbox FortreeCity_House1_Text_21637B, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq FortreeCity_House1_EventScript_21633D + goto_if_eq FortreeCity_House1_EventScript_21633D special sub_81B94B0 waitstate copyvar VAR_0x800A, VAR_0x8004 compare VAR_0x8004, 255 - goto_eq FortreeCity_House1_EventScript_21633D + goto_if_eq FortreeCity_House1_EventScript_21633D copyvar VAR_0x8005, VAR_0x800A specialvar VAR_RESULT, sub_807E9D4 copyvar VAR_0x800B, VAR_RESULT compare VAR_RESULT, VAR_0x8009 - goto_if 5, FortreeCity_House1_EventScript_216347 + goto_if_ne FortreeCity_House1_EventScript_216347 copyvar VAR_0x8004, VAR_0x8008 copyvar VAR_0x8005, VAR_0x800A special sub_807EA10 diff --git a/data/maps/FortreeCity_House2/scripts.inc b/data/maps/FortreeCity_House2/scripts.inc index 0a5042c09..2b4b1c8b2 100644 --- a/data/maps/FortreeCity_House2/scripts.inc +++ b/data/maps/FortreeCity_House2/scripts.inc @@ -4,8 +4,7 @@ FortreeCity_House2_MapScripts:: @ 82177CA FortreeCity_House2_EventScript_2177CB:: @ 82177CB lock faceplayer - checkflag FLAG_0x108 - goto_eq FortreeCity_House2_EventScript_21786E + goto_if_set FLAG_0x108, FortreeCity_House2_EventScript_21786E checkflag FLAG_0x076 call_if 0, FortreeCity_House2_EventScript_217862 msgbox FortreeCity_House2_Text_2178D6, MSGBOX_DEFAULT @@ -23,7 +22,7 @@ FortreeCity_House2_EventScript_2177CB:: @ 82177CB msgbox FortreeCity_House2_Text_217A28, MSGBOX_DEFAULT giveitem_std ITEM_TM10 compare VAR_RESULT, 0 - goto_eq FortreeCity_House2_EventScript_272054 + goto_if_eq FortreeCity_House2_EventScript_272054 setflag FLAG_0x108 msgbox FortreeCity_House2_Text_217A91, MSGBOX_DEFAULT release diff --git a/data/maps/FortreeCity_House4/scripts.inc b/data/maps/FortreeCity_House4/scripts.inc index eb6043ab3..742fce6e9 100644 --- a/data/maps/FortreeCity_House4/scripts.inc +++ b/data/maps/FortreeCity_House4/scripts.inc @@ -7,12 +7,9 @@ FortreeCity_House4_EventScript_217C81:: @ 8217C81 FortreeCity_House4_EventScript_217C8A:: @ 8217C8A lockall - checkflag FLAG_0x0DF - goto_eq FortreeCity_House4_EventScript_217D06 - checkflag FLAG_0x0E0 - goto_eq FortreeCity_House4_EventScript_217CD8 - checkflag FLAG_0x0DE - goto_eq FortreeCity_House4_EventScript_217CC4 + goto_if_set FLAG_0x0DF, FortreeCity_House4_EventScript_217D06 + goto_if_set FLAG_0x0E0, FortreeCity_House4_EventScript_217CD8 + goto_if_set FLAG_0x0DE, FortreeCity_House4_EventScript_217CC4 msgbox FortreeCity_House4_Text_217DB9, MSGBOX_DEFAULT closemessage setflag FLAG_0x0DE @@ -36,7 +33,7 @@ FortreeCity_House4_EventScript_217CD8:: @ 8217CD8 msgbox FortreeCity_House4_Text_217E05, MSGBOX_DEFAULT giveitem_std ITEM_MENTAL_HERB compare VAR_RESULT, 0 - goto_eq FortreeCity_House4_EventScript_272054 + goto_if_eq FortreeCity_House4_EventScript_272054 setflag FLAG_0x0DF releaseall end diff --git a/data/maps/GraniteCave_1F/scripts.inc b/data/maps/GraniteCave_1F/scripts.inc index 28b95d578..1ace4071b 100644 --- a/data/maps/GraniteCave_1F/scripts.inc +++ b/data/maps/GraniteCave_1F/scripts.inc @@ -4,8 +4,7 @@ GraniteCave_1F_MapScripts:: @ 822DA5D GraniteCave_1F_EventScript_22DA5E:: @ 822DA5E lock faceplayer - checkflag FLAG_0x06D - goto_eq GraniteCave_1F_EventScript_22DA8A + goto_if_set FLAG_0x06D, GraniteCave_1F_EventScript_22DA8A msgbox GraniteCave_1F_Text_22DA94, MSGBOX_DEFAULT giveitem_std ITEM_HM05 setflag FLAG_0x06D diff --git a/data/maps/InsideOfTruck/scripts.inc b/data/maps/InsideOfTruck/scripts.inc index 100e4314d..53bdc073a 100644 --- a/data/maps/InsideOfTruck/scripts.inc +++ b/data/maps/InsideOfTruck/scripts.inc @@ -18,9 +18,9 @@ InsideOfTruck_EventScript_23BF04:: @ 823BF04 setflag FLAG_SPECIAL_FLAG_0x4000 checkplayergender compare VAR_RESULT, 0 - goto_eq InsideOfTruck_EventScript_23BF20 + goto_if_eq InsideOfTruck_EventScript_23BF20 compare VAR_RESULT, 1 - goto_eq InsideOfTruck_EventScript_23BF46 + goto_if_eq InsideOfTruck_EventScript_23BF46 end InsideOfTruck_EventScript_23BF20:: @ 823BF20 diff --git a/data/maps/IslandCave/scripts.inc b/data/maps/IslandCave/scripts.inc index e18b73a7a..d1c6563e2 100644 --- a/data/maps/IslandCave/scripts.inc +++ b/data/maps/IslandCave/scripts.inc @@ -12,7 +12,7 @@ IslandCave_MapScript1_238E3A: @ 8238E3A IslandCave_EventScript_238E44:: @ 8238E44 specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if 5, IslandCave_EventScript_27374E + goto_if_ne IslandCave_EventScript_27374E removeobject VAR_LAST_TALKED return @@ -57,8 +57,7 @@ IslandCave_EventScript_238EEF:: @ 8238EEF lockall checkflag FLAG_TEMP_3 call_if 1, IslandCave_EventScript_238F45 - checkflag FLAG_SYS_BRAILLE_WAIT - goto_eq IslandCave_EventScript_238F13 + goto_if_set FLAG_SYS_BRAILLE_WAIT, IslandCave_EventScript_238F13 braillemessage IslandCave_Braille_2A6CD4 setflag FLAG_TEMP_2 special ShouldDoBrailleRegicePuzzle @@ -75,8 +74,7 @@ IslandCave_EventScript_238F1D:: @ 8238F1D checkflag FLAG_TEMP_3 call_if 1, IslandCave_EventScript_238F45 braillemessage IslandCave_Braille_2A6CD4 - checkflag FLAG_SYS_BRAILLE_WAIT - goto_eq IslandCave_EventScript_238F41 + goto_if_set FLAG_SYS_BRAILLE_WAIT, IslandCave_EventScript_238F41 setflag FLAG_TEMP_2 special ShouldDoBrailleRegicePuzzle goto IslandCave_EventScript_238F41 @@ -109,11 +107,11 @@ IslandCave_EventScript_238F58:: @ 8238F58 clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 1 - goto_eq IslandCave_EventScript_238F9F + goto_if_eq IslandCave_EventScript_238F9F compare VAR_RESULT, 4 - goto_eq IslandCave_EventScript_238FA8 + goto_if_eq IslandCave_EventScript_238FA8 compare VAR_RESULT, 5 - goto_eq IslandCave_EventScript_238FA8 + goto_if_eq IslandCave_EventScript_238FA8 setflag FLAG_0x1BC release end diff --git a/data/maps/JaggedPass/scripts.inc b/data/maps/JaggedPass/scripts.inc index d9a5f0849..67d52f9c8 100644 --- a/data/maps/JaggedPass/scripts.inc +++ b/data/maps/JaggedPass/scripts.inc @@ -13,7 +13,7 @@ JaggedPass_MapScript1_230666: @ 8230666 JaggedPass_EventScript_230674:: @ 8230674 checkitem ITEM_MAGMA_EMBLEM, 1 compare VAR_RESULT, 1 - goto_eq JaggedPass_EventScript_230685 + goto_if_eq JaggedPass_EventScript_230685 return JaggedPass_EventScript_230685:: @ 8230685 @@ -32,7 +32,7 @@ JaggedPass_EventScript_230697:: @ 8230697 JaggedPass_MapScript1_23069C: @ 823069C compare VAR_0x40C8, 1 - goto_if 3, JaggedPass_EventScript_2306A8 + goto_if_le JaggedPass_EventScript_2306A8 end JaggedPass_EventScript_2306A8:: @ 82306A8 @@ -68,8 +68,7 @@ JaggedPass_EventScript_2306BB:: @ 82306BB JaggedPass_EventScript_230718:: @ 8230718 lockall - checkflag FLAG_0x139 - goto_eq JaggedPass_EventScript_230766 + goto_if_set FLAG_0x139, JaggedPass_EventScript_230766 waitse playse SE_PIN applymovement 5, JaggedPass_Movement_272598 @@ -106,7 +105,7 @@ JaggedPass_EventScript_23079C:: @ 823079C trainerbattle_single TRAINER_DIANA_1, JaggedPass_Text_230974, JaggedPass_Text_2309B5, JaggedPass_EventScript_2307C8 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq JaggedPass_EventScript_2307E4 + goto_if_eq JaggedPass_EventScript_2307E4 msgbox JaggedPass_Text_2309D8, MSGBOX_DEFAULT release end @@ -127,7 +126,7 @@ JaggedPass_EventScript_2307FB:: @ 82307FB trainerbattle_single TRAINER_ETHAN_1, JaggedPass_Text_230B10, JaggedPass_Text_230B50, JaggedPass_EventScript_230827 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq JaggedPass_EventScript_230843 + goto_if_eq JaggedPass_EventScript_230843 msgbox JaggedPass_Text_230B93, MSGBOX_DEFAULT release end diff --git a/data/maps/LavaridgeTown/scripts.inc b/data/maps/LavaridgeTown/scripts.inc index 9d2a8b6dc..a58b92f51 100644 --- a/data/maps/LavaridgeTown/scripts.inc +++ b/data/maps/LavaridgeTown/scripts.inc @@ -24,7 +24,7 @@ LavaridgeTown_EventScript_1EA514:: @ 81EA514 LavaridgeTown_EventScript_1EA518:: @ 81EA518 getplayerxy VAR_0x8004, VAR_0x8005 compare VAR_0x8004, 9 - goto_eq LavaridgeTown_EventScript_1EA529 + goto_if_eq LavaridgeTown_EventScript_1EA529 return LavaridgeTown_EventScript_1EA529:: @ 81EA529 @@ -65,9 +65,9 @@ LavaridgeTown_EventScript_1EA551:: @ 81EA551 call_if 5, LavaridgeTown_EventScript_1EA6AC checkplayergender compare VAR_RESULT, 0 - goto_eq LavaridgeTown_EventScript_1EA5B5 + goto_if_eq LavaridgeTown_EventScript_1EA5B5 compare VAR_RESULT, 1 - goto_eq LavaridgeTown_EventScript_1EA5DA + goto_if_eq LavaridgeTown_EventScript_1EA5DA end LavaridgeTown_EventScript_1EA5B5:: @ 81EA5B5 @@ -214,7 +214,7 @@ LavaridgeTown_Movement_1EA6F8: @ 81EA6F8 LavaridgeTown_EventScript_1EA6FA:: @ 81EA6FA specialvar VAR_RESULT, GetPlayerFacingDirection compare VAR_RESULT, 1 - goto_eq LavaridgeTown_EventScript_1EA70B + goto_if_eq LavaridgeTown_EventScript_1EA70B end LavaridgeTown_EventScript_1EA70B:: @ 81EA70B @@ -248,14 +248,13 @@ LavaridgeTown_EventScript_1EA73B:: @ 81EA73B LavaridgeTown_EventScript_1EA744:: @ 81EA744 lock faceplayer - checkflag FLAG_0x10A - goto_eq LavaridgeTown_EventScript_1EA787 + goto_if_set FLAG_0x10A, LavaridgeTown_EventScript_1EA787 msgbox LavaridgeTown_Text_1EAB80, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq LavaridgeTown_EventScript_1EA79B + goto_if_eq LavaridgeTown_EventScript_1EA79B getpartysize compare VAR_RESULT, 6 - goto_eq LavaridgeTown_EventScript_1EA791 + goto_if_eq LavaridgeTown_EventScript_1EA791 msgbox LavaridgeTown_Text_1EACC0, MSGBOX_DEFAULT setflag FLAG_0x10A playfanfare MUS_FANFA4 diff --git a/data/maps/LavaridgeTown_Gym_1F/scripts.inc b/data/maps/LavaridgeTown_Gym_1F/scripts.inc index 6a795a74c..d01770fe8 100644 --- a/data/maps/LavaridgeTown_Gym_1F/scripts.inc +++ b/data/maps/LavaridgeTown_Gym_1F/scripts.inc @@ -14,22 +14,22 @@ LavaridgeTown_Gym_1F_EventScript_1FE705:: @ 81FE705 setvar VAR_TEMP_E, 0 setvar VAR_TEMP_F, 0 checktrainerflag TRAINER_COLE - goto_eq LavaridgeTown_Gym_1F_EventScript_1FE72C + goto_if_eq LavaridgeTown_Gym_1F_EventScript_1FE72C setvar VAR_TEMP_B, 1 LavaridgeTown_Gym_1F_EventScript_1FE72C:: @ 81FE72C checktrainerflag TRAINER_GERALD - goto_eq LavaridgeTown_Gym_1F_EventScript_1FE73A + goto_if_eq LavaridgeTown_Gym_1F_EventScript_1FE73A setvar VAR_TEMP_C, 1 LavaridgeTown_Gym_1F_EventScript_1FE73A:: @ 81FE73A checktrainerflag TRAINER_AXLE - goto_eq LavaridgeTown_Gym_1F_EventScript_1FE748 + goto_if_eq LavaridgeTown_Gym_1F_EventScript_1FE748 setvar VAR_TEMP_D, 1 LavaridgeTown_Gym_1F_EventScript_1FE748:: @ 81FE748 checktrainerflag TRAINER_DANIELLE - goto_eq LavaridgeTown_Gym_1F_EventScript_1FE756 + goto_if_eq LavaridgeTown_Gym_1F_EventScript_1FE756 setvar VAR_TEMP_E, 1 LavaridgeTown_Gym_1F_EventScript_1FE756:: @ 81FE756 @@ -37,22 +37,22 @@ LavaridgeTown_Gym_1F_EventScript_1FE756:: @ 81FE756 LavaridgeTown_Gym_1F_EventScript_1FE757:: @ 81FE757 checktrainerflag TRAINER_COLE - goto_eq LavaridgeTown_Gym_1F_EventScript_1FE764 + goto_if_eq LavaridgeTown_Gym_1F_EventScript_1FE764 setobjectmovementtype 2, 63 LavaridgeTown_Gym_1F_EventScript_1FE764:: @ 81FE764 checktrainerflag TRAINER_GERALD - goto_eq LavaridgeTown_Gym_1F_EventScript_1FE771 + goto_if_eq LavaridgeTown_Gym_1F_EventScript_1FE771 setobjectmovementtype 3, 63 LavaridgeTown_Gym_1F_EventScript_1FE771:: @ 81FE771 checktrainerflag TRAINER_AXLE - goto_eq LavaridgeTown_Gym_1F_EventScript_1FE77E + goto_if_eq LavaridgeTown_Gym_1F_EventScript_1FE77E setobjectmovementtype 4, 63 LavaridgeTown_Gym_1F_EventScript_1FE77E:: @ 81FE77E checktrainerflag TRAINER_DANIELLE - goto_eq LavaridgeTown_Gym_1F_EventScript_1FE78B + goto_if_eq LavaridgeTown_Gym_1F_EventScript_1FE78B setobjectmovementtype 5, 63 LavaridgeTown_Gym_1F_EventScript_1FE78B:: @ 81FE78B @@ -62,9 +62,8 @@ LavaridgeTown_Gym_1F_EventScript_1FE78C:: @ 81FE78C trainerbattle_single TRAINER_FLANNERY_1, LavaridgeTown_Gym_1F_Text_1FF0DC, LavaridgeTown_Gym_1F_Text_1FF233, LavaridgeTown_Gym_1F_EventScript_1FE7C1, NO_MUSIC specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq LavaridgeTown_Gym_1F_EventScript_1FE864 - checkflag FLAG_0x0A8 - goto_if 0, LavaridgeTown_Gym_1F_EventScript_1FE81D + goto_if_eq LavaridgeTown_Gym_1F_EventScript_1FE864 + goto_if_unset FLAG_0x0A8, LavaridgeTown_Gym_1F_EventScript_1FE81D msgbox LavaridgeTown_Gym_1F_Text_1FF546, MSGBOX_DEFAULT release end @@ -99,7 +98,7 @@ LavaridgeTown_Gym_1F_EventScript_1FE7C1:: @ 81FE7C1 LavaridgeTown_Gym_1F_EventScript_1FE81D:: @ 81FE81D giveitem_std ITEM_TM50 compare VAR_RESULT, 0 - goto_eq LavaridgeTown_Gym_1F_EventScript_272054 + goto_if_eq LavaridgeTown_Gym_1F_EventScript_272054 msgbox LavaridgeTown_Gym_1F_Text_1FF45C, MSGBOX_DEFAULT setflag FLAG_0x0A8 release @@ -108,7 +107,7 @@ LavaridgeTown_Gym_1F_EventScript_1FE81D:: @ 81FE81D LavaridgeTown_Gym_1F_EventScript_1FE841:: @ 81FE841 giveitem_std ITEM_TM50 compare VAR_RESULT, 0 - goto_eq LavaridgeTown_Gym_1F_EventScript_27205E + goto_if_eq LavaridgeTown_Gym_1F_EventScript_27205E msgbox LavaridgeTown_Gym_1F_Text_1FF45C, MSGBOX_DEFAULT setflag FLAG_0x0A8 return @@ -129,7 +128,7 @@ LavaridgeTown_Gym_B1F_EventScript_1FE89A:: @ 81FE89A release special ShouldTryGetTrainerScript compare VAR_RESULT, 1 - goto_eq EventScript_GotoTrainerScript + goto_if_eq EventScript_GotoTrainerScript end LavaridgeTown_Gym_1F_EventScript_1FE8AF:: @ 81FE8AF @@ -170,8 +169,7 @@ LavaridgeTown_Gym_B1F_EventScript_1FE951:: @ 81FE951 LavaridgeTown_Gym_1F_EventScript_1FE96C:: @ 81FE96C lock faceplayer - checkflag FLAG_0x4F3 - goto_eq LavaridgeTown_Gym_1F_EventScript_1FE981 + goto_if_set FLAG_0x4F3, LavaridgeTown_Gym_1F_EventScript_1FE981 msgbox LavaridgeTown_Gym_1F_Text_1FE9BF, MSGBOX_DEFAULT release end @@ -183,15 +181,13 @@ LavaridgeTown_Gym_1F_EventScript_1FE981:: @ 81FE981 LavaridgeTown_Gym_1F_EventScript_1FE98B:: @ 81FE98B lockall - checkflag FLAG_BADGE04_GET - goto_eq LavaridgeTown_Gym_1F_EventScript_1FE9AB + goto_if_set FLAG_BADGE04_GET, LavaridgeTown_Gym_1F_EventScript_1FE9AB goto LavaridgeTown_Gym_1F_EventScript_1FE9B5 end LavaridgeTown_Gym_1F_EventScript_1FE99B:: @ 81FE99B lockall - checkflag FLAG_BADGE04_GET - goto_eq LavaridgeTown_Gym_1F_EventScript_1FE9AB + goto_if_set FLAG_BADGE04_GET, LavaridgeTown_Gym_1F_EventScript_1FE9AB goto LavaridgeTown_Gym_1F_EventScript_1FE9B5 end diff --git a/data/maps/LavaridgeTown_Gym_B1F/scripts.inc b/data/maps/LavaridgeTown_Gym_B1F/scripts.inc index ad2be83ea..222f36810 100644 --- a/data/maps/LavaridgeTown_Gym_B1F/scripts.inc +++ b/data/maps/LavaridgeTown_Gym_B1F/scripts.inc @@ -13,22 +13,22 @@ LavaridgeTown_Gym_B1F_EventScript_1FF88F:: @ 81FF88F setvar VAR_TEMP_9, 0 setvar VAR_TEMP_A, 0 checktrainerflag TRAINER_KEEGAN - goto_eq LavaridgeTown_Gym_B1F_EventScript_1FF8B1 + goto_if_eq LavaridgeTown_Gym_B1F_EventScript_1FF8B1 setvar VAR_TEMP_7, 1 LavaridgeTown_Gym_B1F_EventScript_1FF8B1:: @ 81FF8B1 checktrainerflag TRAINER_JACE - goto_eq LavaridgeTown_Gym_B1F_EventScript_1FF8BF + goto_if_eq LavaridgeTown_Gym_B1F_EventScript_1FF8BF setvar VAR_TEMP_8, 1 LavaridgeTown_Gym_B1F_EventScript_1FF8BF:: @ 81FF8BF checktrainerflag TRAINER_JEFF - goto_eq LavaridgeTown_Gym_B1F_EventScript_1FF8CD + goto_if_eq LavaridgeTown_Gym_B1F_EventScript_1FF8CD setvar VAR_TEMP_9, 1 LavaridgeTown_Gym_B1F_EventScript_1FF8CD:: @ 81FF8CD checktrainerflag TRAINER_ELI - goto_eq LavaridgeTown_Gym_B1F_EventScript_1FF8DB + goto_if_eq LavaridgeTown_Gym_B1F_EventScript_1FF8DB setvar VAR_TEMP_A, 1 LavaridgeTown_Gym_B1F_EventScript_1FF8DB:: @ 81FF8DB @@ -36,22 +36,22 @@ LavaridgeTown_Gym_B1F_EventScript_1FF8DB:: @ 81FF8DB LavaridgeTown_Gym_B1F_EventScript_1FF8DC:: @ 81FF8DC checktrainerflag TRAINER_KEEGAN - goto_eq LavaridgeTown_Gym_B1F_EventScript_1FF8E9 + goto_if_eq LavaridgeTown_Gym_B1F_EventScript_1FF8E9 setobjectmovementtype 2, 63 LavaridgeTown_Gym_B1F_EventScript_1FF8E9:: @ 81FF8E9 checktrainerflag TRAINER_JACE - goto_eq LavaridgeTown_Gym_B1F_EventScript_1FF8F6 + goto_if_eq LavaridgeTown_Gym_B1F_EventScript_1FF8F6 setobjectmovementtype 1, 63 LavaridgeTown_Gym_B1F_EventScript_1FF8F6:: @ 81FF8F6 checktrainerflag TRAINER_JEFF - goto_eq LavaridgeTown_Gym_B1F_EventScript_1FF903 + goto_if_eq LavaridgeTown_Gym_B1F_EventScript_1FF903 setobjectmovementtype 3, 63 LavaridgeTown_Gym_B1F_EventScript_1FF903:: @ 81FF903 checktrainerflag TRAINER_ELI - goto_eq LavaridgeTown_Gym_B1F_EventScript_1FF910 + goto_if_eq LavaridgeTown_Gym_B1F_EventScript_1FF910 setobjectmovementtype 4, 63 LavaridgeTown_Gym_B1F_EventScript_1FF910:: @ 81FF910 diff --git a/data/maps/LavaridgeTown_HerbShop/scripts.inc b/data/maps/LavaridgeTown_HerbShop/scripts.inc index b1d776fbd..d627d4fa7 100644 --- a/data/maps/LavaridgeTown_HerbShop/scripts.inc +++ b/data/maps/LavaridgeTown_HerbShop/scripts.inc @@ -28,12 +28,11 @@ LavaridgeTown_HerbShop_EventScript_1FE4FC:: @ 81FE4FC LavaridgeTown_HerbShop_EventScript_1FE505:: @ 81FE505 lock faceplayer - checkflag FLAG_0x0FE - goto_eq LavaridgeTown_HerbShop_EventScript_1FE534 + goto_if_set FLAG_0x0FE, LavaridgeTown_HerbShop_EventScript_1FE534 msgbox LavaridgeTown_HerbShop_Text_1FE584, MSGBOX_DEFAULT giveitem_std ITEM_CHARCOAL compare VAR_RESULT, 0 - goto_eq LavaridgeTown_HerbShop_EventScript_272054 + goto_if_eq LavaridgeTown_HerbShop_EventScript_272054 setflag FLAG_0x0FE release end diff --git a/data/maps/LilycoveCity/scripts.inc b/data/maps/LilycoveCity/scripts.inc index 83b258c7e..03eb005b3 100644 --- a/data/maps/LilycoveCity/scripts.inc +++ b/data/maps/LilycoveCity/scripts.inc @@ -36,14 +36,13 @@ LilycoveCity_EventScript_1E2BD8:: @ 81E2BD8 lock faceplayer dodailyevents - checkflag FLAG_0x92F - goto_eq LilycoveCity_EventScript_1E2C18 + goto_if_set FLAG_0x92F, LilycoveCity_EventScript_1E2C18 msgbox LilycoveCity_Text_2A7244, MSGBOX_DEFAULT random 10 addvar VAR_RESULT, 133 giveitem_std VAR_RESULT compare VAR_RESULT, 0 - goto_eq LilycoveCity_EventScript_272054 + goto_if_eq LilycoveCity_EventScript_272054 setflag FLAG_0x92F msgbox LilycoveCity_Text_2A72E3, MSGBOX_DEFAULT release @@ -61,8 +60,7 @@ LilycoveCity_EventScript_1E2C22:: @ 81E2C22 LilycoveCity_EventScript_1E2C2B:: @ 81E2C2B lock faceplayer - checkflag FLAG_BADGE07_GET - goto_eq LilycoveCity_EventScript_1E2C40 + goto_if_set FLAG_BADGE07_GET, LilycoveCity_EventScript_1E2C40 msgbox LilycoveCity_Text_1E3E3C, MSGBOX_DEFAULT release end @@ -79,8 +77,7 @@ LilycoveCity_EventScript_1E2C4A:: @ 81E2C4A LilycoveCity_EventScript_1E2C53:: @ 81E2C53 lock faceplayer - checkflag FLAG_0x070 - goto_eq LilycoveCity_EventScript_1E2C68 + goto_if_set FLAG_0x070, LilycoveCity_EventScript_1E2C68 msgbox LilycoveCity_Text_1E3FAB, MSGBOX_DEFAULT release end @@ -93,8 +90,7 @@ LilycoveCity_EventScript_1E2C68:: @ 81E2C68 LilycoveCity_EventScript_1E2C72:: @ 81E2C72 lock faceplayer - checkflag FLAG_0x070 - goto_eq LilycoveCity_EventScript_1E2C87 + goto_if_set FLAG_0x070, LilycoveCity_EventScript_1E2C87 msgbox LilycoveCity_Text_1E40AD, MSGBOX_DEFAULT release end @@ -119,8 +115,7 @@ LilycoveCity_EventScript_1E2CA3:: @ 81E2CA3 LilycoveCity_EventScript_1E2CAC:: @ 81E2CAC lock faceplayer - checkflag FLAG_BADGE07_GET - goto_eq LilycoveCity_EventScript_1E2CC1 + goto_if_set FLAG_BADGE07_GET, LilycoveCity_EventScript_1E2CC1 msgbox LilycoveCity_Text_1E42FC, MSGBOX_DEFAULT release end @@ -178,8 +173,7 @@ LilycoveCity_EventScript_1E2D3A:: @ 81E2D3A LilycoveCity_EventScript_1E2D44:: @ 81E2D44 lockall - checkflag FLAG_SYS_GAME_CLEAR - goto_eq LilycoveCity_EventScript_1E2D58 + goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_EventScript_1E2D58 msgbox LilycoveCity_Text_1E45A7, MSGBOX_DEFAULT releaseall end @@ -203,8 +197,7 @@ LilycoveCity_EventScript_1E2D74:: @ 81E2D74 LilycoveCity_EventScript_1E2D7D:: @ 81E2D7D lockall - checkflag FLAG_0x0DA - goto_eq LilycoveCity_EventScript_1E2DB0 + goto_if_set FLAG_0x0DA, LilycoveCity_EventScript_1E2DB0 msgbox LilycoveCity_Text_1E3D1F, MSGBOX_DEFAULT applymovement VAR_LAST_TALKED, LilycoveCity_Movement_27259E waitmovement 0 @@ -241,9 +234,9 @@ LilycoveCity_EventScript_1E2DDE:: @ 81E2DDE faceplayer checkplayergender compare VAR_RESULT, 0 - goto_eq LilycoveCity_EventScript_1E2DF8 + goto_if_eq LilycoveCity_EventScript_1E2DF8 compare VAR_RESULT, 1 - goto_eq LilycoveCity_EventScript_1E2E6B + goto_if_eq LilycoveCity_EventScript_1E2E6B end LilycoveCity_EventScript_1E2DF8:: @ 81E2DF8 @@ -253,7 +246,7 @@ LilycoveCity_EventScript_1E2DF8:: @ 81E2DF8 checkflag FLAG_0x11E call_if 0, LilycoveCity_EventScript_1E2E51 compare VAR_RESULT, 0 - goto_eq LilycoveCity_EventScript_1E2E5A + goto_if_eq LilycoveCity_EventScript_1E2E5A msgbox LilycoveCity_Text_1E3234, MSGBOX_DEFAULT switch VAR_STARTER_MON case 0, LilycoveCity_EventScript_1E2EDE @@ -284,7 +277,7 @@ LilycoveCity_EventScript_1E2E6B:: @ 81E2E6B checkflag FLAG_0x11E call_if 0, LilycoveCity_EventScript_1E2EC4 compare VAR_RESULT, 0 - goto_eq LilycoveCity_EventScript_1E2ECD + goto_if_eq LilycoveCity_EventScript_1E2ECD msgbox LilycoveCity_Text_1E373C, MSGBOX_DEFAULT switch VAR_STARTER_MON case 0, LilycoveCity_EventScript_1E2F0E @@ -353,8 +346,7 @@ LilycoveCity_EventScript_1E2F3E:: @ 81E2F3E end LilycoveCity_EventScript_1E2F76:: @ 81E2F76 - checkflag FLAG_BADGE08_GET - goto_eq LilycoveCity_EventScript_1E2F80 + goto_if_set FLAG_BADGE08_GET, LilycoveCity_EventScript_1E2F80 return LilycoveCity_EventScript_1E2F80:: @ 81E2F80 @@ -366,8 +358,7 @@ LilycoveCity_EventScript_1E2F86:: @ 81E2F86 return LilycoveCity_EventScript_1E2F8F:: @ 81E2F8F - checkflag FLAG_SYS_GAME_CLEAR - goto_eq LilycoveCity_EventScript_1E2FA1 + goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_EventScript_1E2FA1 msgbox LilycoveCity_Text_1E346D, MSGBOX_DEFAULT return @@ -394,8 +385,7 @@ LilycoveCity_EventScript_1E2FE2:: @ 81E2FE2 return LilycoveCity_EventScript_1E2FEB:: @ 81E2FEB - checkflag FLAG_SYS_GAME_CLEAR - goto_eq LilycoveCity_EventScript_1E2FFD + goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_EventScript_1E2FFD msgbox LilycoveCity_Text_1E390C, MSGBOX_DEFAULT return diff --git a/data/maps/LilycoveCity_ContestLobby/scripts.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc index b172dfd7a..46ef88f87 100644 --- a/data/maps/LilycoveCity_ContestLobby/scripts.inc +++ b/data/maps/LilycoveCity_ContestLobby/scripts.inc @@ -11,7 +11,7 @@ LilycoveCity_ContestLobby_MapScript1_21A21C: @ 821A21C LilycoveCity_ContestLobby_EventScript_21A227:: @ 821A227 getpricereduction 4 compare VAR_RESULT, 1 - goto_eq LilycoveCity_ContestLobby_EventScript_21A23C + goto_if_eq LilycoveCity_ContestLobby_EventScript_21A23C clearflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_POKEBLOCK_EXPERT setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS return @@ -27,8 +27,7 @@ LilycoveCity_ContestLobby_MapScript2_21A243: @ 821A243 .2byte 0 LilycoveCity_ContestLobby_EventScript_21A255:: @ 821A255 - checkflag FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR - goto_eq LilycoveCity_ContestLobby_EventScript_21A264 + goto_if_set FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR, LilycoveCity_ContestLobby_EventScript_21A264 setvar VAR_0x4099, 0 end @@ -46,9 +45,9 @@ LilycoveCity_ContestLobby_EventScript_21A264:: @ 821A264 lockall msgbox LilycoveCity_ContestLobby_Text_21AE78, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq LilycoveCity_ContestLobby_EventScript_21A2AA + goto_if_eq LilycoveCity_ContestLobby_EventScript_21A2AA compare VAR_RESULT, 0 - goto_eq LilycoveCity_ContestLobby_EventScript_21A2E4 + goto_if_eq LilycoveCity_ContestLobby_EventScript_21A2E4 releaseall end @@ -71,7 +70,7 @@ LilycoveCity_ContestLobby_EventScript_21A2AA:: @ 821A2AA LilycoveCity_ContestLobby_EventScript_21A2E4:: @ 821A2E4 msgbox LilycoveCity_ContestLobby_Text_21B0BC, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq LilycoveCity_ContestLobby_EventScript_21A2AA + goto_if_eq LilycoveCity_ContestLobby_EventScript_21A2AA msgbox LilycoveCity_ContestLobby_Text_21B132, MSGBOX_DEFAULT closemessage applymovement 4, LilycoveCity_ContestLobby_Movement_21A40F @@ -202,8 +201,7 @@ LilycoveCity_ContestLobby_Movement_21A41E: @ 821A41E step_end LilycoveCity_ContestLobby_EventScript_21A427:: @ 821A427 - checkflag FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR - goto_eq LilycoveCity_ContestLobby_EventScript_21A436 + goto_if_set FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR, LilycoveCity_ContestLobby_EventScript_21A436 setvar VAR_0x4099, 0 end @@ -220,9 +218,9 @@ LilycoveCity_ContestLobby_EventScript_21A436:: @ 821A436 drawcontestwinner 0 msgbox LilycoveCity_ContestLobby_Text_21AE78, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq LilycoveCity_ContestLobby_EventScript_21A47A + goto_if_eq LilycoveCity_ContestLobby_EventScript_21A47A compare VAR_RESULT, 0 - goto_eq LilycoveCity_ContestLobby_EventScript_21A4B4 + goto_if_eq LilycoveCity_ContestLobby_EventScript_21A4B4 end LilycoveCity_ContestLobby_EventScript_21A47A:: @ 821A47A @@ -244,7 +242,7 @@ LilycoveCity_ContestLobby_EventScript_21A47A:: @ 821A47A LilycoveCity_ContestLobby_EventScript_21A4B4:: @ 821A4B4 msgbox LilycoveCity_ContestLobby_Text_21B0BC, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq LilycoveCity_ContestLobby_EventScript_21A47A + goto_if_eq LilycoveCity_ContestLobby_EventScript_21A47A msgbox LilycoveCity_ContestLobby_Text_21B132, MSGBOX_DEFAULT closemessage applymovement 11, LilycoveCity_ContestLobby_Movement_21A53C @@ -321,7 +319,7 @@ LilycoveCity_ContestLobby_EventScript_21A554:: @ 821A554 special sub_80F9154 specialvar VAR_RESULT, sub_80F8D24 compare VAR_RESULT, 1 - goto_eq LilycoveCity_ContestLobby_EventScript_21A5CF + goto_if_eq LilycoveCity_ContestLobby_EventScript_21A5CF call LilycoveCity_ContestLobby_EventScript_279CC5 call LilycoveCity_ContestLobby_EventScript_21A670 special SetContestTrainerGfxIds @@ -643,10 +641,10 @@ LilycoveCity_ContestLobby_EventScript_21A819:: @ 821A819 LilycoveCity_ContestLobby_EventScript_21A856:: @ 821A856 msgbox LilycoveCity_ContestLobby_Text_27BD17, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq LilycoveCity_ContestLobby_EventScript_21A97F + goto_if_eq LilycoveCity_ContestLobby_EventScript_21A97F call LilycoveCity_ContestLobby_EventScript_27134F compare VAR_RESULT, 0 - goto_eq LilycoveCity_ContestLobby_EventScript_21A97F + goto_if_eq LilycoveCity_ContestLobby_EventScript_21A97F message LilycoveCity_ContestLobby_Text_27C8FD waitmessage specialvar VAR_TEMP_D, IsWirelessAdapterConnected @@ -666,7 +664,7 @@ LilycoveCity_ContestLobby_EventScript_21A8BB:: @ 821A8BB LilycoveCity_ContestLobby_EventScript_21A8C6:: @ 821A8C6 setvar VAR_TEMP_C, 1 compare VAR_TEMP_D, 1 - goto_eq LilycoveCity_ContestLobby_EventScript_21AAFC + goto_if_eq LilycoveCity_ContestLobby_EventScript_21AAFC goto LilycoveCity_ContestLobby_EventScript_21A8DC end @@ -719,18 +717,18 @@ LilycoveCity_ContestLobby_EventScript_21A98C:: @ 821A98C setvar VAR_CONTEST_RANK, 0 choosecontestmon compare VAR_0x8004, 255 - goto_eq LilycoveCity_ContestLobby_EventScript_21A97F + goto_if_eq LilycoveCity_ContestLobby_EventScript_21A97F special sub_80F7F30 compare VAR_RESULT, 0 - goto_eq LilycoveCity_ContestLobby_EventScript_21A9E0 + goto_if_eq LilycoveCity_ContestLobby_EventScript_21A9E0 compare VAR_RESULT, 1 - goto_eq LilycoveCity_ContestLobby_EventScript_21AA0A + goto_if_eq LilycoveCity_ContestLobby_EventScript_21AA0A compare VAR_RESULT, 2 - goto_eq LilycoveCity_ContestLobby_EventScript_21AA0A + goto_if_eq LilycoveCity_ContestLobby_EventScript_21AA0A compare VAR_RESULT, 3 - goto_eq LilycoveCity_ContestLobby_EventScript_21A9EE + goto_if_eq LilycoveCity_ContestLobby_EventScript_21A9EE compare VAR_RESULT, 4 - goto_eq LilycoveCity_ContestLobby_EventScript_21A9FC + goto_if_eq LilycoveCity_ContestLobby_EventScript_21A9FC end LilycoveCity_ContestLobby_EventScript_21A9E0:: @ 821A9E0 @@ -755,9 +753,9 @@ LilycoveCity_ContestLobby_EventScript_21AA0A:: @ 821AA0A LilycoveCity_ContestLobby_EventScript_21AA15:: @ 821AA15 compare VAR_TEMP_D, 1 - goto_eq LilycoveCity_ContestLobby_EventScript_21AB4B + goto_if_eq LilycoveCity_ContestLobby_EventScript_21AB4B compare VAR_TEMP_D, 2 - goto_if 4, LilycoveCity_ContestLobby_EventScript_21A97F + goto_if_ge LilycoveCity_ContestLobby_EventScript_21A97F message LilycoveCity_ContestLobby_Text_27BF85 waitmessage copyvar VAR_0x8004, VAR_RESULT @@ -766,17 +764,17 @@ LilycoveCity_ContestLobby_EventScript_21AA15:: @ 821AA15 compare VAR_TEMP_C, 1 call_if 1, LilycoveCity_ContestLobby_EventScript_21AAC0 compare VAR_TEMP_C, 2 - goto_if 4, LilycoveCity_ContestLobby_EventScript_21A97F + goto_if_ge LilycoveCity_ContestLobby_EventScript_21A97F compare VAR_RESULT, 4 - goto_eq LilycoveCity_ContestLobby_EventScript_21AAD3 + goto_if_eq LilycoveCity_ContestLobby_EventScript_21AAD3 compare VAR_RESULT, 3 - goto_eq LilycoveCity_ContestLobby_EventScript_21AAD3 + goto_if_eq LilycoveCity_ContestLobby_EventScript_21AAD3 compare VAR_RESULT, 5 - goto_eq LilycoveCity_ContestLobby_EventScript_21A97F + goto_if_eq LilycoveCity_ContestLobby_EventScript_21A97F compare VAR_RESULT, 6 - goto_eq LilycoveCity_ContestLobby_EventScript_21AAEF + goto_if_eq LilycoveCity_ContestLobby_EventScript_21AAEF compare VAR_RESULT, 10 - goto_eq LilycoveCity_ContestLobby_EventScript_21AAE1 + goto_if_eq LilycoveCity_ContestLobby_EventScript_21AAE1 message3 LilycoveCity_ContestLobby_Text_27BEEC contestlinktransfer switch VAR_0x8004 @@ -890,22 +888,22 @@ LilycoveCity_ContestLobby_EventScript_21ABA6:: @ 821ABA6 LilycoveCity_ContestLobby_EventScript_21ABE3:: @ 821ABE3 call LilycoveCity_ContestLobby_EventScript_21AC33 compare VAR_RESULT, 1 - goto_eq LilycoveCity_ContestLobby_EventScript_21AC3D + goto_if_eq LilycoveCity_ContestLobby_EventScript_21AC3D compare VAR_RESULT, 5 - goto_eq LilycoveCity_ContestLobby_EventScript_21ABA6 + goto_if_eq LilycoveCity_ContestLobby_EventScript_21ABA6 compare VAR_RESULT, 8 - goto_eq LilycoveCity_ContestLobby_EventScript_21ABE3 + goto_if_eq LilycoveCity_ContestLobby_EventScript_21ABE3 release end LilycoveCity_ContestLobby_EventScript_21AC0B:: @ 821AC0B call LilycoveCity_ContestLobby_EventScript_21AC38 compare VAR_RESULT, 1 - goto_eq LilycoveCity_ContestLobby_EventScript_21AC3D + goto_if_eq LilycoveCity_ContestLobby_EventScript_21AC3D compare VAR_RESULT, 5 - goto_eq LilycoveCity_ContestLobby_EventScript_21ABA6 + goto_if_eq LilycoveCity_ContestLobby_EventScript_21ABA6 compare VAR_RESULT, 8 - goto_eq LilycoveCity_ContestLobby_EventScript_21AC0B + goto_if_eq LilycoveCity_ContestLobby_EventScript_21AC0B release end @@ -1006,8 +1004,7 @@ LilycoveCity_ContestLobby_Movement_21ACEF: @ 821ACEF LilycoveCity_ContestLobby_EventScript_21ACF1:: @ 821ACF1 lock faceplayer - checkflag FLAG_0x05F - goto_eq LilycoveCity_ContestLobby_EventScript_21AD06 + goto_if_set FLAG_0x05F, LilycoveCity_ContestLobby_EventScript_21AD06 msgbox LilycoveCity_ContestLobby_Text_21AD10, MSGBOX_DEFAULT release end diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc index 35ab3aa8e..7ccc8b82f 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc @@ -3,10 +3,8 @@ LilycoveCity_CoveLilyMotel_1F_MapScripts:: @ 8218188 LilycoveCity_CoveLilyMotel_1F_EventScript_218189:: @ 8218189 lockall - checkflag FLAG_SYS_GAME_CLEAR - goto_eq LilycoveCity_CoveLilyMotel_1F_EventScript_2181EA - checkflag FLAG_BADGE07_GET - goto_eq LilycoveCity_CoveLilyMotel_1F_EventScript_2181C3 + goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_CoveLilyMotel_1F_EventScript_2181EA + goto_if_set FLAG_BADGE07_GET, LilycoveCity_CoveLilyMotel_1F_EventScript_2181C3 msgbox LilycoveCity_CoveLilyMotel_1F_Text_218264, MSGBOX_DEFAULT applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_27259E waitmovement 0 diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc index 33f67ff9a..108fbc2f3 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc @@ -10,7 +10,7 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_2186D3:: @ 82186D3 call_if 1, LilycoveCity_CoveLilyMotel_2F_EventScript_21870F specialvar VAR_RESULT, sub_80C08E4 compare VAR_RESULT, 1 - goto_eq LilycoveCity_CoveLilyMotel_2F_EventScript_218702 + goto_if_eq LilycoveCity_CoveLilyMotel_2F_EventScript_218702 release end @@ -57,8 +57,7 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_218744:: @ 8218744 LilycoveCity_CoveLilyMotel_2F_EventScript_21874D:: @ 821874D lock faceplayer - checkflag FLAG_0x1CE - goto_eq LilycoveCity_CoveLilyMotel_2F_EventScript_21876A + goto_if_set FLAG_0x1CE, LilycoveCity_CoveLilyMotel_2F_EventScript_21876A msgbox LilycoveCity_CoveLilyMotel_2F_Text_218ACF, MSGBOX_DEFAULT addvar VAR_0x40D1, 1 setflag FLAG_0x1CE diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc index bcc3649e2..f96cee275 100644 --- a/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc @@ -61,7 +61,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_220718:: @ 8220718 setvar VAR_0x8006, 4 setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F, 255, 2, 1 compare VAR_DEPT_STORE_FLOOR, 4 - goto_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 + goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 call LilycoveCity_DepartmentStoreElevator_EventScript_2207E5 setvar VAR_DEPT_STORE_FLOOR, 4 goto LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 @@ -71,7 +71,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_220740:: @ 8220740 setvar VAR_0x8006, 5 setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F, 255, 2, 1 compare VAR_DEPT_STORE_FLOOR, 5 - goto_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 + goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 call LilycoveCity_DepartmentStoreElevator_EventScript_2207E5 setvar VAR_DEPT_STORE_FLOOR, 5 goto LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 @@ -81,7 +81,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_220768:: @ 8220768 setvar VAR_0x8006, 6 setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F, 255, 2, 1 compare VAR_DEPT_STORE_FLOOR, 6 - goto_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 + goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 call LilycoveCity_DepartmentStoreElevator_EventScript_2207E5 setvar VAR_DEPT_STORE_FLOOR, 6 goto LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 @@ -91,7 +91,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_220790:: @ 8220790 setvar VAR_0x8006, 7 setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F, 255, 2, 1 compare VAR_DEPT_STORE_FLOOR, 7 - goto_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 + goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 call LilycoveCity_DepartmentStoreElevator_EventScript_2207E5 setvar VAR_DEPT_STORE_FLOOR, 7 goto LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 @@ -101,7 +101,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_2207B8:: @ 82207B8 setvar VAR_0x8006, 8 setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F, 255, 2, 1 compare VAR_DEPT_STORE_FLOOR, 8 - goto_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 + goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 call LilycoveCity_DepartmentStoreElevator_EventScript_2207E5 setvar VAR_DEPT_STORE_FLOOR, 8 goto LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc index dbb552409..1487d705a 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc @@ -133,10 +133,10 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_22032F:: @ 822032F compare VAR_TEMP_1, 2 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_220313 compare VAR_RESULT, 0 - goto_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220442 + goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220442 checkitemspace VAR_TEMP_0, 1 compare VAR_RESULT, 0 - goto_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220450 + goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220450 compare VAR_TEMP_1, 0 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_22031A compare VAR_TEMP_1, 1 @@ -154,10 +154,10 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_22032F:: @ 822032F msgbox gUnknown_08272A9A, MSGBOX_DEFAULT random 64 compare VAR_RESULT, 0 - goto_if 5, LilycoveCity_DepartmentStoreRooftop_EventScript_220436 + goto_if_ne LilycoveCity_DepartmentStoreRooftop_EventScript_220436 checkitemspace VAR_TEMP_0, 1 compare VAR_RESULT, 0 - goto_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220450 + goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220450 playse SE_JIHANKI msgbox LilycoveCity_DepartmentStoreRooftop_Text_2205C2, MSGBOX_DEFAULT giveitem VAR_TEMP_0, 1 @@ -166,10 +166,10 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_22032F:: @ 822032F msgbox gUnknown_08272A9A, MSGBOX_DEFAULT random 64 compare VAR_RESULT, 0 - goto_if 5, LilycoveCity_DepartmentStoreRooftop_EventScript_220436 + goto_if_ne LilycoveCity_DepartmentStoreRooftop_EventScript_220436 checkitemspace VAR_TEMP_0, 1 compare VAR_RESULT, 0 - goto_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220450 + goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220450 playse SE_JIHANKI msgbox LilycoveCity_DepartmentStoreRooftop_Text_2205C2, MSGBOX_DEFAULT giveitem VAR_TEMP_0, 1 diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc index fece7f16e..328a045c7 100644 --- a/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc @@ -10,12 +10,11 @@ LilycoveCity_DepartmentStore_1F_EventScript_21F69C:: @ 821F69C faceplayer dodailyevents compare VAR_POKELOT_PRIZE, 0 - goto_if 5, LilycoveCity_DepartmentStore_1F_EventScript_21F7F7 - checkflag FLAG_0x92A - goto_eq LilycoveCity_DepartmentStore_1F_EventScript_21F78D + goto_if_ne LilycoveCity_DepartmentStore_1F_EventScript_21F7F7 + goto_if_set FLAG_0x92A, LilycoveCity_DepartmentStore_1F_EventScript_21F78D msgbox LilycoveCity_DepartmentStore_1F_Text_2A6390, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq LilycoveCity_DepartmentStore_1F_EventScript_21F797 + goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_21F797 setflag FLAG_0x92A message LilycoveCity_DepartmentStore_1F_Text_2A64C8 waitmessage @@ -34,7 +33,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_21F69C:: @ 821F69C applymovement 2, LilycoveCity_DepartmentStore_1F_Movement_27259E waitmovement 0 compare VAR_0x8004, 0 - goto_eq LilycoveCity_DepartmentStore_1F_EventScript_21F7A1 + goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_21F7A1 incrementgamestat 46 compare VAR_0x8006, 0 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_21F77B @@ -51,7 +50,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_21F69C:: @ 821F69C call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_21F7D4 giveitem_std VAR_0x8005 compare VAR_RESULT, 0 - goto_eq LilycoveCity_DepartmentStore_1F_EventScript_21F7DD + goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_21F7DD special sub_80EE2CC goto LilycoveCity_DepartmentStore_1F_EventScript_21F7AF end @@ -115,7 +114,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_21F7F7:: @ 821F7F7 msgbox LilycoveCity_DepartmentStore_1F_Text_2A67E1, MSGBOX_DEFAULT giveitem_std VAR_POKELOT_PRIZE compare VAR_RESULT, 0 - goto_eq LilycoveCity_DepartmentStore_1F_EventScript_21F7ED + goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_21F7ED copyvar VAR_0x8004, VAR_0x404D copyvar VAR_0x8005, VAR_POKELOT_PRIZE special sub_80EE2CC diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc index 9f55dbc04..b278d3e14 100644 --- a/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc @@ -126,9 +126,9 @@ LilycoveCity_DepartmentStore_5F_EventScript_220075:: @ 8220075 applymovement 7, LilycoveCity_DepartmentStore_5F_Movement_27259E waitmovement 0 compare VAR_0x405E, 0 - goto_eq LilycoveCity_DepartmentStore_5F_EventScript_22009C + goto_if_eq LilycoveCity_DepartmentStore_5F_EventScript_22009C compare VAR_0x405E, 4 - goto_if 4, LilycoveCity_DepartmentStore_5F_EventScript_22009C + goto_if_ge LilycoveCity_DepartmentStore_5F_EventScript_22009C goto LilycoveCity_DepartmentStore_5F_EventScript_2200A7 end diff --git a/data/maps/LilycoveCity_Harbor/scripts.inc b/data/maps/LilycoveCity_Harbor/scripts.inc index 7beb75988..03d46b641 100644 --- a/data/maps/LilycoveCity_Harbor/scripts.inc +++ b/data/maps/LilycoveCity_Harbor/scripts.inc @@ -9,8 +9,7 @@ LilycoveCity_Harbor_MapScript1_21E006: @ 821E006 LilycoveCity_Harbor_EventScript_21E00F:: @ 821E00F lock faceplayer - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, LilycoveCity_Harbor_EventScript_21E54D + goto_if_unset FLAG_SYS_GAME_CLEAR, LilycoveCity_Harbor_EventScript_21E54D call LilycoveCity_Harbor_EventScript_21E194 call LilycoveCity_Harbor_EventScript_21E1C6 call LilycoveCity_Harbor_EventScript_21E1F8 @@ -18,23 +17,23 @@ LilycoveCity_Harbor_EventScript_21E00F:: @ 821E00F call LilycoveCity_Harbor_EventScript_21E25C call LilycoveCity_Harbor_EventScript_21E2A6 compare VAR_TEMP_C, 2 - goto_eq LilycoveCity_Harbor_EventScript_21E350 + goto_if_eq LilycoveCity_Harbor_EventScript_21E350 compare VAR_TEMP_B, 1 - goto_eq LilycoveCity_Harbor_EventScript_21E2F0 + goto_if_eq LilycoveCity_Harbor_EventScript_21E2F0 compare VAR_TEMP_B, 2 - goto_eq LilycoveCity_Harbor_EventScript_21E320 + goto_if_eq LilycoveCity_Harbor_EventScript_21E320 compare VAR_TEMP_B, 4 - goto_eq LilycoveCity_Harbor_EventScript_21E350 + goto_if_eq LilycoveCity_Harbor_EventScript_21E350 compare VAR_TEMP_B, 8 - goto_eq LilycoveCity_Harbor_EventScript_21E41D + goto_if_eq LilycoveCity_Harbor_EventScript_21E41D compare VAR_TEMP_B, 0 - goto_if 5, LilycoveCity_Harbor_EventScript_21E44D + goto_if_ne LilycoveCity_Harbor_EventScript_21E44D goto LilycoveCity_Harbor_EventScript_21E080 end LilycoveCity_Harbor_EventScript_21E080:: @ 821E080 compare VAR_TEMP_A, 0 - goto_eq LilycoveCity_Harbor_EventScript_21E557 + goto_if_eq LilycoveCity_Harbor_EventScript_21E557 msgbox LilycoveCity_Harbor_Text_21E758, MSGBOX_DEFAULT message LilycoveCity_Harbor_Text_21E7ED waitmessage @@ -88,7 +87,7 @@ LilycoveCity_Harbor_EventScript_21E139:: @ 821E139 LilycoveCity_Harbor_EventScript_21E149:: @ 821E149 msgbox LilycoveCity_Harbor_Text_21E864, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq LilycoveCity_Harbor_EventScript_21E5C0 + goto_if_eq LilycoveCity_Harbor_EventScript_21E5C0 setvar VAR_PORTHOLE_STATE, 5 call LilycoveCity_Harbor_EventScript_21E5CC warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10 @@ -99,7 +98,7 @@ LilycoveCity_Harbor_EventScript_21E149:: @ 821E149 LilycoveCity_Harbor_EventScript_21E171:: @ 821E171 msgbox LilycoveCity_Harbor_Text_21E880, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq LilycoveCity_Harbor_EventScript_21E5C0 + goto_if_eq LilycoveCity_Harbor_EventScript_21E5C0 call LilycoveCity_Harbor_EventScript_21E5CC warp MAP_BATTLE_FRONTIER_OUTSIDE_WEST, 255, 19, 67 waitstate @@ -108,53 +107,45 @@ LilycoveCity_Harbor_EventScript_21E171:: @ 821E171 LilycoveCity_Harbor_EventScript_21E194:: @ 821E194 setvar VAR_TEMP_E, 0 - checkflag FLAG_SYS_HAS_EON_TICKET - goto_if 0, LilycoveCity_Harbor_EventScript_27374E + goto_if_unset FLAG_SYS_HAS_EON_TICKET, LilycoveCity_Harbor_EventScript_27374E checkitem ITEM_EON_TICKET, 1 compare VAR_RESULT, 0 - goto_eq LilycoveCity_Harbor_EventScript_27374E + goto_if_eq LilycoveCity_Harbor_EventScript_27374E setvar VAR_TEMP_E, 1 - checkflag FLAG_0x1AE - goto_eq LilycoveCity_Harbor_EventScript_27374E + goto_if_set FLAG_0x1AE, LilycoveCity_Harbor_EventScript_27374E setvar VAR_TEMP_E, 2 return LilycoveCity_Harbor_EventScript_21E1C6:: @ 821E1C6 setvar VAR_TEMP_D, 0 - checkflag FLAG_0x8D5 - goto_if 0, LilycoveCity_Harbor_EventScript_27374E + goto_if_unset FLAG_0x8D5, LilycoveCity_Harbor_EventScript_27374E checkitem ITEM_AURORA_TICKET, 1 compare VAR_RESULT, 0 - goto_eq LilycoveCity_Harbor_EventScript_27374E + goto_if_eq LilycoveCity_Harbor_EventScript_27374E setvar VAR_TEMP_D, 1 - checkflag FLAG_0x1AF - goto_eq LilycoveCity_Harbor_EventScript_27374E + goto_if_set FLAG_0x1AF, LilycoveCity_Harbor_EventScript_27374E setvar VAR_TEMP_D, 2 return LilycoveCity_Harbor_EventScript_21E1F8:: @ 821E1F8 setvar VAR_TEMP_C, 0 - checkflag FLAG_0x8D6 - goto_if 0, LilycoveCity_Harbor_EventScript_27374E + goto_if_unset FLAG_0x8D6, LilycoveCity_Harbor_EventScript_27374E checkitem ITEM_OLD_SEA_MAP, 1 compare VAR_RESULT, 0 - goto_eq LilycoveCity_Harbor_EventScript_27374E + goto_if_eq LilycoveCity_Harbor_EventScript_27374E setvar VAR_TEMP_C, 1 - checkflag FLAG_0x1B0 - goto_eq LilycoveCity_Harbor_EventScript_27374E + goto_if_set FLAG_0x1B0, LilycoveCity_Harbor_EventScript_27374E setvar VAR_TEMP_C, 2 return LilycoveCity_Harbor_EventScript_21E22A:: @ 821E22A setvar VAR_TEMP_9, 0 - checkflag FLAG_0x8E0 - goto_if 0, LilycoveCity_Harbor_EventScript_27374E + goto_if_unset FLAG_0x8E0, LilycoveCity_Harbor_EventScript_27374E checkitem ITEM_MYSTIC_TICKET, 1 compare VAR_RESULT, 0 - goto_eq LilycoveCity_Harbor_EventScript_27374E + goto_if_eq LilycoveCity_Harbor_EventScript_27374E setvar VAR_TEMP_9, 1 - checkflag FLAG_0x1DB - goto_eq LilycoveCity_Harbor_EventScript_27374E + goto_if_set FLAG_0x1DB, LilycoveCity_Harbor_EventScript_27374E setvar VAR_TEMP_9, 2 return @@ -397,7 +388,7 @@ LilycoveCity_Harbor_EventScript_21E56B:: @ 821E56B LilycoveCity_Harbor_EventScript_21E575:: @ 821E575 msgbox LilycoveCity_Harbor_Text_21E864, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq LilycoveCity_Harbor_EventScript_21E5C0 + goto_if_eq LilycoveCity_Harbor_EventScript_21E5C0 setvar VAR_PORTHOLE_STATE, 5 call LilycoveCity_Harbor_EventScript_21E5CC warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10 @@ -408,7 +399,7 @@ LilycoveCity_Harbor_EventScript_21E575:: @ 821E575 LilycoveCity_Harbor_EventScript_21E59D:: @ 821E59D msgbox LilycoveCity_Harbor_Text_21E880, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq LilycoveCity_Harbor_EventScript_21E5C0 + goto_if_eq LilycoveCity_Harbor_EventScript_21E5C0 call LilycoveCity_Harbor_EventScript_21E5CC warp MAP_BATTLE_FRONTIER_OUTSIDE_WEST, 255, 19, 67 waitstate @@ -469,8 +460,7 @@ LilycoveCity_Harbor_Movement_21E635: @ 821E635 LilycoveCity_Harbor_EventScript_21E637:: @ 821E637 lock faceplayer - checkflag FLAG_SYS_GAME_CLEAR - goto_eq LilycoveCity_Harbor_EventScript_21E64C + goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_Harbor_EventScript_21E64C msgbox LilycoveCity_Harbor_Text_21E8EE, MSGBOX_DEFAULT release end diff --git a/data/maps/LilycoveCity_House2/scripts.inc b/data/maps/LilycoveCity_House2/scripts.inc index 6069f0fa7..dc526f00b 100644 --- a/data/maps/LilycoveCity_House2/scripts.inc +++ b/data/maps/LilycoveCity_House2/scripts.inc @@ -4,12 +4,11 @@ LilycoveCity_House2_MapScripts:: @ 821ED74 LilycoveCity_House2_EventScript_21ED75:: @ 821ED75 lock faceplayer - checkflag FLAG_0x0EA - goto_eq LilycoveCity_House2_EventScript_21EDAC + goto_if_set FLAG_0x0EA, LilycoveCity_House2_EventScript_21EDAC msgbox LilycoveCity_House2_Text_21EDB6, MSGBOX_DEFAULT giveitem_std ITEM_TM44 compare VAR_RESULT, 0 - goto_eq LilycoveCity_House2_EventScript_272054 + goto_if_eq LilycoveCity_House2_EventScript_272054 setflag FLAG_0x0EA msgbox LilycoveCity_House2_Text_21EDF9, MSGBOX_DEFAULT release diff --git a/data/maps/LilycoveCity_House3/scripts.inc b/data/maps/LilycoveCity_House3/scripts.inc index 8c3f4f7ab..644c50113 100644 --- a/data/maps/LilycoveCity_House3/scripts.inc +++ b/data/maps/LilycoveCity_House3/scripts.inc @@ -12,7 +12,7 @@ LilycoveCity_House3_EventScript_21EE4B:: @ 821EE4B faceplayer msgbox LilycoveCity_House3_Text_21EF99, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq LilycoveCity_House3_EventScript_21EE75 + goto_if_eq LilycoveCity_House3_EventScript_21EE75 msgbox LilycoveCity_House3_Text_21F0F8, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, LilycoveCity_House3_Movement_2725A2 diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc index 54ba63fb0..89ac90dc6 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc @@ -12,9 +12,9 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_218CC2:: @ 8218CC2 waitmessage multichoice 20, 8, 16, 1 compare VAR_RESULT, 0 - goto_eq LilycoveCity_LilycoveMuseum_1F_EventScript_218CF5 + goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_218CF5 compare VAR_RESULT, 1 - goto_eq LilycoveCity_LilycoveMuseum_1F_EventScript_218CEC + goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_218CEC end LilycoveCity_LilycoveMuseum_1F_EventScript_218CEC:: @ 8218CEC @@ -24,9 +24,9 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_218CEC:: @ 8218CEC LilycoveCity_LilycoveMuseum_1F_EventScript_218CF5:: @ 8218CF5 msgbox LilycoveCity_LilycoveMuseum_1F_Text_218F98, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq LilycoveCity_LilycoveMuseum_1F_EventScript_218D14 + goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_218D14 compare VAR_RESULT, 1 - goto_eq LilycoveCity_LilycoveMuseum_1F_EventScript_218D1E + goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_218D1E end LilycoveCity_LilycoveMuseum_1F_EventScript_218D14:: @ 8218D14 diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc index e2bda1ab5..325ad0340 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc @@ -4,32 +4,27 @@ LilycoveCity_LilycoveMuseum_2F_MapScripts:: @ 821973A .byte 0 LilycoveCity_LilycoveMuseum_2F_MapScript1_219745: @ 8219745 - checkflag FLAG_0x0A0 - goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_21978B + goto_if_set FLAG_0x0A0, LilycoveCity_LilycoveMuseum_2F_EventScript_21978B goto LilycoveCity_LilycoveMuseum_2F_EventScript_219754 end LilycoveCity_LilycoveMuseum_2F_EventScript_219754:: @ 8219754 - checkflag FLAG_0x0A1 - goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_2197A3 + goto_if_set FLAG_0x0A1, LilycoveCity_LilycoveMuseum_2F_EventScript_2197A3 goto LilycoveCity_LilycoveMuseum_2F_EventScript_219763 end LilycoveCity_LilycoveMuseum_2F_EventScript_219763:: @ 8219763 - checkflag FLAG_0x0A2 - goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_2197BB + goto_if_set FLAG_0x0A2, LilycoveCity_LilycoveMuseum_2F_EventScript_2197BB goto LilycoveCity_LilycoveMuseum_2F_EventScript_219772 end LilycoveCity_LilycoveMuseum_2F_EventScript_219772:: @ 8219772 - checkflag FLAG_0x0A3 - goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_2197D3 + goto_if_set FLAG_0x0A3, LilycoveCity_LilycoveMuseum_2F_EventScript_2197D3 goto LilycoveCity_LilycoveMuseum_2F_EventScript_219781 end LilycoveCity_LilycoveMuseum_2F_EventScript_219781:: @ 8219781 - checkflag FLAG_0x0A4 - goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_2197EB + goto_if_set FLAG_0x0A4, LilycoveCity_LilycoveMuseum_2F_EventScript_2197EB end LilycoveCity_LilycoveMuseum_2F_EventScript_21978B:: @ 821978B @@ -96,8 +91,7 @@ LilycoveCity_LilycoveMuseum_2F_Movement_219863: @ 8219863 LilycoveCity_LilycoveMuseum_2F_EventScript_219866:: @ 8219866 lockall - checkflag FLAG_0x0EC - goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_219921 + goto_if_set FLAG_0x0EC, LilycoveCity_LilycoveMuseum_2F_EventScript_219921 specialvar VAR_0x8004, sub_80F8940 switch VAR_0x8004 case 1, LilycoveCity_LilycoveMuseum_2F_EventScript_2198BA @@ -126,7 +120,7 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_2198EA:: @ 82198EA msgbox LilycoveCity_LilycoveMuseum_2F_Text_219EC5, MSGBOX_DEFAULT givedecoration_std 44 compare VAR_RESULT, 0 - goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_219911 + goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_219911 setflag FLAG_0x0EC closemessage releaseall @@ -146,36 +140,31 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_219921:: @ 8219921 LilycoveCity_LilycoveMuseum_2F_EventScript_21992B:: @ 821992B lockall - checkflag FLAG_0x0A2 - goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_2199C1 + goto_if_set FLAG_0x0A2, LilycoveCity_LilycoveMuseum_2F_EventScript_2199C1 msgbox LilycoveCity_LilycoveMuseum_2F_Text_219FA0, MSGBOX_SIGN end LilycoveCity_LilycoveMuseum_2F_EventScript_21993E:: @ 821993E lockall - checkflag FLAG_0x0A4 - goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_2199DD + goto_if_set FLAG_0x0A4, LilycoveCity_LilycoveMuseum_2F_EventScript_2199DD msgbox LilycoveCity_LilycoveMuseum_2F_Text_219FD3, MSGBOX_SIGN end LilycoveCity_LilycoveMuseum_2F_EventScript_219951:: @ 8219951 lockall - checkflag FLAG_0x0A0 - goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_2199A5 + goto_if_set FLAG_0x0A0, LilycoveCity_LilycoveMuseum_2F_EventScript_2199A5 msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A03B, MSGBOX_SIGN end LilycoveCity_LilycoveMuseum_2F_EventScript_219964:: @ 8219964 lockall - checkflag FLAG_0x0A1 - goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_2199B3 + goto_if_set FLAG_0x0A1, LilycoveCity_LilycoveMuseum_2F_EventScript_2199B3 msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A008, MSGBOX_SIGN end LilycoveCity_LilycoveMuseum_2F_EventScript_219977:: @ 8219977 lockall - checkflag FLAG_0x0A3 - goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_2199CF + goto_if_set FLAG_0x0A3, LilycoveCity_LilycoveMuseum_2F_EventScript_2199CF msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A06D, MSGBOX_SIGN end diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc b/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc index 160dab557..c5c2188e5 100644 --- a/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc +++ b/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc @@ -17,19 +17,19 @@ LilycoveCity_MoveDeletersHouse_EventScript_21EA3B:: @ 821EA3B special sub_81B94B0 waitstate compare VAR_0x8004, 255 - goto_eq LilycoveCity_MoveDeletersHouse_EventScript_21EAE6 + goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_21EAE6 special sub_81B98DC compare VAR_RESULT, 1 - goto_eq LilycoveCity_MoveDeletersHouse_EventScript_21EADC + goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_21EADC special sub_81B96D0 compare VAR_RESULT, 1 - goto_eq LilycoveCity_MoveDeletersHouse_EventScript_21EACF + goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_21EACF msgbox LilycoveCity_MoveDeletersHouse_Text_21EB89, MSGBOX_DEFAULT fadescreen 1 special sub_81B968C fadescreen 0 compare VAR_0x8005, 4 - goto_eq LilycoveCity_MoveDeletersHouse_EventScript_21EA3B + goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_21EA3B special sub_81B9718 msgbox LilycoveCity_MoveDeletersHouse_Text_21EBDA, MSGBOX_YESNO switch VAR_RESULT @@ -41,7 +41,7 @@ LilycoveCity_MoveDeletersHouse_EventScript_21EA3B:: @ 821EA3B LilycoveCity_MoveDeletersHouse_EventScript_21EAB0:: @ 821EAB0 special sub_81B9918 compare VAR_RESULT, 1 - goto_eq LilycoveCity_MoveDeletersHouse_EventScript_21EAF0 + goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_21EAF0 special sub_81B9770 playfanfare MUS_ME_WASURE waitfanfare diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc b/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc index 5e51f7daa..dd0dff376 100644 --- a/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc @@ -11,9 +11,9 @@ LilycoveCity_PokemonCenter_1F_MapScript1_21C5BD: @ 821C5BD LilycoveCity_PokemonCenter_1F_EventScript_21C5C6:: @ 821C5C6 special sub_818D9C0 compare VAR_RESULT, 0 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_21C5E0 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_21C5E0 compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_21C5E4 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_21C5E4 end LilycoveCity_PokemonCenter_1F_EventScript_21C5E0:: @ 821C5E0 @@ -39,8 +39,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_21C5F6:: @ 821C5F6 LilycoveCity_PokemonCenter_1F_EventScript_21C5FF:: @ 821C5FF lock faceplayer - checkflag FLAG_BADGE07_GET - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_21C614 + goto_if_set FLAG_BADGE07_GET, LilycoveCity_PokemonCenter_1F_EventScript_21C614 msgbox LilycoveCity_PokemonCenter_1F_Text_21C69D, MSGBOX_DEFAULT release end diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc index 54df8e81a..290efc7be 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc @@ -63,9 +63,9 @@ LilycoveCity_PokemonTrainerFanClub_Movement_21C807: @ 821C807 LilycoveCity_PokemonTrainerFanClub_MapScript1_21C80D: @ 821C80D call LilycoveCity_PokemonTrainerFanClub_EventScript_21C8DA compare VAR_LILYCOVE_FAN_CLUB_STATE, 1 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C9F8 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C9F8 compare VAR_LILYCOVE_FAN_CLUB_STATE, 2 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C829 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C829 end LilycoveCity_PokemonTrainerFanClub_EventScript_21C829:: @ 821C829 @@ -108,7 +108,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21C829:: @ 821C829 LilycoveCity_PokemonTrainerFanClub_EventScript_21C8DA:: @ 821C8DA specialvar VAR_RESULT, sub_80EE7C0 compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C8F1 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C8F1 clearflag FLAG_HIDE_LILYCOVE_FAN_CLUB_INTERVIEWER clearflag FLAG_0x0D2 return @@ -152,7 +152,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21C8F5:: @ 821C8F5 compare VAR_RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE compare VAR_0x8005, 5 - goto_if 4, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9B4 + goto_if_ge LilycoveCity_PokemonTrainerFanClub_EventScript_21C9B4 return LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE:: @ 821C9AE @@ -210,13 +210,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CA17:: @ 821CA17 setvar VAR_0x8004, 13 special BufferStreakTrainerText compare VAR_LILYCOVE_FAN_CLUB_STATE, 0 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CA84 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CA84 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CA56 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CA56 specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 7 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CA7A + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CA7A msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D12A, MSGBOX_DEFAULT release end @@ -224,7 +224,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CA17:: @ 821CA17 LilycoveCity_PokemonTrainerFanClub_EventScript_21CA56:: @ 821CA56 specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CA70 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CA70 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D094, MSGBOX_DEFAULT release end @@ -250,13 +250,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CA8E:: @ 821CA8E setvar VAR_0x8004, 8 special BufferStreakTrainerText compare VAR_LILYCOVE_FAN_CLUB_STATE, 0 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CAFB + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CAFB specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CACD + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CACD specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 7 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CAF1 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CAF1 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D347, MSGBOX_DEFAULT release end @@ -264,7 +264,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CA8E:: @ 821CA8E LilycoveCity_PokemonTrainerFanClub_EventScript_21CACD:: @ 821CACD specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CAE7 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CAE7 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D2A6, MSGBOX_DEFAULT release end @@ -290,13 +290,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CB05:: @ 821CB05 setvar VAR_0x8004, 9 special BufferStreakTrainerText compare VAR_LILYCOVE_FAN_CLUB_STATE, 0 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CB72 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CB72 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CB44 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CB44 specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 7 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CB68 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CB68 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D52E, MSGBOX_DEFAULT release end @@ -304,7 +304,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CB05:: @ 821CB05 LilycoveCity_PokemonTrainerFanClub_EventScript_21CB44:: @ 821CB44 specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CB5E + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CB5E msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D438, MSGBOX_DEFAULT release end @@ -330,13 +330,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CB7C:: @ 821CB7C setvar VAR_0x8004, 10 special BufferStreakTrainerText compare VAR_LILYCOVE_FAN_CLUB_STATE, 0 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CBE9 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CBE9 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CBBB + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CBBB specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 7 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CBDF + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CBDF msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D822, MSGBOX_DEFAULT release end @@ -344,7 +344,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CB7C:: @ 821CB7C LilycoveCity_PokemonTrainerFanClub_EventScript_21CBBB:: @ 821CBBB specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CBD5 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CBD5 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D751, MSGBOX_DEFAULT release end @@ -371,10 +371,10 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CBF3:: @ 821CBF3 special BufferStreakTrainerText specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CC27 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CC27 specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 7 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CC4B + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CC4B msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D9D1, MSGBOX_DEFAULT release end @@ -382,7 +382,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CBF3:: @ 821CBF3 LilycoveCity_PokemonTrainerFanClub_EventScript_21CC27:: @ 821CC27 specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CC41 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CC41 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D921, MSGBOX_DEFAULT release end @@ -404,10 +404,10 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CC55:: @ 821CC55 special BufferStreakTrainerText specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CC89 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CC89 specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 7 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CCAD + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CCAD msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DB69, MSGBOX_DEFAULT release end @@ -415,7 +415,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CC55:: @ 821CC55 LilycoveCity_PokemonTrainerFanClub_EventScript_21CC89:: @ 821CC89 specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CCA3 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CCA3 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DA73, MSGBOX_DEFAULT release end @@ -437,10 +437,10 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CCB7:: @ 821CCB7 special BufferStreakTrainerText specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CCEB + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CCEB specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 7 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD0F + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD0F msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DD36, MSGBOX_DEFAULT release end @@ -448,7 +448,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CCB7:: @ 821CCB7 LilycoveCity_PokemonTrainerFanClub_EventScript_21CCEB:: @ 821CCEB specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD05 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD05 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DC68, MSGBOX_DEFAULT release end @@ -470,10 +470,10 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CD19:: @ 821CD19 special BufferStreakTrainerText specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD4D + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD4D specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 7 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD71 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD71 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DEFF, MSGBOX_DEFAULT release end @@ -481,7 +481,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CD19:: @ 821CD19 LilycoveCity_PokemonTrainerFanClub_EventScript_21CD4D:: @ 821CD4D specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD67 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD67 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DE72, MSGBOX_DEFAULT release end @@ -499,17 +499,15 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CD71:: @ 821CD71 LilycoveCity_PokemonTrainerFanClub_EventScript_21CD7B:: @ 821CD7B lock faceplayer - checkflag FLAG_0x0D2 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CEED - checkflag FLAG_0x0D2 - goto_if 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CD90 + goto_if_set FLAG_0x0D2, LilycoveCity_PokemonTrainerFanClub_EventScript_21CEED + goto_if_unset FLAG_0x0D2, LilycoveCity_PokemonTrainerFanClub_EventScript_21CD90 end LilycoveCity_PokemonTrainerFanClub_EventScript_21CD90:: @ 821CD90 setvar VAR_0x8005, 11 special InterviewBefore compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CEFF + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CEFF copyvar VAR_0x800A, VAR_0x8006 setvar VAR_0x8004, 8 special BufferStreakTrainerText @@ -520,9 +518,9 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CD90:: @ 821CD90 lock faceplayer compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CDE0 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CDE0 compare VAR_RESULT, 0 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CDEE + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CDEE end LilycoveCity_PokemonTrainerFanClub_EventScript_21CDE0:: @ 821CDE0 @@ -535,9 +533,9 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CDEE:: @ 821CDEE special BufferStreakTrainerText msgbox LilycoveCity_PokemonTrainerFanClub_Text_281C3D, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CEC6 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CEC6 compare VAR_RESULT, 0 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CE15 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CE15 end LilycoveCity_PokemonTrainerFanClub_EventScript_21CE15:: @ 821CE15 @@ -550,9 +548,9 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CE15:: @ 821CE15 lock faceplayer compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CDE0 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CDE0 compare VAR_RESULT, 0 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CDEE + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CDEE end LilycoveCity_PokemonTrainerFanClub_EventScript_21CE4D:: @ 821CE4D @@ -580,9 +578,9 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CE9F:: @ 821CE9F special BufferStreakTrainerText msgbox LilycoveCity_PokemonTrainerFanClub_Text_281CCD, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CEC6 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CEC6 compare VAR_RESULT, 0 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CE4D + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CE4D end LilycoveCity_PokemonTrainerFanClub_EventScript_21CEC6:: @ 821CEC6 diff --git a/data/maps/LittlerootTown/scripts.inc b/data/maps/LittlerootTown/scripts.inc index 8e70af98b..001a88327 100644 --- a/data/maps/LittlerootTown/scripts.inc +++ b/data/maps/LittlerootTown/scripts.inc @@ -55,7 +55,7 @@ LittlerootTown_EventScript_1E7E67:: @ 81E7E67 LittlerootTown_EventScript_1E7E6F:: @ 81E7E6F compare VAR_0x4050, 0 - goto_eq LittlerootTown_EventScript_1E7E86 + goto_if_eq LittlerootTown_EventScript_1E7E86 setobjectxyperm 1, 10, 1 setobjectmovementtype 1, 7 return @@ -210,7 +210,7 @@ LittlerootTown_EventScript_1E7FEC:: @ 81E7FEC addobject 7 checkplayergender compare VAR_RESULT, 0 - goto_eq LittlerootTown_EventScript_1E8004 + goto_if_eq LittlerootTown_EventScript_1E8004 goto LittlerootTown_EventScript_1E8013 end @@ -235,12 +235,10 @@ LittlerootTown_EventScript_1E802B:: @ 81E802B LittlerootTown_EventScript_1E8034:: @ 81E8034 lock faceplayer - checkflag FLAG_0x074 - goto_eq LittlerootTown_EventScript_1E8087 - checkflag FLAG_0x052 - goto_eq LittlerootTown_EventScript_1E807A + goto_if_set FLAG_0x074, LittlerootTown_EventScript_1E8087 + goto_if_set FLAG_0x052, LittlerootTown_EventScript_1E807A compare VAR_0x4050, 0 - goto_if 5, LittlerootTown_EventScript_1E805D + goto_if_ne LittlerootTown_EventScript_1E805D msgbox LittlerootTown_Text_1E8BB8, MSGBOX_DEFAULT release end diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc index 363579e6e..addccf7cd 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc +++ b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc @@ -19,7 +19,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F777A:: @ 81F777A LittlerootTown_BrendansHouse_1F_EventScript_1F778D:: @ 81F778D checkplayergender compare VAR_RESULT, 0 - goto_eq LittlerootTown_BrendansHouse_1F_EventScript_1F779A + goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F779A return LittlerootTown_BrendansHouse_1F_EventScript_1F779A:: @ 81F779A diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc index d0063a0e3..4f6841b2c 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc +++ b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc @@ -15,18 +15,17 @@ LittlerootTown_BrendansHouse_2F_MapScript1_1F83EE: @ 81F83EE end LittlerootTown_BrendansHouse_2F_EventScript_1F841A:: @ 81F841A - checkflag FLAG_0x124 - goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8433 + goto_if_set FLAG_0x124, LittlerootTown_BrendansHouse_2F_EventScript_1F8433 compare VAR_0x4084, 2 - goto_if 4, LittlerootTown_BrendansHouse_2F_EventScript_1F8456 + goto_if_ge LittlerootTown_BrendansHouse_2F_EventScript_1F8456 goto LittlerootTown_BrendansHouse_2F_EventScript_1F8433 LittlerootTown_BrendansHouse_2F_EventScript_1F8433:: @ 81F8433 checkplayergender compare VAR_RESULT, 0 - goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8456 + goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8456 compare VAR_0x40D3, 2 - goto_if 4, LittlerootTown_BrendansHouse_2F_EventScript_1F9309 + goto_if_ge LittlerootTown_BrendansHouse_2F_EventScript_1F9309 setobjectxyperm 1, 0, 2 setobjectmovementtype 1, 7 return @@ -37,7 +36,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8456:: @ 81F8456 LittlerootTown_BrendansHouse_2F_EventScript_1F8457:: @ 81F8457 checkplayergender compare VAR_RESULT, 1 - goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8464 + goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8464 return LittlerootTown_BrendansHouse_2F_EventScript_1F8464:: @ 81F8464 @@ -51,13 +50,13 @@ LittlerootTown_BrendansHouse_2F_MapScript2_1F846A: @ 81F846A LittlerootTown_BrendansHouse_2F_EventScript_1F8474:: @ 81F8474 checkplayergender compare VAR_RESULT, 0 - goto_eq EventScript_275D0C + goto_if_eq EventScript_275D0C end LittlerootTown_BrendansHouse_2F_EventScript_1F8481:: @ 81F8481 lockall compare VAR_0x408D, 2 - goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8497 + goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8497 msgbox LittlerootTown_BrendansHouse_2F_Text_1F9991, MSGBOX_DEFAULT releaseall end @@ -249,9 +248,9 @@ EventScript_PlayerPCMale:: @ 81F860D lockall checkplayergender compare VAR_RESULT, 0 - goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8626 + goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8626 compare VAR_RESULT, 1 - goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F864C + goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F864C end LittlerootTown_BrendansHouse_2F_EventScript_1F8626:: @ 81F8626 diff --git a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc index a974ce5cb..92c951a11 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc +++ b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc @@ -19,7 +19,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1F88CA:: @ 81F88CA LittlerootTown_MaysHouse_1F_EventScript_1F88DD:: @ 81F88DD checkplayergender compare VAR_RESULT, 1 - goto_eq LittlerootTown_MaysHouse_1F_EventScript_1F88EA + goto_if_eq LittlerootTown_MaysHouse_1F_EventScript_1F88EA return LittlerootTown_MaysHouse_1F_EventScript_1F88EA:: @ 81F88EA @@ -118,12 +118,10 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F89F3:: @ 81F89F3 LittlerootTown_MaysHouse_1F_EventScript_1F89F3:: @ 81F89F3 lock faceplayer - checkflag FLAG_0x082 - goto_eq LittlerootTown_BrendansHouse_1F_EventScript_1F8A33 - checkflag FLAG_SYS_POKEMON_GET - goto_eq LittlerootTown_BrendansHouse_1F_EventScript_1F8A29 + goto_if_set FLAG_0x082, LittlerootTown_BrendansHouse_1F_EventScript_1F8A33 + goto_if_set FLAG_SYS_POKEMON_GET, LittlerootTown_BrendansHouse_1F_EventScript_1F8A29 compare VAR_0x408D, 3 - goto_eq LittlerootTown_BrendansHouse_1F_EventScript_1F8A1F + goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F8A1F special GetRivalSonDaughterString msgbox LittlerootTown_BrendansHouse_1F_Text_1F8CA5, MSGBOX_DEFAULT release diff --git a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc index ba3233853..f3553b5a0 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc +++ b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc @@ -15,18 +15,17 @@ LittlerootTown_MaysHouse_2F_MapScript1_1F92A1: @ 81F92A1 end LittlerootTown_MaysHouse_2F_EventScript_1F92CD:: @ 81F92CD - checkflag FLAG_0x124 - goto_eq LittlerootTown_MaysHouse_2F_EventScript_1F92E6 + goto_if_set FLAG_0x124, LittlerootTown_MaysHouse_2F_EventScript_1F92E6 compare VAR_0x4084, 2 - goto_if 4, LittlerootTown_MaysHouse_2F_EventScript_1F9309 + goto_if_ge LittlerootTown_MaysHouse_2F_EventScript_1F9309 goto LittlerootTown_MaysHouse_2F_EventScript_1F92E6 LittlerootTown_MaysHouse_2F_EventScript_1F92E6:: @ 81F92E6 checkplayergender compare VAR_RESULT, 1 - goto_eq LittlerootTown_MaysHouse_2F_EventScript_1F9309 + goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F9309 compare VAR_0x40D3, 2 - goto_if 4, LittlerootTown_MaysHouse_2F_EventScript_1F9309 + goto_if_ge LittlerootTown_MaysHouse_2F_EventScript_1F9309 setobjectxyperm 1, 8, 2 setobjectmovementtype 1, 7 return @@ -38,7 +37,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F9309:: @ 81F9309 LittlerootTown_MaysHouse_2F_EventScript_1F930A:: @ 81F930A checkplayergender compare VAR_RESULT, 0 - goto_eq LittlerootTown_MaysHouse_2F_EventScript_1F9317 + goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F9317 return LittlerootTown_MaysHouse_2F_EventScript_1F9317:: @ 81F9317 @@ -52,13 +51,13 @@ LittlerootTown_MaysHouse_2F_MapScript2_1F931D: @ 81F931D LittlerootTown_MaysHouse_2F_EventScript_1F9327:: @ 81F9327 checkplayergender compare VAR_RESULT, 1 - goto_eq EventScript_275D0C + goto_if_eq EventScript_275D0C end LittlerootTown_MaysHouse_2F_EventScript_1F9334:: @ 81F9334 lockall compare VAR_0x408D, 2 - goto_eq LittlerootTown_MaysHouse_2F_EventScript_1F934A + goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F934A msgbox LittlerootTown_MaysHouse_2F_Text_1F9991, MSGBOX_DEFAULT releaseall end @@ -250,13 +249,12 @@ LittlerootTown_MaysHouse_2F_Movement_1F94BB: @ 81F94BB LittlerootTown_BrendansHouse_2F_EventScript_1F94C1:: @ 81F94C1 LittlerootTown_MaysHouse_2F_EventScript_1F94C1:: @ 81F94C1 lockall - checkflag FLAG_0x124 - goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F94F7 + goto_if_set FLAG_0x124, LittlerootTown_BrendansHouse_2F_EventScript_1F94F7 checkplayergender compare VAR_RESULT, 0 - goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F94E3 + goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F94E3 compare VAR_RESULT, 1 - goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F94ED + goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F94ED end LittlerootTown_BrendansHouse_2F_EventScript_1F94E3:: @ 81F94E3 @@ -282,14 +280,12 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F94F7:: @ 81F94F7 end LittlerootTown_BrendansHouse_2F_EventScript_1F951D:: @ 81F951D - checkflag FLAG_0x125 - goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F9541 + goto_if_set FLAG_0x125, LittlerootTown_BrendansHouse_2F_EventScript_1F9541 msgbox LittlerootTown_BrendansHouse_2F_Text_1F99C9, MSGBOX_DEFAULT return LittlerootTown_BrendansHouse_2F_EventScript_1F952F:: @ 81F952F - checkflag FLAG_0x125 - goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F954A + goto_if_set FLAG_0x125, LittlerootTown_BrendansHouse_2F_EventScript_1F954A msgbox LittlerootTown_BrendansHouse_2F_Text_1F9B0D, MSGBOX_DEFAULT return @@ -305,9 +301,9 @@ EventScript_PlayerPCFemale:: @ 81F9553 lockall checkplayergender compare VAR_RESULT, 0 - goto_eq LittlerootTown_MaysHouse_2F_EventScript_1F956C + goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F956C compare VAR_RESULT, 1 - goto_eq LittlerootTown_MaysHouse_2F_EventScript_1F9576 + goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F9576 end LittlerootTown_MaysHouse_2F_EventScript_1F956C:: @ 81F956C diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc index 829062a73..54f6501fe 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc @@ -8,17 +8,17 @@ LittlerootTown_ProfessorBirchsLab_MapScript1_1F9CA1: @ 81F9CA1 call LittlerootTown_ProfessorBirchsLab_EventScript_271ED7 call LittlerootTown_ProfessorBirchsLab_EventScript_2720AD compare VAR_0x40D3, 6 - goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF7 + goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF7 compare VAR_0x40D3, 4 - goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF3 + goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF3 compare VAR_0x40D3, 3 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9CCD + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9CCD end LittlerootTown_ProfessorBirchsLab_EventScript_1F9CCD:: @ 81F9CCD specialvar VAR_RESULT, sub_80C08E4 compare VAR_RESULT, 1 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9CE9 + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9CE9 setobjectmovementtype 3, 3 setobjectxyperm 3, 5, 10 end @@ -100,9 +100,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9DDB:: @ 81F9DDB waitfanfare msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA8B1, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E07 + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E07 compare VAR_RESULT, 0 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E17 + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E17 end LittlerootTown_ProfessorBirchsLab_EventScript_1F9E07:: @ 81F9E07 @@ -114,9 +114,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9E07:: @ 81F9E07 LittlerootTown_ProfessorBirchsLab_EventScript_1F9E17:: @ 81F9E17 msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA8F6, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E36 + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E36 compare VAR_RESULT, 0 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E48 + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E48 end LittlerootTown_ProfessorBirchsLab_EventScript_1F9E36:: @ 81F9E36 @@ -129,9 +129,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9E36:: @ 81F9E36 LittlerootTown_ProfessorBirchsLab_EventScript_1F9E48:: @ 81F9E48 msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAA35, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E36 + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E36 compare VAR_RESULT, 0 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E48 + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E48 end LittlerootTown_ProfessorBirchsLab_EventScript_1F9E67:: @ 81F9E67 @@ -265,9 +265,8 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9F84:: @ 81F9F84 lock faceplayer compare VAR_0x4084, 3 - goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_1F9FB1 - checkflag FLAG_0x058 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9FA7 + goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1F9FB1 + goto_if_set FLAG_0x058, LittlerootTown_ProfessorBirchsLab_EventScript_1F9FA7 msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA4E2, MSGBOX_DEFAULT setflag FLAG_0x058 release @@ -286,39 +285,39 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9FB1:: @ 81F9FB1 LittlerootTown_ProfessorBirchsLab_EventScript_1F9FBB:: @ 81F9FBB release compare VAR_0x40D3, 6 - goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_1FA057 + goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA057 applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_2725A8 waitmovement 0 drawmonpic SPECIES_CYNDAQUIL, 10, 3 msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB7F6, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA061 + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA061 goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA06C end LittlerootTown_ProfessorBirchsLab_EventScript_1F9FEF:: @ 81F9FEF release compare VAR_0x40D3, 6 - goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_1FA057 + goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA057 applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_2725A8 waitmovement 0 drawmonpic SPECIES_TOTODILE, 10, 3 msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB869, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA061 + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA061 goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA10D end LittlerootTown_ProfessorBirchsLab_EventScript_1FA023:: @ 81FA023 release compare VAR_0x40D3, 6 - goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_1FA057 + goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA057 applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_2725A8 waitmovement 0 drawmonpic SPECIES_CHIKORITA, 10, 3 msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB8E0, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA061 + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA061 goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA1AE end @@ -338,9 +337,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA06C:: @ 81FA06C setvar VAR_TEMP_1, 155 givemon SPECIES_CYNDAQUIL, 5, ITEM_NONE, 0x0, 0x0, 0 compare VAR_RESULT, 0 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0A1 + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0A1 compare VAR_RESULT, 1 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0CC + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0CC erasemonpic goto LittlerootTown_ProfessorBirchsLab_EventScript_273811 end @@ -350,7 +349,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA0A1:: @ 81FA0A1 removeobject 4 msgbox gUnknown_08273374, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0FD + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0FD call LittlerootTown_ProfessorBirchsLab_EventScript_27378B call LittlerootTown_ProfessorBirchsLab_EventScript_2723DD goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA0FD @@ -361,7 +360,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA0CC:: @ 81FA0CC removeobject 4 msgbox gUnknown_08273374, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0F2 + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0F2 call LittlerootTown_ProfessorBirchsLab_EventScript_273797 goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA0F2 end @@ -383,9 +382,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA10D:: @ 81FA10D setvar VAR_TEMP_1, 158 givemon SPECIES_TOTODILE, 5, ITEM_NONE, 0x0, 0x0, 0 compare VAR_RESULT, 0 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA142 + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA142 compare VAR_RESULT, 1 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA16D + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA16D erasemonpic goto LittlerootTown_ProfessorBirchsLab_EventScript_273811 end @@ -395,7 +394,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA142:: @ 81FA142 removeobject 5 msgbox gUnknown_08273374, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA19E + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA19E call LittlerootTown_ProfessorBirchsLab_EventScript_27378B call LittlerootTown_ProfessorBirchsLab_EventScript_2723DD goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA19E @@ -406,7 +405,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA16D:: @ 81FA16D removeobject 5 msgbox gUnknown_08273374, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA193 + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA193 call LittlerootTown_ProfessorBirchsLab_EventScript_273797 goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA193 end @@ -428,9 +427,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA1AE:: @ 81FA1AE setvar VAR_TEMP_1, 152 givemon SPECIES_CHIKORITA, 5, ITEM_NONE, 0x0, 0x0, 0 compare VAR_RESULT, 0 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA1E3 + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA1E3 compare VAR_RESULT, 1 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA20E + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA20E erasemonpic goto LittlerootTown_ProfessorBirchsLab_EventScript_273811 end @@ -440,7 +439,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA1E3:: @ 81FA1E3 removeobject 6 msgbox gUnknown_08273374, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA23F + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA23F call LittlerootTown_ProfessorBirchsLab_EventScript_27378B call LittlerootTown_ProfessorBirchsLab_EventScript_2723DD goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA23F @@ -451,7 +450,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA20E:: @ 81FA20E removeobject 6 msgbox gUnknown_08273374, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA234 + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA234 call LittlerootTown_ProfessorBirchsLab_EventScript_273797 goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA234 end @@ -479,13 +478,11 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA25A:: @ 81FA25A lock faceplayer compare VAR_0x40D3, 5 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA28A + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA28A compare VAR_0x40D3, 2 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA294 - checkflag FLAG_HAS_MATCH_CALL - goto_if 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA29E - checkflag FLAG_0x119 - goto_if 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA2D2 + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA294 + goto_if_unset FLAG_HAS_MATCH_CALL, LittlerootTown_ProfessorBirchsLab_EventScript_1FA29E + goto_if_unset FLAG_0x119, LittlerootTown_ProfessorBirchsLab_EventScript_1FA2D2 goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA29E end @@ -500,14 +497,13 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA294:: @ 81FA294 end LittlerootTown_ProfessorBirchsLab_EventScript_1FA29E:: @ 81FA29E - checkflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380 - goto_if 0, LittlerootTown_ProfessorBirchsLab_EventScript_272141 + goto_if_unset FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380, LittlerootTown_ProfessorBirchsLab_EventScript_272141 compare VAR_0x40D3, 3 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_272141 + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_272141 compare VAR_0x40D3, 6 - goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_272141 + goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_272141 compare VAR_0x4084, 5 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA3C4 + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA3C4 msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAA74, MSGBOX_DEFAULT release end @@ -603,11 +599,11 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA3EC:: @ 81FA3EC lock faceplayer compare VAR_0x40D3, 5 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA43A + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA43A compare VAR_0x40D3, 6 - goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_1FA465 + goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA465 compare VAR_0x40D3, 2 - goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_1FA490 + goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA490 checkplayergender compare VAR_RESULT, 0 call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA428 diff --git a/data/maps/MarineCave_End/scripts.inc b/data/maps/MarineCave_End/scripts.inc index 68e27fa58..1a8f5f1ce 100644 --- a/data/maps/MarineCave_End/scripts.inc +++ b/data/maps/MarineCave_End/scripts.inc @@ -11,7 +11,7 @@ MarineCave_End_MapScript1_23AFEA: @ 823AFEA MarineCave_End_EventScript_23AFF4:: @ 823AFF4 specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if 5, MarineCave_End_EventScript_27374E + goto_if_ne MarineCave_End_EventScript_27374E removeobject 1 return @@ -44,11 +44,11 @@ MarineCave_End_EventScript_23B01B:: @ 823B01B setvar VAR_TEMP_1, 0 specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 1 - goto_eq MarineCave_End_EventScript_23B084 + goto_if_eq MarineCave_End_EventScript_23B084 compare VAR_RESULT, 4 - goto_eq MarineCave_End_EventScript_23B092 + goto_if_eq MarineCave_End_EventScript_23B092 compare VAR_RESULT, 5 - goto_eq MarineCave_End_EventScript_23B092 + goto_if_eq MarineCave_End_EventScript_23B092 setvar VAR_0x4039, 1 setflag FLAG_0x1BE releaseall diff --git a/data/maps/MauvilleCity/scripts.inc b/data/maps/MauvilleCity/scripts.inc index e0835a87d..2dbee0e08 100644 --- a/data/maps/MauvilleCity/scripts.inc +++ b/data/maps/MauvilleCity/scripts.inc @@ -54,8 +54,7 @@ MauvilleCity_EventScript_1DF3F2:: @ 81DF3F2 MauvilleCity_EventScript_1DF3FB:: @ 81DF3FB lock faceplayer - checkflag FLAG_0x062 - goto_eq MauvilleCity_EventScript_1DF413 + goto_if_set FLAG_0x062, MauvilleCity_EventScript_1DF413 msgbox MauvilleCity_Text_1E056A, MSGBOX_DEFAULT setflag FLAG_0x062 release @@ -69,8 +68,7 @@ MauvilleCity_EventScript_1DF413:: @ 81DF413 MauvilleCity_EventScript_1DF41D:: @ 81DF41D lock faceplayer - checkflag FLAG_0x11C - goto_eq MauvilleCity_EventScript_1DF43D + goto_if_set FLAG_0x11C, MauvilleCity_EventScript_1DF43D msgbox MauvilleCity_Text_1DF7DC, MSGBOX_DEFAULT closemessage applymovement 7, MauvilleCity_Movement_2725A2 @@ -88,8 +86,7 @@ MauvilleCity_EventScript_1DF43D:: @ 81DF43D MauvilleCity_EventScript_1DF452:: @ 81DF452 lockall - checkflag FLAG_0x11C - goto_eq MauvilleCity_EventScript_1DF690 + goto_if_set FLAG_0x11C, MauvilleCity_EventScript_1DF690 applymovement 6, MauvilleCity_Movement_2725A8 waitmovement 0 msgbox MauvilleCity_Text_1DF845, MSGBOX_DEFAULT @@ -110,7 +107,7 @@ MauvilleCity_EventScript_1DF4AD:: @ 81DF4AD compare VAR_RESULT, 1 call_if 1, MauvilleCity_EventScript_1DF63A compare VAR_RESULT, 0 - goto_eq MauvilleCity_EventScript_1DF683 + goto_if_eq MauvilleCity_EventScript_1DF683 closemessage switch VAR_FACING case 2, MauvilleCity_EventScript_1DF4E0 @@ -424,12 +421,10 @@ MauvilleCity_Movement_1DF72F: @ 81DF72F MauvilleCity_EventScript_1DF73A:: @ 81DF73A lock faceplayer - checkflag FLAG_GOT_TM24_FROM_WATTSON - goto_eq MauvilleCity_EventScript_1DF7B0 + goto_if_set FLAG_GOT_TM24_FROM_WATTSON, MauvilleCity_EventScript_1DF7B0 compare VAR_0x40BA, 2 - goto_eq MauvilleCity_EventScript_1DF784 - checkflag FLAG_GOT_BASEMENT_KEY_FROM_WATTSON - goto_eq MauvilleCity_EventScript_1DF77A + goto_if_eq MauvilleCity_EventScript_1DF784 + goto_if_set FLAG_GOT_BASEMENT_KEY_FROM_WATTSON, MauvilleCity_EventScript_1DF77A msgbox MauvilleCity_Text_1DFFE4, MSGBOX_DEFAULT giveitem_std ITEM_BASEMENT_KEY setflag FLAG_GOT_BASEMENT_KEY_FROM_WATTSON @@ -446,7 +441,7 @@ MauvilleCity_EventScript_1DF784:: @ 81DF784 msgbox MauvilleCity_Text_1E020E, MSGBOX_DEFAULT giveitem_std ITEM_TM24 compare VAR_RESULT, 0 - goto_eq MauvilleCity_EventScript_272054 + goto_if_eq MauvilleCity_EventScript_272054 setflag FLAG_GOT_TM24_FROM_WATTSON msgbox MauvilleCity_Text_1E02AA, MSGBOX_DEFAULT release diff --git a/data/maps/MauvilleCity_BikeShop/scripts.inc b/data/maps/MauvilleCity_BikeShop/scripts.inc index 1634ee33c..fd390a92c 100644 --- a/data/maps/MauvilleCity_BikeShop/scripts.inc +++ b/data/maps/MauvilleCity_BikeShop/scripts.inc @@ -4,24 +4,22 @@ MauvilleCity_BikeShop_MapScripts:: @ 820EBBB MauvilleCity_BikeShop_EventScript_20EBBC:: @ 820EBBC lock faceplayer - checkflag FLAG_0x05A - goto_eq MauvilleCity_BikeShop_EventScript_20EC94 - checkflag FLAG_0x059 - goto_eq MauvilleCity_BikeShop_EventScript_20EBF7 + goto_if_set FLAG_0x05A, MauvilleCity_BikeShop_EventScript_20EC94 + goto_if_set FLAG_0x059, MauvilleCity_BikeShop_EventScript_20EBF7 msgbox MauvilleCity_BikeShop_Text_20EE22, MSGBOX_DEFAULT msgbox MauvilleCity_BikeShop_Text_20EE99, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq MauvilleCity_BikeShop_EventScript_20EC4A + goto_if_eq MauvilleCity_BikeShop_EventScript_20EC4A compare VAR_RESULT, 0 - goto_eq MauvilleCity_BikeShop_EventScript_20EC3D + goto_if_eq MauvilleCity_BikeShop_EventScript_20EC3D end MauvilleCity_BikeShop_EventScript_20EBF7:: @ 820EBF7 msgbox MauvilleCity_BikeShop_Text_20EE99, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq MauvilleCity_BikeShop_EventScript_20EC4A + goto_if_eq MauvilleCity_BikeShop_EventScript_20EC4A compare VAR_RESULT, 0 - goto_eq MauvilleCity_BikeShop_EventScript_20EC3D + goto_if_eq MauvilleCity_BikeShop_EventScript_20EC3D end MauvilleCity_BikeShop_EventScript_20EC16:: @ 820EC16 @@ -65,19 +63,19 @@ MauvilleCity_BikeShop_EventScript_20EC87:: @ 820EC87 MauvilleCity_BikeShop_EventScript_20EC94:: @ 820EC94 msgbox MauvilleCity_BikeShop_Text_20F1FB, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq MauvilleCity_BikeShop_EventScript_20ECB3 + goto_if_eq MauvilleCity_BikeShop_EventScript_20ECB3 compare VAR_RESULT, 0 - goto_eq MauvilleCity_BikeShop_EventScript_20ECE5 + goto_if_eq MauvilleCity_BikeShop_EventScript_20ECE5 end MauvilleCity_BikeShop_EventScript_20ECB3:: @ 820ECB3 msgbox MauvilleCity_BikeShop_Text_20F22F, MSGBOX_DEFAULT checkitem ITEM_ACRO_BIKE, 1 compare VAR_RESULT, 1 - goto_eq MauvilleCity_BikeShop_EventScript_20ECEF + goto_if_eq MauvilleCity_BikeShop_EventScript_20ECEF checkitem ITEM_MACH_BIKE, 1 compare VAR_RESULT, 1 - goto_eq MauvilleCity_BikeShop_EventScript_20ED10 + goto_if_eq MauvilleCity_BikeShop_EventScript_20ED10 msgbox MauvilleCity_BikeShop_Text_20F2F3, MSGBOX_DEFAULT release end diff --git a/data/maps/MauvilleCity_GameCorner/scripts.inc b/data/maps/MauvilleCity_GameCorner/scripts.inc index 135f48f23..45f00c9ee 100644 --- a/data/maps/MauvilleCity_GameCorner/scripts.inc +++ b/data/maps/MauvilleCity_GameCorner/scripts.inc @@ -7,7 +7,7 @@ MauvilleCity_GameCorner_EventScript_20FBB9:: @ 820FBB9 msgbox MauvilleCity_GameCorner_Text_210460, MSGBOX_DEFAULT checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_20FCB7 + goto_if_eq MauvilleCity_GameCorner_EventScript_20FCB7 message MauvilleCity_GameCorner_Text_2104DF waitmessage showmoneybox 0, 0, 0 @@ -33,10 +33,10 @@ MauvilleCity_GameCorner_EventScript_20FC0C:: @ 820FC0C MauvilleCity_GameCorner_EventScript_20FC33:: @ 820FC33 checkcoins VAR_TEMP_1 compare VAR_TEMP_1, 9950 - goto_if 4, MauvilleCity_GameCorner_EventScript_20FCE1 + goto_if_ge MauvilleCity_GameCorner_EventScript_20FCE1 checkmoney 0x3e8, 0 compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_20FCC1 + goto_if_eq MauvilleCity_GameCorner_EventScript_20FCC1 givecoins 50 takemoney 0x3e8, 0 updatemoneybox 0, 0 @@ -54,10 +54,10 @@ MauvilleCity_GameCorner_EventScript_20FC33:: @ 820FC33 MauvilleCity_GameCorner_EventScript_20FC75:: @ 820FC75 checkcoins VAR_TEMP_1 compare VAR_TEMP_1, 9500 - goto_if 4, MauvilleCity_GameCorner_EventScript_20FCE1 + goto_if_ge MauvilleCity_GameCorner_EventScript_20FCE1 checkmoney 0x2710, 0 compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_20FCC1 + goto_if_eq MauvilleCity_GameCorner_EventScript_20FCC1 givecoins 500 takemoney 0x2710, 0 updatemoneybox 0, 0 @@ -110,7 +110,7 @@ MauvilleCity_GameCorner_EventScript_20FCF1:: @ 820FCF1 msgbox MauvilleCity_GameCorner_Text_2105D7, MSGBOX_DEFAULT checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 1 - goto_eq MauvilleCity_GameCorner_EventScript_20FD0D + goto_if_eq MauvilleCity_GameCorner_EventScript_20FD0D release end @@ -154,7 +154,7 @@ MauvilleCity_GameCorner_EventScript_20FD83:: @ 820FD83 MauvilleCity_GameCorner_EventScript_20FD91:: @ 820FD91 msgbox MauvilleCity_GameCorner_Text_210705, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_20FE92 + goto_if_eq MauvilleCity_GameCorner_EventScript_20FE92 switch VAR_TEMP_1 case 1, MauvilleCity_GameCorner_EventScript_20FDCB case 2, MauvilleCity_GameCorner_EventScript_20FE05 @@ -164,11 +164,11 @@ MauvilleCity_GameCorner_EventScript_20FD91:: @ 820FD91 MauvilleCity_GameCorner_EventScript_20FDCB:: @ 820FDCB checkcoins VAR_TEMP_2 compare VAR_TEMP_2, 1000 - goto_if 0, MauvilleCity_GameCorner_EventScript_20FE79 + goto_if_lt MauvilleCity_GameCorner_EventScript_20FE79 bufferdecorationname 1, 88 checkdecorspace 88 compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_20FE87 + goto_if_eq MauvilleCity_GameCorner_EventScript_20FE87 takecoins 1000 givedecoration 88 updatecoinsbox 1, 1 @@ -180,11 +180,11 @@ MauvilleCity_GameCorner_EventScript_20FDCB:: @ 820FDCB MauvilleCity_GameCorner_EventScript_20FE05:: @ 820FE05 checkcoins VAR_TEMP_2 compare VAR_TEMP_2, 1000 - goto_if 0, MauvilleCity_GameCorner_EventScript_20FE79 + goto_if_lt MauvilleCity_GameCorner_EventScript_20FE79 bufferdecorationname 1, 89 checkdecorspace 89 compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_20FE87 + goto_if_eq MauvilleCity_GameCorner_EventScript_20FE87 takecoins 1000 givedecoration 89 updatecoinsbox 1, 1 @@ -196,11 +196,11 @@ MauvilleCity_GameCorner_EventScript_20FE05:: @ 820FE05 MauvilleCity_GameCorner_EventScript_20FE3F:: @ 820FE3F checkcoins VAR_TEMP_2 compare VAR_TEMP_2, 1000 - goto_if 0, MauvilleCity_GameCorner_EventScript_20FE79 + goto_if_lt MauvilleCity_GameCorner_EventScript_20FE79 bufferdecorationname 1, 90 checkdecorspace 90 compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_20FE87 + goto_if_eq MauvilleCity_GameCorner_EventScript_20FE87 takecoins 1000 givedecoration 90 updatecoinsbox 1, 1 @@ -231,7 +231,7 @@ MauvilleCity_GameCorner_EventScript_20FE9F:: @ 820FE9F msgbox MauvilleCity_GameCorner_Text_2105D7, MSGBOX_DEFAULT checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 1 - goto_eq MauvilleCity_GameCorner_EventScript_20FEBB + goto_if_eq MauvilleCity_GameCorner_EventScript_20FEBB release end @@ -293,7 +293,7 @@ MauvilleCity_GameCorner_EventScript_20FF8A:: @ 820FF8A special sub_81398C0 msgbox MauvilleCity_GameCorner_Text_210629, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_210118 + goto_if_eq MauvilleCity_GameCorner_EventScript_210118 switch VAR_TEMP_1 case 1, MauvilleCity_GameCorner_EventScript_20FFDD case 2, MauvilleCity_GameCorner_EventScript_210017 @@ -305,10 +305,10 @@ MauvilleCity_GameCorner_EventScript_20FF8A:: @ 820FF8A MauvilleCity_GameCorner_EventScript_20FFDD:: @ 820FFDD checkcoins VAR_TEMP_2 compare VAR_TEMP_2, 1500 - goto_if 0, MauvilleCity_GameCorner_EventScript_2100FF + goto_if_lt MauvilleCity_GameCorner_EventScript_2100FF checkitemspace ITEM_TM32, 1 compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_21010D + goto_if_eq MauvilleCity_GameCorner_EventScript_21010D takecoins 1500 giveitem ITEM_TM32, 1 updatecoinsbox 1, 1 @@ -320,10 +320,10 @@ MauvilleCity_GameCorner_EventScript_20FFDD:: @ 820FFDD MauvilleCity_GameCorner_EventScript_210017:: @ 8210017 checkcoins VAR_TEMP_2 compare VAR_TEMP_2, 3500 - goto_if 0, MauvilleCity_GameCorner_EventScript_2100FF + goto_if_lt MauvilleCity_GameCorner_EventScript_2100FF checkitemspace ITEM_TM29, 1 compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_21010D + goto_if_eq MauvilleCity_GameCorner_EventScript_21010D takecoins 3500 giveitem ITEM_TM29, 1 updatecoinsbox 1, 1 @@ -335,10 +335,10 @@ MauvilleCity_GameCorner_EventScript_210017:: @ 8210017 MauvilleCity_GameCorner_EventScript_210051:: @ 8210051 checkcoins VAR_TEMP_2 compare VAR_TEMP_2, 4000 - goto_if 0, MauvilleCity_GameCorner_EventScript_2100FF + goto_if_lt MauvilleCity_GameCorner_EventScript_2100FF checkitemspace ITEM_TM35, 1 compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_21010D + goto_if_eq MauvilleCity_GameCorner_EventScript_21010D takecoins 4000 giveitem ITEM_TM35, 1 updatecoinsbox 1, 1 @@ -350,10 +350,10 @@ MauvilleCity_GameCorner_EventScript_210051:: @ 8210051 MauvilleCity_GameCorner_EventScript_21008B:: @ 821008B checkcoins VAR_TEMP_2 compare VAR_TEMP_2, 4000 - goto_if 0, MauvilleCity_GameCorner_EventScript_2100FF + goto_if_lt MauvilleCity_GameCorner_EventScript_2100FF checkitemspace ITEM_TM24, 1 compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_21010D + goto_if_eq MauvilleCity_GameCorner_EventScript_21010D takecoins 4000 giveitem ITEM_TM24, 1 updatecoinsbox 1, 1 @@ -365,10 +365,10 @@ MauvilleCity_GameCorner_EventScript_21008B:: @ 821008B MauvilleCity_GameCorner_EventScript_2100C5:: @ 82100C5 checkcoins VAR_TEMP_2 compare VAR_TEMP_2, 4000 - goto_if 0, MauvilleCity_GameCorner_EventScript_2100FF + goto_if_lt MauvilleCity_GameCorner_EventScript_2100FF checkitemspace ITEM_TM13, 1 compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_21010D + goto_if_eq MauvilleCity_GameCorner_EventScript_21010D takecoins 4000 giveitem ITEM_TM13, 1 updatecoinsbox 1, 1 @@ -404,11 +404,10 @@ MauvilleCity_GameCorner_EventScript_21012E:: @ 821012E MauvilleCity_GameCorner_EventScript_210137:: @ 8210137 lock faceplayer - checkflag FLAG_0x0E2 - goto_eq MauvilleCity_GameCorner_EventScript_210213 + goto_if_set FLAG_0x0E2, MauvilleCity_GameCorner_EventScript_210213 msgbox MauvilleCity_GameCorner_Text_210750, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_210209 + goto_if_eq MauvilleCity_GameCorner_EventScript_210209 switch VAR_STARTER_MON case 0, MauvilleCity_GameCorner_EventScript_21017C case 1, MauvilleCity_GameCorner_EventScript_2101A6 @@ -419,7 +418,7 @@ MauvilleCity_GameCorner_EventScript_21017C:: @ 821017C bufferdecorationname 1, 88 checkdecorspace 88 compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_2101FA + goto_if_eq MauvilleCity_GameCorner_EventScript_2101FA msgbox MauvilleCity_GameCorner_Text_21079C, MSGBOX_DEFAULT givedecoration_std 88 setflag FLAG_0x0E2 @@ -430,7 +429,7 @@ MauvilleCity_GameCorner_EventScript_2101A6:: @ 82101A6 bufferdecorationname 1, 89 checkdecorspace 89 compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_2101FA + goto_if_eq MauvilleCity_GameCorner_EventScript_2101FA msgbox MauvilleCity_GameCorner_Text_21079C, MSGBOX_DEFAULT givedecoration_std 89 setflag FLAG_0x0E2 @@ -441,7 +440,7 @@ MauvilleCity_GameCorner_EventScript_2101D0:: @ 82101D0 bufferdecorationname 1, 90 checkdecorspace 90 compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_2101FA + goto_if_eq MauvilleCity_GameCorner_EventScript_2101FA msgbox MauvilleCity_GameCorner_Text_21079C, MSGBOX_DEFAULT givedecoration_std 90 setflag FLAG_0x0E2 @@ -469,17 +468,16 @@ MauvilleCity_GameCorner_EventScript_21021D:: @ 821021D faceplayer checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 1 - goto_eq MauvilleCity_GameCorner_EventScript_21023D + goto_if_eq MauvilleCity_GameCorner_EventScript_21023D msgbox MauvilleCity_GameCorner_Text_210830, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_2102A9 end MauvilleCity_GameCorner_EventScript_21023D:: @ 821023D - checkflag FLAG_0x0E1 - goto_eq MauvilleCity_GameCorner_EventScript_21026B + goto_if_set FLAG_0x0E1, MauvilleCity_GameCorner_EventScript_21026B checkcoins VAR_TEMP_1 compare VAR_TEMP_1, 1 - goto_if 4, MauvilleCity_GameCorner_EventScript_21026B + goto_if_ge MauvilleCity_GameCorner_EventScript_21026B setflag FLAG_0x0E1 givecoins 20 msgbox MauvilleCity_GameCorner_Text_2108A0, MSGBOX_DEFAULT @@ -538,7 +536,7 @@ MauvilleCity_GameCorner_EventScript_2102D6:: @ 82102D6 lockall checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_210456 + goto_if_eq MauvilleCity_GameCorner_EventScript_210456 setvar VAR_0x8004, 0 specialvar VAR_RESULT, GetSlotMachineId playslotmachine VAR_RESULT @@ -549,7 +547,7 @@ MauvilleCity_GameCorner_EventScript_2102F6:: @ 82102F6 lockall checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_210456 + goto_if_eq MauvilleCity_GameCorner_EventScript_210456 setvar VAR_0x8004, 1 specialvar VAR_RESULT, GetSlotMachineId playslotmachine VAR_RESULT @@ -560,7 +558,7 @@ MauvilleCity_GameCorner_EventScript_210316:: @ 8210316 lockall checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_210456 + goto_if_eq MauvilleCity_GameCorner_EventScript_210456 setvar VAR_0x8004, 2 specialvar VAR_RESULT, GetSlotMachineId playslotmachine VAR_RESULT @@ -571,7 +569,7 @@ MauvilleCity_GameCorner_EventScript_210336:: @ 8210336 lockall checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_210456 + goto_if_eq MauvilleCity_GameCorner_EventScript_210456 setvar VAR_0x8004, 3 specialvar VAR_RESULT, GetSlotMachineId playslotmachine VAR_RESULT @@ -582,7 +580,7 @@ MauvilleCity_GameCorner_EventScript_210356:: @ 8210356 lockall checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_210456 + goto_if_eq MauvilleCity_GameCorner_EventScript_210456 setvar VAR_0x8004, 4 specialvar VAR_RESULT, GetSlotMachineId playslotmachine VAR_RESULT @@ -593,7 +591,7 @@ MauvilleCity_GameCorner_EventScript_210376:: @ 8210376 lockall checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_210456 + goto_if_eq MauvilleCity_GameCorner_EventScript_210456 setvar VAR_0x8004, 5 specialvar VAR_RESULT, GetSlotMachineId playslotmachine VAR_RESULT @@ -604,7 +602,7 @@ MauvilleCity_GameCorner_EventScript_210396:: @ 8210396 lockall checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_210456 + goto_if_eq MauvilleCity_GameCorner_EventScript_210456 setvar VAR_0x8004, 6 specialvar VAR_RESULT, GetSlotMachineId playslotmachine VAR_RESULT @@ -615,7 +613,7 @@ MauvilleCity_GameCorner_EventScript_2103B6:: @ 82103B6 lockall checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_210456 + goto_if_eq MauvilleCity_GameCorner_EventScript_210456 setvar VAR_0x8004, 7 specialvar VAR_RESULT, GetSlotMachineId playslotmachine VAR_RESULT @@ -626,7 +624,7 @@ MauvilleCity_GameCorner_EventScript_2103D6:: @ 82103D6 lockall checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_210456 + goto_if_eq MauvilleCity_GameCorner_EventScript_210456 setvar VAR_0x8004, 8 specialvar VAR_RESULT, GetSlotMachineId playslotmachine VAR_RESULT @@ -637,7 +635,7 @@ MauvilleCity_GameCorner_EventScript_2103F6:: @ 82103F6 lockall checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_210456 + goto_if_eq MauvilleCity_GameCorner_EventScript_210456 setvar VAR_0x8004, 9 specialvar VAR_RESULT, GetSlotMachineId playslotmachine VAR_RESULT @@ -648,7 +646,7 @@ MauvilleCity_GameCorner_EventScript_210416:: @ 8210416 lockall checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_210456 + goto_if_eq MauvilleCity_GameCorner_EventScript_210456 setvar VAR_0x8004, 10 specialvar VAR_RESULT, GetSlotMachineId playslotmachine VAR_RESULT @@ -659,7 +657,7 @@ MauvilleCity_GameCorner_EventScript_210436:: @ 8210436 lockall checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_210456 + goto_if_eq MauvilleCity_GameCorner_EventScript_210456 setvar VAR_0x8004, 11 specialvar VAR_RESULT, GetSlotMachineId playslotmachine VAR_RESULT diff --git a/data/maps/MauvilleCity_Gym/scripts.inc b/data/maps/MauvilleCity_Gym/scripts.inc index fbc1d8b0b..bc01745c9 100644 --- a/data/maps/MauvilleCity_Gym/scripts.inc +++ b/data/maps/MauvilleCity_Gym/scripts.inc @@ -3,8 +3,7 @@ MauvilleCity_Gym_MapScripts:: @ 820DD6E .byte 0 MauvilleCity_Gym_MapScript1_20DD74: @ 820DD74 - checkflag FLAG_0x4F2 - goto_eq MauvilleCity_Gym_EventScript_20DEE7 + goto_if_set FLAG_0x4F2, MauvilleCity_Gym_EventScript_20DEE7 switch VAR_0x4093 case 0, MauvilleCity_Gym_EventScript_20DDBA case 1, MauvilleCity_Gym_EventScript_20DEAF @@ -14,8 +13,7 @@ MauvilleCity_Gym_MapScript1_20DD74: @ 820DD74 end MauvilleCity_Gym_EventScript_20DDBA:: @ 820DDBA - checkflag FLAG_0x063 - goto_eq MauvilleCity_Gym_EventScript_20DDC4 + goto_if_set FLAG_0x063, MauvilleCity_Gym_EventScript_20DDC4 end MauvilleCity_Gym_EventScript_20DDC4:: @ 820DDC4 @@ -79,11 +77,10 @@ MauvilleCity_Gym_EventScript_20DEEB:: @ 820DEEB trainerbattle_single TRAINER_WATTSON_1, MauvilleCity_Gym_Text_20E602, MauvilleCity_Gym_Text_20E734, MauvilleCity_Gym_EventScript_20DF2B, NO_MUSIC specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq MauvilleCity_Gym_EventScript_20DFDE - checkflag FLAG_0x0A7 - goto_if 0, MauvilleCity_Gym_EventScript_20DF8D + goto_if_eq MauvilleCity_Gym_EventScript_20DFDE + goto_if_unset FLAG_0x0A7, MauvilleCity_Gym_EventScript_20DF8D compare VAR_0x40BA, 2 - goto_eq MauvilleCity_Gym_EventScript_20DFD4 + goto_if_eq MauvilleCity_Gym_EventScript_20DFD4 msgbox MauvilleCity_Gym_Text_20E8E3, MSGBOX_DEFAULT release end @@ -120,7 +117,7 @@ MauvilleCity_Gym_EventScript_20DF2B:: @ 820DF2B MauvilleCity_Gym_EventScript_20DF8D:: @ 820DF8D giveitem_std ITEM_TM34 compare VAR_RESULT, 0 - goto_eq MauvilleCity_Gym_EventScript_272054 + goto_if_eq MauvilleCity_Gym_EventScript_272054 msgbox MauvilleCity_Gym_Text_20E844, MSGBOX_DEFAULT setflag FLAG_0x0A7 release @@ -129,7 +126,7 @@ MauvilleCity_Gym_EventScript_20DF8D:: @ 820DF8D MauvilleCity_Gym_EventScript_20DFB1:: @ 820DFB1 giveitem_std ITEM_TM34 compare VAR_RESULT, 0 - goto_eq MauvilleCity_Gym_EventScript_27205E + goto_if_eq MauvilleCity_Gym_EventScript_27205E msgbox MauvilleCity_Gym_Text_20E844, MSGBOX_DEFAULT setflag FLAG_0x0A7 return @@ -146,10 +143,9 @@ MauvilleCity_Gym_EventScript_20DFDE:: @ 820DFDE MauvilleCity_Gym_EventScript_20DFF9:: @ 820DFF9 lockall - checkflag FLAG_0x4F2 - goto_eq MauvilleCity_Gym_EventScript_20E0AD + goto_if_set FLAG_0x4F2, MauvilleCity_Gym_EventScript_20E0AD compare VAR_0x4093, 1 - goto_eq MauvilleCity_Gym_EventScript_20E0AD + goto_if_eq MauvilleCity_Gym_EventScript_20E0AD setvar VAR_0x4093, 1 setvar VAR_0x8004, 0 goto MauvilleCity_Gym_EventScript_20E08D @@ -157,10 +153,9 @@ MauvilleCity_Gym_EventScript_20DFF9:: @ 820DFF9 MauvilleCity_Gym_EventScript_20E01E:: @ 820E01E lockall - checkflag FLAG_0x4F2 - goto_eq MauvilleCity_Gym_EventScript_20E0AD + goto_if_set FLAG_0x4F2, MauvilleCity_Gym_EventScript_20E0AD compare VAR_0x4093, 2 - goto_eq MauvilleCity_Gym_EventScript_20E0AD + goto_if_eq MauvilleCity_Gym_EventScript_20E0AD setvar VAR_0x4093, 2 setvar VAR_0x8004, 1 goto MauvilleCity_Gym_EventScript_20E08D @@ -168,10 +163,9 @@ MauvilleCity_Gym_EventScript_20E01E:: @ 820E01E MauvilleCity_Gym_EventScript_20E043:: @ 820E043 lockall - checkflag FLAG_0x4F2 - goto_eq MauvilleCity_Gym_EventScript_20E0AD + goto_if_set FLAG_0x4F2, MauvilleCity_Gym_EventScript_20E0AD compare VAR_0x4093, 3 - goto_eq MauvilleCity_Gym_EventScript_20E0AD + goto_if_eq MauvilleCity_Gym_EventScript_20E0AD setvar VAR_0x4093, 3 setvar VAR_0x8004, 2 goto MauvilleCity_Gym_EventScript_20E08D @@ -179,10 +173,9 @@ MauvilleCity_Gym_EventScript_20E043:: @ 820E043 MauvilleCity_Gym_EventScript_20E068:: @ 820E068 lockall - checkflag FLAG_0x4F2 - goto_eq MauvilleCity_Gym_EventScript_20E0AD + goto_if_set FLAG_0x4F2, MauvilleCity_Gym_EventScript_20E0AD compare VAR_0x4093, 4 - goto_eq MauvilleCity_Gym_EventScript_20E0AD + goto_if_eq MauvilleCity_Gym_EventScript_20E0AD setvar VAR_0x4093, 4 setvar VAR_0x8004, 3 goto MauvilleCity_Gym_EventScript_20E08D @@ -193,10 +186,8 @@ MauvilleCity_Gym_EventScript_20E08D:: @ 820E08D special MauvilleGymSpecial1 special DrawWholeMapView playse SE_KI_GASYAN - checkflag FLAG_0x063 - goto_eq MauvilleCity_Gym_EventScript_20E0B4 - checkflag FLAG_0x063 - goto_if 0, MauvilleCity_Gym_EventScript_20E0AF + goto_if_set FLAG_0x063, MauvilleCity_Gym_EventScript_20E0B4 + goto_if_unset FLAG_0x063, MauvilleCity_Gym_EventScript_20E0AF releaseall end @@ -242,8 +233,7 @@ MauvilleCity_Gym_EventScript_20E115:: @ 820E115 MauvilleCity_Gym_EventScript_20E12C:: @ 820E12C lock faceplayer - checkflag FLAG_0x4F2 - goto_eq MauvilleCity_Gym_EventScript_20E141 + goto_if_set FLAG_0x4F2, MauvilleCity_Gym_EventScript_20E141 msgbox MauvilleCity_Gym_Text_20E17F, MSGBOX_DEFAULT release end @@ -255,15 +245,13 @@ MauvilleCity_Gym_EventScript_20E141:: @ 820E141 MauvilleCity_Gym_EventScript_20E14B:: @ 820E14B lockall - checkflag FLAG_BADGE03_GET - goto_eq MauvilleCity_Gym_EventScript_20E16B + goto_if_set FLAG_BADGE03_GET, MauvilleCity_Gym_EventScript_20E16B goto MauvilleCity_Gym_EventScript_20E175 end MauvilleCity_Gym_EventScript_20E15B:: @ 820E15B lockall - checkflag FLAG_BADGE03_GET - goto_eq MauvilleCity_Gym_EventScript_20E16B + goto_if_set FLAG_BADGE03_GET, MauvilleCity_Gym_EventScript_20E16B goto MauvilleCity_Gym_EventScript_20E175 end diff --git a/data/maps/MauvilleCity_House1/scripts.inc b/data/maps/MauvilleCity_House1/scripts.inc index d5605e5d7..0168f2e9b 100644 --- a/data/maps/MauvilleCity_House1/scripts.inc +++ b/data/maps/MauvilleCity_House1/scripts.inc @@ -4,8 +4,7 @@ MauvilleCity_House1_MapScripts:: @ 820F975 MauvilleCity_House1_EventScript_20F976:: @ 820F976 lock faceplayer - checkflag FLAG_0x06B - goto_eq MauvilleCity_House1_EventScript_20F9A5 + goto_if_set FLAG_0x06B, MauvilleCity_House1_EventScript_20F9A5 msgbox MauvilleCity_House1_Text_20F9AF, MSGBOX_DEFAULT giveitem_std ITEM_HM06 setflag FLAG_0x06B diff --git a/data/maps/MauvilleCity_House2/scripts.inc b/data/maps/MauvilleCity_House2/scripts.inc index 2256fd1fe..288e50725 100644 --- a/data/maps/MauvilleCity_House2/scripts.inc +++ b/data/maps/MauvilleCity_House2/scripts.inc @@ -4,12 +4,11 @@ MauvilleCity_House2_MapScripts:: @ 8210C5C MauvilleCity_House2_EventScript_210C5D:: @ 8210C5D lock faceplayer - checkflag FLAG_0x102 - goto_eq MauvilleCity_House2_EventScript_210CDA + goto_if_set FLAG_0x102, MauvilleCity_House2_EventScript_210CDA msgbox MauvilleCity_House2_Text_210CEE, MSGBOX_DEFAULT checkitem ITEM_HARBOR_MAIL, 1 compare VAR_RESULT, 1 - goto_eq MauvilleCity_House2_EventScript_210C82 + goto_if_eq MauvilleCity_House2_EventScript_210C82 release end @@ -21,9 +20,9 @@ MauvilleCity_House2_EventScript_210C82:: @ 8210C82 waitmovement 0 msgbox MauvilleCity_House2_Text_210D76, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq MauvilleCity_House2_EventScript_210CB8 + goto_if_eq MauvilleCity_House2_EventScript_210CB8 compare VAR_RESULT, 0 - goto_eq MauvilleCity_House2_EventScript_210CE4 + goto_if_eq MauvilleCity_House2_EventScript_210CE4 end MauvilleCity_House2_EventScript_210CB8:: @ 8210CB8 diff --git a/data/maps/MeteorFalls_1F_1R/scripts.inc b/data/maps/MeteorFalls_1F_1R/scripts.inc index 4867ad44f..42d067a3e 100644 --- a/data/maps/MeteorFalls_1F_1R/scripts.inc +++ b/data/maps/MeteorFalls_1F_1R/scripts.inc @@ -221,8 +221,7 @@ MeteorFalls_1F_1R_Movement_22BF1D: @ 822BF1D MeteorFalls_1F_1R_EventScript_22BF25:: @ 822BF25 lock faceplayer - checkflag FLAG_0x0F4 - goto_eq MeteorFalls_1F_1R_EventScript_22BF3D + goto_if_set FLAG_0x0F4, MeteorFalls_1F_1R_EventScript_22BF3D setflag FLAG_0x0F4 msgbox MeteorFalls_1F_1R_Text_22C342, MSGBOX_DEFAULT release diff --git a/data/maps/MeteorFalls_1F_2R/scripts.inc b/data/maps/MeteorFalls_1F_2R/scripts.inc index c1427d1f2..fee636e0b 100644 --- a/data/maps/MeteorFalls_1F_2R/scripts.inc +++ b/data/maps/MeteorFalls_1F_2R/scripts.inc @@ -5,7 +5,7 @@ MeteorFalls_1F_2R_EventScript_22C4DE:: @ 822C4DE trainerbattle_single TRAINER_NICOLAS_1, MeteorFalls_1F_2R_Text_22C608, MeteorFalls_1F_2R_Text_22C678, MeteorFalls_1F_2R_EventScript_22C50A specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq MeteorFalls_1F_2R_EventScript_22C529 + goto_if_eq MeteorFalls_1F_2R_EventScript_22C529 msgbox MeteorFalls_1F_2R_Text_22C6A3, MSGBOX_DEFAULT release end @@ -27,7 +27,7 @@ MeteorFalls_1F_2R_EventScript_22C540:: @ 822C540 trainerbattle_double TRAINER_JOHN_AND_JAY_1, MeteorFalls_1F_2R_Text_22C843, MeteorFalls_1F_2R_Text_22C89C, MeteorFalls_1F_2R_Text_22C92B, MeteorFalls_1F_2R_EventScript_22C570 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq MeteorFalls_1F_2R_EventScript_22C589 + goto_if_eq MeteorFalls_1F_2R_EventScript_22C589 msgbox MeteorFalls_1F_2R_Text_22C8C1, MSGBOX_DEFAULT release end @@ -47,7 +47,7 @@ MeteorFalls_1F_2R_EventScript_22C5A4:: @ 822C5A4 trainerbattle_double TRAINER_JOHN_AND_JAY_1, MeteorFalls_1F_2R_Text_22C9E6, MeteorFalls_1F_2R_Text_22CA44, MeteorFalls_1F_2R_Text_22CACD, MeteorFalls_1F_2R_EventScript_22C5D4 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq MeteorFalls_1F_2R_EventScript_22C5ED + goto_if_eq MeteorFalls_1F_2R_EventScript_22C5ED msgbox MeteorFalls_1F_2R_Text_22CA70, MSGBOX_DEFAULT release end diff --git a/data/maps/MeteorFalls_StevensCave/scripts.inc b/data/maps/MeteorFalls_StevensCave/scripts.inc index 738a7b6cd..854105932 100644 --- a/data/maps/MeteorFalls_StevensCave/scripts.inc +++ b/data/maps/MeteorFalls_StevensCave/scripts.inc @@ -3,8 +3,7 @@ MeteorFalls_StevensCave_MapScripts:: @ 823B181 MeteorFalls_StevensCave_EventScript_23B182:: @ 823B182 lock - checkflag FLAG_0x4F8 - goto_eq MeteorFalls_StevensCave_EventScript_23B1CD + goto_if_set FLAG_0x4F8, MeteorFalls_StevensCave_EventScript_23B1CD waitse playse SE_PIN applymovement 1, MeteorFalls_StevensCave_Movement_272598 diff --git a/data/maps/MirageTower_4F/scripts.inc b/data/maps/MirageTower_4F/scripts.inc index e60180559..b64fb23a3 100644 --- a/data/maps/MirageTower_4F/scripts.inc +++ b/data/maps/MirageTower_4F/scripts.inc @@ -6,7 +6,7 @@ MirageTower_4F_EventScript_23AD48:: @ 823AD48 faceplayer msgbox MirageTower_4F_Text_23ADF9, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq MirageTower_4F_EventScript_23AD7F + goto_if_eq MirageTower_4F_EventScript_23AD7F giveitem_std ITEM_ROOT_FOSSIL closemessage setflag FLAG_HIDE_MIRAGE_TOWER_ROOT_FOSSIL @@ -27,7 +27,7 @@ MirageTower_4F_EventScript_23AD89:: @ 823AD89 faceplayer msgbox MirageTower_4F_Text_23AE98, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq MirageTower_4F_EventScript_23ADC0 + goto_if_eq MirageTower_4F_EventScript_23ADC0 giveitem_std ITEM_CLAW_FOSSIL closemessage setflag FLAG_HIDE_MIRAGE_TOWER_CLAW_FOSSIL diff --git a/data/maps/MossdeepCity/scripts.inc b/data/maps/MossdeepCity/scripts.inc index a4a87e3e7..745790458 100644 --- a/data/maps/MossdeepCity/scripts.inc +++ b/data/maps/MossdeepCity/scripts.inc @@ -14,8 +14,7 @@ MossdeepCity_MapScript1_1E4A9C: @ 81E4A9C MossdeepCity_EventScript_1E4AB2:: @ 81E4AB2 lock faceplayer - checkflag FLAG_0x07B - goto_eq MossdeepCity_EventScript_1E4AC7 + goto_if_set FLAG_0x07B, MossdeepCity_EventScript_1E4AC7 msgbox MossdeepCity_Text_1E4E90, MSGBOX_DEFAULT release end @@ -28,8 +27,7 @@ MossdeepCity_EventScript_1E4AC7:: @ 81E4AC7 MossdeepCity_EventScript_1E4AD1:: @ 81E4AD1 lock faceplayer - checkflag FLAG_0x07B - goto_eq MossdeepCity_EventScript_1E4AE6 + goto_if_set FLAG_0x07B, MossdeepCity_EventScript_1E4AE6 msgbox MossdeepCity_Text_1E4F50, MSGBOX_DEFAULT release end @@ -227,15 +225,14 @@ MossdeepCity_EventScript_1E4C10:: @ 81E4C10 MossdeepCity_EventScript_1E4C26:: @ 81E4C26 lock faceplayer - checkflag FLAG_0x114 - goto_eq MossdeepCity_EventScript_1E4C68 + goto_if_set FLAG_0x114, MossdeepCity_EventScript_1E4C68 msgbox MossdeepCity_Text_1E4CED, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq MossdeepCity_EventScript_1E4C72 + goto_if_eq MossdeepCity_EventScript_1E4C72 msgbox MossdeepCity_Text_1E4D5B, MSGBOX_DEFAULT giveitem_std ITEM_KINGS_ROCK compare VAR_RESULT, 0 - goto_eq MossdeepCity_EventScript_272054 + goto_if_eq MossdeepCity_EventScript_272054 setflag FLAG_0x114 release end diff --git a/data/maps/MossdeepCity_Gym/scripts.inc b/data/maps/MossdeepCity_Gym/scripts.inc index dd9ebf951..84157a362 100644 --- a/data/maps/MossdeepCity_Gym/scripts.inc +++ b/data/maps/MossdeepCity_Gym/scripts.inc @@ -3,26 +3,22 @@ MossdeepCity_Gym_MapScripts:: @ 8220800 .byte 0 MossdeepCity_Gym_MapScript1_220806: @ 8220806 - checkflag FLAG_0x064 - goto_eq MossdeepCity_Gym_EventScript_22083D + goto_if_set FLAG_0x064, MossdeepCity_Gym_EventScript_22083D goto MossdeepCity_Gym_EventScript_220815 end MossdeepCity_Gym_EventScript_220815:: @ 8220815 - checkflag FLAG_0x065 - goto_eq MossdeepCity_Gym_EventScript_220855 + goto_if_set FLAG_0x065, MossdeepCity_Gym_EventScript_220855 goto MossdeepCity_Gym_EventScript_220824 end MossdeepCity_Gym_EventScript_220824:: @ 8220824 - checkflag FLAG_0x066 - goto_eq MossdeepCity_Gym_EventScript_22086D + goto_if_set FLAG_0x066, MossdeepCity_Gym_EventScript_22086D goto MossdeepCity_Gym_EventScript_220833 end MossdeepCity_Gym_EventScript_220833:: @ 8220833 - checkflag FLAG_0x067 - goto_eq MossdeepCity_Gym_EventScript_220885 + goto_if_set FLAG_0x067, MossdeepCity_Gym_EventScript_220885 end MossdeepCity_Gym_EventScript_22083D:: @ 822083D @@ -52,9 +48,8 @@ MossdeepCity_Gym_EventScript_220898:: @ 8220898 trainerbattle_double TRAINER_TATE_AND_LIZA_1, MossdeepCity_Gym_Text_221783, MossdeepCity_Gym_Text_2218EC, MossdeepCity_Gym_Text_221BCE, MossdeepCity_Gym_EventScript_2208D1, NO_MUSIC specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq MossdeepCity_Gym_EventScript_22097E - checkflag FLAG_0x0AB - goto_if 0, MossdeepCity_Gym_EventScript_220937 + goto_if_eq MossdeepCity_Gym_EventScript_22097E + goto_if_unset FLAG_0x0AB, MossdeepCity_Gym_EventScript_220937 msgbox MossdeepCity_Gym_Text_221B1D, MSGBOX_DEFAULT release end @@ -94,7 +89,7 @@ MossdeepCity_Gym_EventScript_2208D1:: @ 82208D1 MossdeepCity_Gym_EventScript_220937:: @ 8220937 giveitem_std ITEM_TM04 compare VAR_RESULT, 0 - goto_eq MossdeepCity_Gym_EventScript_272054 + goto_if_eq MossdeepCity_Gym_EventScript_272054 msgbox MossdeepCity_Gym_Text_221A40, MSGBOX_DEFAULT setflag FLAG_0x0AB release @@ -103,7 +98,7 @@ MossdeepCity_Gym_EventScript_220937:: @ 8220937 MossdeepCity_Gym_EventScript_22095B:: @ 822095B giveitem_std ITEM_TM04 compare VAR_RESULT, 0 - goto_eq MossdeepCity_Gym_EventScript_27205E + goto_if_eq MossdeepCity_Gym_EventScript_27205E msgbox MossdeepCity_Gym_Text_221A40, MSGBOX_DEFAULT setflag FLAG_0x0AB return @@ -115,8 +110,7 @@ MossdeepCity_Gym_EventScript_22097E:: @ 822097E MossdeepCity_Gym_EventScript_220999:: @ 8220999 lockall - checkflag FLAG_0x064 - goto_eq MossdeepCity_Gym_EventScript_2209D0 + goto_if_set FLAG_0x064, MossdeepCity_Gym_EventScript_2209D0 setflag FLAG_0x064 applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_220C30 waitmovement 0 @@ -142,8 +136,7 @@ MossdeepCity_Gym_EventScript_2209D0:: @ 82209D0 MossdeepCity_Gym_EventScript_2209F5:: @ 82209F5 lockall - checkflag FLAG_0x065 - goto_eq MossdeepCity_Gym_EventScript_220A24 + goto_if_set FLAG_0x065, MossdeepCity_Gym_EventScript_220A24 setflag FLAG_0x065 applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_220C30 waitmovement 0 @@ -163,8 +156,7 @@ MossdeepCity_Gym_EventScript_220A24:: @ 8220A24 MossdeepCity_Gym_EventScript_220A49:: @ 8220A49 lockall - checkflag FLAG_0x066 - goto_eq MossdeepCity_Gym_EventScript_220A78 + goto_if_set FLAG_0x066, MossdeepCity_Gym_EventScript_220A78 setflag FLAG_0x066 applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_220C30 waitmovement 0 @@ -184,8 +176,7 @@ MossdeepCity_Gym_EventScript_220A78:: @ 8220A78 MossdeepCity_Gym_EventScript_220A9D:: @ 8220A9D lockall - checkflag FLAG_0x067 - goto_eq MossdeepCity_Gym_EventScript_220ACC + goto_if_set FLAG_0x067, MossdeepCity_Gym_EventScript_220ACC setflag FLAG_0x067 applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_220C30 waitmovement 0 @@ -273,8 +264,7 @@ MossdeepCity_Gym_EventScript_220BFA:: @ 8220BFA MossdeepCity_Gym_EventScript_220C11:: @ 8220C11 lock faceplayer - checkflag FLAG_0x4F6 - goto_eq MossdeepCity_Gym_EventScript_220C26 + goto_if_set FLAG_0x4F6, MossdeepCity_Gym_EventScript_220C26 msgbox MossdeepCity_Gym_Text_220CD5, MSGBOX_DEFAULT release end @@ -291,15 +281,13 @@ MossdeepCity_Gym_Movement_220C30: @ 8220C30 MossdeepCity_Gym_EventScript_220C33:: @ 8220C33 lockall - checkflag FLAG_BADGE07_GET - goto_eq MossdeepCity_Gym_EventScript_220C53 + goto_if_set FLAG_BADGE07_GET, MossdeepCity_Gym_EventScript_220C53 goto MossdeepCity_Gym_EventScript_220C5D end MossdeepCity_Gym_EventScript_220C43:: @ 8220C43 lockall - checkflag FLAG_BADGE07_GET - goto_eq MossdeepCity_Gym_EventScript_220C53 + goto_if_set FLAG_BADGE07_GET, MossdeepCity_Gym_EventScript_220C53 goto MossdeepCity_Gym_EventScript_220C5D end diff --git a/data/maps/MossdeepCity_House1/scripts.inc b/data/maps/MossdeepCity_House1/scripts.inc index 4a5da3b16..60d612fb2 100644 --- a/data/maps/MossdeepCity_House1/scripts.inc +++ b/data/maps/MossdeepCity_House1/scripts.inc @@ -8,7 +8,7 @@ MossdeepCity_House1_EventScript_221FD6:: @ 8221FD6 msgbox MossdeepCity_House1_Text_22200F, MSGBOX_DEFAULT specialvar VAR_RESULT, GetPokeblockNameByMonNature compare VAR_RESULT, 0 - goto_eq MossdeepCity_House1_EventScript_221FFC + goto_if_eq MossdeepCity_House1_EventScript_221FFC msgbox MossdeepCity_House1_Text_22201D, MSGBOX_DEFAULT release end diff --git a/data/maps/MossdeepCity_House3/scripts.inc b/data/maps/MossdeepCity_House3/scripts.inc index 2d4fd04ad..c61a0751c 100644 --- a/data/maps/MossdeepCity_House3/scripts.inc +++ b/data/maps/MossdeepCity_House3/scripts.inc @@ -4,11 +4,10 @@ MossdeepCity_House3_MapScripts:: @ 82225C2 MossdeepCity_House3_EventScript_2225C3:: @ 82225C3 lock faceplayer - checkflag FLAG_0x098 - goto_eq MossdeepCity_House3_EventScript_222602 + goto_if_set FLAG_0x098, MossdeepCity_House3_EventScript_222602 msgbox MossdeepCity_House3_Text_222616, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq MossdeepCity_House3_EventScript_22260C + goto_if_eq MossdeepCity_House3_EventScript_22260C msgbox MossdeepCity_House3_Text_2226B6, MSGBOX_DEFAULT giveitem_std ITEM_SUPER_ROD setflag FLAG_0x098 diff --git a/data/maps/MossdeepCity_House4/scripts.inc b/data/maps/MossdeepCity_House4/scripts.inc index 627340b5c..1763a9c46 100644 --- a/data/maps/MossdeepCity_House4/scripts.inc +++ b/data/maps/MossdeepCity_House4/scripts.inc @@ -4,8 +4,7 @@ MossdeepCity_House4_MapScripts:: @ 8222DD7 MossdeepCity_House4_EventScript_222DD8:: @ 8222DD8 lock faceplayer - checkflag FLAG_SYS_GAME_CLEAR - goto_eq MossdeepCity_House4_EventScript_222DED + goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_House4_EventScript_222DED msgbox MossdeepCity_House4_Text_222E31, MSGBOX_DEFAULT release end @@ -20,7 +19,7 @@ MossdeepCity_House4_EventScript_222DF7:: @ 8222DF7 faceplayer special sub_80E8BC8 compare VAR_RESULT, 0 - goto_eq MossdeepCity_House4_EventScript_222E14 + goto_if_eq MossdeepCity_House4_EventScript_222E14 special GetSecretBaseNearbyMapName msgbox MossdeepCity_House4_Text_222ECC, MSGBOX_DEFAULT release diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc index 32eac1540..109841df3 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc +++ b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc @@ -5,7 +5,7 @@ MossdeepCity_SpaceCenter_1F_MapScripts:: @ 8222F41 MossdeepCity_SpaceCenter_1F_MapScript1_222F4C: @ 8222F4C compare VAR_0x405D, 2 - goto_eq MossdeepCity_SpaceCenter_1F_EventScript_222F58 + goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_222F58 end MossdeepCity_SpaceCenter_1F_EventScript_222F58:: @ 8222F58 @@ -19,11 +19,11 @@ MossdeepCity_SpaceCenter_1F_EventScript_222F58:: @ 8222F58 setobjectmovementtype 1, 10 setobjectmovementtype 2, 10 compare VAR_0x409E, 1 - goto_eq MossdeepCity_SpaceCenter_1F_EventScript_222FAA + goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_222FAA compare VAR_0x409E, 2 - goto_eq MossdeepCity_SpaceCenter_1F_EventScript_222FB2 + goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_222FB2 compare VAR_0x409E, 3 - goto_eq MossdeepCity_SpaceCenter_1F_EventScript_222FBA + goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_222FBA end MossdeepCity_SpaceCenter_1F_EventScript_222FAA:: @ 8222FAA @@ -40,7 +40,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_222FBA:: @ 8222FBA MossdeepCity_SpaceCenter_1F_MapScript1_222FC2: @ 8222FC2 compare VAR_0x405D, 2 - goto_if 3, MossdeepCity_SpaceCenter_1F_EventScript_222FCE + goto_if_le MossdeepCity_SpaceCenter_1F_EventScript_222FCE end MossdeepCity_SpaceCenter_1F_EventScript_222FCE:: @ 8222FCE @@ -51,7 +51,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_222FD8:: @ 8222FD8 lock faceplayer compare VAR_0x405D, 2 - goto_eq MossdeepCity_SpaceCenter_1F_EventScript_223024 + goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_223024 dodailyevents specialvar VAR_RESULT, GetWeekCount buffernumberstring 0, VAR_RESULT @@ -99,7 +99,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_223063:: @ 8223063 lock faceplayer compare VAR_0x405D, 2 - goto_eq MossdeepCity_SpaceCenter_1F_EventScript_22307A + goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_22307A msgbox MossdeepCity_SpaceCenter_1F_Text_2233D3, MSGBOX_DEFAULT release end @@ -115,13 +115,12 @@ MossdeepCity_SpaceCenter_1F_EventScript_22308E:: @ 822308E lock faceplayer compare VAR_0x405D, 2 - goto_eq MossdeepCity_SpaceCenter_1F_EventScript_2230DA - checkflag FLAG_0x0C0 - goto_eq MossdeepCity_SpaceCenter_1F_EventScript_2230D0 + goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_2230DA + goto_if_set FLAG_0x0C0, MossdeepCity_SpaceCenter_1F_EventScript_2230D0 msgbox MossdeepCity_SpaceCenter_1F_Text_223540, MSGBOX_DEFAULT giveitem_std ITEM_SUN_STONE compare VAR_RESULT, 0 - goto_eq MossdeepCity_SpaceCenter_1F_EventScript_272054 + goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_272054 setflag FLAG_0x0C0 msgbox MossdeepCity_SpaceCenter_1F_Text_2235A6, MSGBOX_DEFAULT release @@ -133,12 +132,11 @@ MossdeepCity_SpaceCenter_1F_EventScript_2230D0:: @ 82230D0 end MossdeepCity_SpaceCenter_1F_EventScript_2230DA:: @ 82230DA - checkflag FLAG_0x0C0 - goto_eq MossdeepCity_SpaceCenter_1F_EventScript_223119 + goto_if_set FLAG_0x0C0, MossdeepCity_SpaceCenter_1F_EventScript_223119 msgbox MossdeepCity_SpaceCenter_1F_Text_2235F0, MSGBOX_DEFAULT giveitem_std ITEM_SUN_STONE compare VAR_RESULT, 0 - goto_eq MossdeepCity_SpaceCenter_1F_EventScript_272054 + goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_272054 setflag FLAG_0x0C0 msgbox MossdeepCity_SpaceCenter_1F_Text_223664, MSGBOX_DEFAULT applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A8 @@ -156,12 +154,11 @@ MossdeepCity_SpaceCenter_1F_EventScript_223119:: @ 8223119 MossdeepCity_SpaceCenter_1F_EventScript_22312D:: @ 822312D lock faceplayer - checkflag FLAG_SYS_GAME_CLEAR - goto_eq MossdeepCity_SpaceCenter_1F_EventScript_223154 + goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_SpaceCenter_1F_EventScript_223154 compare VAR_0x405D, 2 - goto_eq MossdeepCity_SpaceCenter_1F_EventScript_22315E + goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_22315E compare VAR_0x405D, 2 - goto_if 0, MossdeepCity_SpaceCenter_1F_EventScript_223154 + goto_if_lt MossdeepCity_SpaceCenter_1F_EventScript_223154 goto MossdeepCity_SpaceCenter_1F_EventScript_22315E end @@ -178,12 +175,11 @@ MossdeepCity_SpaceCenter_1F_EventScript_22315E:: @ 822315E MossdeepCity_SpaceCenter_1F_EventScript_223168:: @ 8223168 lock faceplayer - checkflag FLAG_SYS_GAME_CLEAR - goto_eq MossdeepCity_SpaceCenter_1F_EventScript_22318F + goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_SpaceCenter_1F_EventScript_22318F compare VAR_0x405D, 2 - goto_eq MossdeepCity_SpaceCenter_1F_EventScript_2231A4 + goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_2231A4 compare VAR_0x405D, 2 - goto_if 0, MossdeepCity_SpaceCenter_1F_EventScript_22318F + goto_if_lt MossdeepCity_SpaceCenter_1F_EventScript_22318F goto MossdeepCity_SpaceCenter_1F_EventScript_2231A4 end @@ -236,8 +232,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_223208:: @ 8223208 MossdeepCity_SpaceCenter_1F_EventScript_22321F:: @ 822321F lock faceplayer - checkflag FLAG_0x0BF - goto_eq MossdeepCity_SpaceCenter_1F_EventScript_22326E + goto_if_set FLAG_0x0BF, MossdeepCity_SpaceCenter_1F_EventScript_22326E msgbox MossdeepCity_SpaceCenter_1F_Text_223B90, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_GRUNT_23, MossdeepCity_SpaceCenter_1F_Text_223BC2 setflag FLAG_0x0BF diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc index 96bc41e07..c45899f8c 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc +++ b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc @@ -38,7 +38,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_223DBF:: @ 8223DBF waitmovement 0 msgbox MossdeepCity_SpaceCenter_2F_Text_2243A4, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq MossdeepCity_SpaceCenter_2F_EventScript_223E09 + goto_if_eq MossdeepCity_SpaceCenter_2F_EventScript_223E09 msgbox MossdeepCity_SpaceCenter_2F_Text_2243FE, MSGBOX_DEFAULT closemessage applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_SpaceCenter_2F_Movement_223E07 @@ -97,12 +97,11 @@ MossdeepCity_SpaceCenter_2F_Movement_223E89: @ 8223E89 MossdeepCity_SpaceCenter_2F_EventScript_223E8D:: @ 8223E8D lock faceplayer - checkflag FLAG_SYS_GAME_CLEAR - goto_eq MossdeepCity_SpaceCenter_2F_EventScript_223EB4 + goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_SpaceCenter_2F_EventScript_223EB4 compare VAR_0x405D, 2 - goto_eq MossdeepCity_SpaceCenter_2F_EventScript_223EBE + goto_if_eq MossdeepCity_SpaceCenter_2F_EventScript_223EBE compare VAR_0x405D, 2 - goto_if 0, MossdeepCity_SpaceCenter_2F_EventScript_223EB4 + goto_if_lt MossdeepCity_SpaceCenter_2F_EventScript_223EB4 goto MossdeepCity_SpaceCenter_2F_EventScript_223EBE end @@ -119,12 +118,11 @@ MossdeepCity_SpaceCenter_2F_EventScript_223EBE:: @ 8223EBE MossdeepCity_SpaceCenter_2F_EventScript_223EC8:: @ 8223EC8 lock faceplayer - checkflag FLAG_SYS_GAME_CLEAR - goto_eq MossdeepCity_SpaceCenter_2F_EventScript_223EEF + goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_SpaceCenter_2F_EventScript_223EEF compare VAR_0x405D, 2 - goto_eq MossdeepCity_SpaceCenter_2F_EventScript_223EF9 + goto_if_eq MossdeepCity_SpaceCenter_2F_EventScript_223EF9 compare VAR_0x405D, 2 - goto_if 0, MossdeepCity_SpaceCenter_2F_EventScript_223EEF + goto_if_lt MossdeepCity_SpaceCenter_2F_EventScript_223EEF goto MossdeepCity_SpaceCenter_2F_EventScript_223EF9 end @@ -141,12 +139,11 @@ MossdeepCity_SpaceCenter_2F_EventScript_223EF9:: @ 8223EF9 MossdeepCity_SpaceCenter_2F_EventScript_223F03:: @ 8223F03 lock faceplayer - checkflag FLAG_SYS_GAME_CLEAR - goto_eq MossdeepCity_SpaceCenter_2F_EventScript_223F2A + goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_SpaceCenter_2F_EventScript_223F2A compare VAR_0x405D, 2 - goto_eq MossdeepCity_SpaceCenter_2F_EventScript_223F34 + goto_if_eq MossdeepCity_SpaceCenter_2F_EventScript_223F34 compare VAR_0x405D, 2 - goto_if 0, MossdeepCity_SpaceCenter_2F_EventScript_223F2A + goto_if_lt MossdeepCity_SpaceCenter_2F_EventScript_223F2A goto MossdeepCity_SpaceCenter_2F_EventScript_223F34 end @@ -189,8 +186,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_223F6F:: @ 8223F6F MossdeepCity_SpaceCenter_2F_EventScript_223F7A:: @ 8223F7A lockall - checkflag FLAG_0x0CD - goto_eq MossdeepCity_SpaceCenter_2F_EventScript_223FDA + goto_if_set FLAG_0x0CD, MossdeepCity_SpaceCenter_2F_EventScript_223FDA setflag FLAG_0x0CD msgbox MossdeepCity_SpaceCenter_2F_Text_2246B2, MSGBOX_DEFAULT msgbox MossdeepCity_SpaceCenter_2F_Text_2246F0, MSGBOX_DEFAULT @@ -239,7 +235,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_223FDA:: @ 8223FDA waitmovement 0 msgbox MossdeepCity_SpaceCenter_2F_Text_2247FF, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq MossdeepCity_SpaceCenter_2F_EventScript_22400C + goto_if_eq MossdeepCity_SpaceCenter_2F_EventScript_22400C msgbox MossdeepCity_SpaceCenter_2F_Text_224854, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_2F_Movement_2725AA @@ -255,7 +251,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_22400C:: @ 822400C special sub_80F9438 waitstate compare VAR_RESULT, 0 - goto_if 5, MossdeepCity_SpaceCenter_2F_EventScript_224032 + goto_if_ne MossdeepCity_SpaceCenter_2F_EventScript_224032 special LoadPlayerParty goto MossdeepCity_SpaceCenter_2F_EventScript_223FDA diff --git a/data/maps/MossdeepCity_StevensHouse/scripts.inc b/data/maps/MossdeepCity_StevensHouse/scripts.inc index 297af90d3..b1e794172 100644 --- a/data/maps/MossdeepCity_StevensHouse/scripts.inc +++ b/data/maps/MossdeepCity_StevensHouse/scripts.inc @@ -75,7 +75,7 @@ MossdeepCity_StevensHouse_EventScript_222841:: @ 8222841 lockall msgbox MossdeepCity_StevensHouse_Text_222B9E, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq MossdeepCity_StevensHouse_EventScript_22285B + goto_if_eq MossdeepCity_StevensHouse_EventScript_22285B goto MossdeepCity_StevensHouse_EventScript_222865 end @@ -88,9 +88,9 @@ MossdeepCity_StevensHouse_EventScript_222865:: @ 8222865 setvar VAR_TEMP_1, 398 givemon SPECIES_BELDUM, 5, ITEM_NONE, 0x0, 0x0, 0 compare VAR_RESULT, 0 - goto_eq MossdeepCity_StevensHouse_EventScript_222895 + goto_if_eq MossdeepCity_StevensHouse_EventScript_222895 compare VAR_RESULT, 1 - goto_eq MossdeepCity_StevensHouse_EventScript_2228BD + goto_if_eq MossdeepCity_StevensHouse_EventScript_2228BD goto MossdeepCity_StevensHouse_EventScript_273811 end @@ -98,7 +98,7 @@ MossdeepCity_StevensHouse_EventScript_222895:: @ 8222895 call MossdeepCity_StevensHouse_EventScript_2228EB msgbox gUnknown_08273374, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq MossdeepCity_StevensHouse_EventScript_222901 + goto_if_eq MossdeepCity_StevensHouse_EventScript_222901 call MossdeepCity_StevensHouse_EventScript_27378B call MossdeepCity_StevensHouse_EventScript_2723DD goto MossdeepCity_StevensHouse_EventScript_222901 @@ -108,7 +108,7 @@ MossdeepCity_StevensHouse_EventScript_2228BD:: @ 82228BD call MossdeepCity_StevensHouse_EventScript_2228EB msgbox gUnknown_08273374, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq MossdeepCity_StevensHouse_EventScript_2228E0 + goto_if_eq MossdeepCity_StevensHouse_EventScript_2228E0 call MossdeepCity_StevensHouse_EventScript_273797 goto MossdeepCity_StevensHouse_EventScript_2228E0 end diff --git a/data/maps/MtChimney/scripts.inc b/data/maps/MtChimney/scripts.inc index ee89519bc..9b1c29290 100644 --- a/data/maps/MtChimney/scripts.inc +++ b/data/maps/MtChimney/scripts.inc @@ -105,17 +105,17 @@ MtChimney_EventScript_22EEF3:: @ 822EEF3 showmoneybox 0, 0, 0 msgbox MtChimney_Text_22FE04, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq MtChimney_EventScript_22EF69 + goto_if_eq MtChimney_EventScript_22EF69 checkmoney 0xc8, 0 compare VAR_RESULT, 0 - goto_eq MtChimney_EventScript_22EF76 + goto_if_eq MtChimney_EventScript_22EF76 msgbox MtChimney_Text_22FE4D, MSGBOX_DEFAULT checkitemspace ITEM_LAVA_COOKIE, 1 compare VAR_RESULT, 1 call_if 1, MtChimney_EventScript_22EF5E giveitem_std ITEM_LAVA_COOKIE compare VAR_RESULT, 0 - goto_eq MtChimney_EventScript_22EF51 + goto_if_eq MtChimney_EventScript_22EF51 hidemoneybox nop nop @@ -454,13 +454,11 @@ MtChimney_EventScript_22F0DB:: @ 822F0DB MtChimney_EventScript_22F0E4:: @ 822F0E4 lockall - checkflag FLAG_0x08B - goto_if 0, MtChimney_EventScript_22F137 - checkflag FLAG_0x073 - goto_eq MtChimney_EventScript_22F12D + goto_if_unset FLAG_0x08B, MtChimney_EventScript_22F137 + goto_if_set FLAG_0x073, MtChimney_EventScript_22F12D msgbox MtChimney_Text_22FF12, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq MtChimney_EventScript_22F123 + goto_if_eq MtChimney_EventScript_22F123 msgbox MtChimney_Text_22FF66, MSGBOX_DEFAULT giveitem_std ITEM_METEORITE setflag FLAG_0x073 @@ -490,7 +488,7 @@ MtChimney_EventScript_22F14A:: @ 822F14A trainerbattle_single TRAINER_SHELBY_1, MtChimney_Text_23001D, MtChimney_Text_230076, MtChimney_EventScript_22F176 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq MtChimney_EventScript_22F195 + goto_if_eq MtChimney_EventScript_22F195 msgbox MtChimney_Text_2300A2, MSGBOX_DEFAULT release end @@ -532,7 +530,7 @@ MtChimney_EventScript_22F208:: @ 822F208 trainerbattle_single TRAINER_SAWYER_1, MtChimney_Text_2304B3, MtChimney_Text_2304F7, MtChimney_EventScript_22F234 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq MtChimney_EventScript_22F253 + goto_if_eq MtChimney_EventScript_22F253 msgbox MtChimney_Text_230519, MSGBOX_DEFAULT release end diff --git a/data/maps/MtChimney_CableCarStation/scripts.inc b/data/maps/MtChimney_CableCarStation/scripts.inc index 664f75935..06590d78f 100644 --- a/data/maps/MtChimney_CableCarStation/scripts.inc +++ b/data/maps/MtChimney_CableCarStation/scripts.inc @@ -33,9 +33,9 @@ MtChimney_CableCarStation_EventScript_22AC4B:: @ 822AC4B faceplayer msgbox MtChimney_CableCarStation_Text_22ACB9, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq MtChimney_CableCarStation_EventScript_22AC6C + goto_if_eq MtChimney_CableCarStation_EventScript_22AC6C compare VAR_RESULT, 0 - goto_eq MtChimney_CableCarStation_EventScript_22AC9B + goto_if_eq MtChimney_CableCarStation_EventScript_22AC9B end MtChimney_CableCarStation_EventScript_22AC6C:: @ 822AC6C diff --git a/data/maps/MtPyre_1F/scripts.inc b/data/maps/MtPyre_1F/scripts.inc index c5f24ccc0..b3f38c296 100644 --- a/data/maps/MtPyre_1F/scripts.inc +++ b/data/maps/MtPyre_1F/scripts.inc @@ -4,12 +4,11 @@ MtPyre_1F_MapScripts:: @ 8230F3E MtPyre_1F_EventScript_230F3F:: @ 8230F3F lock faceplayer - checkflag FLAG_0x11A - goto_eq MtPyre_1F_EventScript_230F6E + goto_if_set FLAG_0x11A, MtPyre_1F_EventScript_230F6E msgbox MtPyre_1F_Text_230F8A, MSGBOX_DEFAULT giveitem_std ITEM_CLEANSE_TAG compare VAR_RESULT, 0 - goto_eq MtPyre_1F_EventScript_272054 + goto_if_eq MtPyre_1F_EventScript_272054 setflag FLAG_0x11A release end diff --git a/data/maps/MtPyre_3F/scripts.inc b/data/maps/MtPyre_3F/scripts.inc index 42c39705c..558ab9999 100644 --- a/data/maps/MtPyre_3F/scripts.inc +++ b/data/maps/MtPyre_3F/scripts.inc @@ -15,7 +15,7 @@ MtPyre_3F_EventScript_231781:: @ 8231781 trainerbattle_single TRAINER_GABRIELLE_1, MtPyre_3F_Text_231952, MtPyre_3F_Text_23196A, MtPyre_3F_EventScript_2317AD specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq MtPyre_3F_EventScript_2317CC + goto_if_eq MtPyre_3F_EventScript_2317CC msgbox MtPyre_3F_Text_23199B, MSGBOX_DEFAULT release end diff --git a/data/maps/MtPyre_6F/scripts.inc b/data/maps/MtPyre_6F/scripts.inc index 92178b21b..f59edd7b1 100644 --- a/data/maps/MtPyre_6F/scripts.inc +++ b/data/maps/MtPyre_6F/scripts.inc @@ -5,7 +5,7 @@ MtPyre_6F_EventScript_231D3B:: @ 8231D3B trainerbattle_single TRAINER_VALERIE_1, MtPyre_6F_Text_231DB4, MtPyre_6F_Text_231DE2, MtPyre_6F_EventScript_231D67 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq MtPyre_6F_EventScript_231D86 + goto_if_eq MtPyre_6F_EventScript_231D86 msgbox MtPyre_6F_Text_231DFC, MSGBOX_DEFAULT release end diff --git a/data/maps/MtPyre_Exterior/scripts.inc b/data/maps/MtPyre_Exterior/scripts.inc index 8f757ebb4..6f078c06c 100644 --- a/data/maps/MtPyre_Exterior/scripts.inc +++ b/data/maps/MtPyre_Exterior/scripts.inc @@ -9,7 +9,7 @@ MtPyre_Exterior_MapScript1_231FD2: @ 8231FD2 MtPyre_Exterior_EventScript_231FD8:: @ 8231FD8 getplayerxy VAR_TEMP_0, VAR_TEMP_1 compare VAR_TEMP_1, 12 - goto_if 0, MtPyre_Exterior_EventScript_231FE9 + goto_if_lt MtPyre_Exterior_EventScript_231FE9 return MtPyre_Exterior_EventScript_231FE9:: @ 8231FE9 diff --git a/data/maps/MtPyre_Summit/scripts.inc b/data/maps/MtPyre_Summit/scripts.inc index 3e19bc95a..63de4d5dd 100644 --- a/data/maps/MtPyre_Summit/scripts.inc +++ b/data/maps/MtPyre_Summit/scripts.inc @@ -131,8 +131,7 @@ MtPyre_Summit_Movement_232139: @ 8232139 MtPyre_Summit_EventScript_23213C:: @ 823213C lock faceplayer - checkflag FLAG_0x09E - goto_eq MtPyre_Summit_EventScript_232167 + 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 @@ -165,12 +164,10 @@ MtPyre_Summit_EventScript_232199:: @ 8232199 MtPyre_Summit_EventScript_2321A2:: @ 82321A2 lock faceplayer - checkflag FLAG_0x103 - goto_eq MtPyre_Summit_EventScript_2321E2 + goto_if_set FLAG_0x103, MtPyre_Summit_EventScript_2321E2 compare VAR_0x40B9, 3 call_if 4, MtPyre_Summit_EventScript_2321CB - checkflag FLAG_0x081 - goto_eq MtPyre_Summit_EventScript_2321D8 + goto_if_set FLAG_0x081, MtPyre_Summit_EventScript_2321D8 msgbox MtPyre_Summit_Text_232AD8, MSGBOX_DEFAULT release end diff --git a/data/maps/NavelRock_Bottom/scripts.inc b/data/maps/NavelRock_Bottom/scripts.inc index 3abd0c84a..70a6fed65 100644 --- a/data/maps/NavelRock_Bottom/scripts.inc +++ b/data/maps/NavelRock_Bottom/scripts.inc @@ -15,8 +15,7 @@ NavelRock_Bottom_EventScript_269273:: @ 8269273 return NavelRock_Bottom_EventScript_269277:: @ 8269277 - checkflag FLAG_0x1DD - goto_eq NavelRock_Bottom_EventScript_27374E + goto_if_set FLAG_0x1DD, NavelRock_Bottom_EventScript_27374E clearflag FLAG_HIDE_LUGIA return @@ -28,7 +27,7 @@ NavelRock_Bottom_MapScript1_269284: @ 8269284 NavelRock_Bottom_EventScript_26928E:: @ 826928E specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if 5, NavelRock_Bottom_EventScript_27374E + goto_if_ne NavelRock_Bottom_EventScript_27374E removeobject 1 return @@ -66,11 +65,11 @@ NavelRock_Bottom_EventScript_2692A2:: @ 82692A2 clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 1 - goto_eq NavelRock_Bottom_EventScript_269336 + goto_if_eq NavelRock_Bottom_EventScript_269336 compare VAR_RESULT, 4 - goto_eq NavelRock_Bottom_EventScript_269344 + goto_if_eq NavelRock_Bottom_EventScript_269344 compare VAR_RESULT, 5 - goto_eq NavelRock_Bottom_EventScript_269344 + goto_if_eq NavelRock_Bottom_EventScript_269344 setflag FLAG_0x091 release end diff --git a/data/maps/NavelRock_Harbor/scripts.inc b/data/maps/NavelRock_Harbor/scripts.inc index 910dc8eed..4df8343fb 100644 --- a/data/maps/NavelRock_Harbor/scripts.inc +++ b/data/maps/NavelRock_Harbor/scripts.inc @@ -6,7 +6,7 @@ NavelRock_Harbor_EventScript_2690BD:: @ 82690BD faceplayer msgbox NavelRock_Harbor_Text_2C6CE6, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq NavelRock_Harbor_EventScript_269102 + goto_if_eq NavelRock_Harbor_EventScript_269102 msgbox NavelRock_Harbor_Text_2A6A5D, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, NavelRock_Harbor_Movement_2725AA diff --git a/data/maps/NavelRock_Top/scripts.inc b/data/maps/NavelRock_Top/scripts.inc index f2b107947..339158041 100644 --- a/data/maps/NavelRock_Top/scripts.inc +++ b/data/maps/NavelRock_Top/scripts.inc @@ -17,8 +17,7 @@ NavelRock_Top_EventScript_269131:: @ 8269131 NavelRock_Top_EventScript_26913A:: @ 826913A setvar VAR_TEMP_1, 1 - checkflag FLAG_0x1DC - goto_eq NavelRock_Top_EventScript_27374E + goto_if_set FLAG_0x1DC, NavelRock_Top_EventScript_27374E setvar VAR_TEMP_1, 0 clearflag FLAG_HIDE_HOOH return @@ -31,7 +30,7 @@ NavelRock_Top_MapScript1_269151: @ 8269151 NavelRock_Top_EventScript_26915B:: @ 826915B specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if 5, NavelRock_Top_EventScript_27374E + goto_if_ne NavelRock_Top_EventScript_27374E removeobject 1 return @@ -71,11 +70,11 @@ NavelRock_Top_EventScript_26916F:: @ 826916F setvar VAR_LAST_TALKED, 1 specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 1 - goto_eq NavelRock_Top_EventScript_269217 + goto_if_eq NavelRock_Top_EventScript_269217 compare VAR_RESULT, 4 - goto_eq NavelRock_Top_EventScript_269225 + goto_if_eq NavelRock_Top_EventScript_269225 compare VAR_RESULT, 5 - goto_eq NavelRock_Top_EventScript_269225 + goto_if_eq NavelRock_Top_EventScript_269225 setflag FLAG_0x092 releaseall end diff --git a/data/maps/NewMauville_Entrance/scripts.inc b/data/maps/NewMauville_Entrance/scripts.inc index 9efc423db..b9b7b5189 100644 --- a/data/maps/NewMauville_Entrance/scripts.inc +++ b/data/maps/NewMauville_Entrance/scripts.inc @@ -28,10 +28,10 @@ NewMauville_Entrance_EventScript_2372FF:: @ 82372FF msgbox NewMauville_Entrance_Text_237382, MSGBOX_DEFAULT checkitem ITEM_BASEMENT_KEY, 1 compare VAR_RESULT, 0 - goto_eq NewMauville_Entrance_EventScript_237380 + goto_if_eq NewMauville_Entrance_EventScript_237380 msgbox NewMauville_Entrance_Text_237396, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq NewMauville_Entrance_EventScript_237380 + goto_if_eq NewMauville_Entrance_EventScript_237380 msgbox NewMauville_Entrance_Text_2373AC, MSGBOX_DEFAULT setmetatile 3, 0, 707, 0 setmetatile 4, 0, 708, 0 diff --git a/data/maps/NewMauville_Inside/scripts.inc b/data/maps/NewMauville_Inside/scripts.inc index b0f0a18c7..784d813da 100644 --- a/data/maps/NewMauville_Inside/scripts.inc +++ b/data/maps/NewMauville_Inside/scripts.inc @@ -16,7 +16,7 @@ NewMauville_Inside_MapScript1_2373E7: @ 82373E7 NewMauville_Inside_EventScript_237407:: @ 8237407 specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if 5, NewMauville_Inside_EventScript_27374E + goto_if_ne NewMauville_Inside_EventScript_27374E removeobject VAR_LAST_TALKED return @@ -172,7 +172,7 @@ NewMauville_Inside_EventScript_23773A:: @ 823773A NewMauville_Inside_EventScript_23778F:: @ 823778F lockall compare VAR_0x40BA, 2 - goto_eq NewMauville_Inside_EventScript_2377A5 + goto_if_eq NewMauville_Inside_EventScript_2377A5 msgbox NewMauville_Inside_Text_237896, MSGBOX_DEFAULT releaseall end @@ -195,11 +195,11 @@ NewMauville_Inside_EventScript_2377AF:: @ 82377AF clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 1 - goto_eq NewMauville_Inside_EventScript_2377F3 + goto_if_eq NewMauville_Inside_EventScript_2377F3 compare VAR_RESULT, 4 - goto_eq NewMauville_Inside_EventScript_2377F3 + goto_if_eq NewMauville_Inside_EventScript_2377F3 compare VAR_RESULT, 5 - goto_eq NewMauville_Inside_EventScript_2377F3 + goto_if_eq NewMauville_Inside_EventScript_2377F3 setflag FLAG_0x1C1 release end @@ -222,11 +222,11 @@ NewMauville_Inside_EventScript_2377FC:: @ 82377FC clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 1 - goto_eq NewMauville_Inside_EventScript_237840 + goto_if_eq NewMauville_Inside_EventScript_237840 compare VAR_RESULT, 4 - goto_eq NewMauville_Inside_EventScript_237840 + goto_if_eq NewMauville_Inside_EventScript_237840 compare VAR_RESULT, 5 - goto_eq NewMauville_Inside_EventScript_237840 + goto_if_eq NewMauville_Inside_EventScript_237840 setflag FLAG_0x1C2 release end @@ -249,11 +249,11 @@ NewMauville_Inside_EventScript_237849:: @ 8237849 clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 1 - goto_eq NewMauville_Inside_EventScript_23788D + goto_if_eq NewMauville_Inside_EventScript_23788D compare VAR_RESULT, 4 - goto_eq NewMauville_Inside_EventScript_23788D + goto_if_eq NewMauville_Inside_EventScript_23788D compare VAR_RESULT, 5 - goto_eq NewMauville_Inside_EventScript_23788D + goto_if_eq NewMauville_Inside_EventScript_23788D setflag FLAG_0x1C3 release end diff --git a/data/maps/OldaleTown/scripts.inc b/data/maps/OldaleTown/scripts.inc index 80867cca6..2b3b76fc5 100644 --- a/data/maps/OldaleTown/scripts.inc +++ b/data/maps/OldaleTown/scripts.inc @@ -38,10 +38,8 @@ OldaleTown_EventScript_1E8EF3:: @ 81E8EF3 OldaleTown_EventScript_1E8EFC:: @ 81E8EFC lock faceplayer - checkflag FLAG_0x084 - goto_eq OldaleTown_EventScript_1E8FB9 - checkflag FLAG_TEMP_1 - goto_eq OldaleTown_EventScript_1E8FB9 + goto_if_set FLAG_0x084, OldaleTown_EventScript_1E8FB9 + goto_if_set FLAG_TEMP_1, OldaleTown_EventScript_1E8FB9 setflag FLAG_TEMP_1 playbgm MUS_TSURETEK, 0 msgbox OldaleTown_Text_1E91C0, MSGBOX_DEFAULT @@ -77,7 +75,7 @@ OldaleTown_EventScript_1E8F8C:: @ 81E8F8C msgbox OldaleTown_Text_1E91FD, MSGBOX_DEFAULT giveitem_std ITEM_POTION compare VAR_RESULT, 0 - goto_eq OldaleTown_EventScript_1E8FC3 + goto_if_eq OldaleTown_EventScript_1E8FC3 msgbox OldaleTown_Text_1E92AF, MSGBOX_DEFAULT setflag FLAG_0x084 fadedefaultbgm @@ -195,8 +193,7 @@ OldaleTown_Movement_1E9013: @ 81E9013 OldaleTown_EventScript_1E901F:: @ 81E901F lock faceplayer - checkflag FLAG_0x074 - goto_eq OldaleTown_EventScript_1E9066 + goto_if_set FLAG_0x074, OldaleTown_EventScript_1E9066 msgbox OldaleTown_Text_1E939A, MSGBOX_DEFAULT closemessage applymovement 3, OldaleTown_Movement_2725A2 @@ -262,9 +259,9 @@ OldaleTown_EventScript_1E90C6:: @ 81E90C6 OldaleTown_EventScript_1E90E6:: @ 81E90E6 checkplayergender compare VAR_RESULT, 0 - goto_eq OldaleTown_EventScript_1E90FE + goto_if_eq OldaleTown_EventScript_1E90FE compare VAR_RESULT, 1 - goto_eq OldaleTown_EventScript_1E910C + goto_if_eq OldaleTown_EventScript_1E910C end OldaleTown_EventScript_1E90FE:: @ 81E90FE @@ -293,7 +290,7 @@ OldaleTown_EventScript_1E911A:: @ 81E911A OldaleTown_EventScript_1E9148:: @ 81E9148 compare VAR_FACING, 1 - goto_if 5, OldaleTown_EventScript_1E915E + goto_if_ne OldaleTown_EventScript_1E915E applymovement 4, OldaleTown_Movement_1E9177 waitmovement 0 return diff --git a/data/maps/OldaleTown_Mart/scripts.inc b/data/maps/OldaleTown_Mart/scripts.inc index 4503a27a8..2eaa483f5 100644 --- a/data/maps/OldaleTown_Mart/scripts.inc +++ b/data/maps/OldaleTown_Mart/scripts.inc @@ -6,8 +6,7 @@ OldaleTown_Mart_EventScript_1FC240:: @ 81FC240 faceplayer message gUnknown_08272A21 waitmessage - checkflag FLAG_0x074 - goto_eq OldaleTown_Mart_EventScript_1FC26C + goto_if_set FLAG_0x074, OldaleTown_Mart_EventScript_1FC26C pokemart OldaleTown_Mart_Pokemart_1FC260 msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release @@ -42,8 +41,7 @@ OldaleTown_Mart_Pokemart_1FC27C: @ 81FC27C OldaleTown_Mart_EventScript_1FC28A:: @ 81FC28A lock faceplayer - checkflag FLAG_0x074 - goto_eq OldaleTown_Mart_EventScript_1FC29F + goto_if_set FLAG_0x074, OldaleTown_Mart_EventScript_1FC29F msgbox OldaleTown_Mart_Text_1FC2B2, MSGBOX_DEFAULT release end diff --git a/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc b/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc index af104c674..19f7d8f67 100644 --- a/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc @@ -27,8 +27,7 @@ OldaleTown_PokemonCenter_1F_EventScript_1FC031:: @ 81FC031 OldaleTown_PokemonCenter_1F_EventScript_1FC03A:: @ 81FC03A lock faceplayer - checkflag FLAG_SYS_POKEDEX_GET - goto_eq OldaleTown_PokemonCenter_1F_EventScript_1FC04F + goto_if_set FLAG_SYS_POKEDEX_GET, OldaleTown_PokemonCenter_1F_EventScript_1FC04F msgbox OldaleTown_PokemonCenter_1F_Text_1FC148, MSGBOX_DEFAULT release end diff --git a/data/maps/PacifidlogTown_House2/scripts.inc b/data/maps/PacifidlogTown_House2/scripts.inc index 41242ab44..40dc393d0 100644 --- a/data/maps/PacifidlogTown_House2/scripts.inc +++ b/data/maps/PacifidlogTown_House2/scripts.inc @@ -6,8 +6,7 @@ PacifidlogTown_House2_EventScript_203792:: @ 8203792 faceplayer dodailyevents call PacifidlogTown_House2_EventScript_2037DE - checkflag FLAG_0x12B - goto_eq PacifidlogTown_House2_EventScript_20387E + goto_if_set FLAG_0x12B, PacifidlogTown_House2_EventScript_20387E checkflag FLAG_0x12C call_if 1, PacifidlogTown_House2_EventScript_2037F8 checkflag FLAG_0x12C @@ -15,16 +14,15 @@ PacifidlogTown_House2_EventScript_203792:: @ 8203792 setflag FLAG_0x12C specialvar VAR_RESULT, GetLeadMonFriendshipScore compare VAR_RESULT, 4 - goto_if 4, PacifidlogTown_House2_EventScript_203816 + goto_if_ge PacifidlogTown_House2_EventScript_203816 specialvar VAR_RESULT, GetLeadMonFriendshipScore compare VAR_RESULT, 2 - goto_if 4, PacifidlogTown_House2_EventScript_203845 + goto_if_ge PacifidlogTown_House2_EventScript_203845 goto PacifidlogTown_House2_EventScript_20384F end PacifidlogTown_House2_EventScript_2037DE:: @ 82037DE - checkflag FLAG_0x12B - goto_if 0, PacifidlogTown_House2_EventScript_27374E + goto_if_unset FLAG_0x12B, PacifidlogTown_House2_EventScript_27374E specialvar VAR_RESULT, GetDaysUntilPacifidlogTMAvailable compare VAR_RESULT, 0 call_if 1, PacifidlogTown_House2_EventScript_203812 @@ -47,7 +45,7 @@ PacifidlogTown_House2_EventScript_203816:: @ 8203816 msgbox PacifidlogTown_House2_Text_20396D, MSGBOX_DEFAULT giveitem_std ITEM_TM27 compare VAR_RESULT, 0 - goto_eq PacifidlogTown_House2_EventScript_272054 + goto_if_eq PacifidlogTown_House2_EventScript_272054 setflag FLAG_0x12B special SetPacifidlogTMReceivedDay msgbox PacifidlogTown_House2_Text_203A85, MSGBOX_DEFAULT @@ -63,7 +61,7 @@ PacifidlogTown_House2_EventScript_20384F:: @ 820384F msgbox PacifidlogTown_House2_Text_203A2F, MSGBOX_DEFAULT giveitem_std ITEM_TM21 compare VAR_RESULT, 0 - goto_eq PacifidlogTown_House2_EventScript_272054 + goto_if_eq PacifidlogTown_House2_EventScript_272054 setflag FLAG_0x12B special SetPacifidlogTMReceivedDay msgbox PacifidlogTown_House2_Text_203A85, MSGBOX_DEFAULT diff --git a/data/maps/PacifidlogTown_House3/scripts.inc b/data/maps/PacifidlogTown_House3/scripts.inc index d7b83f70a..fb5bf8cb1 100644 --- a/data/maps/PacifidlogTown_House3/scripts.inc +++ b/data/maps/PacifidlogTown_House3/scripts.inc @@ -4,25 +4,24 @@ PacifidlogTown_House3_MapScripts:: @ 8203C10 PacifidlogTown_House3_EventScript_203C11:: @ 8203C11 lock faceplayer - checkflag FLAG_0x09A - goto_eq PacifidlogTown_House3_EventScript_203CAB + goto_if_set FLAG_0x09A, PacifidlogTown_House3_EventScript_203CAB setvar VAR_0x8008, 2 copyvar VAR_0x8004, VAR_0x8008 specialvar VAR_RESULT, sub_807E73C copyvar VAR_0x8009, VAR_RESULT msgbox PacifidlogTown_House3_Text_203CBE, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq PacifidlogTown_House3_EventScript_203C93 + goto_if_eq PacifidlogTown_House3_EventScript_203C93 special sub_81B94B0 waitstate copyvar VAR_0x800A, VAR_0x8004 compare VAR_0x8004, 255 - goto_eq PacifidlogTown_House3_EventScript_203C93 + goto_if_eq PacifidlogTown_House3_EventScript_203C93 copyvar VAR_0x8005, VAR_0x800A specialvar VAR_RESULT, sub_807E9D4 copyvar VAR_0x800B, VAR_RESULT compare VAR_RESULT, VAR_0x8009 - goto_if 5, PacifidlogTown_House3_EventScript_203C9D + goto_if_ne PacifidlogTown_House3_EventScript_203C9D copyvar VAR_0x8004, VAR_0x8008 copyvar VAR_0x8005, VAR_0x800A special sub_807EA10 diff --git a/data/maps/PacifidlogTown_House4/scripts.inc b/data/maps/PacifidlogTown_House4/scripts.inc index 2e9a06e0b..e9f5f19e7 100644 --- a/data/maps/PacifidlogTown_House4/scripts.inc +++ b/data/maps/PacifidlogTown_House4/scripts.inc @@ -14,9 +14,9 @@ PacifidlogTown_House4_EventScript_203F5E:: @ 8203F5E faceplayer msgbox PacifidlogTown_House4_Text_204035, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq PacifidlogTown_House4_EventScript_203F7F + goto_if_eq PacifidlogTown_House4_EventScript_203F7F compare VAR_RESULT, 0 - goto_eq PacifidlogTown_House4_EventScript_203F89 + goto_if_eq PacifidlogTown_House4_EventScript_203F89 end PacifidlogTown_House4_EventScript_203F7F:: @ 8203F7F diff --git a/data/maps/PacifidlogTown_House5/scripts.inc b/data/maps/PacifidlogTown_House5/scripts.inc index d9d9f0c56..cdc54fefe 100644 --- a/data/maps/PacifidlogTown_House5/scripts.inc +++ b/data/maps/PacifidlogTown_House5/scripts.inc @@ -6,7 +6,7 @@ PacifidlogTown_House5_EventScript_204111:: @ 8204111 faceplayer specialvar VAR_RESULT, IsMirageIslandPresent compare VAR_RESULT, 1 - goto_eq PacifidlogTown_House5_EventScript_20412D + goto_if_eq PacifidlogTown_House5_EventScript_20412D msgbox PacifidlogTown_House5_Text_204140, MSGBOX_DEFAULT release end diff --git a/data/maps/PetalburgCity_Gym/scripts.inc b/data/maps/PetalburgCity_Gym/scripts.inc index 9b0f4bcb5..46d9f46c2 100644 --- a/data/maps/PetalburgCity_Gym/scripts.inc +++ b/data/maps/PetalburgCity_Gym/scripts.inc @@ -7,7 +7,7 @@ PetalburgCity_Gym_MapScripts:: @ 8204889 PetalburgCity_Gym_MapScript1_20489E: @ 820489E compare VAR_0x4085, 6 - goto_eq PetalburgCity_Gym_EventScript_2048B5 + goto_if_eq PetalburgCity_Gym_EventScript_2048B5 compare VAR_0x4085, 7 call_if 4, PetalburgCity_Gym_EventScript_2048FF end @@ -64,9 +64,9 @@ PetalburgCity_Gym_EventScript_20495D:: @ 820495D setorcopyvar 0x8015, 269 specialvar VAR_RESULT, IsTrainerReadyForRematch compare VAR_RESULT, 1 - goto_eq PetalburgCity_Gym_EventScript_204985 + goto_if_eq PetalburgCity_Gym_EventScript_204985 compare VAR_0x4085, 8 - goto_eq PetalburgCity_Gym_EventScript_204985 + goto_if_eq PetalburgCity_Gym_EventScript_204985 setobjectxyperm 1, 4, 107 return @@ -364,11 +364,9 @@ PetalburgCity_Gym_EventScript_204D7F:: @ 8204D7F PetalburgCity_Gym_EventScript_204D80:: @ 8204D80 call PetalburgCity_Gym_EventScript_204DCE compare VAR_RESULT, 1 - goto_eq PetalburgCity_Gym_EventScript_204E1D - checkflag FLAG_0x0A9 - goto_if 0, PetalburgCity_Gym_EventScript_204DAC - checkflag FLAG_SYS_GAME_CLEAR - goto_eq PetalburgCity_Gym_EventScript_20512D + goto_if_eq PetalburgCity_Gym_EventScript_204E1D + goto_if_unset FLAG_0x0A9, PetalburgCity_Gym_EventScript_204DAC + goto_if_set FLAG_SYS_GAME_CLEAR, PetalburgCity_Gym_EventScript_20512D msgbox PetalburgCity_Gym_Text_206417, MSGBOX_DEFAULT release end @@ -386,15 +384,15 @@ PetalburgCity_Gym_EventScript_204DB3:: @ 8204DB3 PetalburgCity_Gym_EventScript_204DCE:: @ 8204DCE specialvar VAR_RESULT, IsEnigmaBerryValid compare VAR_RESULT, 0 - goto_eq PetalburgCity_Gym_EventScript_204E17 + goto_if_eq PetalburgCity_Gym_EventScript_204E17 checkitem ITEM_ENIGMA_BERRY, 1 compare VAR_RESULT, 1 - goto_eq PetalburgCity_Gym_EventScript_204E17 + goto_if_eq PetalburgCity_Gym_EventScript_204E17 checkpcitem ITEM_ENIGMA_BERRY, 1 compare VAR_RESULT, 1 - goto_eq PetalburgCity_Gym_EventScript_204E17 + goto_if_eq PetalburgCity_Gym_EventScript_204E17 compare VAR_ENIGMA_BERRY_AVAILABLE, 0 - goto_eq PetalburgCity_Gym_EventScript_204E17 + goto_if_eq PetalburgCity_Gym_EventScript_204E17 msgbox PetalburgCity_Gym_Text_2A6D3D, MSGBOX_DEFAULT setvar VAR_RESULT, 1 return @@ -406,7 +404,7 @@ PetalburgCity_Gym_EventScript_204E17:: @ 8204E17 PetalburgCity_Gym_EventScript_204E1D:: @ 8204E1D giveitem_std ITEM_ENIGMA_BERRY compare VAR_RESULT, 0 - goto_eq PetalburgCity_Gym_EventScript_272054 + goto_if_eq PetalburgCity_Gym_EventScript_272054 setvar VAR_ENIGMA_BERRY_AVAILABLE, 0 release end @@ -447,7 +445,7 @@ PetalburgCity_Gym_EventScript_204E3B:: @ 8204E3B PetalburgCity_Gym_EventScript_204ED2:: @ 8204ED2 giveitem_std ITEM_TM42 compare VAR_RESULT, 0 - goto_eq PetalburgCity_Gym_EventScript_27205E + goto_if_eq PetalburgCity_Gym_EventScript_27205E setflag FLAG_0x0A9 msgbox PetalburgCity_Gym_Text_206254, MSGBOX_DEFAULT return @@ -787,14 +785,14 @@ PetalburgCity_Gym_EventScript_20512D:: @ 820512D PetalburgCity_Gym_EventScript_205137:: @ 8205137 lockall compare VAR_0x4085, 6 - goto_if 0, PetalburgCity_Gym_EventScript_20517D + goto_if_lt PetalburgCity_Gym_EventScript_20517D setvar VAR_0x8008, 7 setvar VAR_0x8009, 85 msgbox PetalburgCity_Gym_Text_20721E, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq PetalburgCity_Gym_EventScript_20516C + goto_if_eq PetalburgCity_Gym_EventScript_20516C compare VAR_RESULT, 0 - goto_eq PetalburgCity_Gym_EventScript_20517B + goto_if_eq PetalburgCity_Gym_EventScript_20517B end PetalburgCity_Gym_EventScript_20516C:: @ 820516C @@ -817,150 +815,149 @@ PetalburgCity_Gym_EventScript_20517D:: @ 820517D PetalburgCity_Gym_EventScript_205187:: @ 8205187 lockall compare VAR_0x4085, 6 - goto_if 0, PetalburgCity_Gym_EventScript_20517D + goto_if_lt PetalburgCity_Gym_EventScript_20517D setvar VAR_0x8008, 1 setvar VAR_0x8009, 98 msgbox PetalburgCity_Gym_Text_207280, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq PetalburgCity_Gym_EventScript_20516C + goto_if_eq PetalburgCity_Gym_EventScript_20516C compare VAR_RESULT, 0 - goto_eq PetalburgCity_Gym_EventScript_20517B + goto_if_eq PetalburgCity_Gym_EventScript_20517B end PetalburgCity_Gym_EventScript_2051BC:: @ 82051BC lockall checktrainerflag TRAINER_RANDALL - goto_if 0, PetalburgCity_Gym_EventScript_20517D + goto_if_lt PetalburgCity_Gym_EventScript_20517D setvar VAR_0x8008, 7 setvar VAR_0x8009, 46 msgbox PetalburgCity_Gym_Text_2072BB, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq PetalburgCity_Gym_EventScript_20516C + goto_if_eq PetalburgCity_Gym_EventScript_20516C compare VAR_RESULT, 0 - goto_eq PetalburgCity_Gym_EventScript_20517B + goto_if_eq PetalburgCity_Gym_EventScript_20517B end PetalburgCity_Gym_EventScript_2051EF:: @ 82051EF lockall checktrainerflag TRAINER_RANDALL - goto_if 0, PetalburgCity_Gym_EventScript_20517D + goto_if_lt PetalburgCity_Gym_EventScript_20517D setvar VAR_0x8008, 1 setvar VAR_0x8009, 59 msgbox PetalburgCity_Gym_Text_2072F7, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq PetalburgCity_Gym_EventScript_20516C + goto_if_eq PetalburgCity_Gym_EventScript_20516C compare VAR_RESULT, 0 - goto_eq PetalburgCity_Gym_EventScript_20517B + goto_if_eq PetalburgCity_Gym_EventScript_20517B end PetalburgCity_Gym_EventScript_205222:: @ 8205222 lockall checktrainerflag TRAINER_MARY - goto_if 0, PetalburgCity_Gym_EventScript_20517D + goto_if_lt PetalburgCity_Gym_EventScript_20517D setvar VAR_0x8008, 7 setvar VAR_0x8009, 59 msgbox PetalburgCity_Gym_Text_2072F7, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq PetalburgCity_Gym_EventScript_20516C + goto_if_eq PetalburgCity_Gym_EventScript_20516C compare VAR_RESULT, 0 - goto_eq PetalburgCity_Gym_EventScript_20517B + goto_if_eq PetalburgCity_Gym_EventScript_20517B end PetalburgCity_Gym_EventScript_205255:: @ 8205255 lockall checktrainerflag TRAINER_MARY - goto_if 0, PetalburgCity_Gym_EventScript_20517D + goto_if_lt PetalburgCity_Gym_EventScript_20517D setvar VAR_0x8008, 1 setvar VAR_0x8009, 72 msgbox PetalburgCity_Gym_Text_207331, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq PetalburgCity_Gym_EventScript_20516C + goto_if_eq PetalburgCity_Gym_EventScript_20516C compare VAR_RESULT, 0 - goto_eq PetalburgCity_Gym_EventScript_20517B + goto_if_eq PetalburgCity_Gym_EventScript_20517B end PetalburgCity_Gym_EventScript_205288:: @ 8205288 lockall checktrainerflag TRAINER_PARKER - goto_if 0, PetalburgCity_Gym_EventScript_20517D + goto_if_lt PetalburgCity_Gym_EventScript_20517D setvar VAR_0x8008, 1 setvar VAR_0x8009, 20 msgbox PetalburgCity_Gym_Text_20736C, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq PetalburgCity_Gym_EventScript_20516C + goto_if_eq PetalburgCity_Gym_EventScript_20516C compare VAR_RESULT, 0 - goto_eq PetalburgCity_Gym_EventScript_20517B + goto_if_eq PetalburgCity_Gym_EventScript_20517B end PetalburgCity_Gym_EventScript_2052BB:: @ 82052BB lockall checktrainerflag TRAINER_ALEXIA - goto_if 0, PetalburgCity_Gym_EventScript_20517D + goto_if_lt PetalburgCity_Gym_EventScript_20517D setvar VAR_0x8008, 7 setvar VAR_0x8009, 20 msgbox PetalburgCity_Gym_Text_20736C, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq PetalburgCity_Gym_EventScript_20516C + goto_if_eq PetalburgCity_Gym_EventScript_20516C compare VAR_RESULT, 0 - goto_eq PetalburgCity_Gym_EventScript_20517B + goto_if_eq PetalburgCity_Gym_EventScript_20517B end PetalburgCity_Gym_EventScript_2052EE:: @ 82052EE lockall checktrainerflag TRAINER_ALEXIA - goto_if 0, PetalburgCity_Gym_EventScript_20517D + goto_if_lt PetalburgCity_Gym_EventScript_20517D setvar VAR_0x8008, 1 setvar VAR_0x8009, 33 msgbox PetalburgCity_Gym_Text_2073A7, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq PetalburgCity_Gym_EventScript_20516C + goto_if_eq PetalburgCity_Gym_EventScript_20516C compare VAR_RESULT, 0 - goto_eq PetalburgCity_Gym_EventScript_20517B + goto_if_eq PetalburgCity_Gym_EventScript_20517B end PetalburgCity_Gym_EventScript_205321:: @ 8205321 lockall checktrainerflag TRAINER_GEORGE - goto_if 0, PetalburgCity_Gym_EventScript_20517D + goto_if_lt PetalburgCity_Gym_EventScript_20517D setvar VAR_0x8008, 7 setvar VAR_0x8009, 33 msgbox PetalburgCity_Gym_Text_2073A7, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq PetalburgCity_Gym_EventScript_20516C + goto_if_eq PetalburgCity_Gym_EventScript_20516C compare VAR_RESULT, 0 - goto_eq PetalburgCity_Gym_EventScript_20517B + goto_if_eq PetalburgCity_Gym_EventScript_20517B end PetalburgCity_Gym_EventScript_205354:: @ 8205354 lockall checktrainerflag TRAINER_JODY - goto_if 0, PetalburgCity_Gym_EventScript_20517D + goto_if_lt PetalburgCity_Gym_EventScript_20517D setvar VAR_0x8008, 1 setvar VAR_0x8009, 7 msgbox PetalburgCity_Gym_Text_2073E4, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq PetalburgCity_Gym_EventScript_20516C + goto_if_eq PetalburgCity_Gym_EventScript_20516C compare VAR_RESULT, 0 - goto_eq PetalburgCity_Gym_EventScript_20517B + goto_if_eq PetalburgCity_Gym_EventScript_20517B end PetalburgCity_Gym_EventScript_205387:: @ 8205387 lockall checktrainerflag TRAINER_BERKE - goto_if 0, PetalburgCity_Gym_EventScript_20517D + goto_if_lt PetalburgCity_Gym_EventScript_20517D setvar VAR_0x8008, 7 setvar VAR_0x8009, 7 msgbox PetalburgCity_Gym_Text_2073E4, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq PetalburgCity_Gym_EventScript_20516C + goto_if_eq PetalburgCity_Gym_EventScript_20516C compare VAR_RESULT, 0 - goto_eq PetalburgCity_Gym_EventScript_20517B + goto_if_eq PetalburgCity_Gym_EventScript_20517B end PetalburgCity_Gym_EventScript_2053BA:: @ 82053BA trainerbattle_single TRAINER_RANDALL, PetalburgCity_Gym_Text_20674F, PetalburgCity_Gym_Text_2067B9, PetalburgCity_Gym_EventScript_2053DE - checkflag FLAG_0x4F4 - goto_eq PetalburgCity_Gym_EventScript_2053ED + goto_if_set FLAG_0x4F4, PetalburgCity_Gym_EventScript_2053ED msgbox PetalburgCity_Gym_Text_2067D8, MSGBOX_AUTOCLOSE end @@ -977,8 +974,7 @@ PetalburgCity_Gym_EventScript_2053ED:: @ 82053ED PetalburgCity_Gym_EventScript_2053F6:: @ 82053F6 trainerbattle_single TRAINER_PARKER, PetalburgCity_Gym_Text_2068FD, PetalburgCity_Gym_Text_20694F, PetalburgCity_Gym_EventScript_20541A - checkflag FLAG_0x4F4 - goto_eq PetalburgCity_Gym_EventScript_205429 + goto_if_set FLAG_0x4F4, PetalburgCity_Gym_EventScript_205429 msgbox PetalburgCity_Gym_Text_206996, MSGBOX_AUTOCLOSE end @@ -995,8 +991,7 @@ PetalburgCity_Gym_EventScript_205429:: @ 8205429 PetalburgCity_Gym_EventScript_205432:: @ 8205432 trainerbattle_single TRAINER_GEORGE, PetalburgCity_Gym_Text_206A1B, PetalburgCity_Gym_Text_206AB8, PetalburgCity_Gym_EventScript_205456 - checkflag FLAG_0x4F4 - goto_eq PetalburgCity_Gym_EventScript_205465 + goto_if_set FLAG_0x4F4, PetalburgCity_Gym_EventScript_205465 msgbox PetalburgCity_Gym_Text_206AE9, MSGBOX_AUTOCLOSE end @@ -1013,8 +1008,7 @@ PetalburgCity_Gym_EventScript_205465:: @ 8205465 PetalburgCity_Gym_EventScript_20546E:: @ 820546E trainerbattle_single TRAINER_BERKE, PetalburgCity_Gym_Text_206BF4, PetalburgCity_Gym_Text_206C7D, PetalburgCity_Gym_EventScript_205492 - checkflag FLAG_0x4F4 - goto_eq PetalburgCity_Gym_EventScript_2054A1 + goto_if_set FLAG_0x4F4, PetalburgCity_Gym_EventScript_2054A1 msgbox PetalburgCity_Gym_Text_206C9F, MSGBOX_AUTOCLOSE end @@ -1031,8 +1025,7 @@ PetalburgCity_Gym_EventScript_2054A1:: @ 82054A1 PetalburgCity_Gym_EventScript_2054AA:: @ 82054AA trainerbattle_single TRAINER_MARY, PetalburgCity_Gym_Text_206DB2, PetalburgCity_Gym_Text_206E0D, PetalburgCity_Gym_EventScript_2054CE - checkflag FLAG_0x4F4 - goto_eq PetalburgCity_Gym_EventScript_2054DD + goto_if_set FLAG_0x4F4, PetalburgCity_Gym_EventScript_2054DD msgbox PetalburgCity_Gym_Text_206E26, MSGBOX_AUTOCLOSE end @@ -1049,8 +1042,7 @@ PetalburgCity_Gym_EventScript_2054DD:: @ 82054DD PetalburgCity_Gym_EventScript_2054E6:: @ 82054E6 trainerbattle_single TRAINER_ALEXIA, PetalburgCity_Gym_Text_206F44, PetalburgCity_Gym_Text_206F82, PetalburgCity_Gym_EventScript_20550A - checkflag FLAG_0x4F4 - goto_eq PetalburgCity_Gym_EventScript_205519 + goto_if_set FLAG_0x4F4, PetalburgCity_Gym_EventScript_205519 msgbox PetalburgCity_Gym_Text_206F9F, MSGBOX_AUTOCLOSE end @@ -1067,8 +1059,7 @@ PetalburgCity_Gym_EventScript_205519:: @ 8205519 PetalburgCity_Gym_EventScript_205522:: @ 8205522 trainerbattle_single TRAINER_JODY, PetalburgCity_Gym_Text_207088, PetalburgCity_Gym_Text_2070E6, PetalburgCity_Gym_EventScript_205546 - checkflag FLAG_0x4F4 - goto_eq PetalburgCity_Gym_EventScript_205555 + goto_if_set FLAG_0x4F4, PetalburgCity_Gym_EventScript_205555 msgbox PetalburgCity_Gym_Text_2070FB, MSGBOX_AUTOCLOSE end @@ -1215,8 +1206,7 @@ PetalburgCity_Gym_EventScript_20574B:: @ 820574B PetalburgCity_Gym_EventScript_20574F:: @ 820574F lock faceplayer - checkflag FLAG_0x4F4 - goto_eq PetalburgCity_Gym_EventScript_205764 + goto_if_set FLAG_0x4F4, PetalburgCity_Gym_EventScript_205764 msgbox PetalburgCity_Gym_Text_206542, MSGBOX_DEFAULT release end @@ -1228,15 +1218,13 @@ PetalburgCity_Gym_EventScript_205764:: @ 8205764 PetalburgCity_Gym_EventScript_20576E:: @ 820576E lockall - checkflag FLAG_BADGE05_GET - goto_eq PetalburgCity_Gym_EventScript_20578E + goto_if_set FLAG_BADGE05_GET, PetalburgCity_Gym_EventScript_20578E goto PetalburgCity_Gym_EventScript_205798 end PetalburgCity_Gym_EventScript_20577E:: @ 820577E lockall - checkflag FLAG_BADGE05_GET - goto_eq PetalburgCity_Gym_EventScript_20578E + goto_if_set FLAG_BADGE05_GET, PetalburgCity_Gym_EventScript_20578E goto PetalburgCity_Gym_EventScript_205798 end diff --git a/data/maps/PetalburgCity_Mart/scripts.inc b/data/maps/PetalburgCity_Mart/scripts.inc index f6d975615..4303f1504 100644 --- a/data/maps/PetalburgCity_Mart/scripts.inc +++ b/data/maps/PetalburgCity_Mart/scripts.inc @@ -6,8 +6,7 @@ PetalburgCity_Mart_EventScript_207D69:: @ 8207D69 faceplayer message gUnknown_08272A21 waitmessage - checkflag FLAG_0x128 - goto_eq PetalburgCity_Mart_EventScript_207DA6 + goto_if_set FLAG_0x128, PetalburgCity_Mart_EventScript_207DA6 pokemart PetalburgCity_Mart_Pokemart_207D8C msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc b/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc index eb0150c08..50d02fa68 100644 --- a/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc @@ -30,7 +30,7 @@ PetalburgCity_PokemonCenter_1F_EventScript_207A1C:: @ 8207A1C msgbox PetalburgCity_PokemonCenter_1F_Text_207B09, MSGBOX_DEFAULT specialvar VAR_RESULT, IsStarterInParty compare VAR_RESULT, 1 - goto_eq PetalburgCity_PokemonCenter_1F_EventScript_207A38 + goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_207A38 release end diff --git a/data/maps/PetalburgCity_WallysHouse/scripts.inc b/data/maps/PetalburgCity_WallysHouse/scripts.inc index 8ef530784..f2c568309 100644 --- a/data/maps/PetalburgCity_WallysHouse/scripts.inc +++ b/data/maps/PetalburgCity_WallysHouse/scripts.inc @@ -29,12 +29,9 @@ PetalburgCity_WallysHouse_EventScript_204251:: @ 8204251 PetalburgCity_WallysHouse_EventScript_204278:: @ 8204278 lock faceplayer - checkflag FLAG_0x07E - goto_eq PetalburgCity_WallysHouse_EventScript_2042AC - checkflag FLAG_0x07A - goto_eq PetalburgCity_WallysHouse_EventScript_2042A2 - checkflag FLAG_0x087 - goto_eq PetalburgCity_WallysHouse_EventScript_2042B6 + goto_if_set FLAG_0x07E, PetalburgCity_WallysHouse_EventScript_2042AC + goto_if_set FLAG_0x07A, PetalburgCity_WallysHouse_EventScript_2042A2 + goto_if_set FLAG_0x087, PetalburgCity_WallysHouse_EventScript_2042B6 msgbox PetalburgCity_WallysHouse_Text_2042DF, MSGBOX_DEFAULT setflag FLAG_0x087 release @@ -58,8 +55,7 @@ PetalburgCity_WallysHouse_EventScript_2042B6:: @ 82042B6 PetalburgCity_WallysHouse_EventScript_2042C0:: @ 82042C0 lock faceplayer - checkflag FLAG_0x07A - goto_eq PetalburgCity_WallysHouse_EventScript_2042D5 + goto_if_set FLAG_0x07A, PetalburgCity_WallysHouse_EventScript_2042D5 msgbox PetalburgCity_WallysHouse_Text_204732, MSGBOX_DEFAULT release end diff --git a/data/maps/PetalburgWoods/scripts.inc b/data/maps/PetalburgWoods/scripts.inc index 7dab2747b..57797588f 100644 --- a/data/maps/PetalburgWoods/scripts.inc +++ b/data/maps/PetalburgWoods/scripts.inc @@ -90,7 +90,7 @@ PetalburgWoods_EventScript_22E138:: @ 822E138 msgbox PetalburgWoods_Text_22E63D, MSGBOX_DEFAULT giveitem_std ITEM_GREAT_BALL compare VAR_RESULT, 0 - goto_eq PetalburgWoods_EventScript_22E17D + goto_if_eq PetalburgWoods_EventScript_22E17D goto PetalburgWoods_EventScript_22E18B end @@ -249,12 +249,11 @@ PetalburgWoods_EventScript_22E219:: @ 822E219 PetalburgWoods_EventScript_22E222:: @ 822E222 lock faceplayer - checkflag FLAG_0x129 - goto_eq PetalburgWoods_EventScript_22E251 + goto_if_set FLAG_0x129, PetalburgWoods_EventScript_22E251 msgbox PetalburgWoods_Text_22EAFE, MSGBOX_DEFAULT giveitem_std ITEM_MIRACLE_SEED compare VAR_RESULT, 0 - goto_eq PetalburgWoods_EventScript_272054 + goto_if_eq PetalburgWoods_EventScript_272054 setflag FLAG_0x129 release end @@ -281,11 +280,11 @@ PetalburgWoods_EventScript_22E284:: @ 822E284 trainerbattle_single TRAINER_JAMES_1, PetalburgWoods_Text_22E827, PetalburgWoods_Text_22E86B, PetalburgWoods_EventScript_22E2C5 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq PetalburgWoods_EventScript_22E31B + goto_if_eq PetalburgWoods_EventScript_22E31B setvar VAR_0x8004, 621 specialvar VAR_RESULT, sub_813B4E0 compare VAR_RESULT, 0 - goto_eq PetalburgWoods_EventScript_22E2EF + goto_if_eq PetalburgWoods_EventScript_22E2EF msgbox PetalburgWoods_Text_22E889, MSGBOX_DEFAULT release end @@ -293,8 +292,7 @@ PetalburgWoods_EventScript_22E284:: @ 822E284 PetalburgWoods_EventScript_22E2C5:: @ 822E2C5 special sub_80B4808 waitmovement 0 - checkflag FLAG_HAS_MATCH_CALL - goto_eq PetalburgWoods_EventScript_22E2D6 + goto_if_set FLAG_HAS_MATCH_CALL, PetalburgWoods_EventScript_22E2D6 release end @@ -305,8 +303,7 @@ PetalburgWoods_EventScript_22E2D6:: @ 822E2D6 end PetalburgWoods_EventScript_22E2EF:: @ 822E2EF - checkflag FLAG_HAS_MATCH_CALL - goto_eq PetalburgWoods_EventScript_22E302 + goto_if_set FLAG_HAS_MATCH_CALL, PetalburgWoods_EventScript_22E302 msgbox PetalburgWoods_Text_22E889, MSGBOX_DEFAULT release end diff --git a/data/maps/Route102/scripts.inc b/data/maps/Route102/scripts.inc index 0a2ba36ba..ada20447a 100644 --- a/data/maps/Route102/scripts.inc +++ b/data/maps/Route102/scripts.inc @@ -21,11 +21,11 @@ Route102_EventScript_1EC105:: @ 81EC105 trainerbattle_single TRAINER_CALVIN_1, Route102_Text_294513, Route102_Text_29457C, Route102_EventScript_1EC146 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route102_EventScript_1EC19C + goto_if_eq Route102_EventScript_1EC19C setvar VAR_0x8004, 318 specialvar VAR_RESULT, sub_813B4E0 compare VAR_RESULT, 0 - goto_eq Route102_EventScript_1EC170 + goto_if_eq Route102_EventScript_1EC170 msgbox Route102_Text_2945AC, MSGBOX_DEFAULT release end @@ -33,8 +33,7 @@ Route102_EventScript_1EC105:: @ 81EC105 Route102_EventScript_1EC146:: @ 81EC146 special sub_80B4808 waitmovement 0 - checkflag FLAG_HAS_MATCH_CALL - goto_eq Route102_EventScript_1EC157 + goto_if_set FLAG_HAS_MATCH_CALL, Route102_EventScript_1EC157 release end @@ -45,8 +44,7 @@ Route102_EventScript_1EC157:: @ 81EC157 end Route102_EventScript_1EC170:: @ 81EC170 - checkflag FLAG_HAS_MATCH_CALL - goto_eq Route102_EventScript_1EC183 + goto_if_set FLAG_HAS_MATCH_CALL, Route102_EventScript_1EC183 msgbox Route102_Text_2945AC, MSGBOX_DEFAULT release end diff --git a/data/maps/Route103/scripts.inc b/data/maps/Route103/scripts.inc index e2b60e800..bcc1b5a91 100644 --- a/data/maps/Route103/scripts.inc +++ b/data/maps/Route103/scripts.inc @@ -22,9 +22,9 @@ Route103_EventScript_1EC3C1:: @ 81EC3C1 lockall checkplayergender compare VAR_RESULT, 0 - goto_eq Route103_EventScript_1EC3DA + goto_if_eq Route103_EventScript_1EC3DA compare VAR_RESULT, 1 - goto_eq Route103_EventScript_1EC434 + goto_if_eq Route103_EventScript_1EC434 end Route103_EventScript_1EC3DA:: @ 81EC3DA @@ -211,7 +211,7 @@ Route103_EventScript_1EC60B:: @ 81EC60B trainerbattle_double TRAINER_AMY_AND_LIV_1, Route103_Text_2949F9, Route103_Text_294A3D, Route103_Text_294AAE, Route103_EventScript_1EC63A specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route103_EventScript_1EC653 + goto_if_eq Route103_EventScript_1EC653 msgbox Route103_Text_294A52, MSGBOX_AUTOCLOSE end @@ -230,7 +230,7 @@ Route103_EventScript_1EC66E:: @ 81EC66E trainerbattle_double TRAINER_AMY_AND_LIV_1, Route103_Text_294AFD, Route103_Text_294B22, Route103_Text_294BD0, Route103_EventScript_1EC69D specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route103_EventScript_1EC6B6 + goto_if_eq Route103_EventScript_1EC6B6 msgbox Route103_Text_294B40, MSGBOX_AUTOCLOSE end @@ -254,7 +254,7 @@ Route103_EventScript_1EC6E8:: @ 81EC6E8 trainerbattle_single TRAINER_MIGUEL_1, Route103_Text_294EDF, Route103_Text_294F21, Route103_EventScript_1EC714 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route103_EventScript_1EC733 + goto_if_eq Route103_EventScript_1EC733 msgbox Route103_Text_294F42, MSGBOX_DEFAULT release end diff --git a/data/maps/Route104/scripts.inc b/data/maps/Route104/scripts.inc index c6f019edb..c2862514e 100644 --- a/data/maps/Route104/scripts.inc +++ b/data/maps/Route104/scripts.inc @@ -19,10 +19,8 @@ Route104_MapScript1_1ECC4E: @ 81ECC4E end Route104_EventScript_1ECC5E:: @ 81ECC5E - checkflag FLAG_0x07F - goto_if 0, Route104_EventScript_1ECC74 - checkflag FLAG_BADGE03_GET - goto_if 0, Route104_EventScript_1ECC74 + goto_if_unset FLAG_0x07F, Route104_EventScript_1ECC74 + goto_if_unset FLAG_BADGE03_GET, Route104_EventScript_1ECC74 clearflag FLAG_HIDE_ROUTE_104_WHITE_HERB_FLORIST return @@ -32,11 +30,9 @@ Route104_EventScript_1ECC74:: @ 81ECC74 Route104_EventScript_1ECC78:: @ 81ECC78 compare VAR_0x408E, 1 - goto_if 4, Route104_EventScript_1ECC9D - checkflag FLAG_0x120 - goto_eq Route104_EventScript_1ECC9D - checkflag FLAG_0x07C - goto_if 0, Route104_EventScript_1ECC9D + goto_if_ge Route104_EventScript_1ECC9D + goto_if_set FLAG_0x120, Route104_EventScript_1ECC9D + goto_if_unset FLAG_0x07C, Route104_EventScript_1ECC9D setobjectxyperm 34, 17, 52 return @@ -77,9 +73,9 @@ Route104_EventScript_1ECCB3:: @ 81ECCB3 Route104_EventScript_1ECD11:: @ 81ECD11 checkplayergender compare VAR_RESULT, 0 - goto_eq Route104_EventScript_1ECD29 + goto_if_eq Route104_EventScript_1ECD29 compare VAR_RESULT, 1 - goto_eq Route104_EventScript_1ECD2E + goto_if_eq Route104_EventScript_1ECD2E return Route104_EventScript_1ECD29:: @ 81ECD29 @@ -93,16 +89,14 @@ Route104_EventScript_1ECD2E:: @ 81ECD2E Route104_EventScript_1ECD33:: @ 81ECD33 checkplayergender compare VAR_RESULT, 0 - goto_eq Route104_EventScript_1ECD4B + goto_if_eq Route104_EventScript_1ECD4B compare VAR_RESULT, 1 - goto_eq Route104_EventScript_1ECE6F + goto_if_eq Route104_EventScript_1ECE6F end Route104_EventScript_1ECD4B:: @ 81ECD4B - checkflag FLAG_0x07D - goto_eq Route104_EventScript_1ECE1C - checkflag FLAG_0x07C - goto_eq Route104_EventScript_1ECDD0 + goto_if_set FLAG_0x07D, Route104_EventScript_1ECE1C + goto_if_set FLAG_0x07C, Route104_EventScript_1ECDD0 setflag FLAG_0x07C msgbox Route104_Text_1EDBFF, MSGBOX_DEFAULT closemessage @@ -123,7 +117,7 @@ Route104_EventScript_1ECD4B:: @ 81ECD4B moveobjectoffscreen 34 msgbox Route104_Text_1EDCED, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq Route104_EventScript_1ECDED + goto_if_eq Route104_EventScript_1ECDED msgbox Route104_Text_1EDD2A, MSGBOX_DEFAULT call Route104_EventScript_1ECE31 releaseall @@ -146,7 +140,7 @@ Route104_Movement_1ECDCD: @ 81ECDCD Route104_EventScript_1ECDD0:: @ 81ECDD0 msgbox Route104_Text_1EDD9F, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq Route104_EventScript_1ECDED + goto_if_eq Route104_EventScript_1ECDED msgbox Route104_Text_1EDD2A, MSGBOX_DEFAULT releaseall end @@ -190,10 +184,8 @@ Route104_EventScript_1ECE5C:: @ 81ECE5C end Route104_EventScript_1ECE6F:: @ 81ECE6F - checkflag FLAG_0x07D - goto_eq Route104_EventScript_1ECF38 - checkflag FLAG_0x07C - goto_eq Route104_EventScript_1ECEEC + goto_if_set FLAG_0x07D, Route104_EventScript_1ECF38 + goto_if_set FLAG_0x07C, Route104_EventScript_1ECEEC setflag FLAG_0x07C msgbox Route104_Text_1EDF04, MSGBOX_DEFAULT closemessage @@ -214,7 +206,7 @@ Route104_EventScript_1ECE6F:: @ 81ECE6F moveobjectoffscreen 34 msgbox Route104_Text_1EE009, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq Route104_EventScript_1ECF09 + goto_if_eq Route104_EventScript_1ECF09 msgbox Route104_Text_1EE04D, MSGBOX_DEFAULT call Route104_EventScript_1ECE31 releaseall @@ -223,7 +215,7 @@ Route104_EventScript_1ECE6F:: @ 81ECE6F Route104_EventScript_1ECEEC:: @ 81ECEEC msgbox Route104_Text_1EE094, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq Route104_EventScript_1ECF09 + goto_if_eq Route104_EventScript_1ECF09 msgbox Route104_Text_1EE04D, MSGBOX_DEFAULT releaseall end @@ -274,12 +266,11 @@ Route104_Movement_1ECF8A: @ 81ECF8A Route104_EventScript_1ECF8C:: @ 81ECF8C lock faceplayer - checkflag FLAG_0x0F6 - goto_eq Route104_EventScript_1ECFC3 + goto_if_set FLAG_0x0F6, Route104_EventScript_1ECFC3 msgbox Route104_Text_2A6D86, MSGBOX_DEFAULT giveitem_std ITEM_CHESTO_BERRY compare VAR_RESULT, 0 - goto_eq Route104_EventScript_272054 + goto_if_eq Route104_EventScript_272054 setflag FLAG_0x0F6 msgbox Route104_Text_2A6E32, MSGBOX_DEFAULT release @@ -293,12 +284,11 @@ Route104_EventScript_1ECFC3:: @ 81ECFC3 Route104_EventScript_1ECFCD:: @ 81ECFCD lock faceplayer - checkflag FLAG_0x117 - goto_eq Route104_EventScript_1ECFFC + goto_if_set FLAG_0x117, Route104_EventScript_1ECFFC msgbox Route104_Text_1ED96A, MSGBOX_DEFAULT giveitem_std ITEM_WHITE_HERB compare VAR_RESULT, 0 - goto_eq Route104_EventScript_272054 + goto_if_eq Route104_EventScript_272054 setflag FLAG_0x117 release end @@ -347,12 +337,11 @@ Route104_EventScript_1ED04E:: @ 81ED04E Route104_EventScript_1ED057:: @ 81ED057 lock faceplayer - checkflag FLAG_0x106 - goto_eq Route104_EventScript_1ED086 + goto_if_set FLAG_0x106, Route104_EventScript_1ED086 msgbox Route104_Text_1ED838, MSGBOX_DEFAULT giveitem_std ITEM_TM09 compare VAR_RESULT, 0 - goto_eq Route104_EventScript_272054 + goto_if_eq Route104_EventScript_272054 setflag FLAG_0x106 release end @@ -376,10 +365,8 @@ Route104_EventScript_1ED099:: @ 81ED099 waitmovement 0 hideobjectat 255, MAP_ROUTE104 call Route104_EventScript_2720A0 - checkflag FLAG_0x132 - goto_eq Route104_EventScript_1ED0D9 - checkflag FLAG_0x132 - goto_if 0, Route104_EventScript_1ED0EF + goto_if_set FLAG_0x132, Route104_EventScript_1ED0D9 + goto_if_unset FLAG_0x132, Route104_EventScript_1ED0EF end Route104_EventScript_1ED0D9:: @ 81ED0D9 @@ -431,10 +418,8 @@ Route104_EventScript_1ED139:: @ 81ED139 resetobjectpriority 2, MAP_DEWFORD_TOWN moveobjectoffscreen 2 setvar VAR_0x408E, 0 - checkflag FLAG_0x0BD - goto_if 0, Route104_EventScript_1ED1B4 - checkflag FLAG_0x0BD - goto_eq Route104_EventScript_1ED1BE + goto_if_unset FLAG_0x0BD, Route104_EventScript_1ED1B4 + goto_if_set FLAG_0x0BD, Route104_EventScript_1ED1BE end Route104_EventScript_1ED1B4:: @ 81ED1B4 @@ -884,11 +869,11 @@ Route104_EventScript_1ED38D:: @ 81ED38D trainerbattle_single TRAINER_HALEY_1, Route104_Text_29563A, Route104_Text_29566F, Route104_EventScript_1ED3CE specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route104_EventScript_1ED424 + goto_if_eq Route104_EventScript_1ED424 setvar VAR_0x8004, 604 specialvar VAR_RESULT, sub_813B4E0 compare VAR_RESULT, 0 - goto_eq Route104_EventScript_1ED3F8 + goto_if_eq Route104_EventScript_1ED3F8 msgbox Route104_Text_295689, MSGBOX_DEFAULT release end @@ -896,8 +881,7 @@ Route104_EventScript_1ED38D:: @ 81ED38D Route104_EventScript_1ED3CE:: @ 81ED3CE special sub_80B4808 waitmovement 0 - checkflag FLAG_HAS_MATCH_CALL - goto_eq Route104_EventScript_1ED3DF + goto_if_set FLAG_HAS_MATCH_CALL, Route104_EventScript_1ED3DF release end @@ -908,8 +892,7 @@ Route104_EventScript_1ED3DF:: @ 81ED3DF end Route104_EventScript_1ED3F8:: @ 81ED3F8 - checkflag FLAG_HAS_MATCH_CALL - goto_eq Route104_EventScript_1ED40B + goto_if_set FLAG_HAS_MATCH_CALL, Route104_EventScript_1ED40B msgbox Route104_Text_295689, MSGBOX_DEFAULT release end @@ -929,11 +912,11 @@ Route104_EventScript_1ED43B:: @ 81ED43B trainerbattle_single TRAINER_WINSTON_1, Route104_Text_295870, Route104_Text_2958AD, Route104_EventScript_1ED47C specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route104_EventScript_1ED4D2 + goto_if_eq Route104_EventScript_1ED4D2 setvar VAR_0x8004, 136 specialvar VAR_RESULT, sub_813B4E0 compare VAR_RESULT, 0 - goto_eq Route104_EventScript_1ED4A6 + goto_if_eq Route104_EventScript_1ED4A6 msgbox Route104_Text_2958C1, MSGBOX_DEFAULT release end @@ -941,8 +924,7 @@ Route104_EventScript_1ED43B:: @ 81ED43B Route104_EventScript_1ED47C:: @ 81ED47C special sub_80B4808 waitmovement 0 - checkflag FLAG_HAS_MATCH_CALL - goto_eq Route104_EventScript_1ED48D + goto_if_set FLAG_HAS_MATCH_CALL, Route104_EventScript_1ED48D release end @@ -953,8 +935,7 @@ Route104_EventScript_1ED48D:: @ 81ED48D end Route104_EventScript_1ED4A6:: @ 81ED4A6 - checkflag FLAG_HAS_MATCH_CALL - goto_eq Route104_EventScript_1ED4B9 + goto_if_set FLAG_HAS_MATCH_CALL, Route104_EventScript_1ED4B9 msgbox Route104_Text_2958C1, MSGBOX_DEFAULT release end @@ -974,11 +955,11 @@ Route104_EventScript_1ED4E9:: @ 81ED4E9 trainerbattle_single TRAINER_CINDY_1, Route104_Text_295A7E, Route104_Text_295ABB, Route104_EventScript_1ED52A specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route104_EventScript_1ED580 + goto_if_eq Route104_EventScript_1ED580 setvar VAR_0x8004, 114 specialvar VAR_RESULT, sub_813B4E0 compare VAR_RESULT, 0 - goto_eq Route104_EventScript_1ED554 + goto_if_eq Route104_EventScript_1ED554 msgbox Route104_Text_295AC3, MSGBOX_DEFAULT release end @@ -986,8 +967,7 @@ Route104_EventScript_1ED4E9:: @ 81ED4E9 Route104_EventScript_1ED52A:: @ 81ED52A special sub_80B4808 waitmovement 0 - checkflag FLAG_HAS_MATCH_CALL - goto_eq Route104_EventScript_1ED53B + goto_if_set FLAG_HAS_MATCH_CALL, Route104_EventScript_1ED53B release end @@ -998,8 +978,7 @@ Route104_EventScript_1ED53B:: @ 81ED53B end Route104_EventScript_1ED554:: @ 81ED554 - checkflag FLAG_HAS_MATCH_CALL - goto_eq Route104_EventScript_1ED567 + goto_if_set FLAG_HAS_MATCH_CALL, Route104_EventScript_1ED567 msgbox Route104_Text_295AC3, MSGBOX_DEFAULT release end diff --git a/data/maps/Route104_MrBrineysHouse/scripts.inc b/data/maps/Route104_MrBrineysHouse/scripts.inc index e8fc402c5..179925624 100644 --- a/data/maps/Route104_MrBrineysHouse/scripts.inc +++ b/data/maps/Route104_MrBrineysHouse/scripts.inc @@ -26,10 +26,8 @@ Route104_MrBrineysHouse_EventScript_229D67:: @ 8229D67 faceplayer checkflag FLAG_0x093 call_if 0, Route104_MrBrineysHouse_EventScript_229D8A - checkflag FLAG_0x0BD - goto_if 0, Route104_MrBrineysHouse_EventScript_229DE1 - checkflag FLAG_0x095 - goto_if 0, Route104_MrBrineysHouse_EventScript_229DFA + goto_if_unset FLAG_0x0BD, Route104_MrBrineysHouse_EventScript_229DE1 + goto_if_unset FLAG_0x095, Route104_MrBrineysHouse_EventScript_229DFA goto Route104_MrBrineysHouse_EventScript_229DAE end @@ -38,7 +36,7 @@ Route104_MrBrineysHouse_EventScript_229D8A:: @ 8229D8A msgbox Route104_MrBrineysHouse_Text_229E70, MSGBOX_DEFAULT msgbox Route104_MrBrineysHouse_Text_229E9B, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq Route104_MrBrineysHouse_EventScript_229E13 + goto_if_eq Route104_MrBrineysHouse_EventScript_229E13 goto Route104_MrBrineysHouse_EventScript_229E27 end @@ -55,14 +53,14 @@ Route104_MrBrineysHouse_EventScript_229DAE:: @ 8229DAE Route104_MrBrineysHouse_EventScript_229DE1:: @ 8229DE1 msgbox Route104_MrBrineysHouse_Text_22A0AD, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq Route104_MrBrineysHouse_EventScript_229E13 + goto_if_eq Route104_MrBrineysHouse_EventScript_229E13 goto Route104_MrBrineysHouse_EventScript_229E27 end Route104_MrBrineysHouse_EventScript_229DFA:: @ 8229DFA msgbox Route104_MrBrineysHouse_Text_22A18F, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq Route104_MrBrineysHouse_EventScript_229E13 + goto_if_eq Route104_MrBrineysHouse_EventScript_229E13 goto Route104_MrBrineysHouse_EventScript_229E27 end diff --git a/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc b/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc index 08b5b7389..9a079d6d7 100644 --- a/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc +++ b/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc @@ -4,10 +4,8 @@ Route104_PrettyPetalFlowerShop_MapScripts:: @ 822A34C Route104_PrettyPetalFlowerShop_MapScript1_22A352: @ 822A352 setflag FLAG_LANDMARK_FLOWER_SHOP - checkflag FLAG_0x07F - goto_if 0, Route104_PrettyPetalFlowerShop_EventScript_22A36B - checkflag FLAG_BADGE03_GET - goto_if 0, Route104_PrettyPetalFlowerShop_EventScript_22A36B + goto_if_unset FLAG_0x07F, Route104_PrettyPetalFlowerShop_EventScript_22A36B + goto_if_unset FLAG_BADGE03_GET, Route104_PrettyPetalFlowerShop_EventScript_22A36B setflag FLAG_TEMP_1 end @@ -18,11 +16,9 @@ Route104_PrettyPetalFlowerShop_EventScript_22A36B:: @ 822A36B Route104_PrettyPetalFlowerShop_EventScript_22A373:: @ 822A373 lock faceplayer - checkflag FLAG_TEMP_1 - goto_eq Route104_PrettyPetalFlowerShop_EventScript_22A3E4 + goto_if_set FLAG_TEMP_1, Route104_PrettyPetalFlowerShop_EventScript_22A3E4 msgbox Route104_PrettyPetalFlowerShop_Text_2A7686, MSGBOX_DEFAULT - checkflag FLAG_0x07F - goto_eq Route104_PrettyPetalFlowerShop_EventScript_22A3B2 + goto_if_set FLAG_0x07F, Route104_PrettyPetalFlowerShop_EventScript_22A3B2 setflag FLAG_0x07F msgbox Route104_PrettyPetalFlowerShop_Text_2A7706, MSGBOX_YESNO compare VAR_RESULT, 1 @@ -72,8 +68,7 @@ Route104_PrettyPetalFlowerShop_Pokemart_22A3FC: @ 822A3FC Route104_PrettyPetalFlowerShop_EventScript_22A40C:: @ 822A40C lock faceplayer - checkflag FLAG_0x05E - goto_if 0, Route104_PrettyPetalFlowerShop_EventScript_22A421 + goto_if_unset FLAG_0x05E, Route104_PrettyPetalFlowerShop_EventScript_22A421 msgbox Route104_PrettyPetalFlowerShop_Text_2A79A6, MSGBOX_DEFAULT release end @@ -90,14 +85,13 @@ Route104_PrettyPetalFlowerShop_EventScript_22A442:: @ 822A442 lock faceplayer dodailyevents - checkflag FLAG_0x930 - goto_eq Route104_PrettyPetalFlowerShop_EventScript_22A482 + goto_if_set FLAG_0x930, Route104_PrettyPetalFlowerShop_EventScript_22A482 msgbox Route104_PrettyPetalFlowerShop_Text_2A7A98, MSGBOX_DEFAULT random 8 addvar VAR_RESULT, 133 giveitem_std VAR_RESULT compare VAR_RESULT, 0 - goto_eq Route104_PrettyPetalFlowerShop_EventScript_272054 + goto_if_eq Route104_PrettyPetalFlowerShop_EventScript_272054 setflag FLAG_0x930 msgbox Route104_PrettyPetalFlowerShop_Text_2A7AF3, MSGBOX_DEFAULT release diff --git a/data/maps/Route105/scripts.inc b/data/maps/Route105/scripts.inc index 617e84350..3fcc64880 100644 --- a/data/maps/Route105/scripts.inc +++ b/data/maps/Route105/scripts.inc @@ -65,7 +65,7 @@ Route105_EventScript_1EE2D4:: @ 81EE2D4 trainerbattle_single TRAINER_ANDRES_1, Route105_Text_2960A9, Route105_Text_2960DB, Route105_EventScript_1EE300 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route105_EventScript_1EE31F + goto_if_eq Route105_EventScript_1EE31F msgbox Route105_Text_2960FA, MSGBOX_DEFAULT release end diff --git a/data/maps/Route106/scripts.inc b/data/maps/Route106/scripts.inc index 533f65254..f27ce9647 100644 --- a/data/maps/Route106/scripts.inc +++ b/data/maps/Route106/scripts.inc @@ -19,7 +19,7 @@ Route106_EventScript_1EE4C1:: @ 81EE4C1 trainerbattle_single TRAINER_ELLIOT_1, Route106_Text_296327, Route106_Text_29635C, Route106_EventScript_1EE4ED specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route106_EventScript_1EE50C + goto_if_eq Route106_EventScript_1EE50C msgbox Route106_Text_29638C, MSGBOX_DEFAULT release end diff --git a/data/maps/Route107/scripts.inc b/data/maps/Route107/scripts.inc index 5f840b3fb..90f67a639 100644 --- a/data/maps/Route107/scripts.inc +++ b/data/maps/Route107/scripts.inc @@ -10,7 +10,7 @@ Route107_EventScript_1EE5AC:: @ 81EE5AC trainerbattle_single TRAINER_TONY_1, Route107_Text_2967AD, Route107_Text_2967D8, Route107_EventScript_1EE5D8 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route107_EventScript_1EE5F7 + goto_if_eq Route107_EventScript_1EE5F7 msgbox Route107_Text_2967FF, MSGBOX_DEFAULT release end diff --git a/data/maps/Route108/scripts.inc b/data/maps/Route108/scripts.inc index 73ddb031d..15a657a20 100644 --- a/data/maps/Route108/scripts.inc +++ b/data/maps/Route108/scripts.inc @@ -30,7 +30,7 @@ Route108_EventScript_1EE6FD:: @ 81EE6FD trainerbattle_single TRAINER_CORY_1, Route108_Text_296F5D, Route108_Text_296F93, Route108_EventScript_1EE729 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route108_EventScript_1EE748 + goto_if_eq Route108_EventScript_1EE748 msgbox Route108_Text_296FB0, MSGBOX_DEFAULT release end diff --git a/data/maps/Route109/scripts.inc b/data/maps/Route109/scripts.inc index 51430fd91..fd6234387 100644 --- a/data/maps/Route109/scripts.inc +++ b/data/maps/Route109/scripts.inc @@ -272,8 +272,7 @@ Route109_Movement_1EE90D: @ 81EE90D Route109_EventScript_1EE910:: @ 81EE910 lock faceplayer - checkflag FLAG_0x095 - goto_if 0, Route109_EventScript_1EE921 + goto_if_unset FLAG_0x095, Route109_EventScript_1EE921 goto Route109_EventScript_1EE93F end @@ -281,7 +280,7 @@ Route109_EventScript_1EE921:: @ 81EE921 message Route109_Text_1EEC96 msgbox Route109_Text_1EEC96, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq Route109_EventScript_1EE981 + goto_if_eq Route109_EventScript_1EE981 goto Route109_EventScript_1EE972 end @@ -329,12 +328,11 @@ Route109_EventScript_1EE9B5:: @ 81EE9B5 lock faceplayer special GetPlayerBigGuyGirlString - checkflag FLAG_0x118 - goto_eq Route109_EventScript_1EE9F2 + goto_if_set FLAG_0x118, Route109_EventScript_1EE9F2 msgbox Route109_Text_1EEFDE, MSGBOX_DEFAULT giveitem_std ITEM_SOFT_SAND compare VAR_RESULT, 0 - goto_eq Route109_EventScript_272054 + goto_if_eq Route109_EventScript_272054 closemessage applymovement VAR_LAST_TALKED, Route109_Movement_2725A2 waitmovement 0 @@ -399,7 +397,7 @@ Route109_EventScript_1EEA99:: @ 81EEA99 trainerbattle_single TRAINER_RICKY_1, Route109_Text_29733B, Route109_Text_297379, Route109_EventScript_1EEAC5 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route109_EventScript_1EEAE4 + goto_if_eq Route109_EventScript_1EEAE4 msgbox Route109_Text_297380, MSGBOX_DEFAULT release end @@ -421,7 +419,7 @@ Route109_EventScript_1EEAFB:: @ 81EEAFB trainerbattle_single TRAINER_LOLA_1, Route109_Text_29749C, Route109_Text_2974CF, Route109_EventScript_1EEB27 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route109_EventScript_1EEB46 + goto_if_eq Route109_EventScript_1EEB46 msgbox Route109_Text_2974D6, MSGBOX_DEFAULT release end diff --git a/data/maps/Route109_SeashoreHouse/scripts.inc b/data/maps/Route109_SeashoreHouse/scripts.inc index fd0b224bc..3056159cd 100644 --- a/data/maps/Route109_SeashoreHouse/scripts.inc +++ b/data/maps/Route109_SeashoreHouse/scripts.inc @@ -9,12 +9,9 @@ Route109_SeashoreHouse_MapScript1_2693FA: @ 82693FA Route109_SeashoreHouse_EventScript_2693FE:: @ 82693FE lock faceplayer - checkflag FLAG_0x08C - goto_eq Route109_SeashoreHouse_EventScript_269460 - checkflag FLAG_0x08D - goto_eq Route109_SeashoreHouse_EventScript_269432 - checkflag FLAG_TEMP_2 - goto_eq Route109_SeashoreHouse_EventScript_269428 + goto_if_set FLAG_0x08C, Route109_SeashoreHouse_EventScript_269460 + goto_if_set FLAG_0x08D, Route109_SeashoreHouse_EventScript_269432 + goto_if_set FLAG_TEMP_2, Route109_SeashoreHouse_EventScript_269428 msgbox Route109_SeashoreHouse_Text_269555, MSGBOX_DEFAULT setflag FLAG_TEMP_2 release @@ -29,7 +26,7 @@ Route109_SeashoreHouse_EventScript_269432:: @ 8269432 msgbox Route109_SeashoreHouse_Text_269685, MSGBOX_DEFAULT giveitem_std ITEM_SODA_POP, 6 compare VAR_RESULT, 0 - goto_eq Route109_SeashoreHouse_EventScript_269456 + goto_if_eq Route109_SeashoreHouse_EventScript_269456 setflag FLAG_0x08C release end @@ -43,7 +40,7 @@ Route109_SeashoreHouse_EventScript_269460:: @ 8269460 showmoneybox 0, 0, 0 msgbox Route109_SeashoreHouse_Text_26977E, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq Route109_SeashoreHouse_EventScript_269484 + goto_if_eq Route109_SeashoreHouse_EventScript_269484 msgbox Route109_SeashoreHouse_Text_2697EF, MSGBOX_DEFAULT hidemoneybox nop @@ -54,10 +51,10 @@ Route109_SeashoreHouse_EventScript_269460:: @ 8269460 Route109_SeashoreHouse_EventScript_269484:: @ 8269484 checkmoney 0x12c, 0 compare VAR_RESULT, 0 - goto_eq Route109_SeashoreHouse_EventScript_2694C8 + goto_if_eq Route109_SeashoreHouse_EventScript_2694C8 checkitemspace ITEM_SODA_POP, 1 compare VAR_RESULT, 0 - goto_eq Route109_SeashoreHouse_EventScript_2694D5 + goto_if_eq Route109_SeashoreHouse_EventScript_2694D5 msgbox Route109_SeashoreHouse_Text_2697C8, MSGBOX_DEFAULT takemoney 0x12c, 0 updatemoneybox 0, 0 @@ -102,11 +99,11 @@ Route109_SeashoreHouse_EventScript_269518:: @ 8269518 Route109_SeashoreHouse_EventScript_269533:: @ 8269533 checktrainerflag TRAINER_DWAYNE - goto_if 0, Route109_SeashoreHouse_EventScript_269553 + goto_if_lt Route109_SeashoreHouse_EventScript_269553 checktrainerflag TRAINER_JOHANNA - goto_if 0, Route109_SeashoreHouse_EventScript_269553 + goto_if_lt Route109_SeashoreHouse_EventScript_269553 checktrainerflag TRAINER_SIMON - goto_if 0, Route109_SeashoreHouse_EventScript_269553 + goto_if_lt Route109_SeashoreHouse_EventScript_269553 setflag FLAG_0x08D release end diff --git a/data/maps/Route110/scripts.inc b/data/maps/Route110/scripts.inc index c5d53b5b4..16618c9ff 100644 --- a/data/maps/Route110/scripts.inc +++ b/data/maps/Route110/scripts.inc @@ -132,7 +132,7 @@ Route110_EventScript_1EF392:: @ 81EF392 lockall specialvar VAR_RESULT, GetRecordedCyclingRoadResults compare VAR_RESULT, 0 - goto_eq Route110_EventScript_1EF3AD + goto_if_eq Route110_EventScript_1EF3AD msgbox Route110_Text_1F0A1E, MSGBOX_DEFAULT releaseall end @@ -147,9 +147,9 @@ Route110_EventScript_1EF3B7:: @ 81EF3B7 faceplayer specialvar VAR_RESULT, GetPlayerAvatarBike compare VAR_RESULT, 1 - goto_eq Route110_EventScript_1EF3E8 + goto_if_eq Route110_EventScript_1EF3E8 compare VAR_CYCLING_CHALLENGE_STATE, 0 - goto_eq Route110_EventScript_1EF3DE + goto_if_eq Route110_EventScript_1EF3DE msgbox Route110_Text_1F06FB, MSGBOX_DEFAULT release end @@ -178,7 +178,7 @@ Route110_EventScript_1EF420:: @ 81EF420 trainerbattle_single TRAINER_EDWIN_1, Route110_Text_29815E, Route110_Text_29818F, Route110_EventScript_1EF44C specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route110_EventScript_1EF46B + goto_if_eq Route110_EventScript_1EF46B msgbox Route110_Text_2981B3, MSGBOX_DEFAULT release end @@ -215,7 +215,7 @@ Route110_EventScript_1EF4C7:: @ 81EF4C7 trainerbattle_single TRAINER_BENJAMIN_1, Route110_Text_297C63, Route110_Text_297C8A, Route110_EventScript_1EF4F3 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route110_EventScript_1EF512 + goto_if_eq Route110_EventScript_1EF512 msgbox Route110_Text_297CB4, MSGBOX_DEFAULT release end @@ -242,7 +242,7 @@ Route110_EventScript_1EF540:: @ 81EF540 trainerbattle_single TRAINER_ABIGAIL_1, Route110_Text_297DFA, Route110_Text_297E69, Route110_EventScript_1EF56C specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route110_EventScript_1EF58B + goto_if_eq Route110_EventScript_1EF58B msgbox Route110_Text_297E88, MSGBOX_DEFAULT release end @@ -264,7 +264,7 @@ Route110_EventScript_1EF5A2:: @ 81EF5A2 trainerbattle_single TRAINER_ISABEL_1, Route110_Text_298349, Route110_Text_298389, Route110_EventScript_1EF5CE specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route110_EventScript_1EF5ED + goto_if_eq Route110_EventScript_1EF5ED msgbox Route110_Text_2983A2, MSGBOX_DEFAULT release end @@ -398,9 +398,9 @@ Route110_EventScript_1EF76E:: @ 81EF76E call_if 1, Route110_EventScript_1EF964 checkplayergender compare VAR_RESULT, 0 - goto_eq Route110_EventScript_1EF7EB + goto_if_eq Route110_EventScript_1EF7EB compare VAR_RESULT, 1 - goto_eq Route110_EventScript_1EF865 + goto_if_eq Route110_EventScript_1EF865 releaseall end diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc index a1c3383a4..687fff9a7 100644 --- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc +++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc @@ -12,7 +12,7 @@ Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA84:: @ 826EA84 lockall specialvar VAR_RESULT, GetPlayerAvatarBike compare VAR_RESULT, 0 - goto_eq Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA9F + goto_if_eq Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA9F setflag FLAG_SYS_CYCLING_ROAD setvar VAR_TEMP_1, 1 releaseall diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc index 4e78df507..2112300a0 100644 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc @@ -26,7 +26,7 @@ Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBD0:: @ 826EBD0 compare VAR_RESULT, 2 call_if 1, Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBF6 compare VAR_RESULT, 0 - goto_eq Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBFC + goto_if_eq Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBFC setflag FLAG_SYS_CYCLING_ROAD setvar VAR_TEMP_1, 1 releaseall diff --git a/data/maps/Route110_TrickHouseEntrance/scripts.inc b/data/maps/Route110_TrickHouseEntrance/scripts.inc index c4f30dedb..ca9ab75e7 100644 --- a/data/maps/Route110_TrickHouseEntrance/scripts.inc +++ b/data/maps/Route110_TrickHouseEntrance/scripts.inc @@ -7,11 +7,11 @@ Route110_TrickHouseEntrance_MapScripts:: @ 8269A50 Route110_TrickHouseEntrance_MapScript1_269A60: @ 8269A60 setflag FLAG_LANDMARK_TRICK_HOUSE compare VAR_0x40B5, 1 - goto_eq Route110_TrickHouseEntrance_EventScript_269AF3 + goto_if_eq Route110_TrickHouseEntrance_EventScript_269AF3 compare VAR_0x40C1, 1 - goto_eq Route110_TrickHouseEntrance_EventScript_269AD7 + goto_if_eq Route110_TrickHouseEntrance_EventScript_269AD7 compare VAR_0x40A6, 1 - goto_eq Route110_TrickHouseEntrance_EventScript_269BB3 + goto_if_eq Route110_TrickHouseEntrance_EventScript_269BB3 compare VAR_0x40A7, 5 call_if 1, Route110_TrickHouseEntrance_EventScript_269B03 compare VAR_0x40A7, 3 @@ -28,7 +28,7 @@ Route110_TrickHouseEntrance_MapScript1_269A60: @ 8269A60 Route110_TrickHouseEntrance_EventScript_269AD7:: @ 8269AD7 setvar VAR_0x40A5, 1 compare VAR_0x4044, 8 - goto_eq Route110_TrickHouseEntrance_EventScript_269AED + goto_if_eq Route110_TrickHouseEntrance_EventScript_269AED setvar VAR_0x40A7, 2 end @@ -351,25 +351,25 @@ Route110_TrickHouseEntrance_EventScript_269E8F:: @ 8269E8F waitmovement 0 msgbox Route110_TrickHouseEntrance_Text_26AA82, MSGBOX_DEFAULT compare VAR_0x4044, 1 - goto_eq Route110_TrickHouseEntrance_EventScript_269EEF + goto_if_eq Route110_TrickHouseEntrance_EventScript_269EEF compare VAR_0x4044, 2 - goto_eq Route110_TrickHouseEntrance_EventScript_269F1B + goto_if_eq Route110_TrickHouseEntrance_EventScript_269F1B compare VAR_0x4044, 3 - goto_eq Route110_TrickHouseEntrance_EventScript_269F47 + goto_if_eq Route110_TrickHouseEntrance_EventScript_269F47 compare VAR_0x4044, 4 - goto_eq Route110_TrickHouseEntrance_EventScript_269F73 + goto_if_eq Route110_TrickHouseEntrance_EventScript_269F73 compare VAR_0x4044, 5 - goto_eq Route110_TrickHouseEntrance_EventScript_269F9F + goto_if_eq Route110_TrickHouseEntrance_EventScript_269F9F compare VAR_0x4044, 6 - goto_eq Route110_TrickHouseEntrance_EventScript_269FCB + goto_if_eq Route110_TrickHouseEntrance_EventScript_269FCB compare VAR_0x4044, 7 - goto_eq Route110_TrickHouseEntrance_EventScript_269FF7 + goto_if_eq Route110_TrickHouseEntrance_EventScript_269FF7 end Route110_TrickHouseEntrance_EventScript_269EEF:: @ 8269EEF giveitem_std ITEM_RARE_CANDY compare VAR_RESULT, 1 - goto_eq Route110_TrickHouseEntrance_EventScript_26A023 + goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023 compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_27205E msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT @@ -379,7 +379,7 @@ Route110_TrickHouseEntrance_EventScript_269EEF:: @ 8269EEF Route110_TrickHouseEntrance_EventScript_269F1B:: @ 8269F1B giveitem_std ITEM_TIMER_BALL compare VAR_RESULT, 1 - goto_eq Route110_TrickHouseEntrance_EventScript_26A023 + goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023 compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_27205E msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT @@ -389,7 +389,7 @@ Route110_TrickHouseEntrance_EventScript_269F1B:: @ 8269F1B Route110_TrickHouseEntrance_EventScript_269F47:: @ 8269F47 giveitem_std ITEM_HARD_STONE compare VAR_RESULT, 1 - goto_eq Route110_TrickHouseEntrance_EventScript_26A023 + goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023 compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_27205E msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT @@ -399,7 +399,7 @@ Route110_TrickHouseEntrance_EventScript_269F47:: @ 8269F47 Route110_TrickHouseEntrance_EventScript_269F73:: @ 8269F73 giveitem_std ITEM_SMOKE_BALL compare VAR_RESULT, 1 - goto_eq Route110_TrickHouseEntrance_EventScript_26A023 + goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023 compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_27205E msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT @@ -409,7 +409,7 @@ Route110_TrickHouseEntrance_EventScript_269F73:: @ 8269F73 Route110_TrickHouseEntrance_EventScript_269F9F:: @ 8269F9F giveitem_std ITEM_TM12 compare VAR_RESULT, 1 - goto_eq Route110_TrickHouseEntrance_EventScript_26A023 + goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023 compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_27205E msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT @@ -419,7 +419,7 @@ Route110_TrickHouseEntrance_EventScript_269F9F:: @ 8269F9F Route110_TrickHouseEntrance_EventScript_269FCB:: @ 8269FCB giveitem_std ITEM_MAGNET compare VAR_RESULT, 1 - goto_eq Route110_TrickHouseEntrance_EventScript_26A023 + goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023 compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_27205E msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT @@ -429,7 +429,7 @@ Route110_TrickHouseEntrance_EventScript_269FCB:: @ 8269FCB Route110_TrickHouseEntrance_EventScript_269FF7:: @ 8269FF7 giveitem_std ITEM_PP_MAX compare VAR_RESULT, 1 - goto_eq Route110_TrickHouseEntrance_EventScript_26A023 + goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023 compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_27205E msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT @@ -450,7 +450,7 @@ Route110_TrickHouseEntrance_EventScript_26A039:: @ 826A039 msgbox Route110_TrickHouseEntrance_Text_26AB2C, MSGBOX_DEFAULT call Route110_TrickHouseEntrance_EventScript_26A070 compare VAR_RESULT, 1 - goto_eq Route110_TrickHouseEntrance_EventScript_26A09A + goto_if_eq Route110_TrickHouseEntrance_EventScript_26A09A compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_272071 msgbox Route110_TrickHouseEntrance_Text_26ABBD, MSGBOX_DEFAULT @@ -505,7 +505,7 @@ Route110_TrickHouseEntrance_EventScript_26A110:: @ 826A110 msgbox Route110_TrickHouseEntrance_Text_26A887, MSGBOX_YESNO closemessage compare VAR_RESULT, 1 - goto_eq Route110_TrickHouseEntrance_EventScript_26A126 + goto_if_eq Route110_TrickHouseEntrance_EventScript_26A126 releaseall end @@ -587,7 +587,7 @@ Route110_TrickHouseEntrance_EventScript_26A201:: @ 826A201 Route110_TrickHouseEntrance_EventScript_26A20B:: @ 826A20B compare VAR_0x4044, 8 - goto_eq Route110_TrickHouseEntrance_EventScript_26A220 + goto_if_eq Route110_TrickHouseEntrance_EventScript_26A220 msgbox Route110_TrickHouseEntrance_Text_26A878, MSGBOX_DEFAULT releaseall end @@ -612,7 +612,7 @@ Route110_TrickHouseEntrance_EventScript_26A22A:: @ 826A22A Route110_TrickHouseEntrance_EventScript_26A289:: @ 826A289 compare VAR_0x40AB, 0 - goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 + goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1 msgbox Route110_TrickHousePuzzle1_Text_26B98D, MSGBOX_DEFAULT playse SE_PIN setvar VAR_0x40AB, 2 @@ -623,7 +623,7 @@ Route110_TrickHouseEntrance_EventScript_26A289:: @ 826A289 Route110_TrickHouseEntrance_EventScript_26A2B2:: @ 826A2B2 compare VAR_0x40AC, 0 - goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 + goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1 msgbox Route110_TrickHousePuzzle2_Text_26BCBA, MSGBOX_DEFAULT playse SE_PIN setvar VAR_0x40AC, 2 @@ -634,7 +634,7 @@ Route110_TrickHouseEntrance_EventScript_26A2B2:: @ 826A2B2 Route110_TrickHouseEntrance_EventScript_26A2DB:: @ 826A2DB compare VAR_0x40AD, 0 - goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 + goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1 msgbox Route110_TrickHousePuzzle3_Text_26C609, MSGBOX_DEFAULT playse SE_PIN setvar VAR_0x40AD, 2 @@ -645,7 +645,7 @@ Route110_TrickHouseEntrance_EventScript_26A2DB:: @ 826A2DB Route110_TrickHouseEntrance_EventScript_26A304:: @ 826A304 compare VAR_0x40AE, 0 - goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 + goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1 msgbox Route110_TrickHousePuzzle4_Text_26C8C3, MSGBOX_DEFAULT playse SE_PIN setvar VAR_0x40AE, 2 @@ -656,7 +656,7 @@ Route110_TrickHouseEntrance_EventScript_26A304:: @ 826A304 Route110_TrickHouseEntrance_EventScript_26A32D:: @ 826A32D compare VAR_0x40AF, 0 - goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 + goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1 msgbox Route110_TrickHousePuzzle5_Text_26D660, MSGBOX_DEFAULT playse SE_PIN setvar VAR_0x40AF, 2 @@ -667,7 +667,7 @@ Route110_TrickHouseEntrance_EventScript_26A32D:: @ 826A32D Route110_TrickHouseEntrance_EventScript_26A356:: @ 826A356 compare VAR_0x40B0, 0 - goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 + goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1 msgbox Route110_TrickHousePuzzle6_Text_26DE26, MSGBOX_DEFAULT playse SE_PIN setvar VAR_0x40B0, 2 @@ -678,7 +678,7 @@ Route110_TrickHouseEntrance_EventScript_26A356:: @ 826A356 Route110_TrickHouseEntrance_EventScript_26A37F:: @ 826A37F compare VAR_0x40B1, 0 - goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 + goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1 msgbox Route110_TrickHousePuzzle7_EventScript_26E413, MSGBOX_DEFAULT playse SE_PIN setvar VAR_0x40B1, 2 @@ -689,7 +689,7 @@ Route110_TrickHouseEntrance_EventScript_26A37F:: @ 826A37F Route110_TrickHouseEntrance_EventScript_26A3A8:: @ 826A3A8 compare VAR_0x40B2, 0 - goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 + goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1 msgbox Route110_TrickHousePuzzle8_EventScript_26E864, MSGBOX_DEFAULT playse SE_PIN setvar VAR_0x40B2, 2 diff --git a/data/maps/Route110_TrickHousePuzzle1/scripts.inc b/data/maps/Route110_TrickHousePuzzle1/scripts.inc index 036521ee4..b34a9d555 100644 --- a/data/maps/Route110_TrickHousePuzzle1/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle1/scripts.inc @@ -4,7 +4,7 @@ Route110_TrickHousePuzzle1_MapScripts:: @ 826B90F Route110_TrickHousePuzzle1_MapScript1_26B915: @ 826B915 compare VAR_0x40AB, 2 - goto_eq Route110_TrickHousePuzzle1_EventScript_26B921 + goto_if_eq Route110_TrickHousePuzzle1_EventScript_26B921 end Route110_TrickHousePuzzle1_EventScript_26B921:: @ 826B921 @@ -14,7 +14,7 @@ Route110_TrickHousePuzzle1_EventScript_26B921:: @ 826B921 Route110_TrickHousePuzzle1_EventScript_26B92B:: @ 826B92B lockall compare VAR_0x40AB, 0 - goto_eq Route110_TrickHousePuzzle1_EventScript_26B93D + goto_if_eq Route110_TrickHousePuzzle1_EventScript_26B93D goto Route110_TrickHousePuzzle1_EventScript_26A3DB end diff --git a/data/maps/Route110_TrickHousePuzzle2/scripts.inc b/data/maps/Route110_TrickHousePuzzle2/scripts.inc index 60c7cdbce..7ddf11734 100644 --- a/data/maps/Route110_TrickHousePuzzle2/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle2/scripts.inc @@ -24,7 +24,7 @@ Route110_TrickHousePuzzle2_MapScript1_26BBAB: @ 826BBAB Route110_TrickHousePuzzle2_EventScript_26BBC0:: @ 826BBC0 lockall compare VAR_0x40AC, 0 - goto_eq Route110_TrickHousePuzzle2_EventScript_26BBD2 + goto_if_eq Route110_TrickHousePuzzle2_EventScript_26BBD2 goto Route110_TrickHousePuzzle2_EventScript_26A3DB end diff --git a/data/maps/Route110_TrickHousePuzzle3/scripts.inc b/data/maps/Route110_TrickHousePuzzle3/scripts.inc index cadb6315a..20881326b 100644 --- a/data/maps/Route110_TrickHousePuzzle3/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle3/scripts.inc @@ -274,9 +274,9 @@ Route110_TrickHousePuzzle3_EventScript_26C569:: @ 826C569 call_if 1, Route110_TrickHousePuzzle3_EventScript_26C232 special DrawWholeMapView compare VAR_TEMP_9, 1 - goto_eq Route110_TrickHousePuzzle3_EventScript_26C599 + goto_if_eq Route110_TrickHousePuzzle3_EventScript_26C599 compare VAR_TEMP_9, 0 - goto_eq Route110_TrickHousePuzzle3_EventScript_26C5A0 + goto_if_eq Route110_TrickHousePuzzle3_EventScript_26C5A0 end Route110_TrickHousePuzzle3_EventScript_26C599:: @ 826C599 @@ -292,7 +292,7 @@ Route110_TrickHousePuzzle3_EventScript_26C5A0:: @ 826C5A0 Route110_TrickHousePuzzle3_EventScript_26C5A7:: @ 826C5A7 lockall compare VAR_0x40AD, 0 - goto_eq Route110_TrickHousePuzzle3_EventScript_26C5B9 + goto_if_eq Route110_TrickHousePuzzle3_EventScript_26C5B9 goto Route110_TrickHousePuzzle3_EventScript_26A3DB end diff --git a/data/maps/Route110_TrickHousePuzzle4/scripts.inc b/data/maps/Route110_TrickHousePuzzle4/scripts.inc index 3d1004b1c..71bb32db8 100644 --- a/data/maps/Route110_TrickHousePuzzle4/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle4/scripts.inc @@ -4,7 +4,7 @@ Route110_TrickHousePuzzle4_MapScripts:: @ 826C860 Route110_TrickHousePuzzle4_EventScript_26C861:: @ 826C861 lockall compare VAR_0x40AE, 0 - goto_eq Route110_TrickHousePuzzle4_EventScript_26C873 + goto_if_eq Route110_TrickHousePuzzle4_EventScript_26C873 goto Route110_TrickHousePuzzle4_EventScript_26A3DB end diff --git a/data/maps/Route110_TrickHousePuzzle5/scripts.inc b/data/maps/Route110_TrickHousePuzzle5/scripts.inc index 330b4fcd7..453db6f9a 100644 --- a/data/maps/Route110_TrickHousePuzzle5/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle5/scripts.inc @@ -14,7 +14,7 @@ Route110_TrickHousePuzzle5_MapScript1_26CAF6: @ 826CAF6 Route110_TrickHousePuzzle5_EventScript_26CB15:: @ 826CB15 lockall compare VAR_0x40AF, 0 - goto_eq Route110_TrickHousePuzzle5_EventScript_26CB27 + goto_if_eq Route110_TrickHousePuzzle5_EventScript_26CB27 goto Route110_TrickHousePuzzle5_EventScript_26A3DB end @@ -28,7 +28,7 @@ Route110_TrickHousePuzzle5_EventScript_26CB32:: @ 826CB32 applymovement 1, Route110_TrickHousePuzzle5_Movement_27259E waitmovement 0 compare VAR_TEMP_1, 1 - goto_eq Route110_TrickHousePuzzle5_EventScript_26D1AA + goto_if_eq Route110_TrickHousePuzzle5_EventScript_26D1AA setvar VAR_TEMP_9, 0 goto Route110_TrickHousePuzzle5_EventScript_26CCEB end @@ -38,7 +38,7 @@ Route110_TrickHousePuzzle5_EventScript_26CB53:: @ 826CB53 applymovement 2, Route110_TrickHousePuzzle5_Movement_27259E waitmovement 0 compare VAR_TEMP_2, 1 - goto_eq Route110_TrickHousePuzzle5_EventScript_26D1AA + goto_if_eq Route110_TrickHousePuzzle5_EventScript_26D1AA setvar VAR_TEMP_9, 0 goto Route110_TrickHousePuzzle5_EventScript_26CD6A end @@ -48,7 +48,7 @@ Route110_TrickHousePuzzle5_EventScript_26CB74:: @ 826CB74 applymovement 3, Route110_TrickHousePuzzle5_Movement_27259E waitmovement 0 compare VAR_TEMP_3, 1 - goto_eq Route110_TrickHousePuzzle5_EventScript_26D1AA + goto_if_eq Route110_TrickHousePuzzle5_EventScript_26D1AA setvar VAR_TEMP_9, 0 goto Route110_TrickHousePuzzle5_EventScript_26CDF4 end @@ -58,7 +58,7 @@ Route110_TrickHousePuzzle5_EventScript_26CB95:: @ 826CB95 applymovement 4, Route110_TrickHousePuzzle5_Movement_27259E waitmovement 0 compare VAR_TEMP_4, 1 - goto_eq Route110_TrickHousePuzzle5_EventScript_26D1AA + goto_if_eq Route110_TrickHousePuzzle5_EventScript_26D1AA setvar VAR_TEMP_9, 0 goto Route110_TrickHousePuzzle5_EventScript_26CE73 end @@ -68,7 +68,7 @@ Route110_TrickHousePuzzle5_EventScript_26CBB6:: @ 826CBB6 applymovement 5, Route110_TrickHousePuzzle5_Movement_27259E waitmovement 0 compare VAR_TEMP_5, 1 - goto_eq Route110_TrickHousePuzzle5_EventScript_26D1AA + goto_if_eq Route110_TrickHousePuzzle5_EventScript_26D1AA setvar VAR_TEMP_9, 0 goto Route110_TrickHousePuzzle5_EventScript_26CEF2 end diff --git a/data/maps/Route110_TrickHousePuzzle6/scripts.inc b/data/maps/Route110_TrickHousePuzzle6/scripts.inc index 53c548c20..2cb784b50 100644 --- a/data/maps/Route110_TrickHousePuzzle6/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle6/scripts.inc @@ -18,7 +18,7 @@ Route110_TrickHousePuzzle6_EventScript_26DDC0:: @ 826DDC0 Route110_TrickHousePuzzle6_EventScript_26DDC4:: @ 826DDC4 lockall compare VAR_0x40B0, 0 - goto_eq Route110_TrickHousePuzzle6_EventScript_26DDD6 + goto_if_eq Route110_TrickHousePuzzle6_EventScript_26DDD6 goto Route110_TrickHousePuzzle6_EventScript_26A3DB end diff --git a/data/maps/Route110_TrickHousePuzzle7/scripts.inc b/data/maps/Route110_TrickHousePuzzle7/scripts.inc index 4004c2e2c..ecb52c7ca 100644 --- a/data/maps/Route110_TrickHousePuzzle7/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle7/scripts.inc @@ -74,7 +74,7 @@ Route110_TrickHousePuzzle7_EventScript_26E185:: @ 826E185 Route110_TrickHousePuzzle7_MapScript1_26E198: @ 826E198 compare VAR_0x40B6, 1 - goto_eq Route110_TrickHousePuzzle7_EventScript_26E1B3 + goto_if_eq Route110_TrickHousePuzzle7_EventScript_26E1B3 clearflag FLAG_0x0C2 clearflag FLAG_0x0C3 clearflag FLAG_0x0C4 @@ -101,7 +101,7 @@ Route110_TrickHousePuzzle7_EventScript_26E1CA:: @ 826E1CA Route110_TrickHousePuzzle7_EventScript_26E1D0:: @ 826E1D0 lockall compare VAR_0x40B1, 0 - goto_eq Route110_TrickHousePuzzle7_EventScript_26E1E2 + goto_if_eq Route110_TrickHousePuzzle7_EventScript_26E1E2 goto Route110_TrickHousePuzzle7_EventScript_26A3DB end @@ -127,10 +127,8 @@ Route110_TrickHousePuzzle7_EventScript_26E1FE:: @ 826E1FE call_if 1, Route110_TrickHousePuzzle7_EventScript_26E139 special DrawWholeMapView playse SE_TK_KASYA - checkflag FLAG_0x0C2 - goto_if 0, Route110_TrickHousePuzzle7_EventScript_26E2E9 - checkflag FLAG_0x0C2 - goto_eq Route110_TrickHousePuzzle7_EventScript_26E2EE + goto_if_unset FLAG_0x0C2, Route110_TrickHousePuzzle7_EventScript_26E2E9 + goto_if_set FLAG_0x0C2, Route110_TrickHousePuzzle7_EventScript_26E2EE end Route110_TrickHousePuzzle7_EventScript_26E22D:: @ 826E22D @@ -142,10 +140,8 @@ Route110_TrickHousePuzzle7_EventScript_26E22D:: @ 826E22D call_if 1, Route110_TrickHousePuzzle7_EventScript_26E14C special DrawWholeMapView playse SE_TK_KASYA - checkflag FLAG_0x0C3 - goto_if 0, Route110_TrickHousePuzzle7_EventScript_26E2F3 - checkflag FLAG_0x0C3 - goto_eq Route110_TrickHousePuzzle7_EventScript_26E2F8 + goto_if_unset FLAG_0x0C3, Route110_TrickHousePuzzle7_EventScript_26E2F3 + goto_if_set FLAG_0x0C3, Route110_TrickHousePuzzle7_EventScript_26E2F8 end Route110_TrickHousePuzzle7_EventScript_26E25C:: @ 826E25C @@ -157,10 +153,8 @@ Route110_TrickHousePuzzle7_EventScript_26E25C:: @ 826E25C call_if 1, Route110_TrickHousePuzzle7_EventScript_26E15F special DrawWholeMapView playse SE_TK_KASYA - checkflag FLAG_0x0C4 - goto_if 0, Route110_TrickHousePuzzle7_EventScript_26E2FD - checkflag FLAG_0x0C4 - goto_eq Route110_TrickHousePuzzle7_EventScript_26E302 + goto_if_unset FLAG_0x0C4, Route110_TrickHousePuzzle7_EventScript_26E2FD + goto_if_set FLAG_0x0C4, Route110_TrickHousePuzzle7_EventScript_26E302 end Route110_TrickHousePuzzle7_EventScript_26E28B:: @ 826E28B @@ -172,10 +166,8 @@ Route110_TrickHousePuzzle7_EventScript_26E28B:: @ 826E28B call_if 1, Route110_TrickHousePuzzle7_EventScript_26E172 special DrawWholeMapView playse SE_TK_KASYA - checkflag FLAG_0x0C5 - goto_if 0, Route110_TrickHousePuzzle7_EventScript_26E307 - checkflag FLAG_0x0C5 - goto_eq Route110_TrickHousePuzzle7_EventScript_26E30C + goto_if_unset FLAG_0x0C5, Route110_TrickHousePuzzle7_EventScript_26E307 + goto_if_set FLAG_0x0C5, Route110_TrickHousePuzzle7_EventScript_26E30C end Route110_TrickHousePuzzle7_EventScript_26E2BA:: @ 826E2BA @@ -187,10 +179,8 @@ Route110_TrickHousePuzzle7_EventScript_26E2BA:: @ 826E2BA call_if 1, Route110_TrickHousePuzzle7_EventScript_26E185 special DrawWholeMapView playse SE_TK_KASYA - checkflag FLAG_0x0C6 - goto_if 0, Route110_TrickHousePuzzle7_EventScript_26E311 - checkflag FLAG_0x0C6 - goto_eq Route110_TrickHousePuzzle7_EventScript_26E316 + goto_if_unset FLAG_0x0C6, Route110_TrickHousePuzzle7_EventScript_26E311 + goto_if_set FLAG_0x0C6, Route110_TrickHousePuzzle7_EventScript_26E316 end Route110_TrickHousePuzzle7_EventScript_26E2E9:: @ 826E2E9 diff --git a/data/maps/Route110_TrickHousePuzzle8/scripts.inc b/data/maps/Route110_TrickHousePuzzle8/scripts.inc index 31aeb9e3a..7efb9f67b 100644 --- a/data/maps/Route110_TrickHousePuzzle8/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle8/scripts.inc @@ -4,7 +4,7 @@ Route110_TrickHousePuzzle8_MapScripts:: @ 826E801 Route110_TrickHousePuzzle8_EventScript_26E802:: @ 826E802 lockall compare VAR_0x40B2, 0 - goto_eq Route110_TrickHousePuzzle8_EventScript_26E814 + goto_if_eq Route110_TrickHousePuzzle8_EventScript_26E814 goto Route110_TrickHousePuzzle8_EventScript_26A3DB end diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc index 8d5de281b..eca7e2242 100644 --- a/data/maps/Route111/scripts.inc +++ b/data/maps/Route111/scripts.inc @@ -50,15 +50,15 @@ Route111_MapScript1_1F0D87: @ 81F0D87 call Route111_EventScript_1F0DE6 call Route111_EventScript_28CCC7 checktrainerflag TRAINER_VICKY - goto_if 0, Route111_EventScript_1F0E26 + goto_if_lt Route111_EventScript_1F0E26 end Route111_EventScript_1F0DC2:: @ 81F0DC2 checkplayergender compare VAR_RESULT, 0 - goto_eq Route111_EventScript_1F0DDA + goto_if_eq Route111_EventScript_1F0DDA compare VAR_RESULT, 1 - goto_eq Route111_EventScript_1F0DE0 + goto_if_eq Route111_EventScript_1F0DE0 return Route111_EventScript_1F0DDA:: @ 81F0DDA @@ -72,15 +72,15 @@ Route111_EventScript_1F0DE0:: @ 81F0DE0 Route111_EventScript_1F0DE6:: @ 81F0DE6 getplayerxy VAR_TEMP_0, VAR_TEMP_1 compare VAR_TEMP_1, 34 - goto_if 0, Route111_EventScript_1F0E25 + goto_if_lt Route111_EventScript_1F0E25 compare VAR_TEMP_1, 107 - goto_if 2, Route111_EventScript_1F0E25 + goto_if_gt Route111_EventScript_1F0E25 compare VAR_TEMP_1, 72 - goto_if 2, Route111_EventScript_1F0E22 + goto_if_gt Route111_EventScript_1F0E22 compare VAR_TEMP_0, 2000 - goto_if 2, Route111_EventScript_1F0E25 + goto_if_gt Route111_EventScript_1F0E25 compare VAR_TEMP_0, 8 - goto_if 0, Route111_EventScript_1F0E25 + goto_if_lt Route111_EventScript_1F0E25 Route111_EventScript_1F0E22:: @ 81F0E22 setweather 8 @@ -138,8 +138,7 @@ Route111_EventScript_1F0E60:: @ 81F0E60 waitstate setvar VAR_0x40CB, 2 clearflag FLAG_HIDE_DESERT_UNDERPASS_FOSSIL - checkflag FLAG_0x150 - goto_eq Route111_EventScript_1F0EA7 + goto_if_set FLAG_0x150, Route111_EventScript_1F0EA7 msgbox Route111_Text_1F1C74, MSGBOX_DEFAULT releaseall end @@ -163,12 +162,11 @@ Route111_EventScript_1F0EB9:: @ 81F0EB9 lock faceplayer dodailyevents - checkflag FLAG_0x92C - goto_eq Route111_EventScript_1F0EF4 + goto_if_set FLAG_0x92C, Route111_EventScript_1F0EF4 msgbox Route111_Text_2A6EBD, MSGBOX_DEFAULT giveitem_std ITEM_RAZZ_BERRY compare VAR_RESULT, 0 - goto_eq Route111_EventScript_272054 + goto_if_eq Route111_EventScript_272054 setflag FLAG_0x92C special GetPlayerBigGuyGirlString msgbox Route111_Text_2A6F3D, MSGBOX_DEFAULT @@ -207,7 +205,7 @@ Route111_EventScript_1F0F22:: @ 81F0F22 Route111_EventScript_1F0F2E:: @ 81F0F2E checkitem ITEM_GO_GOGGLES, 1 compare VAR_RESULT, 0 - goto_eq Route111_EventScript_1F0F45 + goto_if_eq Route111_EventScript_1F0F45 setvar VAR_TEMP_3, 1 releaseall end @@ -281,7 +279,7 @@ Route111_EventScript_1F0FC5:: @ 81F0FC5 setflag FLAG_LANDMARK_WINSTRATE_FAMILY msgbox Route111_Text_1F1475, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq Route111_EventScript_1F0FE7 + goto_if_eq Route111_EventScript_1F0FE7 msgbox Route111_Text_1F14F5, MSGBOX_DEFAULT release end @@ -416,11 +414,10 @@ Route111_EventScript_1F119B:: @ 81F119B lock faceplayer compare VAR_0x40CB, 3 - goto_eq Route111_EventScript_1F11C6 + goto_if_eq Route111_EventScript_1F11C6 compare VAR_0x40CB, 2 - goto_eq Route111_EventScript_1F11D0 - checkflag FLAG_0x14E - goto_eq Route111_EventScript_1F11DA + goto_if_eq Route111_EventScript_1F11D0 + goto_if_set FLAG_0x14E, Route111_EventScript_1F11DA msgbox Route111_Text_1F1A22, MSGBOX_DEFAULT release end @@ -475,7 +472,7 @@ Route111_EventScript_1F1260:: @ 81F1260 trainerbattle_single TRAINER_DUSTY_1, Route111_Text_298B08, Route111_Text_298B53, Route111_EventScript_1F128C specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route111_EventScript_1F12AB + goto_if_eq Route111_EventScript_1F12AB msgbox Route111_Text_298B9A, MSGBOX_DEFAULT release end @@ -512,7 +509,7 @@ Route111_EventScript_1F1307:: @ 81F1307 trainerbattle_single TRAINER_WILTON_1, Route111_Text_298F79, Route111_Text_298FA9, Route111_EventScript_1F1333 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route111_EventScript_1F1352 + goto_if_eq Route111_EventScript_1F1352 msgbox Route111_Text_298FD4, MSGBOX_DEFAULT release end @@ -534,7 +531,7 @@ Route111_EventScript_1F1369:: @ 81F1369 trainerbattle_single TRAINER_BROOKE_1, Route111_Text_299143, Route111_Text_299193, Route111_EventScript_1F1395 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route111_EventScript_1F13B4 + goto_if_eq Route111_EventScript_1F13B4 msgbox Route111_Text_2991C2, MSGBOX_DEFAULT release end diff --git a/data/maps/Route111_OldLadysRestStop/scripts.inc b/data/maps/Route111_OldLadysRestStop/scripts.inc index f98e994b3..5a89f40ed 100644 --- a/data/maps/Route111_OldLadysRestStop/scripts.inc +++ b/data/maps/Route111_OldLadysRestStop/scripts.inc @@ -11,9 +11,9 @@ Route111_OldLadysRestStop_EventScript_22A920:: @ 822A920 faceplayer msgbox Route111_OldLadysRestStop_Text_22A978, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq Route111_OldLadysRestStop_EventScript_22A941 + goto_if_eq Route111_OldLadysRestStop_EventScript_22A941 compare VAR_RESULT, 0 - goto_eq Route111_OldLadysRestStop_EventScript_22A96E + goto_if_eq Route111_OldLadysRestStop_EventScript_22A96E end Route111_OldLadysRestStop_EventScript_22A941:: @ 822A941 @@ -22,9 +22,9 @@ Route111_OldLadysRestStop_EventScript_22A941:: @ 822A941 call Route111_OldLadysRestStop_EventScript_272083 msgbox Route111_OldLadysRestStop_Text_22AA16, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq Route111_OldLadysRestStop_EventScript_22A941 + goto_if_eq Route111_OldLadysRestStop_EventScript_22A941 compare VAR_RESULT, 0 - goto_eq Route111_OldLadysRestStop_EventScript_22A96E + goto_if_eq Route111_OldLadysRestStop_EventScript_22A96E end Route111_OldLadysRestStop_EventScript_22A96E:: @ 822A96E diff --git a/data/maps/Route111_WinstrateFamilysHouse/scripts.inc b/data/maps/Route111_WinstrateFamilysHouse/scripts.inc index 8160d7623..cd862b7e3 100644 --- a/data/maps/Route111_WinstrateFamilysHouse/scripts.inc +++ b/data/maps/Route111_WinstrateFamilysHouse/scripts.inc @@ -13,12 +13,11 @@ Route111_WinstrateFamilysHouse_EventScript_22A4A2:: @ 822A4A2 lock faceplayer setvar VAR_0x8008, 3 - checkflag FLAG_0x115 - goto_eq Route111_WinstrateFamilysHouse_EventScript_22A4DA + goto_if_set FLAG_0x115, Route111_WinstrateFamilysHouse_EventScript_22A4DA msgbox Route111_WinstrateFamilysHouse_Text_22A5F4, MSGBOX_DEFAULT giveitem_std ITEM_MACHO_BRACE compare VAR_RESULT, 0 - goto_eq Route111_WinstrateFamilysHouse_EventScript_272054 + goto_if_eq Route111_WinstrateFamilysHouse_EventScript_272054 setflag FLAG_0x115 goto Route111_WinstrateFamilysHouse_EventScript_22A52C end @@ -40,8 +39,7 @@ Route111_WinstrateFamilysHouse_EventScript_22A4FD:: @ 822A4FD lock faceplayer setvar VAR_0x8008, 4 - checkflag FLAG_TEMP_4 - goto_eq Route111_WinstrateFamilysHouse_EventScript_22A51E + goto_if_set FLAG_TEMP_4, Route111_WinstrateFamilysHouse_EventScript_22A51E msgbox Route111_WinstrateFamilysHouse_Text_22A780, MSGBOX_DEFAULT setflag FLAG_TEMP_4 goto Route111_WinstrateFamilysHouse_EventScript_22A52C diff --git a/data/maps/Route112/scripts.inc b/data/maps/Route112/scripts.inc index 1abcdb6b4..816e0aab0 100644 --- a/data/maps/Route112/scripts.inc +++ b/data/maps/Route112/scripts.inc @@ -69,7 +69,7 @@ Route112_EventScript_1F1E81:: @ 81F1E81 trainerbattle_single TRAINER_TRENT_1, Route112_Text_299815, Route112_Text_29987C, Route112_EventScript_1F1EAD specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route112_EventScript_1F1ECC + goto_if_eq Route112_EventScript_1F1ECC msgbox Route112_Text_299896, MSGBOX_DEFAULT release end diff --git a/data/maps/Route112_CableCarStation/scripts.inc b/data/maps/Route112_CableCarStation/scripts.inc index 5873b2d53..2a79faa02 100644 --- a/data/maps/Route112_CableCarStation/scripts.inc +++ b/data/maps/Route112_CableCarStation/scripts.inc @@ -34,9 +34,9 @@ Route112_CableCarStation_EventScript_22AB17:: @ 822AB17 faceplayer msgbox Route112_CableCarStation_Text_22AB85, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq Route112_CableCarStation_EventScript_22AB38 + goto_if_eq Route112_CableCarStation_EventScript_22AB38 compare VAR_RESULT, 0 - goto_eq Route112_CableCarStation_EventScript_22AB67 + goto_if_eq Route112_CableCarStation_EventScript_22AB67 end Route112_CableCarStation_EventScript_22AB38:: @ 822AB38 diff --git a/data/maps/Route113/scripts.inc b/data/maps/Route113/scripts.inc index b9ece3b21..85aa250ab 100644 --- a/data/maps/Route113/scripts.inc +++ b/data/maps/Route113/scripts.inc @@ -15,9 +15,9 @@ Route113_MapScript1_1F2161: @ 81F2161 Route113_EventScript_1F216A:: @ 81F216A getplayerxy VAR_TEMP_0, VAR_TEMP_1 compare VAR_TEMP_0, 19 - goto_if 0, Route113_EventScript_1F2189 + goto_if_lt Route113_EventScript_1F2189 compare VAR_TEMP_0, 84 - goto_if 2, Route113_EventScript_1F2189 + goto_if_gt Route113_EventScript_1F2189 setweather 7 return @@ -62,7 +62,7 @@ Route113_EventScript_1F21EE:: @ 81F21EE trainerbattle_single TRAINER_MADELINE_1, Route113_Text_299EA6, Route113_Text_299EF9, Route113_EventScript_1F221A specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route113_EventScript_1F2239 + goto_if_eq Route113_EventScript_1F2239 msgbox Route113_Text_299F15, MSGBOX_DEFAULT release end @@ -84,7 +84,7 @@ Route113_EventScript_1F2250:: @ 81F2250 trainerbattle_single TRAINER_LAO_1, Route113_Text_29A015, Route113_Text_29A04C, Route113_EventScript_1F227C specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route113_EventScript_1F229B + goto_if_eq Route113_EventScript_1F229B msgbox Route113_Text_29A067, MSGBOX_DEFAULT release end diff --git a/data/maps/Route113_GlassWorkshop/scripts.inc b/data/maps/Route113_GlassWorkshop/scripts.inc index c211b6a1c..a4487628d 100644 --- a/data/maps/Route113_GlassWorkshop/scripts.inc +++ b/data/maps/Route113_GlassWorkshop/scripts.inc @@ -16,11 +16,11 @@ Route113_GlassWorkshop_EventScript_26ED1E:: @ 826ED1E lock faceplayer compare VAR_0x40BE, 10 - goto_if 4, Route113_GlassWorkshop_EventScript_26F090 + goto_if_ge Route113_GlassWorkshop_EventScript_26F090 compare VAR_0x40BE, 2 - goto_eq Route113_GlassWorkshop_EventScript_26ED6E + goto_if_eq Route113_GlassWorkshop_EventScript_26ED6E compare VAR_0x40BE, 1 - goto_eq Route113_GlassWorkshop_EventScript_26ED64 + goto_if_eq Route113_GlassWorkshop_EventScript_26ED64 msgbox Route113_GlassWorkshop_Text_26F19D, MSGBOX_DEFAULT giveitem_std ITEM_SOOT_SACK setvar VAR_0x40BE, 1 @@ -36,10 +36,10 @@ Route113_GlassWorkshop_EventScript_26ED64:: @ 826ED64 Route113_GlassWorkshop_EventScript_26ED6E:: @ 826ED6E checkitem ITEM_SOOT_SACK, 1 compare VAR_RESULT, 0 - goto_eq Route113_GlassWorkshop_EventScript_26ED9D + goto_if_eq Route113_GlassWorkshop_EventScript_26ED9D msgbox Route113_GlassWorkshop_Text_26F312, MSGBOX_DEFAULT compare VAR_ASH_GATHER_COUNT, 250 - goto_if 0, Route113_GlassWorkshop_EventScript_26EFD6 + goto_if_lt Route113_GlassWorkshop_EventScript_26EFD6 message Route113_GlassWorkshop_Text_26F40A waitmessage goto Route113_GlassWorkshop_EventScript_26EDA7 @@ -72,10 +72,10 @@ Route113_GlassWorkshop_EventScript_26EE1E:: @ 826EE1E bufferitemname 0, VAR_0x8008 setvar VAR_0x800A, 250 compare VAR_ASH_GATHER_COUNT, 250 - goto_if 0, Route113_GlassWorkshop_EventScript_26EFEE + goto_if_lt Route113_GlassWorkshop_EventScript_26EFEE msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq Route113_GlassWorkshop_EventScript_26F003 + goto_if_eq Route113_GlassWorkshop_EventScript_26F003 setvar VAR_0x40BE, 10 subvar VAR_ASH_GATHER_COUNT, 250 goto Route113_GlassWorkshop_EventScript_26F00F @@ -86,10 +86,10 @@ Route113_GlassWorkshop_EventScript_26EE5A:: @ 826EE5A bufferitemname 0, VAR_0x8008 setvar VAR_0x800A, 500 compare VAR_ASH_GATHER_COUNT, 500 - goto_if 0, Route113_GlassWorkshop_EventScript_26EFEE + goto_if_lt Route113_GlassWorkshop_EventScript_26EFEE msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq Route113_GlassWorkshop_EventScript_26F003 + goto_if_eq Route113_GlassWorkshop_EventScript_26F003 setvar VAR_0x40BE, 11 subvar VAR_ASH_GATHER_COUNT, 500 goto Route113_GlassWorkshop_EventScript_26F00F @@ -100,10 +100,10 @@ Route113_GlassWorkshop_EventScript_26EE96:: @ 826EE96 bufferitemname 0, VAR_0x8008 setvar VAR_0x800A, 500 compare VAR_ASH_GATHER_COUNT, 500 - goto_if 0, Route113_GlassWorkshop_EventScript_26EFEE + goto_if_lt Route113_GlassWorkshop_EventScript_26EFEE msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq Route113_GlassWorkshop_EventScript_26F003 + goto_if_eq Route113_GlassWorkshop_EventScript_26F003 setvar VAR_0x40BE, 12 subvar VAR_ASH_GATHER_COUNT, 500 goto Route113_GlassWorkshop_EventScript_26F00F @@ -114,10 +114,10 @@ Route113_GlassWorkshop_EventScript_26EED2:: @ 826EED2 bufferitemname 0, VAR_0x8008 setvar VAR_0x800A, 1000 compare VAR_ASH_GATHER_COUNT, 1000 - goto_if 0, Route113_GlassWorkshop_EventScript_26EFEE + goto_if_lt Route113_GlassWorkshop_EventScript_26EFEE msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq Route113_GlassWorkshop_EventScript_26F003 + goto_if_eq Route113_GlassWorkshop_EventScript_26F003 setvar VAR_0x40BE, 13 subvar VAR_ASH_GATHER_COUNT, 1000 goto Route113_GlassWorkshop_EventScript_26F00F @@ -128,10 +128,10 @@ Route113_GlassWorkshop_EventScript_26EF0E:: @ 826EF0E bufferitemname 0, VAR_0x8008 setvar VAR_0x800A, 1000 compare VAR_ASH_GATHER_COUNT, 1000 - goto_if 0, Route113_GlassWorkshop_EventScript_26EFEE + goto_if_lt Route113_GlassWorkshop_EventScript_26EFEE msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq Route113_GlassWorkshop_EventScript_26F003 + goto_if_eq Route113_GlassWorkshop_EventScript_26F003 setvar VAR_0x40BE, 14 subvar VAR_ASH_GATHER_COUNT, 1000 goto Route113_GlassWorkshop_EventScript_26F00F @@ -143,10 +143,10 @@ Route113_GlassWorkshop_EventScript_26EF4A:: @ 826EF4A bufferdecorationname 0, VAR_0x8008 setvar VAR_0x800A, 6000 compare VAR_ASH_GATHER_COUNT, 6000 - goto_if 0, Route113_GlassWorkshop_EventScript_26EFEE + goto_if_lt Route113_GlassWorkshop_EventScript_26EFEE msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq Route113_GlassWorkshop_EventScript_26F003 + goto_if_eq Route113_GlassWorkshop_EventScript_26F003 setvar VAR_0x40BE, 15 subvar VAR_ASH_GATHER_COUNT, 6000 goto Route113_GlassWorkshop_EventScript_26F00F @@ -158,10 +158,10 @@ Route113_GlassWorkshop_EventScript_26EF8B:: @ 826EF8B bufferdecorationname 0, VAR_0x8008 setvar VAR_0x800A, 8000 compare VAR_ASH_GATHER_COUNT, 8000 - goto_if 0, Route113_GlassWorkshop_EventScript_26EFEE + goto_if_lt Route113_GlassWorkshop_EventScript_26EFEE msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq Route113_GlassWorkshop_EventScript_26F003 + goto_if_eq Route113_GlassWorkshop_EventScript_26F003 setvar VAR_0x40BE, 16 subvar VAR_ASH_GATHER_COUNT, 8000 goto Route113_GlassWorkshop_EventScript_26F00F @@ -213,13 +213,13 @@ Route113_GlassWorkshop_EventScript_26F00F:: @ 826F00F Route113_GlassWorkshop_EventScript_26F047:: @ 826F047 giveitem_std VAR_0x8008 compare VAR_RESULT, 0 - goto_eq Route113_GlassWorkshop_EventScript_26F072 + goto_if_eq Route113_GlassWorkshop_EventScript_26F072 return Route113_GlassWorkshop_EventScript_26F05F:: @ 826F05F givedecoration_std VAR_0x8008 compare VAR_RESULT, 0 - goto_eq Route113_GlassWorkshop_EventScript_26F081 + goto_if_eq Route113_GlassWorkshop_EventScript_26F081 return Route113_GlassWorkshop_EventScript_26F072:: @ 826F072 diff --git a/data/maps/Route114/scripts.inc b/data/maps/Route114/scripts.inc index 6adf20870..ad5d57c11 100644 --- a/data/maps/Route114/scripts.inc +++ b/data/maps/Route114/scripts.inc @@ -28,15 +28,14 @@ Route114_EventScript_1F2582:: @ 81F2582 lock faceplayer dodailyevents - checkflag FLAG_0x92B - goto_eq Route114_EventScript_1F25C7 + goto_if_set FLAG_0x92B, Route114_EventScript_1F25C7 msgbox Route114_Text_2A6FCB, MSGBOX_DEFAULT random 5 addvar VAR_RESULT, 15 addvar VAR_RESULT, 133 giveitem_std VAR_RESULT compare VAR_RESULT, 0 - goto_eq Route114_EventScript_272054 + goto_if_eq Route114_EventScript_272054 setflag FLAG_0x92B msgbox Route114_Text_2A7034, MSGBOX_DEFAULT release @@ -50,12 +49,11 @@ Route114_EventScript_1F25C7:: @ 81F25C7 Route114_EventScript_1F25D1:: @ 81F25D1 lock faceplayer - checkflag FLAG_0x0E7 - goto_eq Route114_EventScript_1F2608 + goto_if_set FLAG_0x0E7, Route114_EventScript_1F2608 msgbox Route114_Text_1F2809, MSGBOX_DEFAULT giveitem_std ITEM_TM05 compare VAR_RESULT, 0 - goto_eq Route114_EventScript_272054 + goto_if_eq Route114_EventScript_272054 setflag FLAG_0x0E7 msgbox Route114_Text_1F2872, MSGBOX_DEFAULT release @@ -112,7 +110,7 @@ Route114_EventScript_1F269C:: @ 81F269C trainerbattle_single TRAINER_STEVE_1, Route114_Text_29A943, Route114_Text_29A973, Route114_EventScript_1F26C8 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route114_EventScript_1F26E7 + goto_if_eq Route114_EventScript_1F26E7 msgbox Route114_Text_29A981, MSGBOX_DEFAULT release end @@ -134,7 +132,7 @@ Route114_EventScript_1F26FE:: @ 81F26FE trainerbattle_single TRAINER_BERNIE_1, Route114_Text_29AADB, Route114_Text_29AB1A, Route114_EventScript_1F272A specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route114_EventScript_1F2749 + goto_if_eq Route114_EventScript_1F2749 msgbox Route114_Text_29AB36, MSGBOX_DEFAULT release end diff --git a/data/maps/Route114_FossilManiacsHouse/scripts.inc b/data/maps/Route114_FossilManiacsHouse/scripts.inc index f2e62b451..4985089c2 100644 --- a/data/maps/Route114_FossilManiacsHouse/scripts.inc +++ b/data/maps/Route114_FossilManiacsHouse/scripts.inc @@ -9,12 +9,11 @@ Route114_FossilManiacsHouse_MapScript1_22AD36: @ 822AD36 Route114_FossilManiacsHouse_EventScript_22AD3A:: @ 822AD3A lock faceplayer - checkflag FLAG_0x105 - goto_eq Route114_FossilManiacsHouse_EventScript_22AD69 + goto_if_set FLAG_0x105, Route114_FossilManiacsHouse_EventScript_22AD69 msgbox Route114_FossilManiacsHouse_Text_22AD85, MSGBOX_DEFAULT giveitem_std ITEM_TM28 compare VAR_RESULT, 0 - goto_eq Route114_FossilManiacsHouse_EventScript_272054 + goto_if_eq Route114_FossilManiacsHouse_EventScript_272054 setflag FLAG_0x105 release end diff --git a/data/maps/Route114_FossilManiacsTunnel/scripts.inc b/data/maps/Route114_FossilManiacsTunnel/scripts.inc index 1159128cc..3a7c3f1cd 100644 --- a/data/maps/Route114_FossilManiacsTunnel/scripts.inc +++ b/data/maps/Route114_FossilManiacsTunnel/scripts.inc @@ -36,14 +36,13 @@ Route114_FossilManiacsTunnel_EventScript_22AF66:: @ 822AF66 Route114_FossilManiacsTunnel_EventScript_22AF87:: @ 822AF87 lock faceplayer - checkflag FLAG_0x10B - goto_eq Route114_FossilManiacsTunnel_EventScript_22AFC6 + goto_if_set FLAG_0x10B, Route114_FossilManiacsTunnel_EventScript_22AFC6 checkitem ITEM_ROOT_FOSSIL, 1 compare VAR_RESULT, 1 - goto_eq Route114_FossilManiacsTunnel_EventScript_22AFBC + goto_if_eq Route114_FossilManiacsTunnel_EventScript_22AFBC checkitem ITEM_CLAW_FOSSIL, 1 compare VAR_RESULT, 1 - goto_eq Route114_FossilManiacsTunnel_EventScript_22AFBC + goto_if_eq Route114_FossilManiacsTunnel_EventScript_22AFBC msgbox Route114_FossilManiacsTunnel_Text_22AFD0, MSGBOX_DEFAULT release end diff --git a/data/maps/Route114_LanettesHouse/scripts.inc b/data/maps/Route114_LanettesHouse/scripts.inc index 0145ee945..165b9eb01 100644 --- a/data/maps/Route114_LanettesHouse/scripts.inc +++ b/data/maps/Route114_LanettesHouse/scripts.inc @@ -9,13 +9,12 @@ Route114_LanettesHouse_MapScript1_22B2CE: @ 822B2CE Route114_LanettesHouse_EventScript_22B2D2:: @ 822B2D2 lock faceplayer - checkflag FLAG_0x083 - goto_eq Route114_LanettesHouse_EventScript_22B2FF + goto_if_set FLAG_0x083, Route114_LanettesHouse_EventScript_22B2FF setflag FLAG_SYS_PC_LANETTE msgbox Route114_LanettesHouse_Text_22B34E, MSGBOX_DEFAULT givedecoration_std 99 compare VAR_RESULT, 0 - goto_eq Route114_LanettesHouse_EventScript_272067 + goto_if_eq Route114_LanettesHouse_EventScript_272067 setflag FLAG_0x083 release end @@ -29,7 +28,7 @@ Route114_LanettesHouse_EventScript_22B309:: @ 822B309 lockall msgbox Route114_LanettesHouse_Text_22B485, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq Route114_LanettesHouse_EventScript_22B327 + goto_if_eq Route114_LanettesHouse_EventScript_22B327 msgbox Route114_LanettesHouse_Text_22B6E4, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/Route115/scripts.inc b/data/maps/Route115/scripts.inc index 6c74a0d5a..735ffaa5b 100644 --- a/data/maps/Route115/scripts.inc +++ b/data/maps/Route115/scripts.inc @@ -40,7 +40,7 @@ Route115_EventScript_1F298E:: @ 81F298E trainerbattle_single TRAINER_TIMOTHY_1, Route115_Text_29B1FA, Route115_Text_29B230, Route115_EventScript_1F29BA specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route115_EventScript_1F29D9 + goto_if_eq Route115_EventScript_1F29D9 msgbox Route115_Text_29B258, MSGBOX_DEFAULT release end @@ -67,7 +67,7 @@ Route115_EventScript_1F2A07:: @ 81F2A07 trainerbattle_single TRAINER_NOB_1, Route115_Text_29B449, Route115_Text_29B480, Route115_EventScript_1F2A33 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route115_EventScript_1F2A52 + goto_if_eq Route115_EventScript_1F2A52 msgbox Route115_Text_29B49D, MSGBOX_DEFAULT release end @@ -89,7 +89,7 @@ Route115_EventScript_1F2A69:: @ 81F2A69 trainerbattle_single TRAINER_CYNDY_1, Route115_Text_29B5EF, Route115_Text_29B62D, Route115_EventScript_1F2A95 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route115_EventScript_1F2AB4 + goto_if_eq Route115_EventScript_1F2AB4 msgbox Route115_Text_29B647, MSGBOX_DEFAULT release end diff --git a/data/maps/Route116/scripts.inc b/data/maps/Route116/scripts.inc index ab8377b1c..32c8d2a40 100644 --- a/data/maps/Route116/scripts.inc +++ b/data/maps/Route116/scripts.inc @@ -33,10 +33,8 @@ Route116_MapScript2_1F2C66: @ 81F2C66 Route116_EventScript_1F2C70:: @ 81F2C70 lock faceplayer - checkflag FLAG_0x08F - goto_eq Route116_EventScript_1F2C8E - checkflag FLAG_0x08E - goto_eq Route116_EventScript_1F2C98 + goto_if_set FLAG_0x08F, Route116_EventScript_1F2C8E + goto_if_set FLAG_0x08E, Route116_EventScript_1F2C98 msgbox Route116_Text_1F3140, MSGBOX_DEFAULT release end @@ -54,8 +52,7 @@ Route116_EventScript_1F2C98:: @ 81F2C98 Route116_EventScript_1F2CA2:: @ 81F2CA2 lock faceplayer - checkflag FLAG_0x11F - goto_eq Route116_EventScript_1F2D2B + goto_if_set FLAG_0x11F, Route116_EventScript_1F2D2B msgbox Route116_Text_1F3317, MSGBOX_DEFAULT goto Route116_EventScript_1F2CBB end @@ -64,7 +61,7 @@ Route116_EventScript_1F2CBB:: @ 81F2CBB setflag FLAG_0x11F giveitem_std ITEM_REPEAT_BALL compare VAR_RESULT, 0 - goto_eq Route116_EventScript_1F2D39 + goto_if_eq Route116_EventScript_1F2D39 msgbox Route116_Text_1F3521, MSGBOX_DEFAULT closemessage compare VAR_FACING, 2 @@ -168,10 +165,10 @@ Route116_EventScript_1F2DB6:: @ 81F2DB6 faceplayer checkitem ITEM_BLACK_GLASSES, 1 compare VAR_RESULT, 1 - goto_eq Route116_EventScript_1F2DF1 + goto_if_eq Route116_EventScript_1F2DF1 specialvar VAR_RESULT, FoundBlackGlasses compare VAR_RESULT, 1 - goto_eq Route116_EventScript_1F2DE2 + goto_if_eq Route116_EventScript_1F2DE2 msgbox Route116_Text_1F3657, MSGBOX_DEFAULT release end @@ -187,7 +184,7 @@ Route116_EventScript_1F2DF1:: @ 81F2DF1 msgbox Route116_Text_1F3688, MSGBOX_DEFAULT specialvar VAR_RESULT, FoundBlackGlasses compare VAR_RESULT, 1 - goto_eq Route116_EventScript_1F2E1B + goto_if_eq Route116_EventScript_1F2E1B msgbox Route116_Text_1F375E, MSGBOX_DEFAULT release end @@ -261,18 +258,17 @@ Route116_EventScript_1F2EB7:: @ 81F2EB7 trainerbattle_single TRAINER_JERRY_1, Route116_Text_29BD0C, Route116_Text_29BD66, Route116_EventScript_1F2EF8 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route116_EventScript_1F2F4E + goto_if_eq Route116_EventScript_1F2F4E setvar VAR_0x8004, 273 specialvar VAR_RESULT, sub_813B4E0 compare VAR_RESULT, 0 - goto_eq Route116_EventScript_1F2F22 + goto_if_eq Route116_EventScript_1F2F22 msgbox Route116_Text_29BD92, MSGBOX_DEFAULT release end Route116_EventScript_1F2EF8:: @ 81F2EF8 - checkflag FLAG_HAS_MATCH_CALL - goto_eq Route116_EventScript_1F2F03 + goto_if_set FLAG_HAS_MATCH_CALL, Route116_EventScript_1F2F03 release end @@ -285,8 +281,7 @@ Route116_EventScript_1F2F03:: @ 81F2F03 end Route116_EventScript_1F2F22:: @ 81F2F22 - checkflag FLAG_HAS_MATCH_CALL - goto_eq Route116_EventScript_1F2F35 + goto_if_set FLAG_HAS_MATCH_CALL, Route116_EventScript_1F2F35 msgbox Route116_Text_29BD92, MSGBOX_DEFAULT release end @@ -316,18 +311,17 @@ Route116_EventScript_1F2F93:: @ 81F2F93 trainerbattle_single TRAINER_KAREN_1, Route116_Text_29BFC5, Route116_Text_29BFFA, Route116_EventScript_1F2FD4 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route116_EventScript_1F302A + goto_if_eq Route116_EventScript_1F302A setvar VAR_0x8004, 280 specialvar VAR_RESULT, sub_813B4E0 compare VAR_RESULT, 0 - goto_eq Route116_EventScript_1F2FFE + goto_if_eq Route116_EventScript_1F2FFE msgbox Route116_Text_29C010, MSGBOX_DEFAULT release end Route116_EventScript_1F2FD4:: @ 81F2FD4 - checkflag FLAG_HAS_MATCH_CALL - goto_eq Route116_EventScript_1F2FDF + goto_if_set FLAG_HAS_MATCH_CALL, Route116_EventScript_1F2FDF release end @@ -340,8 +334,7 @@ Route116_EventScript_1F2FDF:: @ 81F2FDF end Route116_EventScript_1F2FFE:: @ 81F2FFE - checkflag FLAG_HAS_MATCH_CALL - goto_eq Route116_EventScript_1F3011 + goto_if_set FLAG_HAS_MATCH_CALL, Route116_EventScript_1F3011 msgbox Route116_Text_29C010, MSGBOX_DEFAULT release end diff --git a/data/maps/Route116_TunnelersRestHouse/scripts.inc b/data/maps/Route116_TunnelersRestHouse/scripts.inc index af5a96675..89ccdce8d 100644 --- a/data/maps/Route116_TunnelersRestHouse/scripts.inc +++ b/data/maps/Route116_TunnelersRestHouse/scripts.inc @@ -17,8 +17,7 @@ Route116_TunnelersRestHouse_EventScript_22B863:: @ 822B863 Route116_TunnelersRestHouse_EventScript_22B86C:: @ 822B86C lock faceplayer - checkflag FLAG_RUSTURF_TUNNEL_OPENED - goto_eq Route116_TunnelersRestHouse_EventScript_22B881 + goto_if_set FLAG_RUSTURF_TUNNEL_OPENED, Route116_TunnelersRestHouse_EventScript_22B881 msgbox Route116_TunnelersRestHouse_Text_22BAAF, MSGBOX_DEFAULT release end diff --git a/data/maps/Route117/scripts.inc b/data/maps/Route117/scripts.inc index 1dbc7167e..4a51c17d8 100644 --- a/data/maps/Route117/scripts.inc +++ b/data/maps/Route117/scripts.inc @@ -7,8 +7,7 @@ Route117_MapScript1_1F3983: @ 81F3983 end Route117_EventScript_1F3989:: @ 81F3989 - checkflag FLAG_PENDING_DAYCARE_EGG - goto_if 0, Route117_EventScript_1F3999 + goto_if_unset FLAG_PENDING_DAYCARE_EGG, Route117_EventScript_1F3999 setobjectxyperm 3, 47, 6 Route117_EventScript_1F3999:: @ 81F3999 @@ -42,7 +41,7 @@ Route117_EventScript_1F39D0:: @ 81F39D0 trainerbattle_single TRAINER_ISAAC_1, Route117_Text_29C43F, Route117_Text_29C47A, Route117_EventScript_1F39FC specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route117_EventScript_1F3A1B + goto_if_eq Route117_EventScript_1F3A1B msgbox Route117_Text_29C498, MSGBOX_DEFAULT release end @@ -64,7 +63,7 @@ Route117_EventScript_1F3A32:: @ 81F3A32 trainerbattle_single TRAINER_LYDIA_1, Route117_Text_29C612, Route117_Text_29C659, Route117_EventScript_1F3A5E specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route117_EventScript_1F3A7D + goto_if_eq Route117_EventScript_1F3A7D msgbox Route117_Text_29C679, MSGBOX_DEFAULT release end @@ -86,7 +85,7 @@ Route117_EventScript_1F3A94:: @ 81F3A94 trainerbattle_single TRAINER_DYLAN_1, Route117_Text_29C7A5, Route117_Text_29C7EB, Route117_EventScript_1F3AC0 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route117_EventScript_1F3ADF + goto_if_eq Route117_EventScript_1F3ADF msgbox Route117_Text_29C800, MSGBOX_DEFAULT release end @@ -108,7 +107,7 @@ Route117_EventScript_1F3AF6:: @ 81F3AF6 trainerbattle_single TRAINER_MARIA_1, Route117_Text_29C955, Route117_Text_29C9A6, Route117_EventScript_1F3B22 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route117_EventScript_1F3B41 + goto_if_eq Route117_EventScript_1F3B41 msgbox Route117_Text_29C9D0, MSGBOX_DEFAULT release end @@ -135,7 +134,7 @@ Route117_EventScript_1F3B6F:: @ 81F3B6F trainerbattle_double TRAINER_ANNA_AND_MEG_1, Route117_Text_29CC4A, Route117_Text_29CC8E, Route117_Text_29CD61, Route117_EventScript_1F3B9F specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route117_EventScript_1F3BB8 + goto_if_eq Route117_EventScript_1F3BB8 msgbox Route117_Text_29CCCB, MSGBOX_DEFAULT release end @@ -155,7 +154,7 @@ Route117_EventScript_1F3BD3:: @ 81F3BD3 trainerbattle_double TRAINER_ANNA_AND_MEG_1, Route117_Text_29CD9D, Route117_Text_29CDE9, Route117_Text_29CE52, Route117_EventScript_1F3C03 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route117_EventScript_1F3C1C + goto_if_eq Route117_EventScript_1F3C1C msgbox Route117_Text_29CE17, MSGBOX_DEFAULT release end diff --git a/data/maps/Route118/scripts.inc b/data/maps/Route118/scripts.inc index e7aac8ac8..09d188971 100644 --- a/data/maps/Route118/scripts.inc +++ b/data/maps/Route118/scripts.inc @@ -28,13 +28,12 @@ Route118_MapScript2_1F3E0A: @ 81F3E0A Route118_EventScript_1F3E14:: @ 81F3E14 lock faceplayer - checkflag FLAG_0x0E3 - goto_eq Route118_EventScript_1F3E69 + goto_if_set FLAG_0x0E3, Route118_EventScript_1F3E69 msgbox Route118_Text_1F427B, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq Route118_EventScript_1F3E3E + goto_if_eq Route118_EventScript_1F3E3E compare VAR_RESULT, 0 - goto_eq Route118_EventScript_1F3E5F + goto_if_eq Route118_EventScript_1F3E5F end Route118_EventScript_1F3E3E:: @ 81F3E3E @@ -190,7 +189,7 @@ Route118_EventScript_1F3F87:: @ 81F3F87 trainerbattle_single TRAINER_ROSE_1, Route118_Text_29D290, Route118_Text_29D2D8, Route118_EventScript_1F3FB3 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route118_EventScript_1F3FD2 + goto_if_eq Route118_EventScript_1F3FD2 msgbox Route118_Text_29D2FA, MSGBOX_DEFAULT release end @@ -222,7 +221,7 @@ Route118_EventScript_1F4017:: @ 81F4017 trainerbattle_single TRAINER_DALTON_1, Route118_Text_29D6AF, Route118_Text_29D6CD, Route118_EventScript_1F4043 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route118_EventScript_1F4062 + goto_if_eq Route118_EventScript_1F4062 msgbox Route118_Text_29D6D8, MSGBOX_DEFAULT release end diff --git a/data/maps/Route119/scripts.inc b/data/maps/Route119/scripts.inc index 544330f9a..dc63f64df 100644 --- a/data/maps/Route119/scripts.inc +++ b/data/maps/Route119/scripts.inc @@ -11,7 +11,7 @@ Route119_MapScript1_1F442F: @ 81F442F Route119_EventScript_1F4439:: @ 81F4439 specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if 5, Route119_EventScript_27374E + goto_if_ne Route119_EventScript_27374E removeobject VAR_LAST_TALKED return @@ -64,9 +64,9 @@ Route119_EventScript_1F4488:: @ 81F4488 delay 30 checkplayergender compare VAR_RESULT, 0 - goto_eq Route119_EventScript_1F450B + goto_if_eq Route119_EventScript_1F450B compare VAR_RESULT, 1 - goto_eq Route119_EventScript_1F4585 + goto_if_eq Route119_EventScript_1F4585 releaseall end @@ -370,7 +370,7 @@ Route119_EventScript_1F4810:: @ 81F4810 trainerbattle_single TRAINER_JACKSON_1, Route119_Text_29DC4C, Route119_Text_29DC9F, Route119_EventScript_1F483C specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route119_EventScript_1F485B + goto_if_eq Route119_EventScript_1F485B msgbox Route119_Text_29DCC6, MSGBOX_DEFAULT release end @@ -392,7 +392,7 @@ Route119_EventScript_1F4872:: @ 81F4872 trainerbattle_single TRAINER_CATHERINE_1, Route119_Text_29DE0F, Route119_Text_29DE5D, Route119_EventScript_1F489E specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route119_EventScript_1F48BD + goto_if_eq Route119_EventScript_1F48BD msgbox Route119_Text_29DE88, MSGBOX_DEFAULT release end diff --git a/data/maps/Route119_WeatherInstitute_1F/scripts.inc b/data/maps/Route119_WeatherInstitute_1F/scripts.inc index 3b36baf91..1131c42b2 100644 --- a/data/maps/Route119_WeatherInstitute_1F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_1F/scripts.inc @@ -17,7 +17,7 @@ Route119_WeatherInstitute_1F_EventScript_26FAA4:: @ 826FAA4 faceplayer special GetPlayerBigGuyGirlString compare VAR_WEATHER_INSTITUTE_STATE, 0 - goto_eq Route119_WeatherInstitute_1F_EventScript_26FABE + goto_if_eq Route119_WeatherInstitute_1F_EventScript_26FABE msgbox Route119_WeatherInstitute_1F_Text_26FCE5, MSGBOX_DEFAULT release end @@ -30,15 +30,14 @@ Route119_WeatherInstitute_1F_EventScript_26FABE:: @ 826FABE Route119_WeatherInstitute_1F_EventScript_26FAC8:: @ 826FAC8 lock faceplayer - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, Route119_WeatherInstitute_1F_EventScript_26FB05 + 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 compare VAR_0x8004, 2 - goto_eq Route119_WeatherInstitute_1F_EventScript_26FB05 + goto_if_eq Route119_WeatherInstitute_1F_EventScript_26FB05 msgbox Route119_WeatherInstitute_1F_Text_26FDE8, MSGBOX_DEFAULT release end diff --git a/data/maps/Route119_WeatherInstitute_2F/scripts.inc b/data/maps/Route119_WeatherInstitute_2F/scripts.inc index 1feda2f60..8cc69383a 100644 --- a/data/maps/Route119_WeatherInstitute_2F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_2F/scripts.inc @@ -87,9 +87,9 @@ Route119_WeatherInstitute_2F_EventScript_27004D:: @ 827004D setvar VAR_TEMP_1, 385 givemon SPECIES_CASTFORM, 25, ITEM_MYSTIC_WATER, 0x0, 0x0, 0 compare VAR_RESULT, 0 - goto_eq Route119_WeatherInstitute_2F_EventScript_270085 + goto_if_eq Route119_WeatherInstitute_2F_EventScript_270085 compare VAR_RESULT, 1 - goto_eq Route119_WeatherInstitute_2F_EventScript_2700AD + goto_if_eq Route119_WeatherInstitute_2F_EventScript_2700AD goto Route119_WeatherInstitute_2F_EventScript_273811 end @@ -97,7 +97,7 @@ Route119_WeatherInstitute_2F_EventScript_270085:: @ 8270085 call Route119_WeatherInstitute_2F_EventScript_2700DB msgbox gUnknown_08273374, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq Route119_WeatherInstitute_2F_EventScript_2700EA + goto_if_eq Route119_WeatherInstitute_2F_EventScript_2700EA call Route119_WeatherInstitute_2F_EventScript_27378B call Route119_WeatherInstitute_2F_EventScript_2723DD goto Route119_WeatherInstitute_2F_EventScript_2700EA @@ -107,7 +107,7 @@ Route119_WeatherInstitute_2F_EventScript_2700AD:: @ 82700AD call Route119_WeatherInstitute_2F_EventScript_2700DB msgbox gUnknown_08273374, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq Route119_WeatherInstitute_2F_EventScript_2700D0 + goto_if_eq Route119_WeatherInstitute_2F_EventScript_2700D0 call Route119_WeatherInstitute_2F_EventScript_273797 goto Route119_WeatherInstitute_2F_EventScript_2700D0 end @@ -132,8 +132,7 @@ Route119_WeatherInstitute_2F_EventScript_2700EA:: @ 82700EA end Route119_WeatherInstitute_2F_EventScript_2700F7:: @ 82700F7 - checkflag FLAG_SYS_GAME_CLEAR - goto_eq Route119_WeatherInstitute_2F_EventScript_27010A + goto_if_set FLAG_SYS_GAME_CLEAR, Route119_WeatherInstitute_2F_EventScript_27010A msgbox Route119_WeatherInstitute_2F_Text_27077E, MSGBOX_DEFAULT release end @@ -145,12 +144,12 @@ Route119_WeatherInstitute_2F_EventScript_27010A:: @ 827010A checkflag FLAG_0x1BF call_if 1, Route119_WeatherInstitute_2F_EventScript_270160 compare VAR_0x8004, 2 - goto_eq Route119_WeatherInstitute_2F_EventScript_270166 + goto_if_eq Route119_WeatherInstitute_2F_EventScript_270166 checkflag FLAG_TEMP_2 call_if 0, Route119_WeatherInstitute_2F_EventScript_270159 specialvar VAR_RESULT, sub_813B374 compare VAR_RESULT, 1 - goto_eq Route119_WeatherInstitute_2F_EventScript_27014F + goto_if_eq Route119_WeatherInstitute_2F_EventScript_27014F msgbox Route119_WeatherInstitute_2F_Text_2707F1, MSGBOX_DEFAULT release end @@ -212,8 +211,7 @@ Route119_WeatherInstitute_2F_Movement_270187: @ 8270187 Route119_WeatherInstitute_2F_EventScript_27018B:: @ 827018B lock faceplayer - checkflag FLAG_0x097 - goto_eq Route119_WeatherInstitute_2F_EventScript_2700F7 + goto_if_set FLAG_0x097, Route119_WeatherInstitute_2F_EventScript_2700F7 goto Route119_WeatherInstitute_2F_EventScript_27004D end diff --git a/data/maps/Route120/scripts.inc b/data/maps/Route120/scripts.inc index 1eed96ece..4c4a086d8 100644 --- a/data/maps/Route120/scripts.inc +++ b/data/maps/Route120/scripts.inc @@ -27,7 +27,7 @@ Route120_EventScript_1F5406:: @ 81F5406 Route120_EventScript_1F5449:: @ 81F5449 specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if 5, Route120_EventScript_27374E + goto_if_ne Route120_EventScript_27374E removeobject 30 removeobject 36 return @@ -35,7 +35,7 @@ Route120_EventScript_1F5449:: @ 81F5449 Route120_EventScript_1F5460:: @ 81F5460 specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if 5, Route120_EventScript_27374E + goto_if_ne Route120_EventScript_27374E removeobject VAR_LAST_TALKED return @@ -72,11 +72,11 @@ Route120_MapScript1_1F54CD: @ 81F54CD Route120_EventScript_1F54D8:: @ 81F54D8 getplayerxy VAR_TEMP_0, VAR_TEMP_1 compare VAR_TEMP_1, 14 - goto_if 3, Route120_EventScript_1F5503 + goto_if_le Route120_EventScript_1F5503 compare VAR_TEMP_1, 60 - goto_if 3, Route120_EventScript_1F5507 + goto_if_le Route120_EventScript_1F5507 compare VAR_TEMP_1, 61 - goto_if 4, Route120_EventScript_1F54FF + goto_if_ge Route120_EventScript_1F54FF return Route120_EventScript_1F54FF:: @ 81F54FF @@ -89,9 +89,9 @@ Route120_EventScript_1F5503:: @ 81F5503 Route120_EventScript_1F5507:: @ 81F5507 compare VAR_TEMP_0, 7 - goto_if 3, Route120_EventScript_1F5523 + goto_if_le Route120_EventScript_1F5523 compare VAR_TEMP_0, 19 - goto_if 3, Route120_EventScript_1F5503 + goto_if_le Route120_EventScript_1F5503 goto Route120_EventScript_1F5523 end @@ -103,8 +103,7 @@ Route120_EventScript_1F5527:: @ 81F5527 lock faceplayer dodailyevents - checkflag FLAG_0x92E - goto_eq Route120_EventScript_1F5625 + goto_if_set FLAG_0x92E, Route120_EventScript_1F5625 msgbox Route120_Text_2A70C7, MSGBOX_YESNO compare VAR_RESULT, 1 call_if 1, Route120_EventScript_1F562F @@ -152,7 +151,7 @@ Route120_EventScript_1F55F6:: @ 81F55F6 Route120_EventScript_1F5601:: @ 81F5601 giveitem_std VAR_0x8004 compare VAR_RESULT, 0 - goto_eq Route120_EventScript_272054 + goto_if_eq Route120_EventScript_272054 setflag FLAG_0x92E msgbox Route120_Text_2A71D5, MSGBOX_DEFAULT release @@ -174,11 +173,10 @@ Route120_EventScript_1F5638:: @ 81F5638 Route120_EventScript_1F5641:: @ 81F5641 lock faceplayer - checkflag FLAG_0x122 - goto_eq Route120_EventScript_1F5672 + goto_if_set FLAG_0x122, Route120_EventScript_1F5672 msgbox Route120_Text_1F5998, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq Route120_EventScript_1F5665 + goto_if_eq Route120_EventScript_1F5665 goto Route120_EventScript_1F568B end @@ -191,7 +189,7 @@ Route120_EventScript_1F5665:: @ 81F5665 Route120_EventScript_1F5672:: @ 81F5672 msgbox Route120_Text_1F5ADE, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq Route120_EventScript_1F5665 + goto_if_eq Route120_EventScript_1F5665 goto Route120_EventScript_1F568B end @@ -222,11 +220,11 @@ Route120_EventScript_1F568B:: @ 81F568B clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 1 - goto_eq Route120_EventScript_1F571C + goto_if_eq Route120_EventScript_1F571C compare VAR_RESULT, 4 - goto_eq Route120_EventScript_1F571C + goto_if_eq Route120_EventScript_1F571C compare VAR_RESULT, 5 - goto_eq Route120_EventScript_1F571C + goto_if_eq Route120_EventScript_1F571C goto Route120_EventScript_1F572C end @@ -299,7 +297,7 @@ Route120_EventScript_1F57EE:: @ 81F57EE trainerbattle_single TRAINER_ROBERT_1, Route120_Text_29E6E3, Route120_Text_29E70A, Route120_EventScript_1F581A specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route120_EventScript_1F5839 + goto_if_eq Route120_EventScript_1F5839 msgbox Route120_Text_29E726, MSGBOX_DEFAULT release end @@ -331,7 +329,7 @@ Route120_EventScript_1F587E:: @ 81F587E trainerbattle_single TRAINER_JEFFREY_1, Route120_Text_29E9D7, Route120_Text_29E9FF, Route120_EventScript_1F58AA specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route120_EventScript_1F58C9 + goto_if_eq Route120_EventScript_1F58C9 msgbox Route120_Text_29EA08, MSGBOX_DEFAULT release end diff --git a/data/maps/Route121/scripts.inc b/data/maps/Route121/scripts.inc index 2d65779e7..ee361d30c 100644 --- a/data/maps/Route121/scripts.inc +++ b/data/maps/Route121/scripts.inc @@ -74,7 +74,7 @@ Route121_EventScript_1F5E8B:: @ 81F5E8B trainerbattle_single TRAINER_WALTER_1, Route121_Text_29F199, Route121_Text_29F20D, Route121_EventScript_1F5EB7 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route121_EventScript_1F5ED6 + goto_if_eq Route121_EventScript_1F5ED6 msgbox Route121_Text_29F21E, MSGBOX_DEFAULT release end @@ -111,7 +111,7 @@ Route121_EventScript_1F5F3A:: @ 81F5F3A trainerbattle_single TRAINER_JESSICA_1, Route121_Text_29F612, Route121_Text_29F641, Route121_EventScript_1F5F66 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route121_EventScript_1F5F85 + goto_if_eq Route121_EventScript_1F5F85 msgbox Route121_Text_29F66F, MSGBOX_DEFAULT release end @@ -153,7 +153,7 @@ Route121_EventScript_1F5FF8:: @ 81F5FF8 trainerbattle_single TRAINER_CRISTIN_1, Route121_Text_29F770, Route121_Text_29F7C1, Route121_EventScript_1F6024 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route121_EventScript_1F6043 + goto_if_eq Route121_EventScript_1F6043 msgbox Route121_Text_29F7D4, MSGBOX_DEFAULT release end diff --git a/data/maps/Route121_SafariZoneEntrance/scripts.inc b/data/maps/Route121_SafariZoneEntrance/scripts.inc index dcc427b0d..4a26d8075 100644 --- a/data/maps/Route121_SafariZoneEntrance/scripts.inc +++ b/data/maps/Route121_SafariZoneEntrance/scripts.inc @@ -34,7 +34,7 @@ Route121_SafariZoneEntrance_EventScript_22BBEF:: @ 822BBEF faceplayer msgbox Route121_SafariZoneEntrance_Text_2A4E46, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq Route121_SafariZoneEntrance_EventScript_22BC0E + goto_if_eq Route121_SafariZoneEntrance_EventScript_22BC0E msgbox Route121_SafariZoneEntrance_Text_2A4E7E, MSGBOX_DEFAULT release end @@ -51,7 +51,7 @@ Route121_SafariZoneEntrance_EventScript_22BC18:: @ 822BC18 showmoneybox 0, 0, 0 msgbox Route121_SafariZoneEntrance_Text_2A4F74, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq Route121_SafariZoneEntrance_EventScript_22BC48 + goto_if_eq Route121_SafariZoneEntrance_EventScript_22BC48 msgbox Route121_SafariZoneEntrance_Text_2A4FD7, MSGBOX_DEFAULT goto Route121_SafariZoneEntrance_EventScript_22BD06 end @@ -59,11 +59,11 @@ Route121_SafariZoneEntrance_EventScript_22BC18:: @ 822BC18 Route121_SafariZoneEntrance_EventScript_22BC48:: @ 822BC48 checkitem ITEM_POKEBLOCK_CASE, 1 compare VAR_RESULT, 0 - goto_eq Route121_SafariZoneEntrance_EventScript_22BCEA + goto_if_eq Route121_SafariZoneEntrance_EventScript_22BCEA call Route121_SafariZoneEntrance_EventScript_22BCBF checkmoney 0x1f4, 0 compare VAR_RESULT, 0 - goto_eq Route121_SafariZoneEntrance_EventScript_22BCF8 + goto_if_eq Route121_SafariZoneEntrance_EventScript_22BCF8 playse SE_REGI msgbox Route121_SafariZoneEntrance_Text_2A501B, MSGBOX_DEFAULT takemoney 0x1f4, 0 @@ -90,10 +90,10 @@ Route121_SafariZoneEntrance_EventScript_22BC48:: @ 822BC48 Route121_SafariZoneEntrance_EventScript_22BCBF:: @ 822BCBF getpartysize compare VAR_RESULT, 6 - goto_if 5, Route121_SafariZoneEntrance_EventScript_22BCE9 + goto_if_ne Route121_SafariZoneEntrance_EventScript_22BCE9 specialvar VAR_RESULT, ScriptCheckFreePokemonStorageSpace compare VAR_RESULT, 1 - goto_eq Route121_SafariZoneEntrance_EventScript_22BCE9 + goto_if_eq Route121_SafariZoneEntrance_EventScript_22BCE9 msgbox Route121_SafariZoneEntrance_Text_2A50E5, MSGBOX_DEFAULT goto Route121_SafariZoneEntrance_EventScript_22BD06 end diff --git a/data/maps/Route123/scripts.inc b/data/maps/Route123/scripts.inc index f2484af83..d56a543da 100644 --- a/data/maps/Route123/scripts.inc +++ b/data/maps/Route123/scripts.inc @@ -9,16 +9,15 @@ Route123_MapScript1_1F614D: @ 81F614D Route123_EventScript_1F6151:: @ 81F6151 lock faceplayer - checkflag FLAG_0x0E8 - goto_eq Route123_EventScript_1F61A0 + goto_if_set FLAG_0x0E8, Route123_EventScript_1F61A0 msgbox Route123_Text_1F641E, MSGBOX_DEFAULT special IsGrassTypeInParty compare VAR_RESULT, 0 - goto_eq Route123_EventScript_1F619E + goto_if_eq Route123_EventScript_1F619E msgbox Route123_Text_1F645D, MSGBOX_DEFAULT giveitem_std ITEM_TM19 compare VAR_RESULT, 0 - goto_eq Route123_EventScript_272054 + goto_if_eq Route123_EventScript_272054 setflag FLAG_0x0E8 msgbox Route123_Text_1F64CF, MSGBOX_DEFAULT release @@ -64,7 +63,7 @@ Route123_EventScript_1F620A:: @ 81F620A trainerbattle_single TRAINER_CAMERON_1, Route123_Text_29FDBA, Route123_Text_29FE1E, Route123_EventScript_1F6236 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route123_EventScript_1F6255 + goto_if_eq Route123_EventScript_1F6255 msgbox Route123_Text_29FE2A, MSGBOX_DEFAULT release end @@ -86,7 +85,7 @@ Route123_EventScript_1F626C:: @ 81F626C trainerbattle_single TRAINER_JACKI_1, Route123_Text_29FF61, Route123_Text_29FFD8, Route123_EventScript_1F6298 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route123_EventScript_1F62B7 + goto_if_eq Route123_EventScript_1F62B7 msgbox Route123_Text_29FFE5, MSGBOX_DEFAULT release end @@ -158,7 +157,7 @@ Route123_EventScript_1F63BC:: @ 81F63BC trainerbattle_single TRAINER_FERNANDO_1, Route123_Text_2A0323, Route123_Text_2A035C, Route123_EventScript_1F63E8 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route123_EventScript_1F6407 + goto_if_eq Route123_EventScript_1F6407 msgbox Route123_Text_2A0389, MSGBOX_DEFAULT release end diff --git a/data/maps/Route123_BerryMastersHouse/scripts.inc b/data/maps/Route123_BerryMastersHouse/scripts.inc index 3ab35b195..a10bf7664 100644 --- a/data/maps/Route123_BerryMastersHouse/scripts.inc +++ b/data/maps/Route123_BerryMastersHouse/scripts.inc @@ -10,15 +10,14 @@ Route123_BerryMastersHouse_EventScript_26F845:: @ 826F845 lock faceplayer dodailyevents - checkflag FLAG_0x92D - goto_eq Route123_BerryMastersHouse_EventScript_26F8B6 + goto_if_set FLAG_0x92D, Route123_BerryMastersHouse_EventScript_26F8B6 msgbox Route123_BerryMastersHouse_Text_2A7386, MSGBOX_DEFAULT random 10 addvar VAR_RESULT, 20 addvar VAR_RESULT, 133 giveitem_std VAR_RESULT compare VAR_RESULT, 0 - goto_eq Route123_BerryMastersHouse_EventScript_272054 + goto_if_eq Route123_BerryMastersHouse_EventScript_272054 setflag FLAG_0x92D msgbox Route123_BerryMastersHouse_Text_2A7428, MSGBOX_DEFAULT random 10 @@ -26,7 +25,7 @@ Route123_BerryMastersHouse_EventScript_26F845:: @ 826F845 addvar VAR_RESULT, 133 giveitem_std VAR_RESULT compare VAR_RESULT, 0 - goto_eq Route123_BerryMastersHouse_EventScript_272054 + goto_if_eq Route123_BerryMastersHouse_EventScript_272054 msgbox Route123_BerryMastersHouse_Text_2A7445, MSGBOX_DEFAULT release end @@ -40,17 +39,16 @@ Route123_BerryMastersHouse_EventScript_26F8C0:: @ 826F8C0 lock faceplayer dodailyevents - checkflag FLAG_0x931 - goto_eq Route123_BerryMastersHouse_EventScript_26FA6F + goto_if_set FLAG_0x931, Route123_BerryMastersHouse_EventScript_26FA6F msgbox Route123_BerryMastersHouse_Text_2A74E6, MSGBOX_DEFAULT setvar VAR_0x8004, 13 call Route123_BerryMastersHouse_EventScript_271E7C lock faceplayer compare VAR_RESULT, 1 - goto_eq Route123_BerryMastersHouse_EventScript_26F909 + goto_if_eq Route123_BerryMastersHouse_EventScript_26F909 compare VAR_RESULT, 0 - goto_eq Route123_BerryMastersHouse_EventScript_26F8F7 + goto_if_eq Route123_BerryMastersHouse_EventScript_26F8F7 end Route123_BerryMastersHouse_EventScript_26F8F7:: @ 826F8F7 @@ -61,17 +59,17 @@ Route123_BerryMastersHouse_EventScript_26F8F7:: @ 826F8F7 Route123_BerryMastersHouse_EventScript_26F909:: @ 826F909 compare VAR_0x8004, 0 - goto_eq Route123_BerryMastersHouse_EventScript_26F94C + goto_if_eq Route123_BerryMastersHouse_EventScript_26F94C compare VAR_0x8004, 1 - goto_eq Route123_BerryMastersHouse_EventScript_26F97A + goto_if_eq Route123_BerryMastersHouse_EventScript_26F97A compare VAR_0x8004, 2 - goto_eq Route123_BerryMastersHouse_EventScript_26F9AB + goto_if_eq Route123_BerryMastersHouse_EventScript_26F9AB compare VAR_0x8004, 3 - goto_eq Route123_BerryMastersHouse_EventScript_26F9DC + goto_if_eq Route123_BerryMastersHouse_EventScript_26F9DC compare VAR_0x8004, 4 - goto_eq Route123_BerryMastersHouse_EventScript_26FA0D + goto_if_eq Route123_BerryMastersHouse_EventScript_26FA0D compare VAR_0x8004, 5 - goto_eq Route123_BerryMastersHouse_EventScript_26FA3E + goto_if_eq Route123_BerryMastersHouse_EventScript_26FA3E end Route123_BerryMastersHouse_EventScript_26F94C:: @ 826F94C @@ -80,62 +78,57 @@ Route123_BerryMastersHouse_EventScript_26F94C:: @ 826F94C addvar VAR_RESULT, 133 giveitem_std VAR_RESULT compare VAR_RESULT, 0 - goto_eq Route123_BerryMastersHouse_EventScript_272054 + goto_if_eq Route123_BerryMastersHouse_EventScript_272054 goto Route123_BerryMastersHouse_EventScript_26FA79 release end Route123_BerryMastersHouse_EventScript_26F97A:: @ 826F97A - checkflag FLAG_0x0F8 - goto_eq Route123_BerryMastersHouse_EventScript_26F94C + goto_if_set FLAG_0x0F8, Route123_BerryMastersHouse_EventScript_26F94C msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT giveitem_std ITEM_SPELON_BERRY compare VAR_RESULT, 0 - goto_eq Route123_BerryMastersHouse_EventScript_272054 + goto_if_eq Route123_BerryMastersHouse_EventScript_272054 setflag FLAG_0x0F8 goto Route123_BerryMastersHouse_EventScript_26FA79 end Route123_BerryMastersHouse_EventScript_26F9AB:: @ 826F9AB - checkflag FLAG_0x0F9 - goto_eq Route123_BerryMastersHouse_EventScript_26F94C + goto_if_set FLAG_0x0F9, Route123_BerryMastersHouse_EventScript_26F94C msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT giveitem_std ITEM_PAMTRE_BERRY compare VAR_RESULT, 0 - goto_eq Route123_BerryMastersHouse_EventScript_272054 + goto_if_eq Route123_BerryMastersHouse_EventScript_272054 setflag FLAG_0x0F9 goto Route123_BerryMastersHouse_EventScript_26FA79 end Route123_BerryMastersHouse_EventScript_26F9DC:: @ 826F9DC - checkflag FLAG_0x0FA - goto_eq Route123_BerryMastersHouse_EventScript_26F94C + goto_if_set FLAG_0x0FA, Route123_BerryMastersHouse_EventScript_26F94C msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT giveitem_std ITEM_WATMEL_BERRY compare VAR_RESULT, 0 - goto_eq Route123_BerryMastersHouse_EventScript_272054 + goto_if_eq Route123_BerryMastersHouse_EventScript_272054 setflag FLAG_0x0FA goto Route123_BerryMastersHouse_EventScript_26FA79 end Route123_BerryMastersHouse_EventScript_26FA0D:: @ 826FA0D - checkflag FLAG_0x0FB - goto_eq Route123_BerryMastersHouse_EventScript_26F94C + goto_if_set FLAG_0x0FB, Route123_BerryMastersHouse_EventScript_26F94C msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT giveitem_std ITEM_DURIN_BERRY compare VAR_RESULT, 0 - goto_eq Route123_BerryMastersHouse_EventScript_272054 + goto_if_eq Route123_BerryMastersHouse_EventScript_272054 setflag FLAG_0x0FB goto Route123_BerryMastersHouse_EventScript_26FA79 end Route123_BerryMastersHouse_EventScript_26FA3E:: @ 826FA3E - checkflag FLAG_0x0FC - goto_eq Route123_BerryMastersHouse_EventScript_26F94C + goto_if_set FLAG_0x0FC, Route123_BerryMastersHouse_EventScript_26F94C msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT giveitem_std ITEM_BELUE_BERRY compare VAR_RESULT, 0 - goto_eq Route123_BerryMastersHouse_EventScript_272054 + goto_if_eq Route123_BerryMastersHouse_EventScript_272054 setflag FLAG_0x0FC goto Route123_BerryMastersHouse_EventScript_26FA79 end diff --git a/data/maps/Route124/scripts.inc b/data/maps/Route124/scripts.inc index b7c40b034..374c64f4c 100644 --- a/data/maps/Route124/scripts.inc +++ b/data/maps/Route124/scripts.inc @@ -25,7 +25,7 @@ Route124_EventScript_1F65B3:: @ 81F65B3 trainerbattle_single TRAINER_JENNY_1, Route124_Text_2A0B37, Route124_Text_2A0B7C, Route124_EventScript_1F65DF specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route124_EventScript_1F65FE + goto_if_eq Route124_EventScript_1F65FE msgbox Route124_Text_2A0B9A, MSGBOX_DEFAULT release end @@ -57,7 +57,7 @@ Route124_EventScript_1F6643:: @ 81F6643 trainerbattle_double TRAINER_LILA_AND_ROY_1, Route124_Text_2A0E87, Route124_Text_2A0EFE, Route124_Text_2A0F8C, Route124_EventScript_1F6673 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route124_EventScript_1F668C + goto_if_eq Route124_EventScript_1F668C msgbox Route124_Text_2A0F3A, MSGBOX_DEFAULT release end @@ -77,7 +77,7 @@ Route124_EventScript_1F66A7:: @ 81F66A7 trainerbattle_double TRAINER_LILA_AND_ROY_1, Route124_Text_2A0FD1, Route124_Text_2A1012, Route124_Text_2A10E5, Route124_EventScript_1F66D7 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route124_EventScript_1F66F0 + goto_if_eq Route124_EventScript_1F66F0 msgbox Route124_Text_2A103E, MSGBOX_DEFAULT release end diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc b/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc index 8ac5ccf43..d392d692d 100644 --- a/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc +++ b/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc @@ -9,8 +9,7 @@ Route124_DivingTreasureHuntersHouse_MapScript1_270A2E: @ 8270A2E Route124_DivingTreasureHuntersHouse_EventScript_270A32:: @ 8270A32 lock faceplayer - checkflag FLAG_0x0D9 - goto_eq Route124_DivingTreasureHuntersHouse_EventScript_270A4E + goto_if_set FLAG_0x0D9, Route124_DivingTreasureHuntersHouse_EventScript_270A4E msgbox Route124_DivingTreasureHuntersHouse_Text_270F6C, MSGBOX_DEFAULT setflag FLAG_0x0D9 goto Route124_DivingTreasureHuntersHouse_EventScript_270A5C @@ -24,7 +23,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_270A4E:: @ 8270A4E Route124_DivingTreasureHuntersHouse_EventScript_270A5C:: @ 8270A5C call Route124_DivingTreasureHuntersHouse_EventScript_270A72 compare VAR_TEMP_1, 0 - goto_eq Route124_DivingTreasureHuntersHouse_EventScript_270F57 + goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_270F57 goto Route124_DivingTreasureHuntersHouse_EventScript_270AD0 end @@ -248,13 +247,13 @@ Route124_DivingTreasureHuntersHouse_EventScript_270EC0:: @ 8270EC0 bufferitemname 1, VAR_0x8009 msgbox Route124_DivingTreasureHuntersHouse_Text_271132, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq Route124_DivingTreasureHuntersHouse_EventScript_270F4D + goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_270F4D checkitemspace VAR_0x8009, 1 compare VAR_RESULT, 1 - goto_eq Route124_DivingTreasureHuntersHouse_EventScript_270F01 + goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_270F01 checkitem VAR_0x8008, 2 compare VAR_RESULT, 0 - goto_eq Route124_DivingTreasureHuntersHouse_EventScript_270F01 + goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_270F01 goto Route124_DivingTreasureHuntersHouse_EventScript_270F43 end @@ -264,10 +263,10 @@ Route124_DivingTreasureHuntersHouse_EventScript_270F01:: @ 8270F01 msgbox Route124_DivingTreasureHuntersHouse_Text_271158, MSGBOX_DEFAULT call Route124_DivingTreasureHuntersHouse_EventScript_270A72 compare VAR_TEMP_1, 0 - goto_eq Route124_DivingTreasureHuntersHouse_EventScript_270F61 + goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_270F61 msgbox Route124_DivingTreasureHuntersHouse_Text_27117B, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq Route124_DivingTreasureHuntersHouse_EventScript_270ADE + goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_270ADE goto Route124_DivingTreasureHuntersHouse_EventScript_270F4D end diff --git a/data/maps/Route125/scripts.inc b/data/maps/Route125/scripts.inc index 528eda704..1aee88596 100644 --- a/data/maps/Route125/scripts.inc +++ b/data/maps/Route125/scripts.inc @@ -50,7 +50,7 @@ Route125_EventScript_1F6800:: @ 81F6800 trainerbattle_single TRAINER_ERNEST_1, Route125_Text_2A16FC, Route125_Text_2A173A, Route125_EventScript_1F682C specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route125_EventScript_1F684B + goto_if_eq Route125_EventScript_1F684B msgbox Route125_Text_2A1755, MSGBOX_DEFAULT release end diff --git a/data/maps/Route126/scripts.inc b/data/maps/Route126/scripts.inc index 0be11144a..df8e289a6 100644 --- a/data/maps/Route126/scripts.inc +++ b/data/maps/Route126/scripts.inc @@ -46,7 +46,7 @@ Route126_EventScript_1F6977:: @ 81F6977 trainerbattle_single TRAINER_PABLO_1, Route126_Text_2A1EA5, Route126_Text_2A1EE3, Route126_EventScript_1F69A3 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route126_EventScript_1F69C2 + goto_if_eq Route126_EventScript_1F69C2 msgbox Route126_Text_2A1F10, MSGBOX_DEFAULT release end diff --git a/data/maps/Route127/scripts.inc b/data/maps/Route127/scripts.inc index f9c3290b9..4407a1157 100644 --- a/data/maps/Route127/scripts.inc +++ b/data/maps/Route127/scripts.inc @@ -65,7 +65,7 @@ Route127_EventScript_1F6AD6:: @ 81F6AD6 trainerbattle_single TRAINER_KOJI_1, Route127_Text_2A264D, Route127_Text_2A2685, Route127_EventScript_1F6B02 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route127_EventScript_1F6B21 + goto_if_eq Route127_EventScript_1F6B21 msgbox Route127_Text_2A26AC, MSGBOX_DEFAULT release end diff --git a/data/maps/Route128/scripts.inc b/data/maps/Route128/scripts.inc index b593528ab..feeb134e0 100644 --- a/data/maps/Route128/scripts.inc +++ b/data/maps/Route128/scripts.inc @@ -179,7 +179,7 @@ Route128_EventScript_1F6CBE:: @ 81F6CBE trainerbattle_single TRAINER_ISAIAH_1, Route128_Text_2A287F, Route128_Text_2A28AB, Route128_EventScript_1F6CEA specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route128_EventScript_1F6D09 + goto_if_eq Route128_EventScript_1F6D09 msgbox Route128_Text_2A28D7, MSGBOX_DEFAULT release end @@ -201,7 +201,7 @@ Route128_EventScript_1F6D20:: @ 81F6D20 trainerbattle_single TRAINER_KATELYN_1, Route128_Text_2A2A1F, Route128_Text_2A2A94, Route128_EventScript_1F6D4C specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route128_EventScript_1F6D6B + goto_if_eq Route128_EventScript_1F6D6B msgbox Route128_Text_2A2AB7, MSGBOX_DEFAULT release end diff --git a/data/maps/Route130/scripts.inc b/data/maps/Route130/scripts.inc index 6698837d2..57d5b199b 100644 --- a/data/maps/Route130/scripts.inc +++ b/data/maps/Route130/scripts.inc @@ -7,7 +7,7 @@ Route130_MapScript1_1F7365: @ 81F7365 call_if 4, Route130_EventScript_1F73B5 specialvar VAR_RESULT, IsMirageIslandPresent compare VAR_RESULT, 1 - goto_eq Route130_EventScript_1F73B1 + goto_if_eq Route130_EventScript_1F73B1 setflag FLAG_TEMP_11 setflag FLAG_TEMP_12 setflag FLAG_TEMP_13 diff --git a/data/maps/RustboroCity/scripts.inc b/data/maps/RustboroCity/scripts.inc index 26b1357a5..8dfda64bf 100644 --- a/data/maps/RustboroCity/scripts.inc +++ b/data/maps/RustboroCity/scripts.inc @@ -10,12 +10,12 @@ RustboroCity_MapScript1_1E06C8: @ 81E06C8 call_if 1, RustboroCity_EventScript_1E0707 getplayerxy VAR_TEMP_0, VAR_TEMP_1 compare VAR_0x405A, 6 - goto_eq RustboroCity_EventScript_1E06EC + goto_if_eq RustboroCity_EventScript_1E06EC end RustboroCity_EventScript_1E06EC:: @ 81E06EC compare VAR_TEMP_0, 11 - goto_eq RustboroCity_EventScript_1E06FF + goto_if_eq RustboroCity_EventScript_1E06FF setobjectxyperm 15, 12, 15 end @@ -134,8 +134,7 @@ RustboroCity_Movement_1E085D: @ 81E085D RustboroCity_EventScript_1E085F:: @ 81E085F lock faceplayer - checkflag FLAG_0x08E - goto_eq RustboroCity_EventScript_1E0874 + goto_if_set FLAG_0x08E, RustboroCity_EventScript_1E0874 msgbox RustboroCity_Text_1E123F, MSGBOX_DEFAULT release end @@ -159,8 +158,7 @@ RustboroCity_EventScript_1E088A:: @ 81E088A RustboroCity_EventScript_1E0893:: @ 81E0893 lock faceplayer - checkflag FLAG_BADGE01_GET - goto_eq RustboroCity_EventScript_1E08A8 + goto_if_set FLAG_BADGE01_GET, RustboroCity_EventScript_1E08A8 msgbox RustboroCity_Text_1E130D, MSGBOX_DEFAULT release end @@ -173,8 +171,7 @@ RustboroCity_EventScript_1E08A8:: @ 81E08A8 RustboroCity_EventScript_1E08B2:: @ 81E08B2 lock faceplayer - checkflag FLAG_0x0BC - goto_eq RustboroCity_EventScript_1E08C7 + goto_if_set FLAG_0x0BC, RustboroCity_EventScript_1E08C7 msgbox RustboroCity_Text_1E1520, MSGBOX_DEFAULT release end @@ -451,8 +448,7 @@ RustboroCity_Movement_1E0AD5: @ 81E0AD5 RustboroCity_EventScript_1E0ADD:: @ 81E0ADD lock faceplayer - checkflag FLAG_0x08F - goto_eq RustboroCity_EventScript_1E0AF2 + goto_if_set FLAG_0x08F, RustboroCity_EventScript_1E0AF2 msgbox RustboroCity_Text_1E1904, MSGBOX_DEFAULT release end @@ -683,9 +679,9 @@ Route104_EventScript_1E0DD1:: @ 81E0DD1 RustboroCity_EventScript_1E0DD1:: @ 81E0DD1 checkplayergender compare VAR_RESULT, 0 - goto_eq RustboroCity_EventScript_1E0DE9 + goto_if_eq RustboroCity_EventScript_1E0DE9 compare VAR_RESULT, 1 - goto_eq RustboroCity_EventScript_1E0DEE + goto_if_eq RustboroCity_EventScript_1E0DEE return RustboroCity_EventScript_1E0DE9:: @ 81E0DE9 @@ -827,16 +823,14 @@ RustboroCity_EventScript_1E0FB3:: @ 81E0FB3 RustboroCity_EventScript_1E0FF3:: @ 81E0FF3 checkplayergender compare VAR_RESULT, 0 - goto_eq RustboroCity_EventScript_1E100B + goto_if_eq RustboroCity_EventScript_1E100B compare VAR_RESULT, 1 - goto_eq RustboroCity_EventScript_1E1114 + goto_if_eq RustboroCity_EventScript_1E1114 end RustboroCity_EventScript_1E100B:: @ 81E100B - checkflag FLAG_0x0D3 - goto_eq RustboroCity_EventScript_1E10C1 - checkflag FLAG_0x120 - goto_eq RustboroCity_EventScript_1E1070 + goto_if_set FLAG_0x0D3, RustboroCity_EventScript_1E10C1 + goto_if_set FLAG_0x120, RustboroCity_EventScript_1E1070 setflag FLAG_0x120 msgbox RustboroCity_Text_1E1A49, MSGBOX_DEFAULT closemessage @@ -852,7 +846,7 @@ RustboroCity_EventScript_1E100B:: @ 81E100B setvar VAR_0x8008, 0 msgbox RustboroCity_Text_1E1AFA, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq RustboroCity_EventScript_1E1092 + goto_if_eq RustboroCity_EventScript_1E1092 msgbox RustboroCity_Text_1E1BD3, MSGBOX_DEFAULT call RustboroCity_EventScript_1E10D6 releaseall @@ -862,7 +856,7 @@ RustboroCity_EventScript_1E1070:: @ 81E1070 setvar VAR_0x8008, 1 msgbox RustboroCity_Text_1E1C48, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq RustboroCity_EventScript_1E1092 + goto_if_eq RustboroCity_EventScript_1E1092 msgbox RustboroCity_Text_1E1BD3, MSGBOX_DEFAULT releaseall end @@ -906,10 +900,8 @@ RustboroCity_EventScript_1E1101:: @ 81E1101 end RustboroCity_EventScript_1E1114:: @ 81E1114 - checkflag FLAG_0x0D3 - goto_eq RustboroCity_EventScript_1E11C0 - checkflag FLAG_0x120 - goto_eq RustboroCity_EventScript_1E1174 + goto_if_set FLAG_0x0D3, RustboroCity_EventScript_1E11C0 + goto_if_set FLAG_0x120, RustboroCity_EventScript_1E1174 setflag FLAG_0x120 msgbox RustboroCity_Text_1E1D7D, MSGBOX_DEFAULT closemessage @@ -924,7 +916,7 @@ RustboroCity_EventScript_1E1114:: @ 81E1114 setvar VAR_0x4063, 2 msgbox RustboroCity_Text_1E1E34, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq RustboroCity_EventScript_1E1191 + goto_if_eq RustboroCity_EventScript_1E1191 msgbox RustboroCity_Text_1E1F2F, MSGBOX_DEFAULT call RustboroCity_EventScript_1E10D6 releaseall @@ -933,7 +925,7 @@ RustboroCity_EventScript_1E1114:: @ 81E1114 RustboroCity_EventScript_1E1174:: @ 81E1174 msgbox RustboroCity_Text_1E1F76, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq RustboroCity_EventScript_1E1191 + goto_if_eq RustboroCity_EventScript_1E1191 msgbox RustboroCity_Text_1E1F2F, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/RustboroCity_CuttersHouse/scripts.inc b/data/maps/RustboroCity_CuttersHouse/scripts.inc index 1ed908952..b73744094 100644 --- a/data/maps/RustboroCity_CuttersHouse/scripts.inc +++ b/data/maps/RustboroCity_CuttersHouse/scripts.inc @@ -4,8 +4,7 @@ RustboroCity_CuttersHouse_MapScripts:: @ 8215BD3 RustboroCity_CuttersHouse_EventScript_215BD4:: @ 8215BD4 lock faceplayer - checkflag FLAG_0x089 - goto_eq RustboroCity_CuttersHouse_EventScript_215C00 + goto_if_set FLAG_0x089, RustboroCity_CuttersHouse_EventScript_215C00 msgbox RustboroCity_CuttersHouse_Text_215C13, MSGBOX_DEFAULT giveitem_std ITEM_HM01 setflag FLAG_0x089 diff --git a/data/maps/RustboroCity_DevonCorp_1F/scripts.inc b/data/maps/RustboroCity_DevonCorp_1F/scripts.inc index e8314ba04..20aae64a0 100644 --- a/data/maps/RustboroCity_DevonCorp_1F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_1F/scripts.inc @@ -15,10 +15,8 @@ RustboroCity_DevonCorp_1F_EventScript_211255:: @ 8211255 RustboroCity_DevonCorp_1F_EventScript_211261:: @ 8211261 lock faceplayer - checkflag FLAG_0x090 - goto_eq RustboroCity_DevonCorp_1F_EventScript_211289 - checkflag FLAG_0x08E - goto_eq RustboroCity_DevonCorp_1F_EventScript_21127F + goto_if_set FLAG_0x090, RustboroCity_DevonCorp_1F_EventScript_211289 + goto_if_set FLAG_0x08E, RustboroCity_DevonCorp_1F_EventScript_21127F msgbox RustboroCity_DevonCorp_1F_Text_2113D1, MSGBOX_DEFAULT release end @@ -36,12 +34,9 @@ RustboroCity_DevonCorp_1F_EventScript_211289:: @ 8211289 RustboroCity_DevonCorp_1F_EventScript_211293:: @ 8211293 lock faceplayer - checkflag FLAG_0x090 - goto_eq RustboroCity_DevonCorp_1F_EventScript_2112BA - checkflag FLAG_0x08F - goto_eq RustboroCity_DevonCorp_1F_EventScript_2112C4 - checkflag FLAG_0x08E - goto_eq RustboroCity_DevonCorp_1F_EventScript_2112C4 + goto_if_set FLAG_0x090, RustboroCity_DevonCorp_1F_EventScript_2112BA + goto_if_set FLAG_0x08F, RustboroCity_DevonCorp_1F_EventScript_2112C4 + goto_if_set FLAG_0x08E, RustboroCity_DevonCorp_1F_EventScript_2112C4 msgbox RustboroCity_DevonCorp_1F_Text_21151B, MSGBOX_DEFAULT release end @@ -59,12 +54,9 @@ RustboroCity_DevonCorp_1F_EventScript_2112C4:: @ 82112C4 RustboroCity_DevonCorp_1F_EventScript_2112CE:: @ 82112CE lock faceplayer - checkflag FLAG_0x090 - goto_eq RustboroCity_DevonCorp_1F_EventScript_2112F5 - checkflag FLAG_0x08F - goto_eq RustboroCity_DevonCorp_1F_EventScript_2112FF - checkflag FLAG_0x08E - goto_eq RustboroCity_DevonCorp_1F_EventScript_2112FF + goto_if_set FLAG_0x090, RustboroCity_DevonCorp_1F_EventScript_2112F5 + goto_if_set FLAG_0x08F, RustboroCity_DevonCorp_1F_EventScript_2112FF + goto_if_set FLAG_0x08E, RustboroCity_DevonCorp_1F_EventScript_2112FF msgbox RustboroCity_DevonCorp_1F_Text_21131B, MSGBOX_DEFAULT release end diff --git a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc index fc8dd5f79..a83df171e 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc @@ -25,8 +25,7 @@ RustboroCity_DevonCorp_2F_EventScript_211886:: @ 8211886 faceplayer compare VAR_0x40C4, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_211869 - checkflag FLAG_0x11F - goto_eq RustboroCity_DevonCorp_2F_EventScript_2118A6 + goto_if_set FLAG_0x11F, RustboroCity_DevonCorp_2F_EventScript_2118A6 msgbox RustboroCity_DevonCorp_2F_Text_211C50, MSGBOX_DEFAULT release end @@ -41,8 +40,7 @@ RustboroCity_DevonCorp_2F_EventScript_2118B0:: @ 82118B0 faceplayer compare VAR_0x40C4, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_211869 - checkflag FLAG_0x0BC - goto_eq RustboroCity_DevonCorp_2F_EventScript_2118D0 + goto_if_set FLAG_0x0BC, RustboroCity_DevonCorp_2F_EventScript_2118D0 msgbox RustboroCity_DevonCorp_2F_Text_211D9F, MSGBOX_DEFAULT release end @@ -65,16 +63,16 @@ RustboroCity_DevonCorp_2F_EventScript_2118F1:: @ 82118F1 lock faceplayer compare VAR_0x40C4, 2 - goto_eq RustboroCity_DevonCorp_2F_EventScript_211A03 + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211A03 compare VAR_0x40C4, 1 - goto_eq RustboroCity_DevonCorp_2F_EventScript_2119F9 + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_2119F9 msgbox RustboroCity_DevonCorp_2F_Text_211F48, MSGBOX_DEFAULT checkitem ITEM_ROOT_FOSSIL, 1 compare VAR_RESULT, 1 - goto_eq RustboroCity_DevonCorp_2F_EventScript_211933 + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211933 checkitem ITEM_CLAW_FOSSIL, 1 compare VAR_RESULT, 1 - goto_eq RustboroCity_DevonCorp_2F_EventScript_211991 + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211991 release end @@ -87,10 +85,10 @@ RustboroCity_DevonCorp_2F_EventScript_211933:: @ 8211933 waitmovement 0 msgbox RustboroCity_DevonCorp_2F_Text_211FA6, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq RustboroCity_DevonCorp_2F_EventScript_2119EF + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_2119EF checkitem ITEM_CLAW_FOSSIL, 1 compare VAR_RESULT, 1 - goto_eq RustboroCity_DevonCorp_2F_EventScript_211B84 + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211B84 goto RustboroCity_DevonCorp_2F_EventScript_211974 end @@ -112,10 +110,10 @@ RustboroCity_DevonCorp_2F_EventScript_211991:: @ 8211991 waitmovement 0 msgbox RustboroCity_DevonCorp_2F_Text_211FA6, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq RustboroCity_DevonCorp_2F_EventScript_2119EF + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_2119EF checkitem ITEM_ROOT_FOSSIL, 1 compare VAR_RESULT, 1 - goto_eq RustboroCity_DevonCorp_2F_EventScript_211B84 + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211B84 goto RustboroCity_DevonCorp_2F_EventScript_2119D2 end @@ -140,9 +138,9 @@ RustboroCity_DevonCorp_2F_EventScript_2119F9:: @ 82119F9 RustboroCity_DevonCorp_2F_EventScript_211A03:: @ 8211A03 compare VAR_0x40C5, 1 - goto_eq RustboroCity_DevonCorp_2F_EventScript_211A1A + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211A1A compare VAR_0x40C5, 2 - goto_eq RustboroCity_DevonCorp_2F_EventScript_211A2C + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211A2C end RustboroCity_DevonCorp_2F_EventScript_211A1A:: @ 8211A1A @@ -161,9 +159,9 @@ RustboroCity_DevonCorp_2F_EventScript_211A3E:: @ 8211A3E setvar VAR_TEMP_1, 388 givemon SPECIES_LILEEP, 20, ITEM_NONE, 0x0, 0x0, 0 compare VAR_RESULT, 0 - goto_eq RustboroCity_DevonCorp_2F_EventScript_211A6E + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211A6E compare VAR_RESULT, 1 - goto_eq RustboroCity_DevonCorp_2F_EventScript_211A96 + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211A96 goto RustboroCity_DevonCorp_2F_EventScript_273811 end @@ -171,7 +169,7 @@ RustboroCity_DevonCorp_2F_EventScript_211A6E:: @ 8211A6E call RustboroCity_DevonCorp_2F_EventScript_211AC4 msgbox gUnknown_08273374, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq RustboroCity_DevonCorp_2F_EventScript_211AD7 + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211AD7 call RustboroCity_DevonCorp_2F_EventScript_27378B call RustboroCity_DevonCorp_2F_EventScript_2723DD goto RustboroCity_DevonCorp_2F_EventScript_211AD7 @@ -181,7 +179,7 @@ RustboroCity_DevonCorp_2F_EventScript_211A96:: @ 8211A96 call RustboroCity_DevonCorp_2F_EventScript_211AC4 msgbox gUnknown_08273374, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq RustboroCity_DevonCorp_2F_EventScript_211AB9 + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211AB9 call RustboroCity_DevonCorp_2F_EventScript_273797 goto RustboroCity_DevonCorp_2F_EventScript_211AB9 end @@ -210,9 +208,9 @@ RustboroCity_DevonCorp_2F_EventScript_211AE1:: @ 8211AE1 setvar VAR_TEMP_1, 390 givemon SPECIES_ANORITH, 20, ITEM_NONE, 0x0, 0x0, 0 compare VAR_RESULT, 0 - goto_eq RustboroCity_DevonCorp_2F_EventScript_211B11 + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211B11 compare VAR_RESULT, 1 - goto_eq RustboroCity_DevonCorp_2F_EventScript_211B39 + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211B39 goto RustboroCity_DevonCorp_2F_EventScript_273811 end @@ -220,7 +218,7 @@ RustboroCity_DevonCorp_2F_EventScript_211B11:: @ 8211B11 call RustboroCity_DevonCorp_2F_EventScript_211B67 msgbox gUnknown_08273374, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq RustboroCity_DevonCorp_2F_EventScript_211B7A + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211B7A call RustboroCity_DevonCorp_2F_EventScript_27378B call RustboroCity_DevonCorp_2F_EventScript_2723DD goto RustboroCity_DevonCorp_2F_EventScript_211B7A @@ -230,7 +228,7 @@ RustboroCity_DevonCorp_2F_EventScript_211B39:: @ 8211B39 call RustboroCity_DevonCorp_2F_EventScript_211B67 msgbox gUnknown_08273374, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq RustboroCity_DevonCorp_2F_EventScript_211B5C + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211B5C call RustboroCity_DevonCorp_2F_EventScript_273797 goto RustboroCity_DevonCorp_2F_EventScript_211B5C end @@ -284,7 +282,7 @@ RustboroCity_DevonCorp_2F_EventScript_211BCF:: @ 8211BCF compare VAR_0x40C4, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_211869 compare VAR_0x405A, 6 - goto_if 4, RustboroCity_DevonCorp_2F_EventScript_211BF1 + goto_if_ge RustboroCity_DevonCorp_2F_EventScript_211BF1 msgbox RustboroCity_DevonCorp_2F_Text_212338, MSGBOX_DEFAULT release end diff --git a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc index ce5a555ef..a13d38a18 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc @@ -150,10 +150,8 @@ RustboroCity_DevonCorp_3F_Movement_212566: @ 8212566 RustboroCity_DevonCorp_3F_EventScript_21256C:: @ 821256C lock faceplayer - checkflag FLAG_0x110 - goto_eq RustboroCity_DevonCorp_3F_EventScript_2125CC - checkflag FLAG_0x0BD - goto_eq RustboroCity_DevonCorp_3F_EventScript_212595 + goto_if_set FLAG_0x110, RustboroCity_DevonCorp_3F_EventScript_2125CC + goto_if_set FLAG_0x0BD, RustboroCity_DevonCorp_3F_EventScript_212595 msgbox RustboroCity_DevonCorp_3F_Text_212A09, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_2725A2 @@ -165,7 +163,7 @@ RustboroCity_DevonCorp_3F_EventScript_212595:: @ 8212595 msgbox RustboroCity_DevonCorp_3F_Text_212A29, MSGBOX_DEFAULT giveitem_std ITEM_EXP_SHARE compare VAR_RESULT, 0 - goto_eq RustboroCity_DevonCorp_3F_EventScript_272054 + goto_if_eq RustboroCity_DevonCorp_3F_EventScript_272054 setflag FLAG_0x110 msgbox RustboroCity_DevonCorp_3F_Text_212A9E, MSGBOX_DEFAULT closemessage @@ -185,8 +183,7 @@ RustboroCity_DevonCorp_3F_EventScript_2125CC:: @ 82125CC RustboroCity_DevonCorp_3F_EventScript_2125E1:: @ 82125E1 lock faceplayer - checkflag FLAG_0x100 - goto_eq RustboroCity_DevonCorp_3F_EventScript_2125F6 + goto_if_set FLAG_0x100, RustboroCity_DevonCorp_3F_EventScript_2125F6 msgbox RustboroCity_DevonCorp_3F_Text_212E41, MSGBOX_DEFAULT release end diff --git a/data/maps/RustboroCity_Flat1_2F/scripts.inc b/data/maps/RustboroCity_Flat1_2F/scripts.inc index ae0bfcd8e..7798e72e6 100644 --- a/data/maps/RustboroCity_Flat1_2F/scripts.inc +++ b/data/maps/RustboroCity_Flat1_2F/scripts.inc @@ -6,35 +6,35 @@ RustboroCity_Flat1_2F_EventScript_21513A:: @ 821513A faceplayer specialvar VAR_RESULT, TryBufferWaldaPhrase compare VAR_RESULT, 0 - goto_eq RustboroCity_Flat1_2F_EventScript_21518D + goto_if_eq RustboroCity_Flat1_2F_EventScript_21518D compare VAR_RESULT, 1 - goto_eq RustboroCity_Flat1_2F_EventScript_2151AD + goto_if_eq RustboroCity_Flat1_2F_EventScript_2151AD RustboroCity_Flat1_2F_EventScript_215157:: @ 8215157 special DoWaldaNamingScreen waitstate compare VAR_0x8004, 1 - goto_eq RustboroCity_Flat1_2F_EventScript_2151D7 + goto_if_eq RustboroCity_Flat1_2F_EventScript_2151D7 compare VAR_0x8004, 2 - goto_eq RustboroCity_Flat1_2F_EventScript_2151E1 + goto_if_eq RustboroCity_Flat1_2F_EventScript_2151E1 specialvar VAR_RESULT, TryGetWallpaperWithWaldaPhrase compare VAR_RESULT, 1 - goto_eq RustboroCity_Flat1_2F_EventScript_2151F8 + goto_if_eq RustboroCity_Flat1_2F_EventScript_2151F8 compare VAR_RESULT, 0 - goto_eq RustboroCity_Flat1_2F_EventScript_215221 + goto_if_eq RustboroCity_Flat1_2F_EventScript_215221 end RustboroCity_Flat1_2F_EventScript_21518D:: @ 821518D msgbox RustboroCity_Flat1_2F_Text_2152FA, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq RustboroCity_Flat1_2F_EventScript_2151CD + goto_if_eq RustboroCity_Flat1_2F_EventScript_2151CD msgbox RustboroCity_Flat1_2F_Text_2154AD, MSGBOX_DEFAULT goto RustboroCity_Flat1_2F_EventScript_215157 RustboroCity_Flat1_2F_EventScript_2151AD:: @ 82151AD msgbox RustboroCity_Flat1_2F_Text_215448, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq RustboroCity_Flat1_2F_EventScript_2151CD + goto_if_eq RustboroCity_Flat1_2F_EventScript_2151CD msgbox RustboroCity_Flat1_2F_Text_2154AD, MSGBOX_DEFAULT goto RustboroCity_Flat1_2F_EventScript_215157 diff --git a/data/maps/RustboroCity_Flat2_2F/scripts.inc b/data/maps/RustboroCity_Flat2_2F/scripts.inc index d07babf0c..e08d599ac 100644 --- a/data/maps/RustboroCity_Flat2_2F/scripts.inc +++ b/data/maps/RustboroCity_Flat2_2F/scripts.inc @@ -8,12 +8,11 @@ RustboroCity_Flat2_2F_EventScript_215FD8:: @ 8215FD8 RustboroCity_Flat2_2F_EventScript_215FE1:: @ 8215FE1 lock faceplayer - checkflag FLAG_0x0D5 - goto_eq RustboroCity_Flat2_2F_EventScript_216010 + goto_if_set FLAG_0x0D5, RustboroCity_Flat2_2F_EventScript_216010 msgbox RustboroCity_Flat2_2F_Text_21605A, MSGBOX_DEFAULT giveitem_std ITEM_PREMIER_BALL compare VAR_RESULT, 0 - goto_eq RustboroCity_Flat2_2F_EventScript_272054 + goto_if_eq RustboroCity_Flat2_2F_EventScript_272054 setflag FLAG_0x0D5 release end diff --git a/data/maps/RustboroCity_Gym/scripts.inc b/data/maps/RustboroCity_Gym/scripts.inc index 6f161d048..2308c0292 100644 --- a/data/maps/RustboroCity_Gym/scripts.inc +++ b/data/maps/RustboroCity_Gym/scripts.inc @@ -5,9 +5,8 @@ RustboroCity_Gym_EventScript_212F31:: @ 8212F31 trainerbattle_single TRAINER_ROXANNE_1, RustboroCity_Gym_Text_21362A, RustboroCity_Gym_Text_21370B, RustboroCity_Gym_EventScript_212F66, NO_MUSIC specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq RustboroCity_Gym_EventScript_212FC8 - checkflag FLAG_0x0A5 - goto_if 0, RustboroCity_Gym_EventScript_212FA4 + goto_if_eq RustboroCity_Gym_EventScript_212FC8 + goto_if_unset FLAG_0x0A5, RustboroCity_Gym_EventScript_212FA4 msgbox RustboroCity_Gym_Text_2139A7, MSGBOX_DEFAULT release end @@ -31,7 +30,7 @@ RustboroCity_Gym_EventScript_212F66:: @ 8212F66 RustboroCity_Gym_EventScript_212FA4:: @ 8212FA4 giveitem_std ITEM_TM39 compare VAR_RESULT, 0 - goto_eq RustboroCity_Gym_EventScript_272054 + goto_if_eq RustboroCity_Gym_EventScript_272054 setflag FLAG_0x0A5 msgbox RustboroCity_Gym_Text_2138B1, MSGBOX_DEFAULT release @@ -60,8 +59,7 @@ RustboroCity_Gym_EventScript_213011:: @ 8213011 RustboroCity_Gym_EventScript_213028:: @ 8213028 lock faceplayer - checkflag FLAG_0x4F0 - goto_eq RustboroCity_Gym_EventScript_21303D + goto_if_set FLAG_0x4F0, RustboroCity_Gym_EventScript_21303D msgbox RustboroCity_Gym_Text_21309D, MSGBOX_DEFAULT release end @@ -73,15 +71,13 @@ RustboroCity_Gym_EventScript_21303D:: @ 821303D RustboroCity_Gym_EventScript_213047:: @ 8213047 lockall - checkflag FLAG_BADGE01_GET - goto_eq RustboroCity_Gym_EventScript_213067 + goto_if_set FLAG_BADGE01_GET, RustboroCity_Gym_EventScript_213067 goto RustboroCity_Gym_EventScript_213071 end RustboroCity_Gym_EventScript_213057:: @ 8213057 lockall - checkflag FLAG_BADGE01_GET - goto_eq RustboroCity_Gym_EventScript_213067 + goto_if_set FLAG_BADGE01_GET, RustboroCity_Gym_EventScript_213067 goto RustboroCity_Gym_EventScript_213071 end diff --git a/data/maps/RustboroCity_House1/scripts.inc b/data/maps/RustboroCity_House1/scripts.inc index 8bc43c0c2..26a406675 100644 --- a/data/maps/RustboroCity_House1/scripts.inc +++ b/data/maps/RustboroCity_House1/scripts.inc @@ -4,25 +4,24 @@ RustboroCity_House1_MapScripts:: @ 821593E RustboroCity_House1_EventScript_21593F:: @ 821593F lock faceplayer - checkflag FLAG_0x099 - goto_eq RustboroCity_House1_EventScript_2159D5 + goto_if_set FLAG_0x099, RustboroCity_House1_EventScript_2159D5 setvar VAR_0x8008, 0 copyvar VAR_0x8004, VAR_0x8008 specialvar VAR_RESULT, sub_807E73C copyvar VAR_0x8009, VAR_RESULT msgbox RustboroCity_House1_Text_2159E8, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq RustboroCity_House1_EventScript_2159BD + goto_if_eq RustboroCity_House1_EventScript_2159BD special sub_81B94B0 waitstate copyvar VAR_0x800A, VAR_0x8004 compare VAR_0x8004, 255 - goto_eq RustboroCity_House1_EventScript_2159BD + goto_if_eq RustboroCity_House1_EventScript_2159BD copyvar VAR_0x8005, VAR_0x800A specialvar VAR_RESULT, sub_807E9D4 copyvar VAR_0x800B, VAR_RESULT compare VAR_RESULT, VAR_0x8009 - goto_if 5, RustboroCity_House1_EventScript_2159C7 + goto_if_ne RustboroCity_House1_EventScript_2159C7 copyvar VAR_0x8004, VAR_0x8008 copyvar VAR_0x8005, VAR_0x800A special sub_807EA10 diff --git a/data/maps/RustboroCity_Mart/scripts.inc b/data/maps/RustboroCity_Mart/scripts.inc index 17406b0ac..78492e962 100644 --- a/data/maps/RustboroCity_Mart/scripts.inc +++ b/data/maps/RustboroCity_Mart/scripts.inc @@ -6,10 +6,8 @@ RustboroCity_Mart_EventScript_214F06:: @ 8214F06 faceplayer message gUnknown_08272A21 waitmessage - checkflag FLAG_0x11F - goto_if 0, RustboroCity_Mart_EventScript_214F21 - checkflag FLAG_0x11F - goto_eq RustboroCity_Mart_EventScript_214F48 + goto_if_unset FLAG_0x11F, RustboroCity_Mart_EventScript_214F21 + goto_if_set FLAG_0x11F, RustboroCity_Mart_EventScript_214F48 end RustboroCity_Mart_EventScript_214F21:: @ 8214F21 diff --git a/data/maps/RustboroCity_PokemonSchool/scripts.inc b/data/maps/RustboroCity_PokemonSchool/scripts.inc index 330afd30c..93a29241e 100644 --- a/data/maps/RustboroCity_PokemonSchool/scripts.inc +++ b/data/maps/RustboroCity_PokemonSchool/scripts.inc @@ -77,8 +77,7 @@ RustboroCity_PokemonSchool_EventScript_213F8C:: @ 8213F8C RustboroCity_PokemonSchool_EventScript_213F95:: @ 8213F95 lock faceplayer - checkflag FLAG_0x113 - goto_eq RustboroCity_PokemonSchool_EventScript_213FFB + goto_if_set FLAG_0x113, RustboroCity_PokemonSchool_EventScript_213FFB compare VAR_FACING, 4 call_if 1, RustboroCity_PokemonSchool_EventScript_213FE5 compare VAR_FACING, 3 @@ -86,7 +85,7 @@ RustboroCity_PokemonSchool_EventScript_213F95:: @ 8213F95 msgbox RustboroCity_PokemonSchool_Text_214433, MSGBOX_DEFAULT giveitem_std ITEM_QUICK_CLAW compare VAR_RESULT, 0 - goto_eq RustboroCity_PokemonSchool_EventScript_272054 + goto_if_eq RustboroCity_PokemonSchool_EventScript_272054 closemessage applymovement VAR_LAST_TALKED, RustboroCity_PokemonSchool_Movement_2725AA waitmovement 0 @@ -167,12 +166,9 @@ RustboroCity_PokemonSchool_Movement_214027: @ 8214027 RustboroCity_PokemonSchool_EventScript_214040:: @ 8214040 lock faceplayer - checkflag FLAG_0x1CB - goto_eq RustboroCity_PokemonSchool_EventScript_2140A8 - checkflag FLAG_0x136 - goto_eq RustboroCity_PokemonSchool_EventScript_21406F - checkflag FLAG_BADGE01_GET - goto_eq RustboroCity_PokemonSchool_EventScript_214082 + goto_if_set FLAG_0x1CB, RustboroCity_PokemonSchool_EventScript_2140A8 + goto_if_set FLAG_0x136, RustboroCity_PokemonSchool_EventScript_21406F + goto_if_set FLAG_BADGE01_GET, RustboroCity_PokemonSchool_EventScript_214082 msgbox RustboroCity_PokemonSchool_Text_2148C0, MSGBOX_DEFAULT addvar VAR_0x40D1, 1 setflag FLAG_0x136 @@ -180,8 +176,7 @@ RustboroCity_PokemonSchool_EventScript_214040:: @ 8214040 end RustboroCity_PokemonSchool_EventScript_21406F:: @ 821406F - checkflag FLAG_BADGE01_GET - goto_eq RustboroCity_PokemonSchool_EventScript_214090 + goto_if_set FLAG_BADGE01_GET, RustboroCity_PokemonSchool_EventScript_214090 msgbox RustboroCity_PokemonSchool_Text_214A5F, MSGBOX_DEFAULT release end diff --git a/data/maps/RusturfTunnel/scripts.inc b/data/maps/RusturfTunnel/scripts.inc index 48dcaffc9..3d41fad99 100644 --- a/data/maps/RusturfTunnel/scripts.inc +++ b/data/maps/RusturfTunnel/scripts.inc @@ -31,8 +31,7 @@ RusturfTunnel_EventScript_22CE5F:: @ 822CE5F RusturfTunnel_EventScript_22CE76:: @ 822CE76 lock faceplayer - checkflag FLAG_TEMP_1 - goto_eq RusturfTunnel_EventScript_22CE99 + goto_if_set FLAG_TEMP_1, RusturfTunnel_EventScript_22CE99 setflag FLAG_TEMP_1 msgbox RusturfTunnel_Text_22D510, MSGBOX_DEFAULT closemessage diff --git a/data/maps/SSTidalCorridor/scripts.inc b/data/maps/SSTidalCorridor/scripts.inc index f844986c6..6fd607f51 100644 --- a/data/maps/SSTidalCorridor/scripts.inc +++ b/data/maps/SSTidalCorridor/scripts.inc @@ -43,9 +43,9 @@ SSTidalRooms_EventScript_23C03C:: @ 823C03C SSTidalCorridor_EventScript_23C050:: @ 823C050 compare VAR_PORTHOLE_STATE, 2 - goto_eq SSTidalCorridor_EventScript_23C067 + goto_if_eq SSTidalCorridor_EventScript_23C067 compare VAR_PORTHOLE_STATE, 7 - goto_eq SSTidalCorridor_EventScript_23C07D + goto_if_eq SSTidalCorridor_EventScript_23C07D end SSTidalCorridor_EventScript_23C067:: @ 823C067 @@ -115,9 +115,9 @@ SSTidalCorridor_EventScript_23C119:: @ 823C119 lock faceplayer compare VAR_PORTHOLE_STATE, 4 - goto_eq SSTidalCorridor_EventScript_23C13B + goto_if_eq SSTidalCorridor_EventScript_23C13B compare VAR_PORTHOLE_STATE, 8 - goto_eq SSTidalCorridor_EventScript_23C15A + goto_if_eq SSTidalCorridor_EventScript_23C15A msgbox SSTidalCorridor_Text_23C596, MSGBOX_DEFAULT release end @@ -149,9 +149,9 @@ SSTidalCorridor_EventScript_23C179:: @ 823C179 SSTidalCorridor_EventScript_23C17D:: @ 823C17D lockall compare VAR_PORTHOLE_STATE, 2 - goto_eq SSTidalCorridor_EventScript_23C19E + goto_if_eq SSTidalCorridor_EventScript_23C19E compare VAR_PORTHOLE_STATE, 7 - goto_eq SSTidalCorridor_EventScript_23C19E + goto_if_eq SSTidalCorridor_EventScript_23C19E msgbox SSTidalCorridor_Text_23C6C3, MSGBOX_DEFAULT releaseall end @@ -164,8 +164,7 @@ SSTidalCorridor_EventScript_23C19E:: @ 823C19E SSTidalCorridor_EventScript_23C1A3:: @ 823C1A3 lock faceplayer - checkflag FLAG_0x0F7 - goto_eq SSTidalCorridor_EventScript_23C1BD + goto_if_set FLAG_0x0F7, SSTidalCorridor_EventScript_23C1BD call SSTidalCorridor_EventScript_23C1C7 msgbox SSTidalCorridor_Text_23C65E, MSGBOX_DEFAULT release @@ -178,21 +177,21 @@ SSTidalCorridor_EventScript_23C1BD:: @ 823C1BD SSTidalCorridor_EventScript_23C1C7:: @ 823C1C7 checktrainerflag TRAINER_PHILLIP - goto_if 0, SSTidalCorridor_EventScript_23C218 + goto_if_lt SSTidalCorridor_EventScript_23C218 checktrainerflag TRAINER_LEONARD - goto_if 0, SSTidalCorridor_EventScript_23C218 + goto_if_lt SSTidalCorridor_EventScript_23C218 checktrainerflag TRAINER_COLTON - goto_if 0, SSTidalCorridor_EventScript_23C218 + goto_if_lt SSTidalCorridor_EventScript_23C218 checktrainerflag TRAINER_MICAH - goto_if 0, SSTidalCorridor_EventScript_23C218 + goto_if_lt SSTidalCorridor_EventScript_23C218 checktrainerflag TRAINER_THOMAS - goto_if 0, SSTidalCorridor_EventScript_23C218 + goto_if_lt SSTidalCorridor_EventScript_23C218 checktrainerflag TRAINER_LEA_AND_JED - goto_if 0, SSTidalCorridor_EventScript_23C218 + goto_if_lt SSTidalCorridor_EventScript_23C218 checktrainerflag TRAINER_GARRET - goto_if 0, SSTidalCorridor_EventScript_23C218 + goto_if_lt SSTidalCorridor_EventScript_23C218 checktrainerflag TRAINER_NAOMI - goto_if 0, SSTidalCorridor_EventScript_23C218 + goto_if_lt SSTidalCorridor_EventScript_23C218 setflag FLAG_0x0F7 goto SSTidalCorridor_EventScript_23C1BD return diff --git a/data/maps/SSTidalRooms/scripts.inc b/data/maps/SSTidalRooms/scripts.inc index 7d774e491..d4c088536 100644 --- a/data/maps/SSTidalRooms/scripts.inc +++ b/data/maps/SSTidalRooms/scripts.inc @@ -4,12 +4,11 @@ SSTidalRooms_MapScripts:: @ 823C9F1 SSTidalRooms_EventScript_23C9F2:: @ 823C9F2 lock faceplayer - checkflag FLAG_0x104 - goto_eq SSTidalRooms_EventScript_23CA29 + goto_if_set FLAG_0x104, SSTidalRooms_EventScript_23CA29 msgbox SSTidalRooms_Text_23D098, MSGBOX_DEFAULT giveitem_std ITEM_TM49 compare VAR_RESULT, 0 - goto_eq SSTidalRooms_EventScript_272054 + goto_if_eq SSTidalRooms_EventScript_272054 setflag FLAG_0x104 msgbox SSTidalRooms_Text_23D145, MSGBOX_DEFAULT release diff --git a/data/maps/SafariZone_South/scripts.inc b/data/maps/SafariZone_South/scripts.inc index 8e9a20ad6..813c72022 100644 --- a/data/maps/SafariZone_South/scripts.inc +++ b/data/maps/SafariZone_South/scripts.inc @@ -51,11 +51,10 @@ SafariZone_South_EventScript_23D2DC:: @ 823D2DC SafariZone_South_EventScript_23D2E5:: @ 823D2E5 lock faceplayer - checkflag FLAG_0x05D - goto_if 0, SafariZone_South_EventScript_23D30D + goto_if_unset FLAG_0x05D, SafariZone_South_EventScript_23D30D msgbox SafariZone_South_Text_2A51D4, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq SafariZone_South_EventScript_23D31A + goto_if_eq SafariZone_South_EventScript_23D31A msgbox SafariZone_South_Text_2A521A, MSGBOX_DEFAULT release end diff --git a/data/maps/SeafloorCavern_Entrance/scripts.inc b/data/maps/SeafloorCavern_Entrance/scripts.inc index cb41b7ca6..8fa90b274 100644 --- a/data/maps/SeafloorCavern_Entrance/scripts.inc +++ b/data/maps/SeafloorCavern_Entrance/scripts.inc @@ -10,7 +10,7 @@ SeafloorCavern_Entrance_MapScript1_234474: @ 8234474 SeafloorCavern_Entrance_EventScript_234485:: @ 8234485 lockall compare VAR_0x40D9, 1 - goto_eq SeafloorCavern_Entrance_EventScript_2344ED + goto_if_eq SeafloorCavern_Entrance_EventScript_2344ED waitse playse SE_PIN applymovement 1, SeafloorCavern_Entrance_Movement_272598 diff --git a/data/maps/SealedChamber_InnerRoom/scripts.inc b/data/maps/SealedChamber_InnerRoom/scripts.inc index a906d338e..36836fb49 100644 --- a/data/maps/SealedChamber_InnerRoom/scripts.inc +++ b/data/maps/SealedChamber_InnerRoom/scripts.inc @@ -6,11 +6,10 @@ SealedChamber_InnerRoom_EventScript_2391F8:: @ 82391F8 braillemessage SealedChamber_InnerRoom_Braille_2A6B99 waitbuttonpress hidebox2 - checkflag FLAG_0x0E4 - goto_eq SealedChamber_InnerRoom_EventScript_239253 + goto_if_set FLAG_0x0E4, SealedChamber_InnerRoom_EventScript_239253 specialvar VAR_RESULT, CheckRelicanthWailord compare VAR_RESULT, 0 - goto_eq SealedChamber_InnerRoom_EventScript_239253 + goto_if_eq SealedChamber_InnerRoom_EventScript_239253 fadeoutbgm 0 playse SE_TRACK_MOVE special DoSealedChamberShakingEffect1 diff --git a/data/maps/SealedChamber_OuterRoom/scripts.inc b/data/maps/SealedChamber_OuterRoom/scripts.inc index 7d3e32479..a46e1e275 100644 --- a/data/maps/SealedChamber_OuterRoom/scripts.inc +++ b/data/maps/SealedChamber_OuterRoom/scripts.inc @@ -109,8 +109,7 @@ SealedChamber_OuterRoom_EventScript_2391C6:: @ 82391C6 SealedChamber_OuterRoom_EventScript_2391D0:: @ 82391D0 lockall - checkflag FLAG_SYS_BRAILLE_DIG - goto_eq SealedChamber_OuterRoom_EventScript_2391E3 + goto_if_set FLAG_SYS_BRAILLE_DIG, SealedChamber_OuterRoom_EventScript_2391E3 braillemessage SealedChamber_OuterRoom_Braille_2A6B89 waitbuttonpress hidebox2 diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc b/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc index 7d63928ab..459507bc2 100644 --- a/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc @@ -4,8 +4,7 @@ ShoalCave_LowTideEntranceRoom_MapScripts:: @ 8236DBA ShoalCave_LowTideEntranceRoom_MapScript1_236DC0: @ 8236DC0 special UpdateShoalTideFlag - checkflag FLAG_SYS_SHOAL_TIDE - goto_eq ShoalCave_LowTideEntranceRoom_EventScript_236DD1 + goto_if_set FLAG_SYS_SHOAL_TIDE, ShoalCave_LowTideEntranceRoom_EventScript_236DD1 goto ShoalCave_LowTideEntranceRoom_EventScript_236DD5 ShoalCave_LowTideEntranceRoom_EventScript_236DD1:: @ 8236DD1 @@ -24,24 +23,24 @@ ShoalCave_LowTideEntranceRoom_EventScript_236DD9:: @ 8236DD9 call_if 1, ShoalCave_LowTideEntranceRoom_EventScript_236ED9 checkitem ITEM_SHOAL_SALT, 4 compare VAR_RESULT, 0 - goto_eq ShoalCave_LowTideEntranceRoom_EventScript_236E9B + goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_236E9B checkitem ITEM_SHOAL_SHELL, 4 compare VAR_RESULT, 0 - goto_eq ShoalCave_LowTideEntranceRoom_EventScript_236E9B + goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_236E9B msgbox ShoalCave_LowTideEntranceRoom_Text_2A7F37, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq ShoalCave_LowTideEntranceRoom_EventScript_236ECF + goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_236ECF checkitemspace ITEM_SHELL_BELL, 1 compare VAR_RESULT, 0 call_if 1, ShoalCave_LowTideEntranceRoom_EventScript_236E69 compare VAR_RESULT, 2 - goto_eq ShoalCave_LowTideEntranceRoom_EventScript_236E91 + goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_236E91 msgbox ShoalCave_LowTideEntranceRoom_Text_2A7FAC, MSGBOX_DEFAULT takeitem ITEM_SHOAL_SALT, 4 takeitem ITEM_SHOAL_SHELL, 4 giveitem_std ITEM_SHELL_BELL compare VAR_RESULT, 0 - goto_eq ShoalCave_LowTideEntranceRoom_EventScript_272054 + goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_272054 msgbox ShoalCave_LowTideEntranceRoom_Text_2A8012, MSGBOX_DEFAULT setflag FLAG_TEMP_2 release @@ -50,13 +49,13 @@ ShoalCave_LowTideEntranceRoom_EventScript_236DD9:: @ 8236DD9 ShoalCave_LowTideEntranceRoom_EventScript_236E69:: @ 8236E69 checkitem ITEM_SHOAL_SALT, 5 compare VAR_RESULT, 1 - goto_eq ShoalCave_LowTideEntranceRoom_EventScript_236E7A + goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_236E7A return ShoalCave_LowTideEntranceRoom_EventScript_236E7A:: @ 8236E7A checkitem ITEM_SHOAL_SHELL, 5 compare VAR_RESULT, 1 - goto_eq ShoalCave_LowTideEntranceRoom_EventScript_236E8B + goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_236E8B return ShoalCave_LowTideEntranceRoom_EventScript_236E8B:: @ 8236E8B @@ -71,10 +70,10 @@ ShoalCave_LowTideEntranceRoom_EventScript_236E91:: @ 8236E91 ShoalCave_LowTideEntranceRoom_EventScript_236E9B:: @ 8236E9B checkitem ITEM_SHOAL_SALT, 1 compare VAR_RESULT, 1 - goto_eq ShoalCave_LowTideEntranceRoom_EventScript_236EC5 + goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_236EC5 checkitem ITEM_SHOAL_SHELL, 1 compare VAR_RESULT, 1 - goto_eq ShoalCave_LowTideEntranceRoom_EventScript_236EC5 + goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_236EC5 msgbox ShoalCave_LowTideEntranceRoom_Text_2A7E0E, MSGBOX_DEFAULT release end diff --git a/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc b/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc index a92e84e3a..226f89708 100644 --- a/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc @@ -4,8 +4,7 @@ ShoalCave_LowTideInnerRoom_MapScripts:: @ 8236EF5 .byte 0 ShoalCave_LowTideInnerRoom_MapScript1_236F00: @ 8236F00 - checkflag FLAG_SYS_SHOAL_TIDE - goto_eq ShoalCave_LowTideInnerRoom_EventScript_236F0E + goto_if_set FLAG_SYS_SHOAL_TIDE, ShoalCave_LowTideInnerRoom_EventScript_236F0E goto ShoalCave_LowTideInnerRoom_EventScript_236F12 ShoalCave_LowTideInnerRoom_EventScript_236F0E:: @ 8236F0E @@ -21,47 +20,39 @@ ShoalCave_LowTideInnerRoom_MapScript1_236F16: @ 8236F16 end ShoalCave_LowTideInnerRoom_EventScript_236F1C:: @ 8236F1C - checkflag FLAG_0x3B8 - goto_eq ShoalCave_LowTideInnerRoom_EventScript_236F3D - checkflag FLAG_SYS_SHOAL_TIDE - goto_eq ShoalCave_LowTideInnerRoom_EventScript_236F3D + goto_if_set FLAG_0x3B8, ShoalCave_LowTideInnerRoom_EventScript_236F3D + goto_if_set FLAG_SYS_SHOAL_TIDE, ShoalCave_LowTideInnerRoom_EventScript_236F3D setmetatile 31, 8, 856, 1 goto ShoalCave_LowTideInnerRoom_EventScript_236F3D end ShoalCave_LowTideInnerRoom_EventScript_236F3D:: @ 8236F3D - checkflag FLAG_0x3B9 - goto_eq ShoalCave_LowTideInnerRoom_EventScript_236F5E - checkflag FLAG_SYS_SHOAL_TIDE - goto_eq ShoalCave_LowTideInnerRoom_EventScript_236F5E + goto_if_set FLAG_0x3B9, ShoalCave_LowTideInnerRoom_EventScript_236F5E + goto_if_set FLAG_SYS_SHOAL_TIDE, ShoalCave_LowTideInnerRoom_EventScript_236F5E setmetatile 14, 26, 856, 1 goto ShoalCave_LowTideInnerRoom_EventScript_236F5E end ShoalCave_LowTideInnerRoom_EventScript_236F5E:: @ 8236F5E - checkflag FLAG_0x3BC - goto_eq ShoalCave_LowTideInnerRoom_EventScript_236F76 + goto_if_set FLAG_0x3BC, ShoalCave_LowTideInnerRoom_EventScript_236F76 setmetatile 41, 20, 857, 1 goto ShoalCave_LowTideInnerRoom_EventScript_236F76 end ShoalCave_LowTideInnerRoom_EventScript_236F76:: @ 8236F76 - checkflag FLAG_0x3BD - goto_eq ShoalCave_LowTideInnerRoom_EventScript_236F8E + goto_if_set FLAG_0x3BD, ShoalCave_LowTideInnerRoom_EventScript_236F8E setmetatile 41, 10, 857, 1 goto ShoalCave_LowTideInnerRoom_EventScript_236F8E end ShoalCave_LowTideInnerRoom_EventScript_236F8E:: @ 8236F8E - checkflag FLAG_0x3BE - goto_eq ShoalCave_LowTideInnerRoom_EventScript_236FA6 + goto_if_set FLAG_0x3BE, ShoalCave_LowTideInnerRoom_EventScript_236FA6 setmetatile 6, 9, 857, 1 goto ShoalCave_LowTideInnerRoom_EventScript_236FA6 end ShoalCave_LowTideInnerRoom_EventScript_236FA6:: @ 8236FA6 - checkflag FLAG_0x3BF - goto_eq ShoalCave_LowTideInnerRoom_EventScript_236FB9 + goto_if_set FLAG_0x3BF, ShoalCave_LowTideInnerRoom_EventScript_236FB9 setmetatile 16, 13, 857, 1 return @@ -70,11 +61,10 @@ ShoalCave_LowTideInnerRoom_EventScript_236FB9:: @ 8236FB9 ShoalCave_LowTideInnerRoom_EventScript_236FBA:: @ 8236FBA lockall - checkflag FLAG_0x3BC - goto_eq ShoalCave_LowTideInnerRoom_EventScript_236FEC + goto_if_set FLAG_0x3BC, ShoalCave_LowTideInnerRoom_EventScript_236FEC giveitem_std ITEM_SHOAL_SHELL compare VAR_RESULT, 0 - goto_eq ShoalCave_LowTideInnerRoom_EventScript_272054 + goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_272054 setmetatile 41, 20, 859, 0 special DrawWholeMapView setflag FLAG_0x3BC @@ -88,11 +78,10 @@ ShoalCave_LowTideInnerRoom_EventScript_236FEC:: @ 8236FEC ShoalCave_LowTideInnerRoom_EventScript_236FF6:: @ 8236FF6 lockall - checkflag FLAG_0x3BD - goto_eq ShoalCave_LowTideInnerRoom_EventScript_236FEC + goto_if_set FLAG_0x3BD, ShoalCave_LowTideInnerRoom_EventScript_236FEC giveitem_std ITEM_SHOAL_SHELL compare VAR_RESULT, 0 - goto_eq ShoalCave_LowTideInnerRoom_EventScript_272054 + goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_272054 setmetatile 41, 10, 859, 0 special DrawWholeMapView setflag FLAG_0x3BD @@ -101,11 +90,10 @@ ShoalCave_LowTideInnerRoom_EventScript_236FF6:: @ 8236FF6 ShoalCave_LowTideInnerRoom_EventScript_237028:: @ 8237028 lockall - checkflag FLAG_0x3BE - goto_eq ShoalCave_LowTideInnerRoom_EventScript_236FEC + goto_if_set FLAG_0x3BE, ShoalCave_LowTideInnerRoom_EventScript_236FEC giveitem_std ITEM_SHOAL_SHELL compare VAR_RESULT, 0 - goto_eq ShoalCave_LowTideInnerRoom_EventScript_272054 + goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_272054 setmetatile 6, 9, 859, 0 special DrawWholeMapView setflag FLAG_0x3BE @@ -114,11 +102,10 @@ ShoalCave_LowTideInnerRoom_EventScript_237028:: @ 8237028 ShoalCave_LowTideInnerRoom_EventScript_23705A:: @ 823705A lockall - checkflag FLAG_0x3BF - goto_eq ShoalCave_LowTideInnerRoom_EventScript_236FEC + goto_if_set FLAG_0x3BF, ShoalCave_LowTideInnerRoom_EventScript_236FEC giveitem_std ITEM_SHOAL_SHELL compare VAR_RESULT, 0 - goto_eq ShoalCave_LowTideInnerRoom_EventScript_272054 + goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_272054 setmetatile 16, 13, 859, 0 special DrawWholeMapView setflag FLAG_0x3BF @@ -127,11 +114,10 @@ ShoalCave_LowTideInnerRoom_EventScript_23705A:: @ 823705A ShoalCave_LowTideInnerRoom_EventScript_23708C:: @ 823708C lockall - checkflag FLAG_0x3B8 - goto_eq ShoalCave_LowTideInnerRoom_EventScript_2370BE + goto_if_set FLAG_0x3B8, ShoalCave_LowTideInnerRoom_EventScript_2370BE giveitem_std ITEM_SHOAL_SALT compare VAR_RESULT, 0 - goto_eq ShoalCave_LowTideInnerRoom_EventScript_272054 + goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_272054 setmetatile 31, 8, 858, 0 special DrawWholeMapView setflag FLAG_0x3B8 @@ -145,11 +131,10 @@ ShoalCave_LowTideInnerRoom_EventScript_2370BE:: @ 82370BE ShoalCave_LowTideInnerRoom_EventScript_2370C8:: @ 82370C8 lockall - checkflag FLAG_0x3B9 - goto_eq ShoalCave_LowTideInnerRoom_EventScript_2370BE + goto_if_set FLAG_0x3B9, ShoalCave_LowTideInnerRoom_EventScript_2370BE giveitem_std ITEM_SHOAL_SALT compare VAR_RESULT, 0 - goto_eq ShoalCave_LowTideInnerRoom_EventScript_272054 + goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_272054 setmetatile 14, 26, 858, 0 special DrawWholeMapView setflag FLAG_0x3B9 diff --git a/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc b/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc index fc0fb32a7..1e2e756d7 100644 --- a/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc @@ -7,8 +7,7 @@ ShoalCave_LowTideLowerRoom_MapScript1_23715C: @ 823715C end ShoalCave_LowTideLowerRoom_EventScript_237162:: @ 8237162 - checkflag FLAG_0x3BB - goto_eq ShoalCave_LowTideLowerRoom_EventScript_237175 + goto_if_set FLAG_0x3BB, ShoalCave_LowTideLowerRoom_EventScript_237175 setmetatile 18, 2, 856, 1 return @@ -17,11 +16,10 @@ ShoalCave_LowTideLowerRoom_EventScript_237175:: @ 8237175 ShoalCave_LowTideLowerRoom_EventScript_237176:: @ 8237176 lockall - checkflag FLAG_0x3BB - goto_eq ShoalCave_LowTideLowerRoom_EventScript_2371A8 + goto_if_set FLAG_0x3BB, ShoalCave_LowTideLowerRoom_EventScript_2371A8 giveitem_std ITEM_SHOAL_SALT compare VAR_RESULT, 0 - goto_eq ShoalCave_LowTideLowerRoom_EventScript_272054 + goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_272054 setmetatile 18, 2, 858, 0 special DrawWholeMapView setflag FLAG_0x3BB @@ -36,12 +34,11 @@ ShoalCave_LowTideLowerRoom_EventScript_2371A8:: @ 82371A8 ShoalCave_LowTideLowerRoom_EventScript_2371B2:: @ 82371B2 lock faceplayer - checkflag FLAG_0x11B - goto_eq ShoalCave_LowTideLowerRoom_EventScript_2371E1 + goto_if_set FLAG_0x11B, ShoalCave_LowTideLowerRoom_EventScript_2371E1 msgbox ShoalCave_LowTideLowerRoom_Text_2371EB, MSGBOX_DEFAULT giveitem_std ITEM_FOCUS_BAND compare VAR_RESULT, 0 - goto_eq ShoalCave_LowTideLowerRoom_EventScript_272054 + goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_272054 setflag FLAG_0x11B release end diff --git a/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc b/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc index de2faf65b..4486c7c61 100644 --- a/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc @@ -7,8 +7,7 @@ ShoalCave_LowTideStairsRoom_MapScript1_237100: @ 8237100 end ShoalCave_LowTideStairsRoom_EventScript_237106:: @ 8237106 - checkflag FLAG_0x3BA - goto_eq ShoalCave_LowTideStairsRoom_EventScript_237119 + goto_if_set FLAG_0x3BA, ShoalCave_LowTideStairsRoom_EventScript_237119 setmetatile 11, 11, 856, 1 return @@ -17,11 +16,10 @@ ShoalCave_LowTideStairsRoom_EventScript_237119:: @ 8237119 ShoalCave_LowTideStairsRoom_EventScript_23711A:: @ 823711A lockall - checkflag FLAG_0x3BA - goto_eq ShoalCave_LowTideStairsRoom_EventScript_23714C + goto_if_set FLAG_0x3BA, ShoalCave_LowTideStairsRoom_EventScript_23714C giveitem_std ITEM_SHOAL_SALT compare VAR_RESULT, 0 - goto_eq ShoalCave_LowTideStairsRoom_EventScript_272054 + goto_if_eq ShoalCave_LowTideStairsRoom_EventScript_272054 setmetatile 11, 11, 858, 0 special DrawWholeMapView setflag FLAG_0x3BA diff --git a/data/maps/SkyPillar_Top/scripts.inc b/data/maps/SkyPillar_Top/scripts.inc index 2b734e5b0..b611ae2db 100644 --- a/data/maps/SkyPillar_Top/scripts.inc +++ b/data/maps/SkyPillar_Top/scripts.inc @@ -12,7 +12,7 @@ SkyPillar_Top_MapScript1_2396C8: @ 82396C8 SkyPillar_Top_EventScript_2396D2:: @ 82396D2 specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if 5, SkyPillar_Top_EventScript_27374E + goto_if_ne SkyPillar_Top_EventScript_27374E removeobject VAR_LAST_TALKED return @@ -58,11 +58,11 @@ SkyPillar_Top_EventScript_239722:: @ 8239722 clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 1 - goto_eq SkyPillar_Top_EventScript_239768 + goto_if_eq SkyPillar_Top_EventScript_239768 compare VAR_RESULT, 4 - goto_eq SkyPillar_Top_EventScript_239771 + goto_if_eq SkyPillar_Top_EventScript_239771 compare VAR_RESULT, 5 - goto_eq SkyPillar_Top_EventScript_239771 + goto_if_eq SkyPillar_Top_EventScript_239771 setflag FLAG_0x1C0 releaseall end diff --git a/data/maps/SlateportCity/scripts.inc b/data/maps/SlateportCity/scripts.inc index f8e1dc454..5180c47e9 100644 --- a/data/maps/SlateportCity/scripts.inc +++ b/data/maps/SlateportCity/scripts.inc @@ -39,7 +39,7 @@ SlateportCity_EventScript_1DCCE7:: @ 81DCCE7 setflag FLAG_SPECIAL_FLAG_0x4000 getplayerxy VAR_0x8004, VAR_0x8005 compare VAR_0x8004, 30 - goto_eq SlateportCity_EventScript_1DCD06 + goto_if_eq SlateportCity_EventScript_1DCD06 setobjectxyperm 35, 23, 27 setobjectmovementtype 35, 10 return @@ -200,8 +200,7 @@ SlateportCity_EventScript_1DCE84:: @ 81DCE84 faceplayer compare VAR_0x4058, 1 call_if 1, SlateportCity_EventScript_1DCEA4 - checkflag FLAG_0x060 - goto_eq SlateportCity_EventScript_1DCEAE + goto_if_set FLAG_0x060, SlateportCity_EventScript_1DCEAE msgbox SlateportCity_Text_1DD93D, MSGBOX_DEFAULT release end @@ -232,7 +231,7 @@ SlateportCity_EventScript_1DCECF:: @ 81DCECF SlateportCity_EventScript_1DCED9:: @ 81DCED9 compare VAR_0x4058, 1 - goto_eq SlateportCity_EventScript_1DCEED + goto_if_eq SlateportCity_EventScript_1DCEED msgbox SlateportCity_Text_1DDA9A, MSGBOX_NPC end @@ -257,8 +256,7 @@ SlateportCity_EventScript_1DCF0D:: @ 81DCF0D SlateportCity_EventScript_1DCF17:: @ 81DCF17 lock faceplayer - checkflag FLAG_0x094 - goto_eq SlateportCity_EventScript_1DCF2C + goto_if_set FLAG_0x094, SlateportCity_EventScript_1DCF2C msgbox SlateportCity_Text_1DDBAC, MSGBOX_DEFAULT release end @@ -274,10 +272,8 @@ SlateportCity_EventScript_1DCF36:: @ 81DCF36 SlateportCity_EventScript_1DCF3F:: @ 81DCF3F lockall - checkflag FLAG_SYS_GAME_CLEAR - goto_eq SlateportCity_EventScript_1DCF66 - checkflag FLAG_BADGE07_GET - goto_eq SlateportCity_EventScript_1DCF5C + goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_EventScript_1DCF66 + goto_if_set FLAG_BADGE07_GET, SlateportCity_EventScript_1DCF5C msgbox SlateportCity_Text_1DE8F8, MSGBOX_DEFAULT releaseall end @@ -310,8 +306,7 @@ SlateportCity_EventScript_1DCF8B:: @ 81DCF8B SlateportCity_EventScript_1DCF94:: @ 81DCF94 lockall - checkflag FLAG_SYS_GAME_CLEAR - goto_eq SlateportCity_EventScript_1DCFA8 + goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_EventScript_1DCFA8 msgbox SlateportCity_Text_1DEAE3, MSGBOX_DEFAULT releaseall end @@ -518,8 +513,7 @@ SlateportCity_EventScript_1DD18E:: @ 81DD18E SlateportCity_EventScript_1DD198:: @ 81DD198 lock faceplayer - checkflag FLAG_0x060 - goto_if 0, SlateportCity_EventScript_1DD18E + goto_if_unset FLAG_0x060, SlateportCity_EventScript_1DD18E message gUnknown_08272A21 waitmessage pokemartdecoration SlateportCity_PokemartDecor_1DD1B8 @@ -728,8 +722,7 @@ SlateportCity_EventScript_1DD365:: @ 81DD365 SlateportCity_EventScript_1DD36E:: @ 81DD36E lock faceplayer - checkflag FLAG_0x151 - goto_eq SlateportCity_EventScript_1DD39A + goto_if_set FLAG_0x151, SlateportCity_EventScript_1DD39A msgbox SlateportCity_Text_1DEBCE, MSGBOX_DEFAULT giveitem_std ITEM_POWDER_JAR setflag FLAG_0x151 @@ -741,7 +734,7 @@ SlateportCity_EventScript_1DD39A:: @ 81DD39A setvar VAR_0x8004, 1 specialvar VAR_RESULT, sub_80246D4 compare VAR_RESULT, 0 - goto_eq SlateportCity_EventScript_1DD3C0 + goto_if_eq SlateportCity_EventScript_1DD3C0 msgbox SlateportCity_Text_1DEE40, MSGBOX_DEFAULT special sub_80248B0 goto SlateportCity_EventScript_1DD3CA @@ -860,20 +853,20 @@ SlateportCity_EventScript_1DD54A:: @ 81DD54A SlateportCity_EventScript_1DD557:: @ 81DD557 msgbox SlateportCity_Text_1DEE90, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq SlateportCity_EventScript_1DD3CA + goto_if_eq SlateportCity_EventScript_1DD3CA copyvar VAR_0x8004, VAR_0x8009 specialvar VAR_RESULT, sub_80246D4 compare VAR_RESULT, 0 - goto_eq SlateportCity_EventScript_1DD5CE + goto_if_eq SlateportCity_EventScript_1DD5CE giveitem_std VAR_0x8008 compare VAR_RESULT, 0 - goto_eq SlateportCity_EventScript_1DD5C1 + goto_if_eq SlateportCity_EventScript_1DD5C1 copyvar VAR_0x8004, VAR_0x8009 special sub_802477C special sub_802488C msgbox SlateportCity_Text_1DEEF7, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq SlateportCity_EventScript_1DD3CA + goto_if_eq SlateportCity_EventScript_1DD3CA msgbox SlateportCity_Text_1DEF79, MSGBOX_DEFAULT special sub_8024918 release diff --git a/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc b/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc index 3cff83bd8..6bc328f76 100644 --- a/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc +++ b/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc @@ -11,9 +11,9 @@ SlateportCity_BattleTentBattleRoom_MapScript1_209970: @ 8209970 SlateportCity_BattleTentBattleRoom_EventScript_209976:: @ 8209976 checkplayergender compare VAR_RESULT, 0 - goto_eq SlateportCity_BattleTentBattleRoom_EventScript_20998E + goto_if_eq SlateportCity_BattleTentBattleRoom_EventScript_20998E compare VAR_RESULT, 1 - goto_eq SlateportCity_BattleTentBattleRoom_EventScript_209994 + goto_if_eq SlateportCity_BattleTentBattleRoom_EventScript_209994 return SlateportCity_BattleTentBattleRoom_EventScript_20998E:: @ 820998E diff --git a/data/maps/SlateportCity_BattleTentCorridor/scripts.inc b/data/maps/SlateportCity_BattleTentCorridor/scripts.inc index 49a7180cb..bc2027855 100644 --- a/data/maps/SlateportCity_BattleTentCorridor/scripts.inc +++ b/data/maps/SlateportCity_BattleTentCorridor/scripts.inc @@ -10,7 +10,7 @@ SlateportCity_BattleTentCorridor_MapScript2_208E31: @ 8208E31 SlateportCity_BattleTentCorridor_EventScript_208E3B:: @ 8208E3B setvar VAR_TEMP_1, 1 compare VAR_0x8006, 1 - goto_if 5, SlateportCity_BattleTentCorridor_EventScript_208E56 + goto_if_ne SlateportCity_BattleTentCorridor_EventScript_208E56 setobjectxy 1, 2, 2 turnobject 1, 1 @@ -24,13 +24,13 @@ SlateportCity_BattleTentCorridor_MapScript2_208E5B: @ 8208E5B SlateportCity_BattleTentCorridor_EventScript_208E65:: @ 8208E65 compare VAR_0x8006, 1 - goto_eq SlateportCity_BattleTentCorridor_EventScript_208EEE + goto_if_eq SlateportCity_BattleTentCorridor_EventScript_208EEE setvar VAR_TEMP_0, 1 applymovement 1, SlateportCity_BattleTentCorridor_Movement_209062 applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_BattleTentCorridor_Movement_209059 waitmovement 0 compare VAR_0x8006, 2 - goto_eq SlateportCity_BattleTentCorridor_EventScript_209044 + goto_if_eq SlateportCity_BattleTentCorridor_EventScript_209044 setvar VAR_0x8004, 9 special sub_81B9D08 setvar VAR_0x8004, 8 @@ -112,7 +112,7 @@ SlateportCity_BattleTentCorridor_EventScript_208FF1:: @ 8208FF1 special sub_81B9D08 waitstate compare VAR_RESULT, 1 - goto_eq SlateportCity_BattleTentCorridor_EventScript_208EB4 + goto_if_eq SlateportCity_BattleTentCorridor_EventScript_208EB4 msgbox SlateportCity_BattleTentCorridor_Text_25AB6C, MSGBOX_DEFAULT goto SlateportCity_BattleTentCorridor_EventScript_208EB4 diff --git a/data/maps/SlateportCity_BattleTentLobby/scripts.inc b/data/maps/SlateportCity_BattleTentLobby/scripts.inc index 84349a97f..42478e2a0 100644 --- a/data/maps/SlateportCity_BattleTentLobby/scripts.inc +++ b/data/maps/SlateportCity_BattleTentLobby/scripts.inc @@ -121,7 +121,7 @@ SlateportCity_BattleTentLobby_EventScript_2088AA:: @ 82088AA setvar VAR_0x8004, 1 special sub_81B9D08 compare VAR_RESULT, 0 - goto_if 5, SlateportCity_BattleTentLobby_EventScript_2087E9 + goto_if_ne SlateportCity_BattleTentLobby_EventScript_2087E9 special SavePlayerParty msgbox SlateportCity_BattleTentLobby_Text_2C5810, MSGBOX_DEFAULT @@ -168,7 +168,7 @@ SlateportCity_BattleTentLobby_EventScript_208950:: @ 8208950 call SlateportCity_BattleTentLobby_EventScript_27134F setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 - goto_eq SlateportCity_BattleTentLobby_EventScript_208A14 + goto_if_eq SlateportCity_BattleTentLobby_EventScript_208A14 setvar VAR_0x8006, 0 SlateportCity_BattleTentLobby_EventScript_2089AC:: @ 82089AC @@ -245,12 +245,11 @@ SlateportCity_BattleTentLobby_Movement_208A38:: @ 8208A38 SlateportCity_BattleTentLobby_EventScript_208A3D:: @ 8208A3D lock faceplayer - checkflag FLAG_0x109 - goto_eq SlateportCity_BattleTentLobby_EventScript_208A74 + goto_if_set FLAG_0x109, SlateportCity_BattleTentLobby_EventScript_208A74 msgbox SlateportCity_BattleTentLobby_Text_208B4E, MSGBOX_DEFAULT giveitem_std ITEM_TM41 compare VAR_RESULT, 0 - goto_eq SlateportCity_BattleTentLobby_EventScript_272054 + goto_if_eq SlateportCity_BattleTentLobby_EventScript_272054 setflag FLAG_0x109 msgbox SlateportCity_BattleTentLobby_Text_208C5C, MSGBOX_DEFAULT release diff --git a/data/maps/SlateportCity_Harbor/scripts.inc b/data/maps/SlateportCity_Harbor/scripts.inc index 60b78542a..8d513fc07 100644 --- a/data/maps/SlateportCity_Harbor/scripts.inc +++ b/data/maps/SlateportCity_Harbor/scripts.inc @@ -162,8 +162,7 @@ SlateportCity_Harbor_Movement_20CAEF: @ 820CAEF SlateportCity_Harbor_EventScript_20CAF1:: @ 820CAF1 lock faceplayer - checkflag FLAG_SYS_GAME_CLEAR - goto_eq SlateportCity_Harbor_EventScript_20CB06 + goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_Harbor_EventScript_20CB06 msgbox SlateportCity_Harbor_Text_20CE20, MSGBOX_DEFAULT release end @@ -176,8 +175,7 @@ SlateportCity_Harbor_EventScript_20CB06:: @ 820CB06 end SlateportCity_Harbor_EventScript_20CB1A:: @ 820CB1A - checkflag FLAG_0x1D0 - goto_eq SlateportCity_Harbor_EventScript_20CB50 + goto_if_set FLAG_0x1D0, SlateportCity_Harbor_EventScript_20CB50 multichoicedefault 18, 8, 56, 2, 0 switch VAR_RESULT case 0, SlateportCity_Harbor_EventScript_20CB92 @@ -202,7 +200,7 @@ SlateportCity_Harbor_EventScript_20CB88:: @ 820CB88 SlateportCity_Harbor_EventScript_20CB92:: @ 820CB92 msgbox SlateportCity_Harbor_Text_20CF93, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq SlateportCity_Harbor_EventScript_20CBDD + goto_if_eq SlateportCity_Harbor_EventScript_20CBDD setvar VAR_PORTHOLE_STATE, 1 call SlateportCity_Harbor_EventScript_20CBE9 warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10 @@ -213,7 +211,7 @@ SlateportCity_Harbor_EventScript_20CB92:: @ 820CB92 SlateportCity_Harbor_EventScript_20CBBA:: @ 820CBBA msgbox SlateportCity_Harbor_Text_20CFAE, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq SlateportCity_Harbor_EventScript_20CBDD + goto_if_eq SlateportCity_Harbor_EventScript_20CBDD call SlateportCity_Harbor_EventScript_20CBE9 warp MAP_BATTLE_FRONTIER_OUTSIDE_WEST, 255, 19, 67 waitstate @@ -270,15 +268,14 @@ SlateportCity_Harbor_Movement_20CC50: @ 820CC50 SlateportCity_Harbor_EventScript_20CC52:: @ 820CC52 lock faceplayer - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, SlateportCity_Harbor_EventScript_20CC89 + 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 compare VAR_0x8004, 2 - goto_eq SlateportCity_Harbor_EventScript_20CC89 + goto_if_eq SlateportCity_Harbor_EventScript_20CC89 msgbox SlateportCity_Harbor_Text_20D08E, MSGBOX_DEFAULT release end @@ -299,14 +296,11 @@ SlateportCity_Harbor_EventScript_20CC99:: @ 820CC99 SlateportCity_Harbor_EventScript_20CCA2:: @ 820CCA2 lock faceplayer - checkflag FLAG_BADGE07_GET - goto_eq SlateportCity_Harbor_EventScript_20CD00 - checkflag FLAG_0x10F - goto_eq SlateportCity_Harbor_EventScript_20CCF6 - checkflag FLAG_0x070 - goto_eq SlateportCity_Harbor_EventScript_20CCE9 + goto_if_set FLAG_BADGE07_GET, SlateportCity_Harbor_EventScript_20CD00 + goto_if_set FLAG_0x10F, SlateportCity_Harbor_EventScript_20CCF6 + goto_if_set FLAG_0x070, SlateportCity_Harbor_EventScript_20CCE9 compare VAR_0x40A0, 2 - goto_eq SlateportCity_Harbor_EventScript_20CCDF + goto_if_eq SlateportCity_Harbor_EventScript_20CCDF msgbox SlateportCity_Harbor_Text_20D232, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, SlateportCity_Harbor_Movement_2725A2 @@ -332,12 +326,11 @@ SlateportCity_Harbor_EventScript_20CCF6:: @ 820CCF6 SlateportCity_Harbor_EventScript_20CD00:: @ 820CD00 compare VAR_TEMP_1, 1 - goto_eq SlateportCity_Harbor_EventScript_20CE11 + goto_if_eq SlateportCity_Harbor_EventScript_20CE11 checkitem ITEM_SCANNER, 1 compare VAR_RESULT, 1 - goto_eq SlateportCity_Harbor_EventScript_20CD38 - checkflag FLAG_SYS_GAME_CLEAR - goto_eq SlateportCity_Harbor_EventScript_20CD2E + goto_if_eq SlateportCity_Harbor_EventScript_20CD38 + goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_Harbor_EventScript_20CD2E msgbox SlateportCity_Harbor_Text_20D65C, MSGBOX_DEFAULT release end @@ -365,10 +358,10 @@ SlateportCity_Harbor_EventScript_20CD44:: @ 820CD44 SlateportCity_Harbor_EventScript_20CD7B:: @ 820CD7B msgbox SlateportCity_Harbor_Text_20D8BC, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq SlateportCity_Harbor_EventScript_20CE05 + goto_if_eq SlateportCity_Harbor_EventScript_20CE05 giveitem_std ITEM_DEEP_SEA_TOOTH compare VAR_RESULT, 0 - goto_eq SlateportCity_Harbor_EventScript_272054 + goto_if_eq SlateportCity_Harbor_EventScript_272054 takeitem ITEM_SCANNER, 1 msgbox SlateportCity_Harbor_Text_20D94A, MSGBOX_DEFAULT setflag FLAG_TRADED_SCANNER_TO_STERN @@ -378,10 +371,10 @@ SlateportCity_Harbor_EventScript_20CD7B:: @ 820CD7B SlateportCity_Harbor_EventScript_20CDBB:: @ 820CDBB msgbox SlateportCity_Harbor_Text_20D8F1, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq SlateportCity_Harbor_EventScript_20CE05 + goto_if_eq SlateportCity_Harbor_EventScript_20CE05 giveitem_std ITEM_DEEP_SEA_SCALE compare VAR_RESULT, 0 - goto_eq SlateportCity_Harbor_EventScript_272054 + goto_if_eq SlateportCity_Harbor_EventScript_272054 takeitem ITEM_SCANNER, 1 msgbox SlateportCity_Harbor_Text_20D94A, MSGBOX_DEFAULT setflag FLAG_TRADED_SCANNER_TO_STERN diff --git a/data/maps/SlateportCity_House1/scripts.inc b/data/maps/SlateportCity_House1/scripts.inc index aaec06a21..2e973663b 100644 --- a/data/maps/SlateportCity_House1/scripts.inc +++ b/data/maps/SlateportCity_House1/scripts.inc @@ -6,9 +6,9 @@ SlateportCity_House1_EventScript_209AA5:: @ 8209AA5 faceplayer msgbox SlateportCity_House1_Text_209B8E, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq SlateportCity_House1_EventScript_209AC6 + goto_if_eq SlateportCity_House1_EventScript_209AC6 compare VAR_RESULT, 0 - goto_eq SlateportCity_House1_EventScript_209AE9 + goto_if_eq SlateportCity_House1_EventScript_209AE9 end SlateportCity_House1_EventScript_209AC6:: @ 8209AC6 @@ -16,9 +16,9 @@ SlateportCity_House1_EventScript_209AC6:: @ 8209AC6 special sub_81B94B0 waitstate compare VAR_0x8004, 255 - goto_if 5, SlateportCity_House1_EventScript_209AF3 + goto_if_ne SlateportCity_House1_EventScript_209AF3 compare VAR_0x8004, 255 - goto_eq SlateportCity_House1_EventScript_209AE9 + goto_if_eq SlateportCity_House1_EventScript_209AE9 end SlateportCity_House1_EventScript_209AE9:: @ 8209AE9 @@ -29,20 +29,20 @@ SlateportCity_House1_EventScript_209AE9:: @ 8209AE9 SlateportCity_House1_EventScript_209AF3:: @ 8209AF3 specialvar VAR_RESULT, ScriptGetPartyMonSpecies compare VAR_RESULT, 412 - goto_eq SlateportCity_House1_EventScript_209B46 + goto_if_eq SlateportCity_House1_EventScript_209B46 special TV_CopyNicknameToStringVar1AndEnsureTerminated special TV_CheckMonOTIDEqualsPlayerID compare VAR_RESULT, 1 - goto_eq SlateportCity_House1_EventScript_209B50 + goto_if_eq SlateportCity_House1_EventScript_209B50 specialvar VAR_RESULT, MonOTNameMatchesPlayer special TV_CopyNicknameToStringVar1AndEnsureTerminated compare VAR_RESULT, 1 - goto_eq SlateportCity_House1_EventScript_209B50 + goto_if_eq SlateportCity_House1_EventScript_209B50 msgbox SlateportCity_House1_Text_209C2B, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq SlateportCity_House1_EventScript_209B5A + goto_if_eq SlateportCity_House1_EventScript_209B5A compare VAR_RESULT, 0 - goto_eq SlateportCity_House1_EventScript_209AE9 + goto_if_eq SlateportCity_House1_EventScript_209AE9 end SlateportCity_House1_EventScript_209B46:: @ 8209B46 @@ -61,7 +61,7 @@ SlateportCity_House1_EventScript_209B5A:: @ 8209B5A specialvar VAR_RESULT, TV_PutNameRaterShowOnTheAirIfNicnkameChanged special TV_CopyNicknameToStringVar1AndEnsureTerminated compare VAR_RESULT, 1 - goto_eq SlateportCity_House1_EventScript_209B84 + goto_if_eq SlateportCity_House1_EventScript_209B84 msgbox SlateportCity_House1_Text_209D5E, MSGBOX_DEFAULT release end diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc index ceca80c47..76bc18873 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc +++ b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc @@ -23,7 +23,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_20ADC1:: @ 820ADC1 showmoneybox 0, 0, 0 msgbox SlateportCity_OceanicMuseum_1F_Text_20AFD5, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq SlateportCity_OceanicMuseum_1F_EventScript_20ADE8 + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_20ADE8 closemessage hidemoneybox nop @@ -36,7 +36,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_20ADC1:: @ 820ADC1 SlateportCity_OceanicMuseum_1F_EventScript_20ADE8:: @ 820ADE8 checkmoney 0x32, 0 compare VAR_RESULT, 0 - goto_eq SlateportCity_OceanicMuseum_1F_EventScript_20AE18 + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_20AE18 playse SE_REGI takemoney 0x32, 0 updatemoneybox 0, 0 @@ -50,8 +50,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_20ADE8:: @ 820ADE8 end SlateportCity_OceanicMuseum_1F_EventScript_20AE18:: @ 820AE18 - checkflag FLAG_0x095 - goto_if 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE39 + goto_if_unset FLAG_0x095, SlateportCity_OceanicMuseum_1F_EventScript_20AE39 msgbox SlateportCity_OceanicMuseum_1F_Text_20B03D, MSGBOX_DEFAULT closemessage hidemoneybox @@ -163,18 +162,18 @@ SlateportCity_OceanicMuseum_1F_EventScript_20AEF8:: @ 820AEF8 msgbox SlateportCity_OceanicMuseum_1F_Text_20B3AB, MSGBOX_DEFAULT giveitem_std ITEM_TM46 compare VAR_RESULT, 0 - goto_eq SlateportCity_OceanicMuseum_1F_EventScript_20AFB5 + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_20AFB5 setflag FLAG_0x10D msgbox SlateportCity_OceanicMuseum_1F_Text_20B449, MSGBOX_DEFAULT closemessage compare VAR_FACING, 2 - goto_eq SlateportCity_OceanicMuseum_1F_EventScript_20AF6C + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_20AF6C compare VAR_FACING, 1 - goto_eq SlateportCity_OceanicMuseum_1F_EventScript_20AF83 + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_20AF83 compare VAR_FACING, 3 - goto_eq SlateportCity_OceanicMuseum_1F_EventScript_20AF93 + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_20AF93 compare VAR_FACING, 4 - goto_eq SlateportCity_OceanicMuseum_1F_EventScript_20AF93 + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_20AF93 end SlateportCity_OceanicMuseum_1F_EventScript_20AF6C:: @ 820AF6C diff --git a/data/maps/SlateportCity_PokemonFanClub/scripts.inc b/data/maps/SlateportCity_PokemonFanClub/scripts.inc index 154438ae2..d3a652cf5 100644 --- a/data/maps/SlateportCity_PokemonFanClub/scripts.inc +++ b/data/maps/SlateportCity_PokemonFanClub/scripts.inc @@ -4,8 +4,7 @@ SlateportCity_PokemonFanClub_MapScripts:: @ 8209E95 SlateportCity_PokemonFanClub_EventScript_209E96:: @ 8209E96 lock faceplayer - checkflag FLAG_0x155 - goto_if 0, SlateportCity_PokemonFanClub_EventScript_20A152 + goto_if_unset FLAG_0x155, SlateportCity_PokemonFanClub_EventScript_20A152 checkflag FLAG_0x156 call_if 0, SlateportCity_PokemonFanClub_EventScript_20A172 switch VAR_0x40B7 @@ -36,7 +35,7 @@ SlateportCity_PokemonFanClub_EventScript_209EE5:: @ 8209EE5 compare VAR_TEMP_2, 5 call_if 1, SlateportCity_PokemonFanClub_EventScript_209FCA compare VAR_0x40B7, 2 - goto_eq SlateportCity_PokemonFanClub_EventScript_209F3B + goto_if_eq SlateportCity_PokemonFanClub_EventScript_209F3B msgbox SlateportCity_PokemonFanClub_Text_20A62A, MSGBOX_DEFAULT goto SlateportCity_PokemonFanClub_EventScript_209F45 end @@ -86,7 +85,7 @@ SlateportCity_PokemonFanClub_EventScript_209FD6:: @ 8209FD6 SlateportCity_PokemonFanClub_EventScript_209FE0:: @ 8209FE0 checkitemspace ITEM_RED_SCARF, 1 compare VAR_RESULT, 0 - goto_eq SlateportCity_PokemonFanClub_EventScript_20A0D5 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_20A0D5 msgbox SlateportCity_PokemonFanClub_Text_20A795, MSGBOX_DEFAULT setflag FLAG_0x0C8 giveitem_std ITEM_RED_SCARF @@ -97,7 +96,7 @@ SlateportCity_PokemonFanClub_EventScript_209FE0:: @ 8209FE0 SlateportCity_PokemonFanClub_EventScript_20A011:: @ 820A011 checkitemspace ITEM_BLUE_SCARF, 1 compare VAR_RESULT, 0 - goto_eq SlateportCity_PokemonFanClub_EventScript_20A0D5 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_20A0D5 msgbox SlateportCity_PokemonFanClub_Text_20A795, MSGBOX_DEFAULT setflag FLAG_0x0C9 giveitem_std ITEM_BLUE_SCARF @@ -108,7 +107,7 @@ SlateportCity_PokemonFanClub_EventScript_20A011:: @ 820A011 SlateportCity_PokemonFanClub_EventScript_20A042:: @ 820A042 checkitemspace ITEM_PINK_SCARF, 1 compare VAR_RESULT, 0 - goto_eq SlateportCity_PokemonFanClub_EventScript_20A0D5 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_20A0D5 msgbox SlateportCity_PokemonFanClub_Text_20A795, MSGBOX_DEFAULT setflag FLAG_0x0CA giveitem_std ITEM_PINK_SCARF @@ -119,7 +118,7 @@ SlateportCity_PokemonFanClub_EventScript_20A042:: @ 820A042 SlateportCity_PokemonFanClub_EventScript_20A073:: @ 820A073 checkitemspace ITEM_GREEN_SCARF, 1 compare VAR_RESULT, 0 - goto_eq SlateportCity_PokemonFanClub_EventScript_20A0D5 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_20A0D5 msgbox SlateportCity_PokemonFanClub_Text_20A795, MSGBOX_DEFAULT setflag FLAG_0x0CB giveitem_std ITEM_GREEN_SCARF @@ -130,7 +129,7 @@ SlateportCity_PokemonFanClub_EventScript_20A073:: @ 820A073 SlateportCity_PokemonFanClub_EventScript_20A0A4:: @ 820A0A4 checkitemspace ITEM_YELLOW_SCARF, 1 compare VAR_RESULT, 0 - goto_eq SlateportCity_PokemonFanClub_EventScript_20A0D5 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_20A0D5 msgbox SlateportCity_PokemonFanClub_Text_20A795, MSGBOX_DEFAULT setflag FLAG_0x0CC giveitem_std ITEM_YELLOW_SCARF @@ -194,8 +193,7 @@ SlateportCity_PokemonFanClub_EventScript_20A14C:: @ 820A14C return SlateportCity_PokemonFanClub_EventScript_20A152:: @ 820A152 - checkflag FLAG_0x156 - goto_eq SlateportCity_PokemonFanClub_EventScript_20A168 + goto_if_set FLAG_0x156, SlateportCity_PokemonFanClub_EventScript_20A168 msgbox SlateportCity_PokemonFanClub_Text_20A233, MSGBOX_DEFAULT setflag FLAG_0x156 release @@ -214,12 +212,11 @@ SlateportCity_PokemonFanClub_EventScript_20A172:: @ 820A172 SlateportCity_PokemonFanClub_EventScript_20A17E:: @ 820A17E lock faceplayer - checkflag FLAG_0x116 - goto_eq SlateportCity_PokemonFanClub_EventScript_20A1DE + goto_if_set FLAG_0x116, SlateportCity_PokemonFanClub_EventScript_20A1DE msgbox SlateportCity_PokemonFanClub_Text_20AA77, MSGBOX_DEFAULT specialvar VAR_RESULT, GetLeadMonFriendshipScore compare VAR_RESULT, 4 - goto_if 4, SlateportCity_PokemonFanClub_EventScript_20A1A3 + goto_if_ge SlateportCity_PokemonFanClub_EventScript_20A1A3 release end @@ -232,7 +229,7 @@ SlateportCity_PokemonFanClub_EventScript_20A1A3:: @ 820A1A3 msgbox SlateportCity_PokemonFanClub_Text_20AB63, MSGBOX_DEFAULT giveitem_std ITEM_SOOTHE_BELL compare VAR_RESULT, 0 - goto_eq SlateportCity_PokemonFanClub_EventScript_272054 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_272054 setflag FLAG_0x116 release end diff --git a/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc b/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc index 82138168c..da264c2ee 100644 --- a/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc +++ b/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc @@ -3,14 +3,10 @@ SlateportCity_SternsShipyard_1F_MapScripts:: @ 8207F3F SlateportCity_SternsShipyard_1F_EventScript_207F40:: @ 8207F40 lockall - checkflag FLAG_SYS_GAME_CLEAR - goto_eq SlateportCity_SternsShipyard_1F_EventScript_207F92 - checkflag FLAG_BADGE07_GET - goto_eq SlateportCity_SternsShipyard_1F_EventScript_207FA6 - checkflag FLAG_0x095 - goto_eq SlateportCity_SternsShipyard_1F_EventScript_207FD9 - checkflag FLAG_0x094 - goto_eq SlateportCity_SternsShipyard_1F_EventScript_207FBA + goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_SternsShipyard_1F_EventScript_207F92 + goto_if_set FLAG_BADGE07_GET, SlateportCity_SternsShipyard_1F_EventScript_207FA6 + goto_if_set FLAG_0x095, SlateportCity_SternsShipyard_1F_EventScript_207FD9 + goto_if_set FLAG_0x094, SlateportCity_SternsShipyard_1F_EventScript_207FBA msgbox SlateportCity_SternsShipyard_1F_Text_208008, MSGBOX_DEFAULT applymovement 1, SlateportCity_SternsShipyard_1F_Movement_27259E waitmovement 0 diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc index 1b16ba339..88bcad1ff 100644 --- a/data/maps/SootopolisCity/scripts.inc +++ b/data/maps/SootopolisCity/scripts.inc @@ -9,8 +9,7 @@ SootopolisCity_MapScripts:: @ 81E565C SootopolisCity_MapScript1_1E5676: @ 81E5676 checkflag FLAG_0x09E call_if 0, SootopolisCity_EventScript_1E56E5 - checkflag FLAG_0x081 - goto_if 0, SootopolisCity_EventScript_1E5692 + goto_if_unset FLAG_0x081, SootopolisCity_EventScript_1E5692 checkflag FLAG_0x09E call_if 0, SootopolisCity_EventScript_1E5693 end @@ -81,19 +80,19 @@ SootopolisCity_EventScript_1E5785:: @ 81E5785 SootopolisCity_EventScript_1E57B2:: @ 81E57B2 compare VAR_0x405E, 0 - goto_eq SootopolisCity_EventScript_1E5800 + goto_if_eq SootopolisCity_EventScript_1E5800 compare VAR_0x405E, 6 - goto_if 4, SootopolisCity_EventScript_1E5800 + goto_if_ge SootopolisCity_EventScript_1E5800 compare VAR_0x405E, 1 - goto_eq SootopolisCity_EventScript_1E5801 + goto_if_eq SootopolisCity_EventScript_1E5801 compare VAR_0x405E, 2 - goto_eq SootopolisCity_EventScript_1E5801 + goto_if_eq SootopolisCity_EventScript_1E5801 compare VAR_0x405E, 3 - goto_eq SootopolisCity_EventScript_1E5801 + goto_if_eq SootopolisCity_EventScript_1E5801 compare VAR_0x405E, 4 - goto_eq SootopolisCity_EventScript_1E5801 + goto_if_eq SootopolisCity_EventScript_1E5801 compare VAR_0x40CA, 1 - goto_if 3, SootopolisCity_EventScript_1E5801 + goto_if_le SootopolisCity_EventScript_1E5801 return SootopolisCity_EventScript_1E5800:: @ 81E5800 @@ -105,15 +104,15 @@ SootopolisCity_EventScript_1E5801:: @ 81E5801 SootopolisCity_EventScript_1E5805:: @ 81E5805 compare VAR_0x405E, 0 - goto_eq SootopolisCity_EventScript_1E583D + goto_if_eq SootopolisCity_EventScript_1E583D compare VAR_0x405E, 6 - goto_if 4, SootopolisCity_EventScript_1E583D + goto_if_ge SootopolisCity_EventScript_1E583D compare VAR_0x405E, 1 - goto_eq SootopolisCity_EventScript_1E583E + goto_if_eq SootopolisCity_EventScript_1E583E compare VAR_0x40CA, 1 - goto_eq SootopolisCity_EventScript_1E583E + goto_if_eq SootopolisCity_EventScript_1E583E compare VAR_0x40CA, 1 - goto_if 3, SootopolisCity_EventScript_27207A + goto_if_le SootopolisCity_EventScript_27207A return SootopolisCity_EventScript_1E583D:: @ 81E583D @@ -124,8 +123,7 @@ SootopolisCity_EventScript_1E583E:: @ 81E583E return SootopolisCity_EventScript_1E5842:: @ 81E5842 - checkflag FLAG_0x133 - goto_eq SootopolisCity_EventScript_1E584C + goto_if_set FLAG_0x133, SootopolisCity_EventScript_1E584C return SootopolisCity_EventScript_1E584C:: @ 81E584C @@ -204,9 +202,9 @@ SootopolisCity_EventScript_1E5926:: @ 81E5926 lockall special StorePlayerCoordsInVars compare VAR_0x8004, 43 - goto_if 5, SootopolisCity_EventScript_1E5A82 + goto_if_ne SootopolisCity_EventScript_1E5A82 compare VAR_0x8005, 32 - goto_if 5, SootopolisCity_EventScript_1E5A82 + goto_if_ne SootopolisCity_EventScript_1E5A82 goto SootopolisCity_EventScript_1E5946 end @@ -494,9 +492,9 @@ SootopolisCity_EventScript_1E5BFE:: @ 81E5BFE lockall special StorePlayerCoordsInVars compare VAR_0x8004, 43 - goto_if 5, SootopolisCity_EventScript_1E5CCE + goto_if_ne SootopolisCity_EventScript_1E5CCE compare VAR_0x8005, 32 - goto_if 5, SootopolisCity_EventScript_1E5CCE + goto_if_ne SootopolisCity_EventScript_1E5CCE goto SootopolisCity_EventScript_1E5C1E end @@ -699,11 +697,11 @@ SootopolisCity_EventScript_1E5E8D:: @ 81E5E8D lock faceplayer compare VAR_0x405E, 6 - goto_if 4, SootopolisCity_EventScript_1E5EC4 + goto_if_ge SootopolisCity_EventScript_1E5EC4 compare VAR_0x405E, 5 - goto_eq SootopolisCity_EventScript_1E5ECE + goto_if_eq SootopolisCity_EventScript_1E5ECE compare VAR_0x405E, 2 - goto_if 4, SootopolisCity_EventScript_1E5EBA + goto_if_ge SootopolisCity_EventScript_1E5EBA msgbox SootopolisCity_Text_1E6D77, MSGBOX_DEFAULT release end @@ -727,11 +725,11 @@ SootopolisCity_EventScript_1E5ED8:: @ 81E5ED8 lock faceplayer compare VAR_0x405E, 1 - goto_if 3, SootopolisCity_EventScript_1E5F1B + goto_if_le SootopolisCity_EventScript_1E5F1B compare VAR_0x405E, 6 - goto_if 4, SootopolisCity_EventScript_1E5F1B + goto_if_ge SootopolisCity_EventScript_1E5F1B compare VAR_0x405E, 5 - goto_eq SootopolisCity_EventScript_1E5F10 + goto_if_eq SootopolisCity_EventScript_1E5F10 msgbox SootopolisCity_Text_1E6BFF, MSGBOX_DEFAULT closemessage applymovement 3, SootopolisCity_Movement_2725A2 @@ -748,28 +746,27 @@ SootopolisCity_EventScript_1E5F10:: @ 81E5F10 SootopolisCity_EventScript_1E5F1B:: @ 81E5F1B dodailyevents special GetPlayerBigGuyGirlString - checkflag FLAG_0x932 - goto_eq SootopolisCity_EventScript_1E5FBB + goto_if_set FLAG_0x932, SootopolisCity_EventScript_1E5FBB msgbox SootopolisCity_Text_2A7BB0, MSGBOX_DEFAULT random 10 addvar VAR_RESULT, 20 addvar VAR_RESULT, 133 giveitem_std VAR_RESULT compare VAR_RESULT, 0 - goto_eq SootopolisCity_EventScript_272054 + goto_if_eq SootopolisCity_EventScript_272054 setflag FLAG_0x932 msgbox SootopolisCity_Text_2A7C7C, MSGBOX_DEFAULT random 2 compare VAR_RESULT, 0 - goto_eq SootopolisCity_EventScript_1E5F79 + goto_if_eq SootopolisCity_EventScript_1E5F79 compare VAR_RESULT, 1 - goto_eq SootopolisCity_EventScript_1E5F9A + goto_if_eq SootopolisCity_EventScript_1E5F9A end SootopolisCity_EventScript_1E5F79:: @ 81E5F79 giveitem_std ITEM_FIGY_BERRY compare VAR_RESULT, 0 - goto_eq SootopolisCity_EventScript_272054 + goto_if_eq SootopolisCity_EventScript_272054 msgbox SootopolisCity_Text_2A7CB7, MSGBOX_DEFAULT release end @@ -777,7 +774,7 @@ SootopolisCity_EventScript_1E5F79:: @ 81E5F79 SootopolisCity_EventScript_1E5F9A:: @ 81E5F9A giveitem_std ITEM_IAPAPA_BERRY compare VAR_RESULT, 0 - goto_eq SootopolisCity_EventScript_272054 + goto_if_eq SootopolisCity_EventScript_272054 msgbox SootopolisCity_Text_2A7CB7, MSGBOX_DEFAULT release end @@ -785,7 +782,7 @@ SootopolisCity_EventScript_1E5F9A:: @ 81E5F9A SootopolisCity_EventScript_1E5FBB:: @ 81E5FBB msgbox SootopolisCity_Text_2A7CEC, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq SootopolisCity_EventScript_1E5FD8 + goto_if_eq SootopolisCity_EventScript_1E5FD8 msgbox SootopolisCity_Text_2A7DD2, MSGBOX_DEFAULT release end @@ -800,7 +797,7 @@ SootopolisCity_EventScript_1E5FE2:: @ 81E5FE2 applymovement 2, SootopolisCity_Movement_27259E waitmovement 0 compare VAR_0x405E, 5 - goto_eq SootopolisCity_EventScript_1E600D + goto_if_eq SootopolisCity_EventScript_1E600D msgbox SootopolisCity_Text_1E71A1, MSGBOX_DEFAULT closemessage applymovement 2, SootopolisCity_Movement_2725A2 @@ -817,7 +814,7 @@ SootopolisCity_EventScript_1E6017:: @ 81E6017 lock faceplayer compare VAR_0x405E, 6 - goto_if 4, SootopolisCity_EventScript_1E602E + goto_if_ge SootopolisCity_EventScript_1E602E msgbox SootopolisCity_Text_1E6CCA, MSGBOX_DEFAULT release end @@ -831,11 +828,11 @@ SootopolisCity_EventScript_1E6038:: @ 81E6038 lock faceplayer compare VAR_0x405E, 6 - goto_if 4, SootopolisCity_EventScript_1E607A + goto_if_ge SootopolisCity_EventScript_1E607A compare VAR_0x405E, 5 - goto_eq SootopolisCity_EventScript_1E6084 + goto_if_eq SootopolisCity_EventScript_1E6084 compare VAR_0x405E, 2 - goto_if 4, SootopolisCity_EventScript_1E6065 + goto_if_ge SootopolisCity_EventScript_1E6065 msgbox SootopolisCity_Text_1E6F90, MSGBOX_DEFAULT release end @@ -863,11 +860,11 @@ SootopolisCity_EventScript_1E608E:: @ 81E608E applymovement 4, SootopolisCity_Movement_27259E waitmovement 0 compare VAR_0x405E, 5 - goto_eq SootopolisCity_EventScript_1E60D9 + goto_if_eq SootopolisCity_EventScript_1E60D9 compare VAR_0x405E, 6 - goto_if 4, SootopolisCity_EventScript_1E60CF + goto_if_ge SootopolisCity_EventScript_1E60CF compare VAR_0x405E, 1 - goto_if 3, SootopolisCity_EventScript_1E60CF + goto_if_le SootopolisCity_EventScript_1E60CF msgbox SootopolisCity_Text_1E690B, MSGBOX_DEFAULT closemessage applymovement 4, SootopolisCity_Movement_2725A2 @@ -890,13 +887,12 @@ SootopolisCity_EventScript_1E60E3:: @ 81E60E3 applymovement 5, SootopolisCity_Movement_27259E waitmovement 0 compare VAR_0x405E, 5 - goto_eq SootopolisCity_EventScript_1E612D - checkflag FLAG_SYS_GAME_CLEAR - goto_eq SootopolisCity_EventScript_1E6137 + goto_if_eq SootopolisCity_EventScript_1E612D + goto_if_set FLAG_SYS_GAME_CLEAR, SootopolisCity_EventScript_1E6137 compare VAR_0x405E, 6 - goto_if 4, SootopolisCity_EventScript_1E6141 + goto_if_ge SootopolisCity_EventScript_1E6141 compare VAR_0x405E, 1 - goto_if 3, SootopolisCity_EventScript_1E6141 + goto_if_le SootopolisCity_EventScript_1E6141 msgbox SootopolisCity_Text_1E6692, MSGBOX_DEFAULT closemessage applymovement 5, SootopolisCity_Movement_2725A2 @@ -938,13 +934,12 @@ SootopolisCity_EventScript_1E6166:: @ 81E6166 checkflag FLAG_0x133 call_if 0, SootopolisCity_EventScript_1E61CC compare VAR_0x405E, 2 - goto_eq SootopolisCity_EventScript_1E61AE + goto_if_eq SootopolisCity_EventScript_1E61AE compare VAR_0x405E, 3 - goto_eq SootopolisCity_EventScript_1E61C2 + goto_if_eq SootopolisCity_EventScript_1E61C2 compare VAR_0x405E, 4 - goto_eq SootopolisCity_EventScript_1E61C2 - checkflag FLAG_0x09E - goto_eq SootopolisCity_EventScript_1E61B8 + goto_if_eq SootopolisCity_EventScript_1E61C2 + goto_if_set FLAG_0x09E, SootopolisCity_EventScript_1E61B8 msgbox SootopolisCity_Text_1E78E5, MSGBOX_DEFAULT releaseall end @@ -1272,7 +1267,7 @@ SootopolisCity_EventScript_1E635D:: @ 81E635D applymovement 15, SootopolisCity_Movement_27259E waitmovement 0 compare VAR_0x405E, 5 - goto_eq SootopolisCity_EventScript_1E6388 + goto_if_eq SootopolisCity_EventScript_1E6388 msgbox SootopolisCity_Text_1E67DC, MSGBOX_DEFAULT closemessage applymovement 15, SootopolisCity_Movement_2725A2 @@ -1289,7 +1284,7 @@ SootopolisCity_EventScript_1E6388:: @ 81E6388 SootopolisCity_EventScript_1E6393:: @ 81E6393 lockall compare VAR_0x405E, 5 - goto_eq SootopolisCity_EventScript_1E63C7 + goto_if_eq SootopolisCity_EventScript_1E63C7 msgbox SootopolisCity_Text_1E6936, MSGBOX_DEFAULT closemessage applymovement 14, SootopolisCity_Movement_27259E @@ -1313,7 +1308,7 @@ SootopolisCity_EventScript_1E63DB:: @ 81E63DB applymovement 13, SootopolisCity_Movement_27259E waitmovement 0 compare VAR_0x405E, 5 - goto_eq SootopolisCity_EventScript_1E6406 + goto_if_eq SootopolisCity_EventScript_1E6406 msgbox SootopolisCity_Text_1E6C7C, MSGBOX_DEFAULT closemessage applymovement 13, SootopolisCity_Movement_2725A2 @@ -1332,7 +1327,7 @@ SootopolisCity_EventScript_1E6411:: @ 81E6411 applymovement 12, SootopolisCity_Movement_27259E waitmovement 0 compare VAR_0x405E, 5 - goto_eq SootopolisCity_EventScript_1E643C + goto_if_eq SootopolisCity_EventScript_1E643C msgbox SootopolisCity_Text_1E6A50, MSGBOX_DEFAULT closemessage applymovement 12, SootopolisCity_Movement_2725A2 @@ -1349,11 +1344,9 @@ SootopolisCity_EventScript_1E6446:: @ 81E6446 lock faceplayer compare VAR_0x405E, 4 - goto_eq SootopolisCity_EventScript_1E64D8 - checkflag FLAG_0x138 - goto_eq SootopolisCity_EventScript_1E64E2 - checkflag FLAG_0x09E - goto_eq SootopolisCity_EventScript_1E646F + goto_if_eq SootopolisCity_EventScript_1E64D8 + goto_if_set FLAG_0x138, SootopolisCity_EventScript_1E64E2 + goto_if_set FLAG_0x09E, SootopolisCity_EventScript_1E646F msgbox SootopolisCity_Text_1E7A3E, MSGBOX_DEFAULT release end @@ -1410,7 +1403,7 @@ SootopolisCity_Movement_1E64EF: @ 81E64EF SootopolisCity_EventScript_1E64F2:: @ 81E64F2 lockall compare VAR_0x405E, 5 - goto_eq SootopolisCity_EventScript_1E6509 + goto_if_eq SootopolisCity_EventScript_1E6509 msgbox SootopolisCity_Text_1E72DB, MSGBOX_DEFAULT closemessage releaseall @@ -1419,15 +1412,14 @@ SootopolisCity_EventScript_1E64F2:: @ 81E64F2 SootopolisCity_EventScript_1E6509:: @ 81E6509 msgbox SootopolisCity_Text_1E737E, MSGBOX_DEFAULT setflag FLAG_0x135 - checkflag FLAG_0x134 - goto_eq SootopolisCity_EventScript_1E654C + goto_if_set FLAG_0x134, SootopolisCity_EventScript_1E654C releaseall end SootopolisCity_EventScript_1E651F:: @ 81E651F lockall compare VAR_0x405E, 5 - goto_eq SootopolisCity_EventScript_1E6536 + goto_if_eq SootopolisCity_EventScript_1E6536 msgbox SootopolisCity_Text_1E7460, MSGBOX_DEFAULT closemessage releaseall @@ -1436,8 +1428,7 @@ SootopolisCity_EventScript_1E651F:: @ 81E651F SootopolisCity_EventScript_1E6536:: @ 81E6536 msgbox SootopolisCity_Text_1E74F6, MSGBOX_DEFAULT setflag FLAG_0x134 - checkflag FLAG_0x135 - goto_eq SootopolisCity_EventScript_1E654C + goto_if_set FLAG_0x135, SootopolisCity_EventScript_1E654C releaseall end diff --git a/data/maps/SootopolisCity_Gym_1F/scripts.inc b/data/maps/SootopolisCity_Gym_1F/scripts.inc index 844b3c8b3..e4f062fe3 100644 --- a/data/maps/SootopolisCity_Gym_1F/scripts.inc +++ b/data/maps/SootopolisCity_Gym_1F/scripts.inc @@ -20,11 +20,11 @@ SootopolisCity_Gym_1F_MapScript1_224E6A: @ 8224E6A SootopolisCity_Gym_1F_EventScript_224E73:: @ 8224E73 compare VAR_ICE_STEP_COUNT, 8 - goto_if 0, SootopolisCity_Gym_1F_EventScript_224ECA + goto_if_lt SootopolisCity_Gym_1F_EventScript_224ECA compare VAR_ICE_STEP_COUNT, 28 - goto_if 0, SootopolisCity_Gym_1F_EventScript_224EB8 + goto_if_lt SootopolisCity_Gym_1F_EventScript_224EB8 compare VAR_ICE_STEP_COUNT, 67 - goto_if 0, SootopolisCity_Gym_1F_EventScript_224EA6 + goto_if_lt SootopolisCity_Gym_1F_EventScript_224EA6 setmetatile 8, 4, 519, 0 setmetatile 8, 5, 519, 0 @@ -89,11 +89,9 @@ SootopolisCity_Gym_1F_EventScript_224F44:: @ 8224F44 trainerbattle_single TRAINER_JUAN_1, SootopolisCity_Gym_1F_Text_225268, SootopolisCity_Gym_1F_Text_225432, SootopolisCity_Gym_1F_EventScript_224F82, NO_MUSIC specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq SootopolisCity_Gym_1F_EventScript_225025 - checkflag FLAG_0x0AC - goto_if 0, SootopolisCity_Gym_1F_EventScript_224FF7 - checkflag FLAG_BADGE06_GET - goto_if 0, SootopolisCity_Gym_1F_EventScript_22501B + goto_if_eq SootopolisCity_Gym_1F_EventScript_225025 + goto_if_unset FLAG_0x0AC, SootopolisCity_Gym_1F_EventScript_224FF7 + goto_if_unset FLAG_BADGE06_GET, SootopolisCity_Gym_1F_EventScript_22501B msgbox SootopolisCity_Gym_1F_Text_225778, MSGBOX_DEFAULT release end @@ -127,7 +125,7 @@ SootopolisCity_Gym_1F_EventScript_224F82:: @ 8224F82 SootopolisCity_Gym_1F_EventScript_224FD4:: @ 8224FD4 giveitem_std ITEM_TM03 compare VAR_RESULT, 0 - goto_eq SootopolisCity_Gym_1F_EventScript_27205E + goto_if_eq SootopolisCity_Gym_1F_EventScript_27205E msgbox SootopolisCity_Gym_1F_Text_2256C1, MSGBOX_DEFAULT setflag FLAG_0x0AC return @@ -135,7 +133,7 @@ SootopolisCity_Gym_1F_EventScript_224FD4:: @ 8224FD4 SootopolisCity_Gym_1F_EventScript_224FF7:: @ 8224FF7 giveitem_std ITEM_TM03 compare VAR_RESULT, 0 - goto_eq SootopolisCity_Gym_1F_EventScript_272054 + goto_if_eq SootopolisCity_Gym_1F_EventScript_272054 msgbox SootopolisCity_Gym_1F_Text_2256C1, MSGBOX_DEFAULT setflag FLAG_0x0AC release @@ -154,8 +152,7 @@ SootopolisCity_Gym_1F_EventScript_225025:: @ 8225025 SootopolisCity_Gym_1F_EventScript_225040:: @ 8225040 lock faceplayer - checkflag FLAG_0x4F7 - goto_eq SootopolisCity_Gym_1F_EventScript_225055 + goto_if_set FLAG_0x4F7, SootopolisCity_Gym_1F_EventScript_225055 msgbox SootopolisCity_Gym_1F_Text_225093, MSGBOX_DEFAULT release end @@ -167,15 +164,13 @@ SootopolisCity_Gym_1F_EventScript_225055:: @ 8225055 SootopolisCity_Gym_1F_EventScript_22505F:: @ 822505F lockall - checkflag FLAG_BADGE08_GET - goto_eq SootopolisCity_Gym_1F_EventScript_22507F + goto_if_set FLAG_BADGE08_GET, SootopolisCity_Gym_1F_EventScript_22507F goto SootopolisCity_Gym_1F_EventScript_225089 end SootopolisCity_Gym_1F_EventScript_22506F:: @ 822506F lockall - checkflag FLAG_BADGE08_GET - goto_eq SootopolisCity_Gym_1F_EventScript_22507F + goto_if_set FLAG_BADGE08_GET, SootopolisCity_Gym_1F_EventScript_22507F goto SootopolisCity_Gym_1F_EventScript_225089 end diff --git a/data/maps/SootopolisCity_House1/scripts.inc b/data/maps/SootopolisCity_House1/scripts.inc index 3a41c70eb..5b59c3033 100644 --- a/data/maps/SootopolisCity_House1/scripts.inc +++ b/data/maps/SootopolisCity_House1/scripts.inc @@ -4,12 +4,11 @@ SootopolisCity_House1_MapScripts:: @ 822694C SootopolisCity_House1_EventScript_22694D:: @ 822694D lock faceplayer - checkflag FLAG_0x079 - goto_eq SootopolisCity_House1_EventScript_226984 + goto_if_set FLAG_0x079, SootopolisCity_House1_EventScript_226984 msgbox SootopolisCity_House1_Text_2269A1, MSGBOX_DEFAULT giveitem_std ITEM_TM31 compare VAR_RESULT, 0 - goto_eq SootopolisCity_House1_EventScript_272054 + goto_if_eq SootopolisCity_House1_EventScript_272054 setflag FLAG_0x079 msgbox SootopolisCity_House1_Text_226A13, MSGBOX_DEFAULT release diff --git a/data/maps/SootopolisCity_House3/scripts.inc b/data/maps/SootopolisCity_House3/scripts.inc index ec8ad87ed..d7439f18d 100644 --- a/data/maps/SootopolisCity_House3/scripts.inc +++ b/data/maps/SootopolisCity_House3/scripts.inc @@ -6,7 +6,7 @@ SootopolisCity_House3_EventScript_226B72:: @ 8226B72 faceplayer msgbox SootopolisCity_House3_Text_226BA4, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq SootopolisCity_House3_EventScript_226B91 + goto_if_eq SootopolisCity_House3_EventScript_226B91 msgbox SootopolisCity_House3_Text_226C44, MSGBOX_DEFAULT release end diff --git a/data/maps/SootopolisCity_House6/scripts.inc b/data/maps/SootopolisCity_House6/scripts.inc index dbdb1cbae..366525a10 100644 --- a/data/maps/SootopolisCity_House6/scripts.inc +++ b/data/maps/SootopolisCity_House6/scripts.inc @@ -4,15 +4,14 @@ SootopolisCity_House6_MapScripts:: @ 8226F5B SootopolisCity_House6_EventScript_226F5C:: @ 8226F5C lock faceplayer - checkflag FLAG_0x0F5 - goto_eq SootopolisCity_House6_EventScript_226FA3 + 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 msgbox SootopolisCity_House6_Text_227034, MSGBOX_DEFAULT givedecoration_std 117 compare VAR_RESULT, 0 - goto_eq SootopolisCity_House6_EventScript_226FAD + goto_if_eq SootopolisCity_House6_EventScript_226FAD setflag FLAG_0x0F5 release end diff --git a/data/maps/SootopolisCity_LotadAndSeedotHouse/scripts.inc b/data/maps/SootopolisCity_LotadAndSeedotHouse/scripts.inc index b8e037ce3..17debe321 100644 --- a/data/maps/SootopolisCity_LotadAndSeedotHouse/scripts.inc +++ b/data/maps/SootopolisCity_LotadAndSeedotHouse/scripts.inc @@ -10,14 +10,14 @@ SootopolisCity_LotadAndSeedotHouse_EventScript_22722B:: @ 822722B waitstate copyvar VAR_RESULT, VAR_0x8004 compare VAR_RESULT, 255 - goto_eq SootopolisCity_LotadAndSeedotHouse_EventScript_227272 + goto_if_eq SootopolisCity_LotadAndSeedotHouse_EventScript_227272 special CompareSeedotSize compare VAR_RESULT, 1 - goto_eq SootopolisCity_LotadAndSeedotHouse_EventScript_22727C + goto_if_eq SootopolisCity_LotadAndSeedotHouse_EventScript_22727C compare VAR_RESULT, 2 - goto_eq SootopolisCity_LotadAndSeedotHouse_EventScript_227286 + goto_if_eq SootopolisCity_LotadAndSeedotHouse_EventScript_227286 compare VAR_RESULT, 3 - goto_eq SootopolisCity_LotadAndSeedotHouse_EventScript_227290 + goto_if_eq SootopolisCity_LotadAndSeedotHouse_EventScript_227290 release end @@ -40,7 +40,7 @@ SootopolisCity_LotadAndSeedotHouse_EventScript_227290:: @ 8227290 msgbox SootopolisCity_LotadAndSeedotHouse_Text_227480, MSGBOX_DEFAULT giveitem_std ITEM_ELIXIR compare VAR_RESULT, 0 - goto_eq SootopolisCity_LotadAndSeedotHouse_EventScript_2272B2 + goto_if_eq SootopolisCity_LotadAndSeedotHouse_EventScript_2272B2 closemessage release end @@ -59,14 +59,14 @@ SootopolisCity_LotadAndSeedotHouse_EventScript_2272BC:: @ 82272BC waitstate copyvar VAR_RESULT, VAR_0x8004 compare VAR_RESULT, 255 - goto_eq SootopolisCity_LotadAndSeedotHouse_EventScript_227303 + goto_if_eq SootopolisCity_LotadAndSeedotHouse_EventScript_227303 special CompareLotadSize compare VAR_RESULT, 1 - goto_eq SootopolisCity_LotadAndSeedotHouse_EventScript_22730D + goto_if_eq SootopolisCity_LotadAndSeedotHouse_EventScript_22730D compare VAR_RESULT, 2 - goto_eq SootopolisCity_LotadAndSeedotHouse_EventScript_227317 + goto_if_eq SootopolisCity_LotadAndSeedotHouse_EventScript_227317 compare VAR_RESULT, 3 - goto_eq SootopolisCity_LotadAndSeedotHouse_EventScript_227321 + goto_if_eq SootopolisCity_LotadAndSeedotHouse_EventScript_227321 release end @@ -89,7 +89,7 @@ SootopolisCity_LotadAndSeedotHouse_EventScript_227321:: @ 8227321 msgbox SootopolisCity_LotadAndSeedotHouse_Text_22776C, MSGBOX_DEFAULT giveitem_std ITEM_ELIXIR compare VAR_RESULT, 0 - goto_eq SootopolisCity_LotadAndSeedotHouse_EventScript_227343 + goto_if_eq SootopolisCity_LotadAndSeedotHouse_EventScript_227343 closemessage release end diff --git a/data/maps/SootopolisCity_Mart/scripts.inc b/data/maps/SootopolisCity_Mart/scripts.inc index 6e71ce5e8..94f0a8e9f 100644 --- a/data/maps/SootopolisCity_Mart/scripts.inc +++ b/data/maps/SootopolisCity_Mart/scripts.inc @@ -29,9 +29,8 @@ SootopolisCity_Mart_EventScript_2267C2:: @ 82267C2 lock faceplayer compare VAR_0x40CA, 2 - goto_if 4, SootopolisCity_Mart_EventScript_2267E2 - checkflag FLAG_0x081 - goto_if 0, SootopolisCity_Mart_EventScript_2267E2 + goto_if_ge SootopolisCity_Mart_EventScript_2267E2 + goto_if_unset FLAG_0x081, SootopolisCity_Mart_EventScript_2267E2 msgbox SootopolisCity_Mart_Text_22685D, MSGBOX_DEFAULT release end @@ -45,9 +44,8 @@ SootopolisCity_Mart_EventScript_2267EC:: @ 82267EC lock faceplayer compare VAR_0x40CA, 2 - goto_if 4, SootopolisCity_Mart_EventScript_22680C - checkflag FLAG_0x081 - goto_if 0, SootopolisCity_Mart_EventScript_22680C + goto_if_ge SootopolisCity_Mart_EventScript_22680C + goto_if_unset FLAG_0x081, SootopolisCity_Mart_EventScript_22680C msgbox SootopolisCity_Mart_Text_226928, MSGBOX_DEFAULT release end diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc index fafcaa05d..8a9e6ccc3 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc @@ -77,9 +77,9 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_227A24:: @ 8227A24 setvar VAR_0x8004, 16 special CallFrontierUtilFunc compare VAR_RESULT, 1 - goto_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227A4E + goto_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227A4E compare VAR_TEMP_1, 1 - goto_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227A58 + goto_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227A58 msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227B46, MSGBOX_DEFAULT release end @@ -94,17 +94,17 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_227A58:: @ 8227A58 special BufferEReaderTrainerName msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227BFC, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2 + goto_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2 call SootopolisCity_MysteryEventsHouse_1F_EventScript_227AEF compare VAR_RESULT, 0 - goto_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2 + goto_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2 msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227CEB, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2 + goto_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2 special LoadPlayerParty call SootopolisCity_MysteryEventsHouse_1F_EventScript_27134F compare VAR_RESULT, 0 - goto_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2 + goto_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2 special SavePlayerParty special ReducePlayerPartyToSelectedMons msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227D21, MSGBOX_DEFAULT diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc b/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc index a4850b9f8..448d66981 100644 --- a/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc @@ -19,9 +19,8 @@ SootopolisCity_PokemonCenter_1F_EventScript_22650E:: @ 822650E lock faceplayer compare VAR_0x40CA, 2 - goto_if 4, SootopolisCity_PokemonCenter_1F_EventScript_22652E - checkflag FLAG_0x081 - goto_if 0, SootopolisCity_PokemonCenter_1F_EventScript_22652E + goto_if_ge SootopolisCity_PokemonCenter_1F_EventScript_22652E + goto_if_unset FLAG_0x081, SootopolisCity_PokemonCenter_1F_EventScript_22652E msgbox SootopolisCity_PokemonCenter_1F_Text_22664B, MSGBOX_DEFAULT release end @@ -35,9 +34,8 @@ SootopolisCity_PokemonCenter_1F_EventScript_226538:: @ 8226538 lock faceplayer compare VAR_0x40CA, 2 - goto_if 4, SootopolisCity_PokemonCenter_1F_EventScript_226558 - checkflag FLAG_0x081 - goto_if 0, SootopolisCity_PokemonCenter_1F_EventScript_226558 + goto_if_ge SootopolisCity_PokemonCenter_1F_EventScript_226558 + goto_if_unset FLAG_0x081, SootopolisCity_PokemonCenter_1F_EventScript_226558 msgbox SootopolisCity_PokemonCenter_1F_Text_22672F, MSGBOX_DEFAULT release end diff --git a/data/maps/SouthernIsland_Exterior/scripts.inc b/data/maps/SouthernIsland_Exterior/scripts.inc index d041c3ea3..388410821 100644 --- a/data/maps/SouthernIsland_Exterior/scripts.inc +++ b/data/maps/SouthernIsland_Exterior/scripts.inc @@ -11,7 +11,7 @@ SouthernIsland_Exterior_EventScript_2429D2:: @ 82429D2 faceplayer msgbox SouthernIsland_Exterior_Text_2A69F1, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq SouthernIsland_Exterior_EventScript_242A17 + goto_if_eq SouthernIsland_Exterior_EventScript_242A17 msgbox SouthernIsland_Exterior_Text_2A6A5D, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, SouthernIsland_Exterior_Movement_2725AA diff --git a/data/maps/SouthernIsland_Interior/scripts.inc b/data/maps/SouthernIsland_Interior/scripts.inc index ff1425196..02013869c 100644 --- a/data/maps/SouthernIsland_Interior/scripts.inc +++ b/data/maps/SouthernIsland_Interior/scripts.inc @@ -11,7 +11,7 @@ SouthernIsland_Interior_MapScript1_242A50: @ 8242A50 SouthernIsland_Interior_EventScript_242A5A:: @ 8242A5A specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if 5, SouthernIsland_Interior_EventScript_27374E + goto_if_ne SouthernIsland_Interior_EventScript_27374E removeobject 2 return @@ -36,9 +36,9 @@ SouthernIsland_Interior_EventScript_242A95:: @ 8242A95 SouthernIsland_Interior_EventScript_242AA0:: @ 8242AA0 checkplayergender compare VAR_RESULT, 0 - goto_eq SouthernIsland_Interior_EventScript_242AB8 + goto_if_eq SouthernIsland_Interior_EventScript_242AB8 compare VAR_RESULT, 1 - goto_eq SouthernIsland_Interior_EventScript_242ABE + goto_if_eq SouthernIsland_Interior_EventScript_242ABE end SouthernIsland_Interior_EventScript_242AB8:: @ 8242AB8 @@ -56,14 +56,10 @@ SouthernIsland_Interior_EventScript_242AC4:: @ 8242AC4 end SouthernIsland_Interior_EventScript_242AD0:: @ 8242AD0 - checkflag FLAG_TEMP_2 - goto_eq SouthernIsland_Interior_EventScript_242B9A - checkflag FLAG_0x1C8 - goto_eq SouthernIsland_Interior_EventScript_242B9A - checkflag FLAG_0x1C9 - goto_eq SouthernIsland_Interior_EventScript_242B9A - checkflag FLAG_SYS_HAS_EON_TICKET - goto_if 0, SouthernIsland_Interior_EventScript_242B9A + goto_if_set FLAG_TEMP_2, SouthernIsland_Interior_EventScript_242B9A + goto_if_set FLAG_0x1C8, SouthernIsland_Interior_EventScript_242B9A + goto_if_set FLAG_0x1C9, SouthernIsland_Interior_EventScript_242B9A + goto_if_unset FLAG_SYS_HAS_EON_TICKET, SouthernIsland_Interior_EventScript_242B9A setflag FLAG_0x0CE setflag FLAG_TEMP_2 special SpawnCameraObject @@ -92,11 +88,11 @@ SouthernIsland_Interior_EventScript_242AD0:: @ 8242AD0 clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 1 - goto_eq SouthernIsland_Interior_EventScript_242B81 + goto_if_eq SouthernIsland_Interior_EventScript_242B81 compare VAR_RESULT, 4 - goto_eq SouthernIsland_Interior_EventScript_242B8F + goto_if_eq SouthernIsland_Interior_EventScript_242B8F compare VAR_RESULT, 5 - goto_eq SouthernIsland_Interior_EventScript_242B8F + goto_if_eq SouthernIsland_Interior_EventScript_242B8F setflag FLAG_0x1C9 releaseall end diff --git a/data/maps/TerraCave_End/scripts.inc b/data/maps/TerraCave_End/scripts.inc index 4e5580719..cf9782bb5 100644 --- a/data/maps/TerraCave_End/scripts.inc +++ b/data/maps/TerraCave_End/scripts.inc @@ -11,7 +11,7 @@ TerraCave_End_MapScript1_23B0BB: @ 823B0BB TerraCave_End_EventScript_23B0C5:: @ 823B0C5 specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if 5, TerraCave_End_EventScript_27374E + goto_if_ne TerraCave_End_EventScript_27374E removeobject 1 return @@ -44,11 +44,11 @@ TerraCave_End_EventScript_23B0EC:: @ 823B0EC setvar VAR_TEMP_1, 0 specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 1 - goto_eq TerraCave_End_EventScript_23B155 + goto_if_eq TerraCave_End_EventScript_23B155 compare VAR_RESULT, 4 - goto_eq TerraCave_End_EventScript_23B163 + goto_if_eq TerraCave_End_EventScript_23B163 compare VAR_RESULT, 5 - goto_eq TerraCave_End_EventScript_23B163 + goto_if_eq TerraCave_End_EventScript_23B163 setvar VAR_0x4039, 1 setflag FLAG_0x1BF releaseall diff --git a/data/maps/TrainerHill_Elevator/scripts.inc b/data/maps/TrainerHill_Elevator/scripts.inc index c4e3afbdb..c3a71d492 100644 --- a/data/maps/TrainerHill_Elevator/scripts.inc +++ b/data/maps/TrainerHill_Elevator/scripts.inc @@ -25,7 +25,7 @@ TrainerHill_Elevator_EventScript_269375:: @ 8269375 lockall msgbox TrainerHill_Elevator_Text_268F3E, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq TrainerHill_Elevator_EventScript_269360 + goto_if_eq TrainerHill_Elevator_EventScript_269360 releaseall applymovement 1, TrainerHill_Elevator_Movement_2693F0 waitmovement 0 diff --git a/data/maps/TrainerHill_Entrance/scripts.inc b/data/maps/TrainerHill_Entrance/scripts.inc index d86caad9c..702f9cc93 100644 --- a/data/maps/TrainerHill_Entrance/scripts.inc +++ b/data/maps/TrainerHill_Entrance/scripts.inc @@ -21,7 +21,7 @@ TrainerHill_Entrance_MapScript1_2680D0: @ 82680D0 setvar VAR_0x8004, 9 special sp194_trainer_tower compare VAR_RESULT, 0 - goto_eq TrainerHill_Entrance_EventScript_2680FF + goto_if_eq TrainerHill_Entrance_EventScript_2680FF setobjectxy 255, 9, 6 applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_26837F end @@ -30,7 +30,7 @@ TrainerHill_Entrance_EventScript_2680FF:: @ 82680FF setvar VAR_0x8004, 16 special sp194_trainer_tower compare VAR_RESULT, 1 - goto_eq TrainerHill_Entrance_EventScript_26811A + goto_if_eq TrainerHill_Entrance_EventScript_26811A applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_26837F end @@ -117,7 +117,7 @@ TrainerHill_Entrance_EventScript_2681FD:: @ 82681FD setvar VAR_0x8004, 10 special sp194_trainer_tower compare VAR_RESULT, 0 - goto_eq TrainerHill_Entrance_EventScript_26821F + goto_if_eq TrainerHill_Entrance_EventScript_26821F msgbox TrainerHill_Entrance_Text_2686F4, MSGBOX_DEFAULT goto TrainerHill_Entrance_EventScript_268227 @@ -131,8 +131,7 @@ TrainerHill_Entrance_EventScript_268227:: @ 8268227 TrainerHill_Entrance_EventScript_268229:: @ 8268229 lockall applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_26837F - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, TrainerHill_Entrance_EventScript_26836A + goto_if_unset FLAG_SYS_GAME_CLEAR, TrainerHill_Entrance_EventScript_26836A msgbox TrainerHill_Entrance_Text_2684C6, MSGBOX_DEFAULT setvar VAR_0x8004, 13 special sp194_trainer_tower @@ -141,7 +140,7 @@ TrainerHill_Entrance_EventScript_268229:: @ 8268229 setvar VAR_0x8004, 8 special sp194_trainer_tower compare VAR_RESULT, 1 - goto_eq TrainerHill_Entrance_EventScript_268275 + goto_if_eq TrainerHill_Entrance_EventScript_268275 msgbox TrainerHill_Entrance_Text_268564, MSGBOX_DEFAULT goto TrainerHill_Entrance_EventScript_26827D @@ -197,7 +196,7 @@ TrainerHill_Entrance_EventScript_26832E:: @ 826832E setvar VAR_TEMP_5, 1 call TrainerHill_Entrance_EventScript_27134F compare VAR_RESULT, 0 - goto_eq TrainerHill_Entrance_EventScript_26835C + goto_if_eq TrainerHill_Entrance_EventScript_26835C setvar VAR_0x8004, 14 special sp194_trainer_tower return @@ -242,8 +241,7 @@ TrainerHill_Entrance_EventScript_268388:: @ 8268388 end TrainerHill_Entrance_EventScript_268391:: @ 8268391 - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, TrainerHill_Entrance_EventScript_2683A3 + goto_if_unset FLAG_SYS_GAME_CLEAR, TrainerHill_Entrance_EventScript_2683A3 msgbox TrainerHill_Entrance_Text_268D5A, MSGBOX_NPC end @@ -252,8 +250,7 @@ TrainerHill_Entrance_EventScript_2683A3:: @ 82683A3 end TrainerHill_Entrance_EventScript_2683AC:: @ 82683AC - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, TrainerHill_Entrance_EventScript_2683BE + goto_if_unset FLAG_SYS_GAME_CLEAR, TrainerHill_Entrance_EventScript_2683BE msgbox TrainerHill_Entrance_Text_268E6A, MSGBOX_NPC end @@ -266,8 +263,7 @@ TrainerHill_Entrance_EventScript_2683C7:: @ 82683C7 faceplayer message gUnknown_08272A21 waitmessage - checkflag FLAG_SYS_GAME_CLEAR - goto_eq TrainerHill_Entrance_EventScript_268402 + goto_if_set FLAG_SYS_GAME_CLEAR, TrainerHill_Entrance_EventScript_268402 pokemart TrainerHill_Entrance_Pokemart_2683E8 msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release diff --git a/data/maps/Underwater_SeafloorCavern/scripts.inc b/data/maps/Underwater_SeafloorCavern/scripts.inc index 7cdd3402d..050970f3e 100644 --- a/data/maps/Underwater_SeafloorCavern/scripts.inc +++ b/data/maps/Underwater_SeafloorCavern/scripts.inc @@ -6,8 +6,7 @@ Underwater_SeafloorCavern_MapScripts:: @ 823433B Underwater_SeafloorCavern_MapScript1_23434B: @ 823434B setflag FLAG_LANDMARK_SEAFLOOR_CAVERN - checkflag FLAG_0x081 - goto_eq Underwater_SeafloorCavern_EventScript_234358 + goto_if_set FLAG_0x081, Underwater_SeafloorCavern_EventScript_234358 end Underwater_SeafloorCavern_EventScript_234358:: @ 8234358 diff --git a/data/maps/Underwater_SealedChamber/scripts.inc b/data/maps/Underwater_SealedChamber/scripts.inc index 7ac032c5f..de6ed50d1 100644 --- a/data/maps/Underwater_SealedChamber/scripts.inc +++ b/data/maps/Underwater_SealedChamber/scripts.inc @@ -5,9 +5,9 @@ Underwater_SealedChamber_MapScripts:: @ 82390C4 Underwater_SealedChamber_MapScript1_2390CA: @ 82390CA getplayerxy VAR_0x8004, VAR_0x8005 compare VAR_0x8004, 12 - goto_if 5, Underwater_SealedChamber_EventScript_2390EA + goto_if_ne Underwater_SealedChamber_EventScript_2390EA compare VAR_0x8005, 44 - goto_if 5, Underwater_SealedChamber_EventScript_2390EA + goto_if_ne Underwater_SealedChamber_EventScript_2390EA goto Underwater_SealedChamber_EventScript_2390F3 Underwater_SealedChamber_EventScript_2390EA:: @ 82390EA diff --git a/data/maps/UnknownMap_25_34/scripts.inc b/data/maps/UnknownMap_25_34/scripts.inc index 2e13983fa..7c6fe1c5b 100644 --- a/data/maps/UnknownMap_25_34/scripts.inc +++ b/data/maps/UnknownMap_25_34/scripts.inc @@ -83,7 +83,7 @@ LinkContestRoom1_EventScript_23B842:: @ 823B842 call LinkContestRoom1_EventScript_23B8F8 call LinkContestRoom1_EventScript_23B858 compare VAR_TEMP_0, 8 - goto_if 0, LinkContestRoom1_EventScript_23B842 + goto_if_lt LinkContestRoom1_EventScript_23B842 return LinkContestRoom1_EventScript_23B858:: @ 823B858 @@ -302,7 +302,7 @@ LinkContestRoom1_EventScript_23BB25:: @ 823BB25 LinkContestRoom1_EventScript_23BB2B:: @ 823BB2B specialvar VAR_RESULT, sub_80F9160 compare VAR_RESULT, 1 - goto_eq LinkContestRoom1_EventScript_23BD86 + goto_if_eq LinkContestRoom1_EventScript_23BD86 switch VAR_0x4088 case 1, LinkContestRoom1_EventScript_23BB78 case 2, LinkContestRoom1_EventScript_23BB8B @@ -443,9 +443,9 @@ LinkContestRoom1_EventScript_23BEAC:: @ 823BEAC LilycoveCity_ContestLobby_EventScript_23BEB6:: @ 823BEB6 checkplayergender compare VAR_RESULT, 0 - goto_eq LilycoveCity_ContestLobby_EventScript_23BECE + goto_if_eq LilycoveCity_ContestLobby_EventScript_23BECE compare VAR_RESULT, 1 - goto_eq LilycoveCity_ContestLobby_EventScript_23BED4 + goto_if_eq LilycoveCity_ContestLobby_EventScript_23BED4 return LilycoveCity_ContestLobby_EventScript_23BECE:: @ 823BECE diff --git a/data/maps/VerdanturfTown/scripts.inc b/data/maps/VerdanturfTown/scripts.inc index 578881daa..c929633dd 100644 --- a/data/maps/VerdanturfTown/scripts.inc +++ b/data/maps/VerdanturfTown/scripts.inc @@ -10,8 +10,7 @@ VerdanturfTown_MapScript1_1EB56C: @ 81EB56C VerdanturfTown_EventScript_1EB575:: @ 81EB575 lock faceplayer - checkflag FLAG_RUSTURF_TUNNEL_OPENED - goto_eq VerdanturfTown_EventScript_1EB594 + goto_if_set FLAG_RUSTURF_TUNNEL_OPENED, VerdanturfTown_EventScript_1EB594 msgbox VerdanturfTown_Text_1EB5FD, MSGBOX_DEFAULT applymovement 2, VerdanturfTown_Movement_2725A2 waitmovement 0 @@ -36,8 +35,7 @@ VerdanturfTown_EventScript_1EB5B1:: @ 81EB5B1 VerdanturfTown_EventScript_1EB5BA:: @ 81EB5BA lock faceplayer - checkflag FLAG_RUSTURF_TUNNEL_OPENED - goto_eq VerdanturfTown_EventScript_1EB5CF + goto_if_set FLAG_RUSTURF_TUNNEL_OPENED, VerdanturfTown_EventScript_1EB5CF msgbox VerdanturfTown_Text_1EB854, MSGBOX_DEFAULT release end diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc index 5e07864e4..a42ee04cd 100644 --- a/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc +++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc @@ -11,9 +11,9 @@ VerdanturfTown_BattleTentBattleRoom_MapScript1_20230A: @ 820230A VerdanturfTown_BattleTentBattleRoom_EventScript_202310:: @ 8202310 checkplayergender compare VAR_RESULT, 0 - goto_eq VerdanturfTown_BattleTentBattleRoom_EventScript_202328 + goto_if_eq VerdanturfTown_BattleTentBattleRoom_EventScript_202328 compare VAR_RESULT, 1 - goto_eq VerdanturfTown_BattleTentBattleRoom_EventScript_202333 + goto_if_eq VerdanturfTown_BattleTentBattleRoom_EventScript_202333 return VerdanturfTown_BattleTentBattleRoom_EventScript_202328:: @ 8202328 @@ -38,7 +38,7 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_202348:: @ 8202348 setvar VAR_0x8005, 2 special CallFrontierUtilFunc compare VAR_RESULT, 0 - goto_if 5, VerdanturfTown_BattleTentBattleRoom_EventScript_20243C + goto_if_ne VerdanturfTown_BattleTentBattleRoom_EventScript_20243C VerdanturfTown_BattleTentBattleRoom_EventScript_20236F:: @ 820236F setvar VAR_0x8004, 3 diff --git a/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc index 81726eda9..842d6fb1c 100644 --- a/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc +++ b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc @@ -134,7 +134,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201873:: @ 8201873 setvar VAR_0x8004, 1 special sub_81B99B4 compare VAR_RESULT, 0 - goto_if 5, VerdanturfTown_BattleTentLobby_EventScript_2017EE + goto_if_ne VerdanturfTown_BattleTentLobby_EventScript_2017EE special SavePlayerParty msgbox VerdanturfTown_BattleTentLobby_Text_2C50C3, MSGBOX_DEFAULT @@ -155,7 +155,7 @@ VerdanturfTown_BattleTentLobby_EventScript_2018CF:: @ 82018CF setvar VAR_0x8004, 15 special CallFrontierUtilFunc compare VAR_0x8004, 1 - goto_eq VerdanturfTown_BattleTentLobby_EventScript_2019E8 + goto_if_eq VerdanturfTown_BattleTentLobby_EventScript_2019E8 setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 setvar VAR_0x8006, 2 @@ -167,7 +167,7 @@ VerdanturfTown_BattleTentLobby_EventScript_2018CF:: @ 82018CF special sub_80F9490 waitstate compare VAR_RESULT, 0 - goto_eq VerdanturfTown_BattleTentLobby_EventScript_201A34 + goto_if_eq VerdanturfTown_BattleTentLobby_EventScript_201A34 msgbox VerdanturfTown_BattleTentLobby_Text_2C5662, MSGBOX_YESNO switch VAR_RESULT case 0, VerdanturfTown_BattleTentLobby_EventScript_201A34 @@ -195,7 +195,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201954:: @ 8201954 call VerdanturfTown_BattleTentLobby_EventScript_27134F setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 - goto_eq VerdanturfTown_BattleTentLobby_EventScript_201A1D + goto_if_eq VerdanturfTown_BattleTentLobby_EventScript_201A1D VerdanturfTown_BattleTentLobby_EventScript_2019AE:: @ 82019AE special SavePlayerParty @@ -277,12 +277,11 @@ VerdanturfTown_BattleTentLobby_Movement_201A77: @ 8201A77 VerdanturfTown_BattleTentLobby_EventScript_201A7B:: @ 8201A7B lock faceplayer - checkflag FLAG_0x0EB - goto_eq VerdanturfTown_BattleTentLobby_EventScript_201AB2 + goto_if_set FLAG_0x0EB, VerdanturfTown_BattleTentLobby_EventScript_201AB2 msgbox VerdanturfTown_BattleTentLobby_Text_201D9E, MSGBOX_DEFAULT giveitem_std ITEM_TM45 compare VAR_RESULT, 0 - goto_eq VerdanturfTown_BattleTentLobby_EventScript_272054 + goto_if_eq VerdanturfTown_BattleTentLobby_EventScript_272054 setflag FLAG_0x0EB msgbox VerdanturfTown_BattleTentLobby_Text_201E43, MSGBOX_DEFAULT release @@ -306,8 +305,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201AC5:: @ 8201AC5 VerdanturfTown_BattleTentLobby_EventScript_201AD0:: @ 8201AD0 lock faceplayer - checkflag FLAG_0x1CC - goto_eq VerdanturfTown_BattleTentLobby_EventScript_201AED + goto_if_set FLAG_0x1CC, VerdanturfTown_BattleTentLobby_EventScript_201AED msgbox VerdanturfTown_BattleTentLobby_Text_201F3F, MSGBOX_DEFAULT addvar VAR_0x40D1, 1 setflag FLAG_0x1CC diff --git a/data/maps/VerdanturfTown_WandasHouse/scripts.inc b/data/maps/VerdanturfTown_WandasHouse/scripts.inc index fea5d3de0..e185cff51 100644 --- a/data/maps/VerdanturfTown_WandasHouse/scripts.inc +++ b/data/maps/VerdanturfTown_WandasHouse/scripts.inc @@ -4,8 +4,7 @@ VerdanturfTown_WandasHouse_MapScripts:: @ 82028BE VerdanturfTown_WandasHouse_EventScript_2028BF:: @ 82028BF lock faceplayer - checkflag FLAG_0x0C1 - goto_eq VerdanturfTown_WandasHouse_EventScript_2028D7 + goto_if_set FLAG_0x0C1, VerdanturfTown_WandasHouse_EventScript_2028D7 msgbox VerdanturfTown_WandasHouse_Text_202993, MSGBOX_DEFAULT setflag FLAG_0x0C1 release @@ -19,10 +18,8 @@ VerdanturfTown_WandasHouse_EventScript_2028D7:: @ 82028D7 VerdanturfTown_WandasHouse_EventScript_2028E1:: @ 82028E1 lock faceplayer - checkflag FLAG_0x07E - goto_eq VerdanturfTown_WandasHouse_EventScript_202909 - checkflag FLAG_0x4F3 - goto_eq VerdanturfTown_WandasHouse_EventScript_2028FF + goto_if_set FLAG_0x07E, VerdanturfTown_WandasHouse_EventScript_202909 + goto_if_set FLAG_0x4F3, VerdanturfTown_WandasHouse_EventScript_2028FF msgbox VerdanturfTown_WandasHouse_Text_202B37, MSGBOX_DEFAULT release end @@ -44,10 +41,8 @@ VerdanturfTown_WandasHouse_EventScript_202913:: @ 8202913 VerdanturfTown_WandasHouse_EventScript_20291C:: @ 820291C lock faceplayer - checkflag FLAG_0x4F3 - goto_eq VerdanturfTown_WandasHouse_EventScript_202944 - checkflag FLAG_0x0BE - goto_eq VerdanturfTown_WandasHouse_EventScript_20293A + goto_if_set FLAG_0x4F3, VerdanturfTown_WandasHouse_EventScript_202944 + goto_if_set FLAG_0x0BE, VerdanturfTown_WandasHouse_EventScript_20293A msgbox VerdanturfTown_WandasHouse_Text_202D91, MSGBOX_DEFAULT release end @@ -65,12 +60,9 @@ VerdanturfTown_WandasHouse_EventScript_202944:: @ 8202944 VerdanturfTown_WandasHouse_EventScript_20294E:: @ 820294E lock faceplayer - checkflag FLAG_0x07E - goto_eq VerdanturfTown_WandasHouse_EventScript_202989 - checkflag FLAG_0x4F3 - goto_eq VerdanturfTown_WandasHouse_EventScript_20297F - checkflag FLAG_RUSTURF_TUNNEL_OPENED - goto_eq VerdanturfTown_WandasHouse_EventScript_202975 + goto_if_set FLAG_0x07E, VerdanturfTown_WandasHouse_EventScript_202989 + goto_if_set FLAG_0x4F3, VerdanturfTown_WandasHouse_EventScript_20297F + goto_if_set FLAG_RUSTURF_TUNNEL_OPENED, VerdanturfTown_WandasHouse_EventScript_202975 msgbox VerdanturfTown_WandasHouse_Text_202E47, MSGBOX_DEFAULT release end diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc index 45f6d9d78..7cebd6e72 100644 --- a/data/maps/VictoryRoad_1F/scripts.inc +++ b/data/maps/VictoryRoad_1F/scripts.inc @@ -85,7 +85,7 @@ VictoryRoad_1F_EventScript_235E35:: @ 8235E35 trainerbattle_single TRAINER_WALLY_3, VictoryRoad_1F_Text_236073, VictoryRoad_1F_Text_2360DA specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq VictoryRoad_1F_EventScript_235E5C + goto_if_eq VictoryRoad_1F_EventScript_235E5C msgbox VictoryRoad_1F_Text_2360FE, MSGBOX_AUTOCLOSE end diff --git a/data/scripts/apprentice.inc b/data/scripts/apprentice.inc index 4ce7489c2..ca4dd657b 100644 --- a/data/scripts/apprentice.inc +++ b/data/scripts/apprentice.inc @@ -28,27 +28,26 @@ EventScript_Apprentice:: @ 82B688D setvar VAR_0x8004, 0 special CallApprenticeFunction compare VAR_RESULT, 0 - goto_eq Script_Apprentice_FirstMeeting + goto_if_eq Script_Apprentice_FirstMeeting setvar VAR_0x8004, 10 special CallApprenticeFunction compare VAR_0x8004, 0 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_2B68BE - checkflag FLAG_0x934 - goto_eq Script_Apprentice_ReleaseAndEnd + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B68BE + goto_if_set FLAG_0x934, Script_Apprentice_ReleaseAndEnd BattleFrontier_BattleTowerLobby_EventScript_2B68BE: setvar VAR_0x8004, 11 special CallApprenticeFunction compare VAR_RESULT, 2 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_2B69D3 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B69D3 compare VAR_RESULT, 4 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_2B6ACF + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B6ACF compare VAR_RESULT, 3 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_2B6C77 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B6C77 compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_2B6D5C + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B6D5C compare VAR_RESULT, 5 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_2B6DD4 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B6DD4 release releaseall end @@ -60,7 +59,7 @@ Script_Apprentice_FirstMeeting: Script_Apprentice_FirstMeetingNag: apprentice_menu APPRENTICE_ASK_YES_NO compare VAR_RESULT, 1 - goto_eq Script_Apprentice_FirstMeetingAskAgain + goto_if_eq Script_Apprentice_FirstMeetingAskAgain apprentice_msg FALSE, 2 apprentice_menu APPRENTICE_ASK_WHICH_LEVEL setvar VAR_0x8004, 1 @@ -151,11 +150,11 @@ BattleFrontier_BattleTowerLobby_EventScript_2B6B09: special CallApprenticeFunction waitstate compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_2B6B81 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B6B81 setvar VAR_0x8004, 20 special CallApprenticeFunction compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_2B6C0C + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B6C0C apprentice_buff 0, APPRENTICE_BUFF_ITEM apprentice_msg TRUE, 12 setvar VAR_0x8004, 5 @@ -178,7 +177,7 @@ BattleFrontier_BattleTowerLobby_EventScript_2B6B81: setvar VAR_0x8004, 15 special CallApprenticeFunction compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_2B6B09 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B6B09 BattleFrontier_BattleTowerLobby_EventScript_2B6BD4: apprentice_msg TRUE, 14 @@ -203,7 +202,7 @@ BattleFrontier_BattleTowerLobby_EventScript_2B6C0C: setvar VAR_0x8004, 15 special CallApprenticeFunction compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_2B6B09 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B6B09 goto BattleFrontier_BattleTowerLobby_EventScript_2B6BD4 end @@ -297,7 +296,7 @@ Script_Apprentice_LeaveGoRight: setvar VAR_0x8004, 24 special CallApprenticeFunction compare VAR_0x8004, 0 - goto_eq Script_Apprentice_End + goto_if_eq Script_Apprentice_End applymovement 6, BattleFrontier_BattleTowerLobby_Movement_2B6E94 waitmovement 0 end @@ -306,7 +305,7 @@ Script_Apprentice_Leave: setvar VAR_0x8004, 24 special CallApprenticeFunction compare VAR_0x8004, 0 - goto_eq Script_Apprentice_End + goto_if_eq Script_Apprentice_End applymovement 6, BattleFrontier_BattleTowerLobby_Movement_2B6E95 waitmovement 0 end diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc index 238541ee6..685949006 100644 --- a/data/scripts/berry_tree.inc +++ b/data/scripts/berry_tree.inc @@ -23,7 +23,7 @@ Route102_EventScript_274359:: @ 8274359 faceplayer specialvar VAR_RESULT, PlayerHasBerries compare VAR_RESULT, 1 - goto_eq Route102_EventScript_274374 + goto_if_eq Route102_EventScript_274374 message Route102_Text_2744F0 waitmessage waitbuttonpress @@ -33,9 +33,9 @@ Route102_EventScript_274359:: @ 8274359 Route102_EventScript_274374:: @ 8274374 msgbox Route102_Text_274507, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq Route102_EventScript_274393 + goto_if_eq Route102_EventScript_274393 compare VAR_RESULT, 0 - goto_eq Route102_EventScript_2743AF + goto_if_eq Route102_EventScript_2743AF end Route102_EventScript_274393:: @ 8274393 @@ -44,7 +44,7 @@ Route102_EventScript_274393:: @ 8274393 special Bag_ChooseBerry waitstate compare VAR_ITEM_ID, 0 - goto_eq Route102_EventScript_2743AF + goto_if_eq Route102_EventScript_2743AF takeitem VAR_ITEM_ID, 1 call Route102_EventScript_2744DD @@ -87,9 +87,9 @@ Route102_EventScript_2743E1:: @ 82743E1 Route102_EventScript_2743F6:: @ 82743F6 compare VAR_0x8005, 0 - goto_eq Route102_EventScript_27441A + goto_if_eq Route102_EventScript_27441A compare VAR_0x8005, 4 - goto_eq Route102_EventScript_274413 + goto_if_eq Route102_EventScript_274413 bufferstring 1, Route102_Text_2745E5 return @@ -108,14 +108,14 @@ Route102_EventScript_274421:: @ 8274421 special EventObjectInteractionGetBerryCountString msgbox Route102_Text_2745EE, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq Route102_EventScript_274448 + goto_if_eq Route102_EventScript_274448 compare VAR_RESULT, 0 - goto_eq Route102_EventScript_274479 + goto_if_eq Route102_EventScript_274479 Route102_EventScript_274448:: @ 8274448 special EventObjectInteractionPickBerryTree compare VAR_0x8004, 0 - goto_eq Route102_EventScript_274470 + goto_if_eq Route102_EventScript_274470 special sub_80EED34 special EventObjectInteractionRemoveBerryTree message Route102_Text_27461B @@ -153,13 +153,13 @@ Route102_EventScript_274482:: @ 8274482 Route102_EventScript_27448D:: @ 827448D checkitem ITEM_WAILMER_PAIL, 1 compare VAR_RESULT, 0 - goto_eq Route102_EventScript_2744BE + goto_if_eq Route102_EventScript_2744BE special EventObjectInteractionGetBerryName msgbox Route102_Text_2746E4, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq Route102_EventScript_2744C4 + goto_if_eq Route102_EventScript_2744C4 compare VAR_RESULT, 0 - goto_eq Route102_EventScript_2744BE + goto_if_eq Route102_EventScript_2744BE Route102_EventScript_2744BE:: @ 82744BE releaseall diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 44116d088..11c368610 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -21,10 +21,10 @@ VerdanturfTown_PokemonCenter_2F_MapScript1_276ACF: @ 8276ACF OldaleTown_PokemonCenter_2F_EventScript_276AD5:: @ 8276AD5 specialvar VAR_RESULT, sub_813B514 compare VAR_RESULT, 1 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_276AFB + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276AFB specialvar VAR_RESULT, sub_801B27C compare VAR_RESULT, 0 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_276AFF + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276AFF goto OldaleTown_PokemonCenter_2F_EventScript_276AFB end @@ -55,7 +55,7 @@ SootopolisCity_PokemonCenter_2F_EventScript_276B03:: @ 8276B03 VerdanturfTown_PokemonCenter_2F_EventScript_276B03:: @ 8276B03 specialvar VAR_RESULT, sub_813B514 compare VAR_RESULT, 1 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_276B23 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276B23 goto OldaleTown_PokemonCenter_2F_EventScript_276B19 end @@ -69,9 +69,8 @@ OldaleTown_PokemonCenter_2F_EventScript_276B1A:: @ 8276B1A OldaleTown_PokemonCenter_2F_EventScript_276B23:: @ 8276B23 checkitem ITEM_EON_TICKET, 1 compare VAR_RESULT, 1 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_276B19 - checkflag FLAG_SYS_HAS_EON_TICKET - goto_eq OldaleTown_PokemonCenter_2F_EventScript_276B19 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276B19 + goto_if_set FLAG_SYS_HAS_EON_TICKET, OldaleTown_PokemonCenter_2F_EventScript_276B19 msgbox gUnknown_08273594, MSGBOX_DEFAULT giveitem_std ITEM_EON_TICKET setflag FLAG_SYS_HAS_EON_TICKET @@ -115,7 +114,7 @@ VerdanturfTown_PokemonCenter_2F_MapScript2_276B6C: @ 8276B6C MossdeepCity_GameCorner_1F_EventScript_276BAE:: @ 8276BAE OldaleTown_PokemonCenter_2F_EventScript_276BAE:: @ 8276BAE compare VAR_0x8007, 0 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_276BBD + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276BBD turnobject VAR_0x8007, 3 OldaleTown_PokemonCenter_2F_EventScript_276BBD:: @ 8276BBD @@ -140,21 +139,21 @@ SlateportCity_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE SootopolisCity_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE VerdanturfTown_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE compare VAR_0x4087, 1 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_276C17 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C17 compare VAR_0x4087, 2 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_276C17 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C17 compare VAR_0x4087, 5 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_276C17 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C17 compare VAR_0x4087, 3 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_276C1D + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C1D compare VAR_0x4087, 4 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_276C23 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C23 compare VAR_0x4087, 6 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_276C29 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C29 compare VAR_0x4087, 7 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_276C2F + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C2F compare VAR_0x4087, 8 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_276C35 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C35 end OldaleTown_PokemonCenter_2F_EventScript_276C17:: @ 8276C17 @@ -234,7 +233,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276CB5:: @ 8276CB5 special CloseLink setvar VAR_0x4087, 0 compare VAR_0x8007, 0 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_276DD5 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276DD5 applymovement VAR_0x8007, OldaleTown_PokemonCenter_2F_Movement_27734D waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27734F @@ -257,7 +256,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276CFF:: @ 8276CFF special CloseLink setvar VAR_0x4087, 0 compare VAR_0x8007, 0 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_276DD5 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276DD5 applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27735E waitmovement 0 applymovement VAR_0x8007, OldaleTown_PokemonCenter_2F_Movement_27734D @@ -281,7 +280,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276D44:: @ 8276D44 applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27734F waitmovement 0 compare VAR_0x8007, 0 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_276D6B + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276D6B applymovement VAR_0x8007, OldaleTown_PokemonCenter_2F_Movement_277349 waitmovement 0 @@ -301,7 +300,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276D6C:: @ 8276D6C OldaleTown_PokemonCenter_2F_EventScript_276D84:: @ 8276D84 setvar VAR_0x4087, 0 compare VAR_0x8007, 0 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_276DD5 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276DD5 applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27735E waitmovement 0 applymovement VAR_0x8007, OldaleTown_PokemonCenter_2F_Movement_27734D @@ -360,8 +359,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276E22:: @ 8276E22 OldaleTown_PokemonCenter_2F_EventScript_276E30:: @ 8276E30 setvar VAR_0x8004, 0 - checkflag FLAG_VISITED_MAUVILLE_CITY - goto_eq OldaleTown_PokemonCenter_2F_EventScript_276E75 + goto_if_set FLAG_VISITED_MAUVILLE_CITY, OldaleTown_PokemonCenter_2F_EventScript_276E75 multichoice 0, 0, 74, 0 switch VAR_RESULT case 0, OldaleTown_PokemonCenter_2F_EventScript_2770B2 @@ -411,7 +409,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276F23:: @ 8276F23 OldaleTown_PokemonCenter_2F_EventScript_276F2E:: @ 8276F2E special HasEnoughMonsForDoubleBattle compare VAR_RESULT, 0 - goto_if 5, OldaleTown_PokemonCenter_2F_EventScript_276F47 + goto_if_ne OldaleTown_PokemonCenter_2F_EventScript_276F47 setvar VAR_0x8004, 2 goto OldaleTown_PokemonCenter_2F_EventScript_276F60 end @@ -429,23 +427,23 @@ OldaleTown_PokemonCenter_2F_EventScript_276F55:: @ 8276F55 OldaleTown_PokemonCenter_2F_EventScript_276F60:: @ 8276F60 call OldaleTown_PokemonCenter_2F_EventScript_27134F compare VAR_RESULT, 0 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC message gText_PleaseWaitForLink waitmessage special sub_80B2DA4 waitstate compare VAR_RESULT, 1 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_276FBD + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276FBD compare VAR_RESULT, 2 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772D2 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772D2 compare VAR_RESULT, 3 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772DF + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772DF compare VAR_RESULT, 4 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_277046 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277046 compare VAR_RESULT, 5 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC compare VAR_RESULT, 6 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772C5 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772C5 end OldaleTown_PokemonCenter_2F_EventScript_276FBD:: @ 8276FBD @@ -473,7 +471,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276FBD:: @ 8276FBD waitdooranim release compare VAR_0x8004, 5 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_277036 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277036 special SetCableClubWarp warp MAP_SINGLE_BATTLE_COLOSSEUM, 255, 6, 8 special sub_80AF948 @@ -528,30 +526,30 @@ OldaleTown_PokemonCenter_2F_EventScript_2770B2:: @ 82770B2 copyvar VAR_0x8007, VAR_LAST_TALKED call OldaleTown_PokemonCenter_2F_EventScript_277199 compare VAR_RESULT, 0 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC call OldaleTown_PokemonCenter_2F_EventScript_27134F compare VAR_RESULT, 0 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC message gText_PleaseWaitForLink waitmessage special sub_80B2E4C waitstate compare VAR_RESULT, 1 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_27713A + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_27713A compare VAR_RESULT, 2 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772D2 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772D2 compare VAR_RESULT, 3 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772DF + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772DF compare VAR_RESULT, 4 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_27730E + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_27730E compare VAR_RESULT, 5 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC compare VAR_RESULT, 6 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772C5 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772C5 compare VAR_RESULT, 7 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772AB + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772AB compare VAR_RESULT, 9 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772B8 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772B8 end OldaleTown_PokemonCenter_2F_EventScript_27713A:: @ 827713A @@ -585,10 +583,10 @@ OldaleTown_PokemonCenter_2F_EventScript_27713A:: @ 827713A OldaleTown_PokemonCenter_2F_EventScript_277199:: @ 8277199 specialvar VAR_RESULT, CalculatePlayerPartyCount compare VAR_RESULT, 2 - goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_2771BF + goto_if_lt OldaleTown_PokemonCenter_2F_EventScript_2771BF specialvar VAR_RESULT, sub_80F9370 compare VAR_RESULT, 1 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_2771CD + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2771CD setvar VAR_RESULT, 1 return @@ -606,7 +604,7 @@ OldaleTown_PokemonCenter_2F_EventScript_2771DB:: @ 82771DB copyvar VAR_0x8007, VAR_LAST_TALKED call OldaleTown_PokemonCenter_2F_EventScript_27134F compare VAR_RESULT, 0 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC message gText_PleaseWaitForLink waitmessage special sub_80B2E74 @@ -614,19 +612,19 @@ OldaleTown_PokemonCenter_2F_EventScript_2771DB:: @ 82771DB special sub_80B2EA8 waitstate compare VAR_RESULT, 12 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_277328 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277328 compare VAR_RESULT, 1 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_27724C + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_27724C compare VAR_RESULT, 2 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772D2 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772D2 compare VAR_RESULT, 3 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772DF + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772DF compare VAR_RESULT, 4 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_27730E + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_27730E compare VAR_RESULT, 5 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC compare VAR_RESULT, 6 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772C5 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772C5 end OldaleTown_PokemonCenter_2F_EventScript_27724C:: @ 827724C @@ -810,7 +808,7 @@ gUnknown_08277388:: @ 8277388 special sub_80F9438 waitstate compare VAR_RESULT, 0 - goto_eq DoubleBattleColosseum_EventScript_2773F4 + goto_if_eq DoubleBattleColosseum_EventScript_2773F4 setvar VAR_0x8005, 0 special sub_80B3968 waitstate @@ -821,7 +819,7 @@ gUnknown_082773A3:: @ 82773A3 special sub_80F9438 waitstate compare VAR_RESULT, 0 - goto_eq DoubleBattleColosseum_EventScript_2773F4 + goto_if_eq DoubleBattleColosseum_EventScript_2773F4 setvar VAR_0x8005, 1 special sub_80B3968 waitstate @@ -832,7 +830,7 @@ gUnknown_082773BE:: @ 82773BE special sub_80F9438 waitstate compare VAR_RESULT, 0 - goto_eq DoubleBattleColosseum_EventScript_2773F4 + goto_if_eq DoubleBattleColosseum_EventScript_2773F4 setvar VAR_0x8005, 2 special sub_80B3968 waitstate @@ -843,7 +841,7 @@ gUnknown_082773D9:: @ 82773D9 special sub_80F9438 waitstate compare VAR_RESULT, 0 - goto_eq DoubleBattleColosseum_EventScript_2773F4 + goto_if_eq DoubleBattleColosseum_EventScript_2773F4 setvar VAR_0x8005, 3 special sub_80B3968 waitstate @@ -881,7 +879,7 @@ gUnknown_0827741D:: @ 827741D special sub_80E6BE8 waitstate compare VAR_TEMP_1, 0 - goto_if 5, RecordCorner_EventScript_277471 + goto_if_ne RecordCorner_EventScript_277471 end gUnknown_08277432:: @ 8277432 @@ -889,7 +887,7 @@ gUnknown_08277432:: @ 8277432 special sub_80E6BE8 waitstate compare VAR_TEMP_1, 0 - goto_if 5, RecordCorner_EventScript_277471 + goto_if_ne RecordCorner_EventScript_277471 end gUnknown_08277447:: @ 8277447 @@ -897,7 +895,7 @@ gUnknown_08277447:: @ 8277447 special sub_80E6BE8 waitstate compare VAR_TEMP_1, 0 - goto_if 5, RecordCorner_EventScript_277471 + goto_if_ne RecordCorner_EventScript_277471 end gUnknown_0827745C:: @ 827745C @@ -905,7 +903,7 @@ gUnknown_0827745C:: @ 827745C special sub_80E6BE8 waitstate compare VAR_TEMP_1, 0 - goto_if 5, RecordCorner_EventScript_277471 + goto_if_ne RecordCorner_EventScript_277471 end RecordCorner_EventScript_277471:: @ 8277471 @@ -951,7 +949,7 @@ TradeCenter_EventScript_2774B6:: @ 82774B6 RecordCorner_EventScript_2774C6:: @ 82774C6 compare VAR_TEMP_0, 0 - goto_if 5, RecordCorner_EventScript_2774E0 + goto_if_ne RecordCorner_EventScript_2774E0 special sub_8098574 message RecordCorner_Text_27861C waitmessage @@ -972,7 +970,7 @@ RecordCorner_EventScript_2774E0:: @ 82774E0 gUnknown_082774EF:: @ 82774EF msgbox Text_2783A8, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq gUnknown_08277509 + goto_if_eq gUnknown_08277509 erasebox 0, 0, 29, 19 releaseall end @@ -993,15 +991,14 @@ OldaleTown_PokemonCenter_2F_EventScript_27751B:: @ 827751B lock faceplayer setvar VAR_FRONTIER_FACILITY, 8 - checkflag FLAG_SYS_POKEDEX_GET - goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_277335 + goto_if_unset FLAG_SYS_POKEDEX_GET, OldaleTown_PokemonCenter_2F_EventScript_277335 specialvar VAR_RESULT, sub_813990C compare VAR_RESULT, 1 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_27731B + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_27731B copyvar VAR_0x8007, VAR_LAST_TALKED specialvar VAR_RESULT, IsWirelessAdapterConnected compare VAR_RESULT, 0 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_277668 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277668 message OldaleTown_PokemonCenter_2F_Text_27940D waitmessage goto OldaleTown_PokemonCenter_2F_EventScript_27755C @@ -1025,10 +1022,10 @@ OldaleTown_PokemonCenter_2F_EventScript_277593:: @ 8277593 OldaleTown_PokemonCenter_2F_EventScript_27759F:: @ 827759F call OldaleTown_PokemonCenter_2F_EventScript_277626 compare VAR_RESULT, 0 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC call OldaleTown_PokemonCenter_2F_EventScript_27134F compare VAR_RESULT, 0 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC msgbox OldaleTown_PokemonCenter_2F_Text_27961C, MSGBOX_DEFAULT closemessage special HealPlayerParty @@ -1060,10 +1057,10 @@ OldaleTown_PokemonCenter_2F_EventScript_27759F:: @ 827759F OldaleTown_PokemonCenter_2F_EventScript_277626:: @ 8277626 specialvar VAR_RESULT, CountPartyNonEggMons compare VAR_RESULT, 2 - goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_27764C + goto_if_lt OldaleTown_PokemonCenter_2F_EventScript_27764C specialvar VAR_RESULT, sub_80F9370 compare VAR_RESULT, 1 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_27765A + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_27765A setvar VAR_RESULT, 1 return @@ -1085,11 +1082,10 @@ OldaleTown_PokemonCenter_2F_EventScript_277668:: @ 8277668 OldaleTown_PokemonCenter_2F_EventScript_277672:: @ 8277672 lock faceplayer - checkflag FLAG_SYS_POKEDEX_GET - goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_277335 + goto_if_unset FLAG_SYS_POKEDEX_GET, OldaleTown_PokemonCenter_2F_EventScript_277335 msgbox OldaleTown_PokemonCenter_2F_Text_279937, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_27769A + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_27769A msgbox OldaleTown_PokemonCenter_2F_Text_2799AA, MSGBOX_DEFAULT release return @@ -1103,14 +1099,13 @@ OldaleTown_PokemonCenter_2F_EventScript_2776A4:: @ 82776A4 lock faceplayer setvar VAR_FRONTIER_FACILITY, 9 - checkflag FLAG_SYS_POKEDEX_GET - goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_277335 + goto_if_unset FLAG_SYS_POKEDEX_GET, OldaleTown_PokemonCenter_2F_EventScript_277335 specialvar VAR_RESULT, sub_813990C compare VAR_RESULT, 1 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_27731B + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_27731B specialvar VAR_RESULT, IsWirelessAdapterConnected compare VAR_RESULT, 0 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_276E13 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276E13 message OldaleTown_PokemonCenter_2F_Text_279013 waitmessage delay 28 @@ -1120,9 +1115,8 @@ OldaleTown_PokemonCenter_2F_EventScript_2776A4:: @ 82776A4 OldaleTown_PokemonCenter_2F_EventScript_2776E3:: @ 82776E3 checkitem ITEM_POWDER_JAR, 1 compare VAR_RESULT, 0 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_27778B - checkflag FLAG_VISITED_MAUVILLE_CITY - goto_eq OldaleTown_PokemonCenter_2F_EventScript_27773E + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_27778B + goto_if_set FLAG_VISITED_MAUVILLE_CITY, OldaleTown_PokemonCenter_2F_EventScript_27773E multichoice 0, 0, 78, 0 switch VAR_RESULT case 0, OldaleTown_PokemonCenter_2F_EventScript_27780D @@ -1144,8 +1138,7 @@ OldaleTown_PokemonCenter_2F_EventScript_27773E:: @ 827773E end OldaleTown_PokemonCenter_2F_EventScript_27778B:: @ 827778B - checkflag FLAG_VISITED_MAUVILLE_CITY - goto_eq OldaleTown_PokemonCenter_2F_EventScript_2777CB + goto_if_set FLAG_VISITED_MAUVILLE_CITY, OldaleTown_PokemonCenter_2F_EventScript_2777CB multichoice 0, 0, 75, 0 switch VAR_RESULT case 0, OldaleTown_PokemonCenter_2F_EventScript_27780D @@ -1167,10 +1160,10 @@ OldaleTown_PokemonCenter_2F_EventScript_2777CB:: @ 82777CB OldaleTown_PokemonCenter_2F_EventScript_27780D:: @ 827780D msgbox OldaleTown_PokemonCenter_2F_Text_27909D, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC call OldaleTown_PokemonCenter_2F_EventScript_277199 compare VAR_RESULT, 0 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC setvar VAR_0x8004, 3 goto OldaleTown_PokemonCenter_2F_EventScript_277931 end @@ -1196,7 +1189,7 @@ OldaleTown_PokemonCenter_2F_EventScript_27788E:: @ 827788E OldaleTown_PokemonCenter_2F_EventScript_277899:: @ 8277899 special HasEnoughMonsForDoubleBattle compare VAR_RESULT, 0 - goto_if 5, OldaleTown_PokemonCenter_2F_EventScript_2778B2 + goto_if_ne OldaleTown_PokemonCenter_2F_EventScript_2778B2 setvar VAR_0x8004, 1 goto OldaleTown_PokemonCenter_2F_EventScript_277931 end @@ -1219,7 +1212,7 @@ OldaleTown_PokemonCenter_2F_EventScript_2778CB:: @ 82778CB OldaleTown_PokemonCenter_2F_EventScript_2778D9:: @ 82778D9 msgbox OldaleTown_PokemonCenter_2F_Text_2790E8, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC setvar VAR_0x8004, 12 goto OldaleTown_PokemonCenter_2F_EventScript_277931 end @@ -1227,10 +1220,10 @@ OldaleTown_PokemonCenter_2F_EventScript_2778D9:: @ 82778D9 OldaleTown_PokemonCenter_2F_EventScript_2778F7:: @ 82778F7 msgbox OldaleTown_PokemonCenter_2F_Text_279114, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC special HasAtLeastOneBerry compare VAR_RESULT, 0 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_277923 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277923 setvar VAR_0x8004, 5 goto OldaleTown_PokemonCenter_2F_EventScript_277931 end @@ -1243,7 +1236,7 @@ OldaleTown_PokemonCenter_2F_EventScript_277923:: @ 8277923 OldaleTown_PokemonCenter_2F_EventScript_277931:: @ 8277931 call OldaleTown_PokemonCenter_2F_EventScript_27134F compare VAR_RESULT, 0 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC switch VAR_0x8004 case 3, OldaleTown_PokemonCenter_2F_EventScript_277989 case 0, OldaleTown_PokemonCenter_2F_EventScript_277989 @@ -1267,22 +1260,22 @@ OldaleTown_PokemonCenter_2F_EventScript_277989:: @ 8277989 OldaleTown_PokemonCenter_2F_EventScript_2779C6:: @ 82779C6 call OldaleTown_PokemonCenter_2F_EventScript_277B30 compare VAR_RESULT, 1 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_277B3A + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277B3A compare VAR_RESULT, 5 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_277989 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277989 compare VAR_RESULT, 8 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_2779C6 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2779C6 release return OldaleTown_PokemonCenter_2F_EventScript_2779EE:: @ 82779EE call OldaleTown_PokemonCenter_2F_EventScript_277B35 compare VAR_RESULT, 1 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_277B3A + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277B3A compare VAR_RESULT, 5 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_277989 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277989 compare VAR_RESULT, 8 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_2779EE + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2779EE release return @@ -1300,22 +1293,22 @@ OldaleTown_PokemonCenter_2F_EventScript_277A16:: @ 8277A16 OldaleTown_PokemonCenter_2F_EventScript_277A53:: @ 8277A53 call OldaleTown_PokemonCenter_2F_EventScript_277B30 compare VAR_RESULT, 1 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_277B3A + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277B3A compare VAR_RESULT, 5 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_277A16 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277A16 compare VAR_RESULT, 8 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_277A53 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277A53 release return OldaleTown_PokemonCenter_2F_EventScript_277A7B:: @ 8277A7B call OldaleTown_PokemonCenter_2F_EventScript_277B35 compare VAR_RESULT, 1 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_277B3A + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277B3A compare VAR_RESULT, 5 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_277A16 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277A16 compare VAR_RESULT, 8 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_277A7B + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277A7B release return @@ -1333,22 +1326,22 @@ OldaleTown_PokemonCenter_2F_EventScript_277AA3:: @ 8277AA3 OldaleTown_PokemonCenter_2F_EventScript_277AE0:: @ 8277AE0 call OldaleTown_PokemonCenter_2F_EventScript_277B30 compare VAR_RESULT, 1 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_277B3A + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277B3A compare VAR_RESULT, 5 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_277AA3 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277AA3 compare VAR_RESULT, 8 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_277AE0 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277AE0 release return OldaleTown_PokemonCenter_2F_EventScript_277B08:: @ 8277B08 call OldaleTown_PokemonCenter_2F_EventScript_277B35 compare VAR_RESULT, 1 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_277B3A + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277B3A compare VAR_RESULT, 5 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_277AA3 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277AA3 compare VAR_RESULT, 8 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_277B08 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277B08 release return @@ -1394,11 +1387,10 @@ OldaleTown_PokemonCenter_2F_EventScript_277B3A:: @ 8277B3A EventScript_WirelessBoxResults:: @ 8277B8A lockall - checkflag FLAG_SYS_POKEDEX_GET - goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_27733F + goto_if_unset FLAG_SYS_POKEDEX_GET, OldaleTown_PokemonCenter_2F_EventScript_27733F specialvar VAR_RESULT, IsWirelessAdapterConnected compare VAR_RESULT, 0 - goto_eq EventScript_277BB4 + goto_if_eq EventScript_277BB4 fadescreen 1 special sub_801A42C waitstate @@ -1497,7 +1489,7 @@ MossdeepCity_GameCorner_1F_EventScript_277C91:: @ 8277C91 waitmessage specialvar VAR_RESULT, IsWirelessAdapterConnected compare VAR_RESULT, 0 - goto_eq MossdeepCity_GameCorner_1F_EventScript_277E48 + goto_if_eq MossdeepCity_GameCorner_1F_EventScript_277E48 delay 60 message MossdeepCity_GameCorner_1F_Text_278DAD waitmessage @@ -1513,17 +1505,17 @@ MossdeepCity_GameCorner_1F_EventScript_277CE9:: @ 8277CE9 setvar VAR_0x8005, 0 special sub_802C920 compare VAR_RESULT, 0 - goto_eq MossdeepCity_GameCorner_1F_EventScript_277E55 + goto_if_eq MossdeepCity_GameCorner_1F_EventScript_277E55 msgbox MossdeepCity_GameCorner_1F_Text_278DD9, MSGBOX_DEFAULT fadescreen 1 setvar VAR_0x8005, 0 special sub_81B8958 waitstate compare VAR_0x8004, 6 - goto_if 4, MossdeepCity_GameCorner_1F_EventScript_2772F9 + goto_if_ge MossdeepCity_GameCorner_1F_EventScript_2772F9 call MossdeepCity_GameCorner_1F_EventScript_27134F compare VAR_RESULT, 0 - goto_eq MossdeepCity_GameCorner_1F_EventScript_2772F9 + goto_if_eq MossdeepCity_GameCorner_1F_EventScript_2772F9 setvar VAR_0x8004, 4 goto MossdeepCity_GameCorner_1F_EventScript_277D81 end @@ -1532,17 +1524,17 @@ MossdeepCity_GameCorner_1F_EventScript_277D35:: @ 8277D35 setvar VAR_0x8005, 1 special sub_8027A5C compare VAR_RESULT, 0 - goto_eq MossdeepCity_GameCorner_1F_EventScript_277E55 + goto_if_eq MossdeepCity_GameCorner_1F_EventScript_277E55 msgbox MossdeepCity_GameCorner_1F_Text_278DD9, MSGBOX_DEFAULT fadescreen 1 setvar VAR_0x8005, 1 special sub_81B8958 waitstate compare VAR_0x8004, 6 - goto_if 4, MossdeepCity_GameCorner_1F_EventScript_2772F9 + goto_if_ge MossdeepCity_GameCorner_1F_EventScript_2772F9 call MossdeepCity_GameCorner_1F_EventScript_27134F compare VAR_RESULT, 0 - goto_eq MossdeepCity_GameCorner_1F_EventScript_2772F9 + goto_if_eq MossdeepCity_GameCorner_1F_EventScript_2772F9 setvar VAR_0x8004, 6 goto MossdeepCity_GameCorner_1F_EventScript_277D81 end @@ -1561,22 +1553,22 @@ MossdeepCity_GameCorner_1F_EventScript_277D81:: @ 8277D81 MossdeepCity_GameCorner_1F_EventScript_277DBE:: @ 8277DBE call MossdeepCity_GameCorner_1F_EventScript_277B30 compare VAR_RESULT, 1 - goto_eq MossdeepCity_GameCorner_1F_EventScript_277E0E + goto_if_eq MossdeepCity_GameCorner_1F_EventScript_277E0E compare VAR_RESULT, 5 - goto_eq MossdeepCity_GameCorner_1F_EventScript_277D81 + goto_if_eq MossdeepCity_GameCorner_1F_EventScript_277D81 compare VAR_RESULT, 8 - goto_eq MossdeepCity_GameCorner_1F_EventScript_277DBE + goto_if_eq MossdeepCity_GameCorner_1F_EventScript_277DBE release return MossdeepCity_GameCorner_1F_EventScript_277DE6:: @ 8277DE6 call MossdeepCity_GameCorner_1F_EventScript_277B35 compare VAR_RESULT, 1 - goto_eq MossdeepCity_GameCorner_1F_EventScript_277E0E + goto_if_eq MossdeepCity_GameCorner_1F_EventScript_277E0E compare VAR_RESULT, 5 - goto_eq MossdeepCity_GameCorner_1F_EventScript_277D81 + goto_if_eq MossdeepCity_GameCorner_1F_EventScript_277D81 compare VAR_RESULT, 8 - goto_eq MossdeepCity_GameCorner_1F_EventScript_277DE6 + goto_if_eq MossdeepCity_GameCorner_1F_EventScript_277DE6 release return @@ -1609,7 +1601,7 @@ MossdeepCity_GameCorner_1F_EventScript_277E48:: @ 8277E48 MossdeepCity_GameCorner_1F_EventScript_277E55:: @ 8277E55 msgbox MossdeepCity_GameCorner_1F_Text_278E60, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq MossdeepCity_GameCorner_1F_EventScript_2772F9 + goto_if_eq MossdeepCity_GameCorner_1F_EventScript_2772F9 compare VAR_0x8005, 0 call_if 1, MossdeepCity_GameCorner_1F_EventScript_277E84 compare VAR_0x8005, 1 diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index 2b0bfd8aa..1224a0ebe 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -2,7 +2,7 @@ LilycoveCity_ContestLobby_EventScript_279CC5:: @ 8279CC5 lock faceplayer compare VAR_0x408A, 0 - goto_if 5, LilycoveCity_ContestLobby_EventScript_279D13 + goto_if_ne LilycoveCity_ContestLobby_EventScript_279D13 checkflag FLAG_0x05F call_if 1, LilycoveCity_ContestLobby_EventScript_279CEA checkflag FLAG_0x05F @@ -30,7 +30,7 @@ LilycoveCity_ContestLobby_EventScript_279D13:: @ 8279D13 LilycoveCity_ContestLobby_EventScript_279D2C:: @ 8279D2C giveitem_std ITEM_LUXURY_BALL compare VAR_RESULT, 0 - goto_eq LilycoveCity_ContestLobby_EventScript_279D4B + goto_if_eq LilycoveCity_ContestLobby_EventScript_279D4B setvar VAR_0x408A, 0 closemessage release @@ -89,18 +89,18 @@ LilycoveCity_ContestLobby_EventScript_279E13:: @ 8279E13 msgbox LilycoveCity_ContestLobby_Text_27B44A, MSGBOX_DEFAULT choosecontestmon compare VAR_0x8004, 255 - goto_eq LilycoveCity_ContestLobby_EventScript_279E09 + goto_if_eq LilycoveCity_ContestLobby_EventScript_279E09 special sub_80F7F30 compare VAR_RESULT, 0 - goto_eq LilycoveCity_ContestLobby_EventScript_279F12 + goto_if_eq LilycoveCity_ContestLobby_EventScript_279F12 compare VAR_RESULT, 1 - goto_eq LilycoveCity_ContestLobby_EventScript_279F87 + goto_if_eq LilycoveCity_ContestLobby_EventScript_279F87 compare VAR_RESULT, 2 - goto_eq LilycoveCity_ContestLobby_EventScript_279F45 + goto_if_eq LilycoveCity_ContestLobby_EventScript_279F45 compare VAR_RESULT, 3 - goto_eq LilycoveCity_ContestLobby_EventScript_279F69 + goto_if_eq LilycoveCity_ContestLobby_EventScript_279F69 compare VAR_RESULT, 4 - goto_eq LilycoveCity_ContestLobby_EventScript_279F78 + goto_if_eq LilycoveCity_ContestLobby_EventScript_279F78 end LilycoveCity_ContestLobby_EventScript_279E62:: @ 8279E62 @@ -274,7 +274,7 @@ LinkContestRoom1_EventScript_27A097:: @ 827A097 LinkContestRoom1_EventScript_27A0B1:: @ 827A0B1 compare VAR_0x4088, 5 - goto_eq LinkContestRoom1_EventScript_27A0C7 + goto_if_eq LinkContestRoom1_EventScript_27A0C7 lockall msgbox LinkContestRoom1_Text_27B711, MSGBOX_DEFAULT releaseall @@ -283,7 +283,7 @@ LinkContestRoom1_EventScript_27A0B1:: @ 827A0B1 LinkContestRoom1_EventScript_27A0C7:: @ 827A0C7 specialvar VAR_RESULT, sub_80F9160 compare VAR_RESULT, 1 - goto_eq LinkContestRoom1_EventScript_27A0DE + goto_if_eq LinkContestRoom1_EventScript_27A0DE messageautoscroll LinkContestRoom1_Text_27B78F waitmessage return @@ -307,7 +307,7 @@ LinkContestRoom1_EventScript_27A0F5:: @ 827A0F5 call LinkContestRoom1_EventScript_27A133 addvar VAR_0x8006, 1 compare VAR_0x8006, 4 - goto_if 5, LinkContestRoom1_EventScript_27A0F5 + goto_if_ne LinkContestRoom1_EventScript_27A0F5 call LinkContestRoom1_EventScript_27A230 setvar VAR_TEMP_1, 6 return @@ -315,7 +315,7 @@ LinkContestRoom1_EventScript_27A0F5:: @ 827A0F5 LinkContestRoom1_EventScript_27A133:: @ 827A133 specialvar VAR_RESULT, sub_80F9160 compare VAR_RESULT, 1 - goto_eq LinkContestRoom1_EventScript_27A144 + goto_if_eq LinkContestRoom1_EventScript_27A144 return LinkContestRoom1_EventScript_27A144:: @ 827A144 @@ -325,13 +325,13 @@ LinkContestRoom1_EventScript_27A144:: @ 827A144 LinkContestRoom1_EventScript_27A149:: @ 827A149 compare VAR_0x8006, 0 - goto_eq LinkContestRoom1_EventScript_27A176 + goto_if_eq LinkContestRoom1_EventScript_27A176 compare VAR_0x8006, 1 - goto_eq LinkContestRoom1_EventScript_27A18D + goto_if_eq LinkContestRoom1_EventScript_27A18D compare VAR_0x8006, 2 - goto_eq LinkContestRoom1_EventScript_27A1A4 + goto_if_eq LinkContestRoom1_EventScript_27A1A4 compare VAR_0x8006, 3 - goto_eq LinkContestRoom1_EventScript_27A1BB + goto_if_eq LinkContestRoom1_EventScript_27A1BB return LinkContestRoom1_EventScript_27A176:: @ 827A176 @@ -394,7 +394,7 @@ LinkContestRoom1_EventScript_27A1D2:: @ 827A1D2 LinkContestRoom1_EventScript_27A217:: @ 827A217 compare VAR_0x4088, 5 - goto_eq LinkContestRoom1_EventScript_27A229 + goto_if_eq LinkContestRoom1_EventScript_27A229 message LinkContestRoom1_Text_27B815 waitmessage return @@ -422,14 +422,14 @@ LinkContestRoom1_EventScript_27A230:: @ 827A230 LinkContestRoom1_EventScript_27A26C:: @ 827A26C compare VAR_0x4088, 5 - goto_eq LinkContestRoom1_EventScript_27A280 + goto_if_eq LinkContestRoom1_EventScript_27A280 msgbox LinkContestRoom1_Text_27B830, MSGBOX_DEFAULT return LinkContestRoom1_EventScript_27A280:: @ 827A280 specialvar VAR_RESULT, sub_80F9160 compare VAR_RESULT, 1 - goto_eq LinkContestRoom1_EventScript_27A297 + goto_if_eq LinkContestRoom1_EventScript_27A297 messageautoscroll LinkContestRoom1_Text_27B830 waitmessage return @@ -448,7 +448,7 @@ LinkContestRoom1_EventScript_27A297:: @ 827A297 LinkContestRoom1_EventScript_27A2B9:: @ 827A2B9 compare VAR_0x4088, 5 - goto_eq LinkContestRoom1_EventScript_27A2CA + goto_if_eq LinkContestRoom1_EventScript_27A2CA message LinkContestRoom1_Text_27B8F2 return @@ -535,107 +535,107 @@ LinkContestRoom1_EventScript_27A3E5:: @ 827A3E5 compare VAR_RESULT, 7 call_if 1, LinkContestRoom1_EventScript_27A756 compare VAR_TEMP_0, 0 - goto_if 2, LinkContestRoom1_EventScript_27A3E5 + goto_if_gt LinkContestRoom1_EventScript_27A3E5 waitmovement 0 return LinkContestRoom1_EventScript_27A454:: @ 827A454 compare VAR_0x8004, 80 - goto_if 2, LinkContestRoom1_EventScript_27A654 + goto_if_gt LinkContestRoom1_EventScript_27A654 compare VAR_0x8004, 70 - goto_if 2, LinkContestRoom1_EventScript_27A64E + goto_if_gt LinkContestRoom1_EventScript_27A64E compare VAR_0x8004, 60 - goto_if 2, LinkContestRoom1_EventScript_27A648 + goto_if_gt LinkContestRoom1_EventScript_27A648 compare VAR_0x8004, 50 - goto_if 2, LinkContestRoom1_EventScript_27A642 + goto_if_gt LinkContestRoom1_EventScript_27A642 compare VAR_0x8004, 40 - goto_if 2, LinkContestRoom1_EventScript_27A63C + goto_if_gt LinkContestRoom1_EventScript_27A63C compare VAR_0x8004, 30 - goto_if 2, LinkContestRoom1_EventScript_27A636 + goto_if_gt LinkContestRoom1_EventScript_27A636 compare VAR_0x8004, 20 - goto_if 2, LinkContestRoom1_EventScript_27A630 + goto_if_gt LinkContestRoom1_EventScript_27A630 compare VAR_0x8004, 10 - goto_if 2, LinkContestRoom1_EventScript_27A62A + goto_if_gt LinkContestRoom1_EventScript_27A62A setvar VAR_TEMP_0, 0 return LinkContestRoom1_EventScript_27A4B2:: @ 827A4B2 compare VAR_0x8004, 230 - goto_if 2, LinkContestRoom1_EventScript_27A654 + goto_if_gt LinkContestRoom1_EventScript_27A654 compare VAR_0x8004, 210 - goto_if 2, LinkContestRoom1_EventScript_27A64E + goto_if_gt LinkContestRoom1_EventScript_27A64E compare VAR_0x8004, 190 - goto_if 2, LinkContestRoom1_EventScript_27A648 + goto_if_gt LinkContestRoom1_EventScript_27A648 compare VAR_0x8004, 170 - goto_if 2, LinkContestRoom1_EventScript_27A642 + goto_if_gt LinkContestRoom1_EventScript_27A642 compare VAR_0x8004, 150 - goto_if 2, LinkContestRoom1_EventScript_27A63C + goto_if_gt LinkContestRoom1_EventScript_27A63C compare VAR_0x8004, 130 - goto_if 2, LinkContestRoom1_EventScript_27A636 + goto_if_gt LinkContestRoom1_EventScript_27A636 compare VAR_0x8004, 110 - goto_if 2, LinkContestRoom1_EventScript_27A630 + goto_if_gt LinkContestRoom1_EventScript_27A630 compare VAR_0x8004, 90 - goto_if 2, LinkContestRoom1_EventScript_27A62A + goto_if_gt LinkContestRoom1_EventScript_27A62A setvar VAR_TEMP_0, 0 return LinkContestRoom1_EventScript_27A510:: @ 827A510 compare VAR_0x8004, 380 - goto_if 2, LinkContestRoom1_EventScript_27A654 + goto_if_gt LinkContestRoom1_EventScript_27A654 compare VAR_0x8004, 350 - goto_if 2, LinkContestRoom1_EventScript_27A64E + goto_if_gt LinkContestRoom1_EventScript_27A64E compare VAR_0x8004, 320 - goto_if 2, LinkContestRoom1_EventScript_27A648 + goto_if_gt LinkContestRoom1_EventScript_27A648 compare VAR_0x8004, 290 - goto_if 2, LinkContestRoom1_EventScript_27A642 + goto_if_gt LinkContestRoom1_EventScript_27A642 compare VAR_0x8004, 260 - goto_if 2, LinkContestRoom1_EventScript_27A63C + goto_if_gt LinkContestRoom1_EventScript_27A63C compare VAR_0x8004, 230 - goto_if 2, LinkContestRoom1_EventScript_27A636 + goto_if_gt LinkContestRoom1_EventScript_27A636 compare VAR_0x8004, 200 - goto_if 2, LinkContestRoom1_EventScript_27A630 + goto_if_gt LinkContestRoom1_EventScript_27A630 compare VAR_0x8004, 170 - goto_if 2, LinkContestRoom1_EventScript_27A62A + goto_if_gt LinkContestRoom1_EventScript_27A62A setvar VAR_TEMP_0, 0 return LinkContestRoom1_EventScript_27A56E:: @ 827A56E compare VAR_0x8004, 600 - goto_if 2, LinkContestRoom1_EventScript_27A654 + goto_if_gt LinkContestRoom1_EventScript_27A654 compare VAR_0x8004, 560 - goto_if 2, LinkContestRoom1_EventScript_27A64E + goto_if_gt LinkContestRoom1_EventScript_27A64E compare VAR_0x8004, 520 - goto_if 2, LinkContestRoom1_EventScript_27A648 + goto_if_gt LinkContestRoom1_EventScript_27A648 compare VAR_0x8004, 480 - goto_if 2, LinkContestRoom1_EventScript_27A642 + goto_if_gt LinkContestRoom1_EventScript_27A642 compare VAR_0x8004, 440 - goto_if 2, LinkContestRoom1_EventScript_27A63C + goto_if_gt LinkContestRoom1_EventScript_27A63C compare VAR_0x8004, 400 - goto_if 2, LinkContestRoom1_EventScript_27A636 + goto_if_gt LinkContestRoom1_EventScript_27A636 compare VAR_0x8004, 360 - goto_if 2, LinkContestRoom1_EventScript_27A630 + goto_if_gt LinkContestRoom1_EventScript_27A630 compare VAR_0x8004, 320 - goto_if 2, LinkContestRoom1_EventScript_27A62A + goto_if_gt LinkContestRoom1_EventScript_27A62A setvar VAR_TEMP_0, 0 return LinkContestRoom1_EventScript_27A5CC:: @ 827A5CC compare VAR_0x8004, 600 - goto_if 2, LinkContestRoom1_EventScript_27A654 + goto_if_gt LinkContestRoom1_EventScript_27A654 compare VAR_0x8004, 550 - goto_if 2, LinkContestRoom1_EventScript_27A64E + goto_if_gt LinkContestRoom1_EventScript_27A64E compare VAR_0x8004, 500 - goto_if 2, LinkContestRoom1_EventScript_27A648 + goto_if_gt LinkContestRoom1_EventScript_27A648 compare VAR_0x8004, 450 - goto_if 2, LinkContestRoom1_EventScript_27A642 + goto_if_gt LinkContestRoom1_EventScript_27A642 compare VAR_0x8004, 400 - goto_if 2, LinkContestRoom1_EventScript_27A63C + goto_if_gt LinkContestRoom1_EventScript_27A63C compare VAR_0x8004, 300 - goto_if 2, LinkContestRoom1_EventScript_27A636 + goto_if_gt LinkContestRoom1_EventScript_27A636 compare VAR_0x8004, 200 - goto_if 2, LinkContestRoom1_EventScript_27A630 + goto_if_gt LinkContestRoom1_EventScript_27A630 compare VAR_0x8004, 100 - goto_if 2, LinkContestRoom1_EventScript_27A62A + goto_if_gt LinkContestRoom1_EventScript_27A62A setvar VAR_TEMP_0, 0 return @@ -673,7 +673,7 @@ LinkContestRoom1_EventScript_27A654:: @ 827A654 LinkContestRoom1_EventScript_27A65A:: @ 827A65A compare VAR_TEMP_1, 1 - goto_eq LinkContestRoom1_EventScript_27A67D + goto_if_eq LinkContestRoom1_EventScript_27A67D applymovement 6, LinkContestRoom1_Movement_27AD11 playse SE_PIN delay 14 @@ -686,7 +686,7 @@ LinkContestRoom1_EventScript_27A67D:: @ 827A67D LinkContestRoom1_EventScript_27A67E:: @ 827A67E compare VAR_TEMP_2, 1 - goto_eq LinkContestRoom1_EventScript_27A6A1 + goto_if_eq LinkContestRoom1_EventScript_27A6A1 applymovement 12, LinkContestRoom1_Movement_27AD11 playse SE_PIN delay 14 @@ -699,7 +699,7 @@ LinkContestRoom1_EventScript_27A6A1:: @ 827A6A1 LinkContestRoom1_EventScript_27A6A2:: @ 827A6A2 compare VAR_TEMP_3, 1 - goto_eq LinkContestRoom1_EventScript_27A6C5 + goto_if_eq LinkContestRoom1_EventScript_27A6C5 applymovement 7, LinkContestRoom1_Movement_27AD11 playse SE_PIN delay 14 @@ -712,7 +712,7 @@ LinkContestRoom1_EventScript_27A6C5:: @ 827A6C5 LinkContestRoom1_EventScript_27A6C6:: @ 827A6C6 compare VAR_TEMP_4, 1 - goto_eq LinkContestRoom1_EventScript_27A6E9 + goto_if_eq LinkContestRoom1_EventScript_27A6E9 applymovement 8, LinkContestRoom1_Movement_27AD11 playse SE_PIN delay 14 @@ -725,7 +725,7 @@ LinkContestRoom1_EventScript_27A6E9:: @ 827A6E9 LinkContestRoom1_EventScript_27A6EA:: @ 827A6EA compare VAR_TEMP_5, 1 - goto_eq LinkContestRoom1_EventScript_27A70D + goto_if_eq LinkContestRoom1_EventScript_27A70D applymovement 9, LinkContestRoom1_Movement_27AD11 playse SE_PIN delay 14 @@ -738,7 +738,7 @@ LinkContestRoom1_EventScript_27A70D:: @ 827A70D LinkContestRoom1_EventScript_27A70E:: @ 827A70E compare VAR_TEMP_6, 1 - goto_eq LinkContestRoom1_EventScript_27A731 + goto_if_eq LinkContestRoom1_EventScript_27A731 applymovement 10, LinkContestRoom1_Movement_27AD11 playse SE_PIN delay 14 @@ -751,7 +751,7 @@ LinkContestRoom1_EventScript_27A731:: @ 827A731 LinkContestRoom1_EventScript_27A732:: @ 827A732 compare VAR_TEMP_7, 1 - goto_eq LinkContestRoom1_EventScript_27A755 + goto_if_eq LinkContestRoom1_EventScript_27A755 applymovement 11, LinkContestRoom1_Movement_27AD11 playse SE_PIN delay 14 @@ -764,7 +764,7 @@ LinkContestRoom1_EventScript_27A755:: @ 827A755 LinkContestRoom1_EventScript_27A756:: @ 827A756 compare VAR_TEMP_8, 1 - goto_eq LinkContestRoom1_EventScript_27A779 + goto_if_eq LinkContestRoom1_EventScript_27A779 applymovement 15, LinkContestRoom1_Movement_27AD11 playse SE_PIN delay 14 @@ -846,14 +846,14 @@ LinkContestRoom1_EventScript_27A801:: @ 827A801 LinkContestRoom1_EventScript_27A853:: @ 827A853 compare VAR_0x4088, 5 - goto_eq LinkContestRoom1_EventScript_27A867 + goto_if_eq LinkContestRoom1_EventScript_27A867 msgbox LinkContestRoom1_Text_27B904, MSGBOX_DEFAULT return LinkContestRoom1_EventScript_27A867:: @ 827A867 specialvar VAR_RESULT, sub_80F9160 compare VAR_RESULT, 1 - goto_eq LinkContestRoom1_EventScript_27A87E + goto_if_eq LinkContestRoom1_EventScript_27A87E messageautoscroll LinkContestRoom1_Text_27B904 waitmessage return @@ -896,7 +896,7 @@ LinkContestRoom1_EventScript_27A8A5:: @ 827A8A5 LinkContestRoom1_EventScript_27A8FB:: @ 827A8FB compare VAR_0x4088, 5 - goto_eq LinkContestRoom1_EventScript_27A90F + goto_if_eq LinkContestRoom1_EventScript_27A90F msgbox LinkContestRoom1_Text_27BA15, MSGBOX_DEFAULT return @@ -909,7 +909,7 @@ LinkContestRoom1_EventScript_27A90F:: @ 827A90F LinkContestRoom1_EventScript_27A91E:: @ 827A91E compare VAR_0x4088, 5 - goto_eq LinkContestRoom1_EventScript_27A932 + goto_if_eq LinkContestRoom1_EventScript_27A932 msgbox LinkContestRoom1_Text_27BA30, MSGBOX_DEFAULT return @@ -922,7 +922,7 @@ LinkContestRoom1_EventScript_27A932:: @ 827A932 LinkContestRoom1_EventScript_27A941:: @ 827A941 compare VAR_0x4088, 5 - goto_eq LinkContestRoom1_EventScript_27A955 + goto_if_eq LinkContestRoom1_EventScript_27A955 msgbox LinkContestRoom1_Text_27BAAC, MSGBOX_DEFAULT return @@ -935,7 +935,7 @@ LinkContestRoom1_EventScript_27A955:: @ 827A955 LinkContestRoom1_EventScript_27A964:: @ 827A964 compare VAR_0x4088, 5 - goto_eq LinkContestRoom1_EventScript_27A978 + goto_if_eq LinkContestRoom1_EventScript_27A978 msgbox LinkContestRoom1_Text_27BB25, MSGBOX_DEFAULT return @@ -986,7 +986,7 @@ LinkContestRoom1_EventScript_27A9D4:: @ 827A9D4 LinkContestRoom1_EventScript_27AA00:: @ 827AA00 compare VAR_0x4088, 5 - goto_eq LinkContestRoom1_EventScript_27AA14 + goto_if_eq LinkContestRoom1_EventScript_27AA14 msgbox LinkContestRoom1_Text_27BB4C, MSGBOX_DEFAULT return @@ -1009,7 +1009,7 @@ LinkContestRoom1_EventScript_27AA1B:: @ 827AA1B applymovement 6, LinkContestRoom1_Movement_27AD37 applymovement 8, LinkContestRoom1_Movement_27AD33 compare VAR_TEMP_1, 4 - goto_if 5, LinkContestRoom1_EventScript_27AA1B + goto_if_ne LinkContestRoom1_EventScript_27AA1B delay 30 return @@ -1084,10 +1084,9 @@ LinkContestRoom1_EventScript_27AA6F:: @ 827AA6F LinkContestRoom1_EventScript_27AB36:: @ 827AB36 compare VAR_0x4088, 5 - goto_eq LinkContestRoom1_EventScript_27ABD8 + goto_if_eq LinkContestRoom1_EventScript_27ABD8 call LinkContestRoom1_EventScript_27AB9E - checkflag FLAG_TEMP_2 - goto_eq LinkContestRoom1_EventScript_27AB82 + goto_if_set FLAG_TEMP_2, LinkContestRoom1_EventScript_27AB82 lockall msgbox LinkContestRoom1_Text_27BBA8, MSGBOX_DEFAULT releaseall @@ -1099,7 +1098,7 @@ LinkContestRoom1_EventScript_27AB36:: @ 827AB36 delay 30 special sub_80F88E8 compare VAR_0x8004, 1 - goto_eq LinkContestRoom1_EventScript_27ABD2 + goto_if_eq LinkContestRoom1_EventScript_27ABD2 return LinkContestRoom1_EventScript_27AB82:: @ 827AB82 @@ -1109,24 +1108,24 @@ LinkContestRoom1_EventScript_27AB82:: @ 827AB82 delay 90 special sub_80F88E8 compare VAR_0x8004, 1 - goto_eq LinkContestRoom1_EventScript_27ABD2 + goto_if_eq LinkContestRoom1_EventScript_27ABD2 return LinkContestRoom1_EventScript_27AB9E:: @ 827AB9E specialvar VAR_RESULT, sub_80F7F7C compare VAR_RESULT, 1 - goto_eq LinkContestRoom1_EventScript_27ABAF + goto_if_eq LinkContestRoom1_EventScript_27ABAF return LinkContestRoom1_EventScript_27ABAF:: @ 827ABAF special sub_80F831C compare VAR_0x8005, 3 - goto_eq LinkContestRoom1_EventScript_27ABBE + goto_if_eq LinkContestRoom1_EventScript_27ABBE return LinkContestRoom1_EventScript_27ABBE:: @ 827ABBE compare VAR_CONTEST_RANK, 3 - goto_eq LinkContestRoom1_EventScript_27ABCD + goto_if_eq LinkContestRoom1_EventScript_27ABCD setflag FLAG_TEMP_2 return @@ -1147,7 +1146,7 @@ LinkContestRoom1_EventScript_27ABD8:: @ 827ABD8 special sub_80F831C special sub_80F88E8 compare VAR_0x8004, 1 - goto_eq LinkContestRoom1_EventScript_27ABF1 + goto_if_eq LinkContestRoom1_EventScript_27ABF1 closemessage return @@ -1197,7 +1196,7 @@ LinkContestRoom1_EventScript_27AC51:: @ 827AC51 LinkContestRoom1_EventScript_27AC5E:: @ 827AC5E special sub_80F831C compare VAR_0x8005, 3 - goto_eq LinkContestRoom1_EventScript_27AC77 + goto_if_eq LinkContestRoom1_EventScript_27AC77 lockall msgbox LinkContestRoom1_Text_27BB7A, MSGBOX_DEFAULT releaseall @@ -1208,9 +1207,9 @@ LinkContestRoom1_EventScript_27AC77:: @ 827AC77 call_if 1, LinkContestRoom1_EventScript_27ABCE specialvar VAR_RESULT, sub_80F7F7C compare VAR_RESULT, 0 - goto_eq LinkContestRoom1_EventScript_27ACDF + goto_if_eq LinkContestRoom1_EventScript_27ACDF compare VAR_CONTEST_RANK, 3 - goto_eq LinkContestRoom1_EventScript_27ACBD + goto_if_eq LinkContestRoom1_EventScript_27ACBD lockall msgbox LinkContestRoom1_Text_27BB7A, MSGBOX_DEFAULT releaseall @@ -1227,7 +1226,7 @@ LinkContestRoom1_EventScript_27ACA8:: @ 827ACA8 LinkContestRoom1_EventScript_27ACBD:: @ 827ACBD giveitem_std ITEM_LUXURY_BALL compare VAR_RESULT, 0 - goto_eq LinkContestRoom1_EventScript_27ACA8 + goto_if_eq LinkContestRoom1_EventScript_27ACA8 lockall msgbox LinkContestRoom1_Text_27BB7A, MSGBOX_DEFAULT releaseall @@ -1433,7 +1432,7 @@ LinkContestRoom1_Movement_27AD7E: @ 827AD7E LinkContestRoom1_EventScript_27AD80:: @ 827AD80 specialvar VAR_RESULT, sub_80F9134 compare VAR_RESULT, 1 - goto_eq LinkContestRoom1_EventScript_27AD91 + goto_if_eq LinkContestRoom1_EventScript_27AD91 return LinkContestRoom1_EventScript_27AD91:: @ 827AD91 @@ -1442,7 +1441,7 @@ LinkContestRoom1_EventScript_27AD91:: @ 827AD91 LilycoveCity_ContestLobby_EventScript_27AD92:: @ 827AD92 specialvar VAR_RESULT, sub_80F9134 compare VAR_RESULT, 1 - goto_eq LilycoveCity_ContestLobby_EventScript_27ADA3 + goto_if_eq LilycoveCity_ContestLobby_EventScript_27ADA3 return LilycoveCity_ContestLobby_EventScript_27ADA3:: @ 827ADA3 diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index 13b68617a..5195598b1 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -4,11 +4,11 @@ Route117_EventScript_291C18:: @ 8291C18 special GetDaycareMonNicknames specialvar VAR_RESULT, GetDaycareState compare VAR_RESULT, 1 - goto_eq Route117_EventScript_291C4D + goto_if_eq Route117_EventScript_291C4D compare VAR_RESULT, 2 - goto_eq Route117_EventScript_291CD1 + goto_if_eq Route117_EventScript_291CD1 compare VAR_RESULT, 3 - goto_eq Route117_EventScript_291CE8 + goto_if_eq Route117_EventScript_291CE8 msgbox Route117_Text_291FCF, MSGBOX_DEFAULT release end @@ -16,10 +16,10 @@ Route117_EventScript_291C18:: @ 8291C18 Route117_EventScript_291C4D:: @ 8291C4D msgbox Route117_Text_29205D, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq Route117_EventScript_291C83 + goto_if_eq Route117_EventScript_291C83 msgbox Route117_Text_2922C6, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq Route117_EventScript_291C83 + goto_if_eq Route117_EventScript_291C83 msgbox Route117_Text_292149, MSGBOX_DEFAULT clearflag FLAG_PENDING_DAYCARE_EGG special RejectEggFromDayCare @@ -29,7 +29,7 @@ Route117_EventScript_291C4D:: @ 8291C4D Route117_EventScript_291C83:: @ 8291C83 specialvar VAR_RESULT, CalculatePlayerPartyCount compare VAR_RESULT, 6 - goto_if 5, Route117_EventScript_291C9D + goto_if_ne Route117_EventScript_291C9D msgbox Route117_Text_29216A, MSGBOX_DEFAULT release end @@ -82,14 +82,14 @@ Route117_PokemonDayCare_EventScript_291D11:: @ 8291D11 faceplayer specialvar VAR_RESULT, GetDaycareState compare VAR_RESULT, 1 - goto_eq Route117_PokemonDayCare_EventScript_291E0B + goto_if_eq Route117_PokemonDayCare_EventScript_291E0B compare VAR_RESULT, 2 - goto_eq Route117_PokemonDayCare_EventScript_291E2F + goto_if_eq Route117_PokemonDayCare_EventScript_291E2F compare VAR_RESULT, 3 - goto_eq Route117_PokemonDayCare_EventScript_291F5C + goto_if_eq Route117_PokemonDayCare_EventScript_291F5C msgbox Route117_PokemonDayCare_Text_2922F4, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq Route117_PokemonDayCare_EventScript_291D56 + goto_if_eq Route117_PokemonDayCare_EventScript_291D56 msgbox Route117_PokemonDayCare_Text_292416, MSGBOX_DEFAULT release end @@ -97,19 +97,19 @@ Route117_PokemonDayCare_EventScript_291D11:: @ 8291D11 Route117_PokemonDayCare_EventScript_291D56:: @ 8291D56 specialvar VAR_RESULT, CountPartyNonEggMons compare VAR_RESULT, 1 - goto_eq Route117_PokemonDayCare_EventScript_291DED + goto_if_eq Route117_PokemonDayCare_EventScript_291DED specialvar VAR_RESULT, sub_80722E0 compare VAR_RESULT, 2 - goto_eq Route117_PokemonDayCare_EventScript_291E01 + goto_if_eq Route117_PokemonDayCare_EventScript_291E01 msgbox Route117_PokemonDayCare_Text_292349, MSGBOX_DEFAULT fadescreen 1 special ChooseSendDaycareMon waitstate compare VAR_0x8004, 255 - goto_eq Route117_PokemonDayCare_EventScript_291DCA + goto_if_eq Route117_PokemonDayCare_EventScript_291DCA specialvar VAR_RESULT, CountPartyAliveNonEggMons_IgnoreVar0x8004Slot compare VAR_RESULT, 0 - goto_eq Route117_PokemonDayCare_EventScript_291DF7 + goto_if_eq Route117_PokemonDayCare_EventScript_291DF7 specialvar VAR_0x8005, GetSelectedMonNickAndSpecies waitse playmoncry VAR_0x8005, 0 @@ -119,7 +119,7 @@ Route117_PokemonDayCare_EventScript_291D56:: @ 8291D56 incrementgamestat 47 specialvar VAR_RESULT, GetDaycareState compare VAR_RESULT, 2 - goto_eq Route117_PokemonDayCare_EventScript_291DD4 + goto_if_eq Route117_PokemonDayCare_EventScript_291DD4 release end @@ -131,7 +131,7 @@ Route117_PokemonDayCare_EventScript_291DCA:: @ 8291DCA Route117_PokemonDayCare_EventScript_291DD4:: @ 8291DD4 msgbox Route117_PokemonDayCare_Text_2923AF, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq Route117_PokemonDayCare_EventScript_291D56 + goto_if_eq Route117_PokemonDayCare_EventScript_291D56 goto Route117_PokemonDayCare_EventScript_291DCA end @@ -171,26 +171,26 @@ Route117_PokemonDayCare_EventScript_291E2F:: @ 8291E2F call Route117_PokemonDayCare_EventScript_291E1E msgbox Route117_PokemonDayCare_Text_2923AF, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq Route117_PokemonDayCare_EventScript_291D56 + goto_if_eq Route117_PokemonDayCare_EventScript_291D56 msgbox Route117_PokemonDayCare_Text_2925F6, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq Route117_PokemonDayCare_EventScript_291E6D + goto_if_eq Route117_PokemonDayCare_EventScript_291E6D goto Route117_PokemonDayCare_EventScript_291DCA end Route117_PokemonDayCare_EventScript_291E6D:: @ 8291E6D specialvar VAR_RESULT, CalculatePlayerPartyCount compare VAR_RESULT, 6 - goto_eq Route117_PokemonDayCare_EventScript_291F3D + goto_if_eq Route117_PokemonDayCare_EventScript_291F3D specialvar VAR_RESULT, GetDaycareState setvar VAR_0x8004, 0 compare VAR_RESULT, 2 - goto_eq Route117_PokemonDayCare_EventScript_291EAC + goto_if_eq Route117_PokemonDayCare_EventScript_291EAC special ShowDaycareLevelMenu waitstate copyvar VAR_0x8004, VAR_RESULT compare VAR_RESULT, 2 - goto_eq Route117_PokemonDayCare_EventScript_291DCA + goto_if_eq Route117_PokemonDayCare_EventScript_291DCA goto Route117_PokemonDayCare_EventScript_291EAC end @@ -198,14 +198,14 @@ Route117_PokemonDayCare_EventScript_291EAC:: @ 8291EAC special GetDaycareCost msgbox Route117_PokemonDayCare_Text_292549, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq Route117_PokemonDayCare_EventScript_291EC8 + goto_if_eq Route117_PokemonDayCare_EventScript_291EC8 goto Route117_PokemonDayCare_EventScript_291DCA end Route117_PokemonDayCare_EventScript_291EC8:: @ 8291EC8 specialvar VAR_RESULT, IsEnoughForCostInVar0x8005 compare VAR_RESULT, 1 - goto_eq Route117_PokemonDayCare_EventScript_291EE2 + goto_if_eq Route117_PokemonDayCare_EventScript_291EE2 msgbox Route117_PokemonDayCare_Text_292432, MSGBOX_DEFAULT release end @@ -223,14 +223,14 @@ Route117_PokemonDayCare_EventScript_291EE2:: @ 8291EE2 waitmoncry specialvar VAR_RESULT, GetDaycareState compare VAR_RESULT, 2 - goto_eq Route117_PokemonDayCare_EventScript_291F24 + goto_if_eq Route117_PokemonDayCare_EventScript_291F24 goto Route117_PokemonDayCare_EventScript_291DCA end Route117_PokemonDayCare_EventScript_291F24:: @ 8291F24 msgbox Route117_PokemonDayCare_Text_29244F, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq Route117_PokemonDayCare_EventScript_291E6D + goto_if_eq Route117_PokemonDayCare_EventScript_291E6D goto Route117_PokemonDayCare_EventScript_291DCA end @@ -272,7 +272,7 @@ Route117_PokemonDayCare_EventScript_291F5C:: @ 8291F5C call Route117_PokemonDayCare_EventScript_291E1E msgbox Route117_PokemonDayCare_Text_2925F6, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq Route117_PokemonDayCare_EventScript_291E6D + goto_if_eq Route117_PokemonDayCare_EventScript_291E6D msgbox Route117_PokemonDayCare_Text_292476, MSGBOX_DEFAULT release end @@ -281,7 +281,7 @@ Route117_PokemonDayCare_EventScript_291F95:: @ 8291F95 special ShowDaycareLevelMenu waitstate compare VAR_RESULT, 2 - goto_eq Route117_PokemonDayCare_EventScript_291DCA + goto_if_eq Route117_PokemonDayCare_EventScript_291DCA copyvar VAR_0x8004, VAR_RESULT specialvar VAR_RESULT, TakePokemonFromDaycare msgbox Route117_PokemonDayCare_Text_292575, MSGBOX_DEFAULT diff --git a/data/scripts/field_move_scripts.inc b/data/scripts/field_move_scripts.inc index 1d3c8dfe5..024ffbf85 100644 --- a/data/scripts/field_move_scripts.inc +++ b/data/scripts/field_move_scripts.inc @@ -10,17 +10,16 @@ Route120_EventScript_2906BB:: @ 82906BB Route121_EventScript_2906BB:: @ 82906BB Route123_EventScript_2906BB:: @ 82906BB lockall - checkflag FLAG_BADGE01_GET - goto_if 0, Route103_EventScript_290721 + goto_if_unset FLAG_BADGE01_GET, Route103_EventScript_290721 checkpartymove MOVE_CUT compare VAR_RESULT, 6 - goto_eq Route103_EventScript_290721 + goto_if_eq Route103_EventScript_290721 setfieldeffectargument 0, VAR_RESULT bufferpartymonnick 0, VAR_RESULT buffermovename 1, MOVE_CUT msgbox Route103_Text_29072E, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq Route103_EventScript_29072B + goto_if_eq Route103_EventScript_29072B msgbox Route103_Text_290771, MSGBOX_DEFAULT closemessage dofieldeffect 2 @@ -84,17 +83,16 @@ SeafloorCavern_Room2_EventScript_2907A6:: @ 82907A6 SeafloorCavern_Room5_EventScript_2907A6:: @ 82907A6 VictoryRoad_B1F_EventScript_2907A6:: @ 82907A6 lockall - checkflag FLAG_BADGE03_GET - goto_if 0, Route111_EventScript_29082D + goto_if_unset FLAG_BADGE03_GET, Route111_EventScript_29082D checkpartymove MOVE_ROCK_SMASH compare VAR_RESULT, 6 - goto_eq Route111_EventScript_29082D + goto_if_eq Route111_EventScript_29082D setfieldeffectargument 0, VAR_RESULT bufferpartymonnick 0, VAR_RESULT buffermovename 1, MOVE_ROCK_SMASH msgbox Route111_Text_29083A, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq Route111_EventScript_290837 + goto_if_eq Route111_EventScript_290837 msgbox Route111_Text_290771, MSGBOX_DEFAULT closemessage dofieldeffect 37 @@ -115,10 +113,10 @@ Route111_EventScript_2907FB:: @ 82907FB removeobject VAR_LAST_TALKED specialvar VAR_RESULT, TryUpdateRusturfTunnelState compare VAR_RESULT, 1 - goto_eq Route111_EventScript_290829 + goto_if_eq Route111_EventScript_290829 special RockSmashWildEncounter compare VAR_RESULT, 0 - goto_eq Route111_EventScript_290829 + goto_if_eq Route111_EventScript_290829 waitstate releaseall end @@ -160,17 +158,15 @@ SeafloorCavern_Room8_EventScript_2908BA:: @ 82908BA ShoalCave_LowTideLowerRoom_EventScript_2908BA:: @ 82908BA VictoryRoad_B1F_EventScript_2908BA:: @ 82908BA lockall - checkflag FLAG_BADGE04_GET - goto_if 0, FieryPath_EventScript_290915 - checkflag FLAG_SYS_USE_STRENGTH - goto_eq FieryPath_EventScript_29091F + goto_if_unset FLAG_BADGE04_GET, FieryPath_EventScript_290915 + goto_if_set FLAG_SYS_USE_STRENGTH, FieryPath_EventScript_29091F checkpartymove MOVE_STRENGTH compare VAR_RESULT, 6 - goto_eq FieryPath_EventScript_290915 + goto_if_eq FieryPath_EventScript_290915 setfieldeffectargument 0, VAR_RESULT msgbox FieryPath_Text_29092C, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq FieryPath_EventScript_290929 + goto_if_eq FieryPath_EventScript_290929 closemessage dofieldeffect 40 waitstate @@ -227,12 +223,12 @@ EventScript_UseWaterfall:: @ 8290A49 lockall checkpartymove MOVE_WATERFALL compare VAR_RESULT, 6 - goto_eq EventScript_290A84 + goto_if_eq EventScript_290A84 bufferpartymonnick 0, VAR_RESULT setfieldeffectargument 0, VAR_RESULT msgbox Text_290AC3, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq EventScript_290A8C + goto_if_eq EventScript_290A8C msgbox Text_290AFC, MSGBOX_DEFAULT dofieldeffect 43 goto EventScript_290A8C @@ -262,13 +258,13 @@ EventScript_UseDive:: @ 8290B0F lockall checkpartymove MOVE_DIVE compare VAR_RESULT, 6 - goto_eq EventScript_290B4E + goto_if_eq EventScript_290B4E bufferpartymonnick 0, VAR_RESULT setfieldeffectargument 0, VAR_RESULT setfieldeffectargument 1, 1 msgbox Text_290BE8, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq EventScript_290B58 + goto_if_eq EventScript_290B58 msgbox Text_290C1A, MSGBOX_DEFAULT dofieldeffect 44 goto EventScript_290B58 @@ -287,13 +283,13 @@ EventScript_UseDiveUnderwater:: @ 8290B5A lockall checkpartymove MOVE_DIVE compare VAR_RESULT, 6 - goto_eq EventScript_290B99 + goto_if_eq EventScript_290B99 bufferpartymonnick 0, VAR_RESULT setfieldeffectargument 0, VAR_RESULT setfieldeffectargument 1, 1 msgbox Text_290C6E, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq EventScript_290BA8 + goto_if_eq EventScript_290BA8 msgbox Text_290C1A, MSGBOX_DEFAULT dofieldeffect 44 goto EventScript_290BA8 diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc index f95cfa0ab..bcb8e517c 100644 --- a/data/scripts/gabby_and_ty.inc +++ b/data/scripts/gabby_and_ty.inc @@ -2,7 +2,7 @@ EventScript_28CCAA:: @ 828CCAA setvar VAR_0x8005, 8 special InterviewBefore compare VAR_RESULT, 1 - goto_eq EventScript_28CCC6 + goto_if_eq EventScript_28CCC6 setvar VAR_0x8005, 8 special InterviewAfter return @@ -220,8 +220,7 @@ Route111_EventScript_28CF56:: @ 828CF56 call_if 1, Route111_EventScript_28CF9F compare VAR_FACING, 4 call_if 1, Route111_EventScript_28CFB1 - checkflag FLAG_TEMP_1 - goto_eq Route111_EventScript_28D0EE + goto_if_set FLAG_TEMP_1, Route111_EventScript_28D0EE msgbox Route111_Text_28B042, MSGBOX_YESNO goto Route111_EventScript_28D0A7 end @@ -254,11 +253,10 @@ Route120_EventScript_28CFC3:: @ 828CFC3 call_if 1, Route111_EventScript_28CF9F compare VAR_FACING, 4 call_if 1, Route111_EventScript_28CFB1 - checkflag FLAG_TEMP_1 - goto_eq Route111_EventScript_28D0EE + goto_if_set FLAG_TEMP_1, Route111_EventScript_28D0EE specialvar VAR_RESULT, GabbyAndTyGetLastQuote compare VAR_RESULT, 0 - goto_eq Route111_EventScript_28D053 + goto_if_eq Route111_EventScript_28D053 msgbox Route111_Text_28B137, MSGBOX_DEFAULT specialvar VAR_RESULT, GabbyAndTyGetLastBattleTrivia switch VAR_RESULT @@ -313,14 +311,14 @@ Route111_EventScript_28D099:: @ 828D099 Route111_EventScript_28D0A7:: @ 828D0A7 compare VAR_RESULT, 0 - goto_eq Route111_EventScript_28D0E1 + goto_if_eq Route111_EventScript_28D0E1 msgbox Route111_Text_28B433, MSGBOX_DEFAULT setvar VAR_0x8004, 10 call Route111_EventScript_271E7C lock faceplayer compare VAR_RESULT, 0 - goto_eq Route111_EventScript_28D0E1 + goto_if_eq Route111_EventScript_28D0E1 msgbox Route111_Text_28B4AB, MSGBOX_DEFAULT special GabbyAndTyAfterInterview setflag FLAG_TEMP_1 diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc index e19453b66..2791e5d9f 100644 --- a/data/scripts/mauville_man.inc +++ b/data/scripts/mauville_man.inc @@ -13,9 +13,9 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E0A6:: @ 828E0A6 faceplayer msgbox MauvilleCity_PokemonCenter_1F_Text_29038E, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E0C7 + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E0C7 compare VAR_RESULT, 0 - goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E0EA + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E0EA end MauvilleCity_PokemonCenter_1F_EventScript_28E0C7:: @ 828E0C7 @@ -24,7 +24,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E0C7:: @ 828E0C7 delay 60 special ScrSpecial_HasBardSongBeenChanged compare VAR_RESULT, 0 - goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E0F4 + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E0F4 msgbox MauvilleCity_PokemonCenter_1F_Text_2903E6, MSGBOX_DEFAULT release end @@ -37,9 +37,9 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E0EA:: @ 828E0EA MauvilleCity_PokemonCenter_1F_EventScript_28E0F4:: @ 828E0F4 msgbox MauvilleCity_PokemonCenter_1F_Text_290421, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E113 + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E113 compare VAR_RESULT, 0 - goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E15D + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E15D end MauvilleCity_PokemonCenter_1F_EventScript_28E113:: @ 828E113 @@ -48,14 +48,14 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E113:: @ 828E113 lock faceplayer compare VAR_RESULT, 0 - goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E15D + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E15D msgbox MauvilleCity_PokemonCenter_1F_Text_2904C1, MSGBOX_DEFAULT setvar VAR_0x8004, 1 special ScrSpecial_PlayBardSong delay 60 msgbox MauvilleCity_PokemonCenter_1F_Text_2904EB, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E113 + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E113 special ScrSpecial_SaveBardSongLyrics msgbox MauvilleCity_PokemonCenter_1F_Text_290514, MSGBOX_DEFAULT release @@ -73,7 +73,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E167:: @ 828E167 msgbox MauvilleCity_PokemonCenter_1F_Text_29054C, MSGBOX_DEFAULT special ScrSpecial_GetHipsterSpokenFlag compare VAR_RESULT, 0 - goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E18C + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E18C msgbox MauvilleCity_PokemonCenter_1F_Text_290598, MSGBOX_DEFAULT release end @@ -81,7 +81,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E167:: @ 828E167 MauvilleCity_PokemonCenter_1F_EventScript_28E18C:: @ 828E18C special ScrSpecial_HipsterTeachWord compare VAR_RESULT, 1 - goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E1A4 + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E1A4 msgbox MauvilleCity_PokemonCenter_1F_Text_290602, MSGBOX_DEFAULT release end @@ -156,10 +156,10 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E4D4:: @ 828E4D4 faceplayer msgbox MauvilleCity_PokemonCenter_1F_Text_28E1B1, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E503 + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E503 special ScrSpecial_GetTraderTradedFlag compare VAR_RESULT, 1 - goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E50D + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E50D message MauvilleCity_PokemonCenter_1F_Text_28E23F waitmessage goto MauvilleCity_PokemonCenter_1F_EventScript_28E517 @@ -179,15 +179,15 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E517:: @ 828E517 special ScrSpecial_TraderMenuGetDecoration waitstate compare VAR_0x8004, 0 - goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E558 + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E558 compare VAR_0x8004, 65535 - goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E562 + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E562 msgbox MauvilleCity_PokemonCenter_1F_Text_28E2A9, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E56E + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E56E special ScrSpecial_DoesPlayerHaveNoDecorations compare VAR_RESULT, 1 - goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E57A + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E57A goto MauvilleCity_PokemonCenter_1F_EventScript_28E584 end @@ -218,15 +218,15 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E584:: @ 828E584 special ScrSpecial_TraderMenuGiveDecoration waitstate compare VAR_0x8006, 0 - goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E5D4 + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E5D4 compare VAR_0x8006, 65535 - goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E5DE + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E5DE special ScrSpecial_IsDecorationFull compare VAR_RESULT, 1 - goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E5EC + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E5EC msgbox MauvilleCity_PokemonCenter_1F_Text_28E3C4, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E584 + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E584 special ScrSpecial_TraderDoDecorationTrade msgbox MauvilleCity_PokemonCenter_1F_Text_28E424, MSGBOX_DEFAULT release @@ -812,23 +812,23 @@ MauvilleCity_PokemonCenter_1F_EventScript_29014A:: @ 829014A setvar VAR_0x800B, 0 msgbox MauvilleCity_PokemonCenter_1F_Text_28E5F6, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq MauvilleCity_PokemonCenter_1F_EventScript_290219 + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_290219 specialvar VAR_RESULT, ScrSpecial_StorytellerGetFreeStorySlot compare VAR_RESULT, 0 - goto_eq MauvilleCity_PokemonCenter_1F_EventScript_2901DA + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_2901DA message MauvilleCity_PokemonCenter_1F_Text_28E673 waitmessage special ScrSpecial_StorytellerStoryListMenu waitstate compare VAR_RESULT, 0 - goto_eq MauvilleCity_PokemonCenter_1F_EventScript_2901B7 + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_2901B7 setvar VAR_0x8008, 1 special ScrSpecial_StorytellerDisplayStory waitmessage waitbuttonpress specialvar VAR_RESULT, ScrSpecial_StorytellerUpdateStat compare VAR_RESULT, 0 - goto_eq MauvilleCity_PokemonCenter_1F_EventScript_2901BD + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_2901BD goto MauvilleCity_PokemonCenter_1F_EventScript_29020F MauvilleCity_PokemonCenter_1F_EventScript_2901B7:: @ 82901B7 @@ -839,7 +839,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_2901BD:: @ 82901BD msgbox MauvilleCity_PokemonCenter_1F_Text_28E78A, MSGBOX_DEFAULT specialvar VAR_RESULT, ScrSpecial_HasStorytellerAlreadyRecorded compare VAR_RESULT, 1 - goto_eq MauvilleCity_PokemonCenter_1F_EventScript_29022D + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_29022D goto MauvilleCity_PokemonCenter_1F_EventScript_2901E2 MauvilleCity_PokemonCenter_1F_EventScript_2901DA:: @ 82901DA @@ -848,10 +848,10 @@ MauvilleCity_PokemonCenter_1F_EventScript_2901DA:: @ 82901DA MauvilleCity_PokemonCenter_1F_EventScript_2901E2:: @ 82901E2 msgbox MauvilleCity_PokemonCenter_1F_Text_28E7EE, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq MauvilleCity_PokemonCenter_1F_EventScript_290219 + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_290219 specialvar VAR_RESULT, ScrSpecial_StorytellerInitializeRandomStat compare VAR_RESULT, 1 - goto_eq MauvilleCity_PokemonCenter_1F_EventScript_29020F + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_29020F msgbox MauvilleCity_PokemonCenter_1F_Text_28E881, MSGBOX_DEFAULT release end @@ -897,25 +897,25 @@ MauvilleCity_PokemonCenter_1F_EventScript_2902F6:: @ 82902F6 faceplayer msgbox MauvilleCity_PokemonCenter_1F_Text_29022F, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq MauvilleCity_PokemonCenter_1F_EventScript_290317 + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_290317 compare VAR_RESULT, 0 - goto_eq MauvilleCity_PokemonCenter_1F_EventScript_29037A + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_29037A end MauvilleCity_PokemonCenter_1F_EventScript_290317:: @ 8290317 special ScrSpecial_GiddyShouldTellAnotherTale compare VAR_RESULT, 1 - goto_eq MauvilleCity_PokemonCenter_1F_EventScript_290359 + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_290359 compare VAR_RESULT, 0 - goto_eq MauvilleCity_PokemonCenter_1F_EventScript_290384 + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_290384 end MauvilleCity_PokemonCenter_1F_EventScript_290331:: @ 8290331 special ScrSpecial_GiddyShouldTellAnotherTale compare VAR_RESULT, 1 - goto_eq MauvilleCity_PokemonCenter_1F_EventScript_29034B + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_29034B compare VAR_RESULT, 0 - goto_eq MauvilleCity_PokemonCenter_1F_EventScript_290384 + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_290384 end MauvilleCity_PokemonCenter_1F_EventScript_29034B:: @ 829034B @@ -929,9 +929,9 @@ MauvilleCity_PokemonCenter_1F_EventScript_290359:: @ 8290359 waitmessage yesnobox 20, 8 compare VAR_RESULT, 1 - goto_eq MauvilleCity_PokemonCenter_1F_EventScript_290331 + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_290331 compare VAR_RESULT, 0 - goto_eq MauvilleCity_PokemonCenter_1F_EventScript_290331 + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_290331 end MauvilleCity_PokemonCenter_1F_EventScript_29037A:: @ 829037A diff --git a/data/scripts/mystery_event_club.inc b/data/scripts/mystery_event_club.inc index dde799a4b..ea805edc4 100644 --- a/data/scripts/mystery_event_club.inc +++ b/data/scripts/mystery_event_club.inc @@ -1,8 +1,7 @@ PetalburgCity_PokemonCenter_1F_EventScript_291539:: @ 8291539 lock faceplayer - checkflag FLAG_SYS_CHAT_USED - goto_eq PetalburgCity_PokemonCenter_1F_EventScript_2915F5 + goto_if_set FLAG_SYS_CHAT_USED, PetalburgCity_PokemonCenter_1F_EventScript_2915F5 msgbox PetalburgCity_PokemonCenter_1F_Text_291687, MSGBOX_DEFAULT goto PetalburgCity_PokemonCenter_1F_EventScript_291552 end @@ -30,9 +29,9 @@ PetalburgCity_PokemonCenter_1F_EventScript_29159F:: @ 829159F lock faceplayer compare VAR_RESULT, 0 - goto_eq PetalburgCity_PokemonCenter_1F_EventScript_2915CB + goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_2915CB compare VAR_RESULT, 1 - goto_eq PetalburgCity_PokemonCenter_1F_EventScript_2915D5 + goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_2915D5 end PetalburgCity_PokemonCenter_1F_EventScript_2915CB:: @ 82915CB @@ -82,9 +81,9 @@ PetalburgCity_PokemonCenter_1F_EventScript_291650:: @ 8291650 lock faceplayer compare VAR_RESULT, 0 - goto_eq PetalburgCity_PokemonCenter_1F_EventScript_2915CB + goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_2915CB compare VAR_RESULT, 1 - goto_eq PetalburgCity_PokemonCenter_1F_EventScript_2915D5 + goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_2915D5 end PetalburgCity_PokemonCenter_1F_EventScript_29167C:: @ 829167C diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index f22468500..48f95ae05 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -59,8 +59,7 @@ LittlerootTown_MaysHouse_2F_EventScript_29278D:: @ 829278D LittlerootTown_BrendansHouse_2F_EventScript_292799:: @ 8292799 LittlerootTown_MaysHouse_2F_EventScript_292799:: @ 8292799 - checkflag FLAG_0x051 - goto_eq LittlerootTown_BrendansHouse_2F_EventScript_29283F + goto_if_set FLAG_0x051, LittlerootTown_BrendansHouse_2F_EventScript_29283F msgbox LittlerootTown_BrendansHouse_2F_Text_1F8668, MSGBOX_DEFAULT call LittlerootTown_BrendansHouse_2F_EventScript_292849 delay 30 @@ -315,17 +314,15 @@ LittlerootTown_MaysHouse_1F_EventScript_2929C5:: @ 82929C5 lock faceplayer compare VAR_0x4082, 4 - goto_eq LittlerootTown_BrendansHouse_1F_EventScript_292A0F + goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292A0F compare VAR_0x408C, 4 - goto_eq LittlerootTown_BrendansHouse_1F_EventScript_292A0F - checkflag FLAG_HAS_MATCH_CALL - goto_eq LittlerootTown_BrendansHouse_1F_EventScript_292A19 - checkflag FLAG_0x052 - goto_eq LittlerootTown_BrendansHouse_1F_EventScript_292A86 + goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292A0F + goto_if_set FLAG_HAS_MATCH_CALL, LittlerootTown_BrendansHouse_1F_EventScript_292A19 + goto_if_set FLAG_0x052, LittlerootTown_BrendansHouse_1F_EventScript_292A86 compare VAR_TEMP_1, 1 - goto_eq LittlerootTown_BrendansHouse_1F_EventScript_292A94 + goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292A94 compare VAR_0x4092, 7 - goto_eq LittlerootTown_BrendansHouse_1F_EventScript_292AB0 + goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292AB0 msgbox LittlerootTown_BrendansHouse_1F_Text_1F7A1C, MSGBOX_DEFAULT release end @@ -336,8 +333,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_292A0F:: @ 8292A0F end LittlerootTown_BrendansHouse_1F_EventScript_292A19:: @ 8292A19 - checkflag FLAG_0x0D8 - goto_eq LittlerootTown_BrendansHouse_1F_EventScript_292A43 + goto_if_set FLAG_0x0D8, LittlerootTown_BrendansHouse_1F_EventScript_292A43 msgbox LittlerootTown_BrendansHouse_1F_Text_1F7E0E, MSGBOX_DEFAULT closemessage delay 30 @@ -351,17 +347,15 @@ LittlerootTown_BrendansHouse_1F_EventScript_292A19:: @ 8292A19 end LittlerootTown_BrendansHouse_1F_EventScript_292A43:: @ 8292A43 - checkflag FLAG_BADGE05_GET - goto_eq LittlerootTown_BrendansHouse_1F_EventScript_292A51 + goto_if_set FLAG_BADGE05_GET, LittlerootTown_BrendansHouse_1F_EventScript_292A51 goto LittlerootTown_BrendansHouse_1F_EventScript_292A86 LittlerootTown_BrendansHouse_1F_EventScript_292A51:: @ 8292A51 - checkflag FLAG_0x085 - goto_eq LittlerootTown_BrendansHouse_1F_EventScript_292A86 + goto_if_set FLAG_0x085, LittlerootTown_BrendansHouse_1F_EventScript_292A86 msgbox LittlerootTown_BrendansHouse_1F_Text_1F7D73, MSGBOX_DEFAULT giveitem_std ITEM_AMULET_COIN compare VAR_RESULT, 0 - goto_eq LittlerootTown_BrendansHouse_1F_EventScript_272054 + goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_272054 msgbox LittlerootTown_BrendansHouse_1F_Text_1F7DBE, MSGBOX_DEFAULT setflag FLAG_0x085 release diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index c1f53aa5d..c75bb8dbb 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -247,14 +247,13 @@ LilycoveCity_ContestLobby_Text_293BB4: @ 8293BB4 EventScript_Pblock1_Ask:: @ 8293C3E lockall - checkflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS - goto_if 0, LilycoveCity_ContestLobby_EventScript_293EFB + goto_if_unset FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS, LilycoveCity_ContestLobby_EventScript_293EFB setvar VAR_0x8009, 1 applymovement 16, LilycoveCity_ContestLobby_Movement_294053 waitmovement 0 msgbox Text_Pblock1_Ask, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq EventScript_Pblock1_Yes + goto_if_eq EventScript_Pblock1_Yes goto EventScript_Pblock1_No end @@ -266,8 +265,7 @@ EventScript_Pblock1_No: @ 8293C70 EventScript_Pblock1_NoBerries: @ 8293C7A msgbox Text_Pblock1_NoBerries, MSGBOX_DEFAULT dodailyevents - checkflag FLAG_0x921 - goto_eq LilycoveCity_ContestLobby_EventScript_293C92 + goto_if_set FLAG_0x921, LilycoveCity_ContestLobby_EventScript_293C92 goto LilycoveCity_ContestLobby_EventScript_293C9C end @@ -286,7 +284,7 @@ LilycoveCity_ContestLobby_EventScript_293C9C: @ 8293C9C EventScript_Pblock1_KnowHow: @ 8293CB9 msgbox Text_Pblock1_KnowHow, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq EventScript_Pblock1_Start + goto_if_eq EventScript_Pblock1_Start goto EventScript_Pblock1_Explain end @@ -303,13 +301,13 @@ EventScript_Pblock1_Explain: @ 8293CE0 EventScript_Pblock1_Yes: @ 8293CEE checkitem ITEM_POKEBLOCK_CASE, 1 compare VAR_RESULT, 0 - goto_eq EventScript_Pblock1_NoPokeblock + goto_if_eq EventScript_Pblock1_NoPokeblock specialvar VAR_RESULT, GetFirstFreePokeblockSlot compare VAR_RESULT, 65535 - goto_eq EventScript_Pblock1_FullPokeblock + goto_if_eq EventScript_Pblock1_FullPokeblock specialvar VAR_RESULT, PlayerHasBerries compare VAR_RESULT, 0 - goto_eq EventScript_Pblock1_NoBerries + goto_if_eq EventScript_Pblock1_NoBerries msgbox Text_Pblock1_Yes, MSGBOX_DEFAULT goto EventScript_Pblock1_KnowHow end @@ -340,7 +338,7 @@ LilycoveCity_ContestLobby_EventScript_293D4D:: @ 8293D4D waitmovement 0 msgbox LilycoveCity_ContestLobby_Text_293201, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq LilycoveCity_ContestLobby_EventScript_293DC6 + goto_if_eq LilycoveCity_ContestLobby_EventScript_293DC6 goto LilycoveCity_ContestLobby_EventScript_293D7D end @@ -357,7 +355,7 @@ LilycoveCity_ContestLobby_EventScript_293D87: @ 8293D87 LilycoveCity_ContestLobby_EventScript_293D91: @ 8293D91 msgbox LilycoveCity_ContestLobby_Text_29328C, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq LilycoveCity_ContestLobby_EventScript_293DAA + goto_if_eq LilycoveCity_ContestLobby_EventScript_293DAA goto LilycoveCity_ContestLobby_EventScript_293DB8 end @@ -374,16 +372,16 @@ LilycoveCity_ContestLobby_EventScript_293DB8: @ 8293DB8 LilycoveCity_ContestLobby_EventScript_293DC6: @ 8293DC6 specialvar VAR_RESULT, PlayerHasBerries compare VAR_RESULT, 0 - goto_eq LilycoveCity_ContestLobby_EventScript_293D87 + goto_if_eq LilycoveCity_ContestLobby_EventScript_293D87 checkitem ITEM_POKEBLOCK_CASE, 1 compare VAR_RESULT, 0 - goto_eq LilycoveCity_ContestLobby_EventScript_293E14 + goto_if_eq LilycoveCity_ContestLobby_EventScript_293E14 msgbox LilycoveCity_ContestLobby_Text_293237, MSGBOX_DEFAULT specialvar VAR_RESULT, GetFirstFreePokeblockSlot compare VAR_RESULT, 65535 - goto_if 5, LilycoveCity_ContestLobby_EventScript_293D91 + goto_if_ne LilycoveCity_ContestLobby_EventScript_293D91 compare VAR_RESULT, 65535 - goto_eq LilycoveCity_ContestLobby_EventScript_293E0A + goto_if_eq LilycoveCity_ContestLobby_EventScript_293E0A end LilycoveCity_ContestLobby_EventScript_293E0A: @ 8293E0A @@ -406,7 +404,7 @@ LilycoveCity_ContestLobby_EventScript_293E1E:: @ 8293E1E waitmovement 0 msgbox LilycoveCity_ContestLobby_Text_293842, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq LilycoveCity_ContestLobby_EventScript_293EA3 + goto_if_eq LilycoveCity_ContestLobby_EventScript_293EA3 goto LilycoveCity_ContestLobby_EventScript_293E5A end @@ -423,7 +421,7 @@ LilycoveCity_ContestLobby_EventScript_293E64: @ 8293E64 LilycoveCity_ContestLobby_EventScript_293E6E: @ 8293E6E msgbox LilycoveCity_ContestLobby_Text_29357E, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq LilycoveCity_ContestLobby_EventScript_293E87 + goto_if_eq LilycoveCity_ContestLobby_EventScript_293E87 goto LilycoveCity_ContestLobby_EventScript_293E95 end @@ -440,16 +438,16 @@ LilycoveCity_ContestLobby_EventScript_293E95: @ 8293E95 LilycoveCity_ContestLobby_EventScript_293EA3: @ 8293EA3 specialvar VAR_RESULT, PlayerHasBerries compare VAR_RESULT, 0 - goto_eq LilycoveCity_ContestLobby_EventScript_293E64 + goto_if_eq LilycoveCity_ContestLobby_EventScript_293E64 checkitem ITEM_POKEBLOCK_CASE, 1 compare VAR_RESULT, 0 - goto_eq LilycoveCity_ContestLobby_EventScript_293EF1 + goto_if_eq LilycoveCity_ContestLobby_EventScript_293EF1 msgbox LilycoveCity_ContestLobby_Text_29354E, MSGBOX_DEFAULT specialvar VAR_RESULT, GetFirstFreePokeblockSlot compare VAR_RESULT, 65535 - goto_if 5, LilycoveCity_ContestLobby_EventScript_293E6E + goto_if_ne LilycoveCity_ContestLobby_EventScript_293E6E compare VAR_RESULT, 65535 - goto_eq LilycoveCity_ContestLobby_EventScript_293EE7 + goto_if_eq LilycoveCity_ContestLobby_EventScript_293EE7 end LilycoveCity_ContestLobby_EventScript_293EE7: @ 8293EE7 @@ -467,7 +465,7 @@ LilycoveCity_ContestLobby_EventScript_293EFB: @ 8293EFB setvar VAR_0x8009, 1 msgbox LilycoveCity_ContestLobby_Text_2C42F4, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq LilycoveCity_ContestLobby_EventScript_293F28 + goto_if_eq LilycoveCity_ContestLobby_EventScript_293F28 msgbox LilycoveCity_ContestLobby_Text_2C4332, MSGBOX_DEFAULT releaseall end @@ -480,15 +478,15 @@ LilycoveCity_ContestLobby_EventScript_293F1E: @ 8293F1E LilycoveCity_ContestLobby_EventScript_293F28: @ 8293F28 checkitem ITEM_POKEBLOCK_CASE, 1 compare VAR_RESULT, 0 - goto_eq LilycoveCity_ContestLobby_EventScript_293F8E + goto_if_eq LilycoveCity_ContestLobby_EventScript_293F8E specialvar VAR_RESULT, PlayerHasBerries compare VAR_RESULT, 0 - goto_eq LilycoveCity_ContestLobby_EventScript_293F1E + goto_if_eq LilycoveCity_ContestLobby_EventScript_293F1E specialvar VAR_RESULT, GetFirstFreePokeblockSlot compare VAR_RESULT, 65535 - goto_if 5, LilycoveCity_ContestLobby_EventScript_293F64 + goto_if_ne LilycoveCity_ContestLobby_EventScript_293F64 compare VAR_RESULT, 65535 - goto_eq LilycoveCity_ContestLobby_EventScript_293F98 + goto_if_eq LilycoveCity_ContestLobby_EventScript_293F98 end LilycoveCity_ContestLobby_EventScript_293F64: @ 8293F64 @@ -536,9 +534,9 @@ LilycoveCity_ContestLobby_EventScript_293FC8: @ 8293FC8 msgbox Text_Pblock1_Talk_0, MSGBOX_DEFAULT specialvar VAR_RESULT, PlayerHasBerries compare VAR_RESULT, 1 - goto_eq LilycoveCity_ContestLobby_EventScript_293FEE + goto_if_eq LilycoveCity_ContestLobby_EventScript_293FEE compare VAR_RESULT, 0 - goto_eq LilycoveCity_ContestLobby_EventScript_293FF8 + goto_if_eq LilycoveCity_ContestLobby_EventScript_293FF8 end LilycoveCity_ContestLobby_EventScript_293FEE: @ 8293FEE @@ -549,13 +547,12 @@ LilycoveCity_ContestLobby_EventScript_293FEE: @ 8293FEE LilycoveCity_ContestLobby_EventScript_293FF8: @ 8293FF8 checkitem ITEM_POKEBLOCK_CASE, 1 compare VAR_RESULT, 0 - goto_eq LilycoveCity_ContestLobby_EventScript_294028 + goto_if_eq LilycoveCity_ContestLobby_EventScript_294028 specialvar VAR_RESULT, GetFirstFreePokeblockSlot compare VAR_RESULT, 65535 - goto_eq LilycoveCity_ContestLobby_EventScript_294028 + goto_if_eq LilycoveCity_ContestLobby_EventScript_294028 dodailyevents - checkflag FLAG_0x921 - goto_eq LilycoveCity_ContestLobby_EventScript_294028 + goto_if_set FLAG_0x921, LilycoveCity_ContestLobby_EventScript_294028 goto LilycoveCity_ContestLobby_EventScript_294032 end @@ -580,23 +577,23 @@ EventScript_PblockLink:: @ 8294055 lockall specialvar VAR_RESULT, PlayerHasBerries compare VAR_RESULT, 0 - goto_eq EventScript_PblocLink_NoBerries + goto_if_eq EventScript_PblocLink_NoBerries checkitem ITEM_POKEBLOCK_CASE, 1 compare VAR_RESULT, 0 - goto_eq EventScript_PblocLink_NoPokeblock + goto_if_eq EventScript_PblocLink_NoPokeblock specialvar VAR_RESULT, GetFirstFreePokeblockSlot compare VAR_RESULT, 65535 - goto_if 5, EventScript_PblocLink_Ask + goto_if_ne EventScript_PblocLink_Ask compare VAR_RESULT, 65535 - goto_eq EventScript_PblocLink_FullPokeblock + goto_if_eq EventScript_PblocLink_FullPokeblock end EventScript_PblocLink_Ask: @ 8294092 msgbox Text_PblockLink_Ask, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq EventScript_PblocLink_TryConnect + goto_if_eq EventScript_PblocLink_TryConnect compare VAR_RESULT, 0 - goto_eq EventScript_PblocLink_End + goto_if_eq EventScript_PblocLink_End end EventScript_PblocLink_NoBerries: @ 82940B1 @@ -607,24 +604,24 @@ EventScript_PblocLink_NoBerries: @ 82940B1 EventScript_PblocLink_TryConnect: @ 82940BB call LilycoveCity_ContestLobby_EventScript_27134F compare VAR_RESULT, 0 - goto_eq EventScript_PblocLink_End + goto_if_eq EventScript_PblocLink_End specialvar VAR_RESULT, IsWirelessAdapterConnected compare VAR_RESULT, 1 - goto_eq LilycoveCity_ContestLobby_EventScript_2941ED + goto_if_eq LilycoveCity_ContestLobby_EventScript_2941ED message Text_PblockLink_Searching waitmessage special sub_80B2FD8 waitstate compare VAR_RESULT, 1 - goto_eq EventScript_PblocLink_SpawnPartners + goto_if_eq EventScript_PblocLink_SpawnPartners compare VAR_RESULT, 2 - goto_eq EventScript_PblocLink_SomeoneNotReady + goto_if_eq EventScript_PblocLink_SomeoneNotReady compare VAR_RESULT, 3 - goto_eq EventScript_PblocLink_DifferentSelections + goto_if_eq EventScript_PblocLink_DifferentSelections compare VAR_RESULT, 5 - goto_eq EventScript_PblocLink_CloseLink + goto_if_eq EventScript_PblocLink_CloseLink compare VAR_RESULT, 6 - goto_eq EventScript_PblocLink_LinkError + goto_if_eq EventScript_PblocLink_LinkError end EventScript_PblocLink_1Arrived: @ 829411D @@ -728,22 +725,22 @@ EventScript_PblocLink_DecideLeader: @ 82941F8 EventScript_PblocLink_TryBecomeLeader: @ 8294235 call EventScript_PblocLink_BecomeLeader compare VAR_RESULT, 1 - goto_eq EventScript_PblocLink_SpawnPartners_ + goto_if_eq EventScript_PblocLink_SpawnPartners_ compare VAR_RESULT, 5 - goto_eq EventScript_PblocLink_DecideLeader + goto_if_eq EventScript_PblocLink_DecideLeader compare VAR_RESULT, 8 - goto_eq EventScript_PblocLink_TryBecomeLeader + goto_if_eq EventScript_PblocLink_TryBecomeLeader release end EventScript_PblocLink_TryJoinGroup: @ 829425D call EventScript_PblocLink_JoinGroup compare VAR_RESULT, 1 - goto_eq EventScript_PblocLink_SpawnPartners_ + goto_if_eq EventScript_PblocLink_SpawnPartners_ compare VAR_RESULT, 5 - goto_eq EventScript_PblocLink_DecideLeader + goto_if_eq EventScript_PblocLink_DecideLeader compare VAR_RESULT, 8 - goto_eq EventScript_PblocLink_TryJoinGroup + goto_if_eq EventScript_PblocLink_TryJoinGroup release end diff --git a/data/scripts/safari_zone.inc b/data/scripts/safari_zone.inc index 5a5244f1b..2932401e1 100644 --- a/data/scripts/safari_zone.inc +++ b/data/scripts/safari_zone.inc @@ -15,7 +15,7 @@ EventScript_2A4B6F:: @ 82A4B6F lockall msgbox Text_2A4BF4, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq EventScript_2A4B85 + goto_if_eq EventScript_2A4B85 releaseall end @@ -44,10 +44,10 @@ EventScript_2A4BAC:: @ 82A4BAC lockall special GetPokeblockFeederInFront compare VAR_RESULT, 65535 - goto_if 5, EventScript_2A4BEB + goto_if_ne EventScript_2A4BEB msgbox Text_2A4C90, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq EventScript_2A4BD0 + goto_if_eq EventScript_2A4BD0 releaseall end @@ -56,7 +56,7 @@ EventScript_2A4BD0:: @ 82A4BD0 special OpenPokeblockCaseOnFeeder waitstate compare VAR_RESULT, 65535 - goto_if 5, EventScript_2A4BE2 + goto_if_ne EventScript_2A4BE2 end EventScript_2A4BE2:: @ 82A4BE2 diff --git a/data/scripts/secret_base.inc b/data/scripts/secret_base.inc index b3f567d0a..db471545d 100644 --- a/data/scripts/secret_base.inc +++ b/data/scripts/secret_base.inc @@ -313,32 +313,32 @@ EventScript_2759F1:: @ 82759F1 special sub_80E8C98 special sub_80E8BC8 compare VAR_RESULT, 1 - goto_eq EventScript_275BE8 + goto_if_eq EventScript_275BE8 checkpartymove MOVE_SECRET_POWER setfieldeffectargument 0, VAR_RESULT buffermovename 1, MOVE_SECRET_POWER compare VAR_0x8007, 1 - goto_eq EventScript_275A50 + goto_if_eq EventScript_275A50 compare VAR_0x8007, 2 - goto_eq EventScript_275A50 + goto_if_eq EventScript_275A50 compare VAR_0x8007, 3 - goto_eq EventScript_275A50 + goto_if_eq EventScript_275A50 compare VAR_0x8007, 4 - goto_eq EventScript_275A50 + goto_if_eq EventScript_275A50 compare VAR_0x8007, 5 - goto_eq EventScript_275AA9 + goto_if_eq EventScript_275AA9 compare VAR_0x8007, 6 - goto_eq EventScript_275B02 + goto_if_eq EventScript_275B02 end EventScript_275A50:: @ 8275A50 lockall compare VAR_RESULT, 6 - goto_eq EventScript_275A91 + goto_if_eq EventScript_275A91 bufferpartymonnick 0, VAR_RESULT msgbox gText_23B704, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq EventScript_275CDE + goto_if_eq EventScript_275CDE msgbox Route103_Text_290771, MSGBOX_DEFAULT closemessage dofieldeffect FLDEFF_USE_SECRET_POWER_CAVE @@ -366,11 +366,11 @@ EventScript_275A9B:: @ 8275A9B EventScript_275AA9:: @ 8275AA9 lockall compare VAR_RESULT, 6 - goto_eq EventScript_275AEA + goto_if_eq EventScript_275AEA bufferpartymonnick 0, VAR_RESULT msgbox Text_274779, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq EventScript_275CDE + goto_if_eq EventScript_275CDE msgbox Route103_Text_290771, MSGBOX_DEFAULT closemessage dofieldeffect FLDEFF_USE_SECRET_POWER_TREE @@ -398,11 +398,11 @@ EventScript_275AF4:: @ 8275AF4 EventScript_275B02:: @ 8275B02 lockall compare VAR_RESULT, 6 - goto_eq EventScript_275B43 + goto_if_eq EventScript_275B43 bufferpartymonnick 0, VAR_RESULT msgbox Text_274825, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq EventScript_275CDE + goto_if_eq EventScript_275CDE msgbox Route103_Text_290771, MSGBOX_DEFAULT closemessage dofieldeffect FLDEFF_USE_SECRET_POWER_SHRUB @@ -447,7 +447,7 @@ SecretBase_RedCave1_EventScript_275B81:: @ 8275B81 setvar VAR_0x4097, 1 msgbox SecretBase_RedCave1_Text_23B759, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq SecretBase_RedCave1_EventScript_275BAB + goto_if_eq SecretBase_RedCave1_EventScript_275BAB closemessage playse SE_KAIDAN special sub_80E9A90 @@ -471,7 +471,7 @@ EventScript_275BB7:: @ 8275BB7 playse SE_KAIDAN special sub_80E9744 compare VAR_RESULT, 0 - goto_eq EventScript_275BDB + goto_if_eq EventScript_275BDB clearflag FLAG_DECORATION_0 special sub_80E9068 setvar VAR_0x4089, 0 @@ -488,58 +488,58 @@ EventScript_275BDB:: @ 8275BDB EventScript_275BE8:: @ 8275BE8 checkpartymove MOVE_SECRET_POWER compare VAR_RESULT, 6 - goto_eq EventScript_275C9A + goto_if_eq EventScript_275C9A setfieldeffectargument 0, VAR_RESULT setorcopyvar VAR_0x8004, VAR_RESULT lockall special GetSecretBaseNearbyMapName msgbox Text_276A3D, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq EventScript_275CDE + goto_if_eq EventScript_275CDE msgbox Text_2766AA, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq EventScript_275CDE + goto_if_eq EventScript_275CDE fadescreenswapbuffers 1 special sub_80E9B70 closemessage fadescreenswapbuffers 0 msgbox Text_276A95, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq EventScript_275CDE + goto_if_eq EventScript_275CDE bufferpartymonnick 0, VAR_0x8004 buffermovename 1, MOVE_SECRET_POWER msgbox Route103_Text_290771, MSGBOX_DEFAULT closemessage closemessage compare VAR_0x8007, 1 - goto_eq EventScript_275A86 + goto_if_eq EventScript_275A86 compare VAR_0x8007, 2 - goto_eq EventScript_275A86 + goto_if_eq EventScript_275A86 compare VAR_0x8007, 3 - goto_eq EventScript_275A86 + goto_if_eq EventScript_275A86 compare VAR_0x8007, 4 - goto_eq EventScript_275A86 + goto_if_eq EventScript_275A86 compare VAR_0x8007, 5 - goto_eq EventScript_275ADF + goto_if_eq EventScript_275ADF compare VAR_0x8007, 6 - goto_eq EventScript_275B38 + goto_if_eq EventScript_275B38 releaseall end EventScript_275C9A:: @ 8275C9A lockall compare VAR_0x8007, 1 - goto_eq EventScript_275A91 + goto_if_eq EventScript_275A91 compare VAR_0x8007, 2 - goto_eq EventScript_275A91 + goto_if_eq EventScript_275A91 compare VAR_0x8007, 3 - goto_eq EventScript_275A91 + goto_if_eq EventScript_275A91 compare VAR_0x8007, 4 - goto_eq EventScript_275A91 + goto_if_eq EventScript_275A91 compare VAR_0x8007, 5 - goto_eq EventScript_275AEA + goto_if_eq EventScript_275AEA compare VAR_0x8007, 6 - goto_eq EventScript_275B43 + goto_if_eq EventScript_275B43 end EventScript_275CDE:: @ 8275CDE @@ -590,10 +590,10 @@ EventScript_275D2E:: @ 8275D2E EventScript_275D39:: @ 8275D39 special sub_8129708 compare VAR_RESULT, 1 - goto_eq EventScript_275D63 + goto_if_eq EventScript_275D63 addvar VAR_0x8004, 1 compare VAR_0x8005, 0 - goto_eq EventScript_275D39 + goto_if_eq EventScript_275D39 removeobject VAR_0x8006 setflag 0x8005 goto EventScript_275D39 @@ -628,42 +628,41 @@ SecretBase_YellowCave3_EventScript_275D64:: @ 8275D64 SecretBase_YellowCave4_EventScript_275D64:: @ 8275D64 special sub_80EA354 compare VAR_0x8004, 0 - goto_eq SecretBase_RedCave1_EventScript_275DD6 + goto_if_eq SecretBase_RedCave1_EventScript_275DD6 compare VAR_0x8004, 1 - goto_eq SecretBase_RedCave1_EventScript_275E4E + goto_if_eq SecretBase_RedCave1_EventScript_275E4E compare VAR_0x8004, 2 - goto_eq SecretBase_RedCave1_EventScript_275EC6 + goto_if_eq SecretBase_RedCave1_EventScript_275EC6 compare VAR_0x8004, 3 - goto_eq SecretBase_RedCave1_EventScript_275F3E + goto_if_eq SecretBase_RedCave1_EventScript_275F3E compare VAR_0x8004, 4 - goto_eq SecretBase_RedCave1_EventScript_275FB6 + goto_if_eq SecretBase_RedCave1_EventScript_275FB6 compare VAR_0x8004, 5 - goto_eq SecretBase_RedCave1_EventScript_27602E + goto_if_eq SecretBase_RedCave1_EventScript_27602E compare VAR_0x8004, 6 - goto_eq SecretBase_RedCave1_EventScript_2760A6 + goto_if_eq SecretBase_RedCave1_EventScript_2760A6 compare VAR_0x8004, 7 - goto_eq SecretBase_RedCave1_EventScript_27611E + goto_if_eq SecretBase_RedCave1_EventScript_27611E compare VAR_0x8004, 8 - goto_eq SecretBase_RedCave1_EventScript_276196 + goto_if_eq SecretBase_RedCave1_EventScript_276196 compare VAR_0x8004, 9 - goto_eq SecretBase_RedCave1_EventScript_27620E + goto_if_eq SecretBase_RedCave1_EventScript_27620E end SecretBase_RedCave1_EventScript_275DD6:: @ 8275DD6 lock faceplayer - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, SecretBase_RedCave1_EventScript_275E25 + goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_275E25 compare VAR_RESULT, 1 - goto_eq SecretBase_RedCave1_EventScript_275E44 + goto_if_eq SecretBase_RedCave1_EventScript_275E44 msgbox SecretBase_RedCave1_Text_2748A0, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq SecretBase_RedCave1_EventScript_275E2F + goto_if_eq SecretBase_RedCave1_EventScript_275E2F setvar VAR_RESULT, 1 special sub_80EA30C call SecretBase_RedCave1_EventScript_27134F compare VAR_RESULT, 0 - goto_eq SecretBase_RedCave1_EventScript_275E2F + goto_if_eq SecretBase_RedCave1_EventScript_275E2F msgbox SecretBase_RedCave1_Text_274939, MSGBOX_DEFAULT goto SecretBase_RedCave1_EventScript_276286 end @@ -689,18 +688,17 @@ SecretBase_RedCave1_EventScript_275E44:: @ 8275E44 SecretBase_RedCave1_EventScript_275E4E:: @ 8275E4E lock faceplayer - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, SecretBase_RedCave1_EventScript_275E9D + goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_275E9D compare VAR_RESULT, 1 - goto_eq SecretBase_RedCave1_EventScript_275EBC + goto_if_eq SecretBase_RedCave1_EventScript_275EBC msgbox SecretBase_RedCave1_Text_274C13, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq SecretBase_RedCave1_EventScript_275EA7 + goto_if_eq SecretBase_RedCave1_EventScript_275EA7 setvar VAR_RESULT, 1 special sub_80EA30C call SecretBase_RedCave1_EventScript_27134F compare VAR_RESULT, 0 - goto_eq SecretBase_RedCave1_EventScript_275EA7 + goto_if_eq SecretBase_RedCave1_EventScript_275EA7 msgbox SecretBase_RedCave1_Text_274CB0, MSGBOX_DEFAULT goto SecretBase_RedCave1_EventScript_276286 end @@ -726,18 +724,17 @@ SecretBase_RedCave1_EventScript_275EBC:: @ 8275EBC SecretBase_RedCave1_EventScript_275EC6:: @ 8275EC6 lock faceplayer - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, SecretBase_RedCave1_EventScript_275F15 + goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_275F15 compare VAR_RESULT, 1 - goto_eq SecretBase_RedCave1_EventScript_275F34 + goto_if_eq SecretBase_RedCave1_EventScript_275F34 msgbox SecretBase_RedCave1_Text_274F39, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq SecretBase_RedCave1_EventScript_275F1F + goto_if_eq SecretBase_RedCave1_EventScript_275F1F setvar VAR_RESULT, 1 special sub_80EA30C call SecretBase_RedCave1_EventScript_27134F compare VAR_RESULT, 0 - goto_eq SecretBase_RedCave1_EventScript_275F1F + goto_if_eq SecretBase_RedCave1_EventScript_275F1F msgbox SecretBase_RedCave1_Text_274FCA, MSGBOX_DEFAULT goto SecretBase_RedCave1_EventScript_276286 end @@ -763,18 +760,17 @@ SecretBase_RedCave1_EventScript_275F34:: @ 8275F34 SecretBase_RedCave1_EventScript_275F3E:: @ 8275F3E lock faceplayer - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, SecretBase_RedCave1_EventScript_275F8D + goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_275F8D compare VAR_RESULT, 1 - goto_eq SecretBase_RedCave1_EventScript_275FAC + goto_if_eq SecretBase_RedCave1_EventScript_275FAC msgbox SecretBase_RedCave1_Text_275287, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq SecretBase_RedCave1_EventScript_275F97 + goto_if_eq SecretBase_RedCave1_EventScript_275F97 setvar VAR_RESULT, 1 special sub_80EA30C call SecretBase_RedCave1_EventScript_27134F compare VAR_RESULT, 0 - goto_eq SecretBase_RedCave1_EventScript_275F97 + goto_if_eq SecretBase_RedCave1_EventScript_275F97 msgbox SecretBase_RedCave1_Text_275315, MSGBOX_DEFAULT goto SecretBase_RedCave1_EventScript_276286 end @@ -800,18 +796,17 @@ SecretBase_RedCave1_EventScript_275FAC:: @ 8275FAC SecretBase_RedCave1_EventScript_275FB6:: @ 8275FB6 lock faceplayer - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, SecretBase_RedCave1_EventScript_276005 + goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_276005 compare VAR_RESULT, 1 - goto_eq SecretBase_RedCave1_EventScript_276024 + goto_if_eq SecretBase_RedCave1_EventScript_276024 msgbox SecretBase_RedCave1_Text_2755D2, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq SecretBase_RedCave1_EventScript_27600F + goto_if_eq SecretBase_RedCave1_EventScript_27600F setvar VAR_RESULT, 1 special sub_80EA30C call SecretBase_RedCave1_EventScript_27134F compare VAR_RESULT, 0 - goto_eq SecretBase_RedCave1_EventScript_27600F + goto_if_eq SecretBase_RedCave1_EventScript_27600F msgbox SecretBase_RedCave1_Text_275679, MSGBOX_DEFAULT goto SecretBase_RedCave1_EventScript_276286 end @@ -837,18 +832,17 @@ SecretBase_RedCave1_EventScript_276024:: @ 8276024 SecretBase_RedCave1_EventScript_27602E:: @ 827602E lock faceplayer - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, SecretBase_RedCave1_EventScript_27607D + goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_27607D compare VAR_RESULT, 1 - goto_eq SecretBase_RedCave1_EventScript_27609C + goto_if_eq SecretBase_RedCave1_EventScript_27609C msgbox SecretBase_RedCave1_Text_274A64, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq SecretBase_RedCave1_EventScript_276087 + goto_if_eq SecretBase_RedCave1_EventScript_276087 setvar VAR_RESULT, 1 special sub_80EA30C call SecretBase_RedCave1_EventScript_27134F compare VAR_RESULT, 0 - goto_eq SecretBase_RedCave1_EventScript_276087 + goto_if_eq SecretBase_RedCave1_EventScript_276087 msgbox SecretBase_RedCave1_Text_274AFA, MSGBOX_DEFAULT goto SecretBase_RedCave1_EventScript_276286 end @@ -874,18 +868,17 @@ SecretBase_RedCave1_EventScript_27609C:: @ 827609C SecretBase_RedCave1_EventScript_2760A6:: @ 82760A6 lock faceplayer - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, SecretBase_RedCave1_EventScript_2760F5 + goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_2760F5 compare VAR_RESULT, 1 - goto_eq SecretBase_RedCave1_EventScript_276114 + goto_if_eq SecretBase_RedCave1_EventScript_276114 msgbox SecretBase_RedCave1_Text_274DD2, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq SecretBase_RedCave1_EventScript_2760FF + goto_if_eq SecretBase_RedCave1_EventScript_2760FF setvar VAR_RESULT, 1 special sub_80EA30C call SecretBase_RedCave1_EventScript_27134F compare VAR_RESULT, 0 - goto_eq SecretBase_RedCave1_EventScript_2760FF + goto_if_eq SecretBase_RedCave1_EventScript_2760FF msgbox SecretBase_RedCave1_Text_274E41, MSGBOX_DEFAULT goto SecretBase_RedCave1_EventScript_276286 end @@ -911,18 +904,17 @@ SecretBase_RedCave1_EventScript_276114:: @ 8276114 SecretBase_RedCave1_EventScript_27611E:: @ 827611E lock faceplayer - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, SecretBase_RedCave1_EventScript_27616D + goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_27616D compare VAR_RESULT, 1 - goto_eq SecretBase_RedCave1_EventScript_27618C + goto_if_eq SecretBase_RedCave1_EventScript_27618C msgbox SecretBase_RedCave1_Text_275114, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq SecretBase_RedCave1_EventScript_276177 + goto_if_eq SecretBase_RedCave1_EventScript_276177 setvar VAR_RESULT, 1 special sub_80EA30C call SecretBase_RedCave1_EventScript_27134F compare VAR_RESULT, 0 - goto_eq SecretBase_RedCave1_EventScript_276177 + goto_if_eq SecretBase_RedCave1_EventScript_276177 msgbox SecretBase_RedCave1_Text_2751AF, MSGBOX_DEFAULT goto SecretBase_RedCave1_EventScript_276286 end @@ -948,18 +940,17 @@ SecretBase_RedCave1_EventScript_27618C:: @ 827618C SecretBase_RedCave1_EventScript_276196:: @ 8276196 lock faceplayer - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, SecretBase_RedCave1_EventScript_2761E5 + goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_2761E5 compare VAR_RESULT, 1 - goto_eq SecretBase_RedCave1_EventScript_276204 + goto_if_eq SecretBase_RedCave1_EventScript_276204 msgbox SecretBase_RedCave1_Text_275405, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq SecretBase_RedCave1_EventScript_2761EF + goto_if_eq SecretBase_RedCave1_EventScript_2761EF setvar VAR_RESULT, 1 special sub_80EA30C call SecretBase_RedCave1_EventScript_27134F compare VAR_RESULT, 0 - goto_eq SecretBase_RedCave1_EventScript_2761EF + goto_if_eq SecretBase_RedCave1_EventScript_2761EF msgbox SecretBase_RedCave1_Text_2754B2, MSGBOX_DEFAULT goto SecretBase_RedCave1_EventScript_276286 end @@ -985,18 +976,17 @@ SecretBase_RedCave1_EventScript_276204:: @ 8276204 SecretBase_RedCave1_EventScript_27620E:: @ 827620E lock faceplayer - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, SecretBase_RedCave1_EventScript_27625D + goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_27625D compare VAR_RESULT, 1 - goto_eq SecretBase_RedCave1_EventScript_27627C + goto_if_eq SecretBase_RedCave1_EventScript_27627C msgbox SecretBase_RedCave1_Text_2757B5, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq SecretBase_RedCave1_EventScript_276267 + goto_if_eq SecretBase_RedCave1_EventScript_276267 setvar VAR_RESULT, 1 special sub_80EA30C call SecretBase_RedCave1_EventScript_27134F compare VAR_RESULT, 0 - goto_eq SecretBase_RedCave1_EventScript_276267 + goto_if_eq SecretBase_RedCave1_EventScript_276267 msgbox SecretBase_RedCave1_Text_275884, MSGBOX_DEFAULT goto SecretBase_RedCave1_EventScript_276286 end diff --git a/data/scripts/secret_power_tm.inc b/data/scripts/secret_power_tm.inc index 031835c14..7116462c1 100644 --- a/data/scripts/secret_power_tm.inc +++ b/data/scripts/secret_power_tm.inc @@ -38,7 +38,7 @@ Route111_EventScript_2765FF:: @ 82765FF faceplayer msgbox Route111_Text_2762C9, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq Route111_EventScript_27661E + goto_if_eq Route111_EventScript_27661E msgbox Route111_Text_27655C, MSGBOX_DEFAULT release end @@ -46,7 +46,7 @@ Route111_EventScript_2765FF:: @ 82765FF Route111_EventScript_27661E:: @ 827661E giveitem_std ITEM_TM43 compare VAR_RESULT, 0 - goto_eq Route111_EventScript_276680 + goto_if_eq Route111_EventScript_276680 msgbox Route111_Text_27636E, MSGBOX_DEFAULT closemessage setflag FLAG_0x060 diff --git a/data/scripts/trainer_battle.inc b/data/scripts/trainer_battle.inc index 61a1afa25..c205a9d22 100644 --- a/data/scripts/trainer_battle.inc +++ b/data/scripts/trainer_battle.inc @@ -11,7 +11,7 @@ EventScript_TryDoNormalTrainerBattle:: @ 8271362 waitmovement 0 specialvar VAR_RESULT, GetTrainerFlag compare VAR_RESULT, 0 - goto_if 5, EventScript_NoNormalTrainerBattle + goto_if_ne EventScript_NoNormalTrainerBattle special SetUpTrainerEncounterMusic special SetUpTrainerMovement goto EventScript_ShowTrainerIntroMsg @@ -24,10 +24,10 @@ EventScript_TryDoDoubleTrainerBattle:: @ 827138A call EventScript_RevealTrainer specialvar VAR_RESULT, GetTrainerFlag compare VAR_RESULT, 0 - goto_if 5, EventScript_NoDoubleTrainerBattle + goto_if_ne EventScript_NoDoubleTrainerBattle special HasEnoughMonsForDoubleBattle compare VAR_RESULT, 0 - goto_if 5, EventScript_NotEnoughMonsForDoubleBattle + goto_if_ne EventScript_NotEnoughMonsForDoubleBattle special SetUpTrainerEncounterMusic special SetUpTrainerMovement goto EventScript_ShowTrainerIntroMsg @@ -51,7 +51,7 @@ EventScript_TryDoRematchBattle:: @ 82713D1 call EventScript_RevealTrainer specialvar VAR_RESULT, IsTrainerReadyForRematch compare VAR_RESULT, 0 - goto_eq EventScript_NoRematchTrainerBattle + goto_if_eq EventScript_NoRematchTrainerBattle special SetUpTrainerEncounterMusic special SetUpTrainerMovement special ShowTrainerIntroSpeech @@ -67,10 +67,10 @@ EventScript_NoRematchTrainerBattle:: @ 82713F7 EventScript_TryDoDoubleRematchBattle:: @ 82713F8 specialvar VAR_RESULT, IsTrainerReadyForRematch compare VAR_RESULT, 0 - goto_eq EventScript_NoDoubleRematchTrainerBattle + goto_if_eq EventScript_NoDoubleRematchTrainerBattle special HasEnoughMonsForDoubleBattle compare VAR_RESULT, 0 - goto_if 5, EventScript_NotEnoughMonsForDoubleRematchBattle + goto_if_ne EventScript_NotEnoughMonsForDoubleRematchBattle special SetUpTrainerEncounterMusic special SetUpTrainerMovement special ShowTrainerIntroSpeech @@ -104,7 +104,7 @@ EventScript_ShowTrainerIntroMsg:: @ 827143C waitbuttonpress special TryPrepareSecondApproachingTrainer compare VAR_RESULT, TRUE - goto_eq EventScript_ShowSecondTrainerIntro + goto_if_eq EventScript_ShowSecondTrainerIntro goto EventScript_DoTrainerBattle EventScript_DoTrainerBattle:: @ 8271454 @@ -112,15 +112,15 @@ EventScript_DoTrainerBattle:: @ 8271454 @ Pointless check, possibly used for debugging? specialvar VAR_RESULT, GetTrainerBattleMode compare VAR_RESULT, TRAINER_BATTLE_SINGLE - goto_eq EventScript_EndTrainerBattle + goto_if_eq EventScript_EndTrainerBattle compare VAR_RESULT, TRAINER_BATTLE_CONTINUE_SCRIPT - goto_eq EventScript_EndTrainerBattle + goto_if_eq EventScript_EndTrainerBattle compare VAR_RESULT, TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC - goto_eq EventScript_EndTrainerBattle + goto_if_eq EventScript_EndTrainerBattle compare VAR_RESULT, TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE - goto_eq EventScript_EndTrainerBattle + goto_if_eq EventScript_EndTrainerBattle compare VAR_RESULT, TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE_NO_MUSIC - goto_eq EventScript_EndTrainerBattle + goto_if_eq EventScript_EndTrainerBattle EventScript_EndTrainerBattle:: @ 8271491 gotobeatenscript diff --git a/data/scripts/tv.inc b/data/scripts/tv.inc index 9033e741f..0b1224503 100644 --- a/data/scripts/tv.inc +++ b/data/scripts/tv.inc @@ -4,30 +4,28 @@ EventScript_TV:: @ 827EE0B special ResetTVShowState specialvar VAR_RESULT, CheckForBigMovieOrEmergencyNewsOnTV compare VAR_RESULT, 2 - goto_eq EventScript_27EE9A + goto_if_eq EventScript_27EE9A compare VAR_RESULT, 1 - goto_eq EventScript_27EEA4 - checkflag FLAG_SYS_TV_START - goto_if 0, EventScript_27EE8A - checkflag FLAG_SYS_TV_WATCH - goto_eq EventScript_27EE8A + goto_if_eq EventScript_27EEA4 + goto_if_unset FLAG_SYS_TV_START, EventScript_27EE8A + goto_if_set FLAG_SYS_TV_WATCH, EventScript_27EE8A specialvar VAR_RESULT, IsTVShowInSearchOfTrainersAiring compare VAR_RESULT, 1 - goto_eq EventScript_27EEFF + goto_if_eq EventScript_27EEFF goto EventScript_27EEE9 end EventScript_27EE54:: @ 827EE54 specialvar VAR_0x8004, special_0x44 compare VAR_0x8004, 255 - goto_eq EventScript_27EED8 + goto_if_eq EventScript_27EED8 specialvar VAR_RESULT, special_0x4a compare VAR_RESULT, 255 - goto_eq EventScript_27EED8 + goto_if_eq EventScript_27EED8 copyvar VAR_0x8004, VAR_RESULT specialvar VAR_RESULT, special_0x45 compare VAR_RESULT, 0 - goto_if 5, EventScript_27EEBA + goto_if_ne EventScript_27EEBA end EventScript_27EE8A:: @ 827EE8A @@ -56,7 +54,7 @@ EventScript_27EEBA:: @ 827EEBA waitmessage waitbuttonpress compare VAR_RESULT, 1 - goto_if 5, EventScript_27EEBA + goto_if_ne EventScript_27EEBA goto EventScript_27EED0 end @@ -75,7 +73,7 @@ EventScript_27EED8:: @ 827EED8 EventScript_27EEE9:: @ 827EEE9 special DoPokeNews compare VAR_RESULT, 0 - goto_eq EventScript_27EE54 + goto_if_eq EventScript_27EE54 waitmessage waitbuttonpress goto EventScript_27EED0 @@ -86,6 +84,6 @@ EventScript_27EEFF:: @ 827EEFF waitmessage waitbuttonpress compare VAR_RESULT, 0 - goto_eq EventScript_27EEFF + goto_if_eq EventScript_27EEFF goto EventScript_27EED0 end |