diff options
Diffstat (limited to 'data/scripts')
| -rw-r--r-- | data/scripts/apprentice.inc | 31 | ||||
| -rw-r--r-- | data/scripts/berry_tree.inc | 24 | ||||
| -rw-r--r-- | data/scripts/cable_club.inc | 236 | ||||
| -rw-r--r-- | data/scripts/contest_hall.inc | 183 | ||||
| -rw-r--r-- | data/scripts/day_care.inc | 54 | ||||
| -rw-r--r-- | data/scripts/field_move_scripts.inc | 40 | ||||
| -rw-r--r-- | data/scripts/gabby_and_ty.inc | 14 | ||||
| -rw-r--r-- | data/scripts/mauville_man.inc | 68 | ||||
| -rw-r--r-- | data/scripts/mystery_event_club.inc | 11 | ||||
| -rw-r--r-- | data/scripts/players_house.inc | 28 | ||||
| -rw-r--r-- | data/scripts/pokeblocks.inc | 99 | ||||
| -rw-r--r-- | data/scripts/safari_zone.inc | 8 | ||||
| -rw-r--r-- | data/scripts/secret_base.inc | 176 | ||||
| -rw-r--r-- | data/scripts/secret_power_tm.inc | 4 | ||||
| -rw-r--r-- | data/scripts/trainer_battle.inc | 24 | ||||
| -rw-r--r-- | data/scripts/tv.inc | 24 |
16 files changed, 493 insertions, 531 deletions
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 |