diff options
Diffstat (limited to 'data/scripts')
262 files changed, 2790 insertions, 2790 deletions
diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc index d11b7df20..ebe7b9e0b 100644 --- a/data/scripts/berry_tree.inc +++ b/data/scripts/berry_tree.inc @@ -22,7 +22,7 @@ Route102_EventScript_274359:: @ 8274359 lock faceplayer specialvar VAR_RESULT, PlayerHasBerries - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route102_EventScript_274374 message Route102_Text_2744F0 waitmessage @@ -32,9 +32,9 @@ Route102_EventScript_274359:: @ 8274359 Route102_EventScript_274374:: @ 8274374 msgbox Route102_Text_274507, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route102_EventScript_274393 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route102_EventScript_2743AF end @@ -43,7 +43,7 @@ Route102_EventScript_274393:: @ 8274393 closemessage special Bag_ChooseBerry waitstate - compare_var_to_value VAR_ITEM_ID, 0 + compare VAR_ITEM_ID, 0 goto_eq Route102_EventScript_2743AF takeitem VAR_ITEM_ID, 1 call Route102_EventScript_2744DD @@ -86,9 +86,9 @@ Route102_EventScript_2743E1:: @ 82743E1 goto Route102_EventScript_27448D Route102_EventScript_2743F6:: @ 82743F6 - compare_var_to_value VAR_0x8005, 0 + compare VAR_0x8005, 0 goto_eq Route102_EventScript_27441A - compare_var_to_value VAR_0x8005, 4 + compare VAR_0x8005, 4 goto_eq Route102_EventScript_274413 bufferstring 1, Route102_Text_2745E5 return @@ -107,14 +107,14 @@ Route102_EventScript_274421:: @ 8274421 faceplayer special FieldObjectInteractionGetBerryCountString msgbox Route102_Text_2745EE, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route102_EventScript_274448 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route102_EventScript_274479 Route102_EventScript_274448:: @ 8274448 special FieldObjectInteractionPickBerryTree - compare_var_to_value VAR_0x8004, 0 + compare VAR_0x8004, 0 goto_eq Route102_EventScript_274470 special sub_80EED34 special FieldObjectInteractionRemoveBerryTree @@ -152,13 +152,13 @@ Route102_EventScript_274482:: @ 8274482 Route102_EventScript_27448D:: @ 827448D checkitem ITEM_WAILMER_PAIL, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route102_EventScript_2744BE special FieldObjectInteractionGetBerryName msgbox Route102_Text_2746E4, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route102_EventScript_2744C4 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route102_EventScript_2744BE Route102_EventScript_2744BE:: @ 82744BE diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 71e3303b5..5418e6e4e 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -20,10 +20,10 @@ VerdanturfTown_PokemonCenter_2F_MapScript1_276ACF: @ 8276ACF OldaleTown_PokemonCenter_2F_EventScript_276AD5:: @ 8276AD5 specialvar VAR_RESULT, sub_813B514 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq OldaleTown_PokemonCenter_2F_EventScript_276AFB specialvar VAR_RESULT, sub_801B27C - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq OldaleTown_PokemonCenter_2F_EventScript_276AFF goto OldaleTown_PokemonCenter_2F_EventScript_276AFB end @@ -54,7 +54,7 @@ SlateportCity_PokemonCenter_2F_EventScript_276B03:: @ 8276B03 SootopolisCity_PokemonCenter_2F_EventScript_276B03:: @ 8276B03 VerdanturfTown_PokemonCenter_2F_EventScript_276B03:: @ 8276B03 specialvar VAR_RESULT, sub_813B514 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq OldaleTown_PokemonCenter_2F_EventScript_276B23 goto OldaleTown_PokemonCenter_2F_EventScript_276B19 end @@ -68,7 +68,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276B1A:: @ 8276B1A OldaleTown_PokemonCenter_2F_EventScript_276B23:: @ 8276B23 checkitem ITEM_EON_TICKET, 1 - compare_var_to_value VAR_RESULT, 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 @@ -114,7 +114,7 @@ VerdanturfTown_PokemonCenter_2F_MapScript2_276B6C: @ 8276B6C MossdeepCity_GameCorner_1F_EventScript_276BAE:: @ 8276BAE OldaleTown_PokemonCenter_2F_EventScript_276BAE:: @ 8276BAE - compare_var_to_value VAR_0x8007, 0 + compare VAR_0x8007, 0 goto_eq OldaleTown_PokemonCenter_2F_EventScript_276BBD turnobject VAR_0x8007, 3 @@ -139,21 +139,21 @@ RustboroCity_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE SlateportCity_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE SootopolisCity_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE VerdanturfTown_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE - compare_var_to_value VAR_0x4087, 1 + compare VAR_0x4087, 1 goto_eq OldaleTown_PokemonCenter_2F_EventScript_276C17 - compare_var_to_value VAR_0x4087, 2 + compare VAR_0x4087, 2 goto_eq OldaleTown_PokemonCenter_2F_EventScript_276C17 - compare_var_to_value VAR_0x4087, 5 + compare VAR_0x4087, 5 goto_eq OldaleTown_PokemonCenter_2F_EventScript_276C17 - compare_var_to_value VAR_0x4087, 3 + compare VAR_0x4087, 3 goto_eq OldaleTown_PokemonCenter_2F_EventScript_276C1D - compare_var_to_value VAR_0x4087, 4 + compare VAR_0x4087, 4 goto_eq OldaleTown_PokemonCenter_2F_EventScript_276C23 - compare_var_to_value VAR_0x4087, 6 + compare VAR_0x4087, 6 goto_eq OldaleTown_PokemonCenter_2F_EventScript_276C29 - compare_var_to_value VAR_0x4087, 7 + compare VAR_0x4087, 7 goto_eq OldaleTown_PokemonCenter_2F_EventScript_276C2F - compare_var_to_value VAR_0x4087, 8 + compare VAR_0x4087, 8 goto_eq OldaleTown_PokemonCenter_2F_EventScript_276C35 end @@ -233,7 +233,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276C9D:: @ 8276C9D OldaleTown_PokemonCenter_2F_EventScript_276CB5:: @ 8276CB5 special sub_80097E8 setvar VAR_0x4087, 0 - compare_var_to_value VAR_0x8007, 0 + compare VAR_0x8007, 0 goto_eq OldaleTown_PokemonCenter_2F_EventScript_276DD5 applymovement VAR_0x8007, OldaleTown_PokemonCenter_2F_Movement_27734D waitmovement 0 @@ -256,7 +256,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276CE7:: @ 8276CE7 OldaleTown_PokemonCenter_2F_EventScript_276CFF:: @ 8276CFF special sub_80097E8 setvar VAR_0x4087, 0 - compare_var_to_value VAR_0x8007, 0 + compare VAR_0x8007, 0 goto_eq OldaleTown_PokemonCenter_2F_EventScript_276DD5 applymovement 255, OldaleTown_PokemonCenter_2F_Movement_27735E waitmovement 0 @@ -280,7 +280,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276D44:: @ 8276D44 setvar VAR_0x4087, 0 applymovement 255, OldaleTown_PokemonCenter_2F_Movement_27734F waitmovement 0 - compare_var_to_value VAR_0x8007, 0 + compare VAR_0x8007, 0 goto_eq OldaleTown_PokemonCenter_2F_EventScript_276D6B applymovement VAR_0x8007, OldaleTown_PokemonCenter_2F_Movement_277349 waitmovement 0 @@ -300,7 +300,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276D6C:: @ 8276D6C OldaleTown_PokemonCenter_2F_EventScript_276D84:: @ 8276D84 setvar VAR_0x4087, 0 - compare_var_to_value VAR_0x8007, 0 + compare VAR_0x8007, 0 goto_eq OldaleTown_PokemonCenter_2F_EventScript_276DD5 applymovement 255, OldaleTown_PokemonCenter_2F_Movement_27735E waitmovement 0 @@ -409,8 +409,8 @@ OldaleTown_PokemonCenter_2F_EventScript_276F23:: @ 8276F23 end OldaleTown_PokemonCenter_2F_EventScript_276F2E:: @ 8276F2E - special sub_80F92F8 - compare_var_to_value VAR_RESULT, 0 + special HasEnoughMonsForDoubleBattle + compare VAR_RESULT, 0 goto_if 5, OldaleTown_PokemonCenter_2F_EventScript_276F47 setvar VAR_0x8004, 2 goto OldaleTown_PokemonCenter_2F_EventScript_276F60 @@ -428,28 +428,28 @@ OldaleTown_PokemonCenter_2F_EventScript_276F55:: @ 8276F55 OldaleTown_PokemonCenter_2F_EventScript_276F60:: @ 8276F60 call OldaleTown_PokemonCenter_2F_EventScript_27134F - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC message OldaleTown_PokemonCenter_2F_Text_278091 waitmessage special sub_80B2DA4 waitstate - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq OldaleTown_PokemonCenter_2F_EventScript_276FBD - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772D2 - compare_var_to_value VAR_RESULT, 3 + compare VAR_RESULT, 3 goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772DF - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 goto_eq OldaleTown_PokemonCenter_2F_EventScript_277046 - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC - compare_var_to_value VAR_RESULT, 6 + compare VAR_RESULT, 6 goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772C5 end OldaleTown_PokemonCenter_2F_EventScript_276FBD:: @ 8276FBD - special sp000_heal_pokemon + special HealPlayerParty special copy_player_party_to_sav1 special copy_bags_and_unk_data_from_save_blocks copyvar VAR_0x4087, VAR_0x8004 @@ -472,7 +472,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276FBD:: @ 8276FBD closedoor 9, 1 waitdooranim release - compare_var_to_value VAR_0x8004, 5 + compare VAR_0x8004, 5 goto_eq OldaleTown_PokemonCenter_2F_EventScript_277036 special sub_809D2BC warp SINGLE_BATTLE_COLOSSEUM, 255, 6, 8 @@ -527,30 +527,30 @@ OldaleTown_PokemonCenter_2F_EventScript_2770A5:: @ 82770A5 OldaleTown_PokemonCenter_2F_EventScript_2770B2:: @ 82770B2 copyvar VAR_0x8007, VAR_LAST_TALKED call OldaleTown_PokemonCenter_2F_EventScript_277199 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC call OldaleTown_PokemonCenter_2F_EventScript_27134F - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC message OldaleTown_PokemonCenter_2F_Text_278091 waitmessage special sub_80B2E4C waitstate - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq OldaleTown_PokemonCenter_2F_EventScript_27713A - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772D2 - compare_var_to_value VAR_RESULT, 3 + compare VAR_RESULT, 3 goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772DF - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 goto_eq OldaleTown_PokemonCenter_2F_EventScript_27730E - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC - compare_var_to_value VAR_RESULT, 6 + compare VAR_RESULT, 6 goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772C5 - compare_var_to_value VAR_RESULT, 7 + compare VAR_RESULT, 7 goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772AB - compare_var_to_value VAR_RESULT, 9 + compare VAR_RESULT, 9 goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772B8 end @@ -584,10 +584,10 @@ OldaleTown_PokemonCenter_2F_EventScript_27713A:: @ 827713A OldaleTown_PokemonCenter_2F_EventScript_277199:: @ 8277199 specialvar VAR_RESULT, CalculatePlayerPartyCount - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_2771BF specialvar VAR_RESULT, sub_80F9370 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq OldaleTown_PokemonCenter_2F_EventScript_2771CD setvar VAR_RESULT, 1 return @@ -605,7 +605,7 @@ OldaleTown_PokemonCenter_2F_EventScript_2771CD:: @ 82771CD OldaleTown_PokemonCenter_2F_EventScript_2771DB:: @ 82771DB copyvar VAR_0x8007, VAR_LAST_TALKED call OldaleTown_PokemonCenter_2F_EventScript_27134F - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC message OldaleTown_PokemonCenter_2F_Text_278091 waitmessage @@ -613,19 +613,19 @@ OldaleTown_PokemonCenter_2F_EventScript_2771DB:: @ 82771DB waitstate special sub_80B2EA8 waitstate - compare_var_to_value VAR_RESULT, 12 + compare VAR_RESULT, 12 goto_eq OldaleTown_PokemonCenter_2F_EventScript_277328 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq OldaleTown_PokemonCenter_2F_EventScript_27724C - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772D2 - compare_var_to_value VAR_RESULT, 3 + compare VAR_RESULT, 3 goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772DF - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 goto_eq OldaleTown_PokemonCenter_2F_EventScript_27730E - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC - compare_var_to_value VAR_RESULT, 6 + compare VAR_RESULT, 6 goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772C5 end @@ -809,7 +809,7 @@ gUnknown_08277388:: @ 8277388 fadescreen 1 special sub_80F9438 waitstate - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq DoubleBattleColosseum_EventScript_2773F4 setvar VAR_0x8005, 0 special sub_80B3968 @@ -820,7 +820,7 @@ gUnknown_082773A3:: @ 82773A3 fadescreen 1 special sub_80F9438 waitstate - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq DoubleBattleColosseum_EventScript_2773F4 setvar VAR_0x8005, 1 special sub_80B3968 @@ -831,7 +831,7 @@ gUnknown_082773BE:: @ 82773BE fadescreen 1 special sub_80F9438 waitstate - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq DoubleBattleColosseum_EventScript_2773F4 setvar VAR_0x8005, 2 special sub_80B3968 @@ -842,7 +842,7 @@ gUnknown_082773D9:: @ 82773D9 fadescreen 1 special sub_80F9438 waitstate - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq DoubleBattleColosseum_EventScript_2773F4 setvar VAR_0x8005, 3 special sub_80B3968 @@ -880,7 +880,7 @@ gUnknown_0827741D:: @ 827741D setvar VAR_0x8005, 0 special sub_80E6BE8 waitstate - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 goto_if 5, RecordCorner_EventScript_277471 end @@ -888,7 +888,7 @@ gUnknown_08277432:: @ 8277432 setvar VAR_0x8005, 1 special sub_80E6BE8 waitstate - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 goto_if 5, RecordCorner_EventScript_277471 end @@ -896,7 +896,7 @@ gUnknown_08277447:: @ 8277447 setvar VAR_0x8005, 2 special sub_80E6BE8 waitstate - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 goto_if 5, RecordCorner_EventScript_277471 end @@ -904,7 +904,7 @@ gUnknown_0827745C:: @ 827745C setvar VAR_0x8005, 3 special sub_80E6BE8 waitstate - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 goto_if 5, RecordCorner_EventScript_277471 end @@ -950,7 +950,7 @@ TradeCenter_EventScript_2774B6:: @ 82774B6 end RecordCorner_EventScript_2774C6:: @ 82774C6 - compare_var_to_value VAR_0x4000, 0 + compare VAR_0x4000, 0 goto_if 5, RecordCorner_EventScript_2774E0 special sub_8098574 message RecordCorner_Text_27861C @@ -971,7 +971,7 @@ RecordCorner_EventScript_2774E0:: @ 82774E0 gUnknown_082774EF:: @ 82774EF msgbox Text_2783A8, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq gUnknown_08277509 erasebox 0, 0, 29, 19 releaseall @@ -996,11 +996,11 @@ OldaleTown_PokemonCenter_2F_EventScript_27751B:: @ 827751B checkflag FLAG_SYS_POKEDEX_GET goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_277335 specialvar VAR_RESULT, sub_813990C - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq OldaleTown_PokemonCenter_2F_EventScript_27731B copyvar VAR_0x8007, VAR_LAST_TALKED specialvar VAR_RESULT, sub_80093CC - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq OldaleTown_PokemonCenter_2F_EventScript_277668 message OldaleTown_PokemonCenter_2F_Text_27940D waitmessage @@ -1024,14 +1024,14 @@ OldaleTown_PokemonCenter_2F_EventScript_277593:: @ 8277593 OldaleTown_PokemonCenter_2F_EventScript_27759F:: @ 827759F call OldaleTown_PokemonCenter_2F_EventScript_277626 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC call OldaleTown_PokemonCenter_2F_EventScript_27134F - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC msgbox OldaleTown_PokemonCenter_2F_Text_27961C, 4 closemessage - special sp000_heal_pokemon + special HealPlayerParty setvar VAR_0x8004, 6 copyvar VAR_0x4087, VAR_0x8004 call OldaleTown_PokemonCenter_2F_EventScript_277BBE @@ -1059,10 +1059,10 @@ OldaleTown_PokemonCenter_2F_EventScript_27759F:: @ 827759F OldaleTown_PokemonCenter_2F_EventScript_277626:: @ 8277626 specialvar VAR_RESULT, CountPartyNonEggMons - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_27764C specialvar VAR_RESULT, sub_80F9370 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq OldaleTown_PokemonCenter_2F_EventScript_27765A setvar VAR_RESULT, 1 return @@ -1088,7 +1088,7 @@ OldaleTown_PokemonCenter_2F_EventScript_277672:: @ 8277672 checkflag FLAG_SYS_POKEDEX_GET goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_277335 msgbox OldaleTown_PokemonCenter_2F_Text_279937, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq OldaleTown_PokemonCenter_2F_EventScript_27769A msgbox OldaleTown_PokemonCenter_2F_Text_2799AA, 4 release @@ -1106,10 +1106,10 @@ OldaleTown_PokemonCenter_2F_EventScript_2776A4:: @ 82776A4 checkflag FLAG_SYS_POKEDEX_GET goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_277335 specialvar VAR_RESULT, sub_813990C - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq OldaleTown_PokemonCenter_2F_EventScript_27731B specialvar VAR_RESULT, sub_80093CC - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq OldaleTown_PokemonCenter_2F_EventScript_276E13 message OldaleTown_PokemonCenter_2F_Text_279013 waitmessage @@ -1119,7 +1119,7 @@ OldaleTown_PokemonCenter_2F_EventScript_2776A4:: @ 82776A4 OldaleTown_PokemonCenter_2F_EventScript_2776E3:: @ 82776E3 checkitem ITEM_POWDER_JAR, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq OldaleTown_PokemonCenter_2F_EventScript_27778B checkflag FLAG_VISITED_MAUVILLE_CITY goto_eq OldaleTown_PokemonCenter_2F_EventScript_27773E @@ -1166,10 +1166,10 @@ OldaleTown_PokemonCenter_2F_EventScript_2777CB:: @ 82777CB OldaleTown_PokemonCenter_2F_EventScript_27780D:: @ 827780D msgbox OldaleTown_PokemonCenter_2F_Text_27909D, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC call OldaleTown_PokemonCenter_2F_EventScript_277199 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC setvar VAR_0x8004, 3 goto OldaleTown_PokemonCenter_2F_EventScript_277931 @@ -1194,8 +1194,8 @@ OldaleTown_PokemonCenter_2F_EventScript_27788E:: @ 827788E end OldaleTown_PokemonCenter_2F_EventScript_277899:: @ 8277899 - special sub_80F92F8 - compare_var_to_value VAR_RESULT, 0 + special HasEnoughMonsForDoubleBattle + compare VAR_RESULT, 0 goto_if 5, OldaleTown_PokemonCenter_2F_EventScript_2778B2 setvar VAR_0x8004, 1 goto OldaleTown_PokemonCenter_2F_EventScript_277931 @@ -1218,7 +1218,7 @@ OldaleTown_PokemonCenter_2F_EventScript_2778CB:: @ 82778CB OldaleTown_PokemonCenter_2F_EventScript_2778D9:: @ 82778D9 msgbox OldaleTown_PokemonCenter_2F_Text_2790E8, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC setvar VAR_0x8004, 12 goto OldaleTown_PokemonCenter_2F_EventScript_277931 @@ -1226,10 +1226,10 @@ OldaleTown_PokemonCenter_2F_EventScript_2778D9:: @ 82778D9 OldaleTown_PokemonCenter_2F_EventScript_2778F7:: @ 82778F7 msgbox OldaleTown_PokemonCenter_2F_Text_279114, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC special HasAtLeastOneBerry - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq OldaleTown_PokemonCenter_2F_EventScript_277923 setvar VAR_0x8004, 5 goto OldaleTown_PokemonCenter_2F_EventScript_277931 @@ -1242,7 +1242,7 @@ OldaleTown_PokemonCenter_2F_EventScript_277923:: @ 8277923 OldaleTown_PokemonCenter_2F_EventScript_277931:: @ 8277931 call OldaleTown_PokemonCenter_2F_EventScript_27134F - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC switch VAR_0x8004 case 3, OldaleTown_PokemonCenter_2F_EventScript_277989 @@ -1266,22 +1266,22 @@ OldaleTown_PokemonCenter_2F_EventScript_277989:: @ 8277989 OldaleTown_PokemonCenter_2F_EventScript_2779C6:: @ 82779C6 call OldaleTown_PokemonCenter_2F_EventScript_277B30 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq OldaleTown_PokemonCenter_2F_EventScript_277B3A - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_eq OldaleTown_PokemonCenter_2F_EventScript_277989 - compare_var_to_value VAR_RESULT, 8 + compare VAR_RESULT, 8 goto_eq OldaleTown_PokemonCenter_2F_EventScript_2779C6 release return OldaleTown_PokemonCenter_2F_EventScript_2779EE:: @ 82779EE call OldaleTown_PokemonCenter_2F_EventScript_277B35 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq OldaleTown_PokemonCenter_2F_EventScript_277B3A - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_eq OldaleTown_PokemonCenter_2F_EventScript_277989 - compare_var_to_value VAR_RESULT, 8 + compare VAR_RESULT, 8 goto_eq OldaleTown_PokemonCenter_2F_EventScript_2779EE release return @@ -1299,22 +1299,22 @@ OldaleTown_PokemonCenter_2F_EventScript_277A16:: @ 8277A16 OldaleTown_PokemonCenter_2F_EventScript_277A53:: @ 8277A53 call OldaleTown_PokemonCenter_2F_EventScript_277B30 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq OldaleTown_PokemonCenter_2F_EventScript_277B3A - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_eq OldaleTown_PokemonCenter_2F_EventScript_277A16 - compare_var_to_value VAR_RESULT, 8 + compare VAR_RESULT, 8 goto_eq OldaleTown_PokemonCenter_2F_EventScript_277A53 release return OldaleTown_PokemonCenter_2F_EventScript_277A7B:: @ 8277A7B call OldaleTown_PokemonCenter_2F_EventScript_277B35 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq OldaleTown_PokemonCenter_2F_EventScript_277B3A - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_eq OldaleTown_PokemonCenter_2F_EventScript_277A16 - compare_var_to_value VAR_RESULT, 8 + compare VAR_RESULT, 8 goto_eq OldaleTown_PokemonCenter_2F_EventScript_277A7B release return @@ -1332,22 +1332,22 @@ OldaleTown_PokemonCenter_2F_EventScript_277AA3:: @ 8277AA3 OldaleTown_PokemonCenter_2F_EventScript_277AE0:: @ 8277AE0 call OldaleTown_PokemonCenter_2F_EventScript_277B30 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq OldaleTown_PokemonCenter_2F_EventScript_277B3A - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_eq OldaleTown_PokemonCenter_2F_EventScript_277AA3 - compare_var_to_value VAR_RESULT, 8 + compare VAR_RESULT, 8 goto_eq OldaleTown_PokemonCenter_2F_EventScript_277AE0 release return OldaleTown_PokemonCenter_2F_EventScript_277B08:: @ 8277B08 call OldaleTown_PokemonCenter_2F_EventScript_277B35 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq OldaleTown_PokemonCenter_2F_EventScript_277B3A - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_eq OldaleTown_PokemonCenter_2F_EventScript_277AA3 - compare_var_to_value VAR_RESULT, 8 + compare VAR_RESULT, 8 goto_eq OldaleTown_PokemonCenter_2F_EventScript_277B08 release return @@ -1397,7 +1397,7 @@ OldaleTown_PokemonCenter_2F_EventScript_277B8A:: @ 8277B8A checkflag FLAG_SYS_POKEDEX_GET goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_27733F specialvar VAR_RESULT, sub_80093CC - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq EventScript_277BB4 fadescreen 1 special sub_801A42C @@ -1496,7 +1496,7 @@ MossdeepCity_GameCorner_1F_EventScript_277C91:: @ 8277C91 message MossdeepCity_GameCorner_1F_Text_278CEB waitmessage specialvar VAR_RESULT, sub_80093CC - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MossdeepCity_GameCorner_1F_EventScript_277E48 delay 60 message MossdeepCity_GameCorner_1F_Text_278DAD @@ -1512,17 +1512,17 @@ MossdeepCity_GameCorner_1F_EventScript_277C91:: @ 8277C91 MossdeepCity_GameCorner_1F_EventScript_277CE9:: @ 8277CE9 setvar VAR_0x8005, 0 special sub_802C920 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MossdeepCity_GameCorner_1F_EventScript_277E55 msgbox MossdeepCity_GameCorner_1F_Text_278DD9, 4 fadescreen 1 setvar VAR_0x8005, 0 special sub_81B8958 waitstate - compare_var_to_value VAR_0x8004, 6 + compare VAR_0x8004, 6 goto_if 4, MossdeepCity_GameCorner_1F_EventScript_2772F9 call MossdeepCity_GameCorner_1F_EventScript_27134F - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MossdeepCity_GameCorner_1F_EventScript_2772F9 setvar VAR_0x8004, 4 goto MossdeepCity_GameCorner_1F_EventScript_277D81 @@ -1531,17 +1531,17 @@ MossdeepCity_GameCorner_1F_EventScript_277CE9:: @ 8277CE9 MossdeepCity_GameCorner_1F_EventScript_277D35:: @ 8277D35 setvar VAR_0x8005, 1 special sub_8027A5C - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MossdeepCity_GameCorner_1F_EventScript_277E55 msgbox MossdeepCity_GameCorner_1F_Text_278DD9, 4 fadescreen 1 setvar VAR_0x8005, 1 special sub_81B8958 waitstate - compare_var_to_value VAR_0x8004, 6 + compare VAR_0x8004, 6 goto_if 4, MossdeepCity_GameCorner_1F_EventScript_2772F9 call MossdeepCity_GameCorner_1F_EventScript_27134F - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MossdeepCity_GameCorner_1F_EventScript_2772F9 setvar VAR_0x8004, 6 goto MossdeepCity_GameCorner_1F_EventScript_277D81 @@ -1560,22 +1560,22 @@ MossdeepCity_GameCorner_1F_EventScript_277D81:: @ 8277D81 MossdeepCity_GameCorner_1F_EventScript_277DBE:: @ 8277DBE call MossdeepCity_GameCorner_1F_EventScript_277B30 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq MossdeepCity_GameCorner_1F_EventScript_277E0E - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_eq MossdeepCity_GameCorner_1F_EventScript_277D81 - compare_var_to_value VAR_RESULT, 8 + compare VAR_RESULT, 8 goto_eq MossdeepCity_GameCorner_1F_EventScript_277DBE release return MossdeepCity_GameCorner_1F_EventScript_277DE6:: @ 8277DE6 call MossdeepCity_GameCorner_1F_EventScript_277B35 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq MossdeepCity_GameCorner_1F_EventScript_277E0E - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_eq MossdeepCity_GameCorner_1F_EventScript_277D81 - compare_var_to_value VAR_RESULT, 8 + compare VAR_RESULT, 8 goto_eq MossdeepCity_GameCorner_1F_EventScript_277DE6 release return @@ -1608,11 +1608,11 @@ MossdeepCity_GameCorner_1F_EventScript_277E48:: @ 8277E48 MossdeepCity_GameCorner_1F_EventScript_277E55:: @ 8277E55 msgbox MossdeepCity_GameCorner_1F_Text_278E60, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MossdeepCity_GameCorner_1F_EventScript_2772F9 - compare_var_to_value VAR_0x8005, 0 + compare VAR_0x8005, 0 call_if 1, MossdeepCity_GameCorner_1F_EventScript_277E84 - compare_var_to_value VAR_0x8005, 1 + compare VAR_0x8005, 1 call_if 1, MossdeepCity_GameCorner_1F_EventScript_277E8D goto MossdeepCity_GameCorner_1F_EventScript_2772F9 end diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index ad828d7e0..bfe87dfc2 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -1,7 +1,7 @@ LilycoveCity_ContestLobby_EventScript_279CC5:: @ 8279CC5 lock faceplayer - compare_var_to_value VAR_0x408A, 0 + compare VAR_0x408A, 0 goto_if 5, LilycoveCity_ContestLobby_EventScript_279D13 checkflag FLAG_0x05F call_if 1, LilycoveCity_ContestLobby_EventScript_279CEA @@ -29,7 +29,7 @@ LilycoveCity_ContestLobby_EventScript_279D13:: @ 8279D13 LilycoveCity_ContestLobby_EventScript_279D2C:: @ 8279D2C giveitem_std ITEM_LUXURY_BALL - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_ContestLobby_EventScript_279D4B setvar VAR_0x408A, 0 closemessage @@ -87,19 +87,19 @@ LilycoveCity_ContestLobby_EventScript_279E09:: @ 8279E09 LilycoveCity_ContestLobby_EventScript_279E13:: @ 8279E13 msgbox LilycoveCity_ContestLobby_Text_27B44A, 4 - choosecontestpkmn - compare_var_to_value VAR_0x8004, 255 + choosecontestmon + compare VAR_0x8004, 255 goto_eq LilycoveCity_ContestLobby_EventScript_279E09 special sub_80F7F30 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_ContestLobby_EventScript_279F12 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_279F87 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_eq LilycoveCity_ContestLobby_EventScript_279F45 - compare_var_to_value VAR_RESULT, 3 + compare VAR_RESULT, 3 goto_eq LilycoveCity_ContestLobby_EventScript_279F69 - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 goto_eq LilycoveCity_ContestLobby_EventScript_279F78 end @@ -273,7 +273,7 @@ LinkContestRoom1_EventScript_27A097:: @ 827A097 return LinkContestRoom1_EventScript_27A0B1:: @ 827A0B1 - compare_var_to_value VAR_0x4088, 5 + compare VAR_0x4088, 5 goto_eq LinkContestRoom1_EventScript_27A0C7 lockall msgbox LinkContestRoom1_Text_27B711, 4 @@ -282,7 +282,7 @@ LinkContestRoom1_EventScript_27A0B1:: @ 827A0B1 LinkContestRoom1_EventScript_27A0C7:: @ 827A0C7 specialvar VAR_RESULT, sub_80F9160 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LinkContestRoom1_EventScript_27A0DE messageautoscroll LinkContestRoom1_Text_27B78F waitmessage @@ -306,7 +306,7 @@ LinkContestRoom1_EventScript_27A0F5:: @ 827A0F5 call LinkContestRoom1_EventScript_27A133 call LinkContestRoom1_EventScript_27A133 addvar VAR_0x8006, 1 - compare_var_to_value VAR_0x8006, 4 + compare VAR_0x8006, 4 goto_if 5, LinkContestRoom1_EventScript_27A0F5 call LinkContestRoom1_EventScript_27A230 setvar VAR_0x4001, 6 @@ -314,7 +314,7 @@ LinkContestRoom1_EventScript_27A0F5:: @ 827A0F5 LinkContestRoom1_EventScript_27A133:: @ 827A133 specialvar VAR_RESULT, sub_80F9160 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LinkContestRoom1_EventScript_27A144 return @@ -324,13 +324,13 @@ LinkContestRoom1_EventScript_27A144:: @ 827A144 return LinkContestRoom1_EventScript_27A149:: @ 827A149 - compare_var_to_value VAR_0x8006, 0 + compare VAR_0x8006, 0 goto_eq LinkContestRoom1_EventScript_27A176 - compare_var_to_value VAR_0x8006, 1 + compare VAR_0x8006, 1 goto_eq LinkContestRoom1_EventScript_27A18D - compare_var_to_value VAR_0x8006, 2 + compare VAR_0x8006, 2 goto_eq LinkContestRoom1_EventScript_27A1A4 - compare_var_to_value VAR_0x8006, 3 + compare VAR_0x8006, 3 goto_eq LinkContestRoom1_EventScript_27A1BB return @@ -393,7 +393,7 @@ LinkContestRoom1_EventScript_27A1D2:: @ 827A1D2 return LinkContestRoom1_EventScript_27A217:: @ 827A217 - compare_var_to_value VAR_0x4088, 5 + compare VAR_0x4088, 5 goto_eq LinkContestRoom1_EventScript_27A229 message LinkContestRoom1_Text_27B815 waitmessage @@ -421,14 +421,14 @@ LinkContestRoom1_EventScript_27A230:: @ 827A230 return LinkContestRoom1_EventScript_27A26C:: @ 827A26C - compare_var_to_value VAR_0x4088, 5 + compare VAR_0x4088, 5 goto_eq LinkContestRoom1_EventScript_27A280 msgbox LinkContestRoom1_Text_27B830, 4 return LinkContestRoom1_EventScript_27A280:: @ 827A280 specialvar VAR_RESULT, sub_80F9160 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LinkContestRoom1_EventScript_27A297 messageautoscroll LinkContestRoom1_Text_27B830 waitmessage @@ -447,7 +447,7 @@ LinkContestRoom1_EventScript_27A297:: @ 827A297 return LinkContestRoom1_EventScript_27A2B9:: @ 827A2B9 - compare_var_to_value VAR_0x4088, 5 + compare VAR_0x4088, 5 goto_eq LinkContestRoom1_EventScript_27A2CA message LinkContestRoom1_Text_27B8F2 return @@ -485,15 +485,15 @@ LinkContestRoom1_EventScript_27A2D5:: @ 827A2D5 LinkContestRoom1_EventScript_27A34F:: @ 827A34F special sub_80F82FC - compare_var_to_value VAR_0x4088, 1 + compare VAR_0x4088, 1 call_if 1, LinkContestRoom1_EventScript_27A454 - compare_var_to_value VAR_0x4088, 2 + compare VAR_0x4088, 2 call_if 1, LinkContestRoom1_EventScript_27A4B2 - compare_var_to_value VAR_0x4088, 3 + compare VAR_0x4088, 3 call_if 1, LinkContestRoom1_EventScript_27A510 - compare_var_to_value VAR_0x4088, 4 + compare VAR_0x4088, 4 call_if 1, LinkContestRoom1_EventScript_27A56E - compare_var_to_value VAR_0x4088, 5 + compare VAR_0x4088, 5 call_if 1, LinkContestRoom1_EventScript_27A5CC setvar VAR_0x4001, 9 setvar VAR_0x4002, 9 @@ -503,7 +503,7 @@ LinkContestRoom1_EventScript_27A34F:: @ 827A34F setvar VAR_0x4006, 9 setvar VAR_0x4007, 9 setvar VAR_0x4008, 9 - compare_var_to_value VAR_0x4000, 0 + compare VAR_0x4000, 0 call_if 2, LinkContestRoom1_EventScript_27A3E5 setvar VAR_0x4001, 0 setvar VAR_0x4002, 0 @@ -518,123 +518,123 @@ LinkContestRoom1_EventScript_27A34F:: @ 827A34F LinkContestRoom1_EventScript_27A3E5:: @ 827A3E5 setvar VAR_RESULT, 8 special sub_80F8FE8 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, LinkContestRoom1_EventScript_27A65A - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, LinkContestRoom1_EventScript_27A67E - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 call_if 1, LinkContestRoom1_EventScript_27A6A2 - compare_var_to_value VAR_RESULT, 3 + compare VAR_RESULT, 3 call_if 1, LinkContestRoom1_EventScript_27A6C6 - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 call_if 1, LinkContestRoom1_EventScript_27A6EA - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 call_if 1, LinkContestRoom1_EventScript_27A70E - compare_var_to_value VAR_RESULT, 6 + compare VAR_RESULT, 6 call_if 1, LinkContestRoom1_EventScript_27A732 - compare_var_to_value VAR_RESULT, 7 + compare VAR_RESULT, 7 call_if 1, LinkContestRoom1_EventScript_27A756 - compare_var_to_value VAR_0x4000, 0 + compare VAR_0x4000, 0 goto_if 2, LinkContestRoom1_EventScript_27A3E5 waitmovement 0 return LinkContestRoom1_EventScript_27A454:: @ 827A454 - compare_var_to_value VAR_0x8004, 80 + compare VAR_0x8004, 80 goto_if 2, LinkContestRoom1_EventScript_27A654 - compare_var_to_value VAR_0x8004, 70 + compare VAR_0x8004, 70 goto_if 2, LinkContestRoom1_EventScript_27A64E - compare_var_to_value VAR_0x8004, 60 + compare VAR_0x8004, 60 goto_if 2, LinkContestRoom1_EventScript_27A648 - compare_var_to_value VAR_0x8004, 50 + compare VAR_0x8004, 50 goto_if 2, LinkContestRoom1_EventScript_27A642 - compare_var_to_value VAR_0x8004, 40 + compare VAR_0x8004, 40 goto_if 2, LinkContestRoom1_EventScript_27A63C - compare_var_to_value VAR_0x8004, 30 + compare VAR_0x8004, 30 goto_if 2, LinkContestRoom1_EventScript_27A636 - compare_var_to_value VAR_0x8004, 20 + compare VAR_0x8004, 20 goto_if 2, LinkContestRoom1_EventScript_27A630 - compare_var_to_value VAR_0x8004, 10 + compare VAR_0x8004, 10 goto_if 2, LinkContestRoom1_EventScript_27A62A setvar VAR_0x4000, 0 return LinkContestRoom1_EventScript_27A4B2:: @ 827A4B2 - compare_var_to_value VAR_0x8004, 230 + compare VAR_0x8004, 230 goto_if 2, LinkContestRoom1_EventScript_27A654 - compare_var_to_value VAR_0x8004, 210 + compare VAR_0x8004, 210 goto_if 2, LinkContestRoom1_EventScript_27A64E - compare_var_to_value VAR_0x8004, 190 + compare VAR_0x8004, 190 goto_if 2, LinkContestRoom1_EventScript_27A648 - compare_var_to_value VAR_0x8004, 170 + compare VAR_0x8004, 170 goto_if 2, LinkContestRoom1_EventScript_27A642 - compare_var_to_value VAR_0x8004, 150 + compare VAR_0x8004, 150 goto_if 2, LinkContestRoom1_EventScript_27A63C - compare_var_to_value VAR_0x8004, 130 + compare VAR_0x8004, 130 goto_if 2, LinkContestRoom1_EventScript_27A636 - compare_var_to_value VAR_0x8004, 110 + compare VAR_0x8004, 110 goto_if 2, LinkContestRoom1_EventScript_27A630 - compare_var_to_value VAR_0x8004, 90 + compare VAR_0x8004, 90 goto_if 2, LinkContestRoom1_EventScript_27A62A setvar VAR_0x4000, 0 return LinkContestRoom1_EventScript_27A510:: @ 827A510 - compare_var_to_value VAR_0x8004, 380 + compare VAR_0x8004, 380 goto_if 2, LinkContestRoom1_EventScript_27A654 - compare_var_to_value VAR_0x8004, 350 + compare VAR_0x8004, 350 goto_if 2, LinkContestRoom1_EventScript_27A64E - compare_var_to_value VAR_0x8004, 320 + compare VAR_0x8004, 320 goto_if 2, LinkContestRoom1_EventScript_27A648 - compare_var_to_value VAR_0x8004, 290 + compare VAR_0x8004, 290 goto_if 2, LinkContestRoom1_EventScript_27A642 - compare_var_to_value VAR_0x8004, 260 + compare VAR_0x8004, 260 goto_if 2, LinkContestRoom1_EventScript_27A63C - compare_var_to_value VAR_0x8004, 230 + compare VAR_0x8004, 230 goto_if 2, LinkContestRoom1_EventScript_27A636 - compare_var_to_value VAR_0x8004, 200 + compare VAR_0x8004, 200 goto_if 2, LinkContestRoom1_EventScript_27A630 - compare_var_to_value VAR_0x8004, 170 + compare VAR_0x8004, 170 goto_if 2, LinkContestRoom1_EventScript_27A62A setvar VAR_0x4000, 0 return LinkContestRoom1_EventScript_27A56E:: @ 827A56E - compare_var_to_value VAR_0x8004, 600 + compare VAR_0x8004, 600 goto_if 2, LinkContestRoom1_EventScript_27A654 - compare_var_to_value VAR_0x8004, 560 + compare VAR_0x8004, 560 goto_if 2, LinkContestRoom1_EventScript_27A64E - compare_var_to_value VAR_0x8004, 520 + compare VAR_0x8004, 520 goto_if 2, LinkContestRoom1_EventScript_27A648 - compare_var_to_value VAR_0x8004, 480 + compare VAR_0x8004, 480 goto_if 2, LinkContestRoom1_EventScript_27A642 - compare_var_to_value VAR_0x8004, 440 + compare VAR_0x8004, 440 goto_if 2, LinkContestRoom1_EventScript_27A63C - compare_var_to_value VAR_0x8004, 400 + compare VAR_0x8004, 400 goto_if 2, LinkContestRoom1_EventScript_27A636 - compare_var_to_value VAR_0x8004, 360 + compare VAR_0x8004, 360 goto_if 2, LinkContestRoom1_EventScript_27A630 - compare_var_to_value VAR_0x8004, 320 + compare VAR_0x8004, 320 goto_if 2, LinkContestRoom1_EventScript_27A62A setvar VAR_0x4000, 0 return LinkContestRoom1_EventScript_27A5CC:: @ 827A5CC - compare_var_to_value VAR_0x8004, 600 + compare VAR_0x8004, 600 goto_if 2, LinkContestRoom1_EventScript_27A654 - compare_var_to_value VAR_0x8004, 550 + compare VAR_0x8004, 550 goto_if 2, LinkContestRoom1_EventScript_27A64E - compare_var_to_value VAR_0x8004, 500 + compare VAR_0x8004, 500 goto_if 2, LinkContestRoom1_EventScript_27A648 - compare_var_to_value VAR_0x8004, 450 + compare VAR_0x8004, 450 goto_if 2, LinkContestRoom1_EventScript_27A642 - compare_var_to_value VAR_0x8004, 400 + compare VAR_0x8004, 400 goto_if 2, LinkContestRoom1_EventScript_27A63C - compare_var_to_value VAR_0x8004, 300 + compare VAR_0x8004, 300 goto_if 2, LinkContestRoom1_EventScript_27A636 - compare_var_to_value VAR_0x8004, 200 + compare VAR_0x8004, 200 goto_if 2, LinkContestRoom1_EventScript_27A630 - compare_var_to_value VAR_0x8004, 100 + compare VAR_0x8004, 100 goto_if 2, LinkContestRoom1_EventScript_27A62A setvar VAR_0x4000, 0 return @@ -672,7 +672,7 @@ LinkContestRoom1_EventScript_27A654:: @ 827A654 return LinkContestRoom1_EventScript_27A65A:: @ 827A65A - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 goto_eq LinkContestRoom1_EventScript_27A67D applymovement 6, LinkContestRoom1_Movement_27AD11 playse SE_PIN @@ -685,7 +685,7 @@ LinkContestRoom1_EventScript_27A67D:: @ 827A67D return LinkContestRoom1_EventScript_27A67E:: @ 827A67E - compare_var_to_value VAR_0x4002, 1 + compare VAR_0x4002, 1 goto_eq LinkContestRoom1_EventScript_27A6A1 applymovement 12, LinkContestRoom1_Movement_27AD11 playse SE_PIN @@ -698,7 +698,7 @@ LinkContestRoom1_EventScript_27A6A1:: @ 827A6A1 return LinkContestRoom1_EventScript_27A6A2:: @ 827A6A2 - compare_var_to_value VAR_0x4003, 1 + compare VAR_0x4003, 1 goto_eq LinkContestRoom1_EventScript_27A6C5 applymovement 7, LinkContestRoom1_Movement_27AD11 playse SE_PIN @@ -711,7 +711,7 @@ LinkContestRoom1_EventScript_27A6C5:: @ 827A6C5 return LinkContestRoom1_EventScript_27A6C6:: @ 827A6C6 - compare_var_to_value VAR_0x4004, 1 + compare VAR_0x4004, 1 goto_eq LinkContestRoom1_EventScript_27A6E9 applymovement 8, LinkContestRoom1_Movement_27AD11 playse SE_PIN @@ -724,7 +724,7 @@ LinkContestRoom1_EventScript_27A6E9:: @ 827A6E9 return LinkContestRoom1_EventScript_27A6EA:: @ 827A6EA - compare_var_to_value VAR_0x4005, 1 + compare VAR_0x4005, 1 goto_eq LinkContestRoom1_EventScript_27A70D applymovement 9, LinkContestRoom1_Movement_27AD11 playse SE_PIN @@ -737,7 +737,7 @@ LinkContestRoom1_EventScript_27A70D:: @ 827A70D return LinkContestRoom1_EventScript_27A70E:: @ 827A70E - compare_var_to_value VAR_0x4006, 1 + compare VAR_0x4006, 1 goto_eq LinkContestRoom1_EventScript_27A731 applymovement 10, LinkContestRoom1_Movement_27AD11 playse SE_PIN @@ -750,7 +750,7 @@ LinkContestRoom1_EventScript_27A731:: @ 827A731 return LinkContestRoom1_EventScript_27A732:: @ 827A732 - compare_var_to_value VAR_0x4007, 1 + compare VAR_0x4007, 1 goto_eq LinkContestRoom1_EventScript_27A755 applymovement 11, LinkContestRoom1_Movement_27AD11 playse SE_PIN @@ -763,7 +763,7 @@ LinkContestRoom1_EventScript_27A755:: @ 827A755 return LinkContestRoom1_EventScript_27A756:: @ 827A756 - compare_var_to_value VAR_0x4008, 1 + compare VAR_0x4008, 1 goto_eq LinkContestRoom1_EventScript_27A779 applymovement 15, LinkContestRoom1_Movement_27AD11 playse SE_PIN @@ -845,14 +845,14 @@ LinkContestRoom1_EventScript_27A801:: @ 827A801 return LinkContestRoom1_EventScript_27A853:: @ 827A853 - compare_var_to_value VAR_0x4088, 5 + compare VAR_0x4088, 5 goto_eq LinkContestRoom1_EventScript_27A867 msgbox LinkContestRoom1_Text_27B904, 4 return LinkContestRoom1_EventScript_27A867:: @ 827A867 specialvar VAR_RESULT, sub_80F9160 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LinkContestRoom1_EventScript_27A87E messageautoscroll LinkContestRoom1_Text_27B904 waitmessage @@ -895,7 +895,7 @@ LinkContestRoom1_EventScript_27A8A5:: @ 827A8A5 return LinkContestRoom1_EventScript_27A8FB:: @ 827A8FB - compare_var_to_value VAR_0x4088, 5 + compare VAR_0x4088, 5 goto_eq LinkContestRoom1_EventScript_27A90F msgbox LinkContestRoom1_Text_27BA15, 4 return @@ -908,7 +908,7 @@ LinkContestRoom1_EventScript_27A90F:: @ 827A90F return LinkContestRoom1_EventScript_27A91E:: @ 827A91E - compare_var_to_value VAR_0x4088, 5 + compare VAR_0x4088, 5 goto_eq LinkContestRoom1_EventScript_27A932 msgbox LinkContestRoom1_Text_27BA30, 4 return @@ -921,7 +921,7 @@ LinkContestRoom1_EventScript_27A932:: @ 827A932 return LinkContestRoom1_EventScript_27A941:: @ 827A941 - compare_var_to_value VAR_0x4088, 5 + compare VAR_0x4088, 5 goto_eq LinkContestRoom1_EventScript_27A955 msgbox LinkContestRoom1_Text_27BAAC, 4 return @@ -934,7 +934,7 @@ LinkContestRoom1_EventScript_27A955:: @ 827A955 return LinkContestRoom1_EventScript_27A964:: @ 827A964 - compare_var_to_value VAR_0x4088, 5 + compare VAR_0x4088, 5 goto_eq LinkContestRoom1_EventScript_27A978 msgbox LinkContestRoom1_Text_27BB25, 4 return @@ -985,7 +985,7 @@ LinkContestRoom1_EventScript_27A9D4:: @ 827A9D4 return LinkContestRoom1_EventScript_27AA00:: @ 827AA00 - compare_var_to_value VAR_0x4088, 5 + compare VAR_0x4088, 5 goto_eq LinkContestRoom1_EventScript_27AA14 msgbox LinkContestRoom1_Text_27BB4C, 4 return @@ -998,7 +998,7 @@ LinkContestRoom1_EventScript_27AA14:: @ 827AA14 LinkContestRoom1_EventScript_27AA1B:: @ 827AA1B addvar VAR_0x4001, 1 lockall - compare_var_to_value VAR_0x4088, 1 + compare VAR_0x4088, 1 call_if 2, LinkContestRoom1_EventScript_27AA6F applymovement 9, LinkContestRoom1_Movement_27AD3B applymovement 12, LinkContestRoom1_Movement_27AD3F @@ -1008,7 +1008,7 @@ LinkContestRoom1_EventScript_27AA1B:: @ 827AA1B applymovement 11, LinkContestRoom1_Movement_27AD3F applymovement 6, LinkContestRoom1_Movement_27AD37 applymovement 8, LinkContestRoom1_Movement_27AD33 - compare_var_to_value VAR_0x4001, 4 + compare VAR_0x4001, 4 goto_if 5, LinkContestRoom1_EventScript_27AA1B delay 30 return @@ -1083,7 +1083,7 @@ LinkContestRoom1_EventScript_27AA6F:: @ 827AA6F return LinkContestRoom1_EventScript_27AB36:: @ 827AB36 - compare_var_to_value VAR_0x4088, 5 + compare VAR_0x4088, 5 goto_eq LinkContestRoom1_EventScript_27ABD8 call LinkContestRoom1_EventScript_27AB9E checkflag FLAG_0x002 @@ -1098,7 +1098,7 @@ LinkContestRoom1_EventScript_27AB36:: @ 827AB36 call LinkContestRoom1_EventScript_27AA1B delay 30 special sub_80F88E8 - compare_var_to_value VAR_0x8004, 1 + compare VAR_0x8004, 1 goto_eq LinkContestRoom1_EventScript_27ABD2 return @@ -1108,24 +1108,24 @@ LinkContestRoom1_EventScript_27AB82:: @ 827AB82 releaseall delay 90 special sub_80F88E8 - compare_var_to_value VAR_0x8004, 1 + compare VAR_0x8004, 1 goto_eq LinkContestRoom1_EventScript_27ABD2 return LinkContestRoom1_EventScript_27AB9E:: @ 827AB9E specialvar VAR_RESULT, sub_80F7F7C - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LinkContestRoom1_EventScript_27ABAF return LinkContestRoom1_EventScript_27ABAF:: @ 827ABAF special sub_80F831C - compare_var_to_value VAR_0x8005, 3 + compare VAR_0x8005, 3 goto_eq LinkContestRoom1_EventScript_27ABBE return LinkContestRoom1_EventScript_27ABBE:: @ 827ABBE - compare_var_to_value VAR_CONTEST_RANK, 3 + compare VAR_CONTEST_RANK, 3 goto_eq LinkContestRoom1_EventScript_27ABCD setflag FLAG_0x002 return @@ -1146,7 +1146,7 @@ LinkContestRoom1_EventScript_27ABD8:: @ 827ABD8 special sub_80F84B0 special sub_80F831C special sub_80F88E8 - compare_var_to_value VAR_0x8004, 1 + compare VAR_0x8004, 1 goto_eq LinkContestRoom1_EventScript_27ABF1 closemessage return @@ -1196,7 +1196,7 @@ LinkContestRoom1_EventScript_27AC51:: @ 827AC51 LinkContestRoom1_EventScript_27AC5E:: @ 827AC5E special sub_80F831C - compare_var_to_value VAR_0x8005, 3 + compare VAR_0x8005, 3 goto_eq LinkContestRoom1_EventScript_27AC77 lockall msgbox LinkContestRoom1_Text_27BB7A, 4 @@ -1204,12 +1204,12 @@ LinkContestRoom1_EventScript_27AC5E:: @ 827AC5E return LinkContestRoom1_EventScript_27AC77:: @ 827AC77 - compare_var_to_value VAR_0x4088, 2 + compare VAR_0x4088, 2 call_if 1, LinkContestRoom1_EventScript_27ABCE specialvar VAR_RESULT, sub_80F7F7C - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LinkContestRoom1_EventScript_27ACDF - compare_var_to_value VAR_CONTEST_RANK, 3 + compare VAR_CONTEST_RANK, 3 goto_eq LinkContestRoom1_EventScript_27ACBD lockall msgbox LinkContestRoom1_Text_27BB7A, 4 @@ -1226,7 +1226,7 @@ LinkContestRoom1_EventScript_27ACA8:: @ 827ACA8 LinkContestRoom1_EventScript_27ACBD:: @ 827ACBD giveitem_std ITEM_LUXURY_BALL - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LinkContestRoom1_EventScript_27ACA8 lockall msgbox LinkContestRoom1_Text_27BB7A, 4 @@ -1432,7 +1432,7 @@ LinkContestRoom1_Movement_27AD7E: @ 827AD7E LinkContestRoom1_EventScript_27AD80:: @ 827AD80 specialvar VAR_RESULT, sub_80F9134 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LinkContestRoom1_EventScript_27AD91 return @@ -1441,7 +1441,7 @@ LinkContestRoom1_EventScript_27AD91:: @ 827AD91 LilycoveCity_ContestLobby_EventScript_27AD92:: @ 827AD92 specialvar VAR_RESULT, sub_80F9134 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_27ADA3 return diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index 27e617128..7074951d7 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -3,11 +3,11 @@ Route117_EventScript_291C18:: @ 8291C18 faceplayer special GetDaycareMonNicknames specialvar VAR_RESULT, GetDaycareState - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route117_EventScript_291C4D - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_eq Route117_EventScript_291CD1 - compare_var_to_value VAR_RESULT, 3 + compare VAR_RESULT, 3 goto_eq Route117_EventScript_291CE8 msgbox Route117_Text_291FCF, 4 release @@ -15,10 +15,10 @@ Route117_EventScript_291C18:: @ 8291C18 Route117_EventScript_291C4D:: @ 8291C4D msgbox Route117_Text_29205D, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route117_EventScript_291C83 msgbox Route117_Text_2922C6, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route117_EventScript_291C83 msgbox Route117_Text_292149, 4 clearflag FLAG_PENDING_DAYCARE_EGG @@ -28,7 +28,7 @@ Route117_EventScript_291C4D:: @ 8291C4D Route117_EventScript_291C83:: @ 8291C83 specialvar VAR_RESULT, CalculatePlayerPartyCount - compare_var_to_value VAR_RESULT, 6 + compare VAR_RESULT, 6 goto_if 5, Route117_EventScript_291C9D msgbox Route117_Text_29216A, 4 release @@ -47,7 +47,7 @@ Route117_EventScript_291C9D:: @ 8291C9D Route117_EventScript_291CB7:: @ 8291CB7 specialvar VAR_RESULT, sub_8071614 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, Route117_EventScript_291CC8 return @@ -81,14 +81,14 @@ Route117_PokemonDayCare_EventScript_291D11:: @ 8291D11 lock faceplayer specialvar VAR_RESULT, GetDaycareState - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route117_PokemonDayCare_EventScript_291E0B - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_eq Route117_PokemonDayCare_EventScript_291E2F - compare_var_to_value VAR_RESULT, 3 + compare VAR_RESULT, 3 goto_eq Route117_PokemonDayCare_EventScript_291F5C msgbox Route117_PokemonDayCare_Text_2922F4, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route117_PokemonDayCare_EventScript_291D56 msgbox Route117_PokemonDayCare_Text_292416, 4 release @@ -96,19 +96,19 @@ Route117_PokemonDayCare_EventScript_291D11:: @ 8291D11 Route117_PokemonDayCare_EventScript_291D56:: @ 8291D56 specialvar VAR_RESULT, CountPartyNonEggMons - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route117_PokemonDayCare_EventScript_291DED specialvar VAR_RESULT, sub_80722E0 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_eq Route117_PokemonDayCare_EventScript_291E01 msgbox Route117_PokemonDayCare_Text_292349, 4 fadescreen 1 special ChooseSendDaycareMon waitstate - compare_var_to_value VAR_0x8004, 255 + compare VAR_0x8004, 255 goto_eq Route117_PokemonDayCare_EventScript_291DCA specialvar VAR_RESULT, CountPartyAliveNonEggMons_IgnoreVar0x8004Slot - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route117_PokemonDayCare_EventScript_291DF7 specialvar VAR_0x8005, GetSelectedMonNickAndSpecies waitse @@ -118,7 +118,7 @@ Route117_PokemonDayCare_EventScript_291D56:: @ 8291D56 special StoreSelectedPokemonInDaycare incrementgamestat 47 specialvar VAR_RESULT, GetDaycareState - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_eq Route117_PokemonDayCare_EventScript_291DD4 release end @@ -130,7 +130,7 @@ Route117_PokemonDayCare_EventScript_291DCA:: @ 8291DCA Route117_PokemonDayCare_EventScript_291DD4:: @ 8291DD4 msgbox Route117_PokemonDayCare_Text_2923AF, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route117_PokemonDayCare_EventScript_291D56 goto Route117_PokemonDayCare_EventScript_291DCA end @@ -161,7 +161,7 @@ Route117_PokemonDayCare_EventScript_291E15:: @ 8291E15 Route117_PokemonDayCare_EventScript_291E1E:: @ 8291E1E specialvar VAR_RESULT, GetNumLevelsGainedFromDaycare - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 5, Route117_PokemonDayCare_EventScript_291E15 return @@ -170,26 +170,26 @@ Route117_PokemonDayCare_EventScript_291E2F:: @ 8291E2F setvar VAR_0x8004, 0 call Route117_PokemonDayCare_EventScript_291E1E msgbox Route117_PokemonDayCare_Text_2923AF, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route117_PokemonDayCare_EventScript_291D56 msgbox Route117_PokemonDayCare_Text_2925F6, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route117_PokemonDayCare_EventScript_291E6D goto Route117_PokemonDayCare_EventScript_291DCA end Route117_PokemonDayCare_EventScript_291E6D:: @ 8291E6D specialvar VAR_RESULT, CalculatePlayerPartyCount - compare_var_to_value VAR_RESULT, 6 + compare VAR_RESULT, 6 goto_eq Route117_PokemonDayCare_EventScript_291F3D specialvar VAR_RESULT, GetDaycareState setvar VAR_0x8004, 0 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_eq Route117_PokemonDayCare_EventScript_291EAC special ShowDaycareLevelMenu waitstate copyvar VAR_0x8004, VAR_RESULT - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_eq Route117_PokemonDayCare_EventScript_291DCA goto Route117_PokemonDayCare_EventScript_291EAC end @@ -197,14 +197,14 @@ Route117_PokemonDayCare_EventScript_291E6D:: @ 8291E6D Route117_PokemonDayCare_EventScript_291EAC:: @ 8291EAC special GetDaycareCost msgbox Route117_PokemonDayCare_Text_292549, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route117_PokemonDayCare_EventScript_291EC8 goto Route117_PokemonDayCare_EventScript_291DCA end Route117_PokemonDayCare_EventScript_291EC8:: @ 8291EC8 specialvar VAR_RESULT, IsEnoughForCostInVar0x8005 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route117_PokemonDayCare_EventScript_291EE2 msgbox Route117_PokemonDayCare_Text_292432, 4 release @@ -222,14 +222,14 @@ Route117_PokemonDayCare_EventScript_291EE2:: @ 8291EE2 msgbox Route117_PokemonDayCare_Text_292593, 4 waitmoncry specialvar VAR_RESULT, GetDaycareState - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_eq Route117_PokemonDayCare_EventScript_291F24 goto Route117_PokemonDayCare_EventScript_291DCA end Route117_PokemonDayCare_EventScript_291F24:: @ 8291F24 msgbox Route117_PokemonDayCare_Text_29244F, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route117_PokemonDayCare_EventScript_291E6D goto Route117_PokemonDayCare_EventScript_291DCA end @@ -271,7 +271,7 @@ Route117_PokemonDayCare_EventScript_291F5C:: @ 8291F5C setvar VAR_0x8004, 1 call Route117_PokemonDayCare_EventScript_291E1E msgbox Route117_PokemonDayCare_Text_2925F6, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route117_PokemonDayCare_EventScript_291E6D msgbox Route117_PokemonDayCare_Text_292476, 4 release @@ -280,7 +280,7 @@ Route117_PokemonDayCare_EventScript_291F5C:: @ 8291F5C Route117_PokemonDayCare_EventScript_291F95:: @ 8291F95 special ShowDaycareLevelMenu waitstate - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_eq Route117_PokemonDayCare_EventScript_291DCA copyvar VAR_0x8004, VAR_RESULT specialvar VAR_RESULT, TakePokemonFromDaycare diff --git a/data/scripts/field_move_scripts.inc b/data/scripts/field_move_scripts.inc index 76f2aac6b..44631cc20 100644 --- a/data/scripts/field_move_scripts.inc +++ b/data/scripts/field_move_scripts.inc @@ -13,13 +13,13 @@ Route123_EventScript_2906BB:: @ 82906BB checkflag FLAG_BADGE01_GET goto_if 0, Route103_EventScript_290721 checkpartymove MOVE_CUT - compare_var_to_value VAR_RESULT, 6 + compare VAR_RESULT, 6 goto_eq Route103_EventScript_290721 setfieldeffectargument 0, VAR_RESULT bufferpartymonnick 0, VAR_RESULT buffermovename 1, MOVE_CUT msgbox Route103_Text_29072E, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route103_EventScript_29072B msgbox Route103_Text_290771, 4 closemessage @@ -87,13 +87,13 @@ VictoryRoad_B1F_EventScript_2907A6:: @ 82907A6 checkflag FLAG_BADGE03_GET goto_if 0, Route111_EventScript_29082D checkpartymove MOVE_ROCK_SMASH - compare_var_to_value VAR_RESULT, 6 + compare VAR_RESULT, 6 goto_eq Route111_EventScript_29082D setfieldeffectargument 0, VAR_RESULT bufferpartymonnick 0, VAR_RESULT buffermovename 1, MOVE_ROCK_SMASH msgbox Route111_Text_29083A, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route111_EventScript_290837 msgbox Route111_Text_290771, 4 closemessage @@ -114,10 +114,10 @@ Route111_EventScript_2907FB:: @ 82907FB waitmovement 0 removeobject VAR_LAST_TALKED specialvar VAR_RESULT, sub_81393FC - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route111_EventScript_290829 special RockSmashWildEncounter - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route111_EventScript_290829 waitstate releaseall @@ -165,11 +165,11 @@ VictoryRoad_B1F_EventScript_2908BA:: @ 82908BA checkflag FLAG_SYS_USE_STRENGTH goto_eq FieryPath_EventScript_29091F checkpartymove MOVE_STRENGTH - compare_var_to_value VAR_RESULT, 6 + compare VAR_RESULT, 6 goto_eq FieryPath_EventScript_290915 setfieldeffectargument 0, VAR_RESULT msgbox FieryPath_Text_29092C, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq FieryPath_EventScript_290929 closemessage dofieldeffect 40 @@ -226,12 +226,12 @@ FieryPath_Text_290A16: @ 8290A16 EventScript_290A49:: @ 8290A49 lockall checkpartymove MOVE_WATERFALL - compare_var_to_value VAR_RESULT, 6 + compare VAR_RESULT, 6 goto_eq EventScript_290A84 bufferpartymonnick 0, VAR_RESULT setfieldeffectargument 0, VAR_RESULT msgbox Text_290AC3, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq EventScript_290A8C msgbox Text_290AFC, 4 dofieldeffect 43 @@ -261,13 +261,13 @@ Text_290AFC: @ 8290AFC EventScript_290B0F:: @ 8290B0F lockall checkpartymove MOVE_DIVE - compare_var_to_value VAR_RESULT, 6 + compare VAR_RESULT, 6 goto_eq EventScript_290B4E bufferpartymonnick 0, VAR_RESULT setfieldeffectargument 0, VAR_RESULT setfieldeffectargument 1, 1 msgbox Text_290BE8, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq EventScript_290B58 msgbox Text_290C1A, 4 dofieldeffect 44 @@ -286,13 +286,13 @@ EventScript_290B58:: @ 8290B58 EventScript_290B5A:: @ 8290B5A lockall checkpartymove MOVE_DIVE - compare_var_to_value VAR_RESULT, 6 + compare VAR_RESULT, 6 goto_eq EventScript_290B99 bufferpartymonnick 0, VAR_RESULT setfieldeffectargument 0, VAR_RESULT setfieldeffectargument 1, 1 msgbox Text_290C6E, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq EventScript_290BA8 msgbox Text_290C1A, 4 dofieldeffect 44 diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc index d4b05a096..269ef2530 100644 --- a/data/scripts/gabby_and_ty.inc +++ b/data/scripts/gabby_and_ty.inc @@ -1,7 +1,7 @@ EventScript_28CCAA:: @ 828CCAA setvar VAR_0x8005, 8 special InterviewBefore - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq EventScript_28CCC6 setvar VAR_0x8005, 8 special InterviewAfter @@ -214,11 +214,11 @@ Route120_EventScript_28CF36:: @ 828CF36 Route111_EventScript_28CF56:: @ 828CF56 special GabbyAndTyBeforeInterview special GabbyAndTySetScriptVarsToFieldObjectLocalIds - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if 1, Route111_EventScript_28CF94 - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 call_if 1, Route111_EventScript_28CF9F - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if 1, Route111_EventScript_28CFB1 checkflag FLAG_0x001 goto_eq Route111_EventScript_28D0EE @@ -248,16 +248,16 @@ Route118_EventScript_28CFC3:: @ 828CFC3 Route120_EventScript_28CFC3:: @ 828CFC3 special GabbyAndTyBeforeInterview special GabbyAndTySetScriptVarsToFieldObjectLocalIds - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if 1, Route111_EventScript_28CF94 - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 call_if 1, Route111_EventScript_28CF9F - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if 1, Route111_EventScript_28CFB1 checkflag FLAG_0x001 goto_eq Route111_EventScript_28D0EE specialvar VAR_RESULT, GabbyAndTyGetLastQuote - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route111_EventScript_28D053 msgbox Route111_Text_28B137, 4 specialvar VAR_RESULT, GabbyAndTyGetLastBattleTrivia @@ -312,14 +312,14 @@ Route111_EventScript_28D099:: @ 828D099 end Route111_EventScript_28D0A7:: @ 828D0A7 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route111_EventScript_28D0E1 msgbox Route111_Text_28B433, 4 setvar VAR_0x8004, 10 call Route111_EventScript_271E7C lock faceplayer - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route111_EventScript_28D0E1 msgbox Route111_Text_28B4AB, 4 special GabbyAndTyAfterInterview diff --git a/data/scripts/maps/AbandonedShip_CaptainsOffice.inc b/data/scripts/maps/AbandonedShip_CaptainsOffice.inc index 97034e97a..5b3941dd2 100644 --- a/data/scripts/maps/AbandonedShip_CaptainsOffice.inc +++ b/data/scripts/maps/AbandonedShip_CaptainsOffice.inc @@ -7,7 +7,7 @@ AbandonedShip_CaptainsOffice_EventScript_2387E2:: @ 82387E2 checkflag FLAG_0x126 goto_eq AbandonedShip_CaptainsOffice_EventScript_23881A checkitem ITEM_SCANNER, 1 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq AbandonedShip_CaptainsOffice_EventScript_238810 checkflag FLAG_0x436 goto_eq AbandonedShip_CaptainsOffice_EventScript_23881A diff --git a/data/scripts/maps/AbandonedShip_Corridors_B1F.inc b/data/scripts/maps/AbandonedShip_Corridors_B1F.inc index 72784cac7..3f019f4d8 100644 --- a/data/scripts/maps/AbandonedShip_Corridors_B1F.inc +++ b/data/scripts/maps/AbandonedShip_Corridors_B1F.inc @@ -31,7 +31,7 @@ AbandonedShip_Corridors_B1F_EventScript_237DC8:: @ 8237DC8 checkflag FLAG_0x0EF goto_eq AbandonedShip_Corridors_B1F_EventScript_237E09 checkitem ITEM_STORAGE_KEY, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq AbandonedShip_Corridors_B1F_EventScript_237DFF msgbox AbandonedShip_Corridors_B1F_Text_237F4B, 4 playse SE_PIN diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc b/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc index b21bcfa7a..b1bca85aa 100644 --- a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc +++ b/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc @@ -63,7 +63,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_238A19:: @ 8238A19 checkflag FLAG_0x0F0 goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B1D checkitem ITEM_ROOM_1_KEY, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238AF5 msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, 4 playse SE_PIN @@ -79,7 +79,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_238A50:: @ 8238A50 checkflag FLAG_0x0F1 goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B1D checkitem ITEM_ROOM_2_KEY, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238AFF msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, 4 playse SE_PIN @@ -95,7 +95,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_238A87:: @ 8238A87 checkflag FLAG_0x0F2 goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B1D checkitem ITEM_ROOM_4_KEY, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B09 msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, 4 playse SE_PIN @@ -111,7 +111,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_238ABE:: @ 8238ABE checkflag FLAG_0x0F3 goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B1D checkitem ITEM_ROOM_6_KEY, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B13 msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, 4 playse SE_PIN diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc b/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc index cf77399b1..23532b275 100644 --- a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc +++ b/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc @@ -10,11 +10,11 @@ AbandonedShip_HiddenFloorRooms_EventScript_238C59:: @ 8238C59 setvar VAR_0x4001, 1 getplayerxy VAR_0x4002, VAR_0x4003 setvar VAR_0x4004, 1 - compare_var_to_value VAR_0x4002, 21 + compare VAR_0x4002, 21 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_238CD1 - compare_var_to_value VAR_0x4002, 36 + compare VAR_0x4002, 36 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_238CD7 - compare_var_to_value VAR_0x4003, 2 + compare VAR_0x4003, 2 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_238CDD switch VAR_0x4004 case 1, AbandonedShip_HiddenFloorRooms_EventScript_238CE3 @@ -44,7 +44,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_238CE3:: @ 8238CE3 setfieldeffectargument 2, 0 dofieldeffect 54 specialvar VAR_RESULT, sub_81392F8 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_238DD3 waitfieldeffect 54 delay 10 @@ -55,10 +55,10 @@ AbandonedShip_HiddenFloorRooms_EventScript_238D0C:: @ 8238D0C AbandonedShip_HiddenFloorRooms_EventScript_238D0D:: @ 8238D0D specialvar VAR_RESULT, sub_81392AC - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq AbandonedShip_HiddenFloorRooms_EventScript_238D32 delay 20 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_238DB3 waitfieldeffect 54 delay 10 @@ -78,7 +78,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_238D33:: @ 8238D33 setfieldeffectargument 2, 0 dofieldeffect 54 specialvar VAR_RESULT, sub_8139320 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_238DE3 waitfieldeffect 54 delay 10 @@ -99,7 +99,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_238D6B:: @ 8238D6B setfieldeffectargument 2, 0 dofieldeffect 54 specialvar VAR_RESULT, sub_81392D4 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_238DC3 waitfieldeffect 54 delay 10 diff --git a/data/scripts/maps/AbandonedShip_Rooms2_1F.inc b/data/scripts/maps/AbandonedShip_Rooms2_1F.inc index 7d86c6f3f..ab710546b 100644 --- a/data/scripts/maps/AbandonedShip_Rooms2_1F.inc +++ b/data/scripts/maps/AbandonedShip_Rooms2_1F.inc @@ -3,8 +3,8 @@ AbandonedShip_Rooms2_1F_MapScripts:: @ 82380A6 AbandonedShip_Rooms2_1F_EventScript_2380A7:: @ 82380A7 trainerbattle 6, TRAINER_KIRA_AND_DAN_1, 0, AbandonedShip_Rooms2_1F_Text_23819D, AbandonedShip_Rooms2_1F_Text_2381DA, AbandonedShip_Rooms2_1F_Text_238257, AbandonedShip_Rooms2_1F_EventScript_2380D7 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq AbandonedShip_Rooms2_1F_EventScript_2380F0 msgbox AbandonedShip_Rooms2_1F_Text_23820F, 4 release @@ -26,8 +26,8 @@ AbandonedShip_Rooms2_1F_EventScript_2380F0:: @ 82380F0 AbandonedShip_Rooms2_1F_EventScript_23810B:: @ 823810B trainerbattle 6, TRAINER_KIRA_AND_DAN_1, 0, AbandonedShip_Rooms2_1F_Text_2382A4, AbandonedShip_Rooms2_1F_Text_2382F4, AbandonedShip_Rooms2_1F_Text_23836F, AbandonedShip_Rooms2_1F_EventScript_23813B - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq AbandonedShip_Rooms2_1F_EventScript_238154 msgbox AbandonedShip_Rooms2_1F_Text_23830A, 4 release diff --git a/data/scripts/maps/AbandonedShip_Rooms_1F.inc b/data/scripts/maps/AbandonedShip_Rooms_1F.inc index 025b497dd..00fde5ccb 100644 --- a/data/scripts/maps/AbandonedShip_Rooms_1F.inc +++ b/data/scripts/maps/AbandonedShip_Rooms_1F.inc @@ -12,8 +12,8 @@ AbandonedShip_Rooms_1F_EventScript_237A9C:: @ 8237A9C AbandonedShip_Rooms_1F_EventScript_237AB3:: @ 8237AB3 trainerbattle 2, TRAINER_THALIA_1, 0, AbandonedShip_Rooms_1F_Text_237B76, AbandonedShip_Rooms_1F_Text_237BB8, AbandonedShip_Rooms_1F_EventScript_237ADF - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq AbandonedShip_Rooms_1F_EventScript_237AFE msgbox AbandonedShip_Rooms_1F_Text_237BDB, 4 release diff --git a/data/scripts/maps/AncientTomb.inc b/data/scripts/maps/AncientTomb.inc index 85a1d708d..f97c3fc5a 100644 --- a/data/scripts/maps/AncientTomb.inc +++ b/data/scripts/maps/AncientTomb.inc @@ -11,7 +11,7 @@ AncientTomb_MapScript1_238FC3: @ 8238FC3 AncientTomb_EventScript_238FCD:: @ 8238FCD specialvar VAR_RESULT, sub_8138B80 - compare_var_to_value VAR_RESULT, 7 + compare VAR_RESULT, 7 goto_if 5, AncientTomb_EventScript_27374E removeobject VAR_LAST_TALKED return @@ -72,15 +72,15 @@ AncientTomb_EventScript_23905A:: @ 823905A waitmoncry setwildbattle SPECIES_REGISTEEL, 40, ITEM_NONE setflag FLAG_SYS_CTRL_OBJ_DELETE - special sub_80B0A74 + special StartRegiBattle waitstate clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, sub_8138B80 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq AncientTomb_EventScript_2390A1 - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 goto_eq AncientTomb_EventScript_2390AA - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_eq AncientTomb_EventScript_2390AA setflag FLAG_0x1BD release diff --git a/data/scripts/maps/AquaHideout_B1F.inc b/data/scripts/maps/AquaHideout_B1F.inc index be50d205d..cf59bdacc 100644 --- a/data/scripts/maps/AquaHideout_B1F.inc +++ b/data/scripts/maps/AquaHideout_B1F.inc @@ -10,7 +10,7 @@ AquaHideout_B1F_MapScript1_2339B2: @ 82339B2 AquaHideout_B1F_EventScript_2339BC:: @ 82339BC specialvar VAR_RESULT, sub_8138B80 - compare_var_to_value VAR_RESULT, 7 + compare VAR_RESULT, 7 goto_if 5, AquaHideout_B1F_EventScript_27374E removeobject VAR_LAST_TALKED return @@ -42,11 +42,11 @@ AquaHideout_B1F_EventScript_2339EB:: @ 82339EB dowildbattle clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, sub_8138B80 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq AquaHideout_B1F_EventScript_233A2F - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 goto_eq AquaHideout_B1F_EventScript_233A2F - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_eq AquaHideout_B1F_EventScript_233A2F setflag FLAG_0x1C4 release @@ -69,11 +69,11 @@ AquaHideout_B1F_EventScript_233A38:: @ 8233A38 dowildbattle clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, sub_8138B80 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq AquaHideout_B1F_EventScript_233A7C - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 goto_eq AquaHideout_B1F_EventScript_233A7C - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_eq AquaHideout_B1F_EventScript_233A7C setflag FLAG_0x1C5 release diff --git a/data/scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc index 27886b8a5..3bc582c93 100644 --- a/data/scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc @@ -17,9 +17,9 @@ BattleFrontier_BattleArenaBattleRoom_MapScript1_2574A0: @ 82574A0 BattleFrontier_BattleArenaBattleRoom_EventScript_2574AE:: @ 82574AE checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_2574C6 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_2574CC return @@ -43,7 +43,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_2574DC:: @ 82574DC setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 special sub_81A1780 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_25752E applymovement 5, BattleFrontier_BattleArenaBattleRoom_Movement_257C08 applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BEB @@ -143,31 +143,31 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257630:: @ 8257630 special sub_81A1780 playfanfare BGM_ME_ASA waitfanfare - special sp000_heal_pokemon + special HealPlayerParty BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0:: @ 82576B0 setvar VAR_0x8004, 9 special sub_81A1780 copyvar VAR_0x400F, VAR_RESULT - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattleArenaBattleRoom_EventScript_2578BC setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 special sub_81A1780 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, BattleFrontier_BattleArenaBattleRoom_EventScript_257870 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 call_if 1, BattleFrontier_BattleArenaBattleRoom_EventScript_257877 - compare_var_to_value VAR_RESULT, 3 + compare VAR_RESULT, 3 call_if 1, BattleFrontier_BattleArenaBattleRoom_EventScript_25787E - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 call_if 1, BattleFrontier_BattleArenaBattleRoom_EventScript_257885 - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 call_if 1, BattleFrontier_BattleArenaBattleRoom_EventScript_25788C - compare_var_to_value VAR_RESULT, 6 + compare VAR_RESULT, 6 call_if 1, BattleFrontier_BattleArenaBattleRoom_EventScript_257893 call BattleFrontier_BattleArenaBattleRoom_EventScript_23E8E0 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257768 multichoice 19, 4, 103, 1 switch VAR_RESULT @@ -275,7 +275,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_25789A:: @ 825789A end BattleFrontier_BattleArenaBattleRoom_EventScript_2578BC:: @ 82578BC - compare_var_to_value VAR_0x4002, 1 + compare VAR_0x4002, 1 goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_2578D4 msgbox BattleFrontier_BattleArenaBattleRoom_Text_257F45, 4 setvar VAR_0x4002, 1 @@ -284,7 +284,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_2578D4:: @ 82578D4 message BattleFrontier_BattleArenaBattleRoom_Text_257FBB waitmessage call BattleFrontier_BattleArenaBattleRoom_EventScript_23E8E0 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_25792B multichoice 19, 4, 103, 1 switch VAR_RESULT @@ -333,7 +333,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257961:: @ 8257961 setvar VAR_0x8004, 1 setvar VAR_0x8005, 7 special sub_81A1780 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattleArenaBattleRoom_EventScript_257A3F msgbox BattleFrontier_BattleArenaBattleRoom_Text_25801C, 4 closemessage @@ -351,7 +351,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257961:: @ 8257961 BattleFrontier_BattleArenaBattleRoom_EventScript_257A3F:: @ 8257A3F msgbox BattleFrontier_BattleArenaBattleRoom_Text_25810D, 4 call BattleFrontier_BattleArenaBattleRoom_EventScript_257B5E - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257A5C goto BattleFrontier_BattleArenaBattleRoom_EventScript_2575DB @@ -359,7 +359,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257A5C:: @ 8257A5C call BattleFrontier_BattleArenaBattleRoom_EventScript_257BA9 setvar VAR_0x8004, 12 special sub_81A1780 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattleArenaBattleRoom_EventScript_257852 applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BF1 waitmovement 0 @@ -377,7 +377,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257AA5:: @ 8257AA5 setvar VAR_0x8004, 1 setvar VAR_0x8005, 7 special sub_81A1780 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattleArenaBattleRoom_EventScript_257AF8 msgbox BattleFrontier_BattleArenaBattleRoom_Text_258213, 4 closemessage @@ -395,7 +395,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257AA5:: @ 8257AA5 BattleFrontier_BattleArenaBattleRoom_EventScript_257AF8:: @ 8257AF8 msgbox BattleFrontier_BattleArenaBattleRoom_Text_2582F9, 4 call BattleFrontier_BattleArenaBattleRoom_EventScript_257B5E - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257B15 goto BattleFrontier_BattleArenaBattleRoom_EventScript_2575DB @@ -403,7 +403,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257B15:: @ 8257B15 call BattleFrontier_BattleArenaBattleRoom_EventScript_257BA9 setvar VAR_0x8004, 12 special sub_81A1780 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257852 applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BF1 waitmovement 0 @@ -430,14 +430,14 @@ FallarborTown_BattleTentBattleRoom_EventScript_257B6C:: @ 8257B6C setvar VAR_0x8005, 6 setvar VAR_0x8006, 0 special sub_81A1780 - special sp000_heal_pokemon + special HealPlayerParty setvar VAR_0x8004, 5 setvar VAR_0x8005, 0 special sub_8163AC4 waitstate setvar VAR_0x8004, 18 special sub_81A1780 - special sp000_heal_pokemon + special HealPlayerParty setvar VAR_0x8004, 21 special sub_81A1780 return diff --git a/data/scripts/maps/BattleFrontier_BattleArenaLobby.inc b/data/scripts/maps/BattleFrontier_BattleArenaLobby.inc index dbd4d2db6..303a2c4c9 100644 --- a/data/scripts/maps/BattleFrontier_BattleArenaLobby.inc +++ b/data/scripts/maps/BattleFrontier_BattleArenaLobby.inc @@ -49,7 +49,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255CCF:: @ 8255CCF lockall setvar VAR_0x8004, 10 special sub_81A1780 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleArenaLobby_EventScript_255CF0 msgbox BattleFrontier_BattleArenaLobby_Text_2568E7, 4 goto BattleFrontier_BattleArenaLobby_EventScript_255CF8 @@ -90,14 +90,14 @@ BattleFrontier_BattleArenaLobby_EventScript_255D59:: @ 8255D59 setvar VAR_0x8004, 8 special sub_81A1780 special copy_player_party_from_sav1 - special sp000_heal_pokemon + special HealPlayerParty setvar VAR_0x8004, 3 setvar VAR_0x8005, 0 special sub_81A5238 playse SE_SAVE waitse call BattleFrontier_BattleArenaLobby_EventScript_23E8E0 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleArenaLobby_EventScript_255DBF message BattleFrontier_BattleArenaLobby_Text_256B19 waitmessage @@ -156,7 +156,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255E47:: @ 8255E47 case 127, BattleFrontier_BattleArenaLobby_EventScript_255FFB setvar VAR_0x8004, 15 special sub_81A1780 - compare_var_to_value VAR_0x8004, 1 + compare VAR_0x8004, 1 goto_eq BattleFrontier_BattleArenaLobby_EventScript_255FAC setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 @@ -169,7 +169,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255E47:: @ 8255E47 setvar VAR_0x8005, 3 special sub_80F9490 waitstate - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleArenaLobby_EventScript_255FF8 msgbox BattleFrontier_BattleArenaLobby_Text_2564CE, 5 switch VAR_RESULT @@ -201,7 +201,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255EE8:: @ 8255EE8 delay 2 call BattleFrontier_BattleArenaLobby_EventScript_27134F setvar VAR_0x4000, 255 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleArenaLobby_EventScript_255FE1 BattleFrontier_BattleArenaLobby_EventScript_255F54:: @ 8255F54 @@ -214,9 +214,9 @@ BattleFrontier_BattleArenaLobby_EventScript_255F54:: @ 8255F54 setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 special sub_81A1780 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, BattleFrontier_BattleArenaLobby_EventScript_256005 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, BattleFrontier_BattleArenaLobby_EventScript_256050 warp BATTLE_FRONTIER_BATTLE_ARENA_CORRIDOR, 255, 9, 13 setvar VAR_0x4000, 0 diff --git a/data/scripts/maps/BattleFrontier_BattleDomeBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleDomeBattleRoom.inc index 963e8e6c2..9fb734a71 100644 --- a/data/scripts/maps/BattleFrontier_BattleDomeBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattleDomeBattleRoom.inc @@ -12,7 +12,7 @@ BattleFrontier_BattleDomeBattleRoom_MapScript1_24BCB1: @ 824BCB1 setvar VAR_0x8005, 2 special sub_81A1780 copyvar VAR_0x400F, VAR_RESULT - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C919 call BattleFrontier_BattleDomeBattleRoom_EventScript_24BCDC end @@ -20,9 +20,9 @@ BattleFrontier_BattleDomeBattleRoom_MapScript1_24BCB1: @ 824BCB1 BattleFrontier_BattleArenaBattleRoom_EventScript_24BCDC:: @ 824BCDC BattleFrontier_BattleDomeBattleRoom_EventScript_24BCDC:: @ 824BCDC checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BCF4 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BCFA return @@ -41,7 +41,7 @@ BattleFrontier_BattleDomeBattleRoom_MapScript2_24BD00: @ 824BD00 BattleFrontier_BattleDomeBattleRoom_EventScript_24BD0A:: @ 824BD0A lockall call BattleFrontier_BattleDomeBattleRoom_EventScript_24C1BD - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C938 applymovement 1, BattleFrontier_BattleDomeBattleRoom_Movement_2725B4 waitmovement 0 @@ -49,9 +49,9 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BD0A:: @ 824BD0A msgbox BattleFrontier_BattleDomeBattleRoom_Text_24C970, 4 closemessage showobjectat 13, BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM - compare_var_to_value VAR_0x400F, 3 + compare VAR_0x400F, 3 goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24BD4E - compare_var_to_value VAR_0x400E, 0 + compare VAR_0x400E, 0 goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24BD5A BattleFrontier_BattleDomeBattleRoom_EventScript_24BD4E:: @ 824BD4E @@ -65,9 +65,9 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BD61:: @ 824BD61 playse SE_W227B call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E waitmovement 0 - compare_var_to_value VAR_0x400F, 3 + compare VAR_0x400F, 3 goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24BD82 - compare_var_to_value VAR_0x400E, 0 + compare VAR_0x400E, 0 goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24C1CB BattleFrontier_BattleDomeBattleRoom_EventScript_24BD82:: @ 824BD82 @@ -106,7 +106,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BDF7:: @ 824BDF7 delay 180 applymovement 9, BattleFrontier_BattleDomeBattleRoom_Movement_24C96B waitmovement 0 - compare_var_to_value VAR_0x4002, 2 + compare VAR_0x4002, 2 goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BE4F setvar VAR_0x8004, 19 special sub_818E9AC @@ -118,11 +118,11 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BE4F:: @ 824BE4F waitmovement 0 setvar VAR_0x8004, 4 special sub_818E9AC - compare_var_to_value VAR_0x4002, 0 + compare VAR_0x4002, 0 call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BEB1 - compare_var_to_value VAR_0x4002, 1 + compare VAR_0x4002, 1 call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BEC5 - compare_var_to_value VAR_0x4002, 2 + compare VAR_0x4002, 2 call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BED9 playse SE_W227B call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E @@ -165,9 +165,9 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BED9:: @ 824BED9 BattleFrontier_BattleDomeBattleRoom_EventScript_24BEE0:: @ 824BEE0 applymovement 1, BattleFrontier_BattleDomeBattleRoom_Movement_2725B4 waitmovement 0 - compare_var_to_value VAR_0x4002, 0 + compare VAR_0x4002, 0 call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BFC3 - compare_var_to_value VAR_0x4002, 1 + compare VAR_0x4002, 1 call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BFCC playse SE_W227B call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E @@ -228,17 +228,17 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BFD5:: @ 824BFD5 setvar VAR_0x8004, 1 setvar VAR_0x8005, 6 special sub_818E9AC - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C023 setvar VAR_0x8004, 1 setvar VAR_0x8005, 7 special sub_818E9AC - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C076 setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 special sub_818E9AC - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C16A goto BattleFrontier_BattleDomeBattleRoom_EventScript_24C0C9 return @@ -302,7 +302,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C0C2:: @ 824C0C2 return BattleFrontier_BattleDomeBattleRoom_EventScript_24C0C9:: @ 824C0C9 - compare_var_to_value VAR_0x400F, 3 + compare VAR_0x400F, 3 goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24C105 switch VAR_0x400E case 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C158 @@ -429,7 +429,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C211:: @ 824C211 setvar VAR_0x8004, 1 setvar VAR_0x8005, 7 special sub_81A1780 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24C2B9 msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CFAE, 4 setvar VAR_0x8004, 2 @@ -449,7 +449,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C2B9:: @ 824C2B9 special sub_818E9AC setvar VAR_0x8004, 12 special sub_81A1780 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62 closemessage applymovement 15, BattleFrontier_BattleDomeBattleRoom_Movement_24C82B @@ -468,7 +468,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C346:: @ 824C346 setvar VAR_0x8004, 1 setvar VAR_0x8005, 7 special sub_81A1780 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24C373 msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D319, 4 setvar VAR_0x8004, 2 @@ -488,7 +488,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C373:: @ 824C373 special sub_818E9AC setvar VAR_0x8004, 12 special sub_81A1780 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62 closemessage applymovement 15, BattleFrontier_BattleDomeBattleRoom_Movement_24C82B @@ -528,7 +528,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C440:: @ 824C440 setvar VAR_0x8005, 6 setvar VAR_0x8006, 0 special sub_81A1780 - special sp000_heal_pokemon + special HealPlayerParty setvar VAR_0x8004, 3 setvar VAR_0x8005, 0 setvar VAR_0x4009, 1 @@ -537,7 +537,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C440:: @ 824C440 setvar VAR_0x4009, 0 setvar VAR_0x8004, 17 special sub_818E9AC - special sp000_heal_pokemon + special HealPlayerParty setvar VAR_0x8004, 16 special sub_818E9AC return @@ -555,12 +555,12 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C48B:: @ 824C48B setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 special sub_81A1780 - compare_var_to_value VAR_RESULT, 3 + compare VAR_RESULT, 3 goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24C4EF setvar VAR_0x8004, 9 special sub_81A1780 copyvar VAR_0x400E, VAR_RESULT - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C4EF call BattleFrontier_BattleDomeBattleRoom_EventScript_242170 setobjectxyperm 15, 13, 9 @@ -572,7 +572,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C4EF:: @ 824C4EF end BattleFrontier_BattleDomeBattleRoom_MapScript1_24C4F0: @ 824C4F0 - compare_var_to_value VAR_0x4009, 1 + compare VAR_0x4009, 1 call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C4FC end @@ -581,13 +581,13 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C4FC:: @ 824C4FC return BattleFrontier_BattleDomeBattleRoom_EventScript_24C502:: @ 824C502 - compare_var_to_value VAR_0x400F, 0 + compare VAR_0x400F, 0 call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C52F - compare_var_to_value VAR_0x400F, 1 + compare VAR_0x400F, 1 call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C530 - compare_var_to_value VAR_0x400F, 2 + compare VAR_0x400F, 2 call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C594 - compare_var_to_value VAR_0x400F, 3 + compare VAR_0x400F, 3 call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C652 return @@ -951,7 +951,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E:: @ 824C82E BattleFrontier_BattleDomeBattleRoom_EventScript_24C8F5:: @ 824C8F5 BattleFrontier_BattleDomePreBattleRoom_EventScript_24C8F5:: @ 824C8F5 copyvar VAR_RESULT, VAR_0x40CE - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24C90F warp BATTLE_FRONTIER_BATTLE_DOME_LOBBY, 255, 5, 11 waitstate @@ -965,14 +965,14 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24C90F:: @ 824C90F BattleFrontier_BattleDomeBattleRoom_EventScript_24C919:: @ 824C919 random 2 copyvar VAR_0x400D, VAR_RESULT - compare_var_to_value VAR_0x400D, 0 + compare VAR_0x400D, 0 goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_27374E setobjectxyperm 6, 2, 0 setobjectmovementtype 6, 10 return BattleFrontier_BattleDomeBattleRoom_EventScript_24C938:: @ 824C938 - compare_var_to_value VAR_0x400D, 0 + compare VAR_0x400D, 0 goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_27374E applymovement 6, BattleFrontier_BattleDomeBattleRoom_Movement_24C95E return diff --git a/data/scripts/maps/BattleFrontier_BattleDomeCorridor.inc b/data/scripts/maps/BattleFrontier_BattleDomeCorridor.inc index 87bf0aa63..9cb4f3187 100644 --- a/data/scripts/maps/BattleFrontier_BattleDomeCorridor.inc +++ b/data/scripts/maps/BattleFrontier_BattleDomeCorridor.inc @@ -12,7 +12,7 @@ BattleFrontier_BattleDomeCorridor_EventScript_24B10E:: @ 824B10E setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 special sub_81A1780 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleDomeCorridor_EventScript_24B161 applymovement 1, BattleFrontier_BattleDomeCorridor_Movement_24B1B2 applymovement 255, BattleFrontier_BattleDomeCorridor_Movement_24B1A1 diff --git a/data/scripts/maps/BattleFrontier_BattleDomeLobby.inc b/data/scripts/maps/BattleFrontier_BattleDomeLobby.inc index 397793888..33b5654d0 100644 --- a/data/scripts/maps/BattleFrontier_BattleDomeLobby.inc +++ b/data/scripts/maps/BattleFrontier_BattleDomeLobby.inc @@ -61,7 +61,7 @@ BattleFrontier_BattleDomeLobby_EventScript_24989B:: @ 824989B lockall setvar VAR_0x8004, 10 special sub_81A1780 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleDomeLobby_EventScript_2498C1 msgbox BattleFrontier_BattleDomeLobby_Text_24A4E9, 4 goto BattleFrontier_BattleDomeLobby_EventScript_2498C9 @@ -95,7 +95,7 @@ BattleFrontier_BattleDomeLobby_EventScript_2498C9:: @ 82498C9 setvar VAR_0x8006, 1 special sub_818E9AC special copy_player_party_from_sav1 - special sp000_heal_pokemon + special HealPlayerParty goto BattleFrontier_BattleDomeLobby_EventScript_249991 BattleFrontier_BattleDomeLobby_EventScript_249940:: @ 8249940 @@ -118,7 +118,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249940:: @ 8249940 setvar VAR_0x8006, 1 special sub_818E9AC special copy_player_party_from_sav1 - special sp000_heal_pokemon + special HealPlayerParty BattleFrontier_BattleDomeLobby_EventScript_249991:: @ 8249991 setvar VAR_0x8004, 13 @@ -127,7 +127,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249991:: @ 8249991 playse SE_SAVE waitse call BattleFrontier_BattleDomeLobby_EventScript_23E8E0 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleDomeLobby_EventScript_2499E9 message BattleFrontier_BattleDomeLobby_Text_24AE17 waitmessage @@ -182,15 +182,15 @@ BattleFrontier_BattleDomeLobby_EventScript_249A47:: @ 8249A47 BattleFrontier_BattleDomeLobby_EventScript_249A59:: @ 8249A59 special copy_player_party_to_sav1 - compare_var_to_value VAR_0x40CE, 0 + compare VAR_0x40CE, 0 call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249CFD - compare_var_to_value VAR_0x40CE, 1 + compare VAR_0x40CE, 1 call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D06 BattleFrontier_BattleDomeLobby_EventScript_249A72:: @ 8249A72 - compare_var_to_value VAR_0x40CE, 0 + compare VAR_0x40CE, 0 call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D0F - compare_var_to_value VAR_0x40CE, 1 + compare VAR_0x40CE, 1 call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D15 waitmessage multichoice 17, 6, 23, 0 @@ -209,7 +209,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249ABF:: @ 8249ABF case 127, BattleFrontier_BattleDomeLobby_EventScript_249C64 setvar VAR_0x8004, 15 special sub_81A1780 - compare_var_to_value VAR_0x8004, 1 + compare VAR_0x8004, 1 goto_eq BattleFrontier_BattleDomeLobby_EventScript_249C15 setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 @@ -222,7 +222,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249ABF:: @ 8249ABF setvar VAR_0x8005, 3 special sub_80F9490 waitstate - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleDomeLobby_EventScript_249C61 msgbox BattleFrontier_BattleDomeLobby_Text_24A1C6, 5 switch VAR_RESULT @@ -250,7 +250,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249B60:: @ 8249B60 delay 2 call BattleFrontier_BattleDomeLobby_EventScript_27134F setvar VAR_0x4000, 255 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleDomeLobby_EventScript_249C4A setvar VAR_0x8004, 22 special sub_818E9AC @@ -265,16 +265,16 @@ BattleFrontier_BattleDomeLobby_EventScript_249BC2:: @ 8249BC2 msgbox BattleFrontier_BattleDomeLobby_Text_24A437, 4 closemessage call BattleFrontier_BattleDomeLobby_EventScript_249C6E - special sp000_heal_pokemon + special HealPlayerParty warp BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR, 255, 23, 6 setvar VAR_0x4000, 0 waitstate end BattleFrontier_BattleDomeLobby_EventScript_249BFA:: @ 8249BFA - compare_var_to_value VAR_0x40CE, 0 + compare VAR_0x40CE, 0 call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D1B - compare_var_to_value VAR_0x40CE, 1 + compare VAR_0x40CE, 1 call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D24 goto BattleFrontier_BattleDomeLobby_EventScript_249A72 @@ -309,26 +309,26 @@ BattleFrontier_BattleDomeLobby_EventScript_249C6C:: @ 8249C6C end BattleFrontier_BattleDomeLobby_EventScript_249C6E:: @ 8249C6E - compare_var_to_value VAR_0x40CE, 0 + compare VAR_0x40CE, 0 call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249CDD - compare_var_to_value VAR_0x40CE, 1 + compare VAR_0x40CE, 1 call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249CE5 applymovement 255, BattleFrontier_BattleDomeLobby_Movement_249D45 waitmovement 0 - compare_var_to_value VAR_0x40CE, 0 + compare VAR_0x40CE, 0 call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D2D - compare_var_to_value VAR_0x40CE, 1 + compare VAR_0x40CE, 1 call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D33 waitdooranim - compare_var_to_value VAR_0x40CE, 0 + compare VAR_0x40CE, 0 call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249CED - compare_var_to_value VAR_0x40CE, 1 + compare VAR_0x40CE, 1 call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249CF5 applymovement 255, BattleFrontier_BattleDomeLobby_Movement_249D4E waitmovement 0 - compare_var_to_value VAR_0x40CE, 0 + compare VAR_0x40CE, 0 call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D39 - compare_var_to_value VAR_0x40CE, 1 + compare VAR_0x40CE, 1 call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D3F waitdooranim return @@ -434,13 +434,13 @@ BattleFrontier_BattleDomeLobby_EventScript_249D84:: @ 8249D84 setvar VAR_0x8004, 1 setvar VAR_0x8005, 9 special sub_818E9AC - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249DC9 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249DD2 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249DDB - compare_var_to_value VAR_RESULT, 3 + compare VAR_RESULT, 3 call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249DE4 fadescreen 1 setvar VAR_0x8004, 8 diff --git a/data/scripts/maps/BattleFrontier_BattleDomePreBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleDomePreBattleRoom.inc index 30b6d5d39..188fe4649 100644 --- a/data/scripts/maps/BattleFrontier_BattleDomePreBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattleDomePreBattleRoom.inc @@ -17,7 +17,7 @@ BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B218: @ 824B218 .2byte 0 BattleFrontier_BattleDomePreBattleRoom_EventScript_24B222:: @ 824B222 - compare_var_to_value VAR_0x8006, 1 + compare VAR_0x8006, 1 goto_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5C7 setvar VAR_0x8004, 2 setvar VAR_0x8005, 6 @@ -33,7 +33,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F:: @ 824B24F waitmessage switch VAR_RESULT call BattleFrontier_BattleDomePreBattleRoom_EventScript_23E8E0 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B2C1 multichoice 16, 0, 73, 1 switch VAR_RESULT @@ -158,7 +158,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B46D:: @ 824B46D waitstate setvar VAR_0x8004, 21 special sub_81A1780 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F setvar VAR_0x8004, 2 setvar VAR_0x8005, 8 @@ -249,7 +249,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5C7:: @ 824B5C7 special sub_81A1780 playfanfare BGM_ME_ASA waitfanfare - special sp000_heal_pokemon + special HealPlayerParty call BattleFrontier_BattleDomePreBattleRoom_EventScript_24B600 fadescreen 1 setvar VAR_0x8004, 11 diff --git a/data/scripts/maps/BattleFrontier_BattleFactoryBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleFactoryBattleRoom.inc index 2d21f080c..3652d576f 100644 --- a/data/scripts/maps/BattleFrontier_BattleFactoryBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattleFactoryBattleRoom.inc @@ -8,14 +8,14 @@ BattleFrontier_BattleFactoryBattleRoom_MapScript1_25ADBB: @ 825ADBB setvar VAR_0x8004, 5 special sub_81A1780 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE25 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE2B setvar VAR_0x8004, 9 special sub_81A1780 copyvar VAR_0x400F, VAR_RESULT - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25ADF3 end @@ -31,7 +31,7 @@ BattleFrontier_BattleFactoryBattleRoom_MapScript2_25AE00: @ 825AE00 BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE0A:: @ 825AE0A setvar VAR_0x4001, 1 hideobjectat 255, BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM - compare_var_to_value VAR_0x400F, 0 + compare VAR_0x400F, 0 goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE24 hideobjectat 2, BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM @@ -62,7 +62,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE3B:: @ 825AE3B end BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE67:: @ 825AE67 - compare_var_to_value VAR_0x400F, 0 + compare VAR_0x400F, 0 goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE3B applymovement 8, BattleFrontier_BattleFactoryBattleRoom_Movement_25B17B applymovement 255, BattleFrontier_BattleFactoryBattleRoom_Movement_25B17B @@ -77,7 +77,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE67:: @ 825AE67 waitmovement 0 BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEA7:: @ 825AEA7 - compare_var_to_value VAR_0x400F, 0 + compare VAR_0x400F, 0 goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF9C setvar VAR_0x8004, 5 special sub_8195960 @@ -89,7 +89,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEA7:: @ 825AEA7 setvar VAR_0x8005, 6 setvar VAR_0x8006, 0 special sub_81A1780 - special sp000_heal_pokemon + special HealPlayerParty setvar VAR_0x8004, 6 setvar VAR_0x8005, 0 special sub_8163AC4 @@ -110,7 +110,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF0F:: @ 825AF0F setvar VAR_0x8004, 1 setvar VAR_0x8005, 3 special sub_81A5E74 - compare_var_to_value VAR_RESULT, 9999 + compare VAR_RESULT, 9999 goto_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF3E addvar VAR_RESULT, 1 setorcopyvar VAR_0x8006, VAR_RESULT @@ -151,7 +151,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF9C:: @ 825AF9C setvar VAR_0x8004, 1 setvar VAR_0x8005, 7 special sub_81A1780 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AFEF msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B1FB, 4 setvar VAR_0x8004, 2 @@ -161,14 +161,14 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF9C:: @ 825AF9C BattleFrontier_BattleFactoryBattleRoom_EventScript_25AFEF:: @ 825AFEF msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B3F1, 4 call BattleFrontier_BattleFactoryBattleRoom_EventScript_25B0E0 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25B00C goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEF8 BattleFrontier_BattleFactoryBattleRoom_EventScript_25B00C:: @ 825B00C setvar VAR_0x8004, 12 special sub_81A1780 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105 msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B42D, 4 closemessage @@ -187,7 +187,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B051:: @ 825B051 setvar VAR_0x8004, 1 setvar VAR_0x8005, 7 special sub_81A1780 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25B07E msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B517, 4 setvar VAR_0x8004, 2 @@ -197,14 +197,14 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B051:: @ 825B051 BattleFrontier_BattleFactoryBattleRoom_EventScript_25B07E:: @ 825B07E msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B5CF, 4 call BattleFrontier_BattleFactoryBattleRoom_EventScript_25B0E0 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25B09B goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEF8 BattleFrontier_BattleFactoryBattleRoom_EventScript_25B09B:: @ 825B09B setvar VAR_0x8004, 12 special sub_81A1780 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105 msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B5E7, 4 waitmessage @@ -225,7 +225,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B0E0:: @ 825B0E0 setvar VAR_0x8005, 6 setvar VAR_0x8006, 0 special sub_81A1780 - special sp000_heal_pokemon + special HealPlayerParty setvar VAR_0x8004, 6 setvar VAR_0x8005, 0 special sub_8163AC4 @@ -236,7 +236,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105:: @ 825B105 setvar VAR_0x8004, 1 setvar VAR_0x8005, 3 special sub_81A5E74 - compare_var_to_value VAR_RESULT, 9999 + compare VAR_RESULT, 9999 goto_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF3E addvar VAR_RESULT, 1 setorcopyvar VAR_0x8006, VAR_RESULT @@ -246,7 +246,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105:: @ 825B105 setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 special sub_81A5E74 - compare_var_to_value VAR_RESULT, 9999 + compare VAR_RESULT, 9999 goto_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF43 addvar VAR_RESULT, 1 setvar VAR_0x8004, 2 @@ -292,7 +292,7 @@ BattleFrontier_BattleFactoryBattleRoom_Movement_25B18B: @ 825B18B BattleFrontier_BattleFactoryBattleRoom_EventScript_25B190:: @ 825B190 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25B190:: @ 825B190 copyvar VAR_RESULT, VAR_0x40CE - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25B1AA warp BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY, 255, 4, 8 waitstate diff --git a/data/scripts/maps/BattleFrontier_BattleFactoryLobby.inc b/data/scripts/maps/BattleFrontier_BattleFactoryLobby.inc index 3ceb3276c..791a666d5 100644 --- a/data/scripts/maps/BattleFrontier_BattleFactoryLobby.inc +++ b/data/scripts/maps/BattleFrontier_BattleFactoryLobby.inc @@ -55,7 +55,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_25849B:: @ 825849B lockall setvar VAR_0x8004, 10 special sub_81A1780 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleFactoryLobby_EventScript_2584BD msgbox BattleFrontier_BattleFactoryLobby_Text_258D93, 4 waitmessage @@ -102,7 +102,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_258506:: @ 8258506 BattleFrontier_BattleFactoryLobby_EventScript_25853B:: @ 825853B call BattleFrontier_BattleFactoryLobby_EventScript_23E8E0 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleFactoryLobby_EventScript_258582 message BattleFrontier_BattleFactoryLobby_Text_259388 waitmessage @@ -155,15 +155,15 @@ BattleFrontier_BattleFactoryLobby_EventScript_2585DD:: @ 82585DD BattleFrontier_BattleFactoryLobby_EventScript_2585ED:: @ 82585ED special copy_player_party_to_sav1 - compare_var_to_value VAR_0x40CE, 0 + compare VAR_0x40CE, 0 call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_2587B1 - compare_var_to_value VAR_0x40CE, 1 + compare VAR_0x40CE, 1 call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_2587BA BattleFrontier_BattleFactoryLobby_EventScript_258606:: @ 8258606 - compare_var_to_value VAR_0x40CE, 0 + compare VAR_0x40CE, 0 call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_2587C3 - compare_var_to_value VAR_0x40CE, 1 + compare VAR_0x40CE, 1 call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_2587C9 waitmessage multichoice 17, 6, 23, 0 @@ -210,7 +210,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_2586B9:: @ 82586B9 delay 2 call BattleFrontier_BattleFactoryLobby_EventScript_27134F setvar VAR_0x4000, 255 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleFactoryLobby_EventScript_258783 setvar VAR_0x8006, 0 @@ -218,9 +218,9 @@ BattleFrontier_BattleFactoryLobby_EventScript_25871A:: @ 825871A special copy_player_party_to_sav1 msgbox BattleFrontier_BattleFactoryLobby_Text_258CB1, 4 closemessage - compare_var_to_value VAR_0x40CE, 0 + compare VAR_0x40CE, 0 call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_25875C - compare_var_to_value VAR_0x40CE, 1 + compare VAR_0x40CE, 1 call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_258762 applymovement VAR_LAST_TALKED, BattleFrontier_BattleFactoryLobby_Movement_2587A7 applymovement 255, BattleFrontier_BattleFactoryLobby_Movement_2587AC @@ -239,9 +239,9 @@ BattleFrontier_BattleFactoryLobby_EventScript_258762:: @ 8258762 return BattleFrontier_BattleFactoryLobby_EventScript_258768:: @ 8258768 - compare_var_to_value VAR_0x40CE, 0 + compare VAR_0x40CE, 0 call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_2587CF - compare_var_to_value VAR_0x40CE, 1 + compare VAR_0x40CE, 1 call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_2587D8 goto BattleFrontier_BattleFactoryLobby_EventScript_258606 diff --git a/data/scripts/maps/BattleFrontier_BattleFactoryPreBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleFactoryPreBattleRoom.inc index cd34a1d15..ffc3744f6 100644 --- a/data/scripts/maps/BattleFrontier_BattleFactoryPreBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattleFactoryPreBattleRoom.inc @@ -9,7 +9,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_MapScript2_259AC5: @ 8259AC5 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259ACF:: @ 8259ACF setvar VAR_0x4001, 1 - compare_var_to_value VAR_0x8006, 1 + compare VAR_0x8006, 1 goto_if 5, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259AEA setobjectxy 1, 8, 7 turnobject 1, 1 @@ -23,13 +23,13 @@ BattleFrontier_BattleFactoryPreBattleRoom_MapScript2_259AEF: @ 8259AEF .2byte 0 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259AF9:: @ 8259AF9 - compare_var_to_value VAR_0x8006, 1 + compare VAR_0x8006, 1 goto_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259BA5 setvar VAR_0x4000, 1 applymovement 1, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1AC applymovement 255, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A19A waitmovement 0 - compare_var_to_value VAR_0x8006, 2 + compare VAR_0x8006, 2 goto_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E69 setvar VAR_0x8004, 13 special sub_81A5E74 @@ -55,9 +55,9 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74:: @ 8259B74 msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AB96, 4 closemessage call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_23F2B7 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A17C - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A18B waitmovement 0 warp BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM, 255, 6, 11 @@ -72,10 +72,10 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259BA5:: @ 8259BA5 msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A22D, 4 playfanfare BGM_ME_ASA waitfanfare - special sp000_heal_pokemon + special HealPlayerParty setvar VAR_0x8004, 9 special sub_81A1780 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C26 playse 263 waitse @@ -96,27 +96,27 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259BA5:: @ 8259BA5 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13:: @ 8259C13 setvar VAR_0x8004, 9 special sub_81A1780 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B9 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C26:: @ 8259C26 setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 special sub_81A1780 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E1D - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E24 - compare_var_to_value VAR_RESULT, 3 + compare VAR_RESULT, 3 call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E2B - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E32 - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E39 - compare_var_to_value VAR_RESULT, 6 + compare VAR_RESULT, 6 call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E40 call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_23E8E0 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259CC6 multichoice 19, 4, 103, 1 switch VAR_RESULT @@ -185,7 +185,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259DF2:: @ 8259DF2 setvar VAR_0x8004, 7 special sub_81A5E74 waitstate - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74 setvar VAR_0x8004, 8 special sub_81A5E74 @@ -249,41 +249,41 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E69:: @ 8259E69 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E93:: @ 8259E93 msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A3B4, 4 - compare_var_to_value VAR_0x8005, 0 + compare VAR_0x8005, 0 call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F62 - compare_var_to_value VAR_0x8005, 1 + compare VAR_0x8005, 1 call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F6B - compare_var_to_value VAR_0x8005, 2 + compare VAR_0x8005, 2 call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F74 - compare_var_to_value VAR_0x8005, 3 + compare VAR_0x8005, 3 call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F7D - compare_var_to_value VAR_0x8005, 4 + compare VAR_0x8005, 4 call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F86 - compare_var_to_value VAR_0x8005, 5 + compare VAR_0x8005, 5 call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F8F - compare_var_to_value VAR_0x8005, 6 + compare VAR_0x8005, 6 call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F98 - compare_var_to_value VAR_0x8005, 7 + compare VAR_0x8005, 7 call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FA1 - compare_var_to_value VAR_0x8005, 8 + compare VAR_0x8005, 8 call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FAA - compare_var_to_value VAR_0x8005, 10 + compare VAR_0x8005, 10 call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FB3 - compare_var_to_value VAR_0x8005, 11 + compare VAR_0x8005, 11 call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FBC - compare_var_to_value VAR_0x8005, 12 + compare VAR_0x8005, 12 call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FC5 - compare_var_to_value VAR_0x8005, 13 + compare VAR_0x8005, 13 call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FCE - compare_var_to_value VAR_0x8005, 14 + compare VAR_0x8005, 14 call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FD7 - compare_var_to_value VAR_0x8005, 15 + compare VAR_0x8005, 15 call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FE0 - compare_var_to_value VAR_0x8005, 16 + compare VAR_0x8005, 16 call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FE9 - compare_var_to_value VAR_0x8005, 17 + compare VAR_0x8005, 17 call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FF2 - compare_var_to_value VAR_0x8005, 18 + compare VAR_0x8005, 18 call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FFB return @@ -360,23 +360,23 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FFB:: @ 8259FFB return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A004:: @ 825A004 - compare_var_to_value VAR_0x8006, 0 + compare VAR_0x8006, 0 call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A068 - compare_var_to_value VAR_0x8006, 1 + compare VAR_0x8006, 1 call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A071 - compare_var_to_value VAR_0x8006, 2 + compare VAR_0x8006, 2 call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A07A - compare_var_to_value VAR_0x8006, 3 + compare VAR_0x8006, 3 call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A083 - compare_var_to_value VAR_0x8006, 4 + compare VAR_0x8006, 4 call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A08C - compare_var_to_value VAR_0x8006, 5 + compare VAR_0x8006, 5 call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A095 - compare_var_to_value VAR_0x8006, 6 + compare VAR_0x8006, 6 call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A09E - compare_var_to_value VAR_0x8006, 7 + compare VAR_0x8006, 7 call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0A7 - compare_var_to_value VAR_0x8006, 8 + compare VAR_0x8006, 8 call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B0 return @@ -420,7 +420,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B9:: @ 825A0B9 message BattleFrontier_BattleFactoryPreBattleRoom_Text_25AD20 waitmessage call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_23E8E0 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A110 multichoice 19, 4, 103, 1 switch VAR_RESULT diff --git a/data/scripts/maps/BattleFrontier_BattlePalaceBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattlePalaceBattleRoom.inc index 9178ca8bd..6646694f7 100644 --- a/data/scripts/maps/BattleFrontier_BattlePalaceBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattlePalaceBattleRoom.inc @@ -12,9 +12,9 @@ BattleFrontier_BattlePalaceBattleRoom_MapScript1_24F825: @ 824F825 BattleFrontier_BattlePalaceBattleRoom_EventScript_24F833:: @ 824F833 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24F84B - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24F856 return @@ -37,7 +37,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24F86B:: @ 824F86B setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 special sub_81A1780 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8B5 applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE9B waitmovement 0 @@ -100,31 +100,31 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24F911:: @ 824F911 special sub_81A1780 playfanfare BGM_ME_ASA waitfanfare - special sp000_heal_pokemon + special HealPlayerParty BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A:: @ 824F98A setvar VAR_0x8004, 9 special sub_81A1780 copyvar VAR_0x400F, VAR_RESULT - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB61 setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 special sub_81A1780 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE66 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 call_if 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE6D - compare_var_to_value VAR_RESULT, 3 + compare VAR_RESULT, 3 call_if 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE74 - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 call_if 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE7B - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 call_if 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE82 - compare_var_to_value VAR_RESULT, 6 + compare VAR_RESULT, 6 call_if 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE89 call BattleFrontier_BattlePalaceBattleRoom_EventScript_23E8E0 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FA42 multichoice 19, 4, 103, 1 switch VAR_RESULT @@ -198,7 +198,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB3F:: @ 824FB3F end BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB61:: @ 824FB61 - compare_var_to_value VAR_0x4002, 1 + compare VAR_0x4002, 1 goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB79 msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2500DD, 4 setvar VAR_0x4002, 1 @@ -207,7 +207,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB79:: @ 824FB79 message BattleFrontier_BattlePalaceBattleRoom_Text_25014A waitmessage call BattleFrontier_BattlePalaceBattleRoom_EventScript_23E8E0 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FBD0 multichoice 19, 4, 103, 1 switch VAR_RESULT @@ -247,7 +247,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FC06:: @ 824FC06 setvar VAR_0x8004, 1 setvar VAR_0x8005, 7 special sub_81A1780 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCAA msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2501C1, 4 setvar VAR_0x8004, 2 @@ -257,7 +257,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FC06:: @ 824FC06 BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCAA:: @ 824FCAA msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2502C4, 4 call BattleFrontier_BattlePalaceBattleRoom_EventScript_24FDF7 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCC7 goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8FA @@ -266,7 +266,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCC7:: @ 824FCC7 special sub_8195960 setvar VAR_0x8004, 12 special sub_81A1780 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28 msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2502FF, 4 applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE99 @@ -290,7 +290,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD3A:: @ 824FD3A setvar VAR_0x8004, 1 setvar VAR_0x8005, 7 special sub_81A1780 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD67 msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250485, 4 setvar VAR_0x8004, 2 @@ -300,7 +300,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD3A:: @ 824FD3A BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD67:: @ 824FD67 msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250572, 4 call BattleFrontier_BattlePalaceBattleRoom_EventScript_24FDF7 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD84 goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8FA @@ -309,7 +309,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD84:: @ 824FD84 special sub_8195960 setvar VAR_0x8004, 12 special sub_81A1780 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28 msgbox BattleFrontier_BattlePalaceBattleRoom_Text_25057E, 4 applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE99 @@ -337,14 +337,14 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_24FDF7:: @ 824FDF7 setvar VAR_0x8005, 6 setvar VAR_0x8006, 0 special sub_81A1780 - special sp000_heal_pokemon + special HealPlayerParty setvar VAR_0x8004, 4 setvar VAR_0x8005, 0 special sub_8163AC4 waitstate setvar VAR_0x8004, 18 special sub_81A1780 - special sp000_heal_pokemon + special HealPlayerParty setvar VAR_0x8004, 21 special sub_81A1780 return @@ -460,7 +460,7 @@ BattleFrontier_BattlePalaceBattleRoom_Movement_24FEB6: @ 824FEB6 BattleFrontier_BattlePalaceBattleRoom_EventScript_24FEBB:: @ 824FEBB copyvar VAR_RESULT, VAR_0x40CE - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FED5 warp BATTLE_FRONTIER_BATTLE_PALACE_LOBBY, 255, 5, 7 waitstate diff --git a/data/scripts/maps/BattleFrontier_BattlePalaceCorridor.inc b/data/scripts/maps/BattleFrontier_BattlePalaceCorridor.inc index 183dbdaec..5c71cf4d6 100644 --- a/data/scripts/maps/BattleFrontier_BattlePalaceCorridor.inc +++ b/data/scripts/maps/BattleFrontier_BattlePalaceCorridor.inc @@ -14,21 +14,21 @@ BattleFrontier_BattlePalaceCorridor_EventScript_24F4B3:: @ 824F4B3 lockall setvar VAR_0x8004, 3 special sub_8195960 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, BattleFrontier_BattlePalaceCorridor_EventScript_24F58B - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, BattleFrontier_BattlePalaceCorridor_EventScript_24F594 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 call_if 1, BattleFrontier_BattlePalaceCorridor_EventScript_24F59D - compare_var_to_value VAR_RESULT, 3 + compare VAR_RESULT, 3 call_if 1, BattleFrontier_BattlePalaceCorridor_EventScript_24F5A6 - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 call_if 1, BattleFrontier_BattlePalaceCorridor_EventScript_24F5AF closemessage setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 special sub_81A1780 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattlePalaceCorridor_EventScript_24F553 applymovement 1, BattleFrontier_BattlePalaceCorridor_Movement_24F5BD applymovement 255, BattleFrontier_BattlePalaceCorridor_Movement_24F5C4 diff --git a/data/scripts/maps/BattleFrontier_BattlePalaceLobby.inc b/data/scripts/maps/BattleFrontier_BattlePalaceLobby.inc index d62bc4412..2e0f152b4 100644 --- a/data/scripts/maps/BattleFrontier_BattlePalaceLobby.inc +++ b/data/scripts/maps/BattleFrontier_BattlePalaceLobby.inc @@ -49,7 +49,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D817:: @ 824D817 lockall setvar VAR_0x8004, 10 special sub_81A1780 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattlePalaceLobby_EventScript_24D838 msgbox BattleFrontier_BattlePalaceLobby_Text_24E497, 4 goto BattleFrontier_BattlePalaceLobby_EventScript_24D840 @@ -90,14 +90,14 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D8A1:: @ 824D8A1 setvar VAR_0x8004, 8 special sub_81A1780 special copy_player_party_from_sav1 - special sp000_heal_pokemon + special HealPlayerParty setvar VAR_0x8004, 7 setvar VAR_0x8005, 0 special sub_8195960 playse SE_SAVE waitse call BattleFrontier_BattlePalaceLobby_EventScript_23E8E0 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattlePalaceLobby_EventScript_24D907 message BattleFrontier_BattlePalaceLobby_Text_24EF16 waitmessage @@ -150,18 +150,18 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D968:: @ 824D968 setvar VAR_0x8004, 1 setvar VAR_0x8005, 0 special sub_8195960 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattlePalaceLobby_EventScript_24D817 special copy_player_party_to_sav1 - compare_var_to_value VAR_0x40CE, 0 + compare VAR_0x40CE, 0 call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DB9E - compare_var_to_value VAR_0x40CE, 1 + compare VAR_0x40CE, 1 call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DBA7 BattleFrontier_BattlePalaceLobby_EventScript_24D999:: @ 824D999 - compare_var_to_value VAR_0x40CE, 0 + compare VAR_0x40CE, 0 call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DBB0 - compare_var_to_value VAR_0x40CE, 1 + compare VAR_0x40CE, 1 call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DBB6 waitmessage multichoice 17, 6, 23, 0 @@ -180,7 +180,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D9E6:: @ 824D9E6 case 127, BattleFrontier_BattlePalaceLobby_EventScript_24DB94 setvar VAR_0x8004, 15 special sub_81A1780 - compare_var_to_value VAR_0x8004, 1 + compare VAR_0x8004, 1 goto_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB45 setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 @@ -193,7 +193,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D9E6:: @ 824D9E6 setvar VAR_0x8005, 3 special sub_80F9490 waitstate - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB91 msgbox BattleFrontier_BattlePalaceLobby_Text_24E3C8, 5 switch VAR_RESULT @@ -225,7 +225,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DA87:: @ 824DA87 delay 2 call BattleFrontier_BattlePalaceLobby_EventScript_27134F setvar VAR_0x4000, 255 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB7A BattleFrontier_BattlePalaceLobby_EventScript_24DAF3:: @ 824DAF3 @@ -242,7 +242,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DAF3:: @ 824DAF3 end BattleFrontier_BattlePalaceLobby_EventScript_24DB20:: @ 824DB20 - compare_var_to_value VAR_0x40CE, 1 + compare VAR_0x40CE, 1 goto_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB38 msgbox BattleFrontier_BattlePalaceLobby_Text_24DE17, 4 goto BattleFrontier_BattlePalaceLobby_EventScript_24D999 @@ -298,24 +298,24 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DBB6:: @ 824DBB6 return BattleFrontier_BattlePalaceLobby_EventScript_24DBBC:: @ 824DBBC - compare_var_to_value VAR_0x40CE, 0 + compare VAR_0x40CE, 0 call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DC23 - compare_var_to_value VAR_0x40CE, 1 + compare VAR_0x40CE, 1 call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DC29 applymovement VAR_LAST_TALKED, BattleFrontier_BattlePalaceLobby_Movement_24DC47 applymovement 255, BattleFrontier_BattlePalaceLobby_Movement_24DC47 waitmovement 0 - compare_var_to_value VAR_0x40CE, 0 + compare VAR_0x40CE, 0 call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DC2F - compare_var_to_value VAR_0x40CE, 1 + compare VAR_0x40CE, 1 call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DC35 waitdooranim applymovement VAR_LAST_TALKED, BattleFrontier_BattlePalaceLobby_Movement_24DC49 applymovement 255, BattleFrontier_BattlePalaceLobby_Movement_24DC4C waitmovement 0 - compare_var_to_value VAR_0x40CE, 0 + compare VAR_0x40CE, 0 call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DC3B - compare_var_to_value VAR_0x40CE, 1 + compare VAR_0x40CE, 1 call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DC41 waitdooranim return diff --git a/data/scripts/maps/BattleFrontier_BattlePikeLobby.inc b/data/scripts/maps/BattleFrontier_BattlePikeLobby.inc index 66226b9ce..40b5e437f 100644 --- a/data/scripts/maps/BattleFrontier_BattlePikeLobby.inc +++ b/data/scripts/maps/BattleFrontier_BattlePikeLobby.inc @@ -25,7 +25,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B707:: @ 825B707 end BattleFrontier_BattlePikeLobby_EventScript_25B710:: @ 825B710 - special sp000_heal_pokemon + special HealPlayerParty setvar VAR_0x8004, 27 special sub_81A703C lockall @@ -51,7 +51,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B762:: @ 825B762 lockall setvar VAR_0x8004, 10 special sub_81A1780 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattlePikeLobby_EventScript_25B784 msgbox BattleFrontier_BattlePikeLobby_Text_25C18A, 4 waitmessage @@ -77,7 +77,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B78D:: @ 825B78D copyvar VAR_0x8006, VAR_RESULT special sub_81A703C special copy_player_party_from_sav1 - special sp000_heal_pokemon + special HealPlayerParty setvar VAR_0x8004, 27 special sub_81A703C message BattleFrontier_BattlePikeLobby_Text_25C1DF @@ -108,7 +108,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B806:: @ 825B806 setvar VAR_0x8006, 0 special sub_81A703C special copy_player_party_from_sav1 - special sp000_heal_pokemon + special HealPlayerParty setvar VAR_0x8004, 27 special sub_81A703C setvar VAR_0x8004, 8 @@ -149,7 +149,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B8BB:: @ 825B8BB case 127, BattleFrontier_BattlePikeLobby_EventScript_25BA76 setvar VAR_0x8004, 15 special sub_81A1780 - compare_var_to_value VAR_0x8004, 1 + compare VAR_0x8004, 1 goto_eq BattleFrontier_BattlePikeLobby_EventScript_25BA27 setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 @@ -162,7 +162,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B8BB:: @ 825B8BB setvar VAR_0x8005, 3 special sub_80F9490 waitstate - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePikeLobby_EventScript_25BA73 msgbox BattleFrontier_BattlePikeLobby_Text_25C0D8, 5 switch VAR_RESULT @@ -199,7 +199,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B95C:: @ 825B95C setvar VAR_0x4000, 255 setvar VAR_0x8004, 26 special sub_81A703C - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePikeLobby_EventScript_25BA5C special copy_player_party_to_sav1 setvar VAR_0x8004, 3 @@ -210,7 +210,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B95C:: @ 825B95C setvar VAR_0x8004, 5 special sub_81A1780 call BattleFrontier_BattlePikeLobby_EventScript_25BA94 - special sp000_heal_pokemon + special HealPlayerParty call BattleFrontier_BattlePikeLobby_EventScript_25BB49 warpsilent BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR, 255, 6, 7 setvar VAR_0x4000, 0 diff --git a/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom1.inc b/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom1.inc index 69dc87eaa..2aafa58a6 100644 --- a/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom1.inc +++ b/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom1.inc @@ -89,7 +89,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D285:: @ 825D285 msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DE3F, 4 playfanfare BGM_ME_ASA waitfanfare - special sp000_heal_pokemon + special HealPlayerParty msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DE94, 4 closemessage release @@ -145,7 +145,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2FB:: @ 825D2FB setvar VAR_0x8004, 1 setvar VAR_0x8005, 7 special sub_81A1780 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3BD msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DED2, 4 setvar VAR_0x8004, 2 @@ -155,14 +155,14 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2FB:: @ 825D2FB BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3BD:: @ 825D3BD msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DF71, 4 call BattleFrontier_BattlePikeRandomRoom1_EventScript_25D77B - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3DA goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D20A BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3DA:: @ 825D3DA setvar VAR_0x8004, 12 special sub_81A1780 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DFA2, 4 waitmessage @@ -180,7 +180,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D416:: @ 825D416 setvar VAR_0x8004, 1 setvar VAR_0x8005, 7 special sub_81A1780 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D443 msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E02C, 4 setvar VAR_0x8004, 2 @@ -190,14 +190,14 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D416:: @ 825D416 BattleFrontier_BattlePikeRandomRoom1_EventScript_25D443:: @ 825D443 msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E0E8, 4 call BattleFrontier_BattlePikeRandomRoom1_EventScript_25D77B - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D460 goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D20A BattleFrontier_BattlePikeRandomRoom1_EventScript_25D460:: @ 825D460 setvar VAR_0x8004, 12 special sub_81A1780 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E0F6, 4 waitmessage @@ -257,7 +257,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D50E:: @ 825D50E waitmessage playfanfare BGM_ME_ASA waitfanfare - special sp000_heal_pokemon + special HealPlayerParty msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DA13, 4 closemessage applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D798 @@ -320,9 +320,9 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D605:: @ 825D605 setvar VAR_0x8004, 12 special sub_81A703C copyvar VAR_0x8004, VAR_RESULT - compare_var_to_value VAR_0x8004, 0 + compare VAR_0x8004, 0 call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D643 - compare_var_to_value VAR_0x8004, 1 + compare VAR_0x8004, 1 call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D6D5 msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DD3F, 4 closemessage @@ -337,13 +337,13 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D643:: @ 825D643 waitmoncry setvar VAR_0x8004, 11 special sub_81A703C - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D751 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D758 - compare_var_to_value VAR_RESULT, 3 + compare VAR_RESULT, 3 call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D75F - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D766 setvar VAR_0x8004, 15 special sub_81A703C @@ -374,9 +374,9 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D6D5:: @ 825D6D5 waitmoncry setvar VAR_0x8004, 11 special sub_81A703C - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D76D - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D774 setvar VAR_0x8004, 15 special sub_81A703C @@ -607,9 +607,9 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D831:: @ 825D831 BattleFrontier_BattlePikeRandomRoom1_EventScript_25D83E:: @ 825D83E setvar VAR_0x8004, 13 special sub_81A703C - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D881 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D875 playfanfare BGM_ME_ASA waitfanfare diff --git a/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom3.inc b/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom3.inc index ebdfd5b69..c651a9e68 100644 --- a/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom3.inc +++ b/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom3.inc @@ -38,9 +38,9 @@ BattleFrontier_BattlePikeRandomRoom3_MapScript1_25E47A: @ 825E47A setvar VAR_0x8004, 1 setvar VAR_0x8005, 5 special sub_81A1780 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_eq BattleFrontier_BattlePikeRandomRoom3_EventScript_25E4A3 - compare_var_to_value VAR_RESULT, 3 + compare VAR_RESULT, 3 goto_eq BattleFrontier_BattlePikeRandomRoom3_EventScript_25E4A3 end diff --git a/data/scripts/maps/BattleFrontier_BattlePikeThreePathRoom.inc b/data/scripts/maps/BattleFrontier_BattlePikeThreePathRoom.inc index c1dcce822..74da4c01c 100644 --- a/data/scripts/maps/BattleFrontier_BattlePikeThreePathRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattlePikeThreePathRoom.inc @@ -168,7 +168,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA5A:: @ 825CA5A BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA78:: @ 825CA78 setvar VAR_0x8004, 17 special sub_81A703C - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA91 setvar VAR_0x4005, 255 end @@ -191,7 +191,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA97:: @ 825CA97 BattleFrontier_BattlePikeThreePathRoom_EventScript_25CABB:: @ 825CABB setvar VAR_0x8004, 19 special sub_81A703C - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 goto_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_25CBC2 lock faceplayer diff --git a/data/scripts/maps/BattleFrontier_BattlePointExchangeServiceCorner.inc b/data/scripts/maps/BattleFrontier_BattlePointExchangeServiceCorner.inc index 54d72c398..9184f3cd3 100644 --- a/data/scripts/maps/BattleFrontier_BattlePointExchangeServiceCorner.inc +++ b/data/scripts/maps/BattleFrontier_BattlePointExchangeServiceCorner.inc @@ -14,29 +14,29 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F07D:: @ 825F07D BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A:: @ 825F08A specialvar VAR_0x4001, sub_813AA04 - compare_var_to_var VAR_0x4001, VAR_0x8008 + compare VAR_0x4001, VAR_0x8008 goto_if 4, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F0C9 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE86, 4 - compare_var_to_value VAR_0x4002, 0 + compare VAR_0x4002, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 - compare_var_to_value VAR_0x4002, 1 + compare VAR_0x4002, 1 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E - compare_var_to_value VAR_0x4002, 2 + compare VAR_0x4002, 2 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F0C9:: @ 825F0C9 - compare_var_to_value VAR_0x4002, 0 + compare VAR_0x4002, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F0E5 - compare_var_to_value VAR_0x4002, 1 + compare VAR_0x4002, 1 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F0E5 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F12A end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F0E5:: @ 825F0E5 checkdecorspace VAR_0x8009 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F11D copyvar VAR_0x8004, VAR_0x8008 special sub_813A9A4 @@ -44,7 +44,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F0E5:: @ 825F0E5 special sub_813A8FC playse SE_REGI msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE45, 4 - compare_var_to_value VAR_0x4002, 0 + compare VAR_0x4002, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E end @@ -57,7 +57,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F11D:: @ 825F11D BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F12A:: @ 825F12A checkitemspace VAR_0x8009, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F166 copyvar VAR_0x8004, VAR_0x8008 special sub_813A9A4 @@ -65,7 +65,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F12A:: @ 825F12A special sub_813A8FC playse SE_REGI msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE72, 4 - compare_var_to_value VAR_0x4002, 2 + compare VAR_0x4002, 2 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 end @@ -107,7 +107,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185:: @ 825F185 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F21E:: @ 825F21E msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F8B6, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 setvar VAR_0x8008, 16 setvar VAR_0x8009, 75 @@ -116,7 +116,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F21E:: @ 825F21E BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F241:: @ 825F241 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F8E6, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 setvar VAR_0x8008, 32 setvar VAR_0x8009, 103 @@ -125,7 +125,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F241:: @ 825F241 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F264:: @ 825F264 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F917, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 setvar VAR_0x8008, 32 setvar VAR_0x8009, 87 @@ -134,7 +134,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F264:: @ 825F264 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F287:: @ 825F287 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F949, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 setvar VAR_0x8008, 48 setvar VAR_0x8009, 79 @@ -143,7 +143,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F287:: @ 825F287 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F2AA:: @ 825F2AA msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F979, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 setvar VAR_0x8008, 48 setvar VAR_0x8009, 84 @@ -152,7 +152,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F2AA:: @ 825F2AA BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F2CD:: @ 825F2CD msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F9A9, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 setvar VAR_0x8008, 48 setvar VAR_0x8009, 85 @@ -161,7 +161,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F2CD:: @ 825F2CD BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F2F0:: @ 825F2F0 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F9DB, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 setvar VAR_0x8008, 48 setvar VAR_0x8009, 86 @@ -170,7 +170,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F2F0:: @ 825F2F0 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F313:: @ 825F313 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FA0A, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 setvar VAR_0x8008, 80 setvar VAR_0x8009, 80 @@ -179,7 +179,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F313:: @ 825F313 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F336:: @ 825F336 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FA3D, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 setvar VAR_0x8008, 80 setvar VAR_0x8009, 81 @@ -188,7 +188,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F336:: @ 825F336 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F359:: @ 825F359 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FA70, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 setvar VAR_0x8008, 80 setvar VAR_0x8009, 82 @@ -221,7 +221,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E:: @ 825F38E BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F3F0:: @ 825F3F0 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FAA2, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E setvar VAR_0x8008, 128 setvar VAR_0x8009, 113 @@ -230,7 +230,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F3F0:: @ 825F3F0 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F413:: @ 825F413 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FAD2, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E setvar VAR_0x8008, 128 setvar VAR_0x8009, 111 @@ -239,7 +239,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F413:: @ 825F413 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F436:: @ 825F436 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB03, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E setvar VAR_0x8008, 256 setvar VAR_0x8009, 114 @@ -248,7 +248,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F436:: @ 825F436 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F459:: @ 825F459 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB35, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E setvar VAR_0x8008, 256 setvar VAR_0x8009, 115 @@ -257,7 +257,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F459:: @ 825F459 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F47C:: @ 825F47C msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB68, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E setvar VAR_0x8008, 256 setvar VAR_0x8009, 116 @@ -291,7 +291,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1:: @ 825F4B1 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F51E:: @ 825F51E msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB9B, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 setvar VAR_0x8008, 1 setvar VAR_0x8009, 64 @@ -300,7 +300,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F51E:: @ 825F51E BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F541:: @ 825F541 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FBC7, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 setvar VAR_0x8008, 1 setvar VAR_0x8009, 67 @@ -309,7 +309,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F541:: @ 825F541 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F564:: @ 825F564 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FBF3, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 setvar VAR_0x8008, 1 setvar VAR_0x8009, 65 @@ -318,7 +318,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F564:: @ 825F564 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F587:: @ 825F587 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC1C, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 setvar VAR_0x8008, 1 setvar VAR_0x8009, 70 @@ -327,7 +327,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F587:: @ 825F587 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5AA:: @ 825F5AA msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC45, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 setvar VAR_0x8008, 1 setvar VAR_0x8009, 66 @@ -336,7 +336,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5AA:: @ 825F5AA BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5CD:: @ 825F5CD msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC70, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 setvar VAR_0x8008, 1 setvar VAR_0x8009, 63 @@ -373,7 +373,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602:: @ 825F602 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F690:: @ 825F690 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE17, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 setvar VAR_0x8008, 48 setvar VAR_0x8009, 200 @@ -382,7 +382,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F690:: @ 825F690 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6B3:: @ 825F6B3 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FCCB, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 setvar VAR_0x8008, 48 setvar VAR_0x8009, 180 @@ -391,7 +391,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6B3:: @ 825F6B3 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6D6:: @ 825F6D6 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FCFA, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 setvar VAR_0x8008, 48 setvar VAR_0x8009, 183 @@ -400,7 +400,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6D6:: @ 825F6D6 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6F9:: @ 825F6F9 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FD29, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 setvar VAR_0x8008, 48 setvar VAR_0x8009, 185 @@ -409,7 +409,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6F9:: @ 825F6F9 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F71C:: @ 825F71C msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC9A, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 setvar VAR_0x8008, 64 setvar VAR_0x8009, 179 @@ -418,7 +418,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F71C:: @ 825F71C BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F73F:: @ 825F73F msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FD59, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 setvar VAR_0x8008, 64 setvar VAR_0x8009, 186 @@ -427,7 +427,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F73F:: @ 825F73F BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F762:: @ 825F762 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FD89, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 setvar VAR_0x8008, 64 setvar VAR_0x8009, 187 @@ -436,7 +436,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F762:: @ 825F762 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F785:: @ 825F785 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FDB9, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 setvar VAR_0x8008, 64 setvar VAR_0x8009, 196 @@ -445,7 +445,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F785:: @ 825F785 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7A8:: @ 825F7A8 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FDE8, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 setvar VAR_0x8008, 64 setvar VAR_0x8009, 198 diff --git a/data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc b/data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc index 85fd5e417..b4bfcbe40 100644 --- a/data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc +++ b/data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc @@ -21,7 +21,7 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252A5D:: @ 8252A5D BattleFrontier_BattlePyramidEmptySquare_EventScript_252A77:: @ 8252A77 special sub_81A8E7C delay 2 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252A77 setvar VAR_0x400D, 0 releaseall @@ -49,17 +49,17 @@ BattleFrontier_BattlePyramidEmptySquare_MapScript1_252AA2: @ 8252AA2 setvar VAR_0x8004, 1 setvar VAR_0x8005, 5 special sub_81A1780 - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39 - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B42 - compare_var_to_value VAR_RESULT, 3 + compare VAR_RESULT, 3 goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B42 - compare_var_to_value VAR_RESULT, 9 + compare VAR_RESULT, 9 goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B42 setvar VAR_0x8004, 14 setvar VAR_0x8005, 8 @@ -90,7 +90,7 @@ BattleFrontier_BattlePyramidTop_EventScript_252B66:: @ 8252B66 special sub_81A8E7C setvar VAR_0x8004, 14 special sub_81A8E7C - special sp000_heal_pokemon + special HealPlayerParty warpsilent BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY, 255, 7, 13 waitstate end @@ -134,7 +134,7 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252BE8:: @ 8252BE8 setvar VAR_0x8005, 2 copyvar VAR_0x8006, VAR_RESULT special sub_81A1780 - compare_var_to_value VAR_RESULT, 7 + compare VAR_RESULT, 7 goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252C45 setvar VAR_0x8004, 6 special sub_81A8E7C @@ -166,7 +166,7 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A:: @ 8252C6A setvar VAR_0x8004, 7 special sub_81A8E7C callstd 1 - compare_var_to_value VAR_0x8007, 0 + compare VAR_0x8007, 0 goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252C87 setvar VAR_0x8004, 8 special sub_81A8E7C diff --git a/data/scripts/maps/BattleFrontier_BattlePyramidLobby.inc b/data/scripts/maps/BattleFrontier_BattlePyramidLobby.inc index f5043f13e..9455479a7 100644 --- a/data/scripts/maps/BattleFrontier_BattlePyramidLobby.inc +++ b/data/scripts/maps/BattleFrontier_BattlePyramidLobby.inc @@ -52,7 +52,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_2507B1:: @ 82507B1 lockall setvar VAR_0x8004, 10 special sub_81A1780 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattlePyramidLobby_EventScript_2507D2 msgbox BattleFrontier_BattlePyramidLobby_Text_2517B5, 4 goto BattleFrontier_BattlePyramidLobby_EventScript_2507DA @@ -62,7 +62,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_2507D2:: @ 82507D2 BattleFrontier_BattlePyramidLobby_EventScript_2507DA:: @ 82507DA special sub_81B95E0 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, BattleFrontier_BattlePyramidLobby_EventScript_250DDB clearflag FLAG_SPECIAL_FLAG_0x4004 setvar VAR_0x8004, 8 @@ -70,7 +70,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_2507DA:: @ 82507DA special copy_player_party_from_sav1 setvar VAR_0x8004, 14 special sub_81A8E7C - special sp000_heal_pokemon + special HealPlayerParty message BattleFrontier_BattlePyramidLobby_Text_2519F8 waitmessage playse SE_EXPMAX @@ -100,7 +100,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250852:: @ 8250852 special copy_player_party_from_sav1 setvar VAR_0x8004, 14 special sub_81A8E7C - special sp000_heal_pokemon + special HealPlayerParty lockall message BattleFrontier_BattlePyramidLobby_Text_251B5A waitmessage @@ -153,7 +153,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250904:: @ 8250904 case 127, BattleFrontier_BattlePyramidLobby_EventScript_250AC4 setvar VAR_0x8004, 15 special sub_81A1780 - compare_var_to_value VAR_0x8004, 1 + compare VAR_0x8004, 1 goto_eq BattleFrontier_BattlePyramidLobby_EventScript_250A75 setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 @@ -166,7 +166,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250904:: @ 8250904 setvar VAR_0x8005, 3 special sub_80F9490 waitstate - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePyramidLobby_EventScript_250AC1 msgbox BattleFrontier_BattlePyramidLobby_Text_2514E6, 5 switch VAR_RESULT @@ -202,7 +202,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_2509A5:: @ 82509A5 delay 2 call BattleFrontier_BattlePyramidLobby_EventScript_27134F setvar VAR_0x4000, 255 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePyramidLobby_EventScript_250AAA BattleFrontier_BattlePyramidLobby_EventScript_250A21:: @ 8250A21 @@ -218,7 +218,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250A21:: @ 8250A21 setvar VAR_0x8006, 0 special sub_81A1780 setvar VAR_RESULT, 0 - special sp000_heal_pokemon + special HealPlayerParty warp BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE, 255, 1, 1 setvar VAR_0x4000, 0 waitstate @@ -285,7 +285,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250B28:: @ 8250B28 setvar VAR_0x8004, 1 setvar VAR_0x8005, 5 special sub_81A8E7C - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattlePyramidLobby_EventScript_250B53 setvar VAR_RESULT, 0 goto BattleFrontier_BattlePyramidLobby_EventScript_250BA4 @@ -303,7 +303,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250B66:: @ 8250B66 setvar VAR_0x8004, 1 setvar VAR_0x8005, 6 special sub_81A8E7C - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattlePyramidLobby_EventScript_250B91 setvar VAR_RESULT, 0 goto BattleFrontier_BattlePyramidLobby_EventScript_250BA4 @@ -440,7 +440,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250D56:: @ 8250D56 setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 special sub_81A8E7C - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePyramidLobby_EventScript_250D94 msgbox BattleFrontier_BattlePyramidLobby_Text_2515AD, 4 goto BattleFrontier_BattlePyramidLobby_EventScript_250D9C @@ -496,7 +496,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250DDB:: @ 8250DDB msgbox BattleFrontier_BattlePyramidLobby_Text_2517FC, 4 setflag FLAG_SPECIAL_FLAG_0x4004 special sub_81C6A94 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePyramidLobby_EventScript_250E00 message BattleFrontier_BattlePyramidLobby_Text_2518C6 waitmessage @@ -534,7 +534,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250E50:: @ 8250E50 BattleFrontier_BattlePyramidLobby_EventScript_250E60:: @ 8250E60 special sub_81B95E0 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattlePyramidLobby_EventScript_250E6F return diff --git a/data/scripts/maps/BattleFrontier_BattlePyramidTop.inc b/data/scripts/maps/BattleFrontier_BattlePyramidTop.inc index 5249a28d6..f10606ded 100644 --- a/data/scripts/maps/BattleFrontier_BattlePyramidTop.inc +++ b/data/scripts/maps/BattleFrontier_BattlePyramidTop.inc @@ -20,7 +20,7 @@ BattleFrontier_BattlePyramidTop_MapScript2_2550CE: @ 82550CE BattleFrontier_BattlePyramidTop_EventScript_2550D8:: @ 82550D8 setvar VAR_0x4001, 1 turnobject 255, 2 - compare_var_to_value VAR_0x400C, 0 + compare VAR_0x400C, 0 goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_2550F3 setobjectxyperm 2, 0, 0 @@ -30,7 +30,7 @@ BattleFrontier_BattlePyramidTop_EventScript_2550F3:: @ 82550F3 BattleFrontier_BattlePyramidTop_MapScript1_2550F4: @ 82550F4 setvar VAR_0x8004, 9 special sub_81A1780 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePyramidTop_EventScript_25510C call BattleFrontier_BattlePyramidTop_EventScript_242170 @@ -45,11 +45,11 @@ BattleFrontier_BattlePyramidTop_EventScript_25510C:: @ 825510C setvar VAR_0x8004, 1 setvar VAR_0x8005, 5 special sub_81A1780 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_eq BattleFrontier_BattlePyramidTop_EventScript_252B42 - compare_var_to_value VAR_RESULT, 3 + compare VAR_RESULT, 3 goto_eq BattleFrontier_BattlePyramidTop_EventScript_252B42 - compare_var_to_value VAR_RESULT, 9 + compare VAR_RESULT, 9 goto_eq BattleFrontier_BattlePyramidTop_EventScript_252B42 end @@ -88,9 +88,9 @@ BattleFrontier_BattlePyramidTop_EventScript_255193:: @ 8255193 BattleFrontier_BattlePyramidTop_EventScript_2551D0:: @ 82551D0 lock faceplayer - compare_var_to_value VAR_0x400D, 0 + compare VAR_0x400D, 0 goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_255236 - compare_var_to_value VAR_0x400C, 0 + compare VAR_0x400C, 0 goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_255240 msgbox BattleFrontier_BattlePyramidTop_Text_255410, 4 closemessage @@ -136,7 +136,7 @@ BattleFrontier_BattlePyramidTop_EventScript_255256:: @ 8255256 setvar VAR_0x8004, 1 setvar VAR_0x8005, 7 special sub_81A1780 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_2552D0 special SpawnScriptFieldObject applymovement 127, BattleFrontier_BattlePyramidTop_Movement_25540C @@ -160,14 +160,14 @@ BattleFrontier_BattlePyramidTop_EventScript_2552DA:: @ 82552DA msgbox BattleFrontier_BattlePyramidTop_Text_255846, 4 call BattleFrontier_BattlePyramidTop_EventScript_2553ED playbgm BGM_BATTLE_PYRAMID_SUMMIT, 0 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattlePyramidTop_EventScript_2552FB goto BattleFrontier_BattlePyramidTop_EventScript_252B42 BattleFrontier_BattlePyramidTop_EventScript_2552FB:: @ 82552FB setvar VAR_0x8004, 12 special sub_81A1780 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_25521A msgbox BattleFrontier_BattlePyramidTop_Text_255873, 4 playfanfare BGM_ME_BATTLE_SYMBOL @@ -183,7 +183,7 @@ BattleFrontier_BattlePyramidTop_EventScript_255335:: @ 8255335 setvar VAR_0x8004, 1 setvar VAR_0x8005, 7 special sub_81A1780 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_255388 special SpawnScriptFieldObject applymovement 127, BattleFrontier_BattlePyramidTop_Movement_25540C @@ -207,14 +207,14 @@ BattleFrontier_BattlePyramidTop_EventScript_255392:: @ 8255392 msgbox BattleFrontier_BattlePyramidTop_Text_255AA1, 4 call BattleFrontier_BattlePyramidTop_EventScript_2553ED playbgm BGM_BATTLE_PYRAMID_SUMMIT, 0 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattlePyramidTop_EventScript_2553B3 goto BattleFrontier_BattlePyramidTop_EventScript_252B42 BattleFrontier_BattlePyramidTop_EventScript_2553B3:: @ 82553B3 setvar VAR_0x8004, 12 special sub_81A1780 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_eq BattleFrontier_BattlePyramidTop_EventScript_25521A msgbox BattleFrontier_BattlePyramidTop_Text_255ACD, 4 playfanfare BGM_ME_BATTLE_SYMBOL diff --git a/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom.inc index 71f0cff2d..e8af66842 100644 --- a/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom.inc @@ -23,7 +23,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241B6C:: @ 8241B6C setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 special sub_81A1780 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241BC3 applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_24218D waitmovement 0 @@ -75,7 +75,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241C2F:: @ 8241C2F removeobject 1 setvar VAR_0x8004, 9 special sub_81A1780 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 5, BattleFrontier_BattleTowerBattleRoom_EventScript_241EC3 applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_24218D waitmovement 0 @@ -84,20 +84,20 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241C2F:: @ 8241C2F msgbox BattleFrontier_BattleTowerBattleRoom_Text_242217, 4 playfanfare BGM_ME_ASA waitfanfare - special sp000_heal_pokemon + special HealPlayerParty BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F:: @ 8241C8F setvar VAR_0x8004, 9 special sub_81A1780 copyvar VAR_0x400F, VAR_RESULT - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattleTowerBattleRoom_EventScript_241F0A setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 special sub_81A1780 call BattleFrontier_BattleTowerBattleRoom_EventScript_241E44 call BattleFrontier_BattleTowerBattleRoom_EventScript_23E8E0 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241D0A multichoice 19, 4, 103, 1 switch VAR_RESULT @@ -245,7 +245,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241EC3:: @ 8241EC3 return BattleFrontier_BattleTowerBattleRoom_EventScript_241F0A:: @ 8241F0A - compare_var_to_value VAR_0x4002, 1 + compare VAR_0x4002, 1 goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241F22 msgbox BattleFrontier_BattleTowerBattleRoom_Text_2424C2, 4 setvar VAR_0x4002, 1 @@ -254,7 +254,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241F22:: @ 8241F22 message BattleFrontier_BattleTowerBattleRoom_Text_242542 waitmessage call BattleFrontier_BattleTowerBattleRoom_EventScript_23E8E0 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241F79 multichoice 19, 4, 103, 1 switch VAR_RESULT @@ -289,7 +289,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241FAF:: @ 8241FAF setvar VAR_0x8004, 1 setvar VAR_0x8005, 7 special sub_81A1780 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattleTowerBattleRoom_EventScript_242029 msgbox BattleFrontier_BattleTowerBattleRoom_Text_242579, 4 setvar VAR_0x8004, 2 @@ -299,7 +299,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241FAF:: @ 8241FAF BattleFrontier_BattleTowerBattleRoom_EventScript_242029:: @ 8242029 msgbox BattleFrontier_BattleTowerBattleRoom_Text_24268C, 4 call BattleFrontier_BattleTowerBattleRoom_EventScript_24210E - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_242046 goto BattleFrontier_BattleTowerBattleRoom_EventScript_241C03 @@ -307,7 +307,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_242046:: @ 8242046 call BattleFrontier_BattleTowerBattleRoom_EventScript_241EBA setvar VAR_0x8004, 12 special sub_81A1780 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6 msgbox BattleFrontier_BattleTowerBattleRoom_Text_2426B4, 4 playfanfare BGM_ME_BATTLE_SYMBOL @@ -323,7 +323,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_242085:: @ 8242085 setvar VAR_0x8004, 1 setvar VAR_0x8005, 7 special sub_81A1780 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattleTowerBattleRoom_EventScript_2420B2 msgbox BattleFrontier_BattleTowerBattleRoom_Text_2427F9, 4 setvar VAR_0x8004, 2 @@ -333,7 +333,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_242085:: @ 8242085 BattleFrontier_BattleTowerBattleRoom_EventScript_2420B2:: @ 82420B2 msgbox BattleFrontier_BattleTowerBattleRoom_Text_2428E0, 4 call BattleFrontier_BattleTowerBattleRoom_EventScript_24210E - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_2420CF goto BattleFrontier_BattleTowerBattleRoom_EventScript_241C03 @@ -341,7 +341,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_2420CF:: @ 82420CF call BattleFrontier_BattleTowerBattleRoom_EventScript_241EBA setvar VAR_0x8004, 12 special sub_81A1780 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6 msgbox BattleFrontier_BattleTowerBattleRoom_Text_2428F7, 4 playfanfare BGM_ME_BATTLE_SYMBOL @@ -361,17 +361,17 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_24210E:: @ 824210E setvar VAR_0x8005, 6 setvar VAR_0x8006, 0 special sub_81A1780 - special sp000_heal_pokemon + special HealPlayerParty setvar VAR_0x8004, 0 setvar VAR_0x8005, 0 special sub_8163AC4 waitstate copyvar VAR_0x8004, VAR_0x40CE - compare_var_to_value VAR_0x8004, 3 + compare VAR_0x8004, 3 goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_24215A setvar VAR_0x8004, 18 special sub_81A1780 - special sp000_heal_pokemon + special HealPlayerParty setvar VAR_0x8004, 21 special sub_81A1780 @@ -485,11 +485,11 @@ BattleFrontier_BattleTowerBattleRoom_Movement_2421B2: @ 82421B2 BattleFrontier_BattleTowerBattleRoom2_EventScript_2421B8:: @ 82421B8 BattleFrontier_BattleTowerBattleRoom_EventScript_2421B8:: @ 82421B8 copyvar VAR_RESULT, VAR_0x40CE - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_2421E8 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_2421F2 - compare_var_to_value VAR_RESULT, 3 + compare VAR_RESULT, 3 goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_2421FC warp BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 255, 6, 6 waitstate diff --git a/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom2.inc b/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom2.inc index 2ea9c897b..1ee49477f 100644 --- a/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom2.inc +++ b/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom2.inc @@ -5,9 +5,9 @@ BattleFrontier_BattleTowerBattleRoom2_MapScripts:: @ 8248EE8 .byte 0 BattleFrontier_BattleTowerBattleRoom2_MapScript1_248EF8: @ 8248EF8 - compare_var_to_value VAR_0x40CE, 2 + compare VAR_0x40CE, 2 call_if 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_248F0F - compare_var_to_value VAR_0x40CE, 3 + compare VAR_0x40CE, 3 call_if 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_248F2F end @@ -15,7 +15,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_248F0F:: @ 8248F0F setvar VAR_0x8004, 14 special sub_8161F74 checkplayergender - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_248F29 setvar VAR_0x401F, 0 return @@ -48,7 +48,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_248F4D:: @ 8248F4D setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 special sub_81A1780 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_248FB4 applymovement 2, BattleFrontier_BattleTowerBattleRoom2_Movement_24953E applymovement 3, BattleFrontier_BattleTowerBattleRoom2_Movement_24953E @@ -70,7 +70,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_248FB4:: @ 8248FB4 applymovement 1, BattleFrontier_BattleTowerBattleRoom2_Movement_249528 applymovement 4, BattleFrontier_BattleTowerBattleRoom2_Movement_24952E waitmovement 0 - compare_var_to_value VAR_0x40CE, 3 + compare VAR_0x40CE, 3 goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249026 setvar VAR_0x8004, 7 setvar VAR_0x8005, 0 @@ -142,7 +142,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_2490AA:: @ 82490AA applymovement 5, BattleFrontier_BattleTowerBattleRoom2_Movement_249524 applymovement 6, BattleFrontier_BattleTowerBattleRoom2_Movement_249524 waitmovement 0 - compare_var_to_value VAR_0x40CE, 3 + compare VAR_0x40CE, 3 goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249118 msgbox BattleFrontier_BattleTowerBattleRoom2_Text_242217, 4 goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249121 @@ -157,21 +157,21 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249121:: @ 8249121 setvar VAR_0x8004, 3 setvar VAR_0x8005, 2 special sub_81A1780 - compare_var_to_value VAR_0x40CE, 3 + compare VAR_0x40CE, 3 call_if 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249514 playfanfare BGM_ME_ASA waitfanfare - special sp000_heal_pokemon + special HealPlayerParty BattleFrontier_BattleTowerBattleRoom2_EventScript_249143:: @ 8249143 setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 special sub_81A1780 call BattleFrontier_BattleTowerBattleRoom2_EventScript_2492FD - compare_var_to_value VAR_0x40CE, 3 + compare VAR_0x40CE, 3 goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249283 call BattleFrontier_BattleTowerBattleRoom2_EventScript_23E8E0 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_2491B1 multichoice 19, 4, 103, 1 switch VAR_RESULT @@ -256,7 +256,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_2492DB:: @ 82492DB end BattleFrontier_BattleTowerBattleRoom2_EventScript_2492FD:: @ 82492FD - compare_var_to_value VAR_0x40CE, 3 + compare VAR_0x40CE, 3 goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_24937E copyvar VAR_0x400F, VAR_RESULT switch VAR_0x400F @@ -374,7 +374,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249483:: @ 8249483 waitmessage special sub_813B568 waitstate - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattleTowerBattleRoom2_EventScript_24907E goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249412 end @@ -395,7 +395,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_2494DD:: @ 82494DD message BattleFrontier_BattleTowerBattleRoom2_Text_24244C waitmessage multichoicedefault 20, 8, 94, 1, 0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_2494FA goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249143 end diff --git a/data/scripts/maps/BattleFrontier_BattleTowerCorridor.inc b/data/scripts/maps/BattleFrontier_BattleTowerCorridor.inc index 3369e4d75..fc1327f41 100644 --- a/data/scripts/maps/BattleFrontier_BattleTowerCorridor.inc +++ b/data/scripts/maps/BattleFrontier_BattleTowerCorridor.inc @@ -4,7 +4,7 @@ BattleFrontier_BattleTowerCorridor_MapScripts:: @ 8241AAA .byte 0 BattleFrontier_BattleTowerCorridor_MapScript1_241AB5: @ 8241AB5 - compare_var_to_value VAR_0x8006, 1 + compare VAR_0x8006, 1 goto_eq BattleFrontier_BattleTowerCorridor_EventScript_241AD3 setmetatile 12, 0, 519, 0 setmetatile 12, 1, 527, 0 @@ -21,7 +21,7 @@ BattleFrontier_BattleTowerCorridor_MapScript2_241AE6: @ 8241AE6 BattleFrontier_BattleTowerCorridor_EventScript_241AF0:: @ 8241AF0 setvar VAR_0x4000, 1 - compare_var_to_value VAR_0x8006, 1 + compare VAR_0x8006, 1 goto_eq BattleFrontier_BattleTowerCorridor_EventScript_241B16 applymovement 1, BattleFrontier_BattleTowerCorridor_Movement_241B3A applymovement 255, BattleFrontier_BattleTowerCorridor_Movement_241B39 diff --git a/data/scripts/maps/BattleFrontier_BattleTowerCorridor2.inc b/data/scripts/maps/BattleFrontier_BattleTowerCorridor2.inc index 9910296df..cd81b47fd 100644 --- a/data/scripts/maps/BattleFrontier_BattleTowerCorridor2.inc +++ b/data/scripts/maps/BattleFrontier_BattleTowerCorridor2.inc @@ -5,9 +5,9 @@ BattleFrontier_BattleTowerCorridor2_MapScripts:: @ 8248D4A .byte 0 BattleFrontier_BattleTowerCorridor2_MapScript1_248D5A: @ 8248D5A - compare_var_to_value VAR_0x40CE, 2 + compare VAR_0x40CE, 2 call_if 1, BattleFrontier_BattleTowerCorridor2_EventScript_248D71 - compare_var_to_value VAR_0x40CE, 3 + compare VAR_0x40CE, 3 call_if 1, BattleFrontier_BattleTowerCorridor2_EventScript_248D91 end @@ -15,7 +15,7 @@ BattleFrontier_BattleTowerCorridor2_EventScript_248D71:: @ 8248D71 setvar VAR_0x8004, 14 special sub_8161F74 checkplayergender - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleTowerCorridor2_EventScript_248D8B setvar VAR_0x401F, 0 return @@ -87,13 +87,13 @@ BattleFrontier_BattleTowerCorridor2_EventScript_248DBC:: @ 8248DBC end BattleFrontier_BattleTowerCorridor2_EventScript_248E71:: @ 8248E71 - compare_var_to_value VAR_0x40CE, 0 + compare VAR_0x40CE, 0 call_if 1, BattleFrontier_BattleTowerCorridor2_EventScript_248E9E - compare_var_to_value VAR_0x40CE, 1 + compare VAR_0x40CE, 1 call_if 1, BattleFrontier_BattleTowerCorridor2_EventScript_248E9E - compare_var_to_value VAR_0x40CE, 2 + compare VAR_0x40CE, 2 call_if 1, BattleFrontier_BattleTowerCorridor2_EventScript_248EA8 - compare_var_to_value VAR_0x40CE, 3 + compare VAR_0x40CE, 3 call_if 1, BattleFrontier_BattleTowerCorridor2_EventScript_248EB2 return diff --git a/data/scripts/maps/BattleFrontier_BattleTowerElevator.inc b/data/scripts/maps/BattleFrontier_BattleTowerElevator.inc index ed5917c45..fe824b1ea 100644 --- a/data/scripts/maps/BattleFrontier_BattleTowerElevator.inc +++ b/data/scripts/maps/BattleFrontier_BattleTowerElevator.inc @@ -24,13 +24,13 @@ BattleFrontier_BattleTowerElevator_EventScript_2419F0:: @ 82419F0 end BattleFrontier_BattleTowerElevator_EventScript_241A28:: @ 8241A28 - compare_var_to_value VAR_0x40CE, 0 + compare VAR_0x40CE, 0 call_if 1, BattleFrontier_BattleTowerElevator_EventScript_241A55 - compare_var_to_value VAR_0x40CE, 1 + compare VAR_0x40CE, 1 call_if 1, BattleFrontier_BattleTowerElevator_EventScript_241A55 - compare_var_to_value VAR_0x40CE, 2 + compare VAR_0x40CE, 2 call_if 1, BattleFrontier_BattleTowerElevator_EventScript_241A5F - compare_var_to_value VAR_0x40CE, 3 + compare VAR_0x40CE, 3 call_if 1, BattleFrontier_BattleTowerElevator_EventScript_241A72 return diff --git a/data/scripts/maps/BattleFrontier_BattleTowerLobby.inc b/data/scripts/maps/BattleFrontier_BattleTowerLobby.inc index d21c607d8..a7ff05bfb 100644 --- a/data/scripts/maps/BattleFrontier_BattleTowerLobby.inc +++ b/data/scripts/maps/BattleFrontier_BattleTowerLobby.inc @@ -13,7 +13,7 @@ BattleFrontier_BattleTowerLobby_MapScript1_23E694: @ 823E694 call BattleFrontier_BattleTowerLobby_EventScript_28CC84 setvar VAR_0x8004, 10 special sub_81A085C - compare_var_to_value VAR_0x8004, 0 + compare VAR_0x8004, 0 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23E6B5 checkflag FLAG_0x934 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23E6C1 @@ -78,7 +78,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E758:: @ 823E758 faceplayer setvar VAR_0x8004, 10 special sub_81A1780 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23E778 message BattleFrontier_BattleTowerLobby_Text_23F60D waitmessage @@ -90,7 +90,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E778:: @ 823E778 BattleFrontier_BattleTowerLobby_EventScript_23E780:: @ 823E780 setvar VAR_0x8004, 5 special sub_8161F74 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23E7A5 message BattleFrontier_BattleTowerLobby_Text_23F844 waitmessage @@ -107,7 +107,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E7A5:: @ 823E7A5 setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 special sub_8161F74 - compare_var_to_value VAR_RESULT, 49 + compare VAR_RESULT, 49 goto_if 5, BattleFrontier_BattleTowerLobby_EventScript_23E7E2 msgbox BattleFrontier_BattleTowerLobby_Text_23F79D, 4 @@ -119,14 +119,14 @@ BattleFrontier_BattleTowerLobby_EventScript_23E7E2:: @ 823E7E2 end BattleFrontier_BattleTowerLobby_EventScript_23E7F2:: @ 823E7F2 - compare_var_to_value VAR_0x40CE, 2 + compare VAR_0x40CE, 2 goto_if 5, BattleFrontier_BattleTowerLobby_EventScript_23E81E checkflag FLAG_0x152 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23E81E setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 special sub_8161F74 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattleTowerLobby_EventScript_23E830 BattleFrontier_BattleTowerLobby_EventScript_23E81E:: @ 823E81E @@ -153,14 +153,14 @@ BattleFrontier_BattleTowerLobby_EventScript_23E84D:: @ 823E84D setvar VAR_0x8004, 8 special sub_81A1780 special copy_player_party_from_sav1 - special sp000_heal_pokemon + special HealPlayerParty setvar VAR_0x8004, 6 setvar VAR_0x8005, 0 special sub_8161F74 playse SE_SAVE waitse call BattleFrontier_BattleTowerLobby_EventScript_23E8E0 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23E8DF message BattleFrontier_BattleTowerLobby_Text_23FE3C waitmessage @@ -183,7 +183,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_23E8B4:: @ 823E8B4 BattleFrontier_BattleTowerLobby_EventScript_23E8B4:: @ 823E8B4 setvar VAR_0x8004, 19 special sub_81A1780 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23E8D7 playse SE_SAVE msgbox BattleFrontier_BattleTowerLobby_Text_2423CD, 4 @@ -214,7 +214,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E8E0:: @ 823E8E0 BattleFrontier_BattleTowerLobby_EventScript_23E8EE:: @ 823E8EE lock faceplayer - compare_var_to_value VAR_0x40CE, 0 + compare VAR_0x40CE, 0 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23E930 message BattleFrontier_BattleTowerLobby_Text_23F737 waitmessage @@ -263,7 +263,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E984:: @ 823E984 case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 setvar VAR_0x8004, 15 special sub_81A1780 - compare_var_to_value VAR_0x8004, 1 + compare VAR_0x8004, 1 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 @@ -276,7 +276,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E984:: @ 823E984 setvar VAR_0x8005, 3 special sub_80F9490 waitstate - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E3 msgbox BattleFrontier_BattleTowerLobby_Text_23FDC7, 5 switch VAR_RESULT @@ -304,7 +304,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EA2A:: @ 823EA2A delay 2 call BattleFrontier_BattleTowerLobby_EventScript_27134F setvar VAR_0x4000, 255 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0 incrementgamestat 30 setvar VAR_0x40BC, 1 @@ -343,7 +343,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EAED:: @ 823EAED case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 setvar VAR_0x8004, 15 special sub_81A1780 - compare_var_to_value VAR_0x8004, 1 + compare VAR_0x8004, 1 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 @@ -356,7 +356,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EAED:: @ 823EAED setvar VAR_0x8005, 4 special sub_80F9490 waitstate - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E3 msgbox BattleFrontier_BattleTowerLobby_Text_23FDC7, 5 switch VAR_RESULT @@ -384,7 +384,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EB93:: @ 823EB93 delay 2 call BattleFrontier_BattleTowerLobby_EventScript_27134F setvar VAR_0x4000, 255 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0 incrementgamestat 30 setvar VAR_0x40BC, 0 @@ -424,7 +424,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EC59:: @ 823EC59 case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 setvar VAR_0x8004, 15 special sub_81A1780 - compare_var_to_value VAR_0x8004, 1 + compare VAR_0x8004, 1 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 @@ -437,7 +437,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EC59:: @ 823EC59 setvar VAR_0x8005, 2 special sub_80F9490 waitstate - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E3 msgbox BattleFrontier_BattleTowerLobby_Text_23FDC7, 5 switch VAR_RESULT @@ -465,7 +465,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23ECFF:: @ 823ECFF delay 2 call BattleFrontier_BattleTowerLobby_EventScript_27134F setvar VAR_0x4000, 255 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0 incrementgamestat 30 setvar VAR_0x40BC, 0 @@ -504,7 +504,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EDC2:: @ 823EDC2 case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 setvar VAR_0x8004, 15 special sub_81A1780 - compare_var_to_value VAR_0x8004, 1 + compare VAR_0x8004, 1 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 @@ -517,7 +517,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EDC2:: @ 823EDC2 setvar VAR_0x8005, 2 special sub_80F9490 waitstate - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E3 msgbox BattleFrontier_BattleTowerLobby_Text_23FDC7, 5 switch VAR_RESULT @@ -548,11 +548,11 @@ BattleFrontier_BattleTowerLobby_EventScript_23EE68:: @ 823EE68 special sub_8161F74 call BattleFrontier_BattleTowerLobby_EventScript_27134F setvar VAR_0x4000, 255 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0 incrementgamestat 30 specialvar VAR_RESULT, sub_80093CC - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F3E8 goto BattleFrontier_BattleTowerLobby_EventScript_23F2C5 end @@ -605,9 +605,9 @@ BattleFrontier_BattleTowerLobby_EventScript_23EF80:: @ 823EF80 end BattleFrontier_BattleTowerLobby_EventScript_23EF8A:: @ 823EF8A - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23EFA1 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23EFAB end @@ -743,7 +743,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F108:: @ 823F108 setvar VAR_0x8004, 12 special sub_8161F74 delay 1 - compare_var_to_value VAR_RESULT, 6 + compare VAR_RESULT, 6 goto_if 5, BattleFrontier_BattleTowerLobby_EventScript_23F108 call BattleFrontier_BattleTowerLobby_EventScript_23F135 clearflag FLAG_0x077 @@ -754,7 +754,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F108:: @ 823F108 BattleFrontier_BattleTowerLobby_EventScript_23F135:: @ 823F135 call BattleFrontier_BattleTowerLobby_EventScript_23F1A7 - compare_var_to_value VAR_0x40CE, 3 + compare VAR_0x40CE, 3 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F152 msgbox BattleFrontier_BattleTowerLobby_Text_23FE11, 4 goto BattleFrontier_BattleTowerLobby_EventScript_23F15B @@ -807,13 +807,13 @@ BattleFrontier_BattleTowerLobby_Movement_23F1A0: @ 823F1A0 step_end BattleFrontier_BattleTowerLobby_EventScript_23F1A7:: @ 823F1A7 - compare_var_to_value VAR_0x40CE, 0 + compare VAR_0x40CE, 0 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F1D4 - compare_var_to_value VAR_0x40CE, 1 + compare VAR_0x40CE, 1 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F1D9 - compare_var_to_value VAR_0x40CE, 2 + compare VAR_0x40CE, 2 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F1DE - compare_var_to_value VAR_0x40CE, 3 + compare VAR_0x40CE, 3 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F1E3 return @@ -834,13 +834,13 @@ BattleFrontier_BattleTowerLobby_EventScript_23F1E3:: @ 823F1E3 return BattleFrontier_BattleTowerLobby_EventScript_23F1E8:: @ 823F1E8 - compare_var_to_value VAR_0x40CE, 0 + compare VAR_0x40CE, 0 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F215 - compare_var_to_value VAR_0x40CE, 1 + compare VAR_0x40CE, 1 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F21B - compare_var_to_value VAR_0x40CE, 2 + compare VAR_0x40CE, 2 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F221 - compare_var_to_value VAR_0x40CE, 3 + compare VAR_0x40CE, 3 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F227 return @@ -861,13 +861,13 @@ BattleFrontier_BattleTowerLobby_EventScript_23F227:: @ 823F227 return BattleFrontier_BattleTowerLobby_EventScript_23F22D:: @ 823F22D - compare_var_to_value VAR_0x40CE, 0 + compare VAR_0x40CE, 0 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F25A - compare_var_to_value VAR_0x40CE, 1 + compare VAR_0x40CE, 1 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F260 - compare_var_to_value VAR_0x40CE, 2 + compare VAR_0x40CE, 2 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F266 - compare_var_to_value VAR_0x40CE, 3 + compare VAR_0x40CE, 3 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F26C return @@ -888,13 +888,13 @@ BattleFrontier_BattleTowerLobby_EventScript_23F26C:: @ 823F26C return BattleFrontier_BattleTowerLobby_EventScript_23F272:: @ 823F272 - compare_var_to_value VAR_0x40CE, 0 + compare VAR_0x40CE, 0 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F29F - compare_var_to_value VAR_0x40CE, 1 + compare VAR_0x40CE, 1 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F2A5 - compare_var_to_value VAR_0x40CE, 2 + compare VAR_0x40CE, 2 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F2AB - compare_var_to_value VAR_0x40CE, 3 + compare VAR_0x40CE, 3 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F2B1 return @@ -934,25 +934,25 @@ BattleFrontier_BattleTowerLobby_EventScript_23F2C5:: @ 823F2C5 setvar VAR_0x8005, 0 special sub_80B2DA4 waitstate - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F3AF - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_eq BattleFrontier_BattleTowerLobby_EventScript_2772D2 - compare_var_to_value VAR_RESULT, 3 + compare VAR_RESULT, 3 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F327 - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F351 - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E6 - compare_var_to_value VAR_RESULT, 6 + compare VAR_RESULT, 6 goto_eq BattleFrontier_BattleTowerLobby_EventScript_2772C5 - compare_var_to_value VAR_RESULT, 11 + compare VAR_RESULT, 11 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F366 end BattleFrontier_BattleTowerLobby_EventScript_23F327:: @ 823F327 special sub_80097E8 - compare_var_to_value VAR_0x8005, 3 + compare VAR_0x8005, 3 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F33F msgbox BattleFrontier_BattleTowerLobby_Text_278255, 4 release @@ -973,11 +973,11 @@ BattleFrontier_BattleTowerLobby_EventScript_23F351:: @ 823F351 BattleFrontier_BattleTowerLobby_EventScript_23F366:: @ 823F366 special sub_80097E8 - compare_var_to_value VAR_0x8005, 0 + compare VAR_0x8005, 0 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F394 - compare_var_to_value VAR_0x8005, 1 + compare VAR_0x8005, 1 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F39D - compare_var_to_value VAR_0x8005, 2 + compare VAR_0x8005, 2 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F3A6 msgbox BattleFrontier_BattleTowerLobby_Text_2413DE, 4 release @@ -1034,26 +1034,26 @@ BattleFrontier_BattleTowerLobby_EventScript_23F3F3:: @ 823F3F3 BattleFrontier_BattleTowerLobby_EventScript_23F430:: @ 823F430 call BattleFrontier_BattleTowerLobby_EventScript_277B30 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F496 - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F3F3 - compare_var_to_value VAR_RESULT, 8 + compare VAR_RESULT, 8 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F430 - compare_var_to_value VAR_RESULT, 11 + compare VAR_RESULT, 11 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F366 release return BattleFrontier_BattleTowerLobby_EventScript_23F463:: @ 823F463 call BattleFrontier_BattleTowerLobby_EventScript_277B35 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F496 - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F3F3 - compare_var_to_value VAR_RESULT, 8 + compare VAR_RESULT, 8 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F463 - compare_var_to_value VAR_RESULT, 11 + compare VAR_RESULT, 11 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F366 release return diff --git a/data/scripts/maps/BattleFrontier_BattleTowerMultiBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleTowerMultiBattleRoom.inc index b2d411b64..c3ed02996 100644 --- a/data/scripts/maps/BattleFrontier_BattleTowerMultiBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattleTowerMultiBattleRoom.inc @@ -68,7 +68,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E41:: @ 8243E41 applymovement 255, BattleFrontier_BattleTowerMultiBattleRoom_Movement_2725A6 waitmovement 0 msgbox BattleFrontier_BattleTowerMultiBattleRoom_Text_244056, 4 - special sp000_heal_pokemon + special HealPlayerParty setvar VAR_0x4001, 1 releaseall end @@ -88,7 +88,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E7A:: @ 8243E7A message BattleFrontier_BattleTowerMultiBattleRoom_Text_244094 waitmessage multichoicedefault 20, 8, 94, 1, 0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E9D msgbox BattleFrontier_BattleTowerMultiBattleRoom_Text_24410C, 4 release @@ -192,9 +192,9 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F36:: @ 8243F36 waitmessage waitbuttonpress closemessage - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 call_if 5, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FD4 - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 call_if 1, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FDF removeobject VAR_LAST_TALKED setflag FLAG_0x152 diff --git a/data/scripts/maps/BattleFrontier_Lounge1.inc b/data/scripts/maps/BattleFrontier_Lounge1.inc index 72a3659f7..5449fa8ee 100644 --- a/data/scripts/maps/BattleFrontier_Lounge1.inc +++ b/data/scripts/maps/BattleFrontier_Lounge1.inc @@ -15,9 +15,9 @@ BattleFrontier_Lounge1_EventScript_25E775:: @ 825E775 BattleFrontier_Lounge1_EventScript_25E792:: @ 825E792 special sub_81B94B0 waitstate - compare_var_to_value VAR_0x8004, 255 + compare VAR_0x8004, 255 goto_if 5, BattleFrontier_Lounge1_EventScript_25E7BF - compare_var_to_value VAR_0x8004, 255 + compare VAR_0x8004, 255 goto_eq BattleFrontier_Lounge1_EventScript_25E943 end @@ -31,16 +31,16 @@ BattleFrontier_Lounge1_EventScript_25E7B6:: @ 825E7B6 BattleFrontier_Lounge1_EventScript_25E7BF:: @ 825E7BF specialvar VAR_RESULT, sub_81396E0 - compare_var_to_value VAR_RESULT, 412 + compare VAR_RESULT, 412 goto_eq BattleFrontier_Lounge1_EventScript_25E7FF special sub_8139D98 - compare_var_to_value VAR_0x8005, 90 + compare VAR_0x8005, 90 goto_if 3, BattleFrontier_Lounge1_EventScript_25E87F - compare_var_to_value VAR_0x8005, 120 + compare VAR_0x8005, 120 goto_if 3, BattleFrontier_Lounge1_EventScript_25E88D - compare_var_to_value VAR_0x8005, 150 + compare VAR_0x8005, 150 goto_if 3, BattleFrontier_Lounge1_EventScript_25E89B - compare_var_to_value VAR_0x8005, 151 + compare VAR_0x8005, 151 goto_if 4, BattleFrontier_Lounge1_EventScript_25E8A9 end @@ -50,28 +50,28 @@ BattleFrontier_Lounge1_EventScript_25E7FF:: @ 825E7FF end BattleFrontier_Lounge1_EventScript_25E80D:: @ 825E80D - compare_var_to_value VAR_0x8006, 0 + compare VAR_0x8006, 0 goto_eq BattleFrontier_Lounge1_EventScript_25E8B7 - compare_var_to_value VAR_0x8006, 1 + compare VAR_0x8006, 1 goto_eq BattleFrontier_Lounge1_EventScript_25E8C5 - compare_var_to_value VAR_0x8006, 2 + compare VAR_0x8006, 2 goto_eq BattleFrontier_Lounge1_EventScript_25E8D3 - compare_var_to_value VAR_0x8006, 3 + compare VAR_0x8006, 3 goto_eq BattleFrontier_Lounge1_EventScript_25E8E1 - compare_var_to_value VAR_0x8006, 4 + compare VAR_0x8006, 4 goto_eq BattleFrontier_Lounge1_EventScript_25E8EF - compare_var_to_value VAR_0x8006, 5 + compare VAR_0x8006, 5 goto_eq BattleFrontier_Lounge1_EventScript_25E8FD end BattleFrontier_Lounge1_EventScript_25E850:: @ 825E850 - compare_var_to_value VAR_0x8007, 15 + compare VAR_0x8007, 15 goto_if 3, BattleFrontier_Lounge1_EventScript_25E90B - compare_var_to_value VAR_0x8007, 25 + compare VAR_0x8007, 25 goto_if 3, BattleFrontier_Lounge1_EventScript_25E919 - compare_var_to_value VAR_0x8007, 30 + compare VAR_0x8007, 30 goto_if 3, BattleFrontier_Lounge1_EventScript_25E927 - compare_var_to_value VAR_0x8007, 31 + compare VAR_0x8007, 31 goto_if 4, BattleFrontier_Lounge1_EventScript_25E935 end diff --git a/data/scripts/maps/BattleFrontier_Lounge2.inc b/data/scripts/maps/BattleFrontier_Lounge2.inc index 6b43747cc..d5fee28e9 100644 --- a/data/scripts/maps/BattleFrontier_Lounge2.inc +++ b/data/scripts/maps/BattleFrontier_Lounge2.inc @@ -17,29 +17,29 @@ BattleFrontier_Lounge2_EventScript_26065F:: @ 826065F end BattleFrontier_Lounge2_EventScript_26066D:: @ 826066D - compare_var_to_value VAR_0x402F, 0 + compare VAR_FRONTIER_MANIAC_FACILITY, 0 call_if 1, BattleFrontier_Lounge2_EventScript_26070A - compare_var_to_value VAR_0x402F, 1 + compare VAR_FRONTIER_MANIAC_FACILITY, 1 call_if 1, BattleFrontier_Lounge2_EventScript_26070F - compare_var_to_value VAR_0x402F, 2 + compare VAR_FRONTIER_MANIAC_FACILITY, 2 call_if 1, BattleFrontier_Lounge2_EventScript_260714 - compare_var_to_value VAR_0x402F, 3 + compare VAR_FRONTIER_MANIAC_FACILITY, 3 call_if 1, BattleFrontier_Lounge2_EventScript_260719 - compare_var_to_value VAR_0x402F, 4 + compare VAR_FRONTIER_MANIAC_FACILITY, 4 call_if 1, BattleFrontier_Lounge2_EventScript_26071E - compare_var_to_value VAR_0x402F, 5 + compare VAR_FRONTIER_MANIAC_FACILITY, 5 call_if 1, BattleFrontier_Lounge2_EventScript_260723 - compare_var_to_value VAR_0x402F, 6 + compare VAR_FRONTIER_MANIAC_FACILITY, 6 call_if 1, BattleFrontier_Lounge2_EventScript_260728 - compare_var_to_value VAR_0x402F, 7 + compare VAR_FRONTIER_MANIAC_FACILITY, 7 call_if 1, BattleFrontier_Lounge2_EventScript_26072D - compare_var_to_value VAR_0x402F, 8 + compare VAR_FRONTIER_MANIAC_FACILITY, 8 call_if 1, BattleFrontier_Lounge2_EventScript_260732 - compare_var_to_value VAR_0x402F, 9 + compare VAR_FRONTIER_MANIAC_FACILITY, 9 call_if 1, BattleFrontier_Lounge2_EventScript_260737 - compare_var_to_value VAR_0x402F, 3 + compare VAR_FRONTIER_MANIAC_FACILITY, 3 call_if 3, BattleFrontier_Lounge2_EventScript_2606F8 - compare_var_to_value VAR_0x402F, 4 + compare VAR_FRONTIER_MANIAC_FACILITY, 4 call_if 4, BattleFrontier_Lounge2_EventScript_260701 special sub_8139F20 waitmessage diff --git a/data/scripts/maps/BattleFrontier_Lounge3.inc b/data/scripts/maps/BattleFrontier_Lounge3.inc index 0612ccb8e..b8d52deec 100644 --- a/data/scripts/maps/BattleFrontier_Lounge3.inc +++ b/data/scripts/maps/BattleFrontier_Lounge3.inc @@ -7,7 +7,7 @@ BattleFrontier_Lounge3_EventScript_261D83:: @ 8261D83 checkflag FLAG_0x157 goto_eq BattleFrontier_Lounge3_EventScript_261EF9 call BattleFrontier_Lounge3_EventScript_261EA0 - compare_var_to_value VAR_0x8004, 2 + compare VAR_0x8004, 2 goto_if 3, BattleFrontier_Lounge3_EventScript_261EEB setflag FLAG_0x157 msgbox BattleFrontier_Lounge3_Text_262061, 4 @@ -19,10 +19,10 @@ BattleFrontier_Lounge3_EventScript_261DAF:: @ 8261DAF waitmessage waitbuttonpress msgbox BattleFrontier_Lounge3_Text_262A60, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_Lounge3_EventScript_261FA5 msgbox BattleFrontier_Lounge3_Text_262ABD, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_Lounge3_EventScript_261FA5 message BattleFrontier_Lounge3_Text_262B42 waitmessage @@ -32,7 +32,7 @@ BattleFrontier_Lounge3_EventScript_261DAF:: @ 8261DAF BattleFrontier_Lounge3_EventScript_261DE9:: @ 8261DE9 multichoice 20, 4, 87, 0 - copyvar VAR_0x4032, VAR_RESULT + copyvar VAR_FRONTIER_GAMBLER_AMOUNT_BET, VAR_RESULT switch VAR_RESULT case 0, BattleFrontier_Lounge3_EventScript_261E30 case 1, BattleFrontier_Lounge3_EventScript_261E3B @@ -58,7 +58,7 @@ BattleFrontier_Lounge3_EventScript_261E46:: @ 8261E46 BattleFrontier_Lounge3_EventScript_261E51:: @ 8261E51 specialvar VAR_0x4001, sub_813AA04 - compare_var_to_var VAR_0x4001, VAR_0x8008 + compare VAR_0x4001, VAR_0x8008 goto_if 4, BattleFrontier_Lounge3_EventScript_261E75 msgbox BattleFrontier_Lounge3_Text_262B6E, 4 message BattleFrontier_Lounge3_Text_262B42 @@ -69,7 +69,7 @@ BattleFrontier_Lounge3_EventScript_261E51:: @ 8261E51 BattleFrontier_Lounge3_EventScript_261E75:: @ 8261E75 copyvar VAR_0x8004, VAR_0x8008 special sub_813A9A4 - setvar VAR_0x4033, 1 + setvar VAR_FRONTIER_GAMBLER_PLACED_BET_F, 1 special sub_813A8FC playse SE_REGI msgbox BattleFrontier_Lounge3_Text_262BE0, 4 @@ -113,37 +113,37 @@ BattleFrontier_Lounge3_EventScript_261EEB:: @ 8261EEB BattleFrontier_Lounge3_EventScript_261EF9:: @ 8261EF9 msgbox BattleFrontier_Lounge3_Text_26346B, 4 - compare_var_to_value VAR_0x4033, 1 + compare VAR_FRONTIER_GAMBLER_PLACED_BET_F, 1 goto_if 4, BattleFrontier_Lounge3_EventScript_261F12 goto BattleFrontier_Lounge3_EventScript_261DAF end BattleFrontier_Lounge3_EventScript_261F12:: @ 8261F12 - compare_var_to_value VAR_0x4033, 1 + compare VAR_FRONTIER_GAMBLER_PLACED_BET_F, 1 goto_eq BattleFrontier_Lounge3_EventScript_261F9E - compare_var_to_value VAR_0x4033, 2 + compare VAR_FRONTIER_GAMBLER_PLACED_BET_F, 2 goto_eq BattleFrontier_Lounge3_EventScript_261F2E goto BattleFrontier_Lounge3_EventScript_261F71 end BattleFrontier_Lounge3_EventScript_261F2E:: @ 8261F2E msgbox BattleFrontier_Lounge3_Text_263334, 4 - compare_var_to_value VAR_0x4032, 0 + compare VAR_FRONTIER_GAMBLER_AMOUNT_BET, 0 call_if 1, BattleFrontier_Lounge3_EventScript_261F80 - compare_var_to_value VAR_0x4032, 1 + compare VAR_FRONTIER_GAMBLER_AMOUNT_BET, 1 call_if 1, BattleFrontier_Lounge3_EventScript_261F8A - compare_var_to_value VAR_0x4032, 2 + compare VAR_FRONTIER_GAMBLER_AMOUNT_BET, 2 call_if 1, BattleFrontier_Lounge3_EventScript_261F94 msgbox BattleFrontier_Lounge3_Text_2633D4, 9 special sub_813A9D0 msgbox BattleFrontier_Lounge3_Text_2633F2, 4 - setvar VAR_0x4033, 0 + setvar VAR_FRONTIER_GAMBLER_PLACED_BET_F, 0 release end BattleFrontier_Lounge3_EventScript_261F71:: @ 8261F71 msgbox BattleFrontier_Lounge3_Text_263298, 4 - setvar VAR_0x4033, 0 + setvar VAR_FRONTIER_GAMBLER_PLACED_BET_F, 0 release end diff --git a/data/scripts/maps/BattleFrontier_Lounge5.inc b/data/scripts/maps/BattleFrontier_Lounge5.inc index 545fef22f..497857b63 100644 --- a/data/scripts/maps/BattleFrontier_Lounge5.inc +++ b/data/scripts/maps/BattleFrontier_Lounge5.inc @@ -5,16 +5,16 @@ BattleFrontier_Lounge5_EventScript_2645C6:: @ 82645C6 lock faceplayer msgbox BattleFrontier_Lounge5_Text_264632, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_Lounge5_EventScript_26460D special sub_81B94B0 waitstate lock faceplayer - compare_var_to_value VAR_0x8004, 255 + compare VAR_0x8004, 255 goto_eq BattleFrontier_Lounge5_EventScript_26460D specialvar VAR_RESULT, sub_81396E0 - compare_var_to_value VAR_RESULT, 412 + compare VAR_RESULT, 412 goto_eq BattleFrontier_Lounge5_EventScript_264603 special sub_813A7B8 waitmessage diff --git a/data/scripts/maps/BattleFrontier_Lounge6.inc b/data/scripts/maps/BattleFrontier_Lounge6.inc index eacc18413..c779e7c76 100644 --- a/data/scripts/maps/BattleFrontier_Lounge6.inc +++ b/data/scripts/maps/BattleFrontier_Lounge6.inc @@ -11,17 +11,17 @@ BattleFrontier_Lounge6_EventScript_264FED:: @ 8264FED specialvar VAR_RESULT, sub_807E73C copyvar VAR_0x8009, VAR_RESULT msgbox BattleFrontier_Lounge6_Text_26508D, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_Lounge6_EventScript_26506B special sub_81B94B0 waitstate copyvar VAR_0x800A, VAR_0x8004 - compare_var_to_value VAR_0x8004, 255 + compare VAR_0x8004, 255 goto_eq BattleFrontier_Lounge6_EventScript_26506B copyvar VAR_0x8005, VAR_0x800A specialvar VAR_RESULT, sub_807E9D4 copyvar VAR_0x800B, VAR_RESULT - compare_var_to_var VAR_RESULT, VAR_0x8009 + compare VAR_RESULT, VAR_0x8009 goto_if 5, BattleFrontier_Lounge6_EventScript_265075 copyvar VAR_0x8004, VAR_0x8008 copyvar VAR_0x8005, VAR_0x800A diff --git a/data/scripts/maps/BattleFrontier_Lounge7.inc b/data/scripts/maps/BattleFrontier_Lounge7.inc index 53f0ed8d1..b12c911ce 100644 --- a/data/scripts/maps/BattleFrontier_Lounge7.inc +++ b/data/scripts/maps/BattleFrontier_Lounge7.inc @@ -250,10 +250,10 @@ BattleFrontier_Lounge7_EventScript_26564F:: @ 826564F buffernumberstring 1, VAR_0x8008 copyvar VAR_0x8004, VAR_0x400C msgbox BattleFrontier_Lounge7_Text_265921, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_Lounge7_EventScript_2656CA specialvar VAR_0x4001, sub_813AA04 - compare_var_to_var VAR_0x4001, VAR_0x8008 + compare VAR_0x4001, VAR_0x8008 goto_if 4, BattleFrontier_Lounge7_EventScript_265696 msgbox BattleFrontier_Lounge7_Text_265997, 4 goto BattleFrontier_Lounge7_EventScript_2656CA @@ -267,7 +267,7 @@ BattleFrontier_Lounge7_EventScript_265696:: @ 8265696 special sub_813ADB8 special sub_81B892C waitstate - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_Lounge7_EventScript_265645 msgbox BattleFrontier_Lounge7_Text_2659C7, 4 copyvar VAR_0x8004, VAR_0x8008 @@ -276,7 +276,7 @@ BattleFrontier_Lounge7_EventScript_265696:: @ 8265696 end BattleFrontier_Lounge7_EventScript_2656CA:: @ 82656CA - compare_var_to_value VAR_0x400E, 0 + compare VAR_0x400E, 0 goto_eq BattleFrontier_Lounge7_EventScript_26532F goto BattleFrontier_Lounge7_EventScript_26551F end diff --git a/data/scripts/maps/BattleFrontier_OutsideEast.inc b/data/scripts/maps/BattleFrontier_OutsideEast.inc index d1dc4d8e2..bf0d3ff16 100644 --- a/data/scripts/maps/BattleFrontier_OutsideEast.inc +++ b/data/scripts/maps/BattleFrontier_OutsideEast.inc @@ -10,7 +10,7 @@ BattleFrontier_OutsideEast_MapScript1_242C0F: @ 8242C0F BattleFrontier_OutsideEast_EventScript_242C19:: @ 8242C19 specialvar VAR_RESULT, sub_8138B80 - compare_var_to_value VAR_RESULT, 7 + compare VAR_RESULT, 7 goto_if 5, BattleFrontier_OutsideEast_EventScript_27374E removeobject VAR_LAST_TALKED return @@ -135,11 +135,11 @@ BattleFrontier_OutsideEast_EventScript_242CFC:: @ 8242CFC dowildbattle clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, sub_8138B80 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_OutsideEast_EventScript_242D60 - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 goto_eq BattleFrontier_OutsideEast_EventScript_242D60 - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_eq BattleFrontier_OutsideEast_EventScript_242D60 setflag FLAG_0x1C6 release diff --git a/data/scripts/maps/BattleFrontier_OutsideWest.inc b/data/scripts/maps/BattleFrontier_OutsideWest.inc index f35e5320e..f5886bfff 100644 --- a/data/scripts/maps/BattleFrontier_OutsideWest.inc +++ b/data/scripts/maps/BattleFrontier_OutsideWest.inc @@ -12,7 +12,7 @@ BattleFrontier_OutsideWest_EventScript_23D3F0:: @ 823D3F0 faceplayer msgbox BattleFrontier_OutsideWest_Text_23D808, 4 checkitem ITEM_SS_TICKET, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_OutsideWest_EventScript_23D44E message BattleFrontier_OutsideWest_Text_23D89D waitmessage @@ -35,7 +35,7 @@ BattleFrontier_OutsideWest_EventScript_23D44E:: @ 823D44E BattleFrontier_OutsideWest_EventScript_23D458:: @ 823D458 msgbox BattleFrontier_OutsideWest_Text_23D8F2, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_OutsideWest_EventScript_23D4AE msgbox BattleFrontier_OutsideWest_Text_23D94B, 4 call BattleFrontier_OutsideWest_EventScript_23D4BA @@ -46,7 +46,7 @@ BattleFrontier_OutsideWest_EventScript_23D458:: @ 823D458 BattleFrontier_OutsideWest_EventScript_23D483:: @ 823D483 msgbox BattleFrontier_OutsideWest_Text_23D90E, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_OutsideWest_EventScript_23D4AE msgbox BattleFrontier_OutsideWest_Text_23D94B, 4 call BattleFrontier_OutsideWest_EventScript_23D4BA @@ -144,13 +144,13 @@ BattleFrontier_OutsideWest_EventScript_23D57F:: @ 823D57F lock faceplayer delay 20 - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if 1, BattleFrontier_OutsideWest_EventScript_23D5BA - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 call_if 1, BattleFrontier_OutsideWest_EventScript_23D5C5 - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if 1, BattleFrontier_OutsideWest_EventScript_23D5BA - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if 1, BattleFrontier_OutsideWest_EventScript_23D5BA msgbox BattleFrontier_OutsideWest_Text_23DC36, 4 release @@ -169,13 +169,13 @@ BattleFrontier_OutsideWest_EventScript_23D5C6:: @ 823D5C6 faceplayer message BattleFrontier_OutsideWest_Text_23DCB0 waitmessage - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if 1, BattleFrontier_OutsideWest_EventScript_23D5FD - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 call_if 1, BattleFrontier_OutsideWest_EventScript_23D608 - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if 1, BattleFrontier_OutsideWest_EventScript_23D613 - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if 1, BattleFrontier_OutsideWest_EventScript_23D61E waitbuttonpress release @@ -226,7 +226,7 @@ BattleFrontier_OutsideWest_EventScript_23D635:: @ 823D635 faceplayer msgbox BattleFrontier_OutsideWest_Text_23DD3B, 4 random 2 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_OutsideWest_EventScript_23D653 goto BattleFrontier_OutsideWest_EventScript_23D65D end diff --git a/data/scripts/maps/BattleFrontier_RankingHall.inc b/data/scripts/maps/BattleFrontier_RankingHall.inc index 0d8c5cf24..b13bfe343 100644 --- a/data/scripts/maps/BattleFrontier_RankingHall.inc +++ b/data/scripts/maps/BattleFrontier_RankingHall.inc @@ -86,7 +86,7 @@ BattleFrontier_RankingHall_EventScript_25E54A:: @ 825E54A lock faceplayer msgbox BattleFrontier_RankingHall_Text_25E666, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_RankingHall_EventScript_25E569 msgbox BattleFrontier_RankingHall_Text_25E6B6, 4 release diff --git a/data/scripts/maps/BattleFrontier_ScottsHouse.inc b/data/scripts/maps/BattleFrontier_ScottsHouse.inc index bfeed5e49..5be72b9b5 100644 --- a/data/scripts/maps/BattleFrontier_ScottsHouse.inc +++ b/data/scripts/maps/BattleFrontier_ScottsHouse.inc @@ -48,7 +48,7 @@ BattleFrontier_ScottsHouse_EventScript_263704:: @ 8263704 goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC msgbox BattleFrontier_ScottsHouse_Text_2640BC, 4 giveitem_std ITEM_LANSAT_BERRY - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_ScottsHouse_EventScript_2637D0 setflag FLAG_0x05C setflag FLAG_0x004 @@ -72,7 +72,7 @@ BattleFrontier_ScottsHouse_EventScript_26376A:: @ 826376A goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC msgbox BattleFrontier_ScottsHouse_Text_264216, 4 giveitem_std ITEM_STARF_BERRY - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_ScottsHouse_EventScript_2637D0 setflag FLAG_0x1D2 setflag FLAG_0x004 @@ -91,9 +91,9 @@ BattleFrontier_ScottsHouse_EventScript_2637DA:: @ 82637DA BattleFrontier_ScottsHouse_EventScript_2637E4:: @ 82637E4 random 3 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_ScottsHouse_EventScript_263807 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_eq BattleFrontier_ScottsHouse_EventScript_263811 msgbox BattleFrontier_ScottsHouse_Text_263DDD, 4 release @@ -118,7 +118,7 @@ BattleFrontier_ScottsHouse_EventScript_26381B:: @ 826381B setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 special sub_8161F74 - compare_var_to_value VAR_RESULT, 50 + compare VAR_RESULT, 50 goto_if 4, BattleFrontier_ScottsHouse_EventScript_26387A setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 @@ -127,7 +127,7 @@ BattleFrontier_ScottsHouse_EventScript_26381B:: @ 826381B setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 special sub_8161F74 - compare_var_to_value VAR_RESULT, 50 + compare VAR_RESULT, 50 goto_if 4, BattleFrontier_ScottsHouse_EventScript_26387A goto BattleFrontier_ScottsHouse_EventScript_2637E4 end @@ -135,7 +135,7 @@ BattleFrontier_ScottsHouse_EventScript_26381B:: @ 826381B BattleFrontier_ScottsHouse_EventScript_26387A:: @ 826387A msgbox BattleFrontier_ScottsHouse_Text_264412, 4 givedecoration_std 42 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_ScottsHouse_EventScript_2638A0 setflag FLAG_0x0ED setflag FLAG_0x003 @@ -161,7 +161,7 @@ BattleFrontier_ScottsHouse_EventScript_2638B4:: @ 82638B4 setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 special sub_8161F74 - compare_var_to_value VAR_RESULT, 100 + compare VAR_RESULT, 100 goto_if 4, BattleFrontier_ScottsHouse_EventScript_263913 setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 @@ -170,7 +170,7 @@ BattleFrontier_ScottsHouse_EventScript_2638B4:: @ 82638B4 setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 special sub_8161F74 - compare_var_to_value VAR_RESULT, 100 + compare VAR_RESULT, 100 goto_if 4, BattleFrontier_ScottsHouse_EventScript_263913 goto BattleFrontier_ScottsHouse_EventScript_2637E4 end @@ -178,7 +178,7 @@ BattleFrontier_ScottsHouse_EventScript_2638B4:: @ 82638B4 BattleFrontier_ScottsHouse_EventScript_263913:: @ 8263913 msgbox BattleFrontier_ScottsHouse_Text_26449F, 4 givedecoration_std 43 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_ScottsHouse_EventScript_2638A0 setflag FLAG_0x0EE setflag FLAG_0x003 @@ -194,23 +194,23 @@ BattleFrontier_ScottsHouse_EventScript_263943:: @ 8263943 msgbox BattleFrontier_ScottsHouse_Text_263A3F, 4 closemessage delay 30 - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if 1, BattleFrontier_ScottsHouse_EventScript_263A13 - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 call_if 1, BattleFrontier_ScottsHouse_EventScript_263A1E - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if 1, BattleFrontier_ScottsHouse_EventScript_263A29 - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if 1, BattleFrontier_ScottsHouse_EventScript_263A34 msgbox BattleFrontier_ScottsHouse_Text_263B29, 4 applymovement 1, BattleFrontier_ScottsHouse_Movement_27259E waitmovement 0 msgbox BattleFrontier_ScottsHouse_Text_263BD4, 4 - compare_var_to_value VAR_0x40D1, 13 + compare VAR_0x40D1, 13 goto_eq BattleFrontier_ScottsHouse_EventScript_2639BC - compare_var_to_value VAR_0x40D1, 9 + compare VAR_0x40D1, 9 goto_if 4, BattleFrontier_ScottsHouse_EventScript_2639CB - compare_var_to_value VAR_0x40D1, 6 + compare VAR_0x40D1, 6 goto_if 4, BattleFrontier_ScottsHouse_EventScript_2639DA goto BattleFrontier_ScottsHouse_EventScript_2639E9 end diff --git a/data/scripts/maps/BirthIsland_Exterior.inc b/data/scripts/maps/BirthIsland_Exterior.inc index 8ea18a673..7d521e6df 100644 --- a/data/scripts/maps/BirthIsland_Exterior.inc +++ b/data/scripts/maps/BirthIsland_Exterior.inc @@ -38,7 +38,7 @@ BirthIsland_Exterior_MapScript1_267F65: @ 8267F65 BirthIsland_Exterior_EventScript_267F6F:: @ 8267F6F specialvar VAR_RESULT, sub_8138B80 - compare_var_to_value VAR_RESULT, 7 + compare VAR_RESULT, 7 goto_if 5, BirthIsland_Exterior_EventScript_27374E removeobject 2 return @@ -88,15 +88,15 @@ BirthIsland_Exterior_EventScript_267FC1:: @ 8267FC1 setvar VAR_0x8006, 0 special DoScriptedWildBattle setflag FLAG_SYS_CTRL_OBJ_DELETE - special sub_80B0934 + special BattleSetup_StartLegendaryBattle waitstate clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, sub_8138B80 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BirthIsland_Exterior_EventScript_26803B - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 goto_eq BirthIsland_Exterior_EventScript_268049 - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_eq BirthIsland_Exterior_EventScript_268049 setflag FLAG_0x1AD release diff --git a/data/scripts/maps/BirthIsland_Harbor.inc b/data/scripts/maps/BirthIsland_Harbor.inc index 8021a1de6..bf82aa6d1 100644 --- a/data/scripts/maps/BirthIsland_Harbor.inc +++ b/data/scripts/maps/BirthIsland_Harbor.inc @@ -5,7 +5,7 @@ BirthIsland_Harbor_EventScript_26805D:: @ 826805D lock faceplayer msgbox BirthIsland_Harbor_Text_2C6B90, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BirthIsland_Harbor_EventScript_2680A2 msgbox BirthIsland_Harbor_Text_2A6A5D, 4 closemessage diff --git a/data/scripts/maps/DesertRuins.inc b/data/scripts/maps/DesertRuins.inc index bb2f6d23d..fdd8515e9 100644 --- a/data/scripts/maps/DesertRuins.inc +++ b/data/scripts/maps/DesertRuins.inc @@ -11,7 +11,7 @@ DesertRuins_MapScript1_22D96B: @ 822D96B DesertRuins_EventScript_22D975:: @ 822D975 specialvar VAR_RESULT, sub_8138B80 - compare_var_to_value VAR_RESULT, 7 + compare VAR_RESULT, 7 goto_if 5, DesertRuins_EventScript_27374E removeobject VAR_LAST_TALKED return @@ -72,15 +72,15 @@ DesertRuins_EventScript_22DA02:: @ 822DA02 waitmoncry setwildbattle SPECIES_REGIROCK, 40, ITEM_NONE setflag FLAG_SYS_CTRL_OBJ_DELETE - special sub_80B0A74 + special StartRegiBattle waitstate clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, sub_8138B80 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq DesertRuins_EventScript_22DA49 - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 goto_eq DesertRuins_EventScript_22DA52 - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_eq DesertRuins_EventScript_22DA52 setflag FLAG_0x1BB release diff --git a/data/scripts/maps/DewfordTown.inc b/data/scripts/maps/DewfordTown.inc index c00586316..f78d4ea15 100644 --- a/data/scripts/maps/DewfordTown.inc +++ b/data/scripts/maps/DewfordTown.inc @@ -43,7 +43,7 @@ DewfordTown_EventScript_1E957A:: @ 81E957A DewfordTown_EventScript_1E9585:: @ 81E9585 msgbox DewfordTown_Text_1E9B24, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq DewfordTown_EventScript_1E95A2 msgbox DewfordTown_Text_1E9BD9, 4 release @@ -77,9 +77,9 @@ DewfordTown_EventScript_1E95D5:: @ 81E95D5 checkflag FLAG_0x101 goto_eq DewfordTown_EventScript_1E962A msgbox DewfordTown_Text_1E9DD1, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq DewfordTown_EventScript_1E95FF - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq DewfordTown_EventScript_1E9620 end @@ -100,9 +100,9 @@ DewfordTown_EventScript_1E962A:: @ 81E962A message DewfordTown_Text_1E9FB8 waitmessage multichoice 20, 8, 50, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq DewfordTown_EventScript_1E964C - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq DewfordTown_EventScript_1E9656 end @@ -599,9 +599,9 @@ DewfordTown_EventScript_1E9922:: @ 81E9922 faceplayer call DewfordTown_EventScript_271E8B msgbox DewfordTown_Text_1EA136, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq DewfordTown_EventScript_1E9948 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq DewfordTown_EventScript_1E9952 end @@ -616,15 +616,15 @@ DewfordTown_EventScript_1E9952:: @ 81E9952 call DewfordTown_EventScript_271E7C lock faceplayer - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq DewfordTown_EventScript_1E997D - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq DewfordTown_EventScript_1E9994 end DewfordTown_EventScript_1E997D:: @ 81E997D incrementgamestat 2 - compare_var_to_value VAR_0x8004, 0 + compare VAR_0x8004, 0 goto_eq DewfordTown_EventScript_1E999E msgbox DewfordTown_Text_1EA2AA, 4 release diff --git a/data/scripts/maps/DewfordTown_Gym.inc b/data/scripts/maps/DewfordTown_Gym.inc index a3f996f25..b5b7c603c 100644 --- a/data/scripts/maps/DewfordTown_Gym.inc +++ b/data/scripts/maps/DewfordTown_Gym.inc @@ -11,17 +11,17 @@ DewfordTown_Gym_EventScript_1FC648:: @ 81FC648 goto_eq DewfordTown_Gym_EventScript_1FC6A2 call DewfordTown_Gym_EventScript_1FC768 copyvar VAR_0x8001, VAR_0x8000 - compare_var_to_value VAR_0x8000, 0 + compare VAR_0x8000, 0 goto_eq DewfordTown_Gym_EventScript_1FC6BE - compare_var_to_value VAR_0x8000, 1 + compare VAR_0x8000, 1 goto_eq DewfordTown_Gym_EventScript_1FC6BA - compare_var_to_value VAR_0x8000, 2 + compare VAR_0x8000, 2 goto_eq DewfordTown_Gym_EventScript_1FC6B6 - compare_var_to_value VAR_0x8000, 3 + compare VAR_0x8000, 3 goto_eq DewfordTown_Gym_EventScript_1FC6B2 - compare_var_to_value VAR_0x8000, 4 + compare VAR_0x8000, 4 goto_eq DewfordTown_Gym_EventScript_1FC6AE - compare_var_to_value VAR_0x8000, 5 + compare VAR_0x8000, 5 goto_eq DewfordTown_Gym_EventScript_1FC6AA goto DewfordTown_Gym_EventScript_1FC6A6 @@ -60,20 +60,20 @@ DewfordTown_Gym_EventScript_1FC6BE:: @ 81FC6BE DewfordTown_Gym_EventScript_1FC6C2:: @ 81FC6C2 call DewfordTown_Gym_EventScript_1FC768 nop1 - compare_var_to_var VAR_0x8000, VAR_0x8001 + compare VAR_0x8000, VAR_0x8001 goto_eq DewfordTown_Gym_EventScript_1FC71A copyvar VAR_0x8001, VAR_0x8000 - compare_var_to_value VAR_0x8000, 1 + compare VAR_0x8000, 1 goto_eq DewfordTown_Gym_EventScript_1FC71B - compare_var_to_value VAR_0x8000, 2 + compare VAR_0x8000, 2 goto_eq DewfordTown_Gym_EventScript_1FC726 - compare_var_to_value VAR_0x8000, 3 + compare VAR_0x8000, 3 goto_eq DewfordTown_Gym_EventScript_1FC731 - compare_var_to_value VAR_0x8000, 4 + compare VAR_0x8000, 4 goto_eq DewfordTown_Gym_EventScript_1FC73C - compare_var_to_value VAR_0x8000, 5 + compare VAR_0x8000, 5 goto_eq DewfordTown_Gym_EventScript_1FC747 - compare_var_to_value VAR_0x8000, 6 + compare VAR_0x8000, 6 goto_eq DewfordTown_Gym_EventScript_1FC752 DewfordTown_Gym_EventScript_1FC71A:: @ 81FC71A @@ -157,8 +157,8 @@ DewfordTown_Gym_EventScript_1FC7C1:: @ 81FC7C1 DewfordTown_Gym_EventScript_1FC7C2:: @ 81FC7C2 trainerbattle 1, TRAINER_BRAWLY_1, 0, DewfordTown_Gym_Text_1FCF44, DewfordTown_Gym_Text_1FD008, DewfordTown_Gym_EventScript_1FC7F7 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq DewfordTown_Gym_EventScript_1FC89C checkflag FLAG_0x0A6 goto_if 0, DewfordTown_Gym_EventScript_1FC878 @@ -175,7 +175,7 @@ DewfordTown_Gym_EventScript_1FC7F7:: @ 81FC7F7 setflag FLAG_0x4F1 setflag FLAG_BADGE02_GET addvar VAR_0x4085, 1 - compare_var_to_value VAR_0x4085, 6 + compare VAR_0x4085, 6 call_if 1, DewfordTown_Gym_EventScript_271E84 setvar VAR_0x8008, 2 call DewfordTown_Gym_EventScript_271F43 @@ -195,7 +195,7 @@ DewfordTown_Gym_EventScript_1FC7F7:: @ 81FC7F7 DewfordTown_Gym_EventScript_1FC855:: @ 81FC855 giveitem_std ITEM_TM08 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq DewfordTown_Gym_EventScript_27205E msgbox DewfordTown_Gym_Text_1FD181, 4 setflag FLAG_0x0A6 @@ -203,7 +203,7 @@ DewfordTown_Gym_EventScript_1FC855:: @ 81FC855 DewfordTown_Gym_EventScript_1FC878:: @ 81FC878 giveitem_std ITEM_TM08 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq DewfordTown_Gym_EventScript_272054 msgbox DewfordTown_Gym_Text_1FD181, 4 setflag FLAG_0x0A6 diff --git a/data/scripts/maps/DewfordTown_Hall.inc b/data/scripts/maps/DewfordTown_Hall.inc index 9da607c27..3f9518722 100644 --- a/data/scripts/maps/DewfordTown_Hall.inc +++ b/data/scripts/maps/DewfordTown_Hall.inc @@ -6,7 +6,7 @@ DewfordTown_Hall_EventScript_1FD4D0:: @ 81FD4D0 faceplayer call DewfordTown_Hall_EventScript_271E8B special sub_81229C8 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq DewfordTown_Hall_EventScript_1FD4EF msgbox DewfordTown_Hall_Text_1FD818, 4 release @@ -31,9 +31,9 @@ DewfordTown_Hall_EventScript_1FD50A:: @ 81FD50A call DewfordTown_Hall_EventScript_271E8B special sub_811EF6C msgbox DewfordTown_Hall_Text_1FD948, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq DewfordTown_Hall_EventScript_1FD533 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq DewfordTown_Hall_EventScript_1FD53D end @@ -191,14 +191,14 @@ DewfordTown_Hall_EventScript_1FD739:: @ 81FD739 DewfordTown_Hall_EventScript_1FD73A:: @ 81FD73A applymovement 8, DewfordTown_Hall_Movement_1FD7D6 waitmovement 0 - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 goto_eq DewfordTown_Hall_EventScript_1FD75B - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 goto_eq DewfordTown_Hall_EventScript_1FD771 end DewfordTown_Hall_EventScript_1FD75B:: @ 81FD75B - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 goto_eq DewfordTown_Hall_EventScript_1FD739 applymovement 255, DewfordTown_Hall_Movement_2725A8 waitmovement 0 @@ -210,16 +210,16 @@ DewfordTown_Hall_EventScript_1FD771:: @ 81FD771 DewfordTown_Hall_EventScript_1FD772:: @ 81FD772 applymovement 7, DewfordTown_Hall_Movement_1FD7D8 waitmovement 0 - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 goto_eq DewfordTown_Hall_EventScript_1FD793 - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 goto_eq DewfordTown_Hall_EventScript_1FD7C0 end DewfordTown_Hall_EventScript_1FD793:: @ 81FD793 - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if 1, DewfordTown_Hall_EventScript_1FD7AA - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 call_if 1, DewfordTown_Hall_EventScript_1FD7B5 return @@ -234,7 +234,7 @@ DewfordTown_Hall_EventScript_1FD7B5:: @ 81FD7B5 return DewfordTown_Hall_EventScript_1FD7C0:: @ 81FD7C0 - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 goto_eq DewfordTown_Hall_EventScript_1FD739 applymovement 255, DewfordTown_Hall_Movement_2725A4 waitmovement 0 @@ -256,7 +256,7 @@ DewfordTown_Hall_EventScript_1FD7DA:: @ 81FD7DA goto_eq DewfordTown_Hall_EventScript_1FD80E msgbox DewfordTown_Hall_Text_1FE142, 4 giveitem_std ITEM_TM36 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq DewfordTown_Hall_EventScript_272054 setflag FLAG_0x0E6 release diff --git a/data/scripts/maps/DewfordTown_House2.inc b/data/scripts/maps/DewfordTown_House2.inc index ad7f530fc..1805164af 100644 --- a/data/scripts/maps/DewfordTown_House2.inc +++ b/data/scripts/maps/DewfordTown_House2.inc @@ -8,7 +8,7 @@ DewfordTown_House2_EventScript_1FE22E:: @ 81FE22E goto_eq DewfordTown_House2_EventScript_1FE267 msgbox DewfordTown_House2_Text_1FE27A, 4 giveitem_std ITEM_SILK_SCARF - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq DewfordTown_House2_EventScript_1FE25D setflag FLAG_0x121 release diff --git a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc index 605d2874e..15e03f092 100644 --- a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc +++ b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc @@ -53,16 +53,16 @@ EverGrandeCity_ChampionsRoom_EventScript_228A61:: @ 8228A61 closemessage playse SE_DOOR checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, EverGrandeCity_ChampionsRoom_EventScript_228ABC - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, EverGrandeCity_ChampionsRoom_EventScript_228AC1 addobject 2 call EverGrandeCity_ChampionsRoom_EventScript_228BFD checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq EverGrandeCity_ChampionsRoom_EventScript_228AC6 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq EverGrandeCity_ChampionsRoom_EventScript_228AFB end @@ -128,9 +128,9 @@ EverGrandeCity_ChampionsRoom_EventScript_228B30:: @ 8228B30 waitmovement 0 msgbox EverGrandeCity_ChampionsRoom_Text_2293EB, 4 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, EverGrandeCity_ChampionsRoom_EventScript_228BEB - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, EverGrandeCity_ChampionsRoom_EventScript_228BF4 closemessage applymovement 1, EverGrandeCity_ChampionsRoom_Movement_228C3F diff --git a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc index b732f7e88..8d42978d9 100644 --- a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc +++ b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc @@ -26,7 +26,7 @@ EverGrandeCity_DrakesRoom_EventScript_2286C5:: @ 82286C5 EverGrandeCity_DrakesRoom_MapScript1_2286D2: @ 82286D2 checkflag FLAG_0x4FE call_if 1, EverGrandeCity_DrakesRoom_EventScript_2286E7 - compare_var_to_value VAR_0x409C, 4 + compare VAR_0x409C, 4 call_if 1, EverGrandeCity_DrakesRoom_EventScript_2286ED end diff --git a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc b/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc index b0c5b40a1..ccca35370 100644 --- a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc +++ b/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc @@ -26,7 +26,7 @@ EverGrandeCity_GlaciasRoom_EventScript_22843B:: @ 822843B EverGrandeCity_GlaciasRoom_MapScript1_228448: @ 8228448 checkflag FLAG_0x4FD call_if 1, EverGrandeCity_GlaciasRoom_EventScript_22845D - compare_var_to_value VAR_0x409C, 3 + compare VAR_0x409C, 3 call_if 1, EverGrandeCity_GlaciasRoom_EventScript_228463 end diff --git a/data/scripts/maps/EverGrandeCity_HallOfFame.inc b/data/scripts/maps/EverGrandeCity_HallOfFame.inc index 5942aa1e0..20192a4e6 100644 --- a/data/scripts/maps/EverGrandeCity_HallOfFame.inc +++ b/data/scripts/maps/EverGrandeCity_HallOfFame.inc @@ -44,9 +44,9 @@ EverGrandeCity_HallOfFame_EventScript_229850:: @ 8229850 setvar VAR_0x4001, 1 call EverGrandeCity_HallOfFame_EventScript_2717C1 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq EverGrandeCity_HallOfFame_EventScript_2298E9 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq EverGrandeCity_HallOfFame_EventScript_2298F5 end diff --git a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc b/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc index 1d1f45742..e26763e2f 100644 --- a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc +++ b/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc @@ -26,7 +26,7 @@ EverGrandeCity_PhoebesRoom_EventScript_22819D:: @ 822819D EverGrandeCity_PhoebesRoom_MapScript1_2281AA: @ 82281AA checkflag FLAG_0x4FC call_if 1, EverGrandeCity_PhoebesRoom_EventScript_2281BF - compare_var_to_value VAR_0x409C, 2 + compare VAR_0x409C, 2 call_if 1, EverGrandeCity_PhoebesRoom_EventScript_2281C5 end diff --git a/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc b/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc index 488cd0e67..a9e27ec73 100644 --- a/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc @@ -36,11 +36,11 @@ EverGrandeCity_PokemonCenter_1F_EventScript_229A79:: @ 8229A79 faceplayer msgbox EverGrandeCity_PokemonCenter_1F_Text_229BF1, 4 closemessage - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if 1, EverGrandeCity_PokemonCenter_1F_EventScript_229AB6 - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if 1, EverGrandeCity_PokemonCenter_1F_EventScript_229AC1 - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if 1, EverGrandeCity_PokemonCenter_1F_EventScript_229AC1 addvar VAR_0x40D1, 1 setflag FLAG_0x1CF diff --git a/data/scripts/maps/EverGrandeCity_PokemonLeague_1F.inc b/data/scripts/maps/EverGrandeCity_PokemonLeague_1F.inc index fca1a9861..910523a87 100644 --- a/data/scripts/maps/EverGrandeCity_PokemonLeague_1F.inc +++ b/data/scripts/maps/EverGrandeCity_PokemonLeague_1F.inc @@ -51,9 +51,9 @@ EverGrandeCity_PokemonLeague_1F_EventScript_229636:: @ 8229636 checkflag FLAG_0x107 goto_eq EverGrandeCity_PokemonLeague_1F_EventScript_2296BB getplayerxy VAR_0x4000, VAR_0x4001 - compare_var_to_value VAR_0x4000, 11 + compare VAR_0x4000, 11 call_if 4, EverGrandeCity_PokemonLeague_1F_EventScript_229698 - compare_var_to_value VAR_0x4000, 8 + compare VAR_0x4000, 8 call_if 3, EverGrandeCity_PokemonLeague_1F_EventScript_2296A3 message EverGrandeCity_PokemonLeague_1F_Text_2296E8 waitmessage diff --git a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc b/data/scripts/maps/EverGrandeCity_SidneysRoom.inc index 782538b1e..405ffcfd6 100644 --- a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc +++ b/data/scripts/maps/EverGrandeCity_SidneysRoom.inc @@ -13,7 +13,7 @@ EverGrandeCity_SidneysRoom_MapScript1_227F16: @ 8227F16 EverGrandeCity_SidneysRoom_MapScript1_227F1D: @ 8227F1D checkflag FLAG_0x4FB call_if 1, EverGrandeCity_SidneysRoom_EventScript_227F32 - compare_var_to_value VAR_0x409C, 1 + compare VAR_0x409C, 1 call_if 1, EverGrandeCity_SidneysRoom_EventScript_227F38 end diff --git a/data/scripts/maps/FallarborTown_BattleTentBattleRoom.inc b/data/scripts/maps/FallarborTown_BattleTentBattleRoom.inc index a20ca4f1c..6fbc4266b 100644 --- a/data/scripts/maps/FallarborTown_BattleTentBattleRoom.inc +++ b/data/scripts/maps/FallarborTown_BattleTentBattleRoom.inc @@ -10,9 +10,9 @@ FallarborTown_BattleTentBattleRoom_MapScript1_2008A9: @ 82008A9 FallarborTown_BattleTentBattleRoom_EventScript_2008AF:: @ 82008AF checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq FallarborTown_BattleTentBattleRoom_EventScript_2008C7 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq FallarborTown_BattleTentBattleRoom_EventScript_2008D2 return @@ -38,7 +38,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_2008E7:: @ 82008E7 setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 special sub_81A1780 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if 5, FallarborTown_BattleTentBattleRoom_EventScript_200B73 FallarborTown_BattleTentBattleRoom_EventScript_20090F:: @ 820090F @@ -110,15 +110,15 @@ FallarborTown_BattleTentBattleRoom_EventScript_2009B3:: @ 82009B3 special sub_81A1780 playfanfare BGM_ME_ASA waitfanfare - special sp000_heal_pokemon + special HealPlayerParty FallarborTown_BattleTentBattleRoom_EventScript_200A2A:: @ 8200A2A setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 special sub_81A1780 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, FallarborTown_BattleTentBattleRoom_EventScript_200B43 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 call_if 1, FallarborTown_BattleTentBattleRoom_EventScript_200B4A multichoice 20, 6, 104, 1 switch VAR_RESULT @@ -163,7 +163,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_200AF3:: @ 8200AF3 setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 special sub_81A5238 - compare_var_to_value VAR_RESULT, 9999 + compare VAR_RESULT, 9999 goto_eq FallarborTown_BattleTentBattleRoom_EventScript_2009B3 addvar VAR_RESULT, 1 setvar VAR_0x8004, 2 diff --git a/data/scripts/maps/FallarborTown_BattleTentLobby.inc b/data/scripts/maps/FallarborTown_BattleTentLobby.inc index 7d79bb753..9fcc21667 100644 --- a/data/scripts/maps/FallarborTown_BattleTentLobby.inc +++ b/data/scripts/maps/FallarborTown_BattleTentLobby.inc @@ -132,7 +132,7 @@ FallarborTown_BattleTentLobby_EventScript_200001:: @ 8200001 faceplayer setvar VAR_0x8004, 1 special sub_81B9B80 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if 5, FallarborTown_BattleTentLobby_EventScript_1FFF84 special copy_player_party_to_sav1 msgbox FallarborTown_BattleTentLobby_Text_2C47EB, 4 @@ -153,7 +153,7 @@ FallarborTown_BattleTentLobby_EventScript_20005D:: @ 820005D setvar VAR_RESULT, 2 setvar VAR_0x8004, 15 special sub_81A1780 - compare_var_to_value VAR_0x8004, 1 + compare VAR_0x8004, 1 goto_eq FallarborTown_BattleTentLobby_EventScript_200176 setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 @@ -165,7 +165,7 @@ FallarborTown_BattleTentLobby_EventScript_20005D:: @ 820005D setvar VAR_0x8005, 3 special sub_80F9490 waitstate - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq FallarborTown_BattleTentLobby_EventScript_2001C2 msgbox FallarborTown_BattleTentLobby_Text_2C4B35, 5 switch VAR_RESULT @@ -193,7 +193,7 @@ FallarborTown_BattleTentLobby_EventScript_2000E2:: @ 82000E2 delay 2 call FallarborTown_BattleTentLobby_EventScript_27134F setvar VAR_0x4000, 255 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq FallarborTown_BattleTentLobby_EventScript_2001AB FallarborTown_BattleTentLobby_EventScript_20013C:: @ 820013C diff --git a/data/scripts/maps/FallarborTown_House1.inc b/data/scripts/maps/FallarborTown_House1.inc index 390f035b5..47459f8d5 100644 --- a/data/scripts/maps/FallarborTown_House1.inc +++ b/data/scripts/maps/FallarborTown_House1.inc @@ -7,7 +7,7 @@ FallarborTown_House1_EventScript_200F13:: @ 8200F13 checkflag FLAG_0x0E5 goto_eq FallarborTown_House1_EventScript_200FB2 checkitem ITEM_METEORITE, 1 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq FallarborTown_House1_EventScript_200F38 msgbox FallarborTown_House1_Text_200FEE, 4 release @@ -18,11 +18,11 @@ FallarborTown_House1_EventScript_200F38:: @ 8200F38 call_if 0, FallarborTown_House1_EventScript_200F8B checkflag FLAG_0x002 call_if 1, FallarborTown_House1_EventScript_200F9C - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq FallarborTown_House1_EventScript_200FA5 msgbox FallarborTown_House1_Text_201159, 4 giveitem_std ITEM_TM27 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq FallarborTown_House1_EventScript_272054 setvar VAR_0x8004, 280 call FallarborTown_House1_EventScript_2723E4 diff --git a/data/scripts/maps/FallarborTown_House2.inc b/data/scripts/maps/FallarborTown_House2.inc index cd3d6c3ee..b78756e0a 100644 --- a/data/scripts/maps/FallarborTown_House2.inc +++ b/data/scripts/maps/FallarborTown_House2.inc @@ -14,7 +14,7 @@ FallarborTown_House2_EventScript_201383:: @ 8201383 FallarborTown_House2_EventScript_2013A8:: @ 82013A8 checkitem ITEM_HEART_SCALE, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq FallarborTown_House2_EventScript_201452 msgbox FallarborTown_House2_Text_201541, 5 switch VAR_RESULT @@ -26,12 +26,12 @@ FallarborTown_House2_EventScript_2013D6:: @ 82013D6 msgbox FallarborTown_House2_Text_2015A5, 4 special sub_81B951C waitstate - compare_var_to_value VAR_0x8004, 255 + compare VAR_0x8004, 255 goto_eq FallarborTown_House2_EventScript_201452 special sub_81B98DC - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq FallarborTown_House2_EventScript_201444 - compare_var_to_value VAR_0x8005, 0 + compare VAR_0x8005, 0 goto_eq FallarborTown_House2_EventScript_201436 goto FallarborTown_House2_EventScript_20140C end @@ -40,7 +40,7 @@ FallarborTown_House2_EventScript_20140C:: @ 820140C msgbox FallarborTown_House2_Text_2015C3, 4 special sub_8160638 waitstate - compare_var_to_value VAR_0x8004, 0 + compare VAR_0x8004, 0 goto_eq FallarborTown_House2_EventScript_2013D6 msgbox FallarborTown_House2_Text_201627, 4 takeitem ITEM_HEART_SCALE, 1 diff --git a/data/scripts/maps/FarawayIsland_Entrance.inc b/data/scripts/maps/FarawayIsland_Entrance.inc index b13659abd..ff8af2e9f 100644 --- a/data/scripts/maps/FarawayIsland_Entrance.inc +++ b/data/scripts/maps/FarawayIsland_Entrance.inc @@ -20,7 +20,7 @@ FarawayIsland_Entrance_EventScript_267CA2:: @ 8267CA2 lock faceplayer msgbox FarawayIsland_Entrance_Text_2C6B42, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq FarawayIsland_Entrance_EventScript_267CE7 msgbox FarawayIsland_Entrance_Text_2A6A5D, 4 closemessage diff --git a/data/scripts/maps/FarawayIsland_Interior.inc b/data/scripts/maps/FarawayIsland_Interior.inc index f49d938a7..d3132b202 100644 --- a/data/scripts/maps/FarawayIsland_Interior.inc +++ b/data/scripts/maps/FarawayIsland_Interior.inc @@ -12,13 +12,13 @@ FarawayIsland_Interior_MapScript1_267D0F: @ 8267D0F FarawayIsland_Interior_EventScript_267D19:: @ 8267D19 specialvar VAR_RESULT, sub_8138B80 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq FarawayIsland_Interior_EventScript_267D4B - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 goto_eq FarawayIsland_Interior_EventScript_267D4B - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_eq FarawayIsland_Interior_EventScript_267D4B - compare_var_to_value VAR_RESULT, 10 + compare VAR_RESULT, 10 goto_eq FarawayIsland_Interior_EventScript_267D4B return @@ -34,7 +34,7 @@ FarawayIsland_Interior_MapScript1_267D54: @ 8267D54 FarawayIsland_Interior_EventScript_267D5E:: @ 8267D5E specialvar VAR_RESULT, sub_8138B80 - compare_var_to_value VAR_RESULT, 7 + compare VAR_RESULT, 7 goto_if 5, FarawayIsland_Interior_EventScript_27374E removeobject VAR_LAST_TALKED return @@ -129,13 +129,13 @@ FarawayIsland_Interior_EventScript_267DF2:: @ 8267DF2 message FarawayIsland_Interior_Text_2C6DFF waitse playmoncry SPECIES_MEW, 2 - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if 1, FarawayIsland_Interior_EventScript_267EAF - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 call_if 1, FarawayIsland_Interior_EventScript_267EBA - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if 1, FarawayIsland_Interior_EventScript_267EC5 - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if 1, FarawayIsland_Interior_EventScript_267ED0 special sub_81D4BEC delay 40 @@ -145,17 +145,17 @@ FarawayIsland_Interior_EventScript_267DF2:: @ 8267DF2 setvar VAR_0x8006, 0 special DoScriptedWildBattle setflag FLAG_SYS_CTRL_OBJ_DELETE - special sub_80B0934 + special BattleSetup_StartLegendaryBattle waitstate clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, sub_8138B80 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq FarawayIsland_Interior_EventScript_267E96 - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 goto_eq FarawayIsland_Interior_EventScript_267EA4 - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_eq FarawayIsland_Interior_EventScript_267EA4 - compare_var_to_value VAR_RESULT, 10 + compare VAR_RESULT, 10 goto_eq FarawayIsland_Interior_EventScript_267EA4 setflag FLAG_0x1CA release diff --git a/data/scripts/maps/FortreeCity.inc b/data/scripts/maps/FortreeCity.inc index d3b9b41fb..0b4b71c2b 100644 --- a/data/scripts/maps/FortreeCity.inc +++ b/data/scripts/maps/FortreeCity.inc @@ -57,7 +57,7 @@ FortreeCity_EventScript_1E2614:: @ 81E2614 lock faceplayer checkitem ITEM_DEVON_SCOPE, 1 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq FortreeCity_EventScript_1E2630 msgbox FortreeCity_Text_1E29E5, 4 release @@ -65,7 +65,7 @@ FortreeCity_EventScript_1E2614:: @ 81E2614 FortreeCity_EventScript_1E2630:: @ 81E2630 msgbox FortreeCity_Text_1E2A08, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq FortreeCity_EventScript_1E2645 release end diff --git a/data/scripts/maps/FortreeCity_Gym.inc b/data/scripts/maps/FortreeCity_Gym.inc index e3990cd23..e9b9174a8 100644 --- a/data/scripts/maps/FortreeCity_Gym.inc +++ b/data/scripts/maps/FortreeCity_Gym.inc @@ -17,8 +17,8 @@ FortreeCity_Gym_EventScript_2165C4:: @ 82165C4 FortreeCity_Gym_EventScript_2165C8:: @ 82165C8 trainerbattle 1, TRAINER_WINONA_1, 0, FortreeCity_Gym_Text_216D75, FortreeCity_Gym_Text_216E60, FortreeCity_Gym_EventScript_2165FD - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq FortreeCity_Gym_EventScript_21668D checkflag FLAG_0x0AA goto_if 0, FortreeCity_Gym_EventScript_216646 @@ -51,7 +51,7 @@ FortreeCity_Gym_EventScript_2165FD:: @ 82165FD FortreeCity_Gym_EventScript_216646:: @ 8216646 giveitem_std ITEM_TM40 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq FortreeCity_Gym_EventScript_272054 msgbox FortreeCity_Gym_Text_216FEC, 4 setflag FLAG_0x0AA @@ -60,7 +60,7 @@ FortreeCity_Gym_EventScript_216646:: @ 8216646 FortreeCity_Gym_EventScript_21666A:: @ 821666A giveitem_std ITEM_TM40 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq FortreeCity_Gym_EventScript_27205E msgbox FortreeCity_Gym_Text_216FEC, 4 setflag FLAG_0x0AA diff --git a/data/scripts/maps/FortreeCity_House1.inc b/data/scripts/maps/FortreeCity_House1.inc index 1184763dc..7e45bf87a 100644 --- a/data/scripts/maps/FortreeCity_House1.inc +++ b/data/scripts/maps/FortreeCity_House1.inc @@ -11,17 +11,17 @@ FortreeCity_House1_EventScript_2162BB:: @ 82162BB specialvar VAR_RESULT, sub_807E73C copyvar VAR_0x8009, VAR_RESULT msgbox FortreeCity_House1_Text_21637B, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq FortreeCity_House1_EventScript_21633D special sub_81B94B0 waitstate copyvar VAR_0x800A, VAR_0x8004 - compare_var_to_value VAR_0x8004, 255 + compare VAR_0x8004, 255 goto_eq FortreeCity_House1_EventScript_21633D copyvar VAR_0x8005, VAR_0x800A specialvar VAR_RESULT, sub_807E9D4 copyvar VAR_0x800B, VAR_RESULT - compare_var_to_var VAR_RESULT, VAR_0x8009 + compare VAR_RESULT, VAR_0x8009 goto_if 5, FortreeCity_House1_EventScript_216347 copyvar VAR_0x8004, VAR_0x8008 copyvar VAR_0x8005, VAR_0x800A diff --git a/data/scripts/maps/FortreeCity_House2.inc b/data/scripts/maps/FortreeCity_House2.inc index 2458510bc..8f75b20d9 100644 --- a/data/scripts/maps/FortreeCity_House2.inc +++ b/data/scripts/maps/FortreeCity_House2.inc @@ -22,7 +22,7 @@ FortreeCity_House2_EventScript_2177CB:: @ 82177CB case 0, FortreeCity_House2_EventScript_217878 msgbox FortreeCity_House2_Text_217A28, 4 giveitem_std ITEM_TM10 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq FortreeCity_House2_EventScript_272054 setflag FLAG_0x108 msgbox FortreeCity_House2_Text_217A91, 4 diff --git a/data/scripts/maps/FortreeCity_House4.inc b/data/scripts/maps/FortreeCity_House4.inc index 2d260eab3..521e99021 100644 --- a/data/scripts/maps/FortreeCity_House4.inc +++ b/data/scripts/maps/FortreeCity_House4.inc @@ -35,7 +35,7 @@ FortreeCity_House4_EventScript_217CD8:: @ 8217CD8 waitmovement 0 msgbox FortreeCity_House4_Text_217E05, 4 giveitem_std ITEM_MENTAL_HERB - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq FortreeCity_House4_EventScript_272054 setflag FLAG_0x0DF releaseall diff --git a/data/scripts/maps/GraniteCave_StevensRoom.inc b/data/scripts/maps/GraniteCave_StevensRoom.inc index 318b80c78..c913c53a3 100644 --- a/data/scripts/maps/GraniteCave_StevensRoom.inc +++ b/data/scripts/maps/GraniteCave_StevensRoom.inc @@ -10,7 +10,7 @@ GraniteCave_StevensRoom_EventScript_22DC7B:: @ 822DC7B setflag FLAG_0x0BD msgbox GraniteCave_StevensRoom_Text_22DDBD, 4 giveitem_std ITEM_TM47 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, GraniteCave_StevensRoom_EventScript_22DD3C msgbox GraniteCave_StevensRoom_Text_22DE6B, 4 closemessage @@ -23,13 +23,13 @@ GraniteCave_StevensRoom_EventScript_22DC7B:: @ 822DC7B setflag FLAG_0x131 msgbox GraniteCave_StevensRoom_Text_22DF8C, 4 closemessage - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if 1, GraniteCave_StevensRoom_EventScript_22DD0D - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 call_if 1, GraniteCave_StevensRoom_EventScript_22DD2A - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if 1, GraniteCave_StevensRoom_EventScript_22DD18 - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if 1, GraniteCave_StevensRoom_EventScript_22DD18 playse SE_KAIDAN removeobject 1 diff --git a/data/scripts/maps/InsideOfTruck.inc b/data/scripts/maps/InsideOfTruck.inc index eb5eb0522..3c4b241ac 100644 --- a/data/scripts/maps/InsideOfTruck.inc +++ b/data/scripts/maps/InsideOfTruck.inc @@ -17,9 +17,9 @@ InsideOfTruck_EventScript_23BF04:: @ 823BF04 lockall setflag FLAG_SPECIAL_FLAG_0x4000 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq InsideOfTruck_EventScript_23BF20 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq InsideOfTruck_EventScript_23BF46 end diff --git a/data/scripts/maps/IslandCave.inc b/data/scripts/maps/IslandCave.inc index 69a3ef76a..fb1798804 100644 --- a/data/scripts/maps/IslandCave.inc +++ b/data/scripts/maps/IslandCave.inc @@ -11,7 +11,7 @@ IslandCave_MapScript1_238E3A: @ 8238E3A IslandCave_EventScript_238E44:: @ 8238E44 specialvar VAR_RESULT, sub_8138B80 - compare_var_to_value VAR_RESULT, 7 + compare VAR_RESULT, 7 goto_if 5, IslandCave_EventScript_27374E removeobject VAR_LAST_TALKED return @@ -104,15 +104,15 @@ IslandCave_EventScript_238F58:: @ 8238F58 waitmoncry setwildbattle SPECIES_REGICE, 40, ITEM_NONE setflag FLAG_SYS_CTRL_OBJ_DELETE - special sub_80B0A74 + special StartRegiBattle waitstate clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, sub_8138B80 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq IslandCave_EventScript_238F9F - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 goto_eq IslandCave_EventScript_238FA8 - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_eq IslandCave_EventScript_238FA8 setflag FLAG_0x1BC release diff --git a/data/scripts/maps/JaggedPass.inc b/data/scripts/maps/JaggedPass.inc index 1fb3b316e..e5c393221 100644 --- a/data/scripts/maps/JaggedPass.inc +++ b/data/scripts/maps/JaggedPass.inc @@ -6,13 +6,13 @@ JaggedPass_MapScripts:: @ 8230656 JaggedPass_MapScript1_230666: @ 8230666 setstepcallback 1 - compare_var_to_value VAR_0x40C8, 0 + compare VAR_0x40C8, 0 call_if 1, JaggedPass_EventScript_230674 end JaggedPass_EventScript_230674:: @ 8230674 checkitem ITEM_MAGMA_EMBLEM, 1 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq JaggedPass_EventScript_230685 return @@ -21,7 +21,7 @@ JaggedPass_EventScript_230685:: @ 8230685 return JaggedPass_MapScript1_23068B: @ 823068B - compare_var_to_value VAR_0x40BD, 1 + compare VAR_0x40BD, 1 call_if 1, JaggedPass_EventScript_230697 end @@ -31,7 +31,7 @@ JaggedPass_EventScript_230697:: @ 8230697 return JaggedPass_MapScript1_23069C: @ 823069C - compare_var_to_value VAR_0x40C8, 1 + compare VAR_0x40C8, 1 goto_if 3, JaggedPass_EventScript_2306A8 end @@ -104,8 +104,8 @@ JaggedPass_EventScript_230785:: @ 8230785 JaggedPass_EventScript_23079C:: @ 823079C trainerbattle 2, TRAINER_DIANA_1, 0, JaggedPass_Text_230974, JaggedPass_Text_2309B5, JaggedPass_EventScript_2307C8 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq JaggedPass_EventScript_2307E4 msgbox JaggedPass_Text_2309D8, 4 release @@ -128,8 +128,8 @@ JaggedPass_EventScript_2307E4:: @ 82307E4 JaggedPass_EventScript_2307FB:: @ 82307FB trainerbattle 2, TRAINER_ETHAN_1, 0, JaggedPass_Text_230B10, JaggedPass_Text_230B50, JaggedPass_EventScript_230827 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq JaggedPass_EventScript_230843 msgbox JaggedPass_Text_230B93, 4 release diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc index ae7ac908c..965036dfb 100644 --- a/data/scripts/maps/LavaridgeTown.inc +++ b/data/scripts/maps/LavaridgeTown.inc @@ -11,9 +11,9 @@ LavaridgeTown_MapScript1_1EA4DE: @ 81EA4DE call_if 1, LavaridgeTown_EventScript_1EA53F call LavaridgeTown_EventScript_271ED7 call LavaridgeTown_EventScript_271EFB - compare_var_to_value VAR_0x4053, 1 + compare VAR_0x4053, 1 call_if 1, LavaridgeTown_EventScript_1EA518 - compare_var_to_value VAR_0x4053, 1 + compare VAR_0x4053, 1 call_if 1, LavaridgeTown_EventScript_1EA543 end @@ -23,7 +23,7 @@ LavaridgeTown_EventScript_1EA514:: @ 81EA514 LavaridgeTown_EventScript_1EA518:: @ 81EA518 getplayerxy VAR_0x8004, VAR_0x8005 - compare_var_to_value VAR_0x8004, 9 + compare VAR_0x8004, 9 goto_eq LavaridgeTown_EventScript_1EA529 return @@ -49,24 +49,24 @@ LavaridgeTown_MapScript2_1EA547: @ 81EA547 LavaridgeTown_EventScript_1EA551:: @ 81EA551 lockall getplayerxy VAR_0x8008, VAR_0x8009 - compare_var_to_value VAR_0x8008, 9 + compare VAR_0x8008, 9 call_if 1, LavaridgeTown_EventScript_1EA63A - compare_var_to_value VAR_0x8008, 9 + compare VAR_0x8008, 9 call_if 5, LavaridgeTown_EventScript_1EA65C delay 20 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, LavaridgeTown_EventScript_1EA630 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, LavaridgeTown_EventScript_1EA635 - compare_var_to_value VAR_0x8008, 9 + compare VAR_0x8008, 9 call_if 1, LavaridgeTown_EventScript_1EA6A1 - compare_var_to_value VAR_0x8008, 9 + compare VAR_0x8008, 9 call_if 5, LavaridgeTown_EventScript_1EA6AC checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LavaridgeTown_EventScript_1EA5B5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LavaridgeTown_EventScript_1EA5DA end @@ -91,9 +91,9 @@ LavaridgeTown_EventScript_1EA5FF:: @ 81EA5FF removeobject 8 addobject 7 delay 30 - compare_var_to_value VAR_0x8008, 9 + compare VAR_0x8008, 9 call_if 1, LavaridgeTown_EventScript_1EA6B7 - compare_var_to_value VAR_0x8008, 9 + compare VAR_0x8008, 9 call_if 5, LavaridgeTown_EventScript_1EA6C9 removeobject 7 setvar VAR_0x4053, 2 @@ -213,7 +213,7 @@ LavaridgeTown_Movement_1EA6F8: @ 81EA6F8 LavaridgeTown_EventScript_1EA6FA:: @ 81EA6FA specialvar VAR_RESULT, player_get_direction_lower_nybble - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LavaridgeTown_EventScript_1EA70B end @@ -251,10 +251,10 @@ LavaridgeTown_EventScript_1EA744:: @ 81EA744 checkflag FLAG_0x10A goto_eq LavaridgeTown_EventScript_1EA787 msgbox LavaridgeTown_Text_1EAB80, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LavaridgeTown_EventScript_1EA79B getpartysize - compare_var_to_value VAR_RESULT, 6 + compare VAR_RESULT, 6 goto_eq LavaridgeTown_EventScript_1EA791 msgbox LavaridgeTown_Text_1EACC0, 4 setflag FLAG_0x10A diff --git a/data/scripts/maps/LavaridgeTown_Gym_1F.inc b/data/scripts/maps/LavaridgeTown_Gym_1F.inc index 55ae851e0..6c927be40 100644 --- a/data/scripts/maps/LavaridgeTown_Gym_1F.inc +++ b/data/scripts/maps/LavaridgeTown_Gym_1F.inc @@ -60,8 +60,8 @@ LavaridgeTown_Gym_1F_EventScript_1FE78B:: @ 81FE78B LavaridgeTown_Gym_1F_EventScript_1FE78C:: @ 81FE78C trainerbattle 1, TRAINER_FLANNERY_1, 0, LavaridgeTown_Gym_1F_Text_1FF0DC, LavaridgeTown_Gym_1F_Text_1FF233, LavaridgeTown_Gym_1F_EventScript_1FE7C1 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq LavaridgeTown_Gym_1F_EventScript_1FE864 checkflag FLAG_0x0A8 goto_if 0, LavaridgeTown_Gym_1F_EventScript_1FE81D @@ -78,7 +78,7 @@ LavaridgeTown_Gym_1F_EventScript_1FE7C1:: @ 81FE7C1 setflag FLAG_0x4F3 setflag FLAG_BADGE04_GET addvar VAR_0x4085, 1 - compare_var_to_value VAR_0x4085, 6 + compare VAR_0x4085, 6 call_if 1, LavaridgeTown_Gym_1F_EventScript_271E84 setvar VAR_0x8008, 4 call LavaridgeTown_Gym_1F_EventScript_271F43 @@ -98,7 +98,7 @@ LavaridgeTown_Gym_1F_EventScript_1FE7C1:: @ 81FE7C1 LavaridgeTown_Gym_1F_EventScript_1FE81D:: @ 81FE81D giveitem_std ITEM_TM50 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LavaridgeTown_Gym_1F_EventScript_272054 msgbox LavaridgeTown_Gym_1F_Text_1FF45C, 4 setflag FLAG_0x0A8 @@ -107,7 +107,7 @@ LavaridgeTown_Gym_1F_EventScript_1FE81D:: @ 81FE81D LavaridgeTown_Gym_1F_EventScript_1FE841:: @ 81FE841 giveitem_std ITEM_TM50 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LavaridgeTown_Gym_1F_EventScript_27205E msgbox LavaridgeTown_Gym_1F_Text_1FF45C, 4 setflag FLAG_0x0A8 @@ -127,9 +127,9 @@ LavaridgeTown_Gym_1F_EventScript_1FE89A:: @ 81FE89A LavaridgeTown_Gym_B1F_EventScript_1FE89A:: @ 81FE89A call LavaridgeTown_Gym_1F_EventScript_1FE705 release - special CheckIfMultipleTrainersWantBattle - compare_var_to_value VAR_RESULT, 1 - goto_eq LavaridgeTown_Gym_1F_EventScript_2742F6 + special ShouldTryGetTrainerScript + compare VAR_RESULT, 1 + goto_eq EventScript_GotoTrainerScript end LavaridgeTown_Gym_1F_EventScript_1FE8AF:: @ 81FE8AF diff --git a/data/scripts/maps/LavaridgeTown_HerbShop.inc b/data/scripts/maps/LavaridgeTown_HerbShop.inc index 2849371ce..6af8132e4 100644 --- a/data/scripts/maps/LavaridgeTown_HerbShop.inc +++ b/data/scripts/maps/LavaridgeTown_HerbShop.inc @@ -32,7 +32,7 @@ LavaridgeTown_HerbShop_EventScript_1FE505:: @ 81FE505 goto_eq LavaridgeTown_HerbShop_EventScript_1FE534 msgbox LavaridgeTown_HerbShop_Text_1FE584, 4 giveitem_std ITEM_CHARCOAL - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LavaridgeTown_HerbShop_EventScript_272054 setflag FLAG_0x0FE release diff --git a/data/scripts/maps/LilycoveCity.inc b/data/scripts/maps/LilycoveCity.inc index 8a3202a49..b29953d13 100644 --- a/data/scripts/maps/LilycoveCity.inc +++ b/data/scripts/maps/LilycoveCity.inc @@ -42,7 +42,7 @@ LilycoveCity_EventScript_1E2BD8:: @ 81E2BD8 random 10 addvar VAR_RESULT, 133 giveitem_std VAR_RESULT - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_EventScript_272054 setflag FLAG_0x92F msgbox LilycoveCity_Text_2A72E3, 4 @@ -240,9 +240,9 @@ LilycoveCity_EventScript_1E2DDE:: @ 81E2DDE lock faceplayer checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_EventScript_1E2DF8 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_EventScript_1E2E6B end @@ -252,7 +252,7 @@ LilycoveCity_EventScript_1E2DF8:: @ 81E2DF8 call_if 1, LilycoveCity_EventScript_1E2E48 checkflag FLAG_0x11E call_if 0, LilycoveCity_EventScript_1E2E51 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_EventScript_1E2E5A msgbox LilycoveCity_Text_1E3234, 4 switch VAR_FIRST_POKE @@ -283,7 +283,7 @@ LilycoveCity_EventScript_1E2E6B:: @ 81E2E6B call_if 1, LilycoveCity_EventScript_1E2EBB checkflag FLAG_0x11E call_if 0, LilycoveCity_EventScript_1E2EC4 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_EventScript_1E2ECD msgbox LilycoveCity_Text_1E373C, 4 switch VAR_FIRST_POKE @@ -343,9 +343,9 @@ LilycoveCity_EventScript_1E2F3E:: @ 81E2F3E setvar VAR_RESULT, 0 checkflag FLAG_BADGE06_GET call_if 1, LilycoveCity_EventScript_1E2F76 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, LilycoveCity_EventScript_1E2F86 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, LilycoveCity_EventScript_1E2F8F clearflag FLAG_0x2D2 clearflag FLAG_0x351 @@ -380,9 +380,9 @@ LilycoveCity_EventScript_1E2FAA:: @ 81E2FAA setvar VAR_RESULT, 0 checkflag FLAG_BADGE06_GET call_if 1, LilycoveCity_EventScript_1E2F76 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, LilycoveCity_EventScript_1E2FE2 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, LilycoveCity_EventScript_1E2FEB clearflag FLAG_0x2F8 clearflag FLAG_0x32F @@ -423,9 +423,9 @@ LilycoveCity_EventScript_1E302D:: @ 81E302D lock faceplayer msgbox LilycoveCity_Text_1E4774, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, LilycoveCity_EventScript_1E304F - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, LilycoveCity_EventScript_1E3058 release end diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index ab98786e2..0364d8127 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -10,7 +10,7 @@ LilycoveCity_ContestLobby_MapScript1_21A21C: @ 821A21C LilycoveCity_ContestLobby_EventScript_21A227:: @ 821A227 getpricereduction 4 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_21A23C clearflag FLAG_0x369 setflag FLAG_0x340 @@ -45,9 +45,9 @@ LilycoveCity_ContestLobby_EventScript_21A264:: @ 821A264 drawcontestwinner 0 lockall msgbox LilycoveCity_ContestLobby_Text_21AE78, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_21A2AA - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_ContestLobby_EventScript_21A2E4 releaseall end @@ -58,7 +58,7 @@ LilycoveCity_ContestLobby_EventScript_21A2AA:: @ 821A2AA special sub_80F88DC setvar VAR_0x4099, 0 specialvar VAR_RESULT, sub_80F8C7C - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, LilycoveCity_ContestLobby_EventScript_21A314 applymovement 4, LilycoveCity_ContestLobby_Movement_21A40F waitmovement 0 @@ -70,7 +70,7 @@ LilycoveCity_ContestLobby_EventScript_21A2AA:: @ 821A2AA LilycoveCity_ContestLobby_EventScript_21A2E4:: @ 821A2E4 msgbox LilycoveCity_ContestLobby_Text_21B0BC, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_21A2AA msgbox LilycoveCity_ContestLobby_Text_21B132, 4 closemessage @@ -219,9 +219,9 @@ LilycoveCity_ContestLobby_EventScript_21A436:: @ 821A436 fadescreen 1 drawcontestwinner 0 msgbox LilycoveCity_ContestLobby_Text_21AE78, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_21A47A - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_ContestLobby_EventScript_21A4B4 end @@ -231,7 +231,7 @@ LilycoveCity_ContestLobby_EventScript_21A47A:: @ 821A47A special sub_80F88DC setvar VAR_0x4099, 0 specialvar VAR_RESULT, sub_80F8C7C - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, LilycoveCity_ContestLobby_EventScript_21A4E4 applymovement 11, LilycoveCity_ContestLobby_Movement_21A53C waitmovement 0 @@ -243,7 +243,7 @@ LilycoveCity_ContestLobby_EventScript_21A47A:: @ 821A47A LilycoveCity_ContestLobby_EventScript_21A4B4:: @ 821A4B4 msgbox LilycoveCity_ContestLobby_Text_21B0BC, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_21A47A msgbox LilycoveCity_ContestLobby_Text_21B132, 4 closemessage @@ -320,7 +320,7 @@ LilycoveCity_ContestLobby_Movement_21A54B: @ 821A54B LilycoveCity_ContestLobby_EventScript_21A554:: @ 821A554 special sub_80F9154 specialvar VAR_RESULT, sub_80F8D24 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_21A5CF call LilycoveCity_ContestLobby_EventScript_279CC5 call LilycoveCity_ContestLobby_EventScript_21A670 @@ -642,10 +642,10 @@ LilycoveCity_ContestLobby_EventScript_21A819:: @ 821A819 LilycoveCity_ContestLobby_EventScript_21A856:: @ 821A856 msgbox LilycoveCity_ContestLobby_Text_27BD17, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_ContestLobby_EventScript_21A97F call LilycoveCity_ContestLobby_EventScript_27134F - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_ContestLobby_EventScript_21A97F message LilycoveCity_ContestLobby_Text_27C8FD waitmessage @@ -665,7 +665,7 @@ LilycoveCity_ContestLobby_EventScript_21A8BB:: @ 821A8BB LilycoveCity_ContestLobby_EventScript_21A8C6:: @ 821A8C6 setvar VAR_0x400C, 1 - compare_var_to_value VAR_0x400D, 1 + compare VAR_0x400D, 1 goto_eq LilycoveCity_ContestLobby_EventScript_21AAFC goto LilycoveCity_ContestLobby_EventScript_21A8DC end @@ -717,19 +717,19 @@ LilycoveCity_ContestLobby_EventScript_21A97F:: @ 821A97F LilycoveCity_ContestLobby_EventScript_21A98C:: @ 821A98C msgbox LilycoveCity_ContestLobby_Text_27C1C3, 4 setvar VAR_CONTEST_RANK, 0 - choosecontestpkmn - compare_var_to_value VAR_0x8004, 255 + choosecontestmon + compare VAR_0x8004, 255 goto_eq LilycoveCity_ContestLobby_EventScript_21A97F special sub_80F7F30 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_ContestLobby_EventScript_21A9E0 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_21AA0A - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_eq LilycoveCity_ContestLobby_EventScript_21AA0A - compare_var_to_value VAR_RESULT, 3 + compare VAR_RESULT, 3 goto_eq LilycoveCity_ContestLobby_EventScript_21A9EE - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 goto_eq LilycoveCity_ContestLobby_EventScript_21A9FC end @@ -754,28 +754,28 @@ LilycoveCity_ContestLobby_EventScript_21AA0A:: @ 821AA0A end LilycoveCity_ContestLobby_EventScript_21AA15:: @ 821AA15 - compare_var_to_value VAR_0x400D, 1 + compare VAR_0x400D, 1 goto_eq LilycoveCity_ContestLobby_EventScript_21AB4B - compare_var_to_value VAR_0x400D, 2 + compare VAR_0x400D, 2 goto_if 4, LilycoveCity_ContestLobby_EventScript_21A97F message LilycoveCity_ContestLobby_Text_27BF85 waitmessage copyvar VAR_0x8004, VAR_RESULT - compare_var_to_value VAR_0x400C, 0 + compare VAR_0x400C, 0 call_if 1, LilycoveCity_ContestLobby_EventScript_21AABB - compare_var_to_value VAR_0x400C, 1 + compare VAR_0x400C, 1 call_if 1, LilycoveCity_ContestLobby_EventScript_21AAC0 - compare_var_to_value VAR_0x400C, 2 + compare VAR_0x400C, 2 goto_if 4, LilycoveCity_ContestLobby_EventScript_21A97F - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 goto_eq LilycoveCity_ContestLobby_EventScript_21AAD3 - compare_var_to_value VAR_RESULT, 3 + compare VAR_RESULT, 3 goto_eq LilycoveCity_ContestLobby_EventScript_21AAD3 - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_eq LilycoveCity_ContestLobby_EventScript_21A97F - compare_var_to_value VAR_RESULT, 6 + compare VAR_RESULT, 6 goto_eq LilycoveCity_ContestLobby_EventScript_21AAEF - compare_var_to_value VAR_RESULT, 10 + compare VAR_RESULT, 10 goto_eq LilycoveCity_ContestLobby_EventScript_21AAE1 message3 LilycoveCity_ContestLobby_Text_27BEEC contestlinktransfer @@ -843,15 +843,15 @@ LilycoveCity_ContestLobby_EventScript_21AB17:: @ 821AB17 end LilycoveCity_ContestLobby_EventScript_21AB4B:: @ 821AB4B - compare_var_to_value VAR_CONTEST_CATEGORY, 0 + compare VAR_CONTEST_CATEGORY, 0 call_if 1, LilycoveCity_ContestLobby_EventScript_21AB88 - compare_var_to_value VAR_CONTEST_CATEGORY, 1 + compare VAR_CONTEST_CATEGORY, 1 call_if 1, LilycoveCity_ContestLobby_EventScript_21AB8E - compare_var_to_value VAR_CONTEST_CATEGORY, 2 + compare VAR_CONTEST_CATEGORY, 2 call_if 1, LilycoveCity_ContestLobby_EventScript_21AB94 - compare_var_to_value VAR_CONTEST_CATEGORY, 3 + compare VAR_CONTEST_CATEGORY, 3 call_if 1, LilycoveCity_ContestLobby_EventScript_21AB9A - compare_var_to_value VAR_CONTEST_CATEGORY, 4 + compare VAR_CONTEST_CATEGORY, 4 call_if 1, LilycoveCity_ContestLobby_EventScript_21ABA0 goto LilycoveCity_ContestLobby_EventScript_21ABA6 end @@ -889,22 +889,22 @@ LilycoveCity_ContestLobby_EventScript_21ABA6:: @ 821ABA6 LilycoveCity_ContestLobby_EventScript_21ABE3:: @ 821ABE3 call LilycoveCity_ContestLobby_EventScript_21AC33 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_21AC3D - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_eq LilycoveCity_ContestLobby_EventScript_21ABA6 - compare_var_to_value VAR_RESULT, 8 + compare VAR_RESULT, 8 goto_eq LilycoveCity_ContestLobby_EventScript_21ABE3 release end LilycoveCity_ContestLobby_EventScript_21AC0B:: @ 821AC0B call LilycoveCity_ContestLobby_EventScript_21AC38 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_21AC3D - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_eq LilycoveCity_ContestLobby_EventScript_21ABA6 - compare_var_to_value VAR_RESULT, 8 + compare VAR_RESULT, 8 goto_eq LilycoveCity_ContestLobby_EventScript_21AC0B release end diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc index 2ec5d8cab..1e9f9cc28 100644 --- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc +++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc @@ -9,7 +9,7 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_2186D3:: @ 82186D3 checkflag FLAG_0x002 call_if 1, LilycoveCity_CoveLilyMotel_2F_EventScript_21870F specialvar VAR_RESULT, sub_80C08E4 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_CoveLilyMotel_2F_EventScript_218702 release end diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc index 65ed3e6ee..b7ba17125 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc @@ -60,7 +60,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_2206C5:: @ 82206C5 LilycoveCity_DepartmentStoreElevator_EventScript_220718:: @ 8220718 setvar VAR_0x8006, 4 setdynamicwarp LILYCOVE_CITY_DEPARTMENT_STORE_1F, 255, 2, 1 - compare_var_to_value VAR_DEPT_STORE_FLOOR, 4 + compare VAR_DEPT_STORE_FLOOR, 4 goto_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 call LilycoveCity_DepartmentStoreElevator_EventScript_2207E5 setvar VAR_DEPT_STORE_FLOOR, 4 @@ -70,7 +70,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_220718:: @ 8220718 LilycoveCity_DepartmentStoreElevator_EventScript_220740:: @ 8220740 setvar VAR_0x8006, 5 setdynamicwarp LILYCOVE_CITY_DEPARTMENT_STORE_2F, 255, 2, 1 - compare_var_to_value VAR_DEPT_STORE_FLOOR, 5 + compare VAR_DEPT_STORE_FLOOR, 5 goto_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 call LilycoveCity_DepartmentStoreElevator_EventScript_2207E5 setvar VAR_DEPT_STORE_FLOOR, 5 @@ -80,7 +80,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_220740:: @ 8220740 LilycoveCity_DepartmentStoreElevator_EventScript_220768:: @ 8220768 setvar VAR_0x8006, 6 setdynamicwarp LILYCOVE_CITY_DEPARTMENT_STORE_3F, 255, 2, 1 - compare_var_to_value VAR_DEPT_STORE_FLOOR, 6 + compare VAR_DEPT_STORE_FLOOR, 6 goto_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 call LilycoveCity_DepartmentStoreElevator_EventScript_2207E5 setvar VAR_DEPT_STORE_FLOOR, 6 @@ -90,7 +90,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_220768:: @ 8220768 LilycoveCity_DepartmentStoreElevator_EventScript_220790:: @ 8220790 setvar VAR_0x8006, 7 setdynamicwarp LILYCOVE_CITY_DEPARTMENT_STORE_4F, 255, 2, 1 - compare_var_to_value VAR_DEPT_STORE_FLOOR, 7 + compare VAR_DEPT_STORE_FLOOR, 7 goto_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 call LilycoveCity_DepartmentStoreElevator_EventScript_2207E5 setvar VAR_DEPT_STORE_FLOOR, 7 @@ -100,7 +100,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_220790:: @ 8220790 LilycoveCity_DepartmentStoreElevator_EventScript_2207B8:: @ 82207B8 setvar VAR_0x8006, 8 setdynamicwarp LILYCOVE_CITY_DEPARTMENT_STORE_5F, 255, 2, 1 - compare_var_to_value VAR_DEPT_STORE_FLOOR, 8 + compare VAR_DEPT_STORE_FLOOR, 8 goto_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 call LilycoveCity_DepartmentStoreElevator_EventScript_2207E5 setvar VAR_DEPT_STORE_FLOOR, 8 diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc index 1c28039a1..e38f3a276 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc @@ -4,9 +4,9 @@ LilycoveCity_DepartmentStoreRooftop_MapScripts:: @ 8220207 LilycoveCity_DepartmentStoreRooftop_MapScript1_22020D: @ 822020D getpricereduction 3 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_220227 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_22022B end @@ -52,7 +52,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_220268:: @ 8220268 lock faceplayer getpricereduction 3 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_220282 msgbox LilycoveCity_DepartmentStoreRooftop_Text_220463, 4 release @@ -126,22 +126,22 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_220328:: @ 8220328 return LilycoveCity_DepartmentStoreRooftop_EventScript_22032F:: @ 822032F - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_220305 - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_22030C - compare_var_to_value VAR_0x4001, 2 + compare VAR_0x4001, 2 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_220313 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220442 checkitemspace VAR_0x4000, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220450 - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_22031A - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_220321 - compare_var_to_value VAR_0x4001, 2 + compare VAR_0x4001, 2 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_220328 updatemoneybox 0, 0 nop @@ -153,10 +153,10 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_22032F:: @ 822032F bufferstdstring 2, 14 msgbox gUnknown_08272A9A, 4 random 64 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if 5, LilycoveCity_DepartmentStoreRooftop_EventScript_220436 checkitemspace VAR_0x4000, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220450 playse SE_JIHANKI msgbox LilycoveCity_DepartmentStoreRooftop_Text_2205C2, 4 @@ -165,10 +165,10 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_22032F:: @ 822032F bufferstdstring 2, 14 msgbox gUnknown_08272A9A, 4 random 64 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if 5, LilycoveCity_DepartmentStoreRooftop_EventScript_220436 checkitemspace VAR_0x4000, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220450 playse SE_JIHANKI msgbox LilycoveCity_DepartmentStoreRooftop_Text_2205C2, 4 diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc index ca3259128..3eb61ed91 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc @@ -9,12 +9,12 @@ LilycoveCity_DepartmentStore_1F_EventScript_21F69C:: @ 821F69C lock faceplayer dodailyevents - compare_var_to_value VAR_POKELOT_PRIZE, 0 + compare VAR_POKELOT_PRIZE, 0 goto_if 5, LilycoveCity_DepartmentStore_1F_EventScript_21F7F7 checkflag FLAG_0x92A goto_eq LilycoveCity_DepartmentStore_1F_EventScript_21F78D msgbox LilycoveCity_DepartmentStore_1F_Text_2A6390, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_DepartmentStore_1F_EventScript_21F797 setflag FLAG_0x92A message LilycoveCity_DepartmentStore_1F_Text_2A64C8 @@ -33,24 +33,24 @@ LilycoveCity_DepartmentStore_1F_EventScript_21F69C:: @ 821F69C delay 10 applymovement 2, LilycoveCity_DepartmentStore_1F_Movement_27259E waitmovement 0 - compare_var_to_value VAR_0x8004, 0 + compare VAR_0x8004, 0 goto_eq LilycoveCity_DepartmentStore_1F_EventScript_21F7A1 incrementgamestat 46 - compare_var_to_value VAR_0x8006, 0 + compare VAR_0x8006, 0 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_21F77B - compare_var_to_value VAR_0x8006, 1 + compare VAR_0x8006, 1 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_21F784 bufferitemname 0, VAR_0x8005 - compare_var_to_value VAR_0x8004, 1 + compare VAR_0x8004, 1 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_21F7B9 - compare_var_to_value VAR_0x8004, 2 + compare VAR_0x8004, 2 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_21F7C2 - compare_var_to_value VAR_0x8004, 3 + compare VAR_0x8004, 3 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_21F7CB - compare_var_to_value VAR_0x8004, 4 + compare VAR_0x8004, 4 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_21F7D4 giveitem_std VAR_0x8005 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_DepartmentStore_1F_EventScript_21F7DD special sub_80EE2CC goto LilycoveCity_DepartmentStore_1F_EventScript_21F7AF @@ -114,7 +114,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_21F7ED:: @ 821F7ED LilycoveCity_DepartmentStore_1F_EventScript_21F7F7:: @ 821F7F7 msgbox LilycoveCity_DepartmentStore_1F_Text_2A67E1, 4 giveitem_std VAR_POKELOT_PRIZE - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_DepartmentStore_1F_EventScript_21F7ED copyvar VAR_0x8004, VAR_0x404D copyvar VAR_0x8005, VAR_POKELOT_PRIZE diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_5F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_5F.inc index 9e07bf4fc..d5f5e49ad 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStore_5F.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStore_5F.inc @@ -125,9 +125,9 @@ LilycoveCity_DepartmentStore_5F_EventScript_220075:: @ 8220075 lockall applymovement 7, LilycoveCity_DepartmentStore_5F_Movement_27259E waitmovement 0 - compare_var_to_value VAR_0x405E, 0 + compare VAR_0x405E, 0 goto_eq LilycoveCity_DepartmentStore_5F_EventScript_22009C - compare_var_to_value VAR_0x405E, 4 + compare VAR_0x405E, 4 goto_if 4, LilycoveCity_DepartmentStore_5F_EventScript_22009C goto LilycoveCity_DepartmentStore_5F_EventScript_2200A7 end diff --git a/data/scripts/maps/LilycoveCity_Harbor.inc b/data/scripts/maps/LilycoveCity_Harbor.inc index 8f8d5338f..7f0e41d03 100644 --- a/data/scripts/maps/LilycoveCity_Harbor.inc +++ b/data/scripts/maps/LilycoveCity_Harbor.inc @@ -17,23 +17,23 @@ LilycoveCity_Harbor_EventScript_21E00F:: @ 821E00F call LilycoveCity_Harbor_EventScript_21E22A call LilycoveCity_Harbor_EventScript_21E25C call LilycoveCity_Harbor_EventScript_21E2A6 - compare_var_to_value VAR_0x400C, 2 + compare VAR_0x400C, 2 goto_eq LilycoveCity_Harbor_EventScript_21E350 - compare_var_to_value VAR_0x400B, 1 + compare VAR_0x400B, 1 goto_eq LilycoveCity_Harbor_EventScript_21E2F0 - compare_var_to_value VAR_0x400B, 2 + compare VAR_0x400B, 2 goto_eq LilycoveCity_Harbor_EventScript_21E320 - compare_var_to_value VAR_0x400B, 4 + compare VAR_0x400B, 4 goto_eq LilycoveCity_Harbor_EventScript_21E350 - compare_var_to_value VAR_0x400B, 8 + compare VAR_0x400B, 8 goto_eq LilycoveCity_Harbor_EventScript_21E41D - compare_var_to_value VAR_0x400B, 0 + compare VAR_0x400B, 0 goto_if 5, LilycoveCity_Harbor_EventScript_21E44D goto LilycoveCity_Harbor_EventScript_21E080 end LilycoveCity_Harbor_EventScript_21E080:: @ 821E080 - compare_var_to_value VAR_0x400A, 0 + compare VAR_0x400A, 0 goto_eq LilycoveCity_Harbor_EventScript_21E557 msgbox LilycoveCity_Harbor_Text_21E758, 4 message LilycoveCity_Harbor_Text_21E7ED @@ -87,7 +87,7 @@ LilycoveCity_Harbor_EventScript_21E139:: @ 821E139 LilycoveCity_Harbor_EventScript_21E149:: @ 821E149 msgbox LilycoveCity_Harbor_Text_21E864, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_Harbor_EventScript_21E5C0 setvar VAR_PORTHOLE, 5 call LilycoveCity_Harbor_EventScript_21E5CC @@ -98,7 +98,7 @@ LilycoveCity_Harbor_EventScript_21E149:: @ 821E149 LilycoveCity_Harbor_EventScript_21E171:: @ 821E171 msgbox LilycoveCity_Harbor_Text_21E880, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_Harbor_EventScript_21E5C0 call LilycoveCity_Harbor_EventScript_21E5CC warp BATTLE_FRONTIER_OUTSIDE_WEST, 255, 19, 67 @@ -111,7 +111,7 @@ LilycoveCity_Harbor_EventScript_21E194:: @ 821E194 checkflag FLAG_SYS_HAS_EON_TICKET goto_if 0, LilycoveCity_Harbor_EventScript_27374E checkitem ITEM_EON_TICKET, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_Harbor_EventScript_27374E setvar VAR_0x400E, 1 checkflag FLAG_0x1AE @@ -124,7 +124,7 @@ LilycoveCity_Harbor_EventScript_21E1C6:: @ 821E1C6 checkflag FLAG_0x8D5 goto_if 0, LilycoveCity_Harbor_EventScript_27374E checkitem ITEM_AURORA_TICKET, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_Harbor_EventScript_27374E setvar VAR_0x400D, 1 checkflag FLAG_0x1AF @@ -137,7 +137,7 @@ LilycoveCity_Harbor_EventScript_21E1F8:: @ 821E1F8 checkflag FLAG_0x8D6 goto_if 0, LilycoveCity_Harbor_EventScript_27374E checkitem ITEM_OLD_SEA_MAP, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_Harbor_EventScript_27374E setvar VAR_0x400C, 1 checkflag FLAG_0x1B0 @@ -150,7 +150,7 @@ LilycoveCity_Harbor_EventScript_21E22A:: @ 821E22A checkflag FLAG_0x8E0 goto_if 0, LilycoveCity_Harbor_EventScript_27374E checkitem ITEM_MYSTIC_TICKET, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_Harbor_EventScript_27374E setvar VAR_0x4009, 1 checkflag FLAG_0x1DB @@ -160,13 +160,13 @@ LilycoveCity_Harbor_EventScript_21E22A:: @ 821E22A LilycoveCity_Harbor_EventScript_21E25C:: @ 821E25C setvar VAR_0x400B, 0 - compare_var_to_value VAR_0x400E, 2 + compare VAR_0x400E, 2 call_if 1, LilycoveCity_Harbor_EventScript_21E28E - compare_var_to_value VAR_0x400D, 2 + compare VAR_0x400D, 2 call_if 1, LilycoveCity_Harbor_EventScript_21E294 - compare_var_to_value VAR_0x400C, 2 + compare VAR_0x400C, 2 call_if 1, LilycoveCity_Harbor_EventScript_21E29A - compare_var_to_value VAR_0x4009, 2 + compare VAR_0x4009, 2 call_if 1, LilycoveCity_Harbor_EventScript_21E2A0 return @@ -188,13 +188,13 @@ LilycoveCity_Harbor_EventScript_21E2A0:: @ 821E2A0 LilycoveCity_Harbor_EventScript_21E2A6:: @ 821E2A6 setvar VAR_0x400A, 0 - compare_var_to_value VAR_0x400E, 1 + compare VAR_0x400E, 1 call_if 1, LilycoveCity_Harbor_EventScript_21E2D8 - compare_var_to_value VAR_0x400D, 1 + compare VAR_0x400D, 1 call_if 1, LilycoveCity_Harbor_EventScript_21E2DE - compare_var_to_value VAR_0x400C, 1 + compare VAR_0x400C, 1 call_if 1, LilycoveCity_Harbor_EventScript_21E2E4 - compare_var_to_value VAR_0x4009, 1 + compare VAR_0x4009, 1 call_if 1, LilycoveCity_Harbor_EventScript_21E2EA return @@ -262,25 +262,25 @@ LilycoveCity_Harbor_EventScript_21E350:: @ 821E350 waitmovement 0 applymovement 4, LilycoveCity_Harbor_Movement_27259A waitmovement 0 - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if 1, LilycoveCity_Harbor_EventScript_21E656 - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if 1, LilycoveCity_Harbor_EventScript_21E661 addobject 5 - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if 1, LilycoveCity_Harbor_EventScript_21E675 - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if 1, LilycoveCity_Harbor_EventScript_21E680 msgbox LilycoveCity_Harbor_Text_2C6951, 4 - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if 1, LilycoveCity_Harbor_EventScript_21E68B - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if 1, LilycoveCity_Harbor_EventScript_21E696 msgbox LilycoveCity_Harbor_Text_2C69AA, 4 closemessage - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if 1, LilycoveCity_Harbor_EventScript_21E6A1 - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if 1, LilycoveCity_Harbor_EventScript_21E6BA setvar VAR_0x8004, 2 call LilycoveCity_Harbor_EventScript_2721E2 @@ -367,9 +367,9 @@ LilycoveCity_Harbor_EventScript_21E514:: @ 821E514 waitmovement 0 delay 30 removeobject 4 - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if 1, LilycoveCity_Harbor_EventScript_21E61B - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if 1, LilycoveCity_Harbor_EventScript_21E610 delay 30 hideobjectat 255, PETALBURG_CITY @@ -396,7 +396,7 @@ LilycoveCity_Harbor_EventScript_21E56B:: @ 821E56B LilycoveCity_Harbor_EventScript_21E575:: @ 821E575 msgbox LilycoveCity_Harbor_Text_21E864, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_Harbor_EventScript_21E5C0 setvar VAR_PORTHOLE, 5 call LilycoveCity_Harbor_EventScript_21E5CC @@ -407,7 +407,7 @@ LilycoveCity_Harbor_EventScript_21E575:: @ 821E575 LilycoveCity_Harbor_EventScript_21E59D:: @ 821E59D msgbox LilycoveCity_Harbor_Text_21E880, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_Harbor_EventScript_21E5C0 call LilycoveCity_Harbor_EventScript_21E5CC warp BATTLE_FRONTIER_OUTSIDE_WEST, 255, 19, 67 @@ -428,9 +428,9 @@ LilycoveCity_Harbor_EventScript_21E5CC:: @ 821E5CC waitmovement 0 delay 30 hideobjectat VAR_LAST_TALKED, LILYCOVE_CITY_HARBOR - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if 1, LilycoveCity_Harbor_EventScript_21E61B - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if 1, LilycoveCity_Harbor_EventScript_21E610 delay 30 hideobjectat 255, PETALBURG_CITY diff --git a/data/scripts/maps/LilycoveCity_House2.inc b/data/scripts/maps/LilycoveCity_House2.inc index 4b71575b0..486df9be0 100644 --- a/data/scripts/maps/LilycoveCity_House2.inc +++ b/data/scripts/maps/LilycoveCity_House2.inc @@ -8,7 +8,7 @@ LilycoveCity_House2_EventScript_21ED75:: @ 821ED75 goto_eq LilycoveCity_House2_EventScript_21EDAC msgbox LilycoveCity_House2_Text_21EDB6, 4 giveitem_std ITEM_TM44 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_House2_EventScript_272054 setflag FLAG_0x0EA msgbox LilycoveCity_House2_Text_21EDF9, 4 diff --git a/data/scripts/maps/LilycoveCity_House3.inc b/data/scripts/maps/LilycoveCity_House3.inc index dee1eaec6..f82befbcf 100644 --- a/data/scripts/maps/LilycoveCity_House3.inc +++ b/data/scripts/maps/LilycoveCity_House3.inc @@ -11,7 +11,7 @@ LilycoveCity_House3_EventScript_21EE4B:: @ 821EE4B lock faceplayer msgbox LilycoveCity_House3_Text_21EF99, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_House3_EventScript_21EE75 msgbox LilycoveCity_House3_Text_21F0F8, 4 closemessage diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc index a97e277ef..8103a623c 100644 --- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc +++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc @@ -11,9 +11,9 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_218CC2:: @ 8218CC2 message LilycoveCity_LilycoveMuseum_1F_Text_218EBC waitmessage multichoice 20, 8, 16, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_LilycoveMuseum_1F_EventScript_218CF5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_LilycoveMuseum_1F_EventScript_218CEC end @@ -23,9 +23,9 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_218CEC:: @ 8218CEC LilycoveCity_LilycoveMuseum_1F_EventScript_218CF5:: @ 8218CF5 msgbox LilycoveCity_LilycoveMuseum_1F_Text_218F98, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_LilycoveMuseum_1F_EventScript_218D14 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_LilycoveMuseum_1F_EventScript_218D1E end diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc index f464d08ea..97dba4704 100644 --- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc +++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc @@ -125,7 +125,7 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_2198EA:: @ 82198EA applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_27259E msgbox LilycoveCity_LilycoveMuseum_2F_Text_219EC5, 4 givedecoration_std 44 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_219911 setflag FLAG_0x0EC closemessage diff --git a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc index 0f543fe7d..0b677028d 100644 --- a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc +++ b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc @@ -16,19 +16,19 @@ LilycoveCity_MoveDeletersHouse_EventScript_21EA3B:: @ 821EA3B msgbox LilycoveCity_MoveDeletersHouse_Text_21EB65, 4 special sub_81B94B0 waitstate - compare_var_to_value VAR_0x8004, 255 + compare VAR_0x8004, 255 goto_eq LilycoveCity_MoveDeletersHouse_EventScript_21EAE6 special sub_81B98DC - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_MoveDeletersHouse_EventScript_21EADC special sub_81B96D0 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_MoveDeletersHouse_EventScript_21EACF msgbox LilycoveCity_MoveDeletersHouse_Text_21EB89, 4 fadescreen 1 special sub_81B968C fadescreen 0 - compare_var_to_value VAR_0x8005, 4 + compare VAR_0x8005, 4 goto_eq LilycoveCity_MoveDeletersHouse_EventScript_21EA3B special sub_81B9718 msgbox LilycoveCity_MoveDeletersHouse_Text_21EBDA, 5 @@ -40,7 +40,7 @@ LilycoveCity_MoveDeletersHouse_EventScript_21EA3B:: @ 821EA3B LilycoveCity_MoveDeletersHouse_EventScript_21EAB0:: @ 821EAB0 special sub_81B9918 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_MoveDeletersHouse_EventScript_21EAF0 special sub_81B9770 playfanfare BGM_ME_WASURE diff --git a/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc b/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc index 43e0a61f2..b6ca09906 100644 --- a/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc @@ -10,9 +10,9 @@ LilycoveCity_PokemonCenter_1F_MapScript1_21C5BD: @ 821C5BD LilycoveCity_PokemonCenter_1F_EventScript_21C5C6:: @ 821C5C6 special sub_818D9C0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_21C5E0 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_21C5E4 end diff --git a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc index f1921be57..cdcef8e9a 100644 --- a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc +++ b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc @@ -62,9 +62,9 @@ LilycoveCity_PokemonTrainerFanClub_Movement_21C807: @ 821C807 LilycoveCity_PokemonTrainerFanClub_MapScript1_21C80D: @ 821C80D call LilycoveCity_PokemonTrainerFanClub_EventScript_21C8DA - compare_var_to_value VAR_0x4095, 1 + compare VAR_0x4095, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C9F8 - compare_var_to_value VAR_0x4095, 2 + compare VAR_0x4095, 2 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C829 end @@ -73,41 +73,41 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21C829:: @ 821C829 call LilycoveCity_PokemonTrainerFanClub_EventScript_21C8F5 setvar VAR_0x8004, 8 specialvar VAR_RESULT, sub_813BD60 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9B8 setvar VAR_0x8004, 9 specialvar VAR_RESULT, sub_813BD60 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9C0 setvar VAR_0x8004, 10 specialvar VAR_RESULT, sub_813BD60 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9C8 setvar VAR_0x8004, 11 specialvar VAR_RESULT, sub_813BD60 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9D0 setvar VAR_0x8004, 12 specialvar VAR_RESULT, sub_813BD60 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9D8 setvar VAR_0x8004, 13 specialvar VAR_RESULT, sub_813BD60 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9E0 setvar VAR_0x8004, 14 specialvar VAR_RESULT, sub_813BD60 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9E8 setvar VAR_0x8004, 15 specialvar VAR_RESULT, sub_813BD60 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9F0 end LilycoveCity_PokemonTrainerFanClub_EventScript_21C8DA:: @ 821C8DA specialvar VAR_RESULT, sub_80EE7C0 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C8F1 clearflag FLAG_0x2DA clearflag FLAG_0x0D2 @@ -121,37 +121,37 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21C8F5:: @ 821C8F5 setvar VAR_0x8005, 8 setvar VAR_0x8004, 8 specialvar VAR_RESULT, sub_813BD60 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE setvar VAR_0x8004, 9 specialvar VAR_RESULT, sub_813BD60 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE setvar VAR_0x8004, 10 specialvar VAR_RESULT, sub_813BD60 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE setvar VAR_0x8004, 11 specialvar VAR_RESULT, sub_813BD60 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE setvar VAR_0x8004, 12 specialvar VAR_RESULT, sub_813BD60 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE setvar VAR_0x8004, 13 specialvar VAR_RESULT, sub_813BD60 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE setvar VAR_0x8004, 14 specialvar VAR_RESULT, sub_813BD60 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE setvar VAR_0x8004, 15 specialvar VAR_RESULT, sub_813BD60 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE - compare_var_to_value VAR_0x8005, 5 + compare VAR_0x8005, 5 goto_if 4, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9B4 return @@ -209,13 +209,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CA17:: @ 821CA17 faceplayer setvar VAR_0x8004, 13 special sub_813BDB4 - compare_var_to_value VAR_0x4095, 0 + compare VAR_0x4095, 0 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CA84 specialvar VAR_RESULT, sub_813BD60 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CA56 specialvar VAR_RESULT, sub_813BCA8 - compare_var_to_value VAR_RESULT, 7 + compare VAR_RESULT, 7 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CA7A msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D12A, 4 release @@ -223,7 +223,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CA17:: @ 821CA17 LilycoveCity_PokemonTrainerFanClub_EventScript_21CA56:: @ 821CA56 specialvar VAR_RESULT, sub_813BCA8 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CA70 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D094, 4 release @@ -249,13 +249,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CA8E:: @ 821CA8E faceplayer setvar VAR_0x8004, 8 special sub_813BDB4 - compare_var_to_value VAR_0x4095, 0 + compare VAR_0x4095, 0 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CAFB specialvar VAR_RESULT, sub_813BD60 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CACD specialvar VAR_RESULT, sub_813BCA8 - compare_var_to_value VAR_RESULT, 7 + compare VAR_RESULT, 7 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CAF1 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D347, 4 release @@ -263,7 +263,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CA8E:: @ 821CA8E LilycoveCity_PokemonTrainerFanClub_EventScript_21CACD:: @ 821CACD specialvar VAR_RESULT, sub_813BCA8 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CAE7 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D2A6, 4 release @@ -289,13 +289,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CB05:: @ 821CB05 faceplayer setvar VAR_0x8004, 9 special sub_813BDB4 - compare_var_to_value VAR_0x4095, 0 + compare VAR_0x4095, 0 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CB72 specialvar VAR_RESULT, sub_813BD60 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CB44 specialvar VAR_RESULT, sub_813BCA8 - compare_var_to_value VAR_RESULT, 7 + compare VAR_RESULT, 7 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CB68 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D52E, 4 release @@ -303,7 +303,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CB05:: @ 821CB05 LilycoveCity_PokemonTrainerFanClub_EventScript_21CB44:: @ 821CB44 specialvar VAR_RESULT, sub_813BCA8 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CB5E msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D438, 4 release @@ -329,13 +329,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CB7C:: @ 821CB7C faceplayer setvar VAR_0x8004, 10 special sub_813BDB4 - compare_var_to_value VAR_0x4095, 0 + compare VAR_0x4095, 0 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CBE9 specialvar VAR_RESULT, sub_813BD60 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CBBB specialvar VAR_RESULT, sub_813BCA8 - compare_var_to_value VAR_RESULT, 7 + compare VAR_RESULT, 7 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CBDF msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D822, 4 release @@ -343,7 +343,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CB7C:: @ 821CB7C LilycoveCity_PokemonTrainerFanClub_EventScript_21CBBB:: @ 821CBBB specialvar VAR_RESULT, sub_813BCA8 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CBD5 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D751, 4 release @@ -370,10 +370,10 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CBF3:: @ 821CBF3 setvar VAR_0x8004, 11 special sub_813BDB4 specialvar VAR_RESULT, sub_813BD60 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CC27 specialvar VAR_RESULT, sub_813BCA8 - compare_var_to_value VAR_RESULT, 7 + compare VAR_RESULT, 7 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CC4B msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D9D1, 4 release @@ -381,7 +381,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CBF3:: @ 821CBF3 LilycoveCity_PokemonTrainerFanClub_EventScript_21CC27:: @ 821CC27 specialvar VAR_RESULT, sub_813BCA8 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CC41 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D921, 4 release @@ -403,10 +403,10 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CC55:: @ 821CC55 setvar VAR_0x8004, 12 special sub_813BDB4 specialvar VAR_RESULT, sub_813BD60 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CC89 specialvar VAR_RESULT, sub_813BCA8 - compare_var_to_value VAR_RESULT, 7 + compare VAR_RESULT, 7 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CCAD msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DB69, 4 release @@ -414,7 +414,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CC55:: @ 821CC55 LilycoveCity_PokemonTrainerFanClub_EventScript_21CC89:: @ 821CC89 specialvar VAR_RESULT, sub_813BCA8 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CCA3 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DA73, 4 release @@ -436,10 +436,10 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CCB7:: @ 821CCB7 setvar VAR_0x8004, 14 special sub_813BDB4 specialvar VAR_RESULT, sub_813BD60 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CCEB specialvar VAR_RESULT, sub_813BCA8 - compare_var_to_value VAR_RESULT, 7 + compare VAR_RESULT, 7 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD0F msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DD36, 4 release @@ -447,7 +447,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CCB7:: @ 821CCB7 LilycoveCity_PokemonTrainerFanClub_EventScript_21CCEB:: @ 821CCEB specialvar VAR_RESULT, sub_813BCA8 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD05 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DC68, 4 release @@ -469,10 +469,10 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CD19:: @ 821CD19 setvar VAR_0x8004, 15 special sub_813BDB4 specialvar VAR_RESULT, sub_813BD60 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD4D specialvar VAR_RESULT, sub_813BCA8 - compare_var_to_value VAR_RESULT, 7 + compare VAR_RESULT, 7 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD71 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DEFF, 4 release @@ -480,7 +480,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CD19:: @ 821CD19 LilycoveCity_PokemonTrainerFanClub_EventScript_21CD4D:: @ 821CD4D specialvar VAR_RESULT, sub_813BCA8 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD67 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DE72, 4 release @@ -508,7 +508,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CD7B:: @ 821CD7B LilycoveCity_PokemonTrainerFanClub_EventScript_21CD90:: @ 821CD90 setvar VAR_0x8005, 11 special InterviewBefore - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CEFF copyvar VAR_0x800A, VAR_0x8006 setvar VAR_0x8004, 8 @@ -519,9 +519,9 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CD90:: @ 821CD90 call LilycoveCity_PokemonTrainerFanClub_EventScript_271E7C lock faceplayer - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CDE0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CDEE end @@ -534,9 +534,9 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CDEE:: @ 821CDEE setvar VAR_0x8004, 8 special sub_813BDB4 msgbox LilycoveCity_PokemonTrainerFanClub_Text_281C3D, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CEC6 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CE15 end @@ -549,9 +549,9 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CE15:: @ 821CE15 call LilycoveCity_PokemonTrainerFanClub_EventScript_271E7C lock faceplayer - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CDE0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CDEE end @@ -579,9 +579,9 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CE9F:: @ 821CE9F setvar VAR_0x8004, 8 special sub_813BDB4 msgbox LilycoveCity_PokemonTrainerFanClub_Text_281CCD, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CEC6 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CE4D end diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc index 3f58bf1e5..c7376e394 100644 --- a/data/scripts/maps/LittlerootTown.inc +++ b/data/scripts/maps/LittlerootTown.inc @@ -7,23 +7,23 @@ LittlerootTown_MapScripts:: @ 81E7DCB LittlerootTown_MapScript1_1E7DDB: @ 81E7DDB setflag FLAG_VISITED_LITTLEROOT_TOWN call LittlerootTown_EventScript_271ED7 - compare_var_to_value VAR_0x4092, 2 + compare VAR_0x4092, 2 call_if 1, LittlerootTown_EventScript_1E7E67 checkflag FLAG_0x052 call_if 0, LittlerootTown_EventScript_1E7E6F - compare_var_to_value VAR_0x4050, 3 + compare VAR_0x4050, 3 call_if 1, LittlerootTown_EventScript_1E7E92 - compare_var_to_value VAR_0x4082, 4 + compare VAR_0x4082, 4 call_if 1, LittlerootTown_EventScript_1E7E5C - compare_var_to_value VAR_0x408C, 4 + compare VAR_0x408C, 4 call_if 1, LittlerootTown_EventScript_1E7E5C - compare_var_to_value VAR_0x40C7, 1 + compare VAR_0x40C7, 1 call_if 1, LittlerootTown_EventScript_1E7E53 - compare_var_to_value VAR_0x408D, 3 + compare VAR_0x408D, 3 call_if 1, LittlerootTown_EventScript_1E7E4F - compare_var_to_value VAR_0x40D3, 1 + compare VAR_0x40D3, 1 call_if 1, LittlerootTown_EventScript_1E7E4B - compare_var_to_value VAR_0x40D3, 2 + compare VAR_0x40D3, 2 call_if 1, LittlerootTown_EventScript_1E7E45 end @@ -54,7 +54,7 @@ LittlerootTown_EventScript_1E7E67:: @ 81E7E67 return LittlerootTown_EventScript_1E7E6F:: @ 81E7E6F - compare_var_to_value VAR_0x4050, 0 + compare VAR_0x4050, 0 goto_eq LittlerootTown_EventScript_1E7E86 setobjectxyperm 1, 10, 1 setobjectmovementtype 1, 7 @@ -69,9 +69,9 @@ LittlerootTown_EventScript_1E7E92:: @ 81E7E92 clearflag FLAG_0x2F0 setobjectmovementtype 4, 8 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, LittlerootTown_EventScript_1E7EB1 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, LittlerootTown_EventScript_1E7EB9 return @@ -209,7 +209,7 @@ LittlerootTown_EventScript_1E7FEC:: @ 81E7FEC addobject 8 addobject 7 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LittlerootTown_EventScript_1E8004 goto LittlerootTown_EventScript_1E8013 end @@ -239,7 +239,7 @@ LittlerootTown_EventScript_1E8034:: @ 81E8034 goto_eq LittlerootTown_EventScript_1E8087 checkflag FLAG_0x052 goto_eq LittlerootTown_EventScript_1E807A - compare_var_to_value VAR_0x4050, 0 + compare VAR_0x4050, 0 goto_if 5, LittlerootTown_EventScript_1E805D msgbox LittlerootTown_Text_1E8BB8, 4 release @@ -384,9 +384,9 @@ LittlerootTown_EventScript_1E815A:: @ 81E815A LittlerootTown_EventScript_1E8163:: @ 81E8163 lockall checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, LittlerootTown_EventScript_1E817D - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, LittlerootTown_EventScript_1E8186 releaseall end @@ -402,9 +402,9 @@ LittlerootTown_EventScript_1E8186:: @ 81E8186 LittlerootTown_EventScript_1E818F:: @ 81E818F lockall checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, LittlerootTown_EventScript_1E81A9 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, LittlerootTown_EventScript_1E81B2 releaseall end @@ -457,27 +457,27 @@ LittlerootTown_EventScript_1E8205:: @ 81E8205 LittlerootTown_EventScript_1E8211:: @ 81E8211 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, LittlerootTown_EventScript_1E8297 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, LittlerootTown_EventScript_1E82A2 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, LittlerootTown_EventScript_1E8281 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, LittlerootTown_EventScript_1E828C msgbox LittlerootTown_Text_1E87E1, 4 closemessage checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, LittlerootTown_EventScript_1E82AD - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, LittlerootTown_EventScript_1E82F0 call LittlerootTown_EventScript_1E8693 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, LittlerootTown_EventScript_1E8405 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, LittlerootTown_EventScript_1E8448 goto LittlerootTown_EventScript_1E8686 end @@ -503,32 +503,32 @@ LittlerootTown_EventScript_1E82A2:: @ 81E82A2 return LittlerootTown_EventScript_1E82AD:: @ 81E82AD - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 call_if 1, LittlerootTown_EventScript_1E8333 - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if 1, LittlerootTown_EventScript_1E8348 - compare_var_to_value VAR_0x8008, 2 + compare VAR_0x8008, 2 call_if 1, LittlerootTown_EventScript_1E835D - compare_var_to_value VAR_0x8008, 3 + compare VAR_0x8008, 3 call_if 1, LittlerootTown_EventScript_1E8372 - compare_var_to_value VAR_0x8008, 4 + compare VAR_0x8008, 4 call_if 1, LittlerootTown_EventScript_1E8387 - compare_var_to_value VAR_0x8008, 5 + compare VAR_0x8008, 5 call_if 1, LittlerootTown_EventScript_1E839C return LittlerootTown_EventScript_1E82F0:: @ 81E82F0 - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 call_if 1, LittlerootTown_EventScript_1E8333 - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if 1, LittlerootTown_EventScript_1E8348 - compare_var_to_value VAR_0x8008, 2 + compare VAR_0x8008, 2 call_if 1, LittlerootTown_EventScript_1E83B1 - compare_var_to_value VAR_0x8008, 3 + compare VAR_0x8008, 3 call_if 1, LittlerootTown_EventScript_1E83C6 - compare_var_to_value VAR_0x8008, 4 + compare VAR_0x8008, 4 call_if 1, LittlerootTown_EventScript_1E83DB - compare_var_to_value VAR_0x8008, 5 + compare VAR_0x8008, 5 call_if 1, LittlerootTown_EventScript_1E83F0 return @@ -603,32 +603,32 @@ LittlerootTown_EventScript_1E83F0:: @ 81E83F0 return LittlerootTown_EventScript_1E8405:: @ 81E8405 - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 call_if 1, LittlerootTown_EventScript_1E848B - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if 1, LittlerootTown_EventScript_1E8496 - compare_var_to_value VAR_0x8008, 2 + compare VAR_0x8008, 2 call_if 1, LittlerootTown_EventScript_1E84A1 - compare_var_to_value VAR_0x8008, 3 + compare VAR_0x8008, 3 call_if 1, LittlerootTown_EventScript_1E84C7 - compare_var_to_value VAR_0x8008, 4 + compare VAR_0x8008, 4 call_if 1, LittlerootTown_EventScript_1E84ED - compare_var_to_value VAR_0x8008, 5 + compare VAR_0x8008, 5 call_if 1, LittlerootTown_EventScript_1E8513 return LittlerootTown_EventScript_1E8448:: @ 81E8448 - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 call_if 1, LittlerootTown_EventScript_1E848B - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if 1, LittlerootTown_EventScript_1E8496 - compare_var_to_value VAR_0x8008, 2 + compare VAR_0x8008, 2 call_if 1, LittlerootTown_EventScript_1E8539 - compare_var_to_value VAR_0x8008, 3 + compare VAR_0x8008, 3 call_if 1, LittlerootTown_EventScript_1E855F - compare_var_to_value VAR_0x8008, 4 + compare VAR_0x8008, 4 call_if 1, LittlerootTown_EventScript_1E8585 - compare_var_to_value VAR_0x8008, 5 + compare VAR_0x8008, 5 call_if 1, LittlerootTown_EventScript_1E85AB return @@ -892,9 +892,9 @@ LittlerootTown_EventScript_1E863D:: @ 81E863D lock faceplayer checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, LittlerootTown_EventScript_1E8281 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, LittlerootTown_EventScript_1E828C call LittlerootTown_EventScript_1E8693 applymovement 4, LittlerootTown_Movement_2725A6 diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc index aa43cc5f2..45f57262b 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc @@ -5,7 +5,7 @@ LittlerootTown_BrendansHouse_1F_MapScripts:: @ 81F7755 .byte 0 LittlerootTown_BrendansHouse_1F_MapScript1_1F7765: @ 81F7765 - compare_var_to_value VAR_0x4092, 6 + compare VAR_0x4092, 6 call_if 0, LittlerootTown_BrendansHouse_1F_EventScript_1F777A checkflag FLAG_0x112 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F778D @@ -18,7 +18,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F777A:: @ 81F777A LittlerootTown_BrendansHouse_1F_EventScript_1F778D:: @ 81F778D checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LittlerootTown_BrendansHouse_1F_EventScript_1F779A return @@ -27,11 +27,11 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F779A:: @ 81F779A return LittlerootTown_BrendansHouse_1F_MapScript1_1F77A4: @ 81F77A4 - compare_var_to_value VAR_0x4092, 3 + compare VAR_0x4092, 3 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F77DE - compare_var_to_value VAR_0x4092, 5 + compare VAR_0x4092, 5 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F77C6 - compare_var_to_value VAR_0x4092, 6 + compare VAR_0x4092, 6 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F77D2 end @@ -151,22 +151,22 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F78E2:: @ 81F78E2 waitmovement 0 applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_27259A waitmovement 0 - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if 5, LittlerootTown_BrendansHouse_1F_EventScript_1F7981 playbgm BGM_BOY_SUP, 1 - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F798C - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F7997 - compare_var_to_value VAR_0x8008, 2 + compare VAR_0x8008, 2 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F79A2 msgbox LittlerootTown_BrendansHouse_1F_Text_1F90B4, 4 closemessage - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F79C1 - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F79D3 - compare_var_to_value VAR_0x8008, 2 + compare VAR_0x8008, 2 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F79E5 playse SE_KAIDAN removeobject 7 diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc index 895922471..23d30545c 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc @@ -4,11 +4,11 @@ LittlerootTown_BrendansHouse_2F_MapScripts:: @ 81F83E3 .byte 0 LittlerootTown_BrendansHouse_2F_MapScript1_1F83EE: @ 81F83EE - compare_var_to_value VAR_0x408D, 2 + compare VAR_0x408D, 2 call_if 0, LittlerootTown_BrendansHouse_2F_EventScript_1F8457 - compare_var_to_value VAR_0x408D, 3 + compare VAR_0x408D, 3 call_if 4, LittlerootTown_BrendansHouse_2F_EventScript_1F841A - compare_var_to_value VAR_0x4092, 4 + compare VAR_0x4092, 4 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_2926FE call LittlerootTown_BrendansHouse_2F_EventScript_275CE1 setvar VAR_0x4089, 0 @@ -17,15 +17,15 @@ LittlerootTown_BrendansHouse_2F_MapScript1_1F83EE: @ 81F83EE LittlerootTown_BrendansHouse_2F_EventScript_1F841A:: @ 81F841A checkflag FLAG_0x124 goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8433 - compare_var_to_value VAR_0x4084, 2 + compare VAR_0x4084, 2 goto_if 4, LittlerootTown_BrendansHouse_2F_EventScript_1F8456 goto LittlerootTown_BrendansHouse_2F_EventScript_1F8433 LittlerootTown_BrendansHouse_2F_EventScript_1F8433:: @ 81F8433 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8456 - compare_var_to_value VAR_0x40D3, 2 + compare VAR_0x40D3, 2 goto_if 4, LittlerootTown_BrendansHouse_2F_EventScript_1F9309 setobjectxyperm 1, 0, 2 setobjectmovementtype 1, 7 @@ -36,7 +36,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8456:: @ 81F8456 LittlerootTown_BrendansHouse_2F_EventScript_1F8457:: @ 81F8457 checkplayergender - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8464 return @@ -50,13 +50,13 @@ LittlerootTown_BrendansHouse_2F_MapScript2_1F846A: @ 81F846A LittlerootTown_BrendansHouse_2F_EventScript_1F8474:: @ 81F8474 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq EventScript_275D0C end LittlerootTown_BrendansHouse_2F_EventScript_1F8481:: @ 81F8481 lockall - compare_var_to_value VAR_0x408D, 2 + compare VAR_0x408D, 2 goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8497 msgbox LittlerootTown_BrendansHouse_2F_Text_1F9991, 4 releaseall @@ -74,13 +74,13 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8497:: @ 81F8497 waitmovement 0 delay 10 playbgm BGM_BOY_SUP, 1 - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1F8507 - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1F8536 - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1F8565 - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1F8594 setvar VAR_0x408D, 3 setflag FLAG_0x331 @@ -248,9 +248,9 @@ LittlerootTown_BrendansHouse_2F_Movement_1F8609: @ 81F8609 gUnknown_081F860D:: @ 81F860D lockall checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8626 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F864C end diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc index ffeaa9499..92f4a58e0 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc @@ -5,7 +5,7 @@ LittlerootTown_MaysHouse_1F_MapScripts:: @ 81F88A5 .byte 0 LittlerootTown_MaysHouse_1F_MapScript1_1F88B5: @ 81F88B5 - compare_var_to_value VAR_0x4092, 6 + compare VAR_0x4092, 6 call_if 0, LittlerootTown_MaysHouse_1F_EventScript_1F88CA checkflag FLAG_0x112 call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F88DD @@ -18,7 +18,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1F88CA:: @ 81F88CA LittlerootTown_MaysHouse_1F_EventScript_1F88DD:: @ 81F88DD checkplayergender - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LittlerootTown_MaysHouse_1F_EventScript_1F88EA return @@ -27,11 +27,11 @@ LittlerootTown_MaysHouse_1F_EventScript_1F88EA:: @ 81F88EA return LittlerootTown_MaysHouse_1F_MapScript1_1F88F4: @ 81F88F4 - compare_var_to_value VAR_0x4092, 3 + compare VAR_0x4092, 3 call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F892E - compare_var_to_value VAR_0x4092, 5 + compare VAR_0x4092, 5 call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F8916 - compare_var_to_value VAR_0x4092, 6 + compare VAR_0x4092, 6 call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F8922 end @@ -122,7 +122,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1F89F3:: @ 81F89F3 goto_eq LittlerootTown_BrendansHouse_1F_EventScript_1F8A33 checkflag FLAG_SYS_POKEMON_GET goto_eq LittlerootTown_BrendansHouse_1F_EventScript_1F8A29 - compare_var_to_value VAR_0x408D, 3 + compare VAR_0x408D, 3 goto_eq LittlerootTown_BrendansHouse_1F_EventScript_1F8A1F special sub_8138B48 msgbox LittlerootTown_BrendansHouse_1F_Text_1F8CA5, 4 @@ -190,22 +190,22 @@ LittlerootTown_MaysHouse_1F_EventScript_1F8A8B:: @ 81F8A8B waitmovement 0 applymovement 7, LittlerootTown_MaysHouse_1F_Movement_27259A waitmovement 0 - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if 5, LittlerootTown_MaysHouse_1F_EventScript_1F8B2A playbgm BGM_GIRL_SUP, 1 - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F8B35 - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F8B40 - compare_var_to_value VAR_0x8008, 2 + compare VAR_0x8008, 2 call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F8B4B msgbox LittlerootTown_MaysHouse_1F_Text_1F8EC6, 4 closemessage - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F8B6A - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F8B7C - compare_var_to_value VAR_0x8008, 2 + compare VAR_0x8008, 2 call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F8B8E playse SE_KAIDAN removeobject 7 diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc index efe89144d..963ce9880 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc @@ -4,11 +4,11 @@ LittlerootTown_MaysHouse_2F_MapScripts:: @ 81F9296 .byte 0 LittlerootTown_MaysHouse_2F_MapScript1_1F92A1: @ 81F92A1 - compare_var_to_value VAR_0x408D, 2 + compare VAR_0x408D, 2 call_if 0, LittlerootTown_MaysHouse_2F_EventScript_1F930A - compare_var_to_value VAR_0x408D, 3 + compare VAR_0x408D, 3 call_if 4, LittlerootTown_MaysHouse_2F_EventScript_1F92CD - compare_var_to_value VAR_0x4092, 4 + compare VAR_0x4092, 4 call_if 1, LittlerootTown_MaysHouse_2F_EventScript_2926FE call LittlerootTown_MaysHouse_2F_EventScript_275CE1 setvar VAR_0x4089, 0 @@ -17,15 +17,15 @@ LittlerootTown_MaysHouse_2F_MapScript1_1F92A1: @ 81F92A1 LittlerootTown_MaysHouse_2F_EventScript_1F92CD:: @ 81F92CD checkflag FLAG_0x124 goto_eq LittlerootTown_MaysHouse_2F_EventScript_1F92E6 - compare_var_to_value VAR_0x4084, 2 + compare VAR_0x4084, 2 goto_if 4, LittlerootTown_MaysHouse_2F_EventScript_1F9309 goto LittlerootTown_MaysHouse_2F_EventScript_1F92E6 LittlerootTown_MaysHouse_2F_EventScript_1F92E6:: @ 81F92E6 checkplayergender - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LittlerootTown_MaysHouse_2F_EventScript_1F9309 - compare_var_to_value VAR_0x40D3, 2 + compare VAR_0x40D3, 2 goto_if 4, LittlerootTown_MaysHouse_2F_EventScript_1F9309 setobjectxyperm 1, 8, 2 setobjectmovementtype 1, 7 @@ -37,7 +37,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F9309:: @ 81F9309 LittlerootTown_MaysHouse_2F_EventScript_1F930A:: @ 81F930A checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LittlerootTown_MaysHouse_2F_EventScript_1F9317 return @@ -51,13 +51,13 @@ LittlerootTown_MaysHouse_2F_MapScript2_1F931D: @ 81F931D LittlerootTown_MaysHouse_2F_EventScript_1F9327:: @ 81F9327 checkplayergender - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq EventScript_275D0C end LittlerootTown_MaysHouse_2F_EventScript_1F9334:: @ 81F9334 lockall - compare_var_to_value VAR_0x408D, 2 + compare VAR_0x408D, 2 goto_eq LittlerootTown_MaysHouse_2F_EventScript_1F934A msgbox LittlerootTown_MaysHouse_2F_Text_1F9991, 4 releaseall @@ -75,13 +75,13 @@ LittlerootTown_MaysHouse_2F_EventScript_1F934A:: @ 81F934A waitmovement 0 delay 10 playbgm BGM_GIRL_SUP, 1 - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if 1, LittlerootTown_MaysHouse_2F_EventScript_1F93BA - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 call_if 1, LittlerootTown_MaysHouse_2F_EventScript_1F93E9 - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if 1, LittlerootTown_MaysHouse_2F_EventScript_1F9418 - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if 1, LittlerootTown_MaysHouse_2F_EventScript_1F9440 setvar VAR_0x408D, 3 setflag FLAG_0x332 @@ -253,9 +253,9 @@ LittlerootTown_MaysHouse_2F_EventScript_1F94C1:: @ 81F94C1 checkflag FLAG_0x124 goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F94F7 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F94E3 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F94ED end @@ -273,9 +273,9 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F94F7:: @ 81F94F7 applymovement VAR_LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_27259E waitmovement 0 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1F951D - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1F952F setflag FLAG_0x125 releaseall @@ -304,9 +304,9 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F954A:: @ 81F954A gUnknown_081F9553:: @ 81F9553 lockall checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LittlerootTown_MaysHouse_2F_EventScript_1F956C - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LittlerootTown_MaysHouse_2F_EventScript_1F9576 end diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc index cef69c7b2..9e2ac5197 100644 --- a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc +++ b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc @@ -7,17 +7,17 @@ LittlerootTown_ProfessorBirchsLab_MapScripts:: @ 81F9C91 LittlerootTown_ProfessorBirchsLab_MapScript1_1F9CA1: @ 81F9CA1 call LittlerootTown_ProfessorBirchsLab_EventScript_271ED7 call LittlerootTown_ProfessorBirchsLab_EventScript_2720AD - compare_var_to_value VAR_0x40D3, 6 + compare VAR_0x40D3, 6 goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF7 - compare_var_to_value VAR_0x40D3, 4 + compare VAR_0x40D3, 4 goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF3 - compare_var_to_value VAR_0x40D3, 3 + compare VAR_0x40D3, 3 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9CCD end LittlerootTown_ProfessorBirchsLab_EventScript_1F9CCD:: @ 81F9CCD specialvar VAR_RESULT, sub_80C08E4 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9CE9 setobjectmovementtype 3, 3 setobjectxyperm 3, 5, 10 @@ -99,9 +99,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9DDB:: @ 81F9DDB playfanfare BGM_FANFA4 waitfanfare msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA8B1, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E07 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E17 end @@ -113,9 +113,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9E07:: @ 81F9E07 LittlerootTown_ProfessorBirchsLab_EventScript_1F9E17:: @ 81F9E17 msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA8F6, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E36 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E48 end @@ -128,9 +128,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9E36:: @ 81F9E36 LittlerootTown_ProfessorBirchsLab_EventScript_1F9E48:: @ 81F9E48 msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAA35, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E36 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E48 end @@ -171,9 +171,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9E80:: @ 81F9E80 applymovement 255, LittlerootTown_ProfessorBirchsLab_Movement_2725A4 waitmovement 0 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1F9F32 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1F9F3C playse SE_PC_ON waitse @@ -264,7 +264,7 @@ LittlerootTown_ProfessorBirchsLab_Movement_1F9F7C: @ 81F9F7C LittlerootTown_ProfessorBirchsLab_EventScript_1F9F84:: @ 81F9F84 lock faceplayer - compare_var_to_value VAR_0x4084, 3 + compare VAR_0x4084, 3 goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_1F9FB1 checkflag FLAG_0x058 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9FA7 @@ -285,39 +285,39 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9FB1:: @ 81F9FB1 LittlerootTown_ProfessorBirchsLab_EventScript_1F9FBB:: @ 81F9FBB release - compare_var_to_value VAR_0x40D3, 6 + compare VAR_0x40D3, 6 goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_1FA057 applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_2725A8 waitmovement 0 drawmonpic SPECIES_CYNDAQUIL, 10, 3 msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB7F6, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA061 goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA06C end LittlerootTown_ProfessorBirchsLab_EventScript_1F9FEF:: @ 81F9FEF release - compare_var_to_value VAR_0x40D3, 6 + compare VAR_0x40D3, 6 goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_1FA057 applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_2725A8 waitmovement 0 drawmonpic SPECIES_TOTODILE, 10, 3 msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB869, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA061 goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA10D end LittlerootTown_ProfessorBirchsLab_EventScript_1FA023:: @ 81FA023 release - compare_var_to_value VAR_0x40D3, 6 + compare VAR_0x40D3, 6 goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_1FA057 applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_2725A8 waitmovement 0 drawmonpic SPECIES_CHIKORITA, 10, 3 msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB8E0, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA061 goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA1AE end @@ -337,9 +337,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA06C:: @ 81FA06C bufferspeciesname 0, SPECIES_CYNDAQUIL setvar VAR_0x4001, 155 givemon SPECIES_CYNDAQUIL, 5, ITEM_NONE, 0x0, 0x0, 0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0A1 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0CC erasemonpic goto LittlerootTown_ProfessorBirchsLab_EventScript_273811 @@ -349,7 +349,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA0A1:: @ 81FA0A1 call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F removeobject 4 msgbox gUnknown_08273374, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0FD call LittlerootTown_ProfessorBirchsLab_EventScript_27378B call LittlerootTown_ProfessorBirchsLab_EventScript_2723DD @@ -360,7 +360,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA0CC:: @ 81FA0CC call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F removeobject 4 msgbox gUnknown_08273374, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0F2 call LittlerootTown_ProfessorBirchsLab_EventScript_273797 goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA0F2 @@ -382,9 +382,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA10D:: @ 81FA10D bufferspeciesname 0, SPECIES_TOTODILE setvar VAR_0x4001, 158 givemon SPECIES_TOTODILE, 5, ITEM_NONE, 0x0, 0x0, 0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA142 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA16D erasemonpic goto LittlerootTown_ProfessorBirchsLab_EventScript_273811 @@ -394,7 +394,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA142:: @ 81FA142 call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F removeobject 5 msgbox gUnknown_08273374, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA19E call LittlerootTown_ProfessorBirchsLab_EventScript_27378B call LittlerootTown_ProfessorBirchsLab_EventScript_2723DD @@ -405,7 +405,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA16D:: @ 81FA16D call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F removeobject 5 msgbox gUnknown_08273374, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA193 call LittlerootTown_ProfessorBirchsLab_EventScript_273797 goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA193 @@ -427,9 +427,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA1AE:: @ 81FA1AE bufferspeciesname 0, SPECIES_CHIKORITA setvar VAR_0x4001, 152 givemon SPECIES_CHIKORITA, 5, ITEM_NONE, 0x0, 0x0, 0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA1E3 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA20E erasemonpic goto LittlerootTown_ProfessorBirchsLab_EventScript_273811 @@ -439,7 +439,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA1E3:: @ 81FA1E3 call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F removeobject 6 msgbox gUnknown_08273374, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA23F call LittlerootTown_ProfessorBirchsLab_EventScript_27378B call LittlerootTown_ProfessorBirchsLab_EventScript_2723DD @@ -450,7 +450,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA20E:: @ 81FA20E call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F removeobject 6 msgbox gUnknown_08273374, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA234 call LittlerootTown_ProfessorBirchsLab_EventScript_273797 goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA234 @@ -478,11 +478,11 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F:: @ 81FA24F LittlerootTown_ProfessorBirchsLab_EventScript_1FA25A:: @ 81FA25A lock faceplayer - compare_var_to_value VAR_0x40D3, 5 + compare VAR_0x40D3, 5 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA28A - compare_var_to_value VAR_0x40D3, 2 + compare VAR_0x40D3, 2 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA294 - checkflag FLAG_0x12F + checkflag FLAG_HAS_MATCH_CALL goto_if 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA29E checkflag FLAG_0x119 goto_if 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA2D2 @@ -502,11 +502,11 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA294:: @ 81FA294 LittlerootTown_ProfessorBirchsLab_EventScript_1FA29E:: @ 81FA29E checkflag FLAG_0x380 goto_if 0, LittlerootTown_ProfessorBirchsLab_EventScript_272141 - compare_var_to_value VAR_0x40D3, 3 + compare VAR_0x40D3, 3 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_272141 - compare_var_to_value VAR_0x40D3, 6 + compare VAR_0x40D3, 6 goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_272141 - compare_var_to_value VAR_0x4084, 5 + compare VAR_0x4084, 5 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA3C4 msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAA74, 4 release @@ -537,9 +537,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA2F8:: @ 81FA2F8 applymovement 255, LittlerootTown_ProfessorBirchsLab_Movement_2725A8 waitmovement 0 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA352 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA37F setvar VAR_0x4084, 5 setflag FLAG_0x074 @@ -552,7 +552,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA2F8:: @ 81FA2F8 LittlerootTown_ProfessorBirchsLab_EventScript_1FA352:: @ 81FA352 msgbox LittlerootTown_ProfessorBirchsLab_Text_1FADD7, 4 giveitem_std ITEM_POKE_BALL, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA3CE msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAE40, 4 setvar VAR_RESULT, 0 @@ -561,7 +561,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA352:: @ 81FA352 LittlerootTown_ProfessorBirchsLab_EventScript_1FA37F:: @ 81FA37F msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAF3F, 4 giveitem_std ITEM_POKE_BALL, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA3D7 msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAF8E, 4 setvar VAR_RESULT, 1 @@ -602,16 +602,16 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA3E3:: @ 81FA3E3 LittlerootTown_ProfessorBirchsLab_EventScript_1FA3EC:: @ 81FA3EC lock faceplayer - compare_var_to_value VAR_0x40D3, 5 + compare VAR_0x40D3, 5 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA43A - compare_var_to_value VAR_0x40D3, 6 + compare VAR_0x40D3, 6 goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_1FA465 - compare_var_to_value VAR_0x40D3, 2 + compare VAR_0x40D3, 2 goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_1FA490 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA428 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA431 release end @@ -626,9 +626,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA431:: @ 81FA431 LittlerootTown_ProfessorBirchsLab_EventScript_1FA43A:: @ 81FA43A checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA453 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA45C release end @@ -643,9 +643,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA45C:: @ 81FA45C LittlerootTown_ProfessorBirchsLab_EventScript_1FA465:: @ 81FA465 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA47E - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA487 release end @@ -660,9 +660,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA487:: @ 81FA487 LittlerootTown_ProfessorBirchsLab_EventScript_1FA490:: @ 81FA490 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4A9 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4B2 release end diff --git a/data/scripts/maps/MarineCave_End.inc b/data/scripts/maps/MarineCave_End.inc index dc2e2b3a0..7d2588a0a 100644 --- a/data/scripts/maps/MarineCave_End.inc +++ b/data/scripts/maps/MarineCave_End.inc @@ -10,7 +10,7 @@ MarineCave_End_MapScript1_23AFEA: @ 823AFEA MarineCave_End_EventScript_23AFF4:: @ 823AFF4 specialvar VAR_RESULT, sub_8138B80 - compare_var_to_value VAR_RESULT, 7 + compare VAR_RESULT, 7 goto_if 5, MarineCave_End_EventScript_27374E removeobject 1 return @@ -38,16 +38,16 @@ MarineCave_End_EventScript_23B01B:: @ 823B01B setvar VAR_LAST_TALKED, 1 setwildbattle SPECIES_KYOGRE, 70, ITEM_NONE setflag FLAG_SYS_CTRL_OBJ_DELETE - special sub_80B0934 + special BattleSetup_StartLegendaryBattle waitstate clearflag FLAG_SYS_CTRL_OBJ_DELETE setvar VAR_0x4001, 0 specialvar VAR_RESULT, sub_8138B80 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq MarineCave_End_EventScript_23B084 - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 goto_eq MarineCave_End_EventScript_23B092 - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_eq MarineCave_End_EventScript_23B092 setvar VAR_0x4039, 1 setflag FLAG_0x1BE diff --git a/data/scripts/maps/MauvilleCity.inc b/data/scripts/maps/MauvilleCity.inc index b470e4432..908b3a3b3 100644 --- a/data/scripts/maps/MauvilleCity.inc +++ b/data/scripts/maps/MauvilleCity.inc @@ -107,9 +107,9 @@ MauvilleCity_EventScript_1DF452:: @ 81DF452 end MauvilleCity_EventScript_1DF4AD:: @ 81DF4AD - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, MauvilleCity_EventScript_1DF63A - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_EventScript_1DF683 closemessage switch VAR_FACING @@ -164,18 +164,18 @@ MauvilleCity_EventScript_1DF593:: @ 81DF593 setflag FLAG_0x0BE setvar VAR_0x40F2, 0 setflag FLAG_0x088 - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if 1, MauvilleCity_EventScript_1DF5F3 - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if 1, MauvilleCity_EventScript_1DF601 applymovement 255, MauvilleCity_Movement_2725AA waitmovement 0 msgbox MauvilleCity_Text_1DFED5, 4 closemessage addvar VAR_0x40D1, 1 - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if 1, MauvilleCity_EventScript_1DF616 - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if 1, MauvilleCity_EventScript_1DF628 removeobject 11 releaseall @@ -426,7 +426,7 @@ MauvilleCity_EventScript_1DF73A:: @ 81DF73A faceplayer checkflag FLAG_0x0D1 goto_eq MauvilleCity_EventScript_1DF7B0 - compare_var_to_value VAR_0x40BA, 2 + compare VAR_0x40BA, 2 goto_eq MauvilleCity_EventScript_1DF784 checkflag FLAG_0x0D0 goto_eq MauvilleCity_EventScript_1DF77A @@ -445,7 +445,7 @@ MauvilleCity_EventScript_1DF77A:: @ 81DF77A MauvilleCity_EventScript_1DF784:: @ 81DF784 msgbox MauvilleCity_Text_1E020E, 4 giveitem_std ITEM_TM24 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_EventScript_272054 setflag FLAG_0x0D1 msgbox MauvilleCity_Text_1E02AA, 4 diff --git a/data/scripts/maps/MauvilleCity_BikeShop.inc b/data/scripts/maps/MauvilleCity_BikeShop.inc index 1dc08e304..d4915a478 100644 --- a/data/scripts/maps/MauvilleCity_BikeShop.inc +++ b/data/scripts/maps/MauvilleCity_BikeShop.inc @@ -10,17 +10,17 @@ MauvilleCity_BikeShop_EventScript_20EBBC:: @ 820EBBC goto_eq MauvilleCity_BikeShop_EventScript_20EBF7 msgbox MauvilleCity_BikeShop_Text_20EE22, 4 msgbox MauvilleCity_BikeShop_Text_20EE99, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq MauvilleCity_BikeShop_EventScript_20EC4A - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_BikeShop_EventScript_20EC3D end MauvilleCity_BikeShop_EventScript_20EBF7:: @ 820EBF7 msgbox MauvilleCity_BikeShop_Text_20EE99, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq MauvilleCity_BikeShop_EventScript_20EC4A - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_BikeShop_EventScript_20EC3D end @@ -64,19 +64,19 @@ MauvilleCity_BikeShop_EventScript_20EC87:: @ 820EC87 MauvilleCity_BikeShop_EventScript_20EC94:: @ 820EC94 msgbox MauvilleCity_BikeShop_Text_20F1FB, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq MauvilleCity_BikeShop_EventScript_20ECB3 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_BikeShop_EventScript_20ECE5 end MauvilleCity_BikeShop_EventScript_20ECB3:: @ 820ECB3 msgbox MauvilleCity_BikeShop_Text_20F22F, 4 checkitem ITEM_ACRO_BIKE, 1 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq MauvilleCity_BikeShop_EventScript_20ECEF checkitem ITEM_MACH_BIKE, 1 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq MauvilleCity_BikeShop_EventScript_20ED10 msgbox MauvilleCity_BikeShop_Text_20F2F3, 4 release diff --git a/data/scripts/maps/MauvilleCity_GameCorner.inc b/data/scripts/maps/MauvilleCity_GameCorner.inc index c75fdafec..6d3e0c317 100644 --- a/data/scripts/maps/MauvilleCity_GameCorner.inc +++ b/data/scripts/maps/MauvilleCity_GameCorner.inc @@ -6,7 +6,7 @@ MauvilleCity_GameCorner_EventScript_20FBB9:: @ 820FBB9 faceplayer msgbox MauvilleCity_GameCorner_Text_210460, 4 checkitem ITEM_COIN_CASE, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_20FCB7 message MauvilleCity_GameCorner_Text_2104DF waitmessage @@ -32,10 +32,10 @@ MauvilleCity_GameCorner_EventScript_20FC0C:: @ 820FC0C MauvilleCity_GameCorner_EventScript_20FC33:: @ 820FC33 checkcoins VAR_0x4001 - compare_var_to_value VAR_0x4001, 9950 + compare VAR_0x4001, 9950 goto_if 4, MauvilleCity_GameCorner_EventScript_20FCE1 checkmoney 0x3e8, 0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_20FCC1 givecoins 50 takemoney 0x3e8, 0 @@ -53,10 +53,10 @@ MauvilleCity_GameCorner_EventScript_20FC33:: @ 820FC33 MauvilleCity_GameCorner_EventScript_20FC75:: @ 820FC75 checkcoins VAR_0x4001 - compare_var_to_value VAR_0x4001, 9500 + compare VAR_0x4001, 9500 goto_if 4, MauvilleCity_GameCorner_EventScript_20FCE1 checkmoney 0x2710, 0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_20FCC1 givecoins 500 takemoney 0x2710, 0 @@ -109,7 +109,7 @@ MauvilleCity_GameCorner_EventScript_20FCF1:: @ 820FCF1 faceplayer msgbox MauvilleCity_GameCorner_Text_2105D7, 4 checkitem ITEM_COIN_CASE, 1 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq MauvilleCity_GameCorner_EventScript_20FD0D release end @@ -153,7 +153,7 @@ MauvilleCity_GameCorner_EventScript_20FD83:: @ 820FD83 MauvilleCity_GameCorner_EventScript_20FD91:: @ 820FD91 msgbox MauvilleCity_GameCorner_Text_210705, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_20FE92 switch VAR_0x4001 case 1, MauvilleCity_GameCorner_EventScript_20FDCB @@ -163,11 +163,11 @@ MauvilleCity_GameCorner_EventScript_20FD91:: @ 820FD91 MauvilleCity_GameCorner_EventScript_20FDCB:: @ 820FDCB checkcoins VAR_0x4002 - compare_var_to_value VAR_0x4002, 1000 + compare VAR_0x4002, 1000 goto_if 0, MauvilleCity_GameCorner_EventScript_20FE79 bufferdecorationname 1, 88 checkdecorspace 88 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_20FE87 takecoins 1000 givedecoration 88 @@ -179,11 +179,11 @@ MauvilleCity_GameCorner_EventScript_20FDCB:: @ 820FDCB MauvilleCity_GameCorner_EventScript_20FE05:: @ 820FE05 checkcoins VAR_0x4002 - compare_var_to_value VAR_0x4002, 1000 + compare VAR_0x4002, 1000 goto_if 0, MauvilleCity_GameCorner_EventScript_20FE79 bufferdecorationname 1, 89 checkdecorspace 89 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_20FE87 takecoins 1000 givedecoration 89 @@ -195,11 +195,11 @@ MauvilleCity_GameCorner_EventScript_20FE05:: @ 820FE05 MauvilleCity_GameCorner_EventScript_20FE3F:: @ 820FE3F checkcoins VAR_0x4002 - compare_var_to_value VAR_0x4002, 1000 + compare VAR_0x4002, 1000 goto_if 0, MauvilleCity_GameCorner_EventScript_20FE79 bufferdecorationname 1, 90 checkdecorspace 90 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_20FE87 takecoins 1000 givedecoration 90 @@ -230,7 +230,7 @@ MauvilleCity_GameCorner_EventScript_20FE9F:: @ 820FE9F faceplayer msgbox MauvilleCity_GameCorner_Text_2105D7, 4 checkitem ITEM_COIN_CASE, 1 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq MauvilleCity_GameCorner_EventScript_20FEBB release end @@ -292,7 +292,7 @@ MauvilleCity_GameCorner_EventScript_20FF77:: @ 820FF77 MauvilleCity_GameCorner_EventScript_20FF8A:: @ 820FF8A special sub_81398C0 msgbox MauvilleCity_GameCorner_Text_210629, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_210118 switch VAR_0x4001 case 1, MauvilleCity_GameCorner_EventScript_20FFDD @@ -304,10 +304,10 @@ MauvilleCity_GameCorner_EventScript_20FF8A:: @ 820FF8A MauvilleCity_GameCorner_EventScript_20FFDD:: @ 820FFDD checkcoins VAR_0x4002 - compare_var_to_value VAR_0x4002, 1500 + compare VAR_0x4002, 1500 goto_if 0, MauvilleCity_GameCorner_EventScript_2100FF checkitemspace ITEM_TM32, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_21010D takecoins 1500 giveitem ITEM_TM32, 1 @@ -319,10 +319,10 @@ MauvilleCity_GameCorner_EventScript_20FFDD:: @ 820FFDD MauvilleCity_GameCorner_EventScript_210017:: @ 8210017 checkcoins VAR_0x4002 - compare_var_to_value VAR_0x4002, 3500 + compare VAR_0x4002, 3500 goto_if 0, MauvilleCity_GameCorner_EventScript_2100FF checkitemspace ITEM_TM29, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_21010D takecoins 3500 giveitem ITEM_TM29, 1 @@ -334,10 +334,10 @@ MauvilleCity_GameCorner_EventScript_210017:: @ 8210017 MauvilleCity_GameCorner_EventScript_210051:: @ 8210051 checkcoins VAR_0x4002 - compare_var_to_value VAR_0x4002, 4000 + compare VAR_0x4002, 4000 goto_if 0, MauvilleCity_GameCorner_EventScript_2100FF checkitemspace ITEM_TM35, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_21010D takecoins 4000 giveitem ITEM_TM35, 1 @@ -349,10 +349,10 @@ MauvilleCity_GameCorner_EventScript_210051:: @ 8210051 MauvilleCity_GameCorner_EventScript_21008B:: @ 821008B checkcoins VAR_0x4002 - compare_var_to_value VAR_0x4002, 4000 + compare VAR_0x4002, 4000 goto_if 0, MauvilleCity_GameCorner_EventScript_2100FF checkitemspace ITEM_TM24, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_21010D takecoins 4000 giveitem ITEM_TM24, 1 @@ -364,10 +364,10 @@ MauvilleCity_GameCorner_EventScript_21008B:: @ 821008B MauvilleCity_GameCorner_EventScript_2100C5:: @ 82100C5 checkcoins VAR_0x4002 - compare_var_to_value VAR_0x4002, 4000 + compare VAR_0x4002, 4000 goto_if 0, MauvilleCity_GameCorner_EventScript_2100FF checkitemspace ITEM_TM13, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_21010D takecoins 4000 giveitem ITEM_TM13, 1 @@ -407,7 +407,7 @@ MauvilleCity_GameCorner_EventScript_210137:: @ 8210137 checkflag FLAG_0x0E2 goto_eq MauvilleCity_GameCorner_EventScript_210213 msgbox MauvilleCity_GameCorner_Text_210750, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_210209 switch VAR_FIRST_POKE case 0, MauvilleCity_GameCorner_EventScript_21017C @@ -418,7 +418,7 @@ MauvilleCity_GameCorner_EventScript_210137:: @ 8210137 MauvilleCity_GameCorner_EventScript_21017C:: @ 821017C bufferdecorationname 1, 88 checkdecorspace 88 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_2101FA msgbox MauvilleCity_GameCorner_Text_21079C, 4 givedecoration_std 88 @@ -429,7 +429,7 @@ MauvilleCity_GameCorner_EventScript_21017C:: @ 821017C MauvilleCity_GameCorner_EventScript_2101A6:: @ 82101A6 bufferdecorationname 1, 89 checkdecorspace 89 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_2101FA msgbox MauvilleCity_GameCorner_Text_21079C, 4 givedecoration_std 89 @@ -440,7 +440,7 @@ MauvilleCity_GameCorner_EventScript_2101A6:: @ 82101A6 MauvilleCity_GameCorner_EventScript_2101D0:: @ 82101D0 bufferdecorationname 1, 90 checkdecorspace 90 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_2101FA msgbox MauvilleCity_GameCorner_Text_21079C, 4 givedecoration_std 90 @@ -468,7 +468,7 @@ MauvilleCity_GameCorner_EventScript_21021D:: @ 821021D lock faceplayer checkitem ITEM_COIN_CASE, 1 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq MauvilleCity_GameCorner_EventScript_21023D msgbox MauvilleCity_GameCorner_Text_210830, 4 goto MauvilleCity_GameCorner_EventScript_2102A9 @@ -478,7 +478,7 @@ MauvilleCity_GameCorner_EventScript_21023D:: @ 821023D checkflag FLAG_0x0E1 goto_eq MauvilleCity_GameCorner_EventScript_21026B checkcoins VAR_0x4001 - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 goto_if 4, MauvilleCity_GameCorner_EventScript_21026B setflag FLAG_0x0E1 givecoins 20 @@ -537,7 +537,7 @@ MauvilleCity_GameCorner_EventScript_2102C6:: @ 82102C6 MauvilleCity_GameCorner_EventScript_2102D6:: @ 82102D6 lockall checkitem ITEM_COIN_CASE, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_210456 setvar VAR_0x8004, 0 specialvar VAR_RESULT, sub_8139248 @@ -548,7 +548,7 @@ MauvilleCity_GameCorner_EventScript_2102D6:: @ 82102D6 MauvilleCity_GameCorner_EventScript_2102F6:: @ 82102F6 lockall checkitem ITEM_COIN_CASE, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_210456 setvar VAR_0x8004, 1 specialvar VAR_RESULT, sub_8139248 @@ -559,7 +559,7 @@ MauvilleCity_GameCorner_EventScript_2102F6:: @ 82102F6 MauvilleCity_GameCorner_EventScript_210316:: @ 8210316 lockall checkitem ITEM_COIN_CASE, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_210456 setvar VAR_0x8004, 2 specialvar VAR_RESULT, sub_8139248 @@ -570,7 +570,7 @@ MauvilleCity_GameCorner_EventScript_210316:: @ 8210316 MauvilleCity_GameCorner_EventScript_210336:: @ 8210336 lockall checkitem ITEM_COIN_CASE, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_210456 setvar VAR_0x8004, 3 specialvar VAR_RESULT, sub_8139248 @@ -581,7 +581,7 @@ MauvilleCity_GameCorner_EventScript_210336:: @ 8210336 MauvilleCity_GameCorner_EventScript_210356:: @ 8210356 lockall checkitem ITEM_COIN_CASE, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_210456 setvar VAR_0x8004, 4 specialvar VAR_RESULT, sub_8139248 @@ -592,7 +592,7 @@ MauvilleCity_GameCorner_EventScript_210356:: @ 8210356 MauvilleCity_GameCorner_EventScript_210376:: @ 8210376 lockall checkitem ITEM_COIN_CASE, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_210456 setvar VAR_0x8004, 5 specialvar VAR_RESULT, sub_8139248 @@ -603,7 +603,7 @@ MauvilleCity_GameCorner_EventScript_210376:: @ 8210376 MauvilleCity_GameCorner_EventScript_210396:: @ 8210396 lockall checkitem ITEM_COIN_CASE, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_210456 setvar VAR_0x8004, 6 specialvar VAR_RESULT, sub_8139248 @@ -614,7 +614,7 @@ MauvilleCity_GameCorner_EventScript_210396:: @ 8210396 MauvilleCity_GameCorner_EventScript_2103B6:: @ 82103B6 lockall checkitem ITEM_COIN_CASE, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_210456 setvar VAR_0x8004, 7 specialvar VAR_RESULT, sub_8139248 @@ -625,7 +625,7 @@ MauvilleCity_GameCorner_EventScript_2103B6:: @ 82103B6 MauvilleCity_GameCorner_EventScript_2103D6:: @ 82103D6 lockall checkitem ITEM_COIN_CASE, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_210456 setvar VAR_0x8004, 8 specialvar VAR_RESULT, sub_8139248 @@ -636,7 +636,7 @@ MauvilleCity_GameCorner_EventScript_2103D6:: @ 82103D6 MauvilleCity_GameCorner_EventScript_2103F6:: @ 82103F6 lockall checkitem ITEM_COIN_CASE, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_210456 setvar VAR_0x8004, 9 specialvar VAR_RESULT, sub_8139248 @@ -647,7 +647,7 @@ MauvilleCity_GameCorner_EventScript_2103F6:: @ 82103F6 MauvilleCity_GameCorner_EventScript_210416:: @ 8210416 lockall checkitem ITEM_COIN_CASE, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_210456 setvar VAR_0x8004, 10 specialvar VAR_RESULT, sub_8139248 @@ -658,7 +658,7 @@ MauvilleCity_GameCorner_EventScript_210416:: @ 8210416 MauvilleCity_GameCorner_EventScript_210436:: @ 8210436 lockall checkitem ITEM_COIN_CASE, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_210456 setvar VAR_0x8004, 11 specialvar VAR_RESULT, sub_8139248 diff --git a/data/scripts/maps/MauvilleCity_Gym.inc b/data/scripts/maps/MauvilleCity_Gym.inc index 899550337..03d5d5525 100644 --- a/data/scripts/maps/MauvilleCity_Gym.inc +++ b/data/scripts/maps/MauvilleCity_Gym.inc @@ -77,12 +77,12 @@ MauvilleCity_Gym_EventScript_20DEE7:: @ 820DEE7 MauvilleCity_Gym_EventScript_20DEEB:: @ 820DEEB trainerbattle 1, TRAINER_WATTSON_1, 0, MauvilleCity_Gym_Text_20E602, MauvilleCity_Gym_Text_20E734, MauvilleCity_Gym_EventScript_20DF2B - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq MauvilleCity_Gym_EventScript_20DFDE checkflag FLAG_0x0A7 goto_if 0, MauvilleCity_Gym_EventScript_20DF8D - compare_var_to_value VAR_0x40BA, 2 + compare VAR_0x40BA, 2 goto_eq MauvilleCity_Gym_EventScript_20DFD4 msgbox MauvilleCity_Gym_Text_20E8E3, 4 release @@ -98,7 +98,7 @@ MauvilleCity_Gym_EventScript_20DF2B:: @ 820DF2B setflag FLAG_0x4F2 setflag FLAG_BADGE03_GET addvar VAR_0x4085, 1 - compare_var_to_value VAR_0x4085, 6 + compare VAR_0x4085, 6 call_if 1, MauvilleCity_Gym_EventScript_271E84 setvar VAR_0x8008, 3 call MauvilleCity_Gym_EventScript_271F43 @@ -119,7 +119,7 @@ MauvilleCity_Gym_EventScript_20DF2B:: @ 820DF2B MauvilleCity_Gym_EventScript_20DF8D:: @ 820DF8D giveitem_std ITEM_TM34 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_Gym_EventScript_272054 msgbox MauvilleCity_Gym_Text_20E844, 4 setflag FLAG_0x0A7 @@ -128,7 +128,7 @@ MauvilleCity_Gym_EventScript_20DF8D:: @ 820DF8D MauvilleCity_Gym_EventScript_20DFB1:: @ 820DFB1 giveitem_std ITEM_TM34 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_Gym_EventScript_27205E msgbox MauvilleCity_Gym_Text_20E844, 4 setflag FLAG_0x0A7 @@ -148,7 +148,7 @@ MauvilleCity_Gym_EventScript_20DFF9:: @ 820DFF9 lockall checkflag FLAG_0x4F2 goto_eq MauvilleCity_Gym_EventScript_20E0AD - compare_var_to_value VAR_0x4093, 1 + compare VAR_0x4093, 1 goto_eq MauvilleCity_Gym_EventScript_20E0AD setvar VAR_0x4093, 1 setvar VAR_0x8004, 0 @@ -159,7 +159,7 @@ MauvilleCity_Gym_EventScript_20E01E:: @ 820E01E lockall checkflag FLAG_0x4F2 goto_eq MauvilleCity_Gym_EventScript_20E0AD - compare_var_to_value VAR_0x4093, 2 + compare VAR_0x4093, 2 goto_eq MauvilleCity_Gym_EventScript_20E0AD setvar VAR_0x4093, 2 setvar VAR_0x8004, 1 @@ -170,7 +170,7 @@ MauvilleCity_Gym_EventScript_20E043:: @ 820E043 lockall checkflag FLAG_0x4F2 goto_eq MauvilleCity_Gym_EventScript_20E0AD - compare_var_to_value VAR_0x4093, 3 + compare VAR_0x4093, 3 goto_eq MauvilleCity_Gym_EventScript_20E0AD setvar VAR_0x4093, 3 setvar VAR_0x8004, 2 @@ -181,7 +181,7 @@ MauvilleCity_Gym_EventScript_20E068:: @ 820E068 lockall checkflag FLAG_0x4F2 goto_eq MauvilleCity_Gym_EventScript_20E0AD - compare_var_to_value VAR_0x4093, 4 + compare VAR_0x4093, 4 goto_eq MauvilleCity_Gym_EventScript_20E0AD setvar VAR_0x4093, 4 setvar VAR_0x8004, 3 diff --git a/data/scripts/maps/MauvilleCity_House2.inc b/data/scripts/maps/MauvilleCity_House2.inc index 35fb02a22..7a1a1cad1 100644 --- a/data/scripts/maps/MauvilleCity_House2.inc +++ b/data/scripts/maps/MauvilleCity_House2.inc @@ -8,7 +8,7 @@ MauvilleCity_House2_EventScript_210C5D:: @ 8210C5D goto_eq MauvilleCity_House2_EventScript_210CDA msgbox MauvilleCity_House2_Text_210CEE, 4 checkitem ITEM_HARBOR_MAIL, 1 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq MauvilleCity_House2_EventScript_210C82 release end @@ -20,9 +20,9 @@ MauvilleCity_House2_EventScript_210C82:: @ 8210C82 applymovement VAR_LAST_TALKED, MauvilleCity_House2_Movement_27259A waitmovement 0 msgbox MauvilleCity_House2_Text_210D76, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq MauvilleCity_House2_EventScript_210CB8 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_House2_EventScript_210CE4 end diff --git a/data/scripts/maps/MeteorFalls_1F_2R.inc b/data/scripts/maps/MeteorFalls_1F_2R.inc index 8cf171209..76aad489f 100644 --- a/data/scripts/maps/MeteorFalls_1F_2R.inc +++ b/data/scripts/maps/MeteorFalls_1F_2R.inc @@ -3,8 +3,8 @@ MeteorFalls_1F_2R_MapScripts:: @ 822C4DD MeteorFalls_1F_2R_EventScript_22C4DE:: @ 822C4DE trainerbattle 2, TRAINER_NICOLAS_1, 0, MeteorFalls_1F_2R_Text_22C608, MeteorFalls_1F_2R_Text_22C678, MeteorFalls_1F_2R_EventScript_22C50A - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq MeteorFalls_1F_2R_EventScript_22C529 msgbox MeteorFalls_1F_2R_Text_22C6A3, 4 release @@ -28,8 +28,8 @@ MeteorFalls_1F_2R_EventScript_22C529:: @ 822C529 MeteorFalls_1F_2R_EventScript_22C540:: @ 822C540 trainerbattle 6, TRAINER_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_22C843, MeteorFalls_1F_2R_Text_22C89C, MeteorFalls_1F_2R_Text_22C92B, MeteorFalls_1F_2R_EventScript_22C570 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq MeteorFalls_1F_2R_EventScript_22C589 msgbox MeteorFalls_1F_2R_Text_22C8C1, 4 release @@ -51,8 +51,8 @@ MeteorFalls_1F_2R_EventScript_22C589:: @ 822C589 MeteorFalls_1F_2R_EventScript_22C5A4:: @ 822C5A4 trainerbattle 6, TRAINER_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_22C9E6, MeteorFalls_1F_2R_Text_22CA44, MeteorFalls_1F_2R_Text_22CACD, MeteorFalls_1F_2R_EventScript_22C5D4 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq MeteorFalls_1F_2R_EventScript_22C5ED msgbox MeteorFalls_1F_2R_Text_22CA70, 4 release diff --git a/data/scripts/maps/MirageTower_4F.inc b/data/scripts/maps/MirageTower_4F.inc index 696d47435..19b8c6c91 100644 --- a/data/scripts/maps/MirageTower_4F.inc +++ b/data/scripts/maps/MirageTower_4F.inc @@ -5,7 +5,7 @@ MirageTower_4F_EventScript_23AD48:: @ 823AD48 lock faceplayer msgbox MirageTower_4F_Text_23ADF9, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MirageTower_4F_EventScript_23AD7F giveitem_std ITEM_ROOT_FOSSIL closemessage @@ -26,7 +26,7 @@ MirageTower_4F_EventScript_23AD89:: @ 823AD89 lock faceplayer msgbox MirageTower_4F_Text_23AE98, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MirageTower_4F_EventScript_23ADC0 giveitem_std ITEM_CLAW_FOSSIL closemessage diff --git a/data/scripts/maps/MossdeepCity.inc b/data/scripts/maps/MossdeepCity.inc index 1253a2a25..111281931 100644 --- a/data/scripts/maps/MossdeepCity.inc +++ b/data/scripts/maps/MossdeepCity.inc @@ -230,11 +230,11 @@ MossdeepCity_EventScript_1E4C26:: @ 81E4C26 checkflag FLAG_0x114 goto_eq MossdeepCity_EventScript_1E4C68 msgbox MossdeepCity_Text_1E4CED, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MossdeepCity_EventScript_1E4C72 msgbox MossdeepCity_Text_1E4D5B, 4 giveitem_std ITEM_KINGS_ROCK - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MossdeepCity_EventScript_272054 setflag FLAG_0x114 release @@ -259,9 +259,9 @@ MossdeepCity_EventScript_1E4C85:: @ 81E4C85 faceplayer msgbox MossdeepCity_Text_1E5453, 4 closemessage - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if 1, MossdeepCity_EventScript_1E4CB0 - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if 1, MossdeepCity_EventScript_1E4CC2 addvar VAR_0x40D1, 1 removeobject 16 diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/scripts/maps/MossdeepCity_Gym.inc index 89c243767..3443d003d 100644 --- a/data/scripts/maps/MossdeepCity_Gym.inc +++ b/data/scripts/maps/MossdeepCity_Gym.inc @@ -50,8 +50,8 @@ MossdeepCity_Gym_EventScript_220885:: @ 8220885 MossdeepCity_Gym_EventScript_220898:: @ 8220898 trainerbattle 8, TRAINER_TATE_AND_LIZA_1, 0, MossdeepCity_Gym_Text_221783, MossdeepCity_Gym_Text_2218EC, MossdeepCity_Gym_Text_221BCE, MossdeepCity_Gym_EventScript_2208D1 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq MossdeepCity_Gym_EventScript_22097E checkflag FLAG_0x0AB goto_if 0, MossdeepCity_Gym_EventScript_220937 @@ -93,7 +93,7 @@ MossdeepCity_Gym_EventScript_2208D1:: @ 82208D1 MossdeepCity_Gym_EventScript_220937:: @ 8220937 giveitem_std ITEM_TM04 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MossdeepCity_Gym_EventScript_272054 msgbox MossdeepCity_Gym_Text_221A40, 4 setflag FLAG_0x0AB @@ -102,7 +102,7 @@ MossdeepCity_Gym_EventScript_220937:: @ 8220937 MossdeepCity_Gym_EventScript_22095B:: @ 822095B giveitem_std ITEM_TM04 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MossdeepCity_Gym_EventScript_27205E msgbox MossdeepCity_Gym_Text_221A40, 4 setflag FLAG_0x0AB diff --git a/data/scripts/maps/MossdeepCity_House1.inc b/data/scripts/maps/MossdeepCity_House1.inc index f6c3eac63..a06979ddf 100644 --- a/data/scripts/maps/MossdeepCity_House1.inc +++ b/data/scripts/maps/MossdeepCity_House1.inc @@ -7,7 +7,7 @@ MossdeepCity_House1_EventScript_221FD6:: @ 8221FD6 bufferleadmonspeciesname 0 msgbox MossdeepCity_House1_Text_22200F, 4 specialvar VAR_RESULT, sub_81391D0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MossdeepCity_House1_EventScript_221FFC msgbox MossdeepCity_House1_Text_22201D, 4 release diff --git a/data/scripts/maps/MossdeepCity_House2.inc b/data/scripts/maps/MossdeepCity_House2.inc index 22092b6b3..7707690fb 100644 --- a/data/scripts/maps/MossdeepCity_House2.inc +++ b/data/scripts/maps/MossdeepCity_House2.inc @@ -19,9 +19,9 @@ MossdeepCity_House2_EventScript_2220F1:: @ 82220F1 closemessage setflag FLAG_0x0E0 clearflag FLAG_0x3A5 - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if 1, MossdeepCity_House2_EventScript_222124 - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if 1, MossdeepCity_House2_EventScript_22212F removeobject 3 release diff --git a/data/scripts/maps/MossdeepCity_House3.inc b/data/scripts/maps/MossdeepCity_House3.inc index 2209a68a0..dfdbfa956 100644 --- a/data/scripts/maps/MossdeepCity_House3.inc +++ b/data/scripts/maps/MossdeepCity_House3.inc @@ -7,7 +7,7 @@ MossdeepCity_House3_EventScript_2225C3:: @ 82225C3 checkflag FLAG_0x098 goto_eq MossdeepCity_House3_EventScript_222602 msgbox MossdeepCity_House3_Text_222616, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MossdeepCity_House3_EventScript_22260C msgbox MossdeepCity_House3_Text_2226B6, 4 giveitem_std ITEM_SUPER_ROD diff --git a/data/scripts/maps/MossdeepCity_House4.inc b/data/scripts/maps/MossdeepCity_House4.inc index e95528a20..0cd8ddf84 100644 --- a/data/scripts/maps/MossdeepCity_House4.inc +++ b/data/scripts/maps/MossdeepCity_House4.inc @@ -19,7 +19,7 @@ MossdeepCity_House4_EventScript_222DF7:: @ 8222DF7 lock faceplayer special sub_80E8BC8 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MossdeepCity_House4_EventScript_222E14 special sub_8139200 msgbox MossdeepCity_House4_Text_222ECC, 4 diff --git a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc index f69a45029..106dc5570 100644 --- a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc +++ b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc @@ -4,7 +4,7 @@ MossdeepCity_SpaceCenter_1F_MapScripts:: @ 8222F41 .byte 0 MossdeepCity_SpaceCenter_1F_MapScript1_222F4C: @ 8222F4C - compare_var_to_value VAR_0x405D, 2 + compare VAR_0x405D, 2 goto_eq MossdeepCity_SpaceCenter_1F_EventScript_222F58 end @@ -18,11 +18,11 @@ MossdeepCity_SpaceCenter_1F_EventScript_222F58:: @ 8222F58 setobjectxyperm 1, 3, 4 setobjectmovementtype 1, 10 setobjectmovementtype 2, 10 - compare_var_to_value VAR_0x409E, 1 + compare VAR_0x409E, 1 goto_eq MossdeepCity_SpaceCenter_1F_EventScript_222FAA - compare_var_to_value VAR_0x409E, 2 + compare VAR_0x409E, 2 goto_eq MossdeepCity_SpaceCenter_1F_EventScript_222FB2 - compare_var_to_value VAR_0x409E, 3 + compare VAR_0x409E, 3 goto_eq MossdeepCity_SpaceCenter_1F_EventScript_222FBA end @@ -39,7 +39,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_222FBA:: @ 8222FBA end MossdeepCity_SpaceCenter_1F_MapScript1_222FC2: @ 8222FC2 - compare_var_to_value VAR_0x405D, 2 + compare VAR_0x405D, 2 goto_if 3, MossdeepCity_SpaceCenter_1F_EventScript_222FCE end @@ -50,14 +50,14 @@ MossdeepCity_SpaceCenter_1F_EventScript_222FCE:: @ 8222FCE MossdeepCity_SpaceCenter_1F_EventScript_222FD8:: @ 8222FD8 lock faceplayer - compare_var_to_value VAR_0x405D, 2 + compare VAR_0x405D, 2 goto_eq MossdeepCity_SpaceCenter_1F_EventScript_223024 dodailyevents specialvar VAR_RESULT, sub_8138BDC buffernumberstring 0, VAR_RESULT - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, MossdeepCity_SpaceCenter_1F_EventScript_223012 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 4, MossdeepCity_SpaceCenter_1F_EventScript_22301B closemessage applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A2 @@ -77,9 +77,9 @@ MossdeepCity_SpaceCenter_1F_EventScript_223024:: @ 8223024 dodailyevents specialvar VAR_RESULT, sub_8138BDC buffernumberstring 0, VAR_RESULT - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, MossdeepCity_SpaceCenter_1F_EventScript_223051 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 4, MossdeepCity_SpaceCenter_1F_EventScript_22305A closemessage applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A8 @@ -98,7 +98,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_22305A:: @ 822305A MossdeepCity_SpaceCenter_1F_EventScript_223063:: @ 8223063 lock faceplayer - compare_var_to_value VAR_0x405D, 2 + compare VAR_0x405D, 2 goto_eq MossdeepCity_SpaceCenter_1F_EventScript_22307A msgbox MossdeepCity_SpaceCenter_1F_Text_2233D3, 4 release @@ -114,13 +114,13 @@ MossdeepCity_SpaceCenter_1F_EventScript_22307A:: @ 822307A MossdeepCity_SpaceCenter_1F_EventScript_22308E:: @ 822308E lock faceplayer - compare_var_to_value VAR_0x405D, 2 + compare VAR_0x405D, 2 goto_eq MossdeepCity_SpaceCenter_1F_EventScript_2230DA checkflag FLAG_0x0C0 goto_eq MossdeepCity_SpaceCenter_1F_EventScript_2230D0 msgbox MossdeepCity_SpaceCenter_1F_Text_223540, 4 giveitem_std ITEM_SUN_STONE - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MossdeepCity_SpaceCenter_1F_EventScript_272054 setflag FLAG_0x0C0 msgbox MossdeepCity_SpaceCenter_1F_Text_2235A6, 4 @@ -137,7 +137,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_2230DA:: @ 82230DA goto_eq MossdeepCity_SpaceCenter_1F_EventScript_223119 msgbox MossdeepCity_SpaceCenter_1F_Text_2235F0, 4 giveitem_std ITEM_SUN_STONE - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MossdeepCity_SpaceCenter_1F_EventScript_272054 setflag FLAG_0x0C0 msgbox MossdeepCity_SpaceCenter_1F_Text_223664, 4 @@ -158,9 +158,9 @@ MossdeepCity_SpaceCenter_1F_EventScript_22312D:: @ 822312D faceplayer checkflag FLAG_SYS_GAME_CLEAR goto_eq MossdeepCity_SpaceCenter_1F_EventScript_223154 - compare_var_to_value VAR_0x405D, 2 + compare VAR_0x405D, 2 goto_eq MossdeepCity_SpaceCenter_1F_EventScript_22315E - compare_var_to_value VAR_0x405D, 2 + compare VAR_0x405D, 2 goto_if 0, MossdeepCity_SpaceCenter_1F_EventScript_223154 goto MossdeepCity_SpaceCenter_1F_EventScript_22315E end @@ -180,9 +180,9 @@ MossdeepCity_SpaceCenter_1F_EventScript_223168:: @ 8223168 faceplayer checkflag FLAG_SYS_GAME_CLEAR goto_eq MossdeepCity_SpaceCenter_1F_EventScript_22318F - compare_var_to_value VAR_0x405D, 2 + compare VAR_0x405D, 2 goto_eq MossdeepCity_SpaceCenter_1F_EventScript_2231A4 - compare_var_to_value VAR_0x405D, 2 + compare VAR_0x405D, 2 goto_if 0, MossdeepCity_SpaceCenter_1F_EventScript_22318F goto MossdeepCity_SpaceCenter_1F_EventScript_2231A4 end diff --git a/data/scripts/maps/MossdeepCity_SpaceCenter_2F.inc b/data/scripts/maps/MossdeepCity_SpaceCenter_2F.inc index 824044152..b23da6481 100644 --- a/data/scripts/maps/MossdeepCity_SpaceCenter_2F.inc +++ b/data/scripts/maps/MossdeepCity_SpaceCenter_2F.inc @@ -4,9 +4,9 @@ MossdeepCity_SpaceCenter_2F_MapScripts:: @ 8223D58 .byte 0 MossdeepCity_SpaceCenter_2F_MapScript1_223D63: @ 8223D63 - compare_var_to_value VAR_0x405D, 2 + compare VAR_0x405D, 2 call_if 1, MossdeepCity_SpaceCenter_2F_EventScript_223D7A - compare_var_to_value VAR_0x409F, 2 + compare VAR_0x409F, 2 call_if 1, MossdeepCity_SpaceCenter_2F_EventScript_223D9F end @@ -37,7 +37,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_223DBF:: @ 8223DBF applymovement 255, MossdeepCity_SpaceCenter_2F_Movement_27259A waitmovement 0 msgbox MossdeepCity_SpaceCenter_2F_Text_2243A4, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq MossdeepCity_SpaceCenter_2F_EventScript_223E09 msgbox MossdeepCity_SpaceCenter_2F_Text_2243FE, 4 closemessage @@ -99,9 +99,9 @@ MossdeepCity_SpaceCenter_2F_EventScript_223E8D:: @ 8223E8D faceplayer checkflag FLAG_SYS_GAME_CLEAR goto_eq MossdeepCity_SpaceCenter_2F_EventScript_223EB4 - compare_var_to_value VAR_0x405D, 2 + compare VAR_0x405D, 2 goto_eq MossdeepCity_SpaceCenter_2F_EventScript_223EBE - compare_var_to_value VAR_0x405D, 2 + compare VAR_0x405D, 2 goto_if 0, MossdeepCity_SpaceCenter_2F_EventScript_223EB4 goto MossdeepCity_SpaceCenter_2F_EventScript_223EBE end @@ -121,9 +121,9 @@ MossdeepCity_SpaceCenter_2F_EventScript_223EC8:: @ 8223EC8 faceplayer checkflag FLAG_SYS_GAME_CLEAR goto_eq MossdeepCity_SpaceCenter_2F_EventScript_223EEF - compare_var_to_value VAR_0x405D, 2 + compare VAR_0x405D, 2 goto_eq MossdeepCity_SpaceCenter_2F_EventScript_223EF9 - compare_var_to_value VAR_0x405D, 2 + compare VAR_0x405D, 2 goto_if 0, MossdeepCity_SpaceCenter_2F_EventScript_223EEF goto MossdeepCity_SpaceCenter_2F_EventScript_223EF9 end @@ -143,9 +143,9 @@ MossdeepCity_SpaceCenter_2F_EventScript_223F03:: @ 8223F03 faceplayer checkflag FLAG_SYS_GAME_CLEAR goto_eq MossdeepCity_SpaceCenter_2F_EventScript_223F2A - compare_var_to_value VAR_0x405D, 2 + compare VAR_0x405D, 2 goto_eq MossdeepCity_SpaceCenter_2F_EventScript_223F34 - compare_var_to_value VAR_0x405D, 2 + compare VAR_0x405D, 2 goto_if 0, MossdeepCity_SpaceCenter_2F_EventScript_223F2A goto MossdeepCity_SpaceCenter_2F_EventScript_223F34 end @@ -238,7 +238,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_223FDA:: @ 8223FDA applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_2F_Movement_27259E waitmovement 0 msgbox MossdeepCity_SpaceCenter_2F_Text_2247FF, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq MossdeepCity_SpaceCenter_2F_EventScript_22400C msgbox MossdeepCity_SpaceCenter_2F_Text_224854, 4 closemessage @@ -254,7 +254,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_22400C:: @ 822400C fadescreen 1 special sub_80F9438 waitstate - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if 5, MossdeepCity_SpaceCenter_2F_EventScript_224032 special copy_player_party_from_sav1 goto MossdeepCity_SpaceCenter_2F_EventScript_223FDA @@ -353,9 +353,9 @@ MossdeepCity_SpaceCenter_2F_EventScript_224166:: @ 8224166 MossdeepCity_SpaceCenter_2F_EventScript_224175:: @ 8224175 lockall checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, MossdeepCity_SpaceCenter_2F_EventScript_224193 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, MossdeepCity_SpaceCenter_2F_EventScript_22419A closemessage clearflag FLAG_0x075 diff --git a/data/scripts/maps/MossdeepCity_StevensHouse.inc b/data/scripts/maps/MossdeepCity_StevensHouse.inc index d0d71eb6b..918b186ec 100644 --- a/data/scripts/maps/MossdeepCity_StevensHouse.inc +++ b/data/scripts/maps/MossdeepCity_StevensHouse.inc @@ -14,7 +14,7 @@ MossdeepCity_StevensHouse_EventScript_22279E:: @ 822279E return MossdeepCity_StevensHouse_MapScript1_2227A8: @ 82227A8 - compare_var_to_value VAR_0x40C6, 2 + compare VAR_0x40C6, 2 call_if 1, MossdeepCity_StevensHouse_EventScript_2227B4 end @@ -74,7 +74,7 @@ MossdeepCity_StevensHouse_Movement_22283B: @ 822283B MossdeepCity_StevensHouse_EventScript_222841:: @ 8222841 lockall msgbox MossdeepCity_StevensHouse_Text_222B9E, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MossdeepCity_StevensHouse_EventScript_22285B goto MossdeepCity_StevensHouse_EventScript_222865 end @@ -87,9 +87,9 @@ MossdeepCity_StevensHouse_EventScript_22285B:: @ 822285B MossdeepCity_StevensHouse_EventScript_222865:: @ 8222865 setvar VAR_0x4001, 398 givemon SPECIES_BELDUM, 5, ITEM_NONE, 0x0, 0x0, 0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MossdeepCity_StevensHouse_EventScript_222895 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq MossdeepCity_StevensHouse_EventScript_2228BD goto MossdeepCity_StevensHouse_EventScript_273811 end @@ -97,7 +97,7 @@ MossdeepCity_StevensHouse_EventScript_222865:: @ 8222865 MossdeepCity_StevensHouse_EventScript_222895:: @ 8222895 call MossdeepCity_StevensHouse_EventScript_2228EB msgbox gUnknown_08273374, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MossdeepCity_StevensHouse_EventScript_222901 call MossdeepCity_StevensHouse_EventScript_27378B call MossdeepCity_StevensHouse_EventScript_2723DD @@ -107,7 +107,7 @@ MossdeepCity_StevensHouse_EventScript_222895:: @ 8222895 MossdeepCity_StevensHouse_EventScript_2228BD:: @ 82228BD call MossdeepCity_StevensHouse_EventScript_2228EB msgbox gUnknown_08273374, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MossdeepCity_StevensHouse_EventScript_2228E0 call MossdeepCity_StevensHouse_EventScript_273797 goto MossdeepCity_StevensHouse_EventScript_2228E0 diff --git a/data/scripts/maps/MtChimney.inc b/data/scripts/maps/MtChimney.inc index d7a2ed83a..107cda58d 100644 --- a/data/scripts/maps/MtChimney.inc +++ b/data/scripts/maps/MtChimney.inc @@ -58,17 +58,17 @@ MtChimney_EventScript_22EE0B:: @ 822EE0B fadescreen 0 setobjectxyperm 1, 10, 12 addobject 1 - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if 1, MtChimney_EventScript_22EEC7 - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if 1, MtChimney_EventScript_22EED2 applymovement 255, MtChimney_Movement_2725A4 waitmovement 0 msgbox MtChimney_Text_22FC3D, 4 closemessage - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if 1, MtChimney_EventScript_22EEDD - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if 1, MtChimney_EventScript_22EEE8 removeobject 1 setflag FLAG_0x39E @@ -104,17 +104,17 @@ MtChimney_EventScript_22EEF3:: @ 822EEF3 faceplayer showmoneybox 0, 0, 0 msgbox MtChimney_Text_22FE04, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MtChimney_EventScript_22EF69 checkmoney 0xc8, 0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MtChimney_EventScript_22EF76 msgbox MtChimney_Text_22FE4D, 4 checkitemspace ITEM_LAVA_COOKIE, 1 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, MtChimney_EventScript_22EF5E giveitem_std ITEM_LAVA_COOKIE - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MtChimney_EventScript_22EF51 hidemoneybox nop @@ -459,7 +459,7 @@ MtChimney_EventScript_22F0E4:: @ 822F0E4 checkflag FLAG_0x073 goto_eq MtChimney_EventScript_22F12D msgbox MtChimney_Text_22FF12, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MtChimney_EventScript_22F123 msgbox MtChimney_Text_22FF66, 4 giveitem_std ITEM_METEORITE @@ -488,8 +488,8 @@ MtChimney_EventScript_22F141:: @ 822F141 MtChimney_EventScript_22F14A:: @ 822F14A trainerbattle 2, TRAINER_SHELBY_1, 0, MtChimney_Text_23001D, MtChimney_Text_230076, MtChimney_EventScript_22F176 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq MtChimney_EventScript_22F195 msgbox MtChimney_Text_2300A2, 4 release @@ -533,8 +533,8 @@ MtChimney_EventScript_22F1F1:: @ 822F1F1 MtChimney_EventScript_22F208:: @ 822F208 trainerbattle 2, TRAINER_SAWYER_1, 0, MtChimney_Text_2304B3, MtChimney_Text_2304F7, MtChimney_EventScript_22F234 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq MtChimney_EventScript_22F253 msgbox MtChimney_Text_230519, 4 release diff --git a/data/scripts/maps/MtChimney_CableCarStation.inc b/data/scripts/maps/MtChimney_CableCarStation.inc index 338304ac0..06621451e 100644 --- a/data/scripts/maps/MtChimney_CableCarStation.inc +++ b/data/scripts/maps/MtChimney_CableCarStation.inc @@ -4,7 +4,7 @@ MtChimney_CableCarStation_MapScripts:: @ 822ABFA .byte 0 MtChimney_CableCarStation_MapScript1_22AC05: @ 822AC05 - compare_var_to_value VAR_0x40A3, 1 + compare VAR_0x40A3, 1 call_if 1, MtChimney_CableCarStation_EventScript_22AC11 end @@ -32,9 +32,9 @@ MtChimney_CableCarStation_EventScript_22AC4B:: @ 822AC4B lock faceplayer msgbox MtChimney_CableCarStation_Text_22ACB9, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq MtChimney_CableCarStation_EventScript_22AC6C - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MtChimney_CableCarStation_EventScript_22AC9B end diff --git a/data/scripts/maps/MtPyre_1F.inc b/data/scripts/maps/MtPyre_1F.inc index 088290bd3..51c8a88fb 100644 --- a/data/scripts/maps/MtPyre_1F.inc +++ b/data/scripts/maps/MtPyre_1F.inc @@ -8,7 +8,7 @@ MtPyre_1F_EventScript_230F3F:: @ 8230F3F goto_eq MtPyre_1F_EventScript_230F6E msgbox MtPyre_1F_Text_230F8A, 4 giveitem_std ITEM_CLEANSE_TAG - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MtPyre_1F_EventScript_272054 setflag FLAG_0x11A release diff --git a/data/scripts/maps/MtPyre_3F.inc b/data/scripts/maps/MtPyre_3F.inc index ad99e6c9a..0d733a433 100644 --- a/data/scripts/maps/MtPyre_3F.inc +++ b/data/scripts/maps/MtPyre_3F.inc @@ -13,8 +13,8 @@ MtPyre_3F_EventScript_23176A:: @ 823176A MtPyre_3F_EventScript_231781:: @ 8231781 trainerbattle 2, TRAINER_GABRIELLE_1, 0, MtPyre_3F_Text_231952, MtPyre_3F_Text_23196A, MtPyre_3F_EventScript_2317AD - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq MtPyre_3F_EventScript_2317CC msgbox MtPyre_3F_Text_23199B, 4 release diff --git a/data/scripts/maps/MtPyre_6F.inc b/data/scripts/maps/MtPyre_6F.inc index 36a727daa..7a98eb2ab 100644 --- a/data/scripts/maps/MtPyre_6F.inc +++ b/data/scripts/maps/MtPyre_6F.inc @@ -3,8 +3,8 @@ MtPyre_6F_MapScripts:: @ 8231D3A MtPyre_6F_EventScript_231D3B:: @ 8231D3B trainerbattle 2, TRAINER_VALERIE_1, 0, MtPyre_6F_Text_231DB4, MtPyre_6F_Text_231DE2, MtPyre_6F_EventScript_231D67 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq MtPyre_6F_EventScript_231D86 msgbox MtPyre_6F_Text_231DFC, 4 release diff --git a/data/scripts/maps/MtPyre_Exterior.inc b/data/scripts/maps/MtPyre_Exterior.inc index e67c0e4f8..7142f1f06 100644 --- a/data/scripts/maps/MtPyre_Exterior.inc +++ b/data/scripts/maps/MtPyre_Exterior.inc @@ -8,7 +8,7 @@ MtPyre_Exterior_MapScript1_231FD2: @ 8231FD2 MtPyre_Exterior_EventScript_231FD8:: @ 8231FD8 getplayerxy VAR_0x4000, VAR_0x4001 - compare_var_to_value VAR_0x4001, 12 + compare VAR_0x4001, 12 goto_if 0, MtPyre_Exterior_EventScript_231FE9 return diff --git a/data/scripts/maps/MtPyre_Summit.inc b/data/scripts/maps/MtPyre_Summit.inc index c16a6c7a2..874c4122a 100644 --- a/data/scripts/maps/MtPyre_Summit.inc +++ b/data/scripts/maps/MtPyre_Summit.inc @@ -3,7 +3,7 @@ MtPyre_Summit_MapScripts:: @ 8231FF7 .byte 0 MtPyre_Summit_MapScript1_231FFD: @ 8231FFD - compare_var_to_value VAR_0x40B9, 2 + compare VAR_0x40B9, 2 call_if 1, MtPyre_Summit_EventScript_232009 end @@ -37,11 +37,11 @@ MtPyre_Summit_EventScript_23203C:: @ 823203C applymovement 2, MtPyre_Summit_Movement_2725AA waitmovement 0 delay 50 - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 call_if 1, MtPyre_Summit_EventScript_2320E0 - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if 1, MtPyre_Summit_EventScript_2320EB - compare_var_to_value VAR_0x8008, 2 + compare VAR_0x8008, 2 call_if 1, MtPyre_Summit_EventScript_2320EC msgbox MtPyre_Summit_Text_23281A, 4 closemessage @@ -57,11 +57,11 @@ MtPyre_Summit_EventScript_23203C:: @ 823203C fadescreen 0 delay 20 setvar VAR_0x40B9, 1 - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 call_if 1, MtPyre_Summit_EventScript_2320F7 - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if 1, MtPyre_Summit_EventScript_23210C - compare_var_to_value VAR_0x8008, 2 + compare VAR_0x8008, 2 call_if 1, MtPyre_Summit_EventScript_232117 msgbox MtPyre_Summit_Text_23290E, 4 giveitem_std ITEM_MAGMA_EMBLEM @@ -134,18 +134,18 @@ MtPyre_Summit_EventScript_23213C:: @ 823213C checkflag FLAG_0x09E goto_eq MtPyre_Summit_EventScript_232167 msgbox MtPyre_Summit_Text_232E0C, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, MtPyre_Summit_EventScript_232187 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, MtPyre_Summit_EventScript_232190 release end MtPyre_Summit_EventScript_232167:: @ 8232167 msgbox MtPyre_Summit_Text_2331A6, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, MtPyre_Summit_EventScript_232199 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, MtPyre_Summit_EventScript_232190 release end @@ -167,7 +167,7 @@ MtPyre_Summit_EventScript_2321A2:: @ 82321A2 faceplayer checkflag FLAG_0x103 goto_eq MtPyre_Summit_EventScript_2321E2 - compare_var_to_value VAR_0x40B9, 3 + compare VAR_0x40B9, 3 call_if 4, MtPyre_Summit_EventScript_2321CB checkflag FLAG_0x081 goto_eq MtPyre_Summit_EventScript_2321D8 @@ -213,11 +213,11 @@ MtPyre_Summit_EventScript_232210:: @ 8232210 applymovement 255, MtPyre_Summit_Movement_2725A6 waitmovement 0 delay 60 - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 call_if 1, MtPyre_Summit_EventScript_2322C4 - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if 1, MtPyre_Summit_EventScript_2322DD - compare_var_to_value VAR_0x8008, 2 + compare VAR_0x8008, 2 call_if 1, MtPyre_Summit_EventScript_2322F6 playse SE_PIN applymovement 8, MtPyre_Summit_Movement_272598 @@ -225,19 +225,19 @@ MtPyre_Summit_EventScript_232210:: @ 8232210 applymovement 8, MtPyre_Summit_Movement_27259A waitmovement 0 delay 30 - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 call_if 1, MtPyre_Summit_EventScript_23230F - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if 1, MtPyre_Summit_EventScript_232328 - compare_var_to_value VAR_0x8008, 2 + compare VAR_0x8008, 2 call_if 1, MtPyre_Summit_EventScript_232341 msgbox MtPyre_Summit_Text_233183, 4 closemessage - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 call_if 1, MtPyre_Summit_EventScript_23235A - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if 1, MtPyre_Summit_EventScript_232376 - compare_var_to_value VAR_0x8008, 2 + compare VAR_0x8008, 2 call_if 1, MtPyre_Summit_EventScript_232392 delay 30 applymovement 2, MtPyre_Summit_Movement_2323B6 diff --git a/data/scripts/maps/NavelRock_Bottom.inc b/data/scripts/maps/NavelRock_Bottom.inc index 055697d23..dc99ec7f7 100644 --- a/data/scripts/maps/NavelRock_Bottom.inc +++ b/data/scripts/maps/NavelRock_Bottom.inc @@ -27,7 +27,7 @@ NavelRock_Bottom_MapScript1_269284: @ 8269284 NavelRock_Bottom_EventScript_26928E:: @ 826928E specialvar VAR_RESULT, sub_8138B80 - compare_var_to_value VAR_RESULT, 7 + compare VAR_RESULT, 7 goto_if 5, NavelRock_Bottom_EventScript_27374E removeobject 1 return @@ -61,15 +61,15 @@ NavelRock_Bottom_EventScript_2692A2:: @ 82692A2 setvar VAR_0x8006, 0 special DoScriptedWildBattle setflag FLAG_SYS_CTRL_OBJ_DELETE - special sub_80B0934 + special BattleSetup_StartLegendaryBattle waitstate clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, sub_8138B80 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq NavelRock_Bottom_EventScript_269336 - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 goto_eq NavelRock_Bottom_EventScript_269344 - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_eq NavelRock_Bottom_EventScript_269344 setflag FLAG_0x091 release diff --git a/data/scripts/maps/NavelRock_Harbor.inc b/data/scripts/maps/NavelRock_Harbor.inc index 111a8762a..c7acaf066 100644 --- a/data/scripts/maps/NavelRock_Harbor.inc +++ b/data/scripts/maps/NavelRock_Harbor.inc @@ -5,7 +5,7 @@ NavelRock_Harbor_EventScript_2690BD:: @ 82690BD lock faceplayer msgbox NavelRock_Harbor_Text_2C6CE6, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq NavelRock_Harbor_EventScript_269102 msgbox NavelRock_Harbor_Text_2A6A5D, 4 closemessage diff --git a/data/scripts/maps/NavelRock_Top.inc b/data/scripts/maps/NavelRock_Top.inc index 01c9a1523..af3586554 100644 --- a/data/scripts/maps/NavelRock_Top.inc +++ b/data/scripts/maps/NavelRock_Top.inc @@ -30,7 +30,7 @@ NavelRock_Top_MapScript1_269151: @ 8269151 NavelRock_Top_EventScript_26915B:: @ 826915B specialvar VAR_RESULT, sub_8138B80 - compare_var_to_value VAR_RESULT, 7 + compare VAR_RESULT, 7 goto_if 5, NavelRock_Top_EventScript_27374E removeobject 1 return @@ -65,16 +65,16 @@ NavelRock_Top_EventScript_26916F:: @ 826916F setvar VAR_0x8006, 0 special DoScriptedWildBattle setflag FLAG_SYS_CTRL_OBJ_DELETE - special sub_80B0934 + special BattleSetup_StartLegendaryBattle waitstate clearflag FLAG_SYS_CTRL_OBJ_DELETE setvar VAR_LAST_TALKED, 1 specialvar VAR_RESULT, sub_8138B80 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq NavelRock_Top_EventScript_269217 - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 goto_eq NavelRock_Top_EventScript_269225 - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_eq NavelRock_Top_EventScript_269225 setflag FLAG_0x092 releaseall diff --git a/data/scripts/maps/NewMauville_Entrance.inc b/data/scripts/maps/NewMauville_Entrance.inc index e752bbecb..9d13b5cf4 100644 --- a/data/scripts/maps/NewMauville_Entrance.inc +++ b/data/scripts/maps/NewMauville_Entrance.inc @@ -4,7 +4,7 @@ NewMauville_Entrance_MapScripts:: @ 82372AD .byte 0 NewMauville_Entrance_MapScript1_2372B8: @ 82372B8 - compare_var_to_value VAR_0x40BA, 0 + compare VAR_0x40BA, 0 call_if 1, NewMauville_Entrance_EventScript_2372C4 end @@ -27,10 +27,10 @@ NewMauville_Entrance_EventScript_2372FF:: @ 82372FF waitmovement 0 msgbox NewMauville_Entrance_Text_237382, 4 checkitem ITEM_BASEMENT_KEY, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq NewMauville_Entrance_EventScript_237380 msgbox NewMauville_Entrance_Text_237396, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq NewMauville_Entrance_EventScript_237380 msgbox NewMauville_Entrance_Text_2373AC, 4 setmetatile 3, 0, 707, 0 diff --git a/data/scripts/maps/NewMauville_Inside.inc b/data/scripts/maps/NewMauville_Inside.inc index b1bd0b114..301df7801 100644 --- a/data/scripts/maps/NewMauville_Inside.inc +++ b/data/scripts/maps/NewMauville_Inside.inc @@ -5,9 +5,9 @@ NewMauville_Inside_MapScripts:: @ 82373D7 .byte 0 NewMauville_Inside_MapScript1_2373E7: @ 82373E7 - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if 1, NewMauville_Inside_EventScript_237489 - compare_var_to_value VAR_0x4002, 1 + compare VAR_0x4002, 1 call_if 1, NewMauville_Inside_EventScript_2375D7 checkflag FLAG_SYS_CTRL_OBJ_DELETE call_if 1, NewMauville_Inside_EventScript_237407 @@ -15,7 +15,7 @@ NewMauville_Inside_MapScript1_2373E7: @ 82373E7 NewMauville_Inside_EventScript_237407:: @ 8237407 specialvar VAR_RESULT, sub_8138B80 - compare_var_to_value VAR_RESULT, 7 + compare VAR_RESULT, 7 goto_if 5, NewMauville_Inside_EventScript_27374E removeobject VAR_LAST_TALKED return @@ -44,7 +44,7 @@ NewMauville_Inside_EventScript_237449:: @ 8237449 return NewMauville_Inside_MapScript1_23744D: @ 823744D - compare_var_to_value VAR_0x40BA, 2 + compare VAR_0x40BA, 2 call_if 1, NewMauville_Inside_EventScript_23773A end @@ -171,7 +171,7 @@ NewMauville_Inside_EventScript_23773A:: @ 823773A NewMauville_Inside_EventScript_23778F:: @ 823778F lockall - compare_var_to_value VAR_0x40BA, 2 + compare VAR_0x40BA, 2 goto_eq NewMauville_Inside_EventScript_2377A5 msgbox NewMauville_Inside_Text_237896, 4 releaseall @@ -194,11 +194,11 @@ NewMauville_Inside_EventScript_2377AF:: @ 82377AF dowildbattle clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, sub_8138B80 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq NewMauville_Inside_EventScript_2377F3 - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 goto_eq NewMauville_Inside_EventScript_2377F3 - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_eq NewMauville_Inside_EventScript_2377F3 setflag FLAG_0x1C1 release @@ -221,11 +221,11 @@ NewMauville_Inside_EventScript_2377FC:: @ 82377FC dowildbattle clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, sub_8138B80 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq NewMauville_Inside_EventScript_237840 - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 goto_eq NewMauville_Inside_EventScript_237840 - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_eq NewMauville_Inside_EventScript_237840 setflag FLAG_0x1C2 release @@ -248,11 +248,11 @@ NewMauville_Inside_EventScript_237849:: @ 8237849 dowildbattle clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, sub_8138B80 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq NewMauville_Inside_EventScript_23788D - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 goto_eq NewMauville_Inside_EventScript_23788D - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_eq NewMauville_Inside_EventScript_23788D setflag FLAG_0x1C3 release diff --git a/data/scripts/maps/OldaleTown.inc b/data/scripts/maps/OldaleTown.inc index df1aeb595..d627a1632 100644 --- a/data/scripts/maps/OldaleTown.inc +++ b/data/scripts/maps/OldaleTown.inc @@ -76,7 +76,7 @@ OldaleTown_EventScript_1E8F75:: @ 81E8F75 OldaleTown_EventScript_1E8F8C:: @ 81E8F8C msgbox OldaleTown_Text_1E91FD, 4 giveitem_std ITEM_POTION - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq OldaleTown_EventScript_1E8FC3 msgbox OldaleTown_Text_1E92AF, 4 setflag FLAG_0x084 @@ -261,9 +261,9 @@ OldaleTown_EventScript_1E90C6:: @ 81E90C6 OldaleTown_EventScript_1E90E6:: @ 81E90E6 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq OldaleTown_EventScript_1E90FE - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq OldaleTown_EventScript_1E910C end @@ -279,9 +279,9 @@ OldaleTown_EventScript_1E910C:: @ 81E910C OldaleTown_EventScript_1E911A:: @ 81E911A closemessage - compare_var_to_value VAR_0x8009, 0 + compare VAR_0x8009, 0 call_if 1, OldaleTown_EventScript_1E9148 - compare_var_to_value VAR_0x8009, 1 + compare VAR_0x8009, 1 call_if 1, OldaleTown_EventScript_1E915E applymovement 4, OldaleTown_Movement_1E9177 waitmovement 0 @@ -292,7 +292,7 @@ OldaleTown_EventScript_1E911A:: @ 81E911A end OldaleTown_EventScript_1E9148:: @ 81E9148 - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 goto_if 5, OldaleTown_EventScript_1E915E applymovement 4, OldaleTown_Movement_1E9177 waitmovement 0 diff --git a/data/scripts/maps/PacifidlogTown_House2.inc b/data/scripts/maps/PacifidlogTown_House2.inc index d5c1573ae..bf671d01e 100644 --- a/data/scripts/maps/PacifidlogTown_House2.inc +++ b/data/scripts/maps/PacifidlogTown_House2.inc @@ -14,10 +14,10 @@ PacifidlogTown_House2_EventScript_203792:: @ 8203792 call_if 0, PacifidlogTown_House2_EventScript_203801 setflag FLAG_0x12C specialvar VAR_RESULT, sub_8138C04 - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 goto_if 4, PacifidlogTown_House2_EventScript_203816 specialvar VAR_RESULT, sub_8138C04 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if 4, PacifidlogTown_House2_EventScript_203845 goto PacifidlogTown_House2_EventScript_20384F end @@ -26,7 +26,7 @@ PacifidlogTown_House2_EventScript_2037DE:: @ 82037DE checkflag FLAG_0x12B goto_if 0, PacifidlogTown_House2_EventScript_27374E specialvar VAR_RESULT, sub_813970C - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, PacifidlogTown_House2_EventScript_203812 return @@ -46,7 +46,7 @@ PacifidlogTown_House2_EventScript_203812:: @ 8203812 PacifidlogTown_House2_EventScript_203816:: @ 8203816 msgbox PacifidlogTown_House2_Text_20396D, 4 giveitem_std ITEM_TM27 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq PacifidlogTown_House2_EventScript_272054 setflag FLAG_0x12B special sub_8139754 @@ -62,7 +62,7 @@ PacifidlogTown_House2_EventScript_203845:: @ 8203845 PacifidlogTown_House2_EventScript_20384F:: @ 820384F msgbox PacifidlogTown_House2_Text_203A2F, 4 giveitem_std ITEM_TM21 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq PacifidlogTown_House2_EventScript_272054 setflag FLAG_0x12B special sub_8139754 diff --git a/data/scripts/maps/PacifidlogTown_House3.inc b/data/scripts/maps/PacifidlogTown_House3.inc index d66a2e3f8..98977b766 100644 --- a/data/scripts/maps/PacifidlogTown_House3.inc +++ b/data/scripts/maps/PacifidlogTown_House3.inc @@ -11,17 +11,17 @@ PacifidlogTown_House3_EventScript_203C11:: @ 8203C11 specialvar VAR_RESULT, sub_807E73C copyvar VAR_0x8009, VAR_RESULT msgbox PacifidlogTown_House3_Text_203CBE, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq PacifidlogTown_House3_EventScript_203C93 special sub_81B94B0 waitstate copyvar VAR_0x800A, VAR_0x8004 - compare_var_to_value VAR_0x8004, 255 + compare VAR_0x8004, 255 goto_eq PacifidlogTown_House3_EventScript_203C93 copyvar VAR_0x8005, VAR_0x800A specialvar VAR_RESULT, sub_807E9D4 copyvar VAR_0x800B, VAR_RESULT - compare_var_to_var VAR_RESULT, VAR_0x8009 + compare VAR_RESULT, VAR_0x8009 goto_if 5, PacifidlogTown_House3_EventScript_203C9D copyvar VAR_0x8004, VAR_0x8008 copyvar VAR_0x8005, VAR_0x800A diff --git a/data/scripts/maps/PacifidlogTown_House4.inc b/data/scripts/maps/PacifidlogTown_House4.inc index 48ed67c9e..a3e9cf0a4 100644 --- a/data/scripts/maps/PacifidlogTown_House4.inc +++ b/data/scripts/maps/PacifidlogTown_House4.inc @@ -13,9 +13,9 @@ PacifidlogTown_House4_EventScript_203F5E:: @ 8203F5E lock faceplayer msgbox PacifidlogTown_House4_Text_204035, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq PacifidlogTown_House4_EventScript_203F7F - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq PacifidlogTown_House4_EventScript_203F89 end diff --git a/data/scripts/maps/PacifidlogTown_House5.inc b/data/scripts/maps/PacifidlogTown_House5.inc index 441b7fecd..aa02cc017 100644 --- a/data/scripts/maps/PacifidlogTown_House5.inc +++ b/data/scripts/maps/PacifidlogTown_House5.inc @@ -5,7 +5,7 @@ PacifidlogTown_House5_EventScript_204111:: @ 8204111 lock faceplayer specialvar VAR_RESULT, sub_813793C - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq PacifidlogTown_House5_EventScript_20412D msgbox PacifidlogTown_House5_Text_204140, 4 release diff --git a/data/scripts/maps/PetalburgCity.inc b/data/scripts/maps/PetalburgCity.inc index e223bf414..198c46cf1 100644 --- a/data/scripts/maps/PetalburgCity.inc +++ b/data/scripts/maps/PetalburgCity.inc @@ -1,12 +1,12 @@ PetalburgCity_MapScript1_1DC2D7: @ 81DC2D7 setflag FLAG_VISITED_PETALBURG_CITY - compare_var_to_value VAR_0x4057, 0 + compare VAR_0x4057, 0 call_if 1, PetalburgCity_EventScript_1DC307 - compare_var_to_value VAR_0x4057, 2 + compare VAR_0x4057, 2 call_if 1, PetalburgCity_EventScript_1DC30F - compare_var_to_value VAR_0x4057, 4 + compare VAR_0x4057, 4 call_if 1, PetalburgCity_EventScript_1DC30F - compare_var_to_value VAR_0x4085, 8 + compare VAR_0x4085, 8 call_if 1, PetalburgCity_EventScript_1DC316 end @@ -36,11 +36,11 @@ PetalburgCity_EventScript_1DC32E:: @ 81DC32E applymovement 255, PetalburgCity_Movement_1DC430 waitmovement 0 msgbox PetalburgCity_Text_1EC1F8, 4 - special sub_80B086C + special StartWallyTutorialBattle waitstate msgbox PetalburgCity_Text_1EC271, 4 - applymovementat 2, PetalburgCity_Movement_2725A4, PETALBURG_CITY - waitmovementat 2, PETALBURG_CITY + applymovement 2, PetalburgCity_Movement_2725A4, PETALBURG_CITY + waitmovement 2, PETALBURG_CITY msgbox PetalburgCity_Text_1EC297, 4 closemessage clearflag FLAG_SPECIAL_FLAG_0x4000 @@ -266,23 +266,23 @@ PetalburgCity_EventScript_1DC4CA:: @ 81DC4CA waitmovement 0 applymovement 8, PetalburgCity_Movement_27259A waitmovement 0 - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 call_if 1, PetalburgCity_EventScript_1DC57F - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if 1, PetalburgCity_EventScript_1DC594 - compare_var_to_value VAR_0x8008, 2 + compare VAR_0x8008, 2 call_if 1, PetalburgCity_EventScript_1DC59F - compare_var_to_value VAR_0x8008, 3 + compare VAR_0x8008, 3 call_if 1, PetalburgCity_EventScript_1DC5B4 msgbox PetalburgCity_Text_1DC881, 4 closemessage - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 call_if 1, PetalburgCity_EventScript_1DC5C9 - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if 1, PetalburgCity_EventScript_1DC5DB - compare_var_to_value VAR_0x8008, 2 + compare VAR_0x8008, 2 call_if 1, PetalburgCity_EventScript_1DC5ED - compare_var_to_value VAR_0x8008, 3 + compare VAR_0x8008, 3 call_if 1, PetalburgCity_EventScript_1DC5FF msgbox PetalburgCity_Text_1DC91B, 4 applymovement 8, PetalburgCity_Movement_2725A8 @@ -559,13 +559,13 @@ PetalburgCity_EventScript_1DC6E9:: @ 81DC6E9 delay 30 msgbox PetalburgCity_Text_1DCC09, 4 closemessage - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 call_if 1, PetalburgCity_EventScript_1DC78E - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if 1, PetalburgCity_EventScript_1DC7A0 - compare_var_to_value VAR_0x8008, 2 + compare VAR_0x8008, 2 call_if 1, PetalburgCity_EventScript_1DC7B2 - compare_var_to_value VAR_0x8008, 3 + compare VAR_0x8008, 3 call_if 1, PetalburgCity_EventScript_1DC7C4 setvar VAR_0x40C9, 1 removeobject 9 diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index e6cdd1334..5eb82c2be 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -6,9 +6,9 @@ PetalburgCity_Gym_MapScripts:: @ 8204889 .byte 0 PetalburgCity_Gym_MapScript1_20489E: @ 820489E - compare_var_to_value VAR_0x4085, 6 + compare VAR_0x4085, 6 goto_eq PetalburgCity_Gym_EventScript_2048B5 - compare_var_to_value VAR_0x4085, 7 + compare VAR_0x4085, 7 call_if 4, PetalburgCity_Gym_EventScript_2048FF end @@ -44,9 +44,9 @@ PetalburgCity_Gym_EventScript_2048FF:: @ 82048FF return PetalburgCity_Gym_MapScript1_20492D: @ 820492D - compare_var_to_value VAR_0x4085, 1 + compare VAR_0x4085, 1 call_if 1, PetalburgCity_Gym_EventScript_20494D - compare_var_to_value VAR_0x4085, 6 + compare VAR_0x4085, 6 call_if 0, PetalburgCity_Gym_EventScript_204955 checkflag FLAG_SYS_GAME_CLEAR call_if 1, PetalburgCity_Gym_EventScript_20495D @@ -62,10 +62,10 @@ PetalburgCity_Gym_EventScript_204955:: @ 8204955 PetalburgCity_Gym_EventScript_20495D:: @ 820495D setorcopyvar 0x8015, 269 - specialvar VAR_RESULT, sub_80B22A0 - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, IsTrainerReadyForRematch + compare VAR_RESULT, 1 goto_eq PetalburgCity_Gym_EventScript_204985 - compare_var_to_value VAR_0x4085, 8 + compare VAR_0x4085, 8 goto_eq PetalburgCity_Gym_EventScript_204985 setobjectxyperm 1, 4, 107 return @@ -155,65 +155,65 @@ PetalburgCity_Gym_EventScript_204AA1:: @ 8204AA1 PetalburgCity_Gym_EventScript_204AAC:: @ 8204AAC addobject 10 playse SE_DOOR - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 call_if 1, PetalburgCity_Gym_EventScript_204C31 - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if 1, PetalburgCity_Gym_EventScript_204C43 - compare_var_to_value VAR_0x8008, 2 + compare VAR_0x8008, 2 call_if 1, PetalburgCity_Gym_EventScript_204C5F - compare_var_to_value VAR_0x8008, 3 + compare VAR_0x8008, 3 call_if 1, PetalburgCity_Gym_EventScript_204C5F msgbox PetalburgCity_Gym_Text_2058B1, 4 msgbox PetalburgCity_Gym_Text_2058DB, 4 msgbox PetalburgCity_Gym_Text_205910, 4 msgbox PetalburgCity_Gym_Text_2059D8, 4 - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 call_if 1, PetalburgCity_Gym_EventScript_204CC7 - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if 1, PetalburgCity_Gym_EventScript_204CD2 - compare_var_to_value VAR_0x8008, 2 + compare VAR_0x8008, 2 call_if 1, PetalburgCity_Gym_EventScript_204CE4 - compare_var_to_value VAR_0x8008, 3 + compare VAR_0x8008, 3 call_if 1, PetalburgCity_Gym_EventScript_204CF6 msgbox PetalburgCity_Gym_Text_2059E8, 4 - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 call_if 1, PetalburgCity_Gym_EventScript_204D08 - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if 1, PetalburgCity_Gym_EventScript_204D13 - compare_var_to_value VAR_0x8008, 2 + compare VAR_0x8008, 2 call_if 1, PetalburgCity_Gym_EventScript_204D1E - compare_var_to_value VAR_0x8008, 3 + compare VAR_0x8008, 3 call_if 1, PetalburgCity_Gym_EventScript_204D29 msgbox PetalburgCity_Gym_Text_205A46, 4 msgbox PetalburgCity_Gym_Text_205A89, 4 msgbox PetalburgCity_Gym_Text_205AF4, 4 - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 call_if 1, PetalburgCity_Gym_EventScript_204D72 - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if 1, PetalburgCity_Gym_EventScript_204D73 - compare_var_to_value VAR_0x8008, 2 + compare VAR_0x8008, 2 call_if 1, PetalburgCity_Gym_EventScript_204D7E - compare_var_to_value VAR_0x8008, 3 + compare VAR_0x8008, 3 call_if 1, PetalburgCity_Gym_EventScript_204D7F - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 call_if 1, PetalburgCity_Gym_EventScript_204D34 - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if 1, PetalburgCity_Gym_EventScript_204D3F - compare_var_to_value VAR_0x8008, 2 + compare VAR_0x8008, 2 call_if 1, PetalburgCity_Gym_EventScript_204D34 - compare_var_to_value VAR_0x8008, 3 + compare VAR_0x8008, 3 call_if 1, PetalburgCity_Gym_EventScript_204D34 msgbox PetalburgCity_Gym_Text_205B0F, 4 closemessage setflag FLAG_SPECIAL_FLAG_0x4001 playbgm BGM_TSURETEK, 0 - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 call_if 1, PetalburgCity_Gym_EventScript_204C78 - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if 1, PetalburgCity_Gym_EventScript_204C91 - compare_var_to_value VAR_0x8008, 2 + compare VAR_0x8008, 2 call_if 1, PetalburgCity_Gym_EventScript_204CA3 - compare_var_to_value VAR_0x8008, 3 + compare VAR_0x8008, 3 call_if 1, PetalburgCity_Gym_EventScript_204CB5 removeobject 10 setflag FLAG_0x2D8 @@ -363,7 +363,7 @@ PetalburgCity_Gym_EventScript_204D7F:: @ 8204D7F PetalburgCity_Gym_EventScript_204D80:: @ 8204D80 call PetalburgCity_Gym_EventScript_204DCE - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq PetalburgCity_Gym_EventScript_204E1D checkflag FLAG_0x0A9 goto_if 0, PetalburgCity_Gym_EventScript_204DAC @@ -385,15 +385,15 @@ PetalburgCity_Gym_EventScript_204DB3:: @ 8204DB3 PetalburgCity_Gym_EventScript_204DCE:: @ 8204DCE specialvar VAR_RESULT, IsEnigmaBerryValid - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq PetalburgCity_Gym_EventScript_204E17 checkitem ITEM_ENIGMA_BERRY, 1 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq PetalburgCity_Gym_EventScript_204E17 checkpcitem ITEM_ENIGMA_BERRY, 1 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq PetalburgCity_Gym_EventScript_204E17 - compare_var_to_value VAR_0x402D, 0 + compare VAR_0x402D, 0 goto_eq PetalburgCity_Gym_EventScript_204E17 msgbox PetalburgCity_Gym_Text_2A6D3D, 4 setvar VAR_RESULT, 1 @@ -405,7 +405,7 @@ PetalburgCity_Gym_EventScript_204E17:: @ 8204E17 PetalburgCity_Gym_EventScript_204E1D:: @ 8204E1D giveitem_std ITEM_ENIGMA_BERRY - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq PetalburgCity_Gym_EventScript_272054 setvar VAR_0x402D, 0 release @@ -446,7 +446,7 @@ PetalburgCity_Gym_EventScript_204E3B:: @ 8204E3B PetalburgCity_Gym_EventScript_204ED2:: @ 8204ED2 giveitem_std ITEM_TM42 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq PetalburgCity_Gym_EventScript_27205E setflag FLAG_0x0A9 msgbox PetalburgCity_Gym_Text_206254, 4 @@ -473,30 +473,30 @@ PetalburgCity_Gym_EventScript_204F13:: @ 8204F13 applymovement 11, PetalburgCity_Gym_Movement_27259A waitmovement 0 delay 10 - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if 1, PetalburgCity_Gym_EventScript_204FED - compare_var_to_value VAR_0x8008, 2 + compare VAR_0x8008, 2 call_if 1, PetalburgCity_Gym_EventScript_205009 - compare_var_to_value VAR_0x8008, 3 + compare VAR_0x8008, 3 call_if 1, PetalburgCity_Gym_EventScript_205025 msgbox PetalburgCity_Gym_Text_206377, 4 closemessage delay 20 - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if 1, PetalburgCity_Gym_EventScript_204FCC - compare_var_to_value VAR_0x8008, 2 + compare VAR_0x8008, 2 call_if 1, PetalburgCity_Gym_EventScript_204FD7 - compare_var_to_value VAR_0x8008, 3 + compare VAR_0x8008, 3 call_if 1, PetalburgCity_Gym_EventScript_204FE2 msgbox PetalburgCity_Gym_Text_2063CA, 4 closemessage setflag FLAG_SPECIAL_FLAG_0x4001 playbgm BGM_TSURETEK, 0 - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if 1, PetalburgCity_Gym_EventScript_205041 - compare_var_to_value VAR_0x8008, 2 + compare VAR_0x8008, 2 call_if 1, PetalburgCity_Gym_EventScript_20505A - compare_var_to_value VAR_0x8008, 3 + compare VAR_0x8008, 3 call_if 1, PetalburgCity_Gym_EventScript_20506C removeobject 11 setvar VAR_0x4057, 4 @@ -786,14 +786,14 @@ PetalburgCity_Gym_EventScript_20512D:: @ 820512D PetalburgCity_Gym_EventScript_205137:: @ 8205137 lockall - compare_var_to_value VAR_0x4085, 6 + compare VAR_0x4085, 6 goto_if 0, PetalburgCity_Gym_EventScript_20517D setvar VAR_0x8008, 7 setvar VAR_0x8009, 85 msgbox PetalburgCity_Gym_Text_20721E, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq PetalburgCity_Gym_EventScript_20516C - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq PetalburgCity_Gym_EventScript_20517B end @@ -816,14 +816,14 @@ PetalburgCity_Gym_EventScript_20517D:: @ 820517D PetalburgCity_Gym_EventScript_205187:: @ 8205187 lockall - compare_var_to_value VAR_0x4085, 6 + compare VAR_0x4085, 6 goto_if 0, PetalburgCity_Gym_EventScript_20517D setvar VAR_0x8008, 1 setvar VAR_0x8009, 98 msgbox PetalburgCity_Gym_Text_207280, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq PetalburgCity_Gym_EventScript_20516C - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq PetalburgCity_Gym_EventScript_20517B end @@ -834,9 +834,9 @@ PetalburgCity_Gym_EventScript_2051BC:: @ 82051BC setvar VAR_0x8008, 7 setvar VAR_0x8009, 46 msgbox PetalburgCity_Gym_Text_2072BB, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq PetalburgCity_Gym_EventScript_20516C - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq PetalburgCity_Gym_EventScript_20517B end @@ -847,9 +847,9 @@ PetalburgCity_Gym_EventScript_2051EF:: @ 82051EF setvar VAR_0x8008, 1 setvar VAR_0x8009, 59 msgbox PetalburgCity_Gym_Text_2072F7, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq PetalburgCity_Gym_EventScript_20516C - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq PetalburgCity_Gym_EventScript_20517B end @@ -860,9 +860,9 @@ PetalburgCity_Gym_EventScript_205222:: @ 8205222 setvar VAR_0x8008, 7 setvar VAR_0x8009, 59 msgbox PetalburgCity_Gym_Text_2072F7, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq PetalburgCity_Gym_EventScript_20516C - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq PetalburgCity_Gym_EventScript_20517B end @@ -873,9 +873,9 @@ PetalburgCity_Gym_EventScript_205255:: @ 8205255 setvar VAR_0x8008, 1 setvar VAR_0x8009, 72 msgbox PetalburgCity_Gym_Text_207331, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq PetalburgCity_Gym_EventScript_20516C - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq PetalburgCity_Gym_EventScript_20517B end @@ -886,9 +886,9 @@ PetalburgCity_Gym_EventScript_205288:: @ 8205288 setvar VAR_0x8008, 1 setvar VAR_0x8009, 20 msgbox PetalburgCity_Gym_Text_20736C, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq PetalburgCity_Gym_EventScript_20516C - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq PetalburgCity_Gym_EventScript_20517B end @@ -899,9 +899,9 @@ PetalburgCity_Gym_EventScript_2052BB:: @ 82052BB setvar VAR_0x8008, 7 setvar VAR_0x8009, 20 msgbox PetalburgCity_Gym_Text_20736C, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq PetalburgCity_Gym_EventScript_20516C - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq PetalburgCity_Gym_EventScript_20517B end @@ -912,9 +912,9 @@ PetalburgCity_Gym_EventScript_2052EE:: @ 82052EE setvar VAR_0x8008, 1 setvar VAR_0x8009, 33 msgbox PetalburgCity_Gym_Text_2073A7, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq PetalburgCity_Gym_EventScript_20516C - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq PetalburgCity_Gym_EventScript_20517B end @@ -925,9 +925,9 @@ PetalburgCity_Gym_EventScript_205321:: @ 8205321 setvar VAR_0x8008, 7 setvar VAR_0x8009, 33 msgbox PetalburgCity_Gym_Text_2073A7, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq PetalburgCity_Gym_EventScript_20516C - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq PetalburgCity_Gym_EventScript_20517B end @@ -938,9 +938,9 @@ PetalburgCity_Gym_EventScript_205354:: @ 8205354 setvar VAR_0x8008, 1 setvar VAR_0x8009, 7 msgbox PetalburgCity_Gym_Text_2073E4, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq PetalburgCity_Gym_EventScript_20516C - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq PetalburgCity_Gym_EventScript_20517B end @@ -951,9 +951,9 @@ PetalburgCity_Gym_EventScript_205387:: @ 8205387 setvar VAR_0x8008, 7 setvar VAR_0x8009, 7 msgbox PetalburgCity_Gym_Text_2073E4, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq PetalburgCity_Gym_EventScript_20516C - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq PetalburgCity_Gym_EventScript_20517B end @@ -1085,72 +1085,72 @@ PetalburgCity_Gym_EventScript_205555:: @ 8205555 PetalburgCity_Gym_EventScript_20555E:: @ 820555E setvar VAR_0x8004, 1 - compare_var_to_value VAR_0x8005, 0 + compare VAR_0x8005, 0 call_if 1, PetalburgCity_Gym_EventScript_205746 - compare_var_to_value VAR_0x8005, 1 + compare VAR_0x8005, 1 call_if 1, PetalburgCity_Gym_EventScript_20574B call PetalburgCity_Gym_EventScript_205666 return PetalburgCity_Gym_EventScript_20557F:: @ 820557F setvar VAR_0x8004, 2 - compare_var_to_value VAR_0x8005, 0 + compare VAR_0x8005, 0 call_if 1, PetalburgCity_Gym_EventScript_205746 - compare_var_to_value VAR_0x8005, 1 + compare VAR_0x8005, 1 call_if 1, PetalburgCity_Gym_EventScript_20574B call PetalburgCity_Gym_EventScript_20568B return PetalburgCity_Gym_EventScript_2055A0:: @ 82055A0 setvar VAR_0x8004, 3 - compare_var_to_value VAR_0x8005, 0 + compare VAR_0x8005, 0 call_if 1, PetalburgCity_Gym_EventScript_205746 - compare_var_to_value VAR_0x8005, 1 + compare VAR_0x8005, 1 call_if 1, PetalburgCity_Gym_EventScript_20574B call PetalburgCity_Gym_EventScript_2056B0 return PetalburgCity_Gym_EventScript_2055C1:: @ 82055C1 setvar VAR_0x8004, 4 - compare_var_to_value VAR_0x8005, 0 + compare VAR_0x8005, 0 call_if 1, PetalburgCity_Gym_EventScript_205746 - compare_var_to_value VAR_0x8005, 1 + compare VAR_0x8005, 1 call_if 1, PetalburgCity_Gym_EventScript_20574B call PetalburgCity_Gym_EventScript_2056D5 return PetalburgCity_Gym_EventScript_2055E2:: @ 82055E2 setvar VAR_0x8004, 5 - compare_var_to_value VAR_0x8005, 0 + compare VAR_0x8005, 0 call_if 1, PetalburgCity_Gym_EventScript_205746 - compare_var_to_value VAR_0x8005, 1 + compare VAR_0x8005, 1 call_if 1, PetalburgCity_Gym_EventScript_20574B call PetalburgCity_Gym_EventScript_2056E8 return PetalburgCity_Gym_EventScript_205603:: @ 8205603 setvar VAR_0x8004, 6 - compare_var_to_value VAR_0x8005, 0 + compare VAR_0x8005, 0 call_if 1, PetalburgCity_Gym_EventScript_205746 - compare_var_to_value VAR_0x8005, 1 + compare VAR_0x8005, 1 call_if 1, PetalburgCity_Gym_EventScript_20574B call PetalburgCity_Gym_EventScript_20570D return PetalburgCity_Gym_EventScript_205624:: @ 8205624 setvar VAR_0x8004, 7 - compare_var_to_value VAR_0x8005, 0 + compare VAR_0x8005, 0 call_if 1, PetalburgCity_Gym_EventScript_205746 - compare_var_to_value VAR_0x8005, 1 + compare VAR_0x8005, 1 call_if 1, PetalburgCity_Gym_EventScript_20574B call PetalburgCity_Gym_EventScript_205720 return PetalburgCity_Gym_EventScript_205645:: @ 8205645 setvar VAR_0x8004, 8 - compare_var_to_value VAR_0x8005, 0 + compare VAR_0x8005, 0 call_if 1, PetalburgCity_Gym_EventScript_205746 - compare_var_to_value VAR_0x8005, 1 + compare VAR_0x8005, 1 call_if 1, PetalburgCity_Gym_EventScript_20574B call PetalburgCity_Gym_EventScript_205733 return diff --git a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc b/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc index 91ea469de..8d5d79d73 100644 --- a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc @@ -29,17 +29,17 @@ PetalburgCity_PokemonCenter_1F_EventScript_207A1C:: @ 8207A1C faceplayer msgbox PetalburgCity_PokemonCenter_1F_Text_207B09, 4 specialvar VAR_RESULT, sub_81394D8 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq PetalburgCity_PokemonCenter_1F_EventScript_207A38 release end PetalburgCity_PokemonCenter_1F_EventScript_207A38:: @ 8207A38 - compare_var_to_value VAR_FIRST_POKE, 0 + compare VAR_FIRST_POKE, 0 call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_207A5B - compare_var_to_value VAR_FIRST_POKE, 1 + compare VAR_FIRST_POKE, 1 call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_207A64 - compare_var_to_value VAR_FIRST_POKE, 2 + compare VAR_FIRST_POKE, 2 call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_207A6D release end diff --git a/data/scripts/maps/PetalburgWoods.inc b/data/scripts/maps/PetalburgWoods.inc index a6b018134..c70b3fc1c 100644 --- a/data/scripts/maps/PetalburgWoods.inc +++ b/data/scripts/maps/PetalburgWoods.inc @@ -89,7 +89,7 @@ PetalburgWoods_EventScript_22E138:: @ 822E138 waitmovement 0 msgbox PetalburgWoods_Text_22E63D, 4 giveitem_std ITEM_GREAT_BALL - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq PetalburgWoods_EventScript_22E17D goto PetalburgWoods_EventScript_22E18B end @@ -253,7 +253,7 @@ PetalburgWoods_EventScript_22E222:: @ 822E222 goto_eq PetalburgWoods_EventScript_22E251 msgbox PetalburgWoods_Text_22EAFE, 4 giveitem_std ITEM_MIRACLE_SEED - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq PetalburgWoods_EventScript_272054 setflag FLAG_0x129 release @@ -279,12 +279,12 @@ PetalburgWoods_EventScript_22E26D:: @ 822E26D PetalburgWoods_EventScript_22E284:: @ 822E284 trainerbattle 2, TRAINER_JAMES_1, 0, PetalburgWoods_Text_22E827, PetalburgWoods_Text_22E86B, PetalburgWoods_EventScript_22E2C5 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq PetalburgWoods_EventScript_22E31B setvar VAR_0x8004, 621 specialvar VAR_RESULT, sub_813B4E0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq PetalburgWoods_EventScript_22E2EF msgbox PetalburgWoods_Text_22E889, 4 release @@ -293,7 +293,7 @@ PetalburgWoods_EventScript_22E284:: @ 822E284 PetalburgWoods_EventScript_22E2C5:: @ 822E2C5 special sub_80B4808 waitmovement 0 - checkflag FLAG_0x12F + checkflag FLAG_HAS_MATCH_CALL goto_eq PetalburgWoods_EventScript_22E2D6 release end @@ -308,7 +308,7 @@ PetalburgWoods_EventScript_22E2D6:: @ 822E2D6 end PetalburgWoods_EventScript_22E2EF:: @ 822E2EF - checkflag FLAG_0x12F + checkflag FLAG_HAS_MATCH_CALL goto_eq PetalburgWoods_EventScript_22E302 msgbox PetalburgWoods_Text_22E889, 4 release diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc index 27c83f3d0..8ff9d5b55 100644 --- a/data/scripts/maps/Route101.inc +++ b/data/scripts/maps/Route101.inc @@ -225,12 +225,12 @@ Route101_EventScript_1EBE16:: @ 81EBE16 setobjectxy 255, 6, 13 applymovement 255, Route101_Movement_2725A4 waitmovement 0 - special sub_80B1138 + special ChooseStarter waitstate applymovement 2, Route101_Movement_1EBE8D waitmovement 0 msgbox Route101_Text_1EBF12, 4 - special sp000_heal_pokemon + special HealPlayerParty setflag FLAG_0x2D0 clearflag FLAG_0x2D1 setflag FLAG_0x2BC @@ -238,9 +238,9 @@ Route101_EventScript_1EBE16:: @ 81EBE16 setvar VAR_0x4060, 3 clearflag FLAG_SPECIAL_FLAG_0x4000 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, Route101_EventScript_1EBE85 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, Route101_EventScript_1EBE89 warp LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB, 255, 6, 5 waitstate diff --git a/data/scripts/maps/Route102.inc b/data/scripts/maps/Route102.inc index 00c8c309f..ae82ea0b4 100644 --- a/data/scripts/maps/Route102.inc +++ b/data/scripts/maps/Route102.inc @@ -19,12 +19,12 @@ Route102_EventScript_1EC0FC:: @ 81EC0FC Route102_EventScript_1EC105:: @ 81EC105 trainerbattle 2, TRAINER_CALVIN_1, 0, Route102_Text_294513, Route102_Text_29457C, Route102_EventScript_1EC146 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route102_EventScript_1EC19C setvar VAR_0x8004, 318 specialvar VAR_RESULT, sub_813B4E0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route102_EventScript_1EC170 msgbox Route102_Text_2945AC, 4 release @@ -33,7 +33,7 @@ Route102_EventScript_1EC105:: @ 81EC105 Route102_EventScript_1EC146:: @ 81EC146 special sub_80B4808 waitmovement 0 - checkflag FLAG_0x12F + checkflag FLAG_HAS_MATCH_CALL goto_eq Route102_EventScript_1EC157 release end @@ -48,7 +48,7 @@ Route102_EventScript_1EC157:: @ 81EC157 end Route102_EventScript_1EC170:: @ 81EC170 - checkflag FLAG_0x12F + checkflag FLAG_HAS_MATCH_CALL goto_eq Route102_EventScript_1EC183 msgbox Route102_Text_2945AC, 4 release diff --git a/data/scripts/maps/Route103.inc b/data/scripts/maps/Route103.inc index 4dd68204a..8493897b1 100644 --- a/data/scripts/maps/Route103.inc +++ b/data/scripts/maps/Route103.inc @@ -21,9 +21,9 @@ Route103_EventScript_1EC3AE:: @ 81EC3AE Route103_EventScript_1EC3C1:: @ 81EC3C1 lockall checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route103_EventScript_1EC3DA - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route103_EventScript_1EC434 end @@ -209,8 +209,8 @@ Route103_EventScript_1EC5F4:: @ 81EC5F4 Route103_EventScript_1EC60B:: @ 81EC60B trainerbattle 6, TRAINER_AMY_AND_LIV_1, 0, Route103_Text_2949F9, Route103_Text_294A3D, Route103_Text_294AAE, Route103_EventScript_1EC63A - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route103_EventScript_1EC653 msgbox Route103_Text_294A52, 6 end @@ -231,8 +231,8 @@ Route103_EventScript_1EC653:: @ 81EC653 Route103_EventScript_1EC66E:: @ 81EC66E trainerbattle 6, TRAINER_AMY_AND_LIV_1, 0, Route103_Text_294AFD, Route103_Text_294B22, Route103_Text_294BD0, Route103_EventScript_1EC69D - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route103_EventScript_1EC6B6 msgbox Route103_Text_294B40, 6 end @@ -258,8 +258,8 @@ Route103_EventScript_1EC6D1:: @ 81EC6D1 Route103_EventScript_1EC6E8:: @ 81EC6E8 trainerbattle 2, TRAINER_MIGUEL_1, 0, Route103_Text_294EDF, Route103_Text_294F21, Route103_EventScript_1EC714 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route103_EventScript_1EC733 msgbox Route103_Text_294F42, 4 release diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index 8c4138f11..1fc3b89cc 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -31,7 +31,7 @@ Route104_EventScript_1ECC74:: @ 81ECC74 return Route104_EventScript_1ECC78:: @ 81ECC78 - compare_var_to_value VAR_0x408E, 1 + compare VAR_0x408E, 1 goto_if 4, Route104_EventScript_1ECC9D checkflag FLAG_0x120 goto_eq Route104_EventScript_1ECC9D @@ -76,9 +76,9 @@ Route104_EventScript_1ECCB3:: @ 81ECCB3 Route104_EventScript_1ECD11:: @ 81ECD11 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route104_EventScript_1ECD29 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route104_EventScript_1ECD2E return @@ -92,9 +92,9 @@ Route104_EventScript_1ECD2E:: @ 81ECD2E Route104_EventScript_1ECD33:: @ 81ECD33 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route104_EventScript_1ECD4B - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route104_EventScript_1ECE6F end @@ -122,7 +122,7 @@ Route104_EventScript_1ECD4B:: @ 81ECD4B waitmovement 0 moveobjectoffscreen 34 msgbox Route104_Text_1EDCED, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route104_EventScript_1ECDED msgbox Route104_Text_1EDD2A, 4 call Route104_EventScript_1ECE31 @@ -145,7 +145,7 @@ Route104_Movement_1ECDCD: @ 81ECDCD Route104_EventScript_1ECDD0:: @ 81ECDD0 msgbox Route104_Text_1EDD9F, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route104_EventScript_1ECDED msgbox Route104_Text_1EDD2A, 4 releaseall @@ -161,7 +161,7 @@ Route104_EventScript_1ECDED:: @ 81ECDED Route104_EventScript_1ECE1C:: @ 81ECE1C msgbox Route104_Text_1EDE3E, 4 - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 call_if 1, Route104_EventScript_1ECE31 releaseall end @@ -213,7 +213,7 @@ Route104_EventScript_1ECE6F:: @ 81ECE6F waitmovement 0 moveobjectoffscreen 34 msgbox Route104_Text_1EE009, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route104_EventScript_1ECF09 msgbox Route104_Text_1EE04D, 4 call Route104_EventScript_1ECE31 @@ -222,7 +222,7 @@ Route104_EventScript_1ECE6F:: @ 81ECE6F Route104_EventScript_1ECEEC:: @ 81ECEEC msgbox Route104_Text_1EE094, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route104_EventScript_1ECF09 msgbox Route104_Text_1EE04D, 4 releaseall @@ -238,7 +238,7 @@ Route104_EventScript_1ECF09:: @ 81ECF09 Route104_EventScript_1ECF38:: @ 81ECF38 msgbox Route104_Text_1EE120, 4 - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 call_if 1, Route104_EventScript_1ECE31 releaseall end @@ -278,7 +278,7 @@ Route104_EventScript_1ECF8C:: @ 81ECF8C goto_eq Route104_EventScript_1ECFC3 msgbox Route104_Text_2A6D86, 4 giveitem_std ITEM_CHESTO_BERRY - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route104_EventScript_272054 setflag FLAG_0x0F6 msgbox Route104_Text_2A6E32, 4 @@ -297,7 +297,7 @@ Route104_EventScript_1ECFCD:: @ 81ECFCD goto_eq Route104_EventScript_1ECFFC msgbox Route104_Text_1ED96A, 4 giveitem_std ITEM_WHITE_HERB - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route104_EventScript_272054 setflag FLAG_0x117 release @@ -351,7 +351,7 @@ Route104_EventScript_1ED057:: @ 81ED057 goto_eq Route104_EventScript_1ED086 msgbox Route104_Text_1ED838, 4 giveitem_std ITEM_TM09 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route104_EventScript_272054 setflag FLAG_0x106 release @@ -402,8 +402,8 @@ Route104_EventScript_1ED0EF:: @ 81ED0EF delay 30 setflag FLAG_0x132 applymovement 255, Route104_Movement_1ED22A - applymovementat 7, Route104_Movement_1ED22A, ROUTE_104 - waitmovementat 7, ROUTE_104 + applymovement 7, Route104_Movement_1ED22A, ROUTE_104 + waitmovement 7, ROUTE_104 waitmovement 0 goto Route104_EventScript_1ED139 @@ -882,12 +882,12 @@ Route104_EventScript_1ED376:: @ 81ED376 Route104_EventScript_1ED38D:: @ 81ED38D trainerbattle 2, TRAINER_HALEY_1, 0, Route104_Text_29563A, Route104_Text_29566F, Route104_EventScript_1ED3CE - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route104_EventScript_1ED424 setvar VAR_0x8004, 604 specialvar VAR_RESULT, sub_813B4E0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route104_EventScript_1ED3F8 msgbox Route104_Text_295689, 4 release @@ -896,7 +896,7 @@ Route104_EventScript_1ED38D:: @ 81ED38D Route104_EventScript_1ED3CE:: @ 81ED3CE special sub_80B4808 waitmovement 0 - checkflag FLAG_0x12F + checkflag FLAG_HAS_MATCH_CALL goto_eq Route104_EventScript_1ED3DF release end @@ -911,7 +911,7 @@ Route104_EventScript_1ED3DF:: @ 81ED3DF end Route104_EventScript_1ED3F8:: @ 81ED3F8 - checkflag FLAG_0x12F + checkflag FLAG_HAS_MATCH_CALL goto_eq Route104_EventScript_1ED40B msgbox Route104_Text_295689, 4 release @@ -933,12 +933,12 @@ Route104_EventScript_1ED424:: @ 81ED424 Route104_EventScript_1ED43B:: @ 81ED43B trainerbattle 2, TRAINER_WINSTON_1, 0, Route104_Text_295870, Route104_Text_2958AD, Route104_EventScript_1ED47C - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route104_EventScript_1ED4D2 setvar VAR_0x8004, 136 specialvar VAR_RESULT, sub_813B4E0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route104_EventScript_1ED4A6 msgbox Route104_Text_2958C1, 4 release @@ -947,7 +947,7 @@ Route104_EventScript_1ED43B:: @ 81ED43B Route104_EventScript_1ED47C:: @ 81ED47C special sub_80B4808 waitmovement 0 - checkflag FLAG_0x12F + checkflag FLAG_HAS_MATCH_CALL goto_eq Route104_EventScript_1ED48D release end @@ -962,7 +962,7 @@ Route104_EventScript_1ED48D:: @ 81ED48D end Route104_EventScript_1ED4A6:: @ 81ED4A6 - checkflag FLAG_0x12F + checkflag FLAG_HAS_MATCH_CALL goto_eq Route104_EventScript_1ED4B9 msgbox Route104_Text_2958C1, 4 release @@ -984,12 +984,12 @@ Route104_EventScript_1ED4D2:: @ 81ED4D2 Route104_EventScript_1ED4E9:: @ 81ED4E9 trainerbattle 2, TRAINER_CINDY_1, 0, Route104_Text_295A7E, Route104_Text_295ABB, Route104_EventScript_1ED52A - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route104_EventScript_1ED580 setvar VAR_0x8004, 114 specialvar VAR_RESULT, sub_813B4E0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route104_EventScript_1ED554 msgbox Route104_Text_295AC3, 4 release @@ -998,7 +998,7 @@ Route104_EventScript_1ED4E9:: @ 81ED4E9 Route104_EventScript_1ED52A:: @ 81ED52A special sub_80B4808 waitmovement 0 - checkflag FLAG_0x12F + checkflag FLAG_HAS_MATCH_CALL goto_eq Route104_EventScript_1ED53B release end @@ -1013,7 +1013,7 @@ Route104_EventScript_1ED53B:: @ 81ED53B end Route104_EventScript_1ED554:: @ 81ED554 - checkflag FLAG_0x12F + checkflag FLAG_HAS_MATCH_CALL goto_eq Route104_EventScript_1ED567 msgbox Route104_Text_295AC3, 4 release diff --git a/data/scripts/maps/Route104_MrBrineysHouse.inc b/data/scripts/maps/Route104_MrBrineysHouse.inc index f870ba0c8..2e901b5f4 100644 --- a/data/scripts/maps/Route104_MrBrineysHouse.inc +++ b/data/scripts/maps/Route104_MrBrineysHouse.inc @@ -4,7 +4,7 @@ Route104_MrBrineysHouse_MapScripts:: @ 8229D2E Route104_MrBrineysHouse_MapScript1_229D34: @ 8229D34 setflag FLAG_0x89D - compare_var_to_value VAR_0x4090, 1 + compare VAR_0x4090, 1 call_if 1, Route104_MrBrineysHouse_EventScript_229D50 checkflag FLAG_0x0BC call_if 1, Route104_MrBrineysHouse_EventScript_229D4C @@ -37,7 +37,7 @@ Route104_MrBrineysHouse_EventScript_229D8A:: @ 8229D8A setflag FLAG_0x093 msgbox Route104_MrBrineysHouse_Text_229E70, 4 msgbox Route104_MrBrineysHouse_Text_229E9B, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route104_MrBrineysHouse_EventScript_229E13 goto Route104_MrBrineysHouse_EventScript_229E27 end @@ -54,14 +54,14 @@ Route104_MrBrineysHouse_EventScript_229DAE:: @ 8229DAE Route104_MrBrineysHouse_EventScript_229DE1:: @ 8229DE1 msgbox Route104_MrBrineysHouse_Text_22A0AD, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route104_MrBrineysHouse_EventScript_229E13 goto Route104_MrBrineysHouse_EventScript_229E27 end Route104_MrBrineysHouse_EventScript_229DFA:: @ 8229DFA msgbox Route104_MrBrineysHouse_Text_22A18F, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route104_MrBrineysHouse_EventScript_229E13 goto Route104_MrBrineysHouse_EventScript_229E27 end diff --git a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc index 755612b6c..3b7dcf601 100644 --- a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc +++ b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc @@ -25,18 +25,18 @@ Route104_PrettyPetalFlowerShop_EventScript_22A373:: @ 822A373 goto_eq Route104_PrettyPetalFlowerShop_EventScript_22A3B2 setflag FLAG_0x07F msgbox Route104_PrettyPetalFlowerShop_Text_2A7706, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, Route104_PrettyPetalFlowerShop_EventScript_22A3D2 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, Route104_PrettyPetalFlowerShop_EventScript_22A3DB release end Route104_PrettyPetalFlowerShop_EventScript_22A3B2:: @ 822A3B2 msgbox Route104_PrettyPetalFlowerShop_Text_2A76D9, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, Route104_PrettyPetalFlowerShop_EventScript_22A3D2 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, Route104_PrettyPetalFlowerShop_EventScript_22A3DB release end @@ -96,7 +96,7 @@ Route104_PrettyPetalFlowerShop_EventScript_22A442:: @ 822A442 random 8 addvar VAR_RESULT, 133 giveitem_std VAR_RESULT - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route104_PrettyPetalFlowerShop_EventScript_272054 setflag FLAG_0x930 msgbox Route104_PrettyPetalFlowerShop_Text_2A7AF3, 4 diff --git a/data/scripts/maps/Route105.inc b/data/scripts/maps/Route105.inc index 72b35e7b0..32c6826af 100644 --- a/data/scripts/maps/Route105.inc +++ b/data/scripts/maps/Route105.inc @@ -7,9 +7,9 @@ Route105_MapScripts:: @ 81EE1DB Route105_MapScript1_1EE1EB: @ 81EE1EB checkflag FLAG_0x0E4 call_if 0, Route105_EventScript_1EE20B - compare_var_to_value VAR_0x4037, 9 + compare VAR_0x4037, 9 call_if 1, Route105_EventScript_2739AB - compare_var_to_value VAR_0x4037, 10 + compare VAR_0x4037, 10 call_if 1, Route105_EventScript_273A18 end @@ -19,11 +19,11 @@ Route105_EventScript_1EE20B:: @ 81EE20B return Route105_MapScript1_1EE21E: @ 81EE21E - compare_var_to_value VAR_0x4039, 1 + compare VAR_0x4039, 1 call_if 1, Route105_EventScript_273D13 - compare_var_to_value VAR_0x4037, 9 + compare VAR_0x4037, 9 call_if 1, Route105_EventScript_273D17 - compare_var_to_value VAR_0x4037, 10 + compare VAR_0x4037, 10 call_if 1, Route105_EventScript_273D17 end @@ -63,8 +63,8 @@ Route105_EventScript_1EE2BD:: @ 81EE2BD Route105_EventScript_1EE2D4:: @ 81EE2D4 trainerbattle 2, TRAINER_ANDRES_1, 0, Route105_Text_2960A9, Route105_Text_2960DB, Route105_EventScript_1EE300 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route105_EventScript_1EE31F msgbox Route105_Text_2960FA, 4 release diff --git a/data/scripts/maps/Route106.inc b/data/scripts/maps/Route106.inc index 3bb5e27e7..132621cb8 100644 --- a/data/scripts/maps/Route106.inc +++ b/data/scripts/maps/Route106.inc @@ -17,8 +17,8 @@ Route106_EventScript_1EE4AA:: @ 81EE4AA Route106_EventScript_1EE4C1:: @ 81EE4C1 trainerbattle 2, TRAINER_ELLIOT_1, 0, Route106_Text_296327, Route106_Text_29635C, Route106_EventScript_1EE4ED - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route106_EventScript_1EE50C msgbox Route106_Text_29638C, 4 release diff --git a/data/scripts/maps/Route107.inc b/data/scripts/maps/Route107.inc index 736eaa8ee..b7d144ef2 100644 --- a/data/scripts/maps/Route107.inc +++ b/data/scripts/maps/Route107.inc @@ -8,8 +8,8 @@ Route107_EventScript_1EE595:: @ 81EE595 Route107_EventScript_1EE5AC:: @ 81EE5AC trainerbattle 2, TRAINER_TONY_1, 0, Route107_Text_2967AD, Route107_Text_2967D8, Route107_EventScript_1EE5D8 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route107_EventScript_1EE5F7 msgbox Route107_Text_2967FF, 4 release diff --git a/data/scripts/maps/Route108.inc b/data/scripts/maps/Route108.inc index d88f63ca1..e77006508 100644 --- a/data/scripts/maps/Route108.inc +++ b/data/scripts/maps/Route108.inc @@ -28,8 +28,8 @@ Route108_EventScript_1EE6E6:: @ 81EE6E6 Route108_EventScript_1EE6FD:: @ 81EE6FD trainerbattle 2, TRAINER_CORY_1, 0, Route108_Text_296F5D, Route108_Text_296F93, Route108_EventScript_1EE729 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route108_EventScript_1EE748 msgbox Route108_Text_296FB0, 4 release diff --git a/data/scripts/maps/Route109.inc b/data/scripts/maps/Route109.inc index 4cdd835ff..b8503593d 100644 --- a/data/scripts/maps/Route109.inc +++ b/data/scripts/maps/Route109.inc @@ -280,7 +280,7 @@ Route109_EventScript_1EE910:: @ 81EE910 Route109_EventScript_1EE921:: @ 81EE921 message Route109_Text_1EEC96 msgbox Route109_Text_1EEC96, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route109_EventScript_1EE981 goto Route109_EventScript_1EE972 end @@ -333,7 +333,7 @@ Route109_EventScript_1EE9B5:: @ 81EE9B5 goto_eq Route109_EventScript_1EE9F2 msgbox Route109_Text_1EEFDE, 4 giveitem_std ITEM_SOFT_SAND - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route109_EventScript_272054 closemessage applymovement VAR_LAST_TALKED, Route109_Movement_2725A2 @@ -397,8 +397,8 @@ Route109_EventScript_1EEA82:: @ 81EEA82 Route109_EventScript_1EEA99:: @ 81EEA99 trainerbattle 2, TRAINER_RICKY_1, 0, Route109_Text_29733B, Route109_Text_297379, Route109_EventScript_1EEAC5 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route109_EventScript_1EEAE4 msgbox Route109_Text_297380, 4 release @@ -422,8 +422,8 @@ Route109_EventScript_1EEAE4:: @ 81EEAE4 Route109_EventScript_1EEAFB:: @ 81EEAFB trainerbattle 2, TRAINER_LOLA_1, 0, Route109_Text_29749C, Route109_Text_2974CF, Route109_EventScript_1EEB27 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route109_EventScript_1EEB46 msgbox Route109_Text_2974D6, 4 release diff --git a/data/scripts/maps/Route109_SeashoreHouse.inc b/data/scripts/maps/Route109_SeashoreHouse.inc index 6a1c487fe..90113bd5b 100644 --- a/data/scripts/maps/Route109_SeashoreHouse.inc +++ b/data/scripts/maps/Route109_SeashoreHouse.inc @@ -28,7 +28,7 @@ Route109_SeashoreHouse_EventScript_269428:: @ 8269428 Route109_SeashoreHouse_EventScript_269432:: @ 8269432 msgbox Route109_SeashoreHouse_Text_269685, 4 giveitem_std ITEM_SODA_POP, 6 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route109_SeashoreHouse_EventScript_269456 setflag FLAG_0x08C release @@ -42,7 +42,7 @@ Route109_SeashoreHouse_EventScript_269456:: @ 8269456 Route109_SeashoreHouse_EventScript_269460:: @ 8269460 showmoneybox 0, 0, 0 msgbox Route109_SeashoreHouse_Text_26977E, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route109_SeashoreHouse_EventScript_269484 msgbox Route109_SeashoreHouse_Text_2697EF, 4 hidemoneybox @@ -53,10 +53,10 @@ Route109_SeashoreHouse_EventScript_269460:: @ 8269460 Route109_SeashoreHouse_EventScript_269484:: @ 8269484 checkmoney 0x12c, 0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route109_SeashoreHouse_EventScript_2694C8 checkitemspace ITEM_SODA_POP, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route109_SeashoreHouse_EventScript_2694D5 msgbox Route109_SeashoreHouse_Text_2697C8, 4 takemoney 0x12c, 0 diff --git a/data/scripts/maps/Route110.inc b/data/scripts/maps/Route110.inc index 0fa78b385..39a4c57d4 100644 --- a/data/scripts/maps/Route110.inc +++ b/data/scripts/maps/Route110.inc @@ -11,7 +11,7 @@ Route110_MapScript1_1EF279: @ 81EF279 Route110_MapScript1_1EF27D: @ 81EF27D call Route110_EventScript_271ED7 call Route110_EventScript_271EFB - compare_var_to_value VAR_0x40A9, 1 + compare VAR_0x40A9, 1 call_if 1, Route110_EventScript_1EF293 end @@ -131,7 +131,7 @@ Route110_EventScript_1EF389:: @ 81EF389 Route110_EventScript_1EF392:: @ 81EF392 lockall specialvar VAR_RESULT, sub_8137EFC - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route110_EventScript_1EF3AD msgbox Route110_Text_1F0A1E, 4 releaseall @@ -146,9 +146,9 @@ Route110_EventScript_1EF3B7:: @ 81EF3B7 lock faceplayer specialvar VAR_RESULT, sp0E3_walkrun_bitfield_interpretation - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route110_EventScript_1EF3E8 - compare_var_to_value VAR_0x40A9, 0 + compare VAR_0x40A9, 0 goto_eq Route110_EventScript_1EF3DE msgbox Route110_Text_1F06FB, 4 release @@ -176,8 +176,8 @@ Route110_EventScript_1EF409:: @ 81EF409 Route110_EventScript_1EF420:: @ 81EF420 trainerbattle 2, TRAINER_EDWIN_1, 0, Route110_Text_29815E, Route110_Text_29818F, Route110_EventScript_1EF44C - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route110_EventScript_1EF46B msgbox Route110_Text_2981B3, 4 release @@ -216,8 +216,8 @@ Route110_EventScript_1EF4B0:: @ 81EF4B0 Route110_EventScript_1EF4C7:: @ 81EF4C7 trainerbattle 2, TRAINER_BENJAMIN_1, 0, Route110_Text_297C63, Route110_Text_297C8A, Route110_EventScript_1EF4F3 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route110_EventScript_1EF512 msgbox Route110_Text_297CB4, 4 release @@ -246,8 +246,8 @@ Route110_EventScript_1EF529:: @ 81EF529 Route110_EventScript_1EF540:: @ 81EF540 trainerbattle 2, TRAINER_ABIGAIL_1, 0, Route110_Text_297DFA, Route110_Text_297E69, Route110_EventScript_1EF56C - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route110_EventScript_1EF58B msgbox Route110_Text_297E88, 4 release @@ -271,8 +271,8 @@ Route110_EventScript_1EF58B:: @ 81EF58B Route110_EventScript_1EF5A2:: @ 81EF5A2 trainerbattle 2, TRAINER_ISABEL_1, 0, Route110_Text_298349, Route110_Text_298389, Route110_EventScript_1EF5CE - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route110_EventScript_1EF5ED msgbox Route110_Text_2983A2, 4 release @@ -391,9 +391,9 @@ Route110_EventScript_1EF763:: @ 81EF763 Route110_EventScript_1EF76E:: @ 81EF76E lockall checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, Route110_EventScript_1EF7E1 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, Route110_EventScript_1EF7E6 applymovement 28, Route110_Movement_2725AA waitmovement 0 @@ -402,16 +402,16 @@ Route110_EventScript_1EF76E:: @ 81EF76E applymovement 28, Route110_Movement_27259A waitmovement 0 delay 30 - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if 1, Route110_EventScript_1EF94E - compare_var_to_value VAR_0x8008, 2 + compare VAR_0x8008, 2 call_if 1, Route110_EventScript_1EF959 - compare_var_to_value VAR_0x8008, 3 + compare VAR_0x8008, 3 call_if 1, Route110_EventScript_1EF964 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route110_EventScript_1EF7EB - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route110_EventScript_1EF865 releaseall end @@ -490,22 +490,22 @@ Route110_EventScript_1EF8DF:: @ 81EF8DF Route110_EventScript_1EF8EC:: @ 81EF8EC closemessage - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if 1, Route110_EventScript_1EF990 - compare_var_to_value VAR_0x8008, 2 + compare VAR_0x8008, 2 call_if 1, Route110_EventScript_1EF998 - compare_var_to_value VAR_0x8008, 3 + compare VAR_0x8008, 3 call_if 1, Route110_EventScript_1EF9A0 setobjectmovementtype 28, 10 setobjectmovementtype 29, 10 removeobject 28 addobject 29 delay 45 - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if 1, Route110_EventScript_1EF96F - compare_var_to_value VAR_0x8008, 2 + compare VAR_0x8008, 2 call_if 1, Route110_EventScript_1EF97A - compare_var_to_value VAR_0x8008, 3 + compare VAR_0x8008, 3 call_if 1, Route110_EventScript_1EF985 removeobject 29 setvar VAR_0x4069, 1 @@ -632,13 +632,13 @@ Route110_EventScript_1EF9F7:: @ 81EF9F7 waitmovement 0 applymovement 36, Route110_Movement_27259A waitmovement 0 - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if 1, Route110_EventScript_1EFAD8 - compare_var_to_value VAR_0x8008, 2 + compare VAR_0x8008, 2 call_if 1, Route110_EventScript_1EFAE3 - compare_var_to_value VAR_0x8008, 3 + compare VAR_0x8008, 3 call_if 1, Route110_EventScript_1EFAEE - compare_var_to_value VAR_0x8008, 4 + compare VAR_0x8008, 4 call_if 1, Route110_EventScript_1EFAF9 msgbox Route110_Text_1F0AB5, 4 closemessage @@ -663,13 +663,13 @@ Route110_EventScript_1EF9F7:: @ 81EF9F7 setflag FLAG_0x119 msgbox Route110_Text_1F0C33, 4 closemessage - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if 1, Route110_EventScript_1EFB04 - compare_var_to_value VAR_0x8008, 2 + compare VAR_0x8008, 2 call_if 1, Route110_EventScript_1EFB0F - compare_var_to_value VAR_0x8008, 3 + compare VAR_0x8008, 3 call_if 1, Route110_EventScript_1EFB1A - compare_var_to_value VAR_0x8008, 4 + compare VAR_0x8008, 4 call_if 1, Route110_EventScript_1EFB25 removeobject 36 setvar VAR_0x40DA, 2 diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadEntrance1.inc b/data/scripts/maps/Route110_SeasideCyclingRoadEntrance1.inc index 2ea2092d5..8772f96b8 100644 --- a/data/scripts/maps/Route110_SeasideCyclingRoadEntrance1.inc +++ b/data/scripts/maps/Route110_SeasideCyclingRoadEntrance1.inc @@ -11,7 +11,7 @@ Route110_SeasideCyclingRoadEntrance1_EventScript_26EA78:: @ 826EA78 Route110_SeasideCyclingRoadEntrance1_EventScript_26EA84:: @ 826EA84 lockall specialvar VAR_RESULT, sp0E3_walkrun_bitfield_interpretation - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route110_SeasideCyclingRoadEntrance1_EventScript_26EA9F setflag FLAG_SYS_CYCLING_ROAD setvar VAR_0x4001, 1 diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadEntrance2.inc b/data/scripts/maps/Route110_SeasideCyclingRoadEntrance2.inc index 92ef38d9a..ca7f558a8 100644 --- a/data/scripts/maps/Route110_SeasideCyclingRoadEntrance2.inc +++ b/data/scripts/maps/Route110_SeasideCyclingRoadEntrance2.inc @@ -3,9 +3,9 @@ Route110_SeasideCyclingRoadEntrance2_MapScripts:: @ 826EBA1 .byte 0 Route110_SeasideCyclingRoadEntrance2_MapScript1_26EBA7: @ 826EBA7 - compare_var_to_value VAR_0x40A9, 3 + compare VAR_0x40A9, 3 call_if 1, Route110_SeasideCyclingRoadEntrance2_EventScript_26EBBE - compare_var_to_value VAR_0x40A9, 2 + compare VAR_0x40A9, 2 call_if 1, Route110_SeasideCyclingRoadEntrance2_EventScript_26EBBE end @@ -23,9 +23,9 @@ Route110_SeasideCyclingRoadEntrance2_EventScript_26EBC4:: @ 826EBC4 Route110_SeasideCyclingRoadEntrance2_EventScript_26EBD0:: @ 826EBD0 lockall specialvar VAR_RESULT, sp0E3_walkrun_bitfield_interpretation - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 call_if 1, Route110_SeasideCyclingRoadEntrance2_EventScript_26EBF6 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route110_SeasideCyclingRoadEntrance2_EventScript_26EBFC setflag FLAG_SYS_CYCLING_ROAD setvar VAR_0x4001, 1 diff --git a/data/scripts/maps/Route110_TrickHouseEnd.inc b/data/scripts/maps/Route110_TrickHouseEnd.inc index 17fe81ad5..cafa9c827 100644 --- a/data/scripts/maps/Route110_TrickHouseEnd.inc +++ b/data/scripts/maps/Route110_TrickHouseEnd.inc @@ -6,7 +6,7 @@ Route110_TrickHouseEnd_MapScripts:: @ 826ACAF .byte 0 Route110_TrickHouseEnd_MapScript1_26ACC4: @ 826ACC4 - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if 1, Route110_TrickHouseEnd_EventScript_26AD0D end @@ -61,7 +61,7 @@ Route110_TrickHouseEnd_EventScript_26AD84:: @ 826AD84 msgbox Route110_TrickHouseEnd_Text_26B73D, 4 setvar VAR_0x40C1, 0 giveitem_std ITEM_RARE_CANDY - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_26AFEF msgbox Route110_TrickHouseEnd_Text_26B7EF, 4 closemessage @@ -74,7 +74,7 @@ Route110_TrickHouseEnd_EventScript_26ADC0:: @ 826ADC0 msgbox Route110_TrickHouseEnd_Text_26B73D, 4 setvar VAR_0x40C1, 0 giveitem_std ITEM_TIMER_BALL - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_26AFEF msgbox Route110_TrickHouseEnd_Text_26B7EF, 4 closemessage @@ -87,7 +87,7 @@ Route110_TrickHouseEnd_EventScript_26ADFC:: @ 826ADFC msgbox Route110_TrickHouseEnd_Text_26B73D, 4 setvar VAR_0x40C1, 0 giveitem_std ITEM_HARD_STONE - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_26AFEF msgbox Route110_TrickHouseEnd_Text_26B7EF, 4 closemessage @@ -100,7 +100,7 @@ Route110_TrickHouseEnd_EventScript_26AE38:: @ 826AE38 msgbox Route110_TrickHouseEnd_Text_26B73D, 4 setvar VAR_0x40C1, 0 giveitem_std ITEM_SMOKE_BALL - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_26AFEF msgbox Route110_TrickHouseEnd_Text_26B7EF, 4 closemessage @@ -113,7 +113,7 @@ Route110_TrickHouseEnd_EventScript_26AE74:: @ 826AE74 msgbox Route110_TrickHouseEnd_Text_26B73D, 4 setvar VAR_0x40C1, 0 giveitem_std ITEM_TM12 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_26AFEF msgbox Route110_TrickHouseEnd_Text_26B7EF, 4 closemessage @@ -126,7 +126,7 @@ Route110_TrickHouseEnd_EventScript_26AEB0:: @ 826AEB0 msgbox Route110_TrickHouseEnd_Text_26B73D, 4 setvar VAR_0x40C1, 0 giveitem_std ITEM_MAGNET - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_26AFEF msgbox Route110_TrickHouseEnd_Text_26B7EF, 4 closemessage @@ -139,7 +139,7 @@ Route110_TrickHouseEnd_EventScript_26AEEC:: @ 826AEEC msgbox Route110_TrickHouseEnd_Text_26B73D, 4 setvar VAR_0x40C1, 0 giveitem_std ITEM_PP_MAX - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_26AFEF msgbox Route110_TrickHouseEnd_Text_26B7EF, 4 closemessage @@ -150,13 +150,13 @@ Route110_TrickHouseEnd_EventScript_26AEEC:: @ 826AEEC Route110_TrickHouseEnd_EventScript_26AF28:: @ 826AF28 msgbox Route110_TrickHouseEnd_Text_26B3AB, 4 closemessage - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 call_if 1, Route110_TrickHouseEnd_EventScript_26B015 - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if 1, Route110_TrickHouseEnd_EventScript_26B020 - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if 1, Route110_TrickHouseEnd_EventScript_26B02B - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if 1, Route110_TrickHouseEnd_EventScript_26B036 delay 30 msgbox Route110_TrickHouseEnd_Text_26B3FA, 4 @@ -167,7 +167,7 @@ Route110_TrickHouseEnd_EventScript_26AF28:: @ 826AF28 msgbox Route110_TrickHouseEnd_Text_26B485, 4 setvar VAR_0x40C1, 0 call Route110_TrickHouseEnd_EventScript_26AFA5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_26B002 msgbox Route110_TrickHouseEnd_Text_26B69A, 4 call Route110_TrickHouseEnd_EventScript_26AFCF diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.inc b/data/scripts/maps/Route110_TrickHouseEntrance.inc index b7b9453e3..f71a6a097 100644 --- a/data/scripts/maps/Route110_TrickHouseEntrance.inc +++ b/data/scripts/maps/Route110_TrickHouseEntrance.inc @@ -6,17 +6,17 @@ Route110_TrickHouseEntrance_MapScripts:: @ 8269A50 Route110_TrickHouseEntrance_MapScript1_269A60: @ 8269A60 setflag FLAG_0x8A2 - compare_var_to_value VAR_0x40B5, 1 + compare VAR_0x40B5, 1 goto_eq Route110_TrickHouseEntrance_EventScript_269AF3 - compare_var_to_value VAR_0x40C1, 1 + compare VAR_0x40C1, 1 goto_eq Route110_TrickHouseEntrance_EventScript_269AD7 - compare_var_to_value VAR_0x40A6, 1 + compare VAR_0x40A6, 1 goto_eq Route110_TrickHouseEntrance_EventScript_269BB3 - compare_var_to_value VAR_0x40A7, 5 + compare VAR_0x40A7, 5 call_if 1, Route110_TrickHouseEntrance_EventScript_269B03 - compare_var_to_value VAR_0x40A7, 3 + compare VAR_0x40A7, 3 call_if 1, Route110_TrickHouseEntrance_EventScript_269B03 - compare_var_to_value VAR_0x40A7, 0 + compare VAR_0x40A7, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_269B03 switch VAR_0x40A7 case 0, Route110_TrickHouseEntrance_EventScript_269BBB @@ -27,7 +27,7 @@ Route110_TrickHouseEntrance_MapScript1_269A60: @ 8269A60 Route110_TrickHouseEntrance_EventScript_269AD7:: @ 8269AD7 setvar VAR_0x40A5, 1 - compare_var_to_value VAR_0x4044, 8 + compare VAR_0x4044, 8 goto_eq Route110_TrickHouseEntrance_EventScript_269AED setvar VAR_0x40A7, 2 end @@ -44,21 +44,21 @@ Route110_TrickHouseEntrance_EventScript_269AF3:: @ 8269AF3 Route110_TrickHouseEntrance_EventScript_269B03:: @ 8269B03 setvar VAR_0x40A7, 0 - compare_var_to_value VAR_0x4044, 1 + compare VAR_0x4044, 1 call_if 1, Route110_TrickHouseEntrance_EventScript_269B61 - compare_var_to_value VAR_0x4044, 2 + compare VAR_0x4044, 2 call_if 1, Route110_TrickHouseEntrance_EventScript_269B6B - compare_var_to_value VAR_0x4044, 3 + compare VAR_0x4044, 3 call_if 1, Route110_TrickHouseEntrance_EventScript_269B75 - compare_var_to_value VAR_0x4044, 4 + compare VAR_0x4044, 4 call_if 1, Route110_TrickHouseEntrance_EventScript_269B7F - compare_var_to_value VAR_0x4044, 5 + compare VAR_0x4044, 5 call_if 1, Route110_TrickHouseEntrance_EventScript_269B89 - compare_var_to_value VAR_0x4044, 6 + compare VAR_0x4044, 6 call_if 1, Route110_TrickHouseEntrance_EventScript_269B93 - compare_var_to_value VAR_0x4044, 7 + compare VAR_0x4044, 7 call_if 1, Route110_TrickHouseEntrance_EventScript_269B9D - compare_var_to_value VAR_0x4044, 8 + compare VAR_0x4044, 8 call_if 1, Route110_TrickHouseEntrance_EventScript_269BA7 return @@ -212,7 +212,7 @@ Route110_TrickHouseEntrance_MapScript2_269CEE: @ 8269CEE Route110_TrickHouseEntrance_EventScript_269CF8:: @ 8269CF8 lockall delay 20 - compare_var_to_value VAR_0x4044, 0 + compare VAR_0x4044, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_269E48 msgbox Route110_TrickHouseEntrance_Text_26A78C, 4 closemessage @@ -247,21 +247,21 @@ Route110_TrickHouseEntrance_EventScript_269D6E:: @ 8269D6E waitmovement 0 applymovement 255, Route110_TrickHouseEntrance_Movement_27259A waitmovement 0 - compare_var_to_value VAR_0x4044, 0 + compare VAR_0x4044, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_269DEE - compare_var_to_value VAR_0x4044, 1 + compare VAR_0x4044, 1 call_if 1, Route110_TrickHouseEntrance_EventScript_269DF7 - compare_var_to_value VAR_0x4044, 2 + compare VAR_0x4044, 2 call_if 1, Route110_TrickHouseEntrance_EventScript_269E00 - compare_var_to_value VAR_0x4044, 3 + compare VAR_0x4044, 3 call_if 1, Route110_TrickHouseEntrance_EventScript_269E09 - compare_var_to_value VAR_0x4044, 4 + compare VAR_0x4044, 4 call_if 1, Route110_TrickHouseEntrance_EventScript_269E12 - compare_var_to_value VAR_0x4044, 5 + compare VAR_0x4044, 5 call_if 1, Route110_TrickHouseEntrance_EventScript_269E1B - compare_var_to_value VAR_0x4044, 6 + compare VAR_0x4044, 6 call_if 1, Route110_TrickHouseEntrance_EventScript_269E24 - compare_var_to_value VAR_0x4044, 7 + compare VAR_0x4044, 7 call_if 1, Route110_TrickHouseEntrance_EventScript_269E2D closemessage setvar VAR_0x40A6, 1 @@ -350,27 +350,27 @@ Route110_TrickHouseEntrance_EventScript_269E8F:: @ 8269E8F applymovement 1, Route110_TrickHouseEntrance_Movement_27259E waitmovement 0 msgbox Route110_TrickHouseEntrance_Text_26AA82, 4 - compare_var_to_value VAR_0x4044, 1 + compare VAR_0x4044, 1 goto_eq Route110_TrickHouseEntrance_EventScript_269EEF - compare_var_to_value VAR_0x4044, 2 + compare VAR_0x4044, 2 goto_eq Route110_TrickHouseEntrance_EventScript_269F1B - compare_var_to_value VAR_0x4044, 3 + compare VAR_0x4044, 3 goto_eq Route110_TrickHouseEntrance_EventScript_269F47 - compare_var_to_value VAR_0x4044, 4 + compare VAR_0x4044, 4 goto_eq Route110_TrickHouseEntrance_EventScript_269F73 - compare_var_to_value VAR_0x4044, 5 + compare VAR_0x4044, 5 goto_eq Route110_TrickHouseEntrance_EventScript_269F9F - compare_var_to_value VAR_0x4044, 6 + compare VAR_0x4044, 6 goto_eq Route110_TrickHouseEntrance_EventScript_269FCB - compare_var_to_value VAR_0x4044, 7 + compare VAR_0x4044, 7 goto_eq Route110_TrickHouseEntrance_EventScript_269FF7 end Route110_TrickHouseEntrance_EventScript_269EEF:: @ 8269EEF giveitem_std ITEM_RARE_CANDY - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route110_TrickHouseEntrance_EventScript_26A023 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_27205E msgbox Route110_TrickHouseEntrance_Text_26AB00, 4 releaseall @@ -378,9 +378,9 @@ Route110_TrickHouseEntrance_EventScript_269EEF:: @ 8269EEF Route110_TrickHouseEntrance_EventScript_269F1B:: @ 8269F1B giveitem_std ITEM_TIMER_BALL - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route110_TrickHouseEntrance_EventScript_26A023 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_27205E msgbox Route110_TrickHouseEntrance_Text_26AB00, 4 releaseall @@ -388,9 +388,9 @@ Route110_TrickHouseEntrance_EventScript_269F1B:: @ 8269F1B Route110_TrickHouseEntrance_EventScript_269F47:: @ 8269F47 giveitem_std ITEM_HARD_STONE - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route110_TrickHouseEntrance_EventScript_26A023 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_27205E msgbox Route110_TrickHouseEntrance_Text_26AB00, 4 releaseall @@ -398,9 +398,9 @@ Route110_TrickHouseEntrance_EventScript_269F47:: @ 8269F47 Route110_TrickHouseEntrance_EventScript_269F73:: @ 8269F73 giveitem_std ITEM_SMOKE_BALL - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route110_TrickHouseEntrance_EventScript_26A023 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_27205E msgbox Route110_TrickHouseEntrance_Text_26AB00, 4 releaseall @@ -408,9 +408,9 @@ Route110_TrickHouseEntrance_EventScript_269F73:: @ 8269F73 Route110_TrickHouseEntrance_EventScript_269F9F:: @ 8269F9F giveitem_std ITEM_TM12 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route110_TrickHouseEntrance_EventScript_26A023 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_27205E msgbox Route110_TrickHouseEntrance_Text_26AB00, 4 releaseall @@ -418,9 +418,9 @@ Route110_TrickHouseEntrance_EventScript_269F9F:: @ 8269F9F Route110_TrickHouseEntrance_EventScript_269FCB:: @ 8269FCB giveitem_std ITEM_MAGNET - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route110_TrickHouseEntrance_EventScript_26A023 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_27205E msgbox Route110_TrickHouseEntrance_Text_26AB00, 4 releaseall @@ -428,9 +428,9 @@ Route110_TrickHouseEntrance_EventScript_269FCB:: @ 8269FCB Route110_TrickHouseEntrance_EventScript_269FF7:: @ 8269FF7 giveitem_std ITEM_PP_MAX - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route110_TrickHouseEntrance_EventScript_26A023 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_27205E msgbox Route110_TrickHouseEntrance_Text_26AB00, 4 releaseall @@ -449,9 +449,9 @@ Route110_TrickHouseEntrance_EventScript_26A039:: @ 826A039 waitmovement 0 msgbox Route110_TrickHouseEntrance_Text_26AB2C, 4 call Route110_TrickHouseEntrance_EventScript_26A070 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route110_TrickHouseEntrance_EventScript_26A09A - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_272071 msgbox Route110_TrickHouseEntrance_Text_26ABBD, 4 releaseall @@ -504,7 +504,7 @@ Route110_TrickHouseEntrance_EventScript_26A106:: @ 826A106 Route110_TrickHouseEntrance_EventScript_26A110:: @ 826A110 msgbox Route110_TrickHouseEntrance_Text_26A887, 5 closemessage - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route110_TrickHouseEntrance_EventScript_26A126 releaseall end @@ -586,7 +586,7 @@ Route110_TrickHouseEntrance_EventScript_26A201:: @ 826A201 end Route110_TrickHouseEntrance_EventScript_26A20B:: @ 826A20B - compare_var_to_value VAR_0x4044, 8 + compare VAR_0x4044, 8 goto_eq Route110_TrickHouseEntrance_EventScript_26A220 msgbox Route110_TrickHouseEntrance_Text_26A878, 4 releaseall @@ -611,7 +611,7 @@ Route110_TrickHouseEntrance_EventScript_26A22A:: @ 826A22A end Route110_TrickHouseEntrance_EventScript_26A289:: @ 826A289 - compare_var_to_value VAR_0x40AB, 0 + compare VAR_0x40AB, 0 goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 msgbox Route110_TrickHousePuzzle1_Text_26B98D, 4 playse SE_PIN @@ -622,7 +622,7 @@ Route110_TrickHouseEntrance_EventScript_26A289:: @ 826A289 end Route110_TrickHouseEntrance_EventScript_26A2B2:: @ 826A2B2 - compare_var_to_value VAR_0x40AC, 0 + compare VAR_0x40AC, 0 goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 msgbox Route110_TrickHousePuzzle2_Text_26BCBA, 4 playse SE_PIN @@ -633,7 +633,7 @@ Route110_TrickHouseEntrance_EventScript_26A2B2:: @ 826A2B2 end Route110_TrickHouseEntrance_EventScript_26A2DB:: @ 826A2DB - compare_var_to_value VAR_0x40AD, 0 + compare VAR_0x40AD, 0 goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 msgbox Route110_TrickHousePuzzle3_Text_26C609, 4 playse SE_PIN @@ -644,7 +644,7 @@ Route110_TrickHouseEntrance_EventScript_26A2DB:: @ 826A2DB end Route110_TrickHouseEntrance_EventScript_26A304:: @ 826A304 - compare_var_to_value VAR_0x40AE, 0 + compare VAR_0x40AE, 0 goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 msgbox Route110_TrickHousePuzzle4_Text_26C8C3, 4 playse SE_PIN @@ -655,7 +655,7 @@ Route110_TrickHouseEntrance_EventScript_26A304:: @ 826A304 end Route110_TrickHouseEntrance_EventScript_26A32D:: @ 826A32D - compare_var_to_value VAR_0x40AF, 0 + compare VAR_0x40AF, 0 goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 msgbox Route110_TrickHousePuzzle5_Text_26D660, 4 playse SE_PIN @@ -666,7 +666,7 @@ Route110_TrickHouseEntrance_EventScript_26A32D:: @ 826A32D end Route110_TrickHouseEntrance_EventScript_26A356:: @ 826A356 - compare_var_to_value VAR_0x40B0, 0 + compare VAR_0x40B0, 0 goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 msgbox Route110_TrickHousePuzzle6_Text_26DE26, 4 playse SE_PIN @@ -677,7 +677,7 @@ Route110_TrickHouseEntrance_EventScript_26A356:: @ 826A356 end Route110_TrickHouseEntrance_EventScript_26A37F:: @ 826A37F - compare_var_to_value VAR_0x40B1, 0 + compare VAR_0x40B1, 0 goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 msgbox Route110_TrickHousePuzzle7_EventScript_26E413, 4 playse SE_PIN @@ -688,7 +688,7 @@ Route110_TrickHouseEntrance_EventScript_26A37F:: @ 826A37F end Route110_TrickHouseEntrance_EventScript_26A3A8:: @ 826A3A8 - compare_var_to_value VAR_0x40B2, 0 + compare VAR_0x40B2, 0 goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 msgbox Route110_TrickHousePuzzle8_EventScript_26E864, 4 playse SE_PIN @@ -734,11 +734,11 @@ Route110_TrickHouseEntrance_EventScript_26A3F8:: @ 826A3F8 lockall msgbox Route110_TrickHouseEntrance_Text_26A474, 4 releaseall - compare_var_to_value VAR_0x4044, 0 + compare VAR_0x4044, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_26A429 - compare_var_to_value VAR_0x4044, 1 + compare VAR_0x4044, 1 call_if 1, Route110_TrickHouseEntrance_EventScript_26A439 - compare_var_to_value VAR_0x4044, 2 + compare VAR_0x4044, 2 call_if 1, Route110_TrickHouseEntrance_EventScript_26A449 setvar VAR_0x40A5, 1 end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle1.inc b/data/scripts/maps/Route110_TrickHousePuzzle1.inc index 97db16860..340a7e03c 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle1.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle1.inc @@ -3,7 +3,7 @@ Route110_TrickHousePuzzle1_MapScripts:: @ 826B90F .byte 0 Route110_TrickHousePuzzle1_MapScript1_26B915: @ 826B915 - compare_var_to_value VAR_0x40AB, 2 + compare VAR_0x40AB, 2 goto_eq Route110_TrickHousePuzzle1_EventScript_26B921 end @@ -13,7 +13,7 @@ Route110_TrickHousePuzzle1_EventScript_26B921:: @ 826B921 Route110_TrickHousePuzzle1_EventScript_26B92B:: @ 826B92B lockall - compare_var_to_value VAR_0x40AB, 0 + compare VAR_0x40AB, 0 goto_eq Route110_TrickHousePuzzle1_EventScript_26B93D goto Route110_TrickHousePuzzle1_EventScript_26A3DB end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle2.inc b/data/scripts/maps/Route110_TrickHousePuzzle2.inc index d7981a534..fd8c42f84 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle2.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle2.inc @@ -4,13 +4,13 @@ Route110_TrickHousePuzzle2_MapScripts:: @ 826BB73 .byte 0 Route110_TrickHousePuzzle2_MapScript1_26BB7E: @ 826BB7E - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if 1, Route110_TrickHousePuzzle2_EventScript_26BC29 - compare_var_to_value VAR_0x4002, 1 + compare VAR_0x4002, 1 call_if 1, Route110_TrickHousePuzzle2_EventScript_26BC3C - compare_var_to_value VAR_0x4003, 1 + compare VAR_0x4003, 1 call_if 1, Route110_TrickHousePuzzle2_EventScript_26BC4F - compare_var_to_value VAR_0x4004, 1 + compare VAR_0x4004, 1 call_if 1, Route110_TrickHousePuzzle2_EventScript_26BC62 end @@ -23,7 +23,7 @@ Route110_TrickHousePuzzle2_MapScript1_26BBAB: @ 826BBAB Route110_TrickHousePuzzle2_EventScript_26BBC0:: @ 826BBC0 lockall - compare_var_to_value VAR_0x40AC, 0 + compare VAR_0x40AC, 0 goto_eq Route110_TrickHousePuzzle2_EventScript_26BBD2 goto Route110_TrickHousePuzzle2_EventScript_26A3DB end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle3.inc b/data/scripts/maps/Route110_TrickHousePuzzle3.inc index a8c62db41..b5302e551 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle3.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle3.inc @@ -5,9 +5,9 @@ Route110_TrickHousePuzzle3_MapScripts:: @ 826BED8 Route110_TrickHousePuzzle3_MapScript1_26BEE3: @ 826BEE3 call Route110_TrickHousePuzzle3_EventScript_26BF1E - compare_var_to_value VAR_0x4009, 0 + compare VAR_0x4009, 0 call_if 1, Route110_TrickHousePuzzle3_EventScript_26BF97 - compare_var_to_value VAR_0x4009, 1 + compare VAR_0x4009, 1 call_if 1, Route110_TrickHousePuzzle3_EventScript_26C232 end @@ -25,13 +25,13 @@ Route110_TrickHousePuzzle3_EventScript_26BF1E:: @ 826BF1E setmetatile 3, 11, 600, 0 setmetatile 12, 5, 600, 0 setmetatile 8, 2, 600, 0 - compare_var_to_value VAR_0x4008, 1 + compare VAR_0x4008, 1 call_if 1, Route110_TrickHousePuzzle3_EventScript_26BF6F - compare_var_to_value VAR_0x4008, 2 + compare VAR_0x4008, 2 call_if 1, Route110_TrickHousePuzzle3_EventScript_26BF79 - compare_var_to_value VAR_0x4008, 3 + compare VAR_0x4008, 3 call_if 1, Route110_TrickHousePuzzle3_EventScript_26BF83 - compare_var_to_value VAR_0x4008, 4 + compare VAR_0x4008, 4 call_if 1, Route110_TrickHousePuzzle3_EventScript_26BF8D return @@ -241,13 +241,13 @@ Route110_TrickHousePuzzle3_EventScript_26C510:: @ 826C510 setvar VAR_0x4002, 0 setvar VAR_0x4003, 0 setvar VAR_0x4004, 0 - compare_var_to_value VAR_0x4008, 1 + compare VAR_0x4008, 1 call_if 1, Route110_TrickHousePuzzle3_EventScript_26C551 - compare_var_to_value VAR_0x4008, 2 + compare VAR_0x4008, 2 call_if 1, Route110_TrickHousePuzzle3_EventScript_26C557 - compare_var_to_value VAR_0x4008, 3 + compare VAR_0x4008, 3 call_if 1, Route110_TrickHousePuzzle3_EventScript_26C55D - compare_var_to_value VAR_0x4008, 4 + compare VAR_0x4008, 4 call_if 1, Route110_TrickHousePuzzle3_EventScript_26C563 return @@ -268,14 +268,14 @@ Route110_TrickHousePuzzle3_EventScript_26C563:: @ 826C563 return Route110_TrickHousePuzzle3_EventScript_26C569:: @ 826C569 - compare_var_to_value VAR_0x4009, 1 + compare VAR_0x4009, 1 call_if 1, Route110_TrickHousePuzzle3_EventScript_26BF97 - compare_var_to_value VAR_0x4009, 0 + compare VAR_0x4009, 0 call_if 1, Route110_TrickHousePuzzle3_EventScript_26C232 special DrawWholeMapView - compare_var_to_value VAR_0x4009, 1 + compare VAR_0x4009, 1 goto_eq Route110_TrickHousePuzzle3_EventScript_26C599 - compare_var_to_value VAR_0x4009, 0 + compare VAR_0x4009, 0 goto_eq Route110_TrickHousePuzzle3_EventScript_26C5A0 end @@ -291,7 +291,7 @@ Route110_TrickHousePuzzle3_EventScript_26C5A0:: @ 826C5A0 Route110_TrickHousePuzzle3_EventScript_26C5A7:: @ 826C5A7 lockall - compare_var_to_value VAR_0x40AD, 0 + compare VAR_0x40AD, 0 goto_eq Route110_TrickHousePuzzle3_EventScript_26C5B9 goto Route110_TrickHousePuzzle3_EventScript_26A3DB end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle4.inc b/data/scripts/maps/Route110_TrickHousePuzzle4.inc index 9b2e2e57f..56b4b02fb 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle4.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle4.inc @@ -3,7 +3,7 @@ Route110_TrickHousePuzzle4_MapScripts:: @ 826C860 Route110_TrickHousePuzzle4_EventScript_26C861:: @ 826C861 lockall - compare_var_to_value VAR_0x40AE, 0 + compare VAR_0x40AE, 0 goto_eq Route110_TrickHousePuzzle4_EventScript_26C873 goto Route110_TrickHousePuzzle4_EventScript_26A3DB end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle5.inc b/data/scripts/maps/Route110_TrickHousePuzzle5.inc index 5f90e7f1d..5e14d3add 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle5.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle5.inc @@ -13,7 +13,7 @@ Route110_TrickHousePuzzle5_MapScript1_26CAF6: @ 826CAF6 Route110_TrickHousePuzzle5_EventScript_26CB15:: @ 826CB15 lockall - compare_var_to_value VAR_0x40AF, 0 + compare VAR_0x40AF, 0 goto_eq Route110_TrickHousePuzzle5_EventScript_26CB27 goto Route110_TrickHousePuzzle5_EventScript_26A3DB end @@ -27,7 +27,7 @@ Route110_TrickHousePuzzle5_EventScript_26CB32:: @ 826CB32 lockall applymovement 1, Route110_TrickHousePuzzle5_Movement_27259E waitmovement 0 - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 goto_eq Route110_TrickHousePuzzle5_EventScript_26D1AA setvar VAR_0x4009, 0 goto Route110_TrickHousePuzzle5_EventScript_26CCEB @@ -37,7 +37,7 @@ Route110_TrickHousePuzzle5_EventScript_26CB53:: @ 826CB53 lockall applymovement 2, Route110_TrickHousePuzzle5_Movement_27259E waitmovement 0 - compare_var_to_value VAR_0x4002, 1 + compare VAR_0x4002, 1 goto_eq Route110_TrickHousePuzzle5_EventScript_26D1AA setvar VAR_0x4009, 0 goto Route110_TrickHousePuzzle5_EventScript_26CD6A @@ -47,7 +47,7 @@ Route110_TrickHousePuzzle5_EventScript_26CB74:: @ 826CB74 lockall applymovement 3, Route110_TrickHousePuzzle5_Movement_27259E waitmovement 0 - compare_var_to_value VAR_0x4003, 1 + compare VAR_0x4003, 1 goto_eq Route110_TrickHousePuzzle5_EventScript_26D1AA setvar VAR_0x4009, 0 goto Route110_TrickHousePuzzle5_EventScript_26CDF4 @@ -57,7 +57,7 @@ Route110_TrickHousePuzzle5_EventScript_26CB95:: @ 826CB95 lockall applymovement 4, Route110_TrickHousePuzzle5_Movement_27259E waitmovement 0 - compare_var_to_value VAR_0x4004, 1 + compare VAR_0x4004, 1 goto_eq Route110_TrickHousePuzzle5_EventScript_26D1AA setvar VAR_0x4009, 0 goto Route110_TrickHousePuzzle5_EventScript_26CE73 @@ -67,7 +67,7 @@ Route110_TrickHousePuzzle5_EventScript_26CBB6:: @ 826CBB6 lockall applymovement 5, Route110_TrickHousePuzzle5_Movement_27259E waitmovement 0 - compare_var_to_value VAR_0x4005, 1 + compare VAR_0x4005, 1 goto_eq Route110_TrickHousePuzzle5_EventScript_26D1AA setvar VAR_0x4009, 0 goto Route110_TrickHousePuzzle5_EventScript_26CEF2 @@ -219,13 +219,13 @@ Route110_TrickHousePuzzle5_EventScript_26CCEB:: @ 826CCEB waitmovement 0 applymovement 1, Route110_TrickHousePuzzle5_Movement_27259A waitmovement 0 - compare_var_to_value VAR_0x4009, 1 + compare VAR_0x4009, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D1B4 - compare_var_to_value VAR_0x4009, 2 + compare VAR_0x4009, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D1EC - compare_var_to_value VAR_0x4009, 3 + compare VAR_0x4009, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D224 - compare_var_to_value VAR_0x4009, 4 + compare VAR_0x4009, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D25C msgbox Route110_TrickHousePuzzle5_Text_26D6CE, 4 random 3 @@ -243,15 +243,15 @@ Route110_TrickHousePuzzle5_EventScript_26CD6A:: @ 826CD6A waitmovement 0 applymovement 2, Route110_TrickHousePuzzle5_Movement_27259A waitmovement 0 - compare_var_to_value VAR_0x4009, 1 + compare VAR_0x4009, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D2CC - compare_var_to_value VAR_0x4009, 2 + compare VAR_0x4009, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D304 - compare_var_to_value VAR_0x4009, 3 + compare VAR_0x4009, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D33C - compare_var_to_value VAR_0x4009, 4 + compare VAR_0x4009, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D374 - compare_var_to_value VAR_0x4009, 5 + compare VAR_0x4009, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D3AC msgbox Route110_TrickHousePuzzle5_Text_26D8EA, 4 random 3 @@ -269,13 +269,13 @@ Route110_TrickHousePuzzle5_EventScript_26CDF4:: @ 826CDF4 waitmovement 0 applymovement 3, Route110_TrickHousePuzzle5_Movement_27259A waitmovement 0 - compare_var_to_value VAR_0x4009, 1 + compare VAR_0x4009, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D1B4 - compare_var_to_value VAR_0x4009, 2 + compare VAR_0x4009, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D1EC - compare_var_to_value VAR_0x4009, 3 + compare VAR_0x4009, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D224 - compare_var_to_value VAR_0x4009, 4 + compare VAR_0x4009, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D25C msgbox Route110_TrickHousePuzzle5_Text_26DA1E, 4 random 3 @@ -293,13 +293,13 @@ Route110_TrickHousePuzzle5_EventScript_26CE73:: @ 826CE73 waitmovement 0 applymovement 4, Route110_TrickHousePuzzle5_Movement_27259A waitmovement 0 - compare_var_to_value VAR_0x4009, 1 + compare VAR_0x4009, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D1B4 - compare_var_to_value VAR_0x4009, 2 + compare VAR_0x4009, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D1EC - compare_var_to_value VAR_0x4009, 3 + compare VAR_0x4009, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D224 - compare_var_to_value VAR_0x4009, 4 + compare VAR_0x4009, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D25C msgbox Route110_TrickHousePuzzle5_Text_26DB4C, 4 random 3 @@ -475,132 +475,132 @@ Route110_TrickHousePuzzle5_EventScript_26D1AA:: @ 826D1AA end Route110_TrickHousePuzzle5_EventScript_26D1B4:: @ 826D1B4 - compare_var_to_value VAR_0x4008, 1 + compare VAR_0x4008, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D3E4 - compare_var_to_value VAR_0x4008, 2 + compare VAR_0x4008, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D3EF - compare_var_to_value VAR_0x4008, 3 + compare VAR_0x4008, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D3FA - compare_var_to_value VAR_0x4008, 4 + compare VAR_0x4008, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D405 - compare_var_to_value VAR_0x4008, 5 + compare VAR_0x4008, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D410 return Route110_TrickHousePuzzle5_EventScript_26D1EC:: @ 826D1EC - compare_var_to_value VAR_0x4008, 1 + compare VAR_0x4008, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D41B - compare_var_to_value VAR_0x4008, 2 + compare VAR_0x4008, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D426 - compare_var_to_value VAR_0x4008, 3 + compare VAR_0x4008, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D431 - compare_var_to_value VAR_0x4008, 4 + compare VAR_0x4008, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D43C - compare_var_to_value VAR_0x4008, 5 + compare VAR_0x4008, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D447 return Route110_TrickHousePuzzle5_EventScript_26D224:: @ 826D224 - compare_var_to_value VAR_0x4008, 1 + compare VAR_0x4008, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D452 - compare_var_to_value VAR_0x4008, 2 + compare VAR_0x4008, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D45D - compare_var_to_value VAR_0x4008, 3 + compare VAR_0x4008, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D468 - compare_var_to_value VAR_0x4008, 4 + compare VAR_0x4008, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D473 - compare_var_to_value VAR_0x4008, 5 + compare VAR_0x4008, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D47E return Route110_TrickHousePuzzle5_EventScript_26D25C:: @ 826D25C - compare_var_to_value VAR_0x4008, 1 + compare VAR_0x4008, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D489 - compare_var_to_value VAR_0x4008, 2 + compare VAR_0x4008, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D494 - compare_var_to_value VAR_0x4008, 3 + compare VAR_0x4008, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D49F - compare_var_to_value VAR_0x4008, 4 + compare VAR_0x4008, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D4AA - compare_var_to_value VAR_0x4008, 5 + compare VAR_0x4008, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D4B5 return Route110_TrickHousePuzzle5_EventScript_26D294:: @ 826D294 - compare_var_to_value VAR_0x4008, 1 + compare VAR_0x4008, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D4C0 - compare_var_to_value VAR_0x4008, 2 + compare VAR_0x4008, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D4CB - compare_var_to_value VAR_0x4008, 3 + compare VAR_0x4008, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D4D6 - compare_var_to_value VAR_0x4008, 4 + compare VAR_0x4008, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D4E1 - compare_var_to_value VAR_0x4008, 5 + compare VAR_0x4008, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D4EC return Route110_TrickHousePuzzle5_EventScript_26D2CC:: @ 826D2CC - compare_var_to_value VAR_0x4008, 1 + compare VAR_0x4008, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D4F7 - compare_var_to_value VAR_0x4008, 2 + compare VAR_0x4008, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D502 - compare_var_to_value VAR_0x4008, 3 + compare VAR_0x4008, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D50D - compare_var_to_value VAR_0x4008, 4 + compare VAR_0x4008, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D518 - compare_var_to_value VAR_0x4008, 5 + compare VAR_0x4008, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D523 return Route110_TrickHousePuzzle5_EventScript_26D304:: @ 826D304 - compare_var_to_value VAR_0x4008, 1 + compare VAR_0x4008, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D52E - compare_var_to_value VAR_0x4008, 2 + compare VAR_0x4008, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D539 - compare_var_to_value VAR_0x4008, 3 + compare VAR_0x4008, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D544 - compare_var_to_value VAR_0x4008, 4 + compare VAR_0x4008, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D54F - compare_var_to_value VAR_0x4008, 5 + compare VAR_0x4008, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D55A return Route110_TrickHousePuzzle5_EventScript_26D33C:: @ 826D33C - compare_var_to_value VAR_0x4008, 1 + compare VAR_0x4008, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D565 - compare_var_to_value VAR_0x4008, 2 + compare VAR_0x4008, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D570 - compare_var_to_value VAR_0x4008, 3 + compare VAR_0x4008, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D57B - compare_var_to_value VAR_0x4008, 4 + compare VAR_0x4008, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D586 - compare_var_to_value VAR_0x4008, 5 + compare VAR_0x4008, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D591 return Route110_TrickHousePuzzle5_EventScript_26D374:: @ 826D374 - compare_var_to_value VAR_0x4008, 1 + compare VAR_0x4008, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D59C - compare_var_to_value VAR_0x4008, 2 + compare VAR_0x4008, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D5A7 - compare_var_to_value VAR_0x4008, 3 + compare VAR_0x4008, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D5B2 - compare_var_to_value VAR_0x4008, 4 + compare VAR_0x4008, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D5BD - compare_var_to_value VAR_0x4008, 5 + compare VAR_0x4008, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D5C8 return Route110_TrickHousePuzzle5_EventScript_26D3AC:: @ 826D3AC - compare_var_to_value VAR_0x4008, 1 + compare VAR_0x4008, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D5D3 - compare_var_to_value VAR_0x4008, 2 + compare VAR_0x4008, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D5DE - compare_var_to_value VAR_0x4008, 3 + compare VAR_0x4008, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D5E9 - compare_var_to_value VAR_0x4008, 4 + compare VAR_0x4008, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D5F4 - compare_var_to_value VAR_0x4008, 5 + compare VAR_0x4008, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D5FF return diff --git a/data/scripts/maps/Route110_TrickHousePuzzle6.inc b/data/scripts/maps/Route110_TrickHousePuzzle6.inc index 075acc6c9..a043b2ec4 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle6.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle6.inc @@ -17,7 +17,7 @@ Route110_TrickHousePuzzle6_EventScript_26DDC0:: @ 826DDC0 Route110_TrickHousePuzzle6_EventScript_26DDC4:: @ 826DDC4 lockall - compare_var_to_value VAR_0x40B0, 0 + compare VAR_0x40B0, 0 goto_eq Route110_TrickHousePuzzle6_EventScript_26DDD6 goto Route110_TrickHousePuzzle6_EventScript_26A3DB end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle7.inc b/data/scripts/maps/Route110_TrickHousePuzzle7.inc index e7044748b..35e5e1522 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle7.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle7.inc @@ -73,7 +73,7 @@ Route110_TrickHousePuzzle7_EventScript_26E185:: @ 826E185 return Route110_TrickHousePuzzle7_MapScript1_26E198: @ 826E198 - compare_var_to_value VAR_0x40B6, 1 + compare VAR_0x40B6, 1 goto_eq Route110_TrickHousePuzzle7_EventScript_26E1B3 clearflag FLAG_0x0C2 clearflag FLAG_0x0C3 @@ -86,7 +86,7 @@ Route110_TrickHousePuzzle7_EventScript_26E1B3:: @ 826E1B3 end Route110_TrickHousePuzzle7_MapScript1_26E1B4: @ 826E1B4 - compare_var_to_value VAR_0x40B6, 1 + compare VAR_0x40B6, 1 call_if 1, Route110_TrickHousePuzzle7_EventScript_26E0AC end @@ -100,7 +100,7 @@ Route110_TrickHousePuzzle7_EventScript_26E1CA:: @ 826E1CA Route110_TrickHousePuzzle7_EventScript_26E1D0:: @ 826E1D0 lockall - compare_var_to_value VAR_0x40B1, 0 + compare VAR_0x40B1, 0 goto_eq Route110_TrickHousePuzzle7_EventScript_26E1E2 goto Route110_TrickHousePuzzle7_EventScript_26A3DB end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle8.inc b/data/scripts/maps/Route110_TrickHousePuzzle8.inc index bf0c4b978..369bc59a7 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle8.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle8.inc @@ -3,7 +3,7 @@ Route110_TrickHousePuzzle8_MapScripts:: @ 826E801 Route110_TrickHousePuzzle8_EventScript_26E802:: @ 826E802 lockall - compare_var_to_value VAR_0x40B2, 0 + compare VAR_0x40B2, 0 goto_eq Route110_TrickHousePuzzle8_EventScript_26E814 goto Route110_TrickHousePuzzle8_EventScript_26A3DB end diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index c51b07b6c..bd416f463 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -8,7 +8,7 @@ Route111_MapScripts:: @ 81F0CA7 Route111_MapScript1_1F0CBC: @ 81F0CBC checkflag FLAG_0x0E4 call_if 0, Route111_EventScript_1F0CD1 - compare_var_to_value VAR_0x40CB, 1 + compare VAR_0x40CB, 1 call_if 1, Route111_EventScript_1F0CE4 end @@ -43,9 +43,9 @@ Route111_MapScript1_1F0D87: @ 81F0D87 special sub_81BE79C checkflag FLAG_0x14E call_if 0, Route111_EventScript_1F0E3C - compare_var_to_value VAR_0x40CB, 1 + compare VAR_0x40CB, 1 call_if 1, Route111_EventScript_1F0DC2 - compare_var_to_value VAR_0x40CB, 2 + compare VAR_0x40CB, 2 call_if 1, Route111_EventScript_1F0E40 call Route111_EventScript_1F0DE6 call Route111_EventScript_28CCC7 @@ -55,9 +55,9 @@ Route111_MapScript1_1F0D87: @ 81F0D87 Route111_EventScript_1F0DC2:: @ 81F0DC2 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route111_EventScript_1F0DDA - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route111_EventScript_1F0DE0 return @@ -71,15 +71,15 @@ Route111_EventScript_1F0DE0:: @ 81F0DE0 Route111_EventScript_1F0DE6:: @ 81F0DE6 getplayerxy VAR_0x4000, VAR_0x4001 - compare_var_to_value VAR_0x4001, 34 + compare VAR_0x4001, 34 goto_if 0, Route111_EventScript_1F0E25 - compare_var_to_value VAR_0x4001, 107 + compare VAR_0x4001, 107 goto_if 2, Route111_EventScript_1F0E25 - compare_var_to_value VAR_0x4001, 72 + compare VAR_0x4001, 72 goto_if 2, Route111_EventScript_1F0E22 - compare_var_to_value VAR_0x4000, 2000 + compare VAR_0x4000, 2000 goto_if 2, Route111_EventScript_1F0E25 - compare_var_to_value VAR_0x4000, 8 + compare VAR_0x4000, 8 goto_if 0, Route111_EventScript_1F0E25 Route111_EventScript_1F0E22:: @ 81F0E22 @@ -167,7 +167,7 @@ Route111_EventScript_1F0EB9:: @ 81F0EB9 goto_eq Route111_EventScript_1F0EF4 msgbox Route111_Text_2A6EBD, 4 giveitem_std ITEM_RAZZ_BERRY - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route111_EventScript_272054 setflag FLAG_0x92C special sub_8138B10 @@ -206,7 +206,7 @@ Route111_EventScript_1F0F22:: @ 81F0F22 Route111_EventScript_1F0F2E:: @ 81F0F2E checkitem ITEM_GO_GOGGLES, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route111_EventScript_1F0F45 setvar VAR_0x4003, 1 releaseall @@ -215,13 +215,13 @@ Route111_EventScript_1F0F2E:: @ 81F0F2E Route111_EventScript_1F0F45:: @ 81F0F45 msgbox gUnknown_08272C5F, 4 closemessage - compare_var_to_value VAR_0x8004, 0 + compare VAR_0x8004, 0 call_if 1, Route111_EventScript_1F0F7C - compare_var_to_value VAR_0x8004, 1 + compare VAR_0x8004, 1 call_if 1, Route111_EventScript_1F0F87 - compare_var_to_value VAR_0x8004, 2 + compare VAR_0x8004, 2 call_if 1, Route111_EventScript_1F0F92 - compare_var_to_value VAR_0x8004, 3 + compare VAR_0x8004, 3 call_if 1, Route111_EventScript_1F0F9D releaseall end @@ -280,7 +280,7 @@ Route111_EventScript_1F0FC5:: @ 81F0FC5 faceplayer setflag FLAG_0x8A3 msgbox Route111_Text_1F1475, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route111_EventScript_1F0FE7 msgbox Route111_Text_1F14F5, 4 release @@ -415,9 +415,9 @@ Route111_EventScript_1F1192:: @ 81F1192 Route111_EventScript_1F119B:: @ 81F119B lock faceplayer - compare_var_to_value VAR_0x40CB, 3 + compare VAR_0x40CB, 3 goto_eq Route111_EventScript_1F11C6 - compare_var_to_value VAR_0x40CB, 2 + compare VAR_0x40CB, 2 goto_eq Route111_EventScript_1F11D0 checkflag FLAG_0x14E goto_eq Route111_EventScript_1F11DA @@ -473,8 +473,8 @@ Route111_EventScript_1F1249:: @ 81F1249 Route111_EventScript_1F1260:: @ 81F1260 trainerbattle 2, TRAINER_DUSTY_1, 0, Route111_Text_298B08, Route111_Text_298B53, Route111_EventScript_1F128C - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route111_EventScript_1F12AB msgbox Route111_Text_298B9A, 4 release @@ -513,8 +513,8 @@ Route111_EventScript_1F12F0:: @ 81F12F0 Route111_EventScript_1F1307:: @ 81F1307 trainerbattle 2, TRAINER_WILTON_1, 0, Route111_Text_298F79, Route111_Text_298FA9, Route111_EventScript_1F1333 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route111_EventScript_1F1352 msgbox Route111_Text_298FD4, 4 release @@ -538,8 +538,8 @@ Route111_EventScript_1F1352:: @ 81F1352 Route111_EventScript_1F1369:: @ 81F1369 trainerbattle 2, TRAINER_BROOKE_1, 0, Route111_Text_299143, Route111_Text_299193, Route111_EventScript_1F1395 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route111_EventScript_1F13B4 msgbox Route111_Text_2991C2, 4 release diff --git a/data/scripts/maps/Route111_OldLadysRestStop.inc b/data/scripts/maps/Route111_OldLadysRestStop.inc index 474d2a3f2..fbf150dff 100644 --- a/data/scripts/maps/Route111_OldLadysRestStop.inc +++ b/data/scripts/maps/Route111_OldLadysRestStop.inc @@ -10,9 +10,9 @@ Route111_OldLadysRestStop_EventScript_22A920:: @ 822A920 lock faceplayer msgbox Route111_OldLadysRestStop_Text_22A978, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route111_OldLadysRestStop_EventScript_22A941 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route111_OldLadysRestStop_EventScript_22A96E end @@ -21,9 +21,9 @@ Route111_OldLadysRestStop_EventScript_22A941:: @ 822A941 closemessage call Route111_OldLadysRestStop_EventScript_272083 msgbox Route111_OldLadysRestStop_Text_22AA16, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route111_OldLadysRestStop_EventScript_22A941 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route111_OldLadysRestStop_EventScript_22A96E end diff --git a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc b/data/scripts/maps/Route111_WinstrateFamilysHouse.inc index af556d0e0..847119d2e 100644 --- a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc +++ b/data/scripts/maps/Route111_WinstrateFamilysHouse.inc @@ -17,7 +17,7 @@ Route111_WinstrateFamilysHouse_EventScript_22A4A2:: @ 822A4A2 goto_eq Route111_WinstrateFamilysHouse_EventScript_22A4DA msgbox Route111_WinstrateFamilysHouse_Text_22A5F4, 4 giveitem_std ITEM_MACHO_BRACE - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route111_WinstrateFamilysHouse_EventScript_272054 setflag FLAG_0x115 goto Route111_WinstrateFamilysHouse_EventScript_22A52C diff --git a/data/scripts/maps/Route112.inc b/data/scripts/maps/Route112.inc index 066a7a347..88262fadb 100644 --- a/data/scripts/maps/Route112.inc +++ b/data/scripts/maps/Route112.inc @@ -67,8 +67,8 @@ Route112_EventScript_1F1E6A:: @ 81F1E6A Route112_EventScript_1F1E81:: @ 81F1E81 trainerbattle 2, TRAINER_TRENT_1, 0, Route112_Text_299815, Route112_Text_29987C, Route112_EventScript_1F1EAD - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route112_EventScript_1F1ECC msgbox Route112_Text_299896, 4 release diff --git a/data/scripts/maps/Route112_CableCarStation.inc b/data/scripts/maps/Route112_CableCarStation.inc index eac7dbc0a..4835dffa6 100644 --- a/data/scripts/maps/Route112_CableCarStation.inc +++ b/data/scripts/maps/Route112_CableCarStation.inc @@ -5,7 +5,7 @@ Route112_CableCarStation_MapScripts:: @ 822AABE Route112_CableCarStation_MapScript1_22AAC9: @ 822AAC9 setescapewarp ROUTE_112, 255, 28, 28 - compare_var_to_value VAR_0x40A3, 2 + compare VAR_0x40A3, 2 call_if 1, Route112_CableCarStation_EventScript_22AADD end @@ -33,9 +33,9 @@ Route112_CableCarStation_EventScript_22AB17:: @ 822AB17 lock faceplayer msgbox Route112_CableCarStation_Text_22AB85, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route112_CableCarStation_EventScript_22AB38 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route112_CableCarStation_EventScript_22AB67 end diff --git a/data/scripts/maps/Route113.inc b/data/scripts/maps/Route113.inc index 7ee63e492..c1ce29b72 100644 --- a/data/scripts/maps/Route113.inc +++ b/data/scripts/maps/Route113.inc @@ -14,9 +14,9 @@ Route113_MapScript1_1F2161: @ 81F2161 Route113_EventScript_1F216A:: @ 81F216A getplayerxy VAR_0x4000, VAR_0x4001 - compare_var_to_value VAR_0x4000, 19 + compare VAR_0x4000, 19 goto_if 0, Route113_EventScript_1F2189 - compare_var_to_value VAR_0x4000, 84 + compare VAR_0x4000, 84 goto_if 2, Route113_EventScript_1F2189 setweather 7 return @@ -60,8 +60,8 @@ Route113_EventScript_1F21D7:: @ 81F21D7 Route113_EventScript_1F21EE:: @ 81F21EE trainerbattle 2, TRAINER_MADELINE_1, 0, Route113_Text_299EA6, Route113_Text_299EF9, Route113_EventScript_1F221A - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route113_EventScript_1F2239 msgbox Route113_Text_299F15, 4 release @@ -85,8 +85,8 @@ Route113_EventScript_1F2239:: @ 81F2239 Route113_EventScript_1F2250:: @ 81F2250 trainerbattle 2, TRAINER_LAO_1, 0, Route113_Text_29A015, Route113_Text_29A04C, Route113_EventScript_1F227C - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route113_EventScript_1F229B msgbox Route113_Text_29A067, 4 release diff --git a/data/scripts/maps/Route113_GlassWorkshop.inc b/data/scripts/maps/Route113_GlassWorkshop.inc index aff641fa8..985a43805 100644 --- a/data/scripts/maps/Route113_GlassWorkshop.inc +++ b/data/scripts/maps/Route113_GlassWorkshop.inc @@ -4,7 +4,7 @@ Route113_GlassWorkshop_MapScripts:: @ 826ED03 Route113_GlassWorkshop_MapScript1_26ED09: @ 826ED09 setflag FLAG_0x8A4 - compare_var_to_value VAR_0x40BE, 1 + compare VAR_0x40BE, 1 call_if 1, Route113_GlassWorkshop_EventScript_26ED18 end @@ -15,11 +15,11 @@ Route113_GlassWorkshop_EventScript_26ED18:: @ 826ED18 Route113_GlassWorkshop_EventScript_26ED1E:: @ 826ED1E lock faceplayer - compare_var_to_value VAR_0x40BE, 10 + compare VAR_0x40BE, 10 goto_if 4, Route113_GlassWorkshop_EventScript_26F090 - compare_var_to_value VAR_0x40BE, 2 + compare VAR_0x40BE, 2 goto_eq Route113_GlassWorkshop_EventScript_26ED6E - compare_var_to_value VAR_0x40BE, 1 + compare VAR_0x40BE, 1 goto_eq Route113_GlassWorkshop_EventScript_26ED64 msgbox Route113_GlassWorkshop_Text_26F19D, 4 giveitem_std ITEM_SOOT_SACK @@ -35,10 +35,10 @@ Route113_GlassWorkshop_EventScript_26ED64:: @ 826ED64 Route113_GlassWorkshop_EventScript_26ED6E:: @ 826ED6E checkitem ITEM_SOOT_SACK, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route113_GlassWorkshop_EventScript_26ED9D msgbox Route113_GlassWorkshop_Text_26F312, 4 - compare_var_to_value VAR_ASH_GATHER_COUNT, 250 + compare VAR_ASH_GATHER_COUNT, 250 goto_if 0, Route113_GlassWorkshop_EventScript_26EFD6 message Route113_GlassWorkshop_Text_26F40A waitmessage @@ -71,10 +71,10 @@ Route113_GlassWorkshop_EventScript_26EE1E:: @ 826EE1E setvar VAR_0x8008, 39 bufferitemname 0, VAR_0x8008 setvar VAR_0x800A, 250 - compare_var_to_value VAR_ASH_GATHER_COUNT, 250 + compare VAR_ASH_GATHER_COUNT, 250 goto_if 0, Route113_GlassWorkshop_EventScript_26EFEE msgbox Route113_GlassWorkshop_Text_26F480, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route113_GlassWorkshop_EventScript_26F003 setvar VAR_0x40BE, 10 subvar VAR_ASH_GATHER_COUNT, 250 @@ -85,10 +85,10 @@ Route113_GlassWorkshop_EventScript_26EE5A:: @ 826EE5A setvar VAR_0x8008, 40 bufferitemname 0, VAR_0x8008 setvar VAR_0x800A, 500 - compare_var_to_value VAR_ASH_GATHER_COUNT, 500 + compare VAR_ASH_GATHER_COUNT, 500 goto_if 0, Route113_GlassWorkshop_EventScript_26EFEE msgbox Route113_GlassWorkshop_Text_26F480, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route113_GlassWorkshop_EventScript_26F003 setvar VAR_0x40BE, 11 subvar VAR_ASH_GATHER_COUNT, 500 @@ -99,10 +99,10 @@ Route113_GlassWorkshop_EventScript_26EE96:: @ 826EE96 setvar VAR_0x8008, 41 bufferitemname 0, VAR_0x8008 setvar VAR_0x800A, 500 - compare_var_to_value VAR_ASH_GATHER_COUNT, 500 + compare VAR_ASH_GATHER_COUNT, 500 goto_if 0, Route113_GlassWorkshop_EventScript_26EFEE msgbox Route113_GlassWorkshop_Text_26F480, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route113_GlassWorkshop_EventScript_26F003 setvar VAR_0x40BE, 12 subvar VAR_ASH_GATHER_COUNT, 500 @@ -113,10 +113,10 @@ Route113_GlassWorkshop_EventScript_26EED2:: @ 826EED2 setvar VAR_0x8008, 43 bufferitemname 0, VAR_0x8008 setvar VAR_0x800A, 1000 - compare_var_to_value VAR_ASH_GATHER_COUNT, 1000 + compare VAR_ASH_GATHER_COUNT, 1000 goto_if 0, Route113_GlassWorkshop_EventScript_26EFEE msgbox Route113_GlassWorkshop_Text_26F480, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route113_GlassWorkshop_EventScript_26F003 setvar VAR_0x40BE, 13 subvar VAR_ASH_GATHER_COUNT, 1000 @@ -127,10 +127,10 @@ Route113_GlassWorkshop_EventScript_26EF0E:: @ 826EF0E setvar VAR_0x8008, 42 bufferitemname 0, VAR_0x8008 setvar VAR_0x800A, 1000 - compare_var_to_value VAR_ASH_GATHER_COUNT, 1000 + compare VAR_ASH_GATHER_COUNT, 1000 goto_if 0, Route113_GlassWorkshop_EventScript_26EFEE msgbox Route113_GlassWorkshop_Text_26F480, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route113_GlassWorkshop_EventScript_26F003 setvar VAR_0x40BE, 14 subvar VAR_ASH_GATHER_COUNT, 1000 @@ -142,10 +142,10 @@ Route113_GlassWorkshop_EventScript_26EF4A:: @ 826EF4A setvar VAR_0x8008, 13 bufferdecorationname 0, VAR_0x8008 setvar VAR_0x800A, 6000 - compare_var_to_value VAR_ASH_GATHER_COUNT, 6000 + compare VAR_ASH_GATHER_COUNT, 6000 goto_if 0, Route113_GlassWorkshop_EventScript_26EFEE msgbox Route113_GlassWorkshop_Text_26F480, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route113_GlassWorkshop_EventScript_26F003 setvar VAR_0x40BE, 15 subvar VAR_ASH_GATHER_COUNT, 6000 @@ -157,10 +157,10 @@ Route113_GlassWorkshop_EventScript_26EF8B:: @ 826EF8B setvar VAR_0x8008, 6 bufferdecorationname 0, VAR_0x8008 setvar VAR_0x800A, 8000 - compare_var_to_value VAR_ASH_GATHER_COUNT, 8000 + compare VAR_ASH_GATHER_COUNT, 8000 goto_if 0, Route113_GlassWorkshop_EventScript_26EFEE msgbox Route113_GlassWorkshop_Text_26F480, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route113_GlassWorkshop_EventScript_26F003 setvar VAR_0x40BE, 16 subvar VAR_ASH_GATHER_COUNT, 8000 @@ -202,9 +202,9 @@ Route113_GlassWorkshop_EventScript_26F00F:: @ 826F00F delay 30 fadescreen 0 msgbox Route113_GlassWorkshop_Text_26F688, 4 - compare_var_to_value VAR_0x8009, 0 + compare VAR_0x8009, 0 call_if 1, Route113_GlassWorkshop_EventScript_26F047 - compare_var_to_value VAR_0x8009, 1 + compare VAR_0x8009, 1 call_if 1, Route113_GlassWorkshop_EventScript_26F05F setvar VAR_0x40BE, 2 release @@ -212,13 +212,13 @@ Route113_GlassWorkshop_EventScript_26F00F:: @ 826F00F Route113_GlassWorkshop_EventScript_26F047:: @ 826F047 giveitem_std VAR_0x8008 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route113_GlassWorkshop_EventScript_26F072 return Route113_GlassWorkshop_EventScript_26F05F:: @ 826F05F givedecoration_std VAR_0x8008 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route113_GlassWorkshop_EventScript_26F081 return @@ -296,9 +296,9 @@ Route113_GlassWorkshop_EventScript_26F15B:: @ 826F15B Route113_GlassWorkshop_EventScript_26F16F:: @ 826F16F msgbox Route113_GlassWorkshop_Text_26F688, 4 - compare_var_to_value VAR_0x8009, 0 + compare VAR_0x8009, 0 call_if 1, Route113_GlassWorkshop_EventScript_26F047 - compare_var_to_value VAR_0x8009, 1 + compare VAR_0x8009, 1 call_if 1, Route113_GlassWorkshop_EventScript_26F05F setvar VAR_0x40BE, 2 release diff --git a/data/scripts/maps/Route114.inc b/data/scripts/maps/Route114.inc index cca7be5af..6be6bea91 100644 --- a/data/scripts/maps/Route114.inc +++ b/data/scripts/maps/Route114.inc @@ -5,18 +5,18 @@ Route114_MapScripts:: @ 81F252F .byte 0 Route114_MapScript1_1F253F: @ 81F253F - compare_var_to_value VAR_0x4039, 1 + compare VAR_0x4039, 1 call_if 1, Route114_EventScript_273D13 - compare_var_to_value VAR_0x4037, 1 + compare VAR_0x4037, 1 call_if 1, Route114_EventScript_273D1B - compare_var_to_value VAR_0x4037, 2 + compare VAR_0x4037, 2 call_if 1, Route114_EventScript_273D1B end Route114_MapScript1_1F2561: @ 81F2561 - compare_var_to_value VAR_0x4037, 1 + compare VAR_0x4037, 1 call_if 1, Route114_EventScript_273913 - compare_var_to_value VAR_0x4037, 2 + compare VAR_0x4037, 2 call_if 1, Route114_EventScript_273926 end @@ -35,7 +35,7 @@ Route114_EventScript_1F2582:: @ 81F2582 addvar VAR_RESULT, 15 addvar VAR_RESULT, 133 giveitem_std VAR_RESULT - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route114_EventScript_272054 setflag FLAG_0x92B msgbox Route114_Text_2A7034, 4 @@ -54,7 +54,7 @@ Route114_EventScript_1F25D1:: @ 81F25D1 goto_eq Route114_EventScript_1F2608 msgbox Route114_Text_1F2809, 4 giveitem_std ITEM_TM05 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route114_EventScript_272054 setflag FLAG_0x0E7 msgbox Route114_Text_1F2872, 4 @@ -110,8 +110,8 @@ Route114_EventScript_1F2685:: @ 81F2685 Route114_EventScript_1F269C:: @ 81F269C trainerbattle 2, TRAINER_STEVE_1, 0, Route114_Text_29A943, Route114_Text_29A973, Route114_EventScript_1F26C8 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route114_EventScript_1F26E7 msgbox Route114_Text_29A981, 4 release @@ -135,8 +135,8 @@ Route114_EventScript_1F26E7:: @ 81F26E7 Route114_EventScript_1F26FE:: @ 81F26FE trainerbattle 2, TRAINER_BERNIE_1, 0, Route114_Text_29AADB, Route114_Text_29AB1A, Route114_EventScript_1F272A - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route114_EventScript_1F2749 msgbox Route114_Text_29AB36, 4 release diff --git a/data/scripts/maps/Route114_FossilManiacsHouse.inc b/data/scripts/maps/Route114_FossilManiacsHouse.inc index 74aed6cbf..44d4b9d9b 100644 --- a/data/scripts/maps/Route114_FossilManiacsHouse.inc +++ b/data/scripts/maps/Route114_FossilManiacsHouse.inc @@ -13,7 +13,7 @@ Route114_FossilManiacsHouse_EventScript_22AD3A:: @ 822AD3A goto_eq Route114_FossilManiacsHouse_EventScript_22AD69 msgbox Route114_FossilManiacsHouse_Text_22AD85, 4 giveitem_std ITEM_TM28 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route114_FossilManiacsHouse_EventScript_272054 setflag FLAG_0x105 release diff --git a/data/scripts/maps/Route114_FossilManiacsTunnel.inc b/data/scripts/maps/Route114_FossilManiacsTunnel.inc index 81ada5e55..bc5a6d977 100644 --- a/data/scripts/maps/Route114_FossilManiacsTunnel.inc +++ b/data/scripts/maps/Route114_FossilManiacsTunnel.inc @@ -39,10 +39,10 @@ Route114_FossilManiacsTunnel_EventScript_22AF87:: @ 822AF87 checkflag FLAG_0x10B goto_eq Route114_FossilManiacsTunnel_EventScript_22AFC6 checkitem ITEM_ROOT_FOSSIL, 1 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route114_FossilManiacsTunnel_EventScript_22AFBC checkitem ITEM_CLAW_FOSSIL, 1 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route114_FossilManiacsTunnel_EventScript_22AFBC msgbox Route114_FossilManiacsTunnel_Text_22AFD0, 4 release diff --git a/data/scripts/maps/Route114_LanettesHouse.inc b/data/scripts/maps/Route114_LanettesHouse.inc index b75f2091c..961535930 100644 --- a/data/scripts/maps/Route114_LanettesHouse.inc +++ b/data/scripts/maps/Route114_LanettesHouse.inc @@ -14,7 +14,7 @@ Route114_LanettesHouse_EventScript_22B2D2:: @ 822B2D2 setflag FLAG_SYS_PC_LANETTE msgbox Route114_LanettesHouse_Text_22B34E, 4 givedecoration_std 99 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route114_LanettesHouse_EventScript_272067 setflag FLAG_0x083 release @@ -28,7 +28,7 @@ Route114_LanettesHouse_EventScript_22B2FF:: @ 822B2FF Route114_LanettesHouse_EventScript_22B309:: @ 822B309 lockall msgbox Route114_LanettesHouse_Text_22B485, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route114_LanettesHouse_EventScript_22B327 msgbox Route114_LanettesHouse_Text_22B6E4, 4 releaseall @@ -36,7 +36,7 @@ Route114_LanettesHouse_EventScript_22B309:: @ 822B309 Route114_LanettesHouse_EventScript_22B327:: @ 822B327 msgbox Route114_LanettesHouse_Text_22B53C, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, Route114_LanettesHouse_EventScript_22B33C releaseall end diff --git a/data/scripts/maps/Route115.inc b/data/scripts/maps/Route115.inc index 8ea531f9d..69edd5830 100644 --- a/data/scripts/maps/Route115.inc +++ b/data/scripts/maps/Route115.inc @@ -5,18 +5,18 @@ Route115_MapScripts:: @ 81F2920 .byte 0 Route115_MapScript1_1F2930: @ 81F2930 - compare_var_to_value VAR_0x4037, 3 + compare VAR_0x4037, 3 call_if 1, Route115_EventScript_273939 - compare_var_to_value VAR_0x4037, 4 + compare VAR_0x4037, 4 call_if 1, Route115_EventScript_27394C end Route115_MapScript1_1F2947: @ 81F2947 - compare_var_to_value VAR_0x4039, 1 + compare VAR_0x4039, 1 call_if 1, Route115_EventScript_273D13 - compare_var_to_value VAR_0x4037, 3 + compare VAR_0x4037, 3 call_if 1, Route115_EventScript_273D1B - compare_var_to_value VAR_0x4037, 4 + compare VAR_0x4037, 4 call_if 1, Route115_EventScript_273D1B end @@ -38,8 +38,8 @@ Route115_EventScript_1F2985:: @ 81F2985 Route115_EventScript_1F298E:: @ 81F298E trainerbattle 2, TRAINER_TIMOTHY_1, 0, Route115_Text_29B1FA, Route115_Text_29B230, Route115_EventScript_1F29BA - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route115_EventScript_1F29D9 msgbox Route115_Text_29B258, 4 release @@ -68,8 +68,8 @@ Route115_EventScript_1F29F0:: @ 81F29F0 Route115_EventScript_1F2A07:: @ 81F2A07 trainerbattle 2, TRAINER_NOB_1, 0, Route115_Text_29B449, Route115_Text_29B480, Route115_EventScript_1F2A33 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route115_EventScript_1F2A52 msgbox Route115_Text_29B49D, 4 release @@ -93,8 +93,8 @@ Route115_EventScript_1F2A52:: @ 81F2A52 Route115_EventScript_1F2A69:: @ 81F2A69 trainerbattle 2, TRAINER_CYNDY_1, 0, Route115_Text_29B5EF, Route115_Text_29B62D, Route115_EventScript_1F2A95 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route115_EventScript_1F2AB4 msgbox Route115_Text_29B647, 4 release diff --git a/data/scripts/maps/Route116.inc b/data/scripts/maps/Route116.inc index 359f21375..00bc1ff6c 100644 --- a/data/scripts/maps/Route116.inc +++ b/data/scripts/maps/Route116.inc @@ -7,11 +7,11 @@ Route116_MapScripts:: @ 81F2C0C Route116_MapScript1_1F2C1C: @ 81F2C1C checkflag FLAG_0x08F call_if 1, Route116_EventScript_1F2C47 - compare_var_to_value VAR_0x4039, 1 + compare VAR_0x4039, 1 call_if 1, Route116_EventScript_273D13 - compare_var_to_value VAR_0x4037, 5 + compare VAR_0x4037, 5 call_if 1, Route116_EventScript_273D1B - compare_var_to_value VAR_0x4037, 6 + compare VAR_0x4037, 6 call_if 1, Route116_EventScript_273D1B end @@ -20,9 +20,9 @@ Route116_EventScript_1F2C47:: @ 81F2C47 return Route116_MapScript1_1F2C4F: @ 81F2C4F - compare_var_to_value VAR_0x4037, 5 + compare VAR_0x4037, 5 call_if 1, Route116_EventScript_27395F - compare_var_to_value VAR_0x4037, 6 + compare VAR_0x4037, 6 call_if 1, Route116_EventScript_273972 end @@ -63,17 +63,17 @@ Route116_EventScript_1F2CA2:: @ 81F2CA2 Route116_EventScript_1F2CBB:: @ 81F2CBB setflag FLAG_0x11F giveitem_std ITEM_REPEAT_BALL - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route116_EventScript_1F2D39 msgbox Route116_Text_1F3521, 4 closemessage - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if 1, Route116_EventScript_1F2D15 - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 call_if 1, Route116_EventScript_1F2D15 - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if 1, Route116_EventScript_1F2D15 - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if 1, Route116_EventScript_1F2D20 removeobject VAR_LAST_TALKED clearflag FLAG_0x3B5 @@ -167,10 +167,10 @@ Route116_EventScript_1F2DB6:: @ 81F2DB6 lock faceplayer checkitem ITEM_BLACK_GLASSES, 1 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route116_EventScript_1F2DF1 specialvar VAR_RESULT, sub_8139634 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route116_EventScript_1F2DE2 msgbox Route116_Text_1F3657, 4 release @@ -186,7 +186,7 @@ Route116_EventScript_1F2DF1:: @ 81F2DF1 msgbox Route116_Text_1F3657, 4 msgbox Route116_Text_1F3688, 4 specialvar VAR_RESULT, sub_8139634 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route116_EventScript_1F2E1B msgbox Route116_Text_1F375E, 4 release @@ -200,13 +200,13 @@ Route116_EventScript_1F2E1B:: @ 81F2E1B Route116_EventScript_1F2E2A:: @ 81F2E2A delay 20 - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if 1, Route116_EventScript_1F2E5E - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 call_if 1, Route116_EventScript_1F2E5E - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if 1, Route116_EventScript_1F2E5E - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if 1, Route116_EventScript_1F2E69 removeobject VAR_LAST_TALKED release @@ -259,19 +259,19 @@ Route116_EventScript_1F2EA0:: @ 81F2EA0 Route116_EventScript_1F2EB7:: @ 81F2EB7 trainerbattle 2, TRAINER_JERRY_1, 0, Route116_Text_29BD0C, Route116_Text_29BD66, Route116_EventScript_1F2EF8 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route116_EventScript_1F2F4E setvar VAR_0x8004, 273 specialvar VAR_RESULT, sub_813B4E0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route116_EventScript_1F2F22 msgbox Route116_Text_29BD92, 4 release end Route116_EventScript_1F2EF8:: @ 81F2EF8 - checkflag FLAG_0x12F + checkflag FLAG_HAS_MATCH_CALL goto_eq Route116_EventScript_1F2F03 release end @@ -288,7 +288,7 @@ Route116_EventScript_1F2F03:: @ 81F2F03 end Route116_EventScript_1F2F22:: @ 81F2F22 - checkflag FLAG_0x12F + checkflag FLAG_HAS_MATCH_CALL goto_eq Route116_EventScript_1F2F35 msgbox Route116_Text_29BD92, 4 release @@ -320,19 +320,19 @@ Route116_EventScript_1F2F7C:: @ 81F2F7C Route116_EventScript_1F2F93:: @ 81F2F93 trainerbattle 2, TRAINER_KAREN_1, 0, Route116_Text_29BFC5, Route116_Text_29BFFA, Route116_EventScript_1F2FD4 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route116_EventScript_1F302A setvar VAR_0x8004, 280 specialvar VAR_RESULT, sub_813B4E0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route116_EventScript_1F2FFE msgbox Route116_Text_29C010, 4 release end Route116_EventScript_1F2FD4:: @ 81F2FD4 - checkflag FLAG_0x12F + checkflag FLAG_HAS_MATCH_CALL goto_eq Route116_EventScript_1F2FDF release end @@ -349,7 +349,7 @@ Route116_EventScript_1F2FDF:: @ 81F2FDF end Route116_EventScript_1F2FFE:: @ 81F2FFE - checkflag FLAG_0x12F + checkflag FLAG_HAS_MATCH_CALL goto_eq Route116_EventScript_1F3011 msgbox Route116_Text_29C010, 4 release diff --git a/data/scripts/maps/Route117.inc b/data/scripts/maps/Route117.inc index 01463516b..20240dc82 100644 --- a/data/scripts/maps/Route117.inc +++ b/data/scripts/maps/Route117.inc @@ -40,8 +40,8 @@ Route117_EventScript_1F39C7:: @ 81F39C7 Route117_EventScript_1F39D0:: @ 81F39D0 trainerbattle 2, TRAINER_ISAAC_1, 0, Route117_Text_29C43F, Route117_Text_29C47A, Route117_EventScript_1F39FC - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route117_EventScript_1F3A1B msgbox Route117_Text_29C498, 4 release @@ -65,8 +65,8 @@ Route117_EventScript_1F3A1B:: @ 81F3A1B Route117_EventScript_1F3A32:: @ 81F3A32 trainerbattle 2, TRAINER_LYDIA_1, 0, Route117_Text_29C612, Route117_Text_29C659, Route117_EventScript_1F3A5E - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route117_EventScript_1F3A7D msgbox Route117_Text_29C679, 4 release @@ -90,8 +90,8 @@ Route117_EventScript_1F3A7D:: @ 81F3A7D Route117_EventScript_1F3A94:: @ 81F3A94 trainerbattle 2, TRAINER_DYLAN_1, 0, Route117_Text_29C7A5, Route117_Text_29C7EB, Route117_EventScript_1F3AC0 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route117_EventScript_1F3ADF msgbox Route117_Text_29C800, 4 release @@ -115,8 +115,8 @@ Route117_EventScript_1F3ADF:: @ 81F3ADF Route117_EventScript_1F3AF6:: @ 81F3AF6 trainerbattle 2, TRAINER_MARIA_1, 0, Route117_Text_29C955, Route117_Text_29C9A6, Route117_EventScript_1F3B22 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route117_EventScript_1F3B41 msgbox Route117_Text_29C9D0, 4 release @@ -145,8 +145,8 @@ Route117_EventScript_1F3B58:: @ 81F3B58 Route117_EventScript_1F3B6F:: @ 81F3B6F trainerbattle 6, TRAINER_ANNA_AND_MEG_1, 0, Route117_Text_29CC4A, Route117_Text_29CC8E, Route117_Text_29CD61, Route117_EventScript_1F3B9F - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route117_EventScript_1F3BB8 msgbox Route117_Text_29CCCB, 4 release @@ -168,8 +168,8 @@ Route117_EventScript_1F3BB8:: @ 81F3BB8 Route117_EventScript_1F3BD3:: @ 81F3BD3 trainerbattle 6, TRAINER_ANNA_AND_MEG_1, 0, Route117_Text_29CD9D, Route117_Text_29CDE9, Route117_Text_29CE52, Route117_EventScript_1F3C03 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route117_EventScript_1F3C1C msgbox Route117_Text_29CE17, 4 release diff --git a/data/scripts/maps/Route118.inc b/data/scripts/maps/Route118.inc index 42c3d6d57..4894e8187 100644 --- a/data/scripts/maps/Route118.inc +++ b/data/scripts/maps/Route118.inc @@ -6,18 +6,18 @@ Route118_MapScripts:: @ 81F3DBC Route118_MapScript1_1F3DCC: @ 81F3DCC call Route118_EventScript_28CCC7 - compare_var_to_value VAR_0x4039, 1 + compare VAR_0x4039, 1 call_if 1, Route118_EventScript_273D13 - compare_var_to_value VAR_0x4037, 7 + compare VAR_0x4037, 7 call_if 1, Route118_EventScript_273D1B - compare_var_to_value VAR_0x4037, 8 + compare VAR_0x4037, 8 call_if 1, Route118_EventScript_273D1B end Route118_MapScript1_1F3DF3: @ 81F3DF3 - compare_var_to_value VAR_0x4037, 7 + compare VAR_0x4037, 7 call_if 1, Route118_EventScript_273985 - compare_var_to_value VAR_0x4037, 8 + compare VAR_0x4037, 8 call_if 1, Route118_EventScript_273998 end @@ -31,9 +31,9 @@ Route118_EventScript_1F3E14:: @ 81F3E14 checkflag FLAG_0x0E3 goto_eq Route118_EventScript_1F3E69 msgbox Route118_Text_1F427B, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route118_EventScript_1F3E3E - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route118_EventScript_1F3E5F end @@ -102,11 +102,11 @@ Route118_EventScript_1F3EE4:: @ 81F3EE4 delay 30 msgbox Route118_Text_1F40BE, 4 closemessage - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 call_if 1, Route118_EventScript_1F3F28 - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if 1, Route118_EventScript_1F3F3A - compare_var_to_value VAR_0x8008, 2 + compare VAR_0x8008, 2 call_if 1, Route118_EventScript_1F3F4C setvar VAR_0x4071, 1 removeobject 19 @@ -188,8 +188,8 @@ Route118_Movement_1F3F7E: @ 81F3F7E Route118_EventScript_1F3F87:: @ 81F3F87 trainerbattle 2, TRAINER_ROSE_1, 0, Route118_Text_29D290, Route118_Text_29D2D8, Route118_EventScript_1F3FB3 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route118_EventScript_1F3FD2 msgbox Route118_Text_29D2FA, 4 release @@ -223,8 +223,8 @@ Route118_EventScript_1F4000:: @ 81F4000 Route118_EventScript_1F4017:: @ 81F4017 trainerbattle 2, TRAINER_DALTON_1, 0, Route118_Text_29D6AF, Route118_Text_29D6CD, Route118_EventScript_1F4043 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route118_EventScript_1F4062 msgbox Route118_Text_29D6D8, 4 release diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc index 4436005ba..41c74d4a7 100644 --- a/data/scripts/maps/Route119.inc +++ b/data/scripts/maps/Route119.inc @@ -10,7 +10,7 @@ Route119_MapScript1_1F442F: @ 81F442F Route119_EventScript_1F4439:: @ 81F4439 specialvar VAR_RESULT, sub_8138B80 - compare_var_to_value VAR_RESULT, 7 + compare VAR_RESULT, 7 goto_if 5, Route119_EventScript_27374E removeobject VAR_LAST_TALKED return @@ -18,7 +18,7 @@ Route119_EventScript_1F4439:: @ 81F4439 Route119_MapScript1_1F444D: @ 81F444D call Route119_EventScript_271ED7 call Route119_EventScript_271EFB - compare_var_to_value VAR_0x40B3, 1 + compare VAR_0x40B3, 1 call_if 1, Route119_EventScript_1F4466 special sub_8139648 end @@ -43,29 +43,29 @@ Route119_EventScript_1F4488:: @ 81F4488 lockall addobject 25 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, Route119_EventScript_1F4501 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, Route119_EventScript_1F4506 delay 65 - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if 1, Route119_EventScript_1F46C6 - compare_var_to_value VAR_0x4001, 2 + compare VAR_0x4001, 2 call_if 1, Route119_EventScript_1F46D1 applymovement 255, Route119_Movement_2725AA waitmovement 0 delay 30 - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if 1, Route119_EventScript_1F4700 - compare_var_to_value VAR_0x4001, 2 + compare VAR_0x4001, 2 call_if 1, Route119_EventScript_1F470F removeobject 25 addobject 16 delay 30 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route119_EventScript_1F450B - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route119_EventScript_1F4585 releaseall end @@ -145,25 +145,25 @@ Route119_EventScript_1F45FF:: @ 81F45FF Route119_EventScript_1F460F:: @ 81F460F closemessage - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if 1, Route119_EventScript_1F4700 - compare_var_to_value VAR_0x4001, 2 + compare VAR_0x4001, 2 call_if 1, Route119_EventScript_1F470F removeobject 16 addobject 25 delay 30 - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if 1, Route119_EventScript_1F46DC - compare_var_to_value VAR_0x4001, 2 + compare VAR_0x4001, 2 call_if 1, Route119_EventScript_1F46EE removeobject 25 setvar VAR_0x4072, 1 savebgm SE_STOP fadedefaultbgm delay 60 - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if 1, Route119_EventScript_1F46A0 - compare_var_to_value VAR_0x4001, 2 + compare VAR_0x4001, 2 call_if 1, Route119_EventScript_1F46A8 addobject 43 applymovement 43, Route119_Movement_1F4752 @@ -171,9 +171,9 @@ Route119_EventScript_1F460F:: @ 81F460F addvar VAR_0x40D1, 1 msgbox Route119_Text_1F4E60, 4 closemessage - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if 1, Route119_EventScript_1F46B0 - compare_var_to_value VAR_0x4001, 2 + compare VAR_0x4001, 2 call_if 1, Route119_EventScript_1F46BB removeobject 43 releaseall @@ -368,8 +368,8 @@ Route119_EventScript_1F47F9:: @ 81F47F9 Route119_EventScript_1F4810:: @ 81F4810 trainerbattle 2, TRAINER_JACKSON_1, 0, Route119_Text_29DC4C, Route119_Text_29DC9F, Route119_EventScript_1F483C - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route119_EventScript_1F485B msgbox Route119_Text_29DCC6, 4 release @@ -393,8 +393,8 @@ Route119_EventScript_1F485B:: @ 81F485B Route119_EventScript_1F4872:: @ 81F4872 trainerbattle 2, TRAINER_CATHERINE_1, 0, Route119_Text_29DE0F, Route119_Text_29DE5D, Route119_EventScript_1F489E - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route119_EventScript_1F48BD msgbox Route119_Text_29DE88, 4 release diff --git a/data/scripts/maps/Route119_WeatherInstitute_1F.inc b/data/scripts/maps/Route119_WeatherInstitute_1F.inc index 390783a79..eb7032672 100644 --- a/data/scripts/maps/Route119_WeatherInstitute_1F.inc +++ b/data/scripts/maps/Route119_WeatherInstitute_1F.inc @@ -3,7 +3,7 @@ Route119_WeatherInstitute_1F_MapScripts:: @ 826FA86 .byte 0 Route119_WeatherInstitute_1F_MapScript1_26FA8C: @ 826FA8C - compare_var_to_value VAR_0x40B3, 0 + compare VAR_0x40B3, 0 call_if 1, Route119_WeatherInstitute_1F_EventScript_26FA98 end @@ -16,7 +16,7 @@ Route119_WeatherInstitute_1F_EventScript_26FAA4:: @ 826FAA4 lock faceplayer special sub_8138B10 - compare_var_to_value VAR_0x40B3, 0 + compare VAR_0x40B3, 0 goto_eq Route119_WeatherInstitute_1F_EventScript_26FABE msgbox Route119_WeatherInstitute_1F_Text_26FCE5, 4 release @@ -37,7 +37,7 @@ Route119_WeatherInstitute_1F_EventScript_26FAC8:: @ 826FAC8 call_if 1, Route119_WeatherInstitute_1F_EventScript_26FAFF checkflag FLAG_0x1BF call_if 1, Route119_WeatherInstitute_1F_EventScript_26FAFF - compare_var_to_value VAR_0x8004, 2 + compare VAR_0x8004, 2 goto_eq Route119_WeatherInstitute_1F_EventScript_26FB05 msgbox Route119_WeatherInstitute_1F_Text_26FDE8, 4 release diff --git a/data/scripts/maps/Route119_WeatherInstitute_2F.inc b/data/scripts/maps/Route119_WeatherInstitute_2F.inc index 29d106dfe..7d7281e4d 100644 --- a/data/scripts/maps/Route119_WeatherInstitute_2F.inc +++ b/data/scripts/maps/Route119_WeatherInstitute_2F.inc @@ -3,9 +3,9 @@ Route119_WeatherInstitute_2F_MapScripts:: @ 826FF1E .byte 0 Route119_WeatherInstitute_2F_MapScript1_26FF24: @ 826FF24 - compare_var_to_value VAR_0x40B3, 0 + compare VAR_0x40B3, 0 call_if 1, Route119_WeatherInstitute_2F_EventScript_26FF44 - compare_var_to_value VAR_0x40B3, 1 + compare VAR_0x40B3, 1 call_if 1, Route119_WeatherInstitute_2F_EventScript_26FF50 checkflag FLAG_SYS_GAME_CLEAR call_if 1, Route119_WeatherInstitute_2F_EventScript_26FF5C @@ -86,9 +86,9 @@ Route119_WeatherInstitute_2F_EventScript_27004D:: @ 827004D msgbox Route119_WeatherInstitute_2F_Text_270650, 4 setvar VAR_0x4001, 385 givemon SPECIES_CASTFORM, 25, ITEM_MYSTIC_WATER, 0x0, 0x0, 0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route119_WeatherInstitute_2F_EventScript_270085 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route119_WeatherInstitute_2F_EventScript_2700AD goto Route119_WeatherInstitute_2F_EventScript_273811 end @@ -96,7 +96,7 @@ Route119_WeatherInstitute_2F_EventScript_27004D:: @ 827004D Route119_WeatherInstitute_2F_EventScript_270085:: @ 8270085 call Route119_WeatherInstitute_2F_EventScript_2700DB msgbox gUnknown_08273374, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route119_WeatherInstitute_2F_EventScript_2700EA call Route119_WeatherInstitute_2F_EventScript_27378B call Route119_WeatherInstitute_2F_EventScript_2723DD @@ -106,7 +106,7 @@ Route119_WeatherInstitute_2F_EventScript_270085:: @ 8270085 Route119_WeatherInstitute_2F_EventScript_2700AD:: @ 82700AD call Route119_WeatherInstitute_2F_EventScript_2700DB msgbox gUnknown_08273374, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route119_WeatherInstitute_2F_EventScript_2700D0 call Route119_WeatherInstitute_2F_EventScript_273797 goto Route119_WeatherInstitute_2F_EventScript_2700D0 @@ -144,12 +144,12 @@ Route119_WeatherInstitute_2F_EventScript_27010A:: @ 827010A call_if 1, Route119_WeatherInstitute_2F_EventScript_270160 checkflag FLAG_0x1BF call_if 1, Route119_WeatherInstitute_2F_EventScript_270160 - compare_var_to_value VAR_0x8004, 2 + compare VAR_0x8004, 2 goto_eq Route119_WeatherInstitute_2F_EventScript_270166 checkflag FLAG_0x002 call_if 0, Route119_WeatherInstitute_2F_EventScript_270159 specialvar VAR_RESULT, sub_813B374 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route119_WeatherInstitute_2F_EventScript_27014F msgbox Route119_WeatherInstitute_2F_Text_2707F1, 4 release diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc index aaffe0f12..c1cc0c230 100644 --- a/data/scripts/maps/Route120.inc +++ b/data/scripts/maps/Route120.inc @@ -10,23 +10,23 @@ Route120_MapScript1_1F53FC: @ 81F53FC end Route120_EventScript_1F5406:: @ 81F5406 - compare_var_to_value VAR_0x8009, 0 + compare VAR_0x8009, 0 call_if 1, Route120_EventScript_1F5449 - compare_var_to_value VAR_0x8009, 1 + compare VAR_0x8009, 1 call_if 1, Route120_EventScript_1F5460 - compare_var_to_value VAR_0x8009, 2 + compare VAR_0x8009, 2 call_if 1, Route120_EventScript_1F5460 - compare_var_to_value VAR_0x8009, 3 + compare VAR_0x8009, 3 call_if 1, Route120_EventScript_1F5460 - compare_var_to_value VAR_0x8009, 4 + compare VAR_0x8009, 4 call_if 1, Route120_EventScript_1F5460 - compare_var_to_value VAR_0x8009, 5 + compare VAR_0x8009, 5 call_if 1, Route120_EventScript_1F5460 return Route120_EventScript_1F5449:: @ 81F5449 specialvar VAR_RESULT, sub_8138B80 - compare_var_to_value VAR_RESULT, 7 + compare VAR_RESULT, 7 goto_if 5, Route120_EventScript_27374E removeobject 30 removeobject 36 @@ -34,7 +34,7 @@ Route120_EventScript_1F5449:: @ 81F5449 Route120_EventScript_1F5460:: @ 81F5460 specialvar VAR_RESULT, sub_8138B80 - compare_var_to_value VAR_RESULT, 7 + compare VAR_RESULT, 7 goto_if 5, Route120_EventScript_27374E removeobject VAR_LAST_TALKED return @@ -71,11 +71,11 @@ Route120_MapScript1_1F54CD: @ 81F54CD Route120_EventScript_1F54D8:: @ 81F54D8 getplayerxy VAR_0x4000, VAR_0x4001 - compare_var_to_value VAR_0x4001, 14 + compare VAR_0x4001, 14 goto_if 3, Route120_EventScript_1F5503 - compare_var_to_value VAR_0x4001, 60 + compare VAR_0x4001, 60 goto_if 3, Route120_EventScript_1F5507 - compare_var_to_value VAR_0x4001, 61 + compare VAR_0x4001, 61 goto_if 4, Route120_EventScript_1F54FF return @@ -88,9 +88,9 @@ Route120_EventScript_1F5503:: @ 81F5503 return Route120_EventScript_1F5507:: @ 81F5507 - compare_var_to_value VAR_0x4000, 7 + compare VAR_0x4000, 7 goto_if 3, Route120_EventScript_1F5523 - compare_var_to_value VAR_0x4000, 19 + compare VAR_0x4000, 19 goto_if 3, Route120_EventScript_1F5503 goto Route120_EventScript_1F5523 end @@ -106,9 +106,9 @@ Route120_EventScript_1F5527:: @ 81F5527 checkflag FLAG_0x92E goto_eq Route120_EventScript_1F5625 msgbox Route120_Text_2A70C7, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, Route120_EventScript_1F562F - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, Route120_EventScript_1F5638 specialvar VAR_RESULT, sub_8138AF0 switch VAR_RESULT @@ -151,7 +151,7 @@ Route120_EventScript_1F55F6:: @ 81F55F6 Route120_EventScript_1F5601:: @ 81F5601 giveitem_std VAR_0x8004 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route120_EventScript_272054 setflag FLAG_0x92E msgbox Route120_Text_2A71D5, 4 @@ -177,7 +177,7 @@ Route120_EventScript_1F5641:: @ 81F5641 checkflag FLAG_0x122 goto_eq Route120_EventScript_1F5672 msgbox Route120_Text_1F5998, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route120_EventScript_1F5665 goto Route120_EventScript_1F568B end @@ -190,7 +190,7 @@ Route120_EventScript_1F5665:: @ 81F5665 Route120_EventScript_1F5672:: @ 81F5672 msgbox Route120_Text_1F5ADE, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route120_EventScript_1F5665 goto Route120_EventScript_1F568B end @@ -198,9 +198,9 @@ Route120_EventScript_1F5672:: @ 81F5672 Route120_EventScript_1F568B:: @ 81F568B msgbox Route120_Text_1F5B0F, 4 closemessage - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if 1, Route120_EventScript_1F57A3 - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if 1, Route120_EventScript_1F57AE applymovement 31, Route120_Movement_2725A4 waitmovement 0 @@ -221,11 +221,11 @@ Route120_EventScript_1F568B:: @ 81F568B dowildbattle clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, sub_8138B80 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route120_EventScript_1F571C - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 goto_eq Route120_EventScript_1F571C - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_eq Route120_EventScript_1F571C goto Route120_EventScript_1F572C end @@ -297,8 +297,8 @@ Route120_EventScript_1F57D7:: @ 81F57D7 Route120_EventScript_1F57EE:: @ 81F57EE trainerbattle 2, TRAINER_ROBERT_1, 0, Route120_Text_29E6E3, Route120_Text_29E70A, Route120_EventScript_1F581A - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route120_EventScript_1F5839 msgbox Route120_Text_29E726, 4 release @@ -332,8 +332,8 @@ Route120_EventScript_1F5867:: @ 81F5867 Route120_EventScript_1F587E:: @ 81F587E trainerbattle 2, TRAINER_JEFFREY_1, 0, Route120_Text_29E9D7, Route120_Text_29E9FF, Route120_EventScript_1F58AA - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route120_EventScript_1F58C9 msgbox Route120_Text_29EA08, 4 release diff --git a/data/scripts/maps/Route121.inc b/data/scripts/maps/Route121.inc index 0d1f8863e..74746e16f 100644 --- a/data/scripts/maps/Route121.inc +++ b/data/scripts/maps/Route121.inc @@ -72,8 +72,8 @@ Route121_EventScript_1F5E74:: @ 81F5E74 Route121_EventScript_1F5E8B:: @ 81F5E8B trainerbattle 2, TRAINER_WALTER_1, 0, Route121_Text_29F199, Route121_Text_29F20D, Route121_EventScript_1F5EB7 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route121_EventScript_1F5ED6 msgbox Route121_Text_29F21E, 4 release @@ -112,8 +112,8 @@ Route121_EventScript_1F5F1F:: @ 81F5F1F Route121_EventScript_1F5F3A:: @ 81F5F3A trainerbattle 2, TRAINER_JESSICA_1, 0, Route121_Text_29F612, Route121_Text_29F641, Route121_EventScript_1F5F66 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route121_EventScript_1F5F85 msgbox Route121_Text_29F66F, 4 release @@ -157,8 +157,8 @@ Route121_EventScript_1F5FE1:: @ 81F5FE1 Route121_EventScript_1F5FF8:: @ 81F5FF8 trainerbattle 2, TRAINER_CRISTIN_1, 0, Route121_Text_29F770, Route121_Text_29F7C1, Route121_EventScript_1F6024 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route121_EventScript_1F6043 msgbox Route121_Text_29F7D4, 4 release diff --git a/data/scripts/maps/Route121_SafariZoneEntrance.inc b/data/scripts/maps/Route121_SafariZoneEntrance.inc index 3d2ac359d..bfacaaee8 100644 --- a/data/scripts/maps/Route121_SafariZoneEntrance.inc +++ b/data/scripts/maps/Route121_SafariZoneEntrance.inc @@ -33,7 +33,7 @@ Route121_SafariZoneEntrance_EventScript_22BBEF:: @ 822BBEF lock faceplayer msgbox Route121_SafariZoneEntrance_Text_2A4E46, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route121_SafariZoneEntrance_EventScript_22BC0E msgbox Route121_SafariZoneEntrance_Text_2A4E7E, 4 release @@ -50,7 +50,7 @@ Route121_SafariZoneEntrance_EventScript_22BC18:: @ 822BC18 waitmovement 0 showmoneybox 0, 0, 0 msgbox Route121_SafariZoneEntrance_Text_2A4F74, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route121_SafariZoneEntrance_EventScript_22BC48 msgbox Route121_SafariZoneEntrance_Text_2A4FD7, 4 goto Route121_SafariZoneEntrance_EventScript_22BD06 @@ -58,11 +58,11 @@ Route121_SafariZoneEntrance_EventScript_22BC18:: @ 822BC18 Route121_SafariZoneEntrance_EventScript_22BC48:: @ 822BC48 checkitem ITEM_POKEBLOCK_CASE, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route121_SafariZoneEntrance_EventScript_22BCEA call Route121_SafariZoneEntrance_EventScript_22BCBF checkmoney 0x1f4, 0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route121_SafariZoneEntrance_EventScript_22BCF8 playse SE_REGI msgbox Route121_SafariZoneEntrance_Text_2A501B, 4 @@ -89,10 +89,10 @@ Route121_SafariZoneEntrance_EventScript_22BC48:: @ 822BC48 Route121_SafariZoneEntrance_EventScript_22BCBF:: @ 822BCBF getpartysize - compare_var_to_value VAR_RESULT, 6 + compare VAR_RESULT, 6 goto_if 5, Route121_SafariZoneEntrance_EventScript_22BCE9 specialvar VAR_RESULT, sub_8139530 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route121_SafariZoneEntrance_EventScript_22BCE9 msgbox Route121_SafariZoneEntrance_Text_2A50E5, 4 goto Route121_SafariZoneEntrance_EventScript_22BD06 diff --git a/data/scripts/maps/Route123.inc b/data/scripts/maps/Route123.inc index 8eb397fd4..feec8adeb 100644 --- a/data/scripts/maps/Route123.inc +++ b/data/scripts/maps/Route123.inc @@ -13,11 +13,11 @@ Route123_EventScript_1F6151:: @ 81F6151 goto_eq Route123_EventScript_1F61A0 msgbox Route123_Text_1F641E, 4 special sub_81390E0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route123_EventScript_1F619E msgbox Route123_Text_1F645D, 4 giveitem_std ITEM_TM19 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route123_EventScript_272054 setflag FLAG_0x0E8 msgbox Route123_Text_1F64CF, 4 @@ -62,8 +62,8 @@ Route123_EventScript_1F61F3:: @ 81F61F3 Route123_EventScript_1F620A:: @ 81F620A trainerbattle 2, TRAINER_CAMERON_1, 0, Route123_Text_29FDBA, Route123_Text_29FE1E, Route123_EventScript_1F6236 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route123_EventScript_1F6255 msgbox Route123_Text_29FE2A, 4 release @@ -87,8 +87,8 @@ Route123_EventScript_1F6255:: @ 81F6255 Route123_EventScript_1F626C:: @ 81F626C trainerbattle 2, TRAINER_JACKI_1, 0, Route123_Text_29FF61, Route123_Text_29FFD8, Route123_EventScript_1F6298 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route123_EventScript_1F62B7 msgbox Route123_Text_29FFE5, 4 release @@ -162,8 +162,8 @@ Route123_EventScript_1F63A5:: @ 81F63A5 Route123_EventScript_1F63BC:: @ 81F63BC trainerbattle 2, TRAINER_FERNANDO_1, 0, Route123_Text_2A0323, Route123_Text_2A035C, Route123_EventScript_1F63E8 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route123_EventScript_1F6407 msgbox Route123_Text_2A0389, 4 release diff --git a/data/scripts/maps/Route123_BerryMastersHouse.inc b/data/scripts/maps/Route123_BerryMastersHouse.inc index eb5f9a10c..245b828a9 100644 --- a/data/scripts/maps/Route123_BerryMastersHouse.inc +++ b/data/scripts/maps/Route123_BerryMastersHouse.inc @@ -17,7 +17,7 @@ Route123_BerryMastersHouse_EventScript_26F845:: @ 826F845 addvar VAR_RESULT, 20 addvar VAR_RESULT, 133 giveitem_std VAR_RESULT - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route123_BerryMastersHouse_EventScript_272054 setflag FLAG_0x92D msgbox Route123_BerryMastersHouse_Text_2A7428, 4 @@ -25,7 +25,7 @@ Route123_BerryMastersHouse_EventScript_26F845:: @ 826F845 addvar VAR_RESULT, 20 addvar VAR_RESULT, 133 giveitem_std VAR_RESULT - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route123_BerryMastersHouse_EventScript_272054 msgbox Route123_BerryMastersHouse_Text_2A7445, 4 release @@ -47,9 +47,9 @@ Route123_BerryMastersHouse_EventScript_26F8C0:: @ 826F8C0 call Route123_BerryMastersHouse_EventScript_271E7C lock faceplayer - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route123_BerryMastersHouse_EventScript_26F909 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route123_BerryMastersHouse_EventScript_26F8F7 end @@ -60,17 +60,17 @@ Route123_BerryMastersHouse_EventScript_26F8F7:: @ 826F8F7 end Route123_BerryMastersHouse_EventScript_26F909:: @ 826F909 - compare_var_to_value VAR_0x8004, 0 + compare VAR_0x8004, 0 goto_eq Route123_BerryMastersHouse_EventScript_26F94C - compare_var_to_value VAR_0x8004, 1 + compare VAR_0x8004, 1 goto_eq Route123_BerryMastersHouse_EventScript_26F97A - compare_var_to_value VAR_0x8004, 2 + compare VAR_0x8004, 2 goto_eq Route123_BerryMastersHouse_EventScript_26F9AB - compare_var_to_value VAR_0x8004, 3 + compare VAR_0x8004, 3 goto_eq Route123_BerryMastersHouse_EventScript_26F9DC - compare_var_to_value VAR_0x8004, 4 + compare VAR_0x8004, 4 goto_eq Route123_BerryMastersHouse_EventScript_26FA0D - compare_var_to_value VAR_0x8004, 5 + compare VAR_0x8004, 5 goto_eq Route123_BerryMastersHouse_EventScript_26FA3E end @@ -79,7 +79,7 @@ Route123_BerryMastersHouse_EventScript_26F94C:: @ 826F94C random 10 addvar VAR_RESULT, 133 giveitem_std VAR_RESULT - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route123_BerryMastersHouse_EventScript_272054 goto Route123_BerryMastersHouse_EventScript_26FA79 release @@ -90,7 +90,7 @@ Route123_BerryMastersHouse_EventScript_26F97A:: @ 826F97A goto_eq Route123_BerryMastersHouse_EventScript_26F94C msgbox Route123_BerryMastersHouse_Text_2A7583, 4 giveitem_std ITEM_SPELON_BERRY - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route123_BerryMastersHouse_EventScript_272054 setflag FLAG_0x0F8 goto Route123_BerryMastersHouse_EventScript_26FA79 @@ -101,7 +101,7 @@ Route123_BerryMastersHouse_EventScript_26F9AB:: @ 826F9AB goto_eq Route123_BerryMastersHouse_EventScript_26F94C msgbox Route123_BerryMastersHouse_Text_2A7583, 4 giveitem_std ITEM_PAMTRE_BERRY - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route123_BerryMastersHouse_EventScript_272054 setflag FLAG_0x0F9 goto Route123_BerryMastersHouse_EventScript_26FA79 @@ -112,7 +112,7 @@ Route123_BerryMastersHouse_EventScript_26F9DC:: @ 826F9DC goto_eq Route123_BerryMastersHouse_EventScript_26F94C msgbox Route123_BerryMastersHouse_Text_2A7583, 4 giveitem_std ITEM_WATMEL_BERRY - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route123_BerryMastersHouse_EventScript_272054 setflag FLAG_0x0FA goto Route123_BerryMastersHouse_EventScript_26FA79 @@ -123,7 +123,7 @@ Route123_BerryMastersHouse_EventScript_26FA0D:: @ 826FA0D goto_eq Route123_BerryMastersHouse_EventScript_26F94C msgbox Route123_BerryMastersHouse_Text_2A7583, 4 giveitem_std ITEM_DURIN_BERRY - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route123_BerryMastersHouse_EventScript_272054 setflag FLAG_0x0FB goto Route123_BerryMastersHouse_EventScript_26FA79 @@ -134,7 +134,7 @@ Route123_BerryMastersHouse_EventScript_26FA3E:: @ 826FA3E goto_eq Route123_BerryMastersHouse_EventScript_26F94C msgbox Route123_BerryMastersHouse_Text_2A7583, 4 giveitem_std ITEM_BELUE_BERRY - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route123_BerryMastersHouse_EventScript_272054 setflag FLAG_0x0FC goto Route123_BerryMastersHouse_EventScript_26FA79 diff --git a/data/scripts/maps/Route124.inc b/data/scripts/maps/Route124.inc index 2a0298650..2079c338d 100644 --- a/data/scripts/maps/Route124.inc +++ b/data/scripts/maps/Route124.inc @@ -23,8 +23,8 @@ Route124_EventScript_1F659C:: @ 81F659C Route124_EventScript_1F65B3:: @ 81F65B3 trainerbattle 2, TRAINER_JENNY_1, 0, Route124_Text_2A0B37, Route124_Text_2A0B7C, Route124_EventScript_1F65DF - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route124_EventScript_1F65FE msgbox Route124_Text_2A0B9A, 4 release @@ -58,8 +58,8 @@ Route124_EventScript_1F662C:: @ 81F662C Route124_EventScript_1F6643:: @ 81F6643 trainerbattle 6, TRAINER_LILA_AND_ROY_1, 0, Route124_Text_2A0E87, Route124_Text_2A0EFE, Route124_Text_2A0F8C, Route124_EventScript_1F6673 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route124_EventScript_1F668C msgbox Route124_Text_2A0F3A, 4 release @@ -81,8 +81,8 @@ Route124_EventScript_1F668C:: @ 81F668C Route124_EventScript_1F66A7:: @ 81F66A7 trainerbattle 6, TRAINER_LILA_AND_ROY_1, 0, Route124_Text_2A0FD1, Route124_Text_2A1012, Route124_Text_2A10E5, Route124_EventScript_1F66D7 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route124_EventScript_1F66F0 msgbox Route124_Text_2A103E, 4 release diff --git a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc index f94892ee4..3480ad465 100644 --- a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc +++ b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc @@ -23,7 +23,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_270A4E:: @ 8270A4E Route124_DivingTreasureHuntersHouse_EventScript_270A5C:: @ 8270A5C call Route124_DivingTreasureHuntersHouse_EventScript_270A72 - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 goto_eq Route124_DivingTreasureHuntersHouse_EventScript_270F57 goto Route124_DivingTreasureHuntersHouse_EventScript_270AD0 end @@ -31,16 +31,16 @@ Route124_DivingTreasureHuntersHouse_EventScript_270A5C:: @ 8270A5C Route124_DivingTreasureHuntersHouse_EventScript_270A72:: @ 8270A72 setvar VAR_0x4001, 0 checkitem ITEM_RED_SHARD, 1 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, Route124_DivingTreasureHuntersHouse_EventScript_270AB8 checkitem ITEM_YELLOW_SHARD, 1 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, Route124_DivingTreasureHuntersHouse_EventScript_270ABE checkitem ITEM_BLUE_SHARD, 1 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, Route124_DivingTreasureHuntersHouse_EventScript_270AC4 checkitem ITEM_GREEN_SHARD, 1 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, Route124_DivingTreasureHuntersHouse_EventScript_270ACA return @@ -247,13 +247,13 @@ Route124_DivingTreasureHuntersHouse_EventScript_270EC0:: @ 8270EC0 bufferitemname 0, VAR_0x8008 bufferitemname 1, VAR_0x8009 msgbox Route124_DivingTreasureHuntersHouse_Text_271132, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route124_DivingTreasureHuntersHouse_EventScript_270F4D checkitemspace VAR_0x8009, 1 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route124_DivingTreasureHuntersHouse_EventScript_270F01 checkitem VAR_0x8008, 2 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route124_DivingTreasureHuntersHouse_EventScript_270F01 goto Route124_DivingTreasureHuntersHouse_EventScript_270F43 end @@ -263,10 +263,10 @@ Route124_DivingTreasureHuntersHouse_EventScript_270F01:: @ 8270F01 giveitem_std VAR_0x8009 msgbox Route124_DivingTreasureHuntersHouse_Text_271158, 4 call Route124_DivingTreasureHuntersHouse_EventScript_270A72 - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 goto_eq Route124_DivingTreasureHuntersHouse_EventScript_270F61 msgbox Route124_DivingTreasureHuntersHouse_Text_27117B, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route124_DivingTreasureHuntersHouse_EventScript_270ADE goto Route124_DivingTreasureHuntersHouse_EventScript_270F4D end diff --git a/data/scripts/maps/Route125.inc b/data/scripts/maps/Route125.inc index 953bf52b2..de3ae07b5 100644 --- a/data/scripts/maps/Route125.inc +++ b/data/scripts/maps/Route125.inc @@ -7,18 +7,18 @@ Route125_MapScripts:: @ 81F6748 Route125_MapScript1_1F6758: @ 81F6758 checkflag FLAG_SYS_WEATHER_CTRL call_if 1, Route125_EventScript_27207A - compare_var_to_value VAR_0x4039, 1 + compare VAR_0x4039, 1 call_if 1, Route125_EventScript_273D13 - compare_var_to_value VAR_0x4037, 11 + compare VAR_0x4037, 11 call_if 1, Route125_EventScript_273D17 - compare_var_to_value VAR_0x4037, 12 + compare VAR_0x4037, 12 call_if 1, Route125_EventScript_273D17 end Route125_MapScript1_1F6783: @ 81F6783 - compare_var_to_value VAR_0x4037, 11 + compare VAR_0x4037, 11 call_if 1, Route125_EventScript_273A85 - compare_var_to_value VAR_0x4037, 12 + compare VAR_0x4037, 12 call_if 1, Route125_EventScript_273AF2 end @@ -48,8 +48,8 @@ Route125_EventScript_1F67E9:: @ 81F67E9 Route125_EventScript_1F6800:: @ 81F6800 trainerbattle 2, TRAINER_ERNEST_1, 0, Route125_Text_2A16FC, Route125_Text_2A173A, Route125_EventScript_1F682C - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route125_EventScript_1F684B msgbox Route125_Text_2A1755, 4 release diff --git a/data/scripts/maps/Route126.inc b/data/scripts/maps/Route126.inc index 4678fe39d..d03e08103 100644 --- a/data/scripts/maps/Route126.inc +++ b/data/scripts/maps/Route126.inc @@ -44,8 +44,8 @@ Route126_EventScript_1F6960:: @ 81F6960 Route126_EventScript_1F6977:: @ 81F6977 trainerbattle 2, TRAINER_PABLO_1, 0, Route126_Text_2A1EA5, Route126_Text_2A1EE3, Route126_EventScript_1F69A3 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route126_EventScript_1F69C2 msgbox Route126_Text_2A1F10, 4 release diff --git a/data/scripts/maps/Route127.inc b/data/scripts/maps/Route127.inc index 9851df043..cbc7d7da1 100644 --- a/data/scripts/maps/Route127.inc +++ b/data/scripts/maps/Route127.inc @@ -7,18 +7,18 @@ Route127_MapScripts:: @ 81F69D9 Route127_MapScript1_1F69E9: @ 81F69E9 checkflag FLAG_SYS_WEATHER_CTRL call_if 1, Route127_EventScript_27207A - compare_var_to_value VAR_0x4039, 1 + compare VAR_0x4039, 1 call_if 1, Route127_EventScript_273D13 - compare_var_to_value VAR_0x4037, 13 + compare VAR_0x4037, 13 call_if 1, Route127_EventScript_273D17 - compare_var_to_value VAR_0x4037, 14 + compare VAR_0x4037, 14 call_if 1, Route127_EventScript_273D17 end Route127_MapScript1_1F6A14: @ 81F6A14 - compare_var_to_value VAR_0x4037, 13 + compare VAR_0x4037, 13 call_if 1, Route127_EventScript_273B5F - compare_var_to_value VAR_0x4037, 14 + compare VAR_0x4037, 14 call_if 1, Route127_EventScript_273BCC end @@ -63,8 +63,8 @@ Route127_EventScript_1F6ABF:: @ 81F6ABF Route127_EventScript_1F6AD6:: @ 81F6AD6 trainerbattle 2, TRAINER_KOJI_1, 0, Route127_Text_2A264D, Route127_Text_2A2685, Route127_EventScript_1F6B02 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route127_EventScript_1F6B21 msgbox Route127_Text_2A26AC, 4 release diff --git a/data/scripts/maps/Route128.inc b/data/scripts/maps/Route128.inc index 1ba1b3448..6d336e464 100644 --- a/data/scripts/maps/Route128.inc +++ b/data/scripts/maps/Route128.inc @@ -177,8 +177,8 @@ Route128_Movement_1F6CBB: @ 81F6CBB Route128_EventScript_1F6CBE:: @ 81F6CBE trainerbattle 2, TRAINER_ISAIAH_1, 0, Route128_Text_2A287F, Route128_Text_2A28AB, Route128_EventScript_1F6CEA - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route128_EventScript_1F6D09 msgbox Route128_Text_2A28D7, 4 release @@ -202,8 +202,8 @@ Route128_EventScript_1F6D09:: @ 81F6D09 Route128_EventScript_1F6D20:: @ 81F6D20 trainerbattle 2, TRAINER_KATELYN_1, 0, Route128_Text_2A2A1F, Route128_Text_2A2A94, Route128_EventScript_1F6D4C - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route128_EventScript_1F6D6B msgbox Route128_Text_2A2AB7, 4 release diff --git a/data/scripts/maps/Route129.inc b/data/scripts/maps/Route129.inc index 822c6018d..170d87e56 100644 --- a/data/scripts/maps/Route129.inc +++ b/data/scripts/maps/Route129.inc @@ -5,20 +5,20 @@ Route129_MapScripts:: @ 81F7284 .byte 0 Route129_MapScript1_1F7294: @ 81F7294 - compare_var_to_value VAR_0x4037, 15 + compare VAR_0x4037, 15 call_if 1, Route129_EventScript_273C39 - compare_var_to_value VAR_0x4037, 16 + compare VAR_0x4037, 16 call_if 1, Route129_EventScript_273CA6 end Route129_MapScript1_1F72AB: @ 81F72AB - compare_var_to_value VAR_0x4039, 1 + compare VAR_0x4039, 1 call_if 1, Route129_EventScript_273D13 - compare_var_to_value VAR_0x405E, 4 + compare VAR_0x405E, 4 call_if 4, Route129_EventScript_1F72D8 - compare_var_to_value VAR_0x4037, 15 + compare VAR_0x4037, 15 call_if 1, Route129_EventScript_273D17 - compare_var_to_value VAR_0x4037, 16 + compare VAR_0x4037, 16 call_if 1, Route129_EventScript_273D17 end diff --git a/data/scripts/maps/Route130.inc b/data/scripts/maps/Route130.inc index b76d77759..0b9d85e30 100644 --- a/data/scripts/maps/Route130.inc +++ b/data/scripts/maps/Route130.inc @@ -3,10 +3,10 @@ Route130_MapScripts:: @ 81F735F .byte 0 Route130_MapScript1_1F7365: @ 81F7365 - compare_var_to_value VAR_0x405E, 4 + compare VAR_0x405E, 4 call_if 4, Route130_EventScript_1F73B5 specialvar VAR_RESULT, sub_813793C - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route130_EventScript_1F73B1 setflag FLAG_0x011 setflag FLAG_0x012 diff --git a/data/scripts/maps/Route131.inc b/data/scripts/maps/Route131.inc index 5ac962d66..566cbef66 100644 --- a/data/scripts/maps/Route131.inc +++ b/data/scripts/maps/Route131.inc @@ -3,7 +3,7 @@ Route131_MapScripts:: @ 81F7404 .byte 0 Route131_MapScript1_1F740A: @ 81F740A - compare_var_to_value VAR_0x405E, 4 + compare VAR_0x405E, 4 call_if 4, Route131_EventScript_1F741F call Route131_EventScript_1F741B end diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index 31182439b..5b6d0fe7d 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -6,15 +6,15 @@ RustboroCity_MapScripts:: @ 81E06BD RustboroCity_MapScript1_1E06C8: @ 81E06C8 setflag FLAG_VISITED_RUSTBORO_CITY call RustboroCity_EventScript_271ED7 - compare_var_to_value VAR_0x405A, 6 + compare VAR_0x405A, 6 call_if 1, RustboroCity_EventScript_1E0707 getplayerxy VAR_0x4000, VAR_0x4001 - compare_var_to_value VAR_0x405A, 6 + compare VAR_0x405A, 6 goto_eq RustboroCity_EventScript_1E06EC end RustboroCity_EventScript_1E06EC:: @ 81E06EC - compare_var_to_value VAR_0x4000, 11 + compare VAR_0x4000, 11 goto_eq RustboroCity_EventScript_1E06FF setobjectxyperm 15, 12, 15 end @@ -52,7 +52,7 @@ RustboroCity_EventScript_1E0715:: @ 81E0715 waitmovement 0 msgbox RustboroCity_Text_1E22A5, 4 closemessage - setflag FLAG_0x12F + setflag FLAG_HAS_MATCH_CALL applymovement 15, RustboroCity_Movement_2725A4 waitmovement 0 playse SE_TK_KASYA @@ -488,13 +488,13 @@ RustboroCity_EventScript_1E0B22:: @ 81E0B22 end RustboroCity_EventScript_1E0B2E:: @ 81E0B2E - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 call_if 1, RustboroCity_EventScript_1E0B6F - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if 1, RustboroCity_EventScript_1E0B9B - compare_var_to_value VAR_0x4001, 2 + compare VAR_0x4001, 2 call_if 1, RustboroCity_EventScript_1E0BC7 - compare_var_to_value VAR_0x4001, 3 + compare VAR_0x4001, 3 call_if 1, RustboroCity_EventScript_1E0BF3 setflag FLAG_0x09F setvar VAR_0x405A, 3 @@ -582,19 +582,19 @@ RustboroCity_EventScript_1E0C4F:: @ 81E0C4F end RustboroCity_EventScript_1E0C5B:: @ 81E0C5B - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 call_if 1, RustboroCity_EventScript_1E0CDC - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if 1, RustboroCity_EventScript_1E0D08 - compare_var_to_value VAR_0x4001, 2 + compare VAR_0x4001, 2 call_if 1, RustboroCity_EventScript_1E0D34 - compare_var_to_value VAR_0x4001, 3 + compare VAR_0x4001, 3 call_if 1, RustboroCity_EventScript_1E0D60 - compare_var_to_value VAR_0x4001, 4 + compare VAR_0x4001, 4 call_if 1, RustboroCity_EventScript_1E0D96 msgbox RustboroCity_Text_1E194D, 4 giveitem_std ITEM_GREAT_BALL - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, RustboroCity_EventScript_1E0CD3 msgbox RustboroCity_Text_1E1A21, 4 closemessage @@ -682,9 +682,9 @@ RustboroCity_EventScript_1E0DB8:: @ 81E0DB8 Route104_EventScript_1E0DD1:: @ 81E0DD1 RustboroCity_EventScript_1E0DD1:: @ 81E0DD1 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq RustboroCity_EventScript_1E0DE9 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq RustboroCity_EventScript_1E0DEE return @@ -826,9 +826,9 @@ RustboroCity_EventScript_1E0FB3:: @ 81E0FB3 RustboroCity_EventScript_1E0FF3:: @ 81E0FF3 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq RustboroCity_EventScript_1E100B - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq RustboroCity_EventScript_1E1114 end @@ -851,7 +851,7 @@ RustboroCity_EventScript_1E100B:: @ 81E100B setvar VAR_0x4063, 2 setvar VAR_0x8008, 0 msgbox RustboroCity_Text_1E1AFA, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq RustboroCity_EventScript_1E1092 msgbox RustboroCity_Text_1E1BD3, 4 call RustboroCity_EventScript_1E10D6 @@ -861,7 +861,7 @@ RustboroCity_EventScript_1E100B:: @ 81E100B RustboroCity_EventScript_1E1070:: @ 81E1070 setvar VAR_0x8008, 1 msgbox RustboroCity_Text_1E1C48, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq RustboroCity_EventScript_1E1092 msgbox RustboroCity_Text_1E1BD3, 4 releaseall @@ -877,7 +877,7 @@ RustboroCity_EventScript_1E1092:: @ 81E1092 RustboroCity_EventScript_1E10C1:: @ 81E10C1 msgbox RustboroCity_Text_1E1CE7, 4 - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 call_if 1, RustboroCity_EventScript_1E10D6 releaseall end @@ -923,7 +923,7 @@ RustboroCity_EventScript_1E1114:: @ 81E1114 setvar VAR_0x405A, 8 setvar VAR_0x4063, 2 msgbox RustboroCity_Text_1E1E34, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq RustboroCity_EventScript_1E1191 msgbox RustboroCity_Text_1E1F2F, 4 call RustboroCity_EventScript_1E10D6 @@ -932,7 +932,7 @@ RustboroCity_EventScript_1E1114:: @ 81E1114 RustboroCity_EventScript_1E1174:: @ 81E1174 msgbox RustboroCity_Text_1E1F76, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq RustboroCity_EventScript_1E1191 msgbox RustboroCity_Text_1E1F2F, 4 releaseall @@ -948,7 +948,7 @@ RustboroCity_EventScript_1E1191:: @ 81E1191 RustboroCity_EventScript_1E11C0:: @ 81E11C0 msgbox RustboroCity_Text_1E2002, 4 - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 call_if 1, RustboroCity_EventScript_1E10D6 releaseall end diff --git a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc index 8a4293959..e9765fa56 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc @@ -3,7 +3,7 @@ RustboroCity_DevonCorp_2F_MapScripts:: @ 8211857 .byte 0 RustboroCity_DevonCorp_2F_MapScript1_21185D: @ 821185D - compare_var_to_value VAR_0x40C4, 1 + compare VAR_0x40C4, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_211869 end @@ -14,7 +14,7 @@ RustboroCity_DevonCorp_2F_EventScript_211869:: @ 8211869 RustboroCity_DevonCorp_2F_EventScript_21186F:: @ 821186F lock faceplayer - compare_var_to_value VAR_0x40C4, 1 + compare VAR_0x40C4, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_211869 msgbox RustboroCity_DevonCorp_2F_Text_211BFB, 4 release @@ -23,7 +23,7 @@ RustboroCity_DevonCorp_2F_EventScript_21186F:: @ 821186F RustboroCity_DevonCorp_2F_EventScript_211886:: @ 8211886 lock faceplayer - compare_var_to_value VAR_0x40C4, 1 + compare VAR_0x40C4, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_211869 checkflag FLAG_0x11F goto_eq RustboroCity_DevonCorp_2F_EventScript_2118A6 @@ -39,7 +39,7 @@ RustboroCity_DevonCorp_2F_EventScript_2118A6:: @ 82118A6 RustboroCity_DevonCorp_2F_EventScript_2118B0:: @ 82118B0 lock faceplayer - compare_var_to_value VAR_0x40C4, 1 + compare VAR_0x40C4, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_211869 checkflag FLAG_0x0BC goto_eq RustboroCity_DevonCorp_2F_EventScript_2118D0 @@ -55,7 +55,7 @@ RustboroCity_DevonCorp_2F_EventScript_2118D0:: @ 82118D0 RustboroCity_DevonCorp_2F_EventScript_2118DA:: @ 82118DA lock faceplayer - compare_var_to_value VAR_0x40C4, 1 + compare VAR_0x40C4, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_211869 msgbox RustboroCity_DevonCorp_2F_Text_211EE0, 4 release @@ -64,16 +64,16 @@ RustboroCity_DevonCorp_2F_EventScript_2118DA:: @ 82118DA RustboroCity_DevonCorp_2F_EventScript_2118F1:: @ 82118F1 lock faceplayer - compare_var_to_value VAR_0x40C4, 2 + compare VAR_0x40C4, 2 goto_eq RustboroCity_DevonCorp_2F_EventScript_211A03 - compare_var_to_value VAR_0x40C4, 1 + compare VAR_0x40C4, 1 goto_eq RustboroCity_DevonCorp_2F_EventScript_2119F9 msgbox RustboroCity_DevonCorp_2F_Text_211F48, 4 checkitem ITEM_ROOT_FOSSIL, 1 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq RustboroCity_DevonCorp_2F_EventScript_211933 checkitem ITEM_CLAW_FOSSIL, 1 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq RustboroCity_DevonCorp_2F_EventScript_211991 release end @@ -86,10 +86,10 @@ RustboroCity_DevonCorp_2F_EventScript_211933:: @ 8211933 applymovement 5, RustboroCity_DevonCorp_2F_Movement_27259A waitmovement 0 msgbox RustboroCity_DevonCorp_2F_Text_211FA6, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq RustboroCity_DevonCorp_2F_EventScript_2119EF checkitem ITEM_CLAW_FOSSIL, 1 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq RustboroCity_DevonCorp_2F_EventScript_211B84 goto RustboroCity_DevonCorp_2F_EventScript_211974 end @@ -111,10 +111,10 @@ RustboroCity_DevonCorp_2F_EventScript_211991:: @ 8211991 applymovement 5, RustboroCity_DevonCorp_2F_Movement_27259A waitmovement 0 msgbox RustboroCity_DevonCorp_2F_Text_211FA6, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq RustboroCity_DevonCorp_2F_EventScript_2119EF checkitem ITEM_ROOT_FOSSIL, 1 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq RustboroCity_DevonCorp_2F_EventScript_211B84 goto RustboroCity_DevonCorp_2F_EventScript_2119D2 end @@ -139,9 +139,9 @@ RustboroCity_DevonCorp_2F_EventScript_2119F9:: @ 82119F9 end RustboroCity_DevonCorp_2F_EventScript_211A03:: @ 8211A03 - compare_var_to_value VAR_0x40C5, 1 + compare VAR_0x40C5, 1 goto_eq RustboroCity_DevonCorp_2F_EventScript_211A1A - compare_var_to_value VAR_0x40C5, 2 + compare VAR_0x40C5, 2 goto_eq RustboroCity_DevonCorp_2F_EventScript_211A2C end @@ -160,9 +160,9 @@ RustboroCity_DevonCorp_2F_EventScript_211A2C:: @ 8211A2C RustboroCity_DevonCorp_2F_EventScript_211A3E:: @ 8211A3E setvar VAR_0x4001, 388 givemon SPECIES_LILEEP, 20, ITEM_NONE, 0x0, 0x0, 0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq RustboroCity_DevonCorp_2F_EventScript_211A6E - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq RustboroCity_DevonCorp_2F_EventScript_211A96 goto RustboroCity_DevonCorp_2F_EventScript_273811 end @@ -170,7 +170,7 @@ RustboroCity_DevonCorp_2F_EventScript_211A3E:: @ 8211A3E RustboroCity_DevonCorp_2F_EventScript_211A6E:: @ 8211A6E call RustboroCity_DevonCorp_2F_EventScript_211AC4 msgbox gUnknown_08273374, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq RustboroCity_DevonCorp_2F_EventScript_211AD7 call RustboroCity_DevonCorp_2F_EventScript_27378B call RustboroCity_DevonCorp_2F_EventScript_2723DD @@ -180,7 +180,7 @@ RustboroCity_DevonCorp_2F_EventScript_211A6E:: @ 8211A6E RustboroCity_DevonCorp_2F_EventScript_211A96:: @ 8211A96 call RustboroCity_DevonCorp_2F_EventScript_211AC4 msgbox gUnknown_08273374, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq RustboroCity_DevonCorp_2F_EventScript_211AB9 call RustboroCity_DevonCorp_2F_EventScript_273797 goto RustboroCity_DevonCorp_2F_EventScript_211AB9 @@ -209,9 +209,9 @@ RustboroCity_DevonCorp_2F_EventScript_211AD7:: @ 8211AD7 RustboroCity_DevonCorp_2F_EventScript_211AE1:: @ 8211AE1 setvar VAR_0x4001, 390 givemon SPECIES_ANORITH, 20, ITEM_NONE, 0x0, 0x0, 0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq RustboroCity_DevonCorp_2F_EventScript_211B11 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq RustboroCity_DevonCorp_2F_EventScript_211B39 goto RustboroCity_DevonCorp_2F_EventScript_273811 end @@ -219,7 +219,7 @@ RustboroCity_DevonCorp_2F_EventScript_211AE1:: @ 8211AE1 RustboroCity_DevonCorp_2F_EventScript_211B11:: @ 8211B11 call RustboroCity_DevonCorp_2F_EventScript_211B67 msgbox gUnknown_08273374, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq RustboroCity_DevonCorp_2F_EventScript_211B7A call RustboroCity_DevonCorp_2F_EventScript_27378B call RustboroCity_DevonCorp_2F_EventScript_2723DD @@ -229,7 +229,7 @@ RustboroCity_DevonCorp_2F_EventScript_211B11:: @ 8211B11 RustboroCity_DevonCorp_2F_EventScript_211B39:: @ 8211B39 call RustboroCity_DevonCorp_2F_EventScript_211B67 msgbox gUnknown_08273374, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq RustboroCity_DevonCorp_2F_EventScript_211B5C call RustboroCity_DevonCorp_2F_EventScript_273797 goto RustboroCity_DevonCorp_2F_EventScript_211B5C @@ -281,9 +281,9 @@ RustboroCity_DevonCorp_2F_EventScript_211BCD:: @ 8211BCD RustboroCity_DevonCorp_2F_EventScript_211BCF:: @ 8211BCF lock faceplayer - compare_var_to_value VAR_0x40C4, 1 + compare VAR_0x40C4, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_211869 - compare_var_to_value VAR_0x405A, 6 + compare VAR_0x405A, 6 goto_if 4, RustboroCity_DevonCorp_2F_EventScript_211BF1 msgbox RustboroCity_DevonCorp_2F_Text_212338, 4 release diff --git a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc index d887c5669..373f4e566 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc @@ -5,7 +5,7 @@ RustboroCity_DevonCorp_3F_MapScripts:: @ 821242D .byte 0 RustboroCity_DevonCorp_3F_MapScript1_21243D: @ 821243D - compare_var_to_value VAR_0x408F, 0 + compare VAR_0x408F, 0 call_if 1, RustboroCity_DevonCorp_3F_EventScript_212449 end @@ -164,7 +164,7 @@ RustboroCity_DevonCorp_3F_EventScript_21256C:: @ 821256C RustboroCity_DevonCorp_3F_EventScript_212595:: @ 8212595 msgbox RustboroCity_DevonCorp_3F_Text_212A29, 4 giveitem_std ITEM_EXP_SHARE - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq RustboroCity_DevonCorp_3F_EventScript_272054 setflag FLAG_0x110 msgbox RustboroCity_DevonCorp_3F_Text_212A9E, 4 diff --git a/data/scripts/maps/RustboroCity_Flat1_2F.inc b/data/scripts/maps/RustboroCity_Flat1_2F.inc index c31739fb2..425d61f52 100644 --- a/data/scripts/maps/RustboroCity_Flat1_2F.inc +++ b/data/scripts/maps/RustboroCity_Flat1_2F.inc @@ -5,35 +5,35 @@ RustboroCity_Flat1_2F_EventScript_21513A:: @ 821513A lock faceplayer specialvar VAR_RESULT, TryBufferWaldaPhrase - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq RustboroCity_Flat1_2F_EventScript_21518D - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq RustboroCity_Flat1_2F_EventScript_2151AD RustboroCity_Flat1_2F_EventScript_215157:: @ 8215157 special DoWaldaNamingScreen waitstate - compare_var_to_value VAR_0x8004, 1 + compare VAR_0x8004, 1 goto_eq RustboroCity_Flat1_2F_EventScript_2151D7 - compare_var_to_value VAR_0x8004, 2 + compare VAR_0x8004, 2 goto_eq RustboroCity_Flat1_2F_EventScript_2151E1 specialvar VAR_RESULT, TryGetWallpaperWithWaldaPhrase - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq RustboroCity_Flat1_2F_EventScript_2151F8 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq RustboroCity_Flat1_2F_EventScript_215221 end RustboroCity_Flat1_2F_EventScript_21518D:: @ 821518D msgbox RustboroCity_Flat1_2F_Text_2152FA, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq RustboroCity_Flat1_2F_EventScript_2151CD msgbox RustboroCity_Flat1_2F_Text_2154AD, 4 goto RustboroCity_Flat1_2F_EventScript_215157 RustboroCity_Flat1_2F_EventScript_2151AD:: @ 82151AD msgbox RustboroCity_Flat1_2F_Text_215448, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq RustboroCity_Flat1_2F_EventScript_2151CD msgbox RustboroCity_Flat1_2F_Text_2154AD, 4 goto RustboroCity_Flat1_2F_EventScript_215157 diff --git a/data/scripts/maps/RustboroCity_Flat2_2F.inc b/data/scripts/maps/RustboroCity_Flat2_2F.inc index f8a9bcac9..e623aa485 100644 --- a/data/scripts/maps/RustboroCity_Flat2_2F.inc +++ b/data/scripts/maps/RustboroCity_Flat2_2F.inc @@ -12,7 +12,7 @@ RustboroCity_Flat2_2F_EventScript_215FE1:: @ 8215FE1 goto_eq RustboroCity_Flat2_2F_EventScript_216010 msgbox RustboroCity_Flat2_2F_Text_21605A, 4 giveitem_std ITEM_PREMIER_BALL - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq RustboroCity_Flat2_2F_EventScript_272054 setflag FLAG_0x0D5 release diff --git a/data/scripts/maps/RustboroCity_Gym.inc b/data/scripts/maps/RustboroCity_Gym.inc index dec6a8e73..0cdfaf4b9 100644 --- a/data/scripts/maps/RustboroCity_Gym.inc +++ b/data/scripts/maps/RustboroCity_Gym.inc @@ -3,8 +3,8 @@ RustboroCity_Gym_MapScripts:: @ 8212F30 RustboroCity_Gym_EventScript_212F31:: @ 8212F31 trainerbattle 1, TRAINER_ROXANNE_1, 0, RustboroCity_Gym_Text_21362A, RustboroCity_Gym_Text_21370B, RustboroCity_Gym_EventScript_212F66 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq RustboroCity_Gym_EventScript_212FC8 checkflag FLAG_0x0A5 goto_if 0, RustboroCity_Gym_EventScript_212FA4 @@ -23,14 +23,14 @@ RustboroCity_Gym_EventScript_212F66:: @ 8212F66 addvar VAR_0x4085, 1 setvar VAR_0x8008, 1 call RustboroCity_Gym_EventScript_271F43 - compare_var_to_value VAR_0x4085, 6 + compare VAR_0x4085, 6 call_if 1, RustboroCity_Gym_EventScript_271E84 goto RustboroCity_Gym_EventScript_212FA4 end RustboroCity_Gym_EventScript_212FA4:: @ 8212FA4 giveitem_std ITEM_TM39 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq RustboroCity_Gym_EventScript_272054 setflag FLAG_0x0A5 msgbox RustboroCity_Gym_Text_2138B1, 4 diff --git a/data/scripts/maps/RustboroCity_House1.inc b/data/scripts/maps/RustboroCity_House1.inc index bbbacff17..d63536c55 100644 --- a/data/scripts/maps/RustboroCity_House1.inc +++ b/data/scripts/maps/RustboroCity_House1.inc @@ -11,17 +11,17 @@ RustboroCity_House1_EventScript_21593F:: @ 821593F specialvar VAR_RESULT, sub_807E73C copyvar VAR_0x8009, VAR_RESULT msgbox RustboroCity_House1_Text_2159E8, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq RustboroCity_House1_EventScript_2159BD special sub_81B94B0 waitstate copyvar VAR_0x800A, VAR_0x8004 - compare_var_to_value VAR_0x8004, 255 + compare VAR_0x8004, 255 goto_eq RustboroCity_House1_EventScript_2159BD copyvar VAR_0x8005, VAR_0x800A specialvar VAR_RESULT, sub_807E9D4 copyvar VAR_0x800B, VAR_RESULT - compare_var_to_var VAR_RESULT, VAR_0x8009 + compare VAR_RESULT, VAR_0x8009 goto_if 5, RustboroCity_House1_EventScript_2159C7 copyvar VAR_0x8004, VAR_0x8008 copyvar VAR_0x8005, VAR_0x800A diff --git a/data/scripts/maps/RustboroCity_PokemonSchool.inc b/data/scripts/maps/RustboroCity_PokemonSchool.inc index 1caf78524..46887b9c6 100644 --- a/data/scripts/maps/RustboroCity_PokemonSchool.inc +++ b/data/scripts/maps/RustboroCity_PokemonSchool.inc @@ -79,13 +79,13 @@ RustboroCity_PokemonSchool_EventScript_213F95:: @ 8213F95 faceplayer checkflag FLAG_0x113 goto_eq RustboroCity_PokemonSchool_EventScript_213FFB - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if 1, RustboroCity_PokemonSchool_EventScript_213FE5 - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if 1, RustboroCity_PokemonSchool_EventScript_213FF0 msgbox RustboroCity_PokemonSchool_Text_214433, 4 giveitem_std ITEM_QUICK_CLAW - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq RustboroCity_PokemonSchool_EventScript_272054 closemessage applymovement VAR_LAST_TALKED, RustboroCity_PokemonSchool_Movement_2725AA diff --git a/data/scripts/maps/RusturfTunnel.inc b/data/scripts/maps/RusturfTunnel.inc index 25913300c..cefb978fe 100644 --- a/data/scripts/maps/RusturfTunnel.inc +++ b/data/scripts/maps/RusturfTunnel.inc @@ -9,7 +9,7 @@ RusturfTunnel_MapScript2_22CE32: @ 822CE32 .2byte 0 RusturfTunnel_MapScript1_22CE44: @ 822CE44 - compare_var_to_value VAR_0x409A, 2 + compare VAR_0x409A, 2 call_if 1, RusturfTunnel_EventScript_22CE50 end @@ -51,35 +51,35 @@ RusturfTunnel_EventScript_22CE99:: @ 822CE99 RusturfTunnel_EventScript_22CEAE:: @ 822CEAE lockall - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if 1, RusturfTunnel_EventScript_22CFA7 - compare_var_to_value VAR_0x4001, 2 + compare VAR_0x4001, 2 call_if 1, RusturfTunnel_EventScript_22CFBC - compare_var_to_value VAR_0x4001, 3 + compare VAR_0x4001, 3 call_if 1, RusturfTunnel_EventScript_22CFC7 call RusturfTunnel_EventScript_22CFFF msgbox RusturfTunnel_Text_22D65C, 4 - compare_var_to_value VAR_0x4001, 2 + compare VAR_0x4001, 2 call_if 1, RusturfTunnel_EventScript_22CFC8 - compare_var_to_value VAR_0x4001, 3 + compare VAR_0x4001, 3 call_if 1, RusturfTunnel_EventScript_22CFC8 giveitem_std ITEM_HM04 setflag FLAG_0x06A msgbox RusturfTunnel_Text_22D6D2, 4 closemessage - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if 1, RusturfTunnel_EventScript_22CF5D - compare_var_to_value VAR_0x4001, 2 + compare VAR_0x4001, 2 call_if 1, RusturfTunnel_EventScript_22CF6F - compare_var_to_value VAR_0x4001, 3 + compare VAR_0x4001, 3 call_if 1, RusturfTunnel_EventScript_22CF8B msgbox RusturfTunnel_Text_22D745, 4 closemessage - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if 1, RusturfTunnel_EventScript_22CFD4 - compare_var_to_value VAR_0x4001, 2 + compare VAR_0x4001, 2 call_if 1, RusturfTunnel_EventScript_22CFE6 - compare_var_to_value VAR_0x4001, 3 + compare VAR_0x4001, 3 call_if 1, RusturfTunnel_EventScript_22CFE6 call RusturfTunnel_EventScript_272216 releaseall diff --git a/data/scripts/maps/SSTidalCorridor.inc b/data/scripts/maps/SSTidalCorridor.inc index 2faadc2fb..a3bf1ac36 100644 --- a/data/scripts/maps/SSTidalCorridor.inc +++ b/data/scripts/maps/SSTidalCorridor.inc @@ -42,9 +42,9 @@ SSTidalRooms_EventScript_23C03C:: @ 823C03C return SSTidalCorridor_EventScript_23C050:: @ 823C050 - compare_var_to_value VAR_PORTHOLE, 2 + compare VAR_PORTHOLE, 2 goto_eq SSTidalCorridor_EventScript_23C067 - compare_var_to_value VAR_PORTHOLE, 7 + compare VAR_PORTHOLE, 7 goto_eq SSTidalCorridor_EventScript_23C07D end @@ -114,9 +114,9 @@ SSTidalCorridor_EventScript_23C110:: @ 823C110 SSTidalCorridor_EventScript_23C119:: @ 823C119 lock faceplayer - compare_var_to_value VAR_PORTHOLE, 4 + compare VAR_PORTHOLE, 4 goto_eq SSTidalCorridor_EventScript_23C13B - compare_var_to_value VAR_PORTHOLE, 8 + compare VAR_PORTHOLE, 8 goto_eq SSTidalCorridor_EventScript_23C15A msgbox SSTidalCorridor_Text_23C596, 4 release @@ -148,9 +148,9 @@ SSTidalCorridor_EventScript_23C179:: @ 823C179 SSTidalCorridor_EventScript_23C17D:: @ 823C17D lockall - compare_var_to_value VAR_PORTHOLE, 2 + compare VAR_PORTHOLE, 2 goto_eq SSTidalCorridor_EventScript_23C19E - compare_var_to_value VAR_PORTHOLE, 7 + compare VAR_PORTHOLE, 7 goto_eq SSTidalCorridor_EventScript_23C19E msgbox SSTidalCorridor_Text_23C6C3, 4 releaseall diff --git a/data/scripts/maps/SSTidalRooms.inc b/data/scripts/maps/SSTidalRooms.inc index 4863d8ba9..39c453e98 100644 --- a/data/scripts/maps/SSTidalRooms.inc +++ b/data/scripts/maps/SSTidalRooms.inc @@ -8,7 +8,7 @@ SSTidalRooms_EventScript_23C9F2:: @ 823C9F2 goto_eq SSTidalRooms_EventScript_23CA29 msgbox SSTidalRooms_Text_23D098, 4 giveitem_std ITEM_TM49 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SSTidalRooms_EventScript_272054 setflag FLAG_0x104 msgbox SSTidalRooms_Text_23D145, 4 diff --git a/data/scripts/maps/SafariZone_South.inc b/data/scripts/maps/SafariZone_South.inc index b4e687755..4be06d00b 100644 --- a/data/scripts/maps/SafariZone_South.inc +++ b/data/scripts/maps/SafariZone_South.inc @@ -19,7 +19,7 @@ SafariZone_South_EventScript_23D28E:: @ 823D28E end SafariZone_South_MapScript1_23D2B1: @ 823D2B1 - compare_var_to_value VAR_0x40A4, 2 + compare VAR_0x40A4, 2 call_if 1, SafariZone_South_EventScript_23D2BD end @@ -54,7 +54,7 @@ SafariZone_South_EventScript_23D2E5:: @ 823D2E5 checkflag FLAG_0x05D goto_if 0, SafariZone_South_EventScript_23D30D msgbox SafariZone_South_Text_2A51D4, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq SafariZone_South_EventScript_23D31A msgbox SafariZone_South_Text_2A521A, 4 release diff --git a/data/scripts/maps/SeafloorCavern_Entrance.inc b/data/scripts/maps/SeafloorCavern_Entrance.inc index ff1afb53b..b5fdc5e42 100644 --- a/data/scripts/maps/SeafloorCavern_Entrance.inc +++ b/data/scripts/maps/SeafloorCavern_Entrance.inc @@ -9,7 +9,7 @@ SeafloorCavern_Entrance_MapScript1_234474: @ 8234474 SeafloorCavern_Entrance_EventScript_234485:: @ 8234485 lockall - compare_var_to_value VAR_0x40D9, 1 + compare VAR_0x40D9, 1 goto_eq SeafloorCavern_Entrance_EventScript_2344ED waitse playse SE_PIN @@ -18,11 +18,11 @@ SeafloorCavern_Entrance_EventScript_234485:: @ 8234485 applymovement 1, SeafloorCavern_Entrance_Movement_27259A waitmovement 0 delay 20 - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if 1, SeafloorCavern_Entrance_EventScript_23452E - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if 1, SeafloorCavern_Entrance_EventScript_234523 - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if 1, SeafloorCavern_Entrance_EventScript_234539 delay 30 setvar VAR_0x40D9, 1 @@ -35,11 +35,11 @@ SeafloorCavern_Entrance_EventScript_234485:: @ 8234485 end SeafloorCavern_Entrance_EventScript_2344ED:: @ 82344ED - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if 1, SeafloorCavern_Entrance_EventScript_23452E - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if 1, SeafloorCavern_Entrance_EventScript_234523 - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if 1, SeafloorCavern_Entrance_EventScript_234539 msgbox SeafloorCavern_Entrance_Text_2346C8, 4 closemessage diff --git a/data/scripts/maps/SealedChamber_InnerRoom.inc b/data/scripts/maps/SealedChamber_InnerRoom.inc index 318e3beee..9cd3727bb 100644 --- a/data/scripts/maps/SealedChamber_InnerRoom.inc +++ b/data/scripts/maps/SealedChamber_InnerRoom.inc @@ -9,7 +9,7 @@ SealedChamber_InnerRoom_EventScript_2391F8:: @ 82391F8 checkflag FLAG_0x0E4 goto_eq SealedChamber_InnerRoom_EventScript_239253 specialvar VAR_RESULT, CheckRelicanthWailord - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SealedChamber_InnerRoom_EventScript_239253 fadeoutbgm 0 playse SE_TRACK_MOVE diff --git a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc index 5d83dadf9..dcf29081a 100644 --- a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc @@ -23,24 +23,24 @@ ShoalCave_LowTideEntranceRoom_EventScript_236DD9:: @ 8236DD9 checkflag FLAG_SYS_SHOAL_ITEM call_if 1, ShoalCave_LowTideEntranceRoom_EventScript_236ED9 checkitem ITEM_SHOAL_SALT, 4 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq ShoalCave_LowTideEntranceRoom_EventScript_236E9B checkitem ITEM_SHOAL_SHELL, 4 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq ShoalCave_LowTideEntranceRoom_EventScript_236E9B msgbox ShoalCave_LowTideEntranceRoom_Text_2A7F37, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq ShoalCave_LowTideEntranceRoom_EventScript_236ECF checkitemspace ITEM_SHELL_BELL, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, ShoalCave_LowTideEntranceRoom_EventScript_236E69 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_eq ShoalCave_LowTideEntranceRoom_EventScript_236E91 msgbox ShoalCave_LowTideEntranceRoom_Text_2A7FAC, 4 takeitem ITEM_SHOAL_SALT, 4 takeitem ITEM_SHOAL_SHELL, 4 giveitem_std ITEM_SHELL_BELL - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq ShoalCave_LowTideEntranceRoom_EventScript_272054 msgbox ShoalCave_LowTideEntranceRoom_Text_2A8012, 4 setflag FLAG_0x002 @@ -49,13 +49,13 @@ ShoalCave_LowTideEntranceRoom_EventScript_236DD9:: @ 8236DD9 ShoalCave_LowTideEntranceRoom_EventScript_236E69:: @ 8236E69 checkitem ITEM_SHOAL_SALT, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq ShoalCave_LowTideEntranceRoom_EventScript_236E7A return ShoalCave_LowTideEntranceRoom_EventScript_236E7A:: @ 8236E7A checkitem ITEM_SHOAL_SHELL, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq ShoalCave_LowTideEntranceRoom_EventScript_236E8B return @@ -70,10 +70,10 @@ ShoalCave_LowTideEntranceRoom_EventScript_236E91:: @ 8236E91 ShoalCave_LowTideEntranceRoom_EventScript_236E9B:: @ 8236E9B checkitem ITEM_SHOAL_SALT, 1 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq ShoalCave_LowTideEntranceRoom_EventScript_236EC5 checkitem ITEM_SHOAL_SHELL, 1 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq ShoalCave_LowTideEntranceRoom_EventScript_236EC5 msgbox ShoalCave_LowTideEntranceRoom_Text_2A7E0E, 4 release diff --git a/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc b/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc index f89306140..94505a96d 100644 --- a/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc @@ -73,7 +73,7 @@ ShoalCave_LowTideInnerRoom_EventScript_236FBA:: @ 8236FBA checkflag FLAG_0x3BC goto_eq ShoalCave_LowTideInnerRoom_EventScript_236FEC giveitem_std ITEM_SHOAL_SHELL - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq ShoalCave_LowTideInnerRoom_EventScript_272054 setmetatile 41, 20, 859, 0 special DrawWholeMapView @@ -91,7 +91,7 @@ ShoalCave_LowTideInnerRoom_EventScript_236FF6:: @ 8236FF6 checkflag FLAG_0x3BD goto_eq ShoalCave_LowTideInnerRoom_EventScript_236FEC giveitem_std ITEM_SHOAL_SHELL - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq ShoalCave_LowTideInnerRoom_EventScript_272054 setmetatile 41, 10, 859, 0 special DrawWholeMapView @@ -104,7 +104,7 @@ ShoalCave_LowTideInnerRoom_EventScript_237028:: @ 8237028 checkflag FLAG_0x3BE goto_eq ShoalCave_LowTideInnerRoom_EventScript_236FEC giveitem_std ITEM_SHOAL_SHELL - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq ShoalCave_LowTideInnerRoom_EventScript_272054 setmetatile 6, 9, 859, 0 special DrawWholeMapView @@ -117,7 +117,7 @@ ShoalCave_LowTideInnerRoom_EventScript_23705A:: @ 823705A checkflag FLAG_0x3BF goto_eq ShoalCave_LowTideInnerRoom_EventScript_236FEC giveitem_std ITEM_SHOAL_SHELL - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq ShoalCave_LowTideInnerRoom_EventScript_272054 setmetatile 16, 13, 859, 0 special DrawWholeMapView @@ -130,7 +130,7 @@ ShoalCave_LowTideInnerRoom_EventScript_23708C:: @ 823708C checkflag FLAG_0x3B8 goto_eq ShoalCave_LowTideInnerRoom_EventScript_2370BE giveitem_std ITEM_SHOAL_SALT - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq ShoalCave_LowTideInnerRoom_EventScript_272054 setmetatile 31, 8, 858, 0 special DrawWholeMapView @@ -148,7 +148,7 @@ ShoalCave_LowTideInnerRoom_EventScript_2370C8:: @ 82370C8 checkflag FLAG_0x3B9 goto_eq ShoalCave_LowTideInnerRoom_EventScript_2370BE giveitem_std ITEM_SHOAL_SALT - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq ShoalCave_LowTideInnerRoom_EventScript_272054 setmetatile 14, 26, 858, 0 special DrawWholeMapView diff --git a/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc b/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc index a528dde99..9883bf3da 100644 --- a/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc @@ -20,7 +20,7 @@ ShoalCave_LowTideLowerRoom_EventScript_237176:: @ 8237176 checkflag FLAG_0x3BB goto_eq ShoalCave_LowTideLowerRoom_EventScript_2371A8 giveitem_std ITEM_SHOAL_SALT - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq ShoalCave_LowTideLowerRoom_EventScript_272054 setmetatile 18, 2, 858, 0 special DrawWholeMapView @@ -40,7 +40,7 @@ ShoalCave_LowTideLowerRoom_EventScript_2371B2:: @ 82371B2 goto_eq ShoalCave_LowTideLowerRoom_EventScript_2371E1 msgbox ShoalCave_LowTideLowerRoom_Text_2371EB, 4 giveitem_std ITEM_FOCUS_BAND - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq ShoalCave_LowTideLowerRoom_EventScript_272054 setflag FLAG_0x11B release diff --git a/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc b/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc index b8c6bb2bb..e8c87bd98 100644 --- a/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc @@ -20,7 +20,7 @@ ShoalCave_LowTideStairsRoom_EventScript_23711A:: @ 823711A checkflag FLAG_0x3BA goto_eq ShoalCave_LowTideStairsRoom_EventScript_23714C giveitem_std ITEM_SHOAL_SALT - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq ShoalCave_LowTideStairsRoom_EventScript_272054 setmetatile 11, 11, 858, 0 special DrawWholeMapView diff --git a/data/scripts/maps/SkyPillar_1F.inc b/data/scripts/maps/SkyPillar_1F.inc index 25fa53851..6afc5aa64 100644 --- a/data/scripts/maps/SkyPillar_1F.inc +++ b/data/scripts/maps/SkyPillar_1F.inc @@ -3,7 +3,7 @@ SkyPillar_1F_MapScripts:: @ 8239615 .byte 0 SkyPillar_1F_MapScript1_23961B: @ 823961B - compare_var_to_value VAR_0x40CA, 2 + compare VAR_0x40CA, 2 call_if 0, SkyPillar_1F_EventScript_239627 end diff --git a/data/scripts/maps/SkyPillar_2F.inc b/data/scripts/maps/SkyPillar_2F.inc index c711fa0eb..b22afaf54 100644 --- a/data/scripts/maps/SkyPillar_2F.inc +++ b/data/scripts/maps/SkyPillar_2F.inc @@ -5,7 +5,7 @@ SkyPillar_2F_MapScripts:: @ 823962B .byte 0 SkyPillar_2F_MapScript1_23963B: @ 823963B - compare_var_to_value VAR_0x40CA, 2 + compare VAR_0x40CA, 2 call_if 0, SkyPillar_2F_EventScript_23964C copyvar VAR_ICE_STEP_COUNT, 0x1 end diff --git a/data/scripts/maps/SkyPillar_3F.inc b/data/scripts/maps/SkyPillar_3F.inc index e376c6aae..0ddae05b2 100644 --- a/data/scripts/maps/SkyPillar_3F.inc +++ b/data/scripts/maps/SkyPillar_3F.inc @@ -3,7 +3,7 @@ SkyPillar_3F_MapScripts:: @ 823965B .byte 0 SkyPillar_3F_MapScript1_239661: @ 8239661 - compare_var_to_value VAR_0x40CA, 2 + compare VAR_0x40CA, 2 call_if 0, SkyPillar_3F_EventScript_23966D end diff --git a/data/scripts/maps/SkyPillar_4F.inc b/data/scripts/maps/SkyPillar_4F.inc index 99fc10cdc..15d055f02 100644 --- a/data/scripts/maps/SkyPillar_4F.inc +++ b/data/scripts/maps/SkyPillar_4F.inc @@ -5,7 +5,7 @@ SkyPillar_4F_MapScripts:: @ 8239671 .byte 0 SkyPillar_4F_MapScript1_239681: @ 8239681 - compare_var_to_value VAR_0x40CA, 2 + compare VAR_0x40CA, 2 call_if 0, SkyPillar_4F_EventScript_239692 copyvar VAR_ICE_STEP_COUNT, 0x1 end diff --git a/data/scripts/maps/SkyPillar_5F.inc b/data/scripts/maps/SkyPillar_5F.inc index b31cec23d..8e08fb2bd 100644 --- a/data/scripts/maps/SkyPillar_5F.inc +++ b/data/scripts/maps/SkyPillar_5F.inc @@ -3,7 +3,7 @@ SkyPillar_5F_MapScripts:: @ 82396A2 .byte 0 SkyPillar_5F_MapScript1_2396A8: @ 82396A8 - compare_var_to_value VAR_0x40CA, 2 + compare VAR_0x40CA, 2 call_if 0, SkyPillar_5F_EventScript_2396B4 return diff --git a/data/scripts/maps/SkyPillar_Outside.inc b/data/scripts/maps/SkyPillar_Outside.inc index c2f211ab8..aa0b51414 100644 --- a/data/scripts/maps/SkyPillar_Outside.inc +++ b/data/scripts/maps/SkyPillar_Outside.inc @@ -5,9 +5,9 @@ SkyPillar_Outside_MapScripts:: @ 82392A8 .byte 0 SkyPillar_Outside_MapScript1_2392B8: @ 82392B8 - compare_var_to_value VAR_0x405E, 3 + compare VAR_0x405E, 3 call_if 1, SkyPillar_Outside_EventScript_2392CF - compare_var_to_value VAR_0x405E, 4 + compare VAR_0x405E, 4 call_if 4, SkyPillar_Outside_EventScript_2392D3 end diff --git a/data/scripts/maps/SkyPillar_Top.inc b/data/scripts/maps/SkyPillar_Top.inc index d5a4e477c..a652c7897 100644 --- a/data/scripts/maps/SkyPillar_Top.inc +++ b/data/scripts/maps/SkyPillar_Top.inc @@ -11,15 +11,15 @@ SkyPillar_Top_MapScript1_2396C8: @ 82396C8 SkyPillar_Top_EventScript_2396D2:: @ 82396D2 specialvar VAR_RESULT, sub_8138B80 - compare_var_to_value VAR_RESULT, 7 + compare VAR_RESULT, 7 goto_if 5, SkyPillar_Top_EventScript_27374E removeobject VAR_LAST_TALKED return SkyPillar_Top_MapScript1_2396E6: @ 82396E6 - compare_var_to_value VAR_0x40CA, 2 + compare VAR_0x40CA, 2 call_if 0, SkyPillar_Top_EventScript_2396FD - compare_var_to_value VAR_0x40CA, 2 + compare VAR_0x40CA, 2 call_if 4, SkyPillar_Top_EventScript_239705 end @@ -53,15 +53,15 @@ SkyPillar_Top_EventScript_239722:: @ 8239722 waitmoncry setwildbattle SPECIES_RAYQUAZA, 70, ITEM_NONE setflag FLAG_SYS_CTRL_OBJ_DELETE - special sub_80B0934 + special BattleSetup_StartLegendaryBattle waitstate clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, sub_8138B80 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq SkyPillar_Top_EventScript_239768 - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 goto_eq SkyPillar_Top_EventScript_239771 - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_eq SkyPillar_Top_EventScript_239771 setflag FLAG_0x1C0 releaseall diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc index 10c809947..304e4decc 100644 --- a/data/scripts/maps/SlateportCity.inc +++ b/data/scripts/maps/SlateportCity.inc @@ -6,9 +6,9 @@ SlateportCity_MapScripts:: @ 81DCC61 SlateportCity_MapScript1_1DCC6C: @ 81DCC6C setvar VAR_0x40AA, 0 call SlateportCity_EventScript_1DCC8D - compare_var_to_value VAR_0x4058, 1 + compare VAR_0x4058, 1 call_if 1, SlateportCity_EventScript_1DCC99 - compare_var_to_value VAR_0x40D2, 1 + compare VAR_0x40D2, 1 call_if 1, SlateportCity_EventScript_1DCCE7 end @@ -38,7 +38,7 @@ SlateportCity_EventScript_1DCC99:: @ 81DCC99 SlateportCity_EventScript_1DCCE7:: @ 81DCCE7 setflag FLAG_SPECIAL_FLAG_0x4000 getplayerxy VAR_0x8004, VAR_0x8005 - compare_var_to_value VAR_0x8004, 30 + compare VAR_0x8004, 30 goto_eq SlateportCity_EventScript_1DCD06 setobjectxyperm 35, 23, 27 setobjectmovementtype 35, 10 @@ -143,10 +143,10 @@ SlateportCity_EventScript_1DCDE4:: @ 81DCDE4 bufferleadmonspeciesname 0 msgbox SlateportCity_Text_1DD68A, 4 specialvar VAR_RESULT, sub_8139348 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, SlateportCity_EventScript_1DCE38 specialvar VAR_RESULT, sub_81393C8 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, SlateportCity_EventScript_1DCE2E msgbox SlateportCity_Text_1DD697, 4 playfanfare BGM_FANFA4 @@ -170,7 +170,7 @@ SlateportCity_EventScript_1DCE38:: @ 81DCE38 SlateportCity_EventScript_1DCE42:: @ 81DCE42 lock faceplayer - compare_var_to_value VAR_0x4058, 1 + compare VAR_0x4058, 1 call_if 1, SlateportCity_EventScript_1DCE59 msgbox SlateportCity_Text_1DD81A, 4 release @@ -184,7 +184,7 @@ SlateportCity_EventScript_1DCE59:: @ 81DCE59 SlateportCity_EventScript_1DCE63:: @ 81DCE63 lock faceplayer - compare_var_to_value VAR_0x4058, 1 + compare VAR_0x4058, 1 call_if 1, SlateportCity_EventScript_1DCE7A msgbox SlateportCity_Text_1DD8A6, 4 release @@ -198,7 +198,7 @@ SlateportCity_EventScript_1DCE7A:: @ 81DCE7A SlateportCity_EventScript_1DCE84:: @ 81DCE84 lock faceplayer - compare_var_to_value VAR_0x4058, 1 + compare VAR_0x4058, 1 call_if 1, SlateportCity_EventScript_1DCEA4 checkflag FLAG_0x060 goto_eq SlateportCity_EventScript_1DCEAE @@ -219,7 +219,7 @@ SlateportCity_EventScript_1DCEAE:: @ 81DCEAE SlateportCity_EventScript_1DCEB8:: @ 81DCEB8 lock faceplayer - compare_var_to_value VAR_0x4058, 1 + compare VAR_0x4058, 1 call_if 1, SlateportCity_EventScript_1DCECF msgbox SlateportCity_Text_1DDA34, 4 release @@ -231,7 +231,7 @@ SlateportCity_EventScript_1DCECF:: @ 81DCECF end SlateportCity_EventScript_1DCED9:: @ 81DCED9 - compare_var_to_value VAR_0x4058, 1 + compare VAR_0x4058, 1 goto_eq SlateportCity_EventScript_1DCEED msgbox SlateportCity_Text_1DDA9A, 2 end @@ -243,7 +243,7 @@ SlateportCity_EventScript_1DCEED:: @ 81DCEED SlateportCity_EventScript_1DCEF6:: @ 81DCEF6 lock faceplayer - compare_var_to_value VAR_0x4058, 1 + compare VAR_0x4058, 1 call_if 1, SlateportCity_EventScript_1DCF0D msgbox SlateportCity_Text_1DDB21, 4 release @@ -328,7 +328,7 @@ SlateportCity_EventScript_1DCFB2:: @ 81DCFB2 SlateportCity_EventScript_1DCFBB:: @ 81DCFBB lock faceplayer - compare_var_to_value VAR_0x4058, 1 + compare VAR_0x4058, 1 call_if 1, SlateportCity_EventScript_1DCFD2 msgbox SlateportCity_Text_1DE10E, 4 release @@ -740,7 +740,7 @@ SlateportCity_EventScript_1DD36E:: @ 81DD36E SlateportCity_EventScript_1DD39A:: @ 81DD39A setvar VAR_0x8004, 1 specialvar VAR_RESULT, sub_80246D4 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SlateportCity_EventScript_1DD3C0 msgbox SlateportCity_Text_1DEE40, 4 special sub_80248B0 @@ -859,20 +859,20 @@ SlateportCity_EventScript_1DD54A:: @ 81DD54A SlateportCity_EventScript_1DD557:: @ 81DD557 msgbox SlateportCity_Text_1DEE90, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SlateportCity_EventScript_1DD3CA copyvar VAR_0x8004, VAR_0x8009 specialvar VAR_RESULT, sub_80246D4 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SlateportCity_EventScript_1DD5CE giveitem_std VAR_0x8008 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SlateportCity_EventScript_1DD5C1 copyvar VAR_0x8004, VAR_0x8009 special sub_802477C special sub_802488C msgbox SlateportCity_Text_1DEEF7, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq SlateportCity_EventScript_1DD3CA msgbox SlateportCity_Text_1DEF79, 4 special sub_8024918 diff --git a/data/scripts/maps/SlateportCity_BattleTentBattleRoom.inc b/data/scripts/maps/SlateportCity_BattleTentBattleRoom.inc index 6917cac5d..e0c6da76c 100644 --- a/data/scripts/maps/SlateportCity_BattleTentBattleRoom.inc +++ b/data/scripts/maps/SlateportCity_BattleTentBattleRoom.inc @@ -10,9 +10,9 @@ SlateportCity_BattleTentBattleRoom_MapScript1_209970: @ 8209970 SlateportCity_BattleTentBattleRoom_EventScript_209976:: @ 8209976 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SlateportCity_BattleTentBattleRoom_EventScript_20998E - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq SlateportCity_BattleTentBattleRoom_EventScript_209994 return @@ -54,7 +54,7 @@ SlateportCity_BattleTentBattleRoom_EventScript_2099BE:: @ 82099BE msgbox 0x2021fc4, 4 waitmessage closemessage - special sp000_heal_pokemon + special HealPlayerParty setvar VAR_0x8004, 6 setvar VAR_0x8005, 0 special sub_8163AC4 diff --git a/data/scripts/maps/SlateportCity_BattleTentCorridor.inc b/data/scripts/maps/SlateportCity_BattleTentCorridor.inc index 2d14359f0..e1f464368 100644 --- a/data/scripts/maps/SlateportCity_BattleTentCorridor.inc +++ b/data/scripts/maps/SlateportCity_BattleTentCorridor.inc @@ -9,7 +9,7 @@ SlateportCity_BattleTentCorridor_MapScript2_208E31: @ 8208E31 SlateportCity_BattleTentCorridor_EventScript_208E3B:: @ 8208E3B setvar VAR_0x4001, 1 - compare_var_to_value VAR_0x8006, 1 + compare VAR_0x8006, 1 goto_if 5, SlateportCity_BattleTentCorridor_EventScript_208E56 setobjectxy 1, 2, 2 turnobject 1, 1 @@ -23,13 +23,13 @@ SlateportCity_BattleTentCorridor_MapScript2_208E5B: @ 8208E5B .2byte 0 SlateportCity_BattleTentCorridor_EventScript_208E65:: @ 8208E65 - compare_var_to_value VAR_0x8006, 1 + compare VAR_0x8006, 1 goto_eq SlateportCity_BattleTentCorridor_EventScript_208EEE setvar VAR_0x4000, 1 applymovement 1, SlateportCity_BattleTentCorridor_Movement_209062 applymovement 255, SlateportCity_BattleTentCorridor_Movement_209059 waitmovement 0 - compare_var_to_value VAR_0x8006, 2 + compare VAR_0x8006, 2 goto_eq SlateportCity_BattleTentCorridor_EventScript_209044 setvar VAR_0x8004, 9 special sub_81B9D08 @@ -65,15 +65,15 @@ SlateportCity_BattleTentCorridor_EventScript_208EEE:: @ 8208EEE msgbox SlateportCity_BattleTentCorridor_Text_25A22D, 4 playfanfare BGM_ME_ASA waitfanfare - special sp000_heal_pokemon + special HealPlayerParty SlateportCity_BattleTentCorridor_EventScript_208F0D:: @ 8208F0D setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 special sub_81A1780 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, SlateportCity_BattleTentCorridor_EventScript_209014 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 call_if 1, SlateportCity_BattleTentCorridor_EventScript_20901B multichoice 20, 6, 104, 1 switch VAR_RESULT @@ -111,7 +111,7 @@ SlateportCity_BattleTentCorridor_EventScript_208FF1:: @ 8208FF1 setvar VAR_0x8004, 7 special sub_81B9D08 waitstate - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq SlateportCity_BattleTentCorridor_EventScript_208EB4 msgbox SlateportCity_BattleTentCorridor_Text_25AB6C, 4 goto SlateportCity_BattleTentCorridor_EventScript_208EB4 diff --git a/data/scripts/maps/SlateportCity_BattleTentLobby.inc b/data/scripts/maps/SlateportCity_BattleTentLobby.inc index 24c685c6e..985251556 100644 --- a/data/scripts/maps/SlateportCity_BattleTentLobby.inc +++ b/data/scripts/maps/SlateportCity_BattleTentLobby.inc @@ -120,7 +120,7 @@ SlateportCity_BattleTentLobby_EventScript_2088AA:: @ 82088AA faceplayer setvar VAR_0x8004, 1 special sub_81B9D08 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if 5, SlateportCity_BattleTentLobby_EventScript_2087E9 special copy_player_party_to_sav1 msgbox SlateportCity_BattleTentLobby_Text_2C5810, 4 @@ -167,7 +167,7 @@ SlateportCity_BattleTentLobby_EventScript_208950:: @ 8208950 delay 2 call SlateportCity_BattleTentLobby_EventScript_27134F setvar VAR_0x4000, 255 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SlateportCity_BattleTentLobby_EventScript_208A14 setvar VAR_0x8006, 0 @@ -249,7 +249,7 @@ SlateportCity_BattleTentLobby_EventScript_208A3D:: @ 8208A3D goto_eq SlateportCity_BattleTentLobby_EventScript_208A74 msgbox SlateportCity_BattleTentLobby_Text_208B4E, 4 giveitem_std ITEM_TM41 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SlateportCity_BattleTentLobby_EventScript_272054 setflag FLAG_0x109 msgbox SlateportCity_BattleTentLobby_Text_208C5C, 4 diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc index f6bfe736e..aa8704027 100644 --- a/data/scripts/maps/SlateportCity_Harbor.inc +++ b/data/scripts/maps/SlateportCity_Harbor.inc @@ -5,7 +5,7 @@ SlateportCity_Harbor_MapScripts:: @ 820C97D SlateportCity_Harbor_MapScript1_20C983: @ 820C983 setescapewarp SLATEPORT_CITY, 255, 28, 13 setvar VAR_0x4001, 0 - compare_var_to_value VAR_0x40A0, 1 + compare VAR_0x40A0, 1 call_if 1, SlateportCity_Harbor_EventScript_20C9A9 checkflag FLAG_SYS_GAME_CLEAR call_if 1, SlateportCity_Harbor_EventScript_20C9A5 @@ -66,13 +66,13 @@ SlateportCity_Harbor_EventScript_20C9F5:: @ 820C9F5 setvar VAR_0x40A0, 2 setflag FLAG_0x061 setflag FLAG_0x313 - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 call_if 1, SlateportCity_Harbor_EventScript_20CA89 - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if 1, SlateportCity_Harbor_EventScript_20CA9E - compare_var_to_value VAR_0x8008, 2 + compare VAR_0x8008, 2 call_if 1, SlateportCity_Harbor_EventScript_20CAB3 - compare_var_to_value VAR_0x8008, 3 + compare VAR_0x8008, 3 call_if 1, SlateportCity_Harbor_EventScript_20CAB3 msgbox SlateportCity_Harbor_Text_20D35A, 4 closemessage @@ -201,7 +201,7 @@ SlateportCity_Harbor_EventScript_20CB88:: @ 820CB88 SlateportCity_Harbor_EventScript_20CB92:: @ 820CB92 msgbox SlateportCity_Harbor_Text_20CF93, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SlateportCity_Harbor_EventScript_20CBDD setvar VAR_PORTHOLE, 1 call SlateportCity_Harbor_EventScript_20CBE9 @@ -212,7 +212,7 @@ SlateportCity_Harbor_EventScript_20CB92:: @ 820CB92 SlateportCity_Harbor_EventScript_20CBBA:: @ 820CBBA msgbox SlateportCity_Harbor_Text_20CFAE, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SlateportCity_Harbor_EventScript_20CBDD call SlateportCity_Harbor_EventScript_20CBE9 warp BATTLE_FRONTIER_OUTSIDE_WEST, 255, 19, 67 @@ -233,9 +233,9 @@ SlateportCity_Harbor_EventScript_20CBE9:: @ 820CBE9 waitmovement 0 delay 30 hideobjectat VAR_LAST_TALKED, SLATEPORT_CITY_HARBOR - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if 1, SlateportCity_Harbor_EventScript_20CC42 - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if 1, SlateportCity_Harbor_EventScript_20CC37 delay 30 hideobjectat 255, PETALBURG_CITY @@ -277,7 +277,7 @@ SlateportCity_Harbor_EventScript_20CC52:: @ 820CC52 call_if 1, SlateportCity_Harbor_EventScript_20CC93 checkflag FLAG_0x1BF call_if 1, SlateportCity_Harbor_EventScript_20CC93 - compare_var_to_value VAR_0x8004, 2 + compare VAR_0x8004, 2 goto_eq SlateportCity_Harbor_EventScript_20CC89 msgbox SlateportCity_Harbor_Text_20D08E, 4 release @@ -305,7 +305,7 @@ SlateportCity_Harbor_EventScript_20CCA2:: @ 820CCA2 goto_eq SlateportCity_Harbor_EventScript_20CCF6 checkflag FLAG_0x070 goto_eq SlateportCity_Harbor_EventScript_20CCE9 - compare_var_to_value VAR_0x40A0, 2 + compare VAR_0x40A0, 2 goto_eq SlateportCity_Harbor_EventScript_20CCDF msgbox SlateportCity_Harbor_Text_20D232, 4 closemessage @@ -331,10 +331,10 @@ SlateportCity_Harbor_EventScript_20CCF6:: @ 820CCF6 end SlateportCity_Harbor_EventScript_20CD00:: @ 820CD00 - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 goto_eq SlateportCity_Harbor_EventScript_20CE11 checkitem ITEM_SCANNER, 1 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq SlateportCity_Harbor_EventScript_20CD38 checkflag FLAG_SYS_GAME_CLEAR goto_eq SlateportCity_Harbor_EventScript_20CD2E @@ -364,10 +364,10 @@ SlateportCity_Harbor_EventScript_20CD44:: @ 820CD44 SlateportCity_Harbor_EventScript_20CD7B:: @ 820CD7B msgbox SlateportCity_Harbor_Text_20D8BC, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SlateportCity_Harbor_EventScript_20CE05 giveitem_std ITEM_DEEP_SEA_TOOTH - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SlateportCity_Harbor_EventScript_272054 takeitem ITEM_SCANNER, 1 msgbox SlateportCity_Harbor_Text_20D94A, 4 @@ -377,10 +377,10 @@ SlateportCity_Harbor_EventScript_20CD7B:: @ 820CD7B SlateportCity_Harbor_EventScript_20CDBB:: @ 820CDBB msgbox SlateportCity_Harbor_Text_20D8F1, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SlateportCity_Harbor_EventScript_20CE05 giveitem_std ITEM_DEEP_SEA_SCALE - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SlateportCity_Harbor_EventScript_272054 takeitem ITEM_SCANNER, 1 msgbox SlateportCity_Harbor_Text_20D94A, 4 diff --git a/data/scripts/maps/SlateportCity_House1.inc b/data/scripts/maps/SlateportCity_House1.inc index c6fcff184..f8ae54145 100644 --- a/data/scripts/maps/SlateportCity_House1.inc +++ b/data/scripts/maps/SlateportCity_House1.inc @@ -5,9 +5,9 @@ SlateportCity_House1_EventScript_209AA5:: @ 8209AA5 lock faceplayer msgbox SlateportCity_House1_Text_209B8E, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq SlateportCity_House1_EventScript_209AC6 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SlateportCity_House1_EventScript_209AE9 end @@ -15,9 +15,9 @@ SlateportCity_House1_EventScript_209AC6:: @ 8209AC6 msgbox SlateportCity_House1_Text_209BFF, 4 special sub_81B94B0 waitstate - compare_var_to_value VAR_0x8004, 255 + compare VAR_0x8004, 255 goto_if 5, SlateportCity_House1_EventScript_209AF3 - compare_var_to_value VAR_0x8004, 255 + compare VAR_0x8004, 255 goto_eq SlateportCity_House1_EventScript_209AE9 end @@ -28,20 +28,20 @@ SlateportCity_House1_EventScript_209AE9:: @ 8209AE9 SlateportCity_House1_EventScript_209AF3:: @ 8209AF3 specialvar VAR_RESULT, sub_81396E0 - compare_var_to_value VAR_RESULT, 412 + compare VAR_RESULT, 412 goto_eq SlateportCity_House1_EventScript_209B46 special TV_CopyNicknameToStringVar1AndEnsureTerminated special TV_CheckMonOTIDEqualsPlayerID - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq SlateportCity_House1_EventScript_209B50 specialvar VAR_RESULT, sub_8139770 special TV_CopyNicknameToStringVar1AndEnsureTerminated - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq SlateportCity_House1_EventScript_209B50 msgbox SlateportCity_House1_Text_209C2B, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq SlateportCity_House1_EventScript_209B5A - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SlateportCity_House1_EventScript_209AE9 end @@ -60,7 +60,7 @@ SlateportCity_House1_EventScript_209B5A:: @ 8209B5A call SlateportCity_House1_EventScript_2723DD specialvar VAR_RESULT, TV_PutNameRaterShowOnTheAirIfNicnkameChanged special TV_CopyNicknameToStringVar1AndEnsureTerminated - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq SlateportCity_House1_EventScript_209B84 msgbox SlateportCity_House1_Text_209D5E, 4 release diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc index 065951712..ba8575c66 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc @@ -22,7 +22,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_20ADB0:: @ 820ADB0 SlateportCity_OceanicMuseum_1F_EventScript_20ADC1:: @ 820ADC1 showmoneybox 0, 0, 0 msgbox SlateportCity_OceanicMuseum_1F_Text_20AFD5, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq SlateportCity_OceanicMuseum_1F_EventScript_20ADE8 closemessage hidemoneybox @@ -35,7 +35,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_20ADC1:: @ 820ADC1 SlateportCity_OceanicMuseum_1F_EventScript_20ADE8:: @ 820ADE8 checkmoney 0x32, 0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SlateportCity_OceanicMuseum_1F_EventScript_20AE18 playse SE_REGI takemoney 0x32, 0 @@ -162,18 +162,18 @@ SlateportCity_OceanicMuseum_1F_EventScript_20AEF8:: @ 820AEF8 waitmovement 0 msgbox SlateportCity_OceanicMuseum_1F_Text_20B3AB, 4 giveitem_std ITEM_TM46 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SlateportCity_OceanicMuseum_1F_EventScript_20AFB5 setflag FLAG_0x10D msgbox SlateportCity_OceanicMuseum_1F_Text_20B449, 4 closemessage - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 goto_eq SlateportCity_OceanicMuseum_1F_EventScript_20AF6C - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 goto_eq SlateportCity_OceanicMuseum_1F_EventScript_20AF83 - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 goto_eq SlateportCity_OceanicMuseum_1F_EventScript_20AF93 - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 goto_eq SlateportCity_OceanicMuseum_1F_EventScript_20AF93 end diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc index 463c7235c..75f967fef 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc @@ -16,21 +16,21 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BB00:: @ 820BB00 applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_20BCE8 applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_20BCF5 waitmovement 0 - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_20BC92 - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_20BC92 msgbox SlateportCity_OceanicMuseum_2F_Text_20BE40, 4 - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if 5, SlateportCity_OceanicMuseum_2F_EventScript_20BC9D msgbox SlateportCity_OceanicMuseum_2F_Text_20BE69, 4 msgbox SlateportCity_OceanicMuseum_2F_Text_20BE93, 4 closemessage applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_20BCE2 waitmovement 0 - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_20BCA8 - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_20BCB3 trainerbattle 3, TRAINER_GRUNT_14, 0, SlateportCity_OceanicMuseum_2F_Text_20BEE2 msgbox SlateportCity_OceanicMuseum_2F_Text_20BEFA, 4 @@ -78,10 +78,10 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BB00:: @ 820BB00 fadescreen 1 playfanfare BGM_ME_ASA waitfanfare - special sp000_heal_pokemon + special HealPlayerParty removeobject 1 setflag FLAG_0x384 - compare_var_to_value VAR_0x40DA, 0 + compare VAR_0x40DA, 0 call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_20BC8C setflag FLAG_0x095 clearflag FLAG_0x3B3 diff --git a/data/scripts/maps/SlateportCity_PokemonFanClub.inc b/data/scripts/maps/SlateportCity_PokemonFanClub.inc index 227853c96..19094db0d 100644 --- a/data/scripts/maps/SlateportCity_PokemonFanClub.inc +++ b/data/scripts/maps/SlateportCity_PokemonFanClub.inc @@ -33,9 +33,9 @@ SlateportCity_PokemonFanClub_EventScript_209EE5:: @ 8209EE5 call_if 1, SlateportCity_PokemonFanClub_EventScript_209FD0 checkflag FLAG_0x0C8 call_if 1, SlateportCity_PokemonFanClub_EventScript_209FD0 - compare_var_to_value VAR_0x4002, 5 + compare VAR_0x4002, 5 call_if 1, SlateportCity_PokemonFanClub_EventScript_209FCA - compare_var_to_value VAR_0x40B7, 2 + compare VAR_0x40B7, 2 goto_eq SlateportCity_PokemonFanClub_EventScript_209F3B msgbox SlateportCity_PokemonFanClub_Text_20A62A, 4 goto SlateportCity_PokemonFanClub_EventScript_209F45 @@ -85,7 +85,7 @@ SlateportCity_PokemonFanClub_EventScript_209FD6:: @ 8209FD6 SlateportCity_PokemonFanClub_EventScript_209FE0:: @ 8209FE0 checkitemspace ITEM_RED_SCARF, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SlateportCity_PokemonFanClub_EventScript_20A0D5 msgbox SlateportCity_PokemonFanClub_Text_20A795, 4 setflag FLAG_0x0C8 @@ -96,7 +96,7 @@ SlateportCity_PokemonFanClub_EventScript_209FE0:: @ 8209FE0 SlateportCity_PokemonFanClub_EventScript_20A011:: @ 820A011 checkitemspace ITEM_BLUE_SCARF, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SlateportCity_PokemonFanClub_EventScript_20A0D5 msgbox SlateportCity_PokemonFanClub_Text_20A795, 4 setflag FLAG_0x0C9 @@ -107,7 +107,7 @@ SlateportCity_PokemonFanClub_EventScript_20A011:: @ 820A011 SlateportCity_PokemonFanClub_EventScript_20A042:: @ 820A042 checkitemspace ITEM_PINK_SCARF, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SlateportCity_PokemonFanClub_EventScript_20A0D5 msgbox SlateportCity_PokemonFanClub_Text_20A795, 4 setflag FLAG_0x0CA @@ -118,7 +118,7 @@ SlateportCity_PokemonFanClub_EventScript_20A042:: @ 820A042 SlateportCity_PokemonFanClub_EventScript_20A073:: @ 820A073 checkitemspace ITEM_GREEN_SCARF, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SlateportCity_PokemonFanClub_EventScript_20A0D5 msgbox SlateportCity_PokemonFanClub_Text_20A795, 4 setflag FLAG_0x0CB @@ -129,7 +129,7 @@ SlateportCity_PokemonFanClub_EventScript_20A073:: @ 820A073 SlateportCity_PokemonFanClub_EventScript_20A0A4:: @ 820A0A4 checkitemspace ITEM_YELLOW_SCARF, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SlateportCity_PokemonFanClub_EventScript_20A0D5 msgbox SlateportCity_PokemonFanClub_Text_20A795, 4 setflag FLAG_0x0CC @@ -145,7 +145,7 @@ SlateportCity_PokemonFanClub_EventScript_20A0D5:: @ 820A0D5 SlateportCity_PokemonFanClub_EventScript_20A0DF:: @ 820A0DF specialvar VAR_RESULT, sub_8139004 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, SlateportCity_PokemonFanClub_EventScript_20A0F0 return @@ -155,7 +155,7 @@ SlateportCity_PokemonFanClub_EventScript_20A0F0:: @ 820A0F0 SlateportCity_PokemonFanClub_EventScript_20A0F6:: @ 820A0F6 specialvar VAR_RESULT, sub_8139030 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, SlateportCity_PokemonFanClub_EventScript_20A107 return @@ -165,7 +165,7 @@ SlateportCity_PokemonFanClub_EventScript_20A107:: @ 820A107 SlateportCity_PokemonFanClub_EventScript_20A10D:: @ 820A10D specialvar VAR_RESULT, sub_813905C - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, SlateportCity_PokemonFanClub_EventScript_20A11E return @@ -175,7 +175,7 @@ SlateportCity_PokemonFanClub_EventScript_20A11E:: @ 820A11E SlateportCity_PokemonFanClub_EventScript_20A124:: @ 820A124 specialvar VAR_RESULT, sub_8139088 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, SlateportCity_PokemonFanClub_EventScript_20A135 return @@ -185,7 +185,7 @@ SlateportCity_PokemonFanClub_EventScript_20A135:: @ 820A135 SlateportCity_PokemonFanClub_EventScript_20A13B:: @ 820A13B specialvar VAR_RESULT, sub_81390B4 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, SlateportCity_PokemonFanClub_EventScript_20A14C return @@ -218,7 +218,7 @@ SlateportCity_PokemonFanClub_EventScript_20A17E:: @ 820A17E goto_eq SlateportCity_PokemonFanClub_EventScript_20A1DE msgbox SlateportCity_PokemonFanClub_Text_20AA77, 4 specialvar VAR_RESULT, sub_8138C04 - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 goto_if 4, SlateportCity_PokemonFanClub_EventScript_20A1A3 release end @@ -231,7 +231,7 @@ SlateportCity_PokemonFanClub_EventScript_20A1A3:: @ 820A1A3 waitmovement 0 msgbox SlateportCity_PokemonFanClub_Text_20AB63, 4 giveitem_std ITEM_SOOTHE_BELL - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SlateportCity_PokemonFanClub_EventScript_272054 setflag FLAG_0x116 release diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc index d9eaee6eb..2883c5c2a 100644 --- a/data/scripts/maps/SootopolisCity.inc +++ b/data/scripts/maps/SootopolisCity.inc @@ -36,31 +36,31 @@ SootopolisCity_EventScript_1E56E5:: @ 81E56E5 SootopolisCity_MapScript1_1E56EF: @ 81E56EF setflag FLAG_VISITED_SOOTOPOLIS_CITY - compare_var_to_value VAR_0x405E, 1 + compare VAR_0x405E, 1 call_if 1, SootopolisCity_EventScript_1E5781 - compare_var_to_value VAR_0x40CA, 1 + compare VAR_0x40CA, 1 call_if 1, SootopolisCity_EventScript_1E5781 call SootopolisCity_EventScript_1E5805 call SootopolisCity_EventScript_1E57B2 - compare_var_to_value VAR_0x405E, 1 + compare VAR_0x405E, 1 call_if 1, SootopolisCity_EventScript_1E5785 - compare_var_to_value VAR_0x405E, 2 + compare VAR_0x405E, 2 call_if 1, SootopolisCity_EventScript_1E5785 - compare_var_to_value VAR_0x405E, 3 + compare VAR_0x405E, 3 call_if 1, SootopolisCity_EventScript_1E5785 - compare_var_to_value VAR_0x405E, 4 + compare VAR_0x405E, 4 call_if 1, SootopolisCity_EventScript_1E5785 - compare_var_to_value VAR_0x405E, 5 + compare VAR_0x405E, 5 call_if 1, SootopolisCity_EventScript_1E5785 - compare_var_to_value VAR_0x405E, 2 + compare VAR_0x405E, 2 call_if 1, SootopolisCity_EventScript_1E5842 - compare_var_to_value VAR_0x405E, 3 + compare VAR_0x405E, 3 call_if 1, SootopolisCity_EventScript_1E5842 - compare_var_to_value VAR_0x405E, 4 + compare VAR_0x405E, 4 call_if 1, SootopolisCity_EventScript_1E585B - compare_var_to_value VAR_0x405E, 5 + compare VAR_0x405E, 5 call_if 1, SootopolisCity_EventScript_1E5871 - compare_var_to_value VAR_0x405E, 6 + compare VAR_0x405E, 6 call_if 1, SootopolisCity_EventScript_1E58D3 end @@ -80,19 +80,19 @@ SootopolisCity_EventScript_1E5785:: @ 81E5785 return SootopolisCity_EventScript_1E57B2:: @ 81E57B2 - compare_var_to_value VAR_0x405E, 0 + compare VAR_0x405E, 0 goto_eq SootopolisCity_EventScript_1E5800 - compare_var_to_value VAR_0x405E, 6 + compare VAR_0x405E, 6 goto_if 4, SootopolisCity_EventScript_1E5800 - compare_var_to_value VAR_0x405E, 1 + compare VAR_0x405E, 1 goto_eq SootopolisCity_EventScript_1E5801 - compare_var_to_value VAR_0x405E, 2 + compare VAR_0x405E, 2 goto_eq SootopolisCity_EventScript_1E5801 - compare_var_to_value VAR_0x405E, 3 + compare VAR_0x405E, 3 goto_eq SootopolisCity_EventScript_1E5801 - compare_var_to_value VAR_0x405E, 4 + compare VAR_0x405E, 4 goto_eq SootopolisCity_EventScript_1E5801 - compare_var_to_value VAR_0x40CA, 1 + compare VAR_0x40CA, 1 goto_if 3, SootopolisCity_EventScript_1E5801 return @@ -104,15 +104,15 @@ SootopolisCity_EventScript_1E5801:: @ 81E5801 return SootopolisCity_EventScript_1E5805:: @ 81E5805 - compare_var_to_value VAR_0x405E, 0 + compare VAR_0x405E, 0 goto_eq SootopolisCity_EventScript_1E583D - compare_var_to_value VAR_0x405E, 6 + compare VAR_0x405E, 6 goto_if 4, SootopolisCity_EventScript_1E583D - compare_var_to_value VAR_0x405E, 1 + compare VAR_0x405E, 1 goto_eq SootopolisCity_EventScript_1E583E - compare_var_to_value VAR_0x40CA, 1 + compare VAR_0x40CA, 1 goto_eq SootopolisCity_EventScript_1E583E - compare_var_to_value VAR_0x40CA, 1 + compare VAR_0x40CA, 1 goto_if 3, SootopolisCity_EventScript_27207A return @@ -144,11 +144,11 @@ SootopolisCity_EventScript_1E5871:: @ 81E5871 setobjectxyperm 7, 29, 33 setobjectxyperm 16, 33, 35 setobjectxyperm 17, 34, 35 - compare_var_to_value VAR_0x40D8, 0 + compare VAR_0x40D8, 0 call_if 1, SootopolisCity_EventScript_1E58AF - compare_var_to_value VAR_0x40D8, 1 + compare VAR_0x40D8, 1 call_if 1, SootopolisCity_EventScript_1E58BB - compare_var_to_value VAR_0x40D8, 2 + compare VAR_0x40D8, 2 call_if 1, SootopolisCity_EventScript_1E58C7 return @@ -176,9 +176,9 @@ SootopolisCity_MapScript2_1E58DB: @ 81E58DB .2byte 0 SootopolisCity_EventScript_1E58E5:: @ 81E58E5 - compare_var_to_value VAR_0x40CA, 1 + compare VAR_0x40CA, 1 call_if 1, SootopolisCity_EventScript_1E58FC - compare_var_to_value VAR_0x40CA, 2 + compare VAR_0x40CA, 2 call_if 1, SootopolisCity_EventScript_1E5901 end @@ -203,9 +203,9 @@ SootopolisCity_MapScript2_1E5914: @ 81E5914 SootopolisCity_EventScript_1E5926:: @ 81E5926 lockall special sub_8138AD0 - compare_var_to_value VAR_0x8004, 43 + compare VAR_0x8004, 43 goto_if 5, SootopolisCity_EventScript_1E5A82 - compare_var_to_value VAR_0x8005, 32 + compare VAR_0x8005, 32 goto_if 5, SootopolisCity_EventScript_1E5A82 goto SootopolisCity_EventScript_1E5946 end @@ -493,9 +493,9 @@ SootopolisCity_Movement_1E5BF7: @ 81E5BF7 SootopolisCity_EventScript_1E5BFE:: @ 81E5BFE lockall special sub_8138AD0 - compare_var_to_value VAR_0x8004, 43 + compare VAR_0x8004, 43 goto_if 5, SootopolisCity_EventScript_1E5CCE - compare_var_to_value VAR_0x8005, 32 + compare VAR_0x8005, 32 goto_if 5, SootopolisCity_EventScript_1E5CCE goto SootopolisCity_EventScript_1E5C1E end @@ -698,11 +698,11 @@ SootopolisCity_Movement_1E5E7F: @ 81E5E7F SootopolisCity_EventScript_1E5E8D:: @ 81E5E8D lock faceplayer - compare_var_to_value VAR_0x405E, 6 + compare VAR_0x405E, 6 goto_if 4, SootopolisCity_EventScript_1E5EC4 - compare_var_to_value VAR_0x405E, 5 + compare VAR_0x405E, 5 goto_eq SootopolisCity_EventScript_1E5ECE - compare_var_to_value VAR_0x405E, 2 + compare VAR_0x405E, 2 goto_if 4, SootopolisCity_EventScript_1E5EBA msgbox SootopolisCity_Text_1E6D77, 4 release @@ -726,11 +726,11 @@ SootopolisCity_EventScript_1E5ECE:: @ 81E5ECE SootopolisCity_EventScript_1E5ED8:: @ 81E5ED8 lock faceplayer - compare_var_to_value VAR_0x405E, 1 + compare VAR_0x405E, 1 goto_if 3, SootopolisCity_EventScript_1E5F1B - compare_var_to_value VAR_0x405E, 6 + compare VAR_0x405E, 6 goto_if 4, SootopolisCity_EventScript_1E5F1B - compare_var_to_value VAR_0x405E, 5 + compare VAR_0x405E, 5 goto_eq SootopolisCity_EventScript_1E5F10 msgbox SootopolisCity_Text_1E6BFF, 4 closemessage @@ -755,20 +755,20 @@ SootopolisCity_EventScript_1E5F1B:: @ 81E5F1B addvar VAR_RESULT, 20 addvar VAR_RESULT, 133 giveitem_std VAR_RESULT - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SootopolisCity_EventScript_272054 setflag FLAG_0x932 msgbox SootopolisCity_Text_2A7C7C, 4 random 2 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SootopolisCity_EventScript_1E5F79 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq SootopolisCity_EventScript_1E5F9A end SootopolisCity_EventScript_1E5F79:: @ 81E5F79 giveitem_std ITEM_FIGY_BERRY - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SootopolisCity_EventScript_272054 msgbox SootopolisCity_Text_2A7CB7, 4 release @@ -776,7 +776,7 @@ SootopolisCity_EventScript_1E5F79:: @ 81E5F79 SootopolisCity_EventScript_1E5F9A:: @ 81E5F9A giveitem_std ITEM_IAPAPA_BERRY - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SootopolisCity_EventScript_272054 msgbox SootopolisCity_Text_2A7CB7, 4 release @@ -784,7 +784,7 @@ SootopolisCity_EventScript_1E5F9A:: @ 81E5F9A SootopolisCity_EventScript_1E5FBB:: @ 81E5FBB msgbox SootopolisCity_Text_2A7CEC, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq SootopolisCity_EventScript_1E5FD8 msgbox SootopolisCity_Text_2A7DD2, 4 release @@ -799,7 +799,7 @@ SootopolisCity_EventScript_1E5FE2:: @ 81E5FE2 lockall applymovement 2, SootopolisCity_Movement_27259E waitmovement 0 - compare_var_to_value VAR_0x405E, 5 + compare VAR_0x405E, 5 goto_eq SootopolisCity_EventScript_1E600D msgbox SootopolisCity_Text_1E71A1, 4 closemessage @@ -816,7 +816,7 @@ SootopolisCity_EventScript_1E600D:: @ 81E600D SootopolisCity_EventScript_1E6017:: @ 81E6017 lock faceplayer - compare_var_to_value VAR_0x405E, 6 + compare VAR_0x405E, 6 goto_if 4, SootopolisCity_EventScript_1E602E msgbox SootopolisCity_Text_1E6CCA, 4 release @@ -830,11 +830,11 @@ SootopolisCity_EventScript_1E602E:: @ 81E602E SootopolisCity_EventScript_1E6038:: @ 81E6038 lock faceplayer - compare_var_to_value VAR_0x405E, 6 + compare VAR_0x405E, 6 goto_if 4, SootopolisCity_EventScript_1E607A - compare_var_to_value VAR_0x405E, 5 + compare VAR_0x405E, 5 goto_eq SootopolisCity_EventScript_1E6084 - compare_var_to_value VAR_0x405E, 2 + compare VAR_0x405E, 2 goto_if 4, SootopolisCity_EventScript_1E6065 msgbox SootopolisCity_Text_1E6F90, 4 release @@ -862,11 +862,11 @@ SootopolisCity_EventScript_1E608E:: @ 81E608E lockall applymovement 4, SootopolisCity_Movement_27259E waitmovement 0 - compare_var_to_value VAR_0x405E, 5 + compare VAR_0x405E, 5 goto_eq SootopolisCity_EventScript_1E60D9 - compare_var_to_value VAR_0x405E, 6 + compare VAR_0x405E, 6 goto_if 4, SootopolisCity_EventScript_1E60CF - compare_var_to_value VAR_0x405E, 1 + compare VAR_0x405E, 1 goto_if 3, SootopolisCity_EventScript_1E60CF msgbox SootopolisCity_Text_1E690B, 4 closemessage @@ -889,13 +889,13 @@ SootopolisCity_EventScript_1E60E3:: @ 81E60E3 lockall applymovement 5, SootopolisCity_Movement_27259E waitmovement 0 - compare_var_to_value VAR_0x405E, 5 + compare VAR_0x405E, 5 goto_eq SootopolisCity_EventScript_1E612D checkflag FLAG_SYS_GAME_CLEAR goto_eq SootopolisCity_EventScript_1E6137 - compare_var_to_value VAR_0x405E, 6 + compare VAR_0x405E, 6 goto_if 4, SootopolisCity_EventScript_1E6141 - compare_var_to_value VAR_0x405E, 1 + compare VAR_0x405E, 1 goto_if 3, SootopolisCity_EventScript_1E6141 msgbox SootopolisCity_Text_1E6692, 4 closemessage @@ -937,11 +937,11 @@ SootopolisCity_EventScript_1E6166:: @ 81E6166 waitmovement 0 checkflag FLAG_0x133 call_if 0, SootopolisCity_EventScript_1E61CC - compare_var_to_value VAR_0x405E, 2 + compare VAR_0x405E, 2 goto_eq SootopolisCity_EventScript_1E61AE - compare_var_to_value VAR_0x405E, 3 + compare VAR_0x405E, 3 goto_eq SootopolisCity_EventScript_1E61C2 - compare_var_to_value VAR_0x405E, 4 + compare VAR_0x405E, 4 goto_eq SootopolisCity_EventScript_1E61C2 checkflag FLAG_0x09E goto_eq SootopolisCity_EventScript_1E61B8 @@ -967,9 +967,9 @@ SootopolisCity_EventScript_1E61C2:: @ 81E61C2 SootopolisCity_EventScript_1E61CC:: @ 81E61CC msgbox SootopolisCity_Text_1E75CB, 4 closemessage - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if 1, SootopolisCity_EventScript_1E6243 - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if 1, SootopolisCity_EventScript_1E6255 msgbox SootopolisCity_Text_1E7737, 4 closemessage @@ -1271,7 +1271,7 @@ SootopolisCity_EventScript_1E635D:: @ 81E635D lockall applymovement 15, SootopolisCity_Movement_27259E waitmovement 0 - compare_var_to_value VAR_0x405E, 5 + compare VAR_0x405E, 5 goto_eq SootopolisCity_EventScript_1E6388 msgbox SootopolisCity_Text_1E67DC, 4 closemessage @@ -1288,7 +1288,7 @@ SootopolisCity_EventScript_1E6388:: @ 81E6388 SootopolisCity_EventScript_1E6393:: @ 81E6393 lockall - compare_var_to_value VAR_0x405E, 5 + compare VAR_0x405E, 5 goto_eq SootopolisCity_EventScript_1E63C7 msgbox SootopolisCity_Text_1E6936, 4 closemessage @@ -1312,7 +1312,7 @@ SootopolisCity_EventScript_1E63DB:: @ 81E63DB lockall applymovement 13, SootopolisCity_Movement_27259E waitmovement 0 - compare_var_to_value VAR_0x405E, 5 + compare VAR_0x405E, 5 goto_eq SootopolisCity_EventScript_1E6406 msgbox SootopolisCity_Text_1E6C7C, 4 closemessage @@ -1331,7 +1331,7 @@ SootopolisCity_EventScript_1E6411:: @ 81E6411 lockall applymovement 12, SootopolisCity_Movement_27259E waitmovement 0 - compare_var_to_value VAR_0x405E, 5 + compare VAR_0x405E, 5 goto_eq SootopolisCity_EventScript_1E643C msgbox SootopolisCity_Text_1E6A50, 4 closemessage @@ -1348,7 +1348,7 @@ SootopolisCity_EventScript_1E643C:: @ 81E643C SootopolisCity_EventScript_1E6446:: @ 81E6446 lock faceplayer - compare_var_to_value VAR_0x405E, 4 + compare VAR_0x405E, 4 goto_eq SootopolisCity_EventScript_1E64D8 checkflag FLAG_0x138 goto_eq SootopolisCity_EventScript_1E64E2 @@ -1364,11 +1364,11 @@ SootopolisCity_EventScript_1E646F:: @ 81E646F setflag FLAG_0x138 msgbox SootopolisCity_Text_1E7B86, 4 closemessage - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if 1, SootopolisCity_EventScript_1E64B2 - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if 1, SootopolisCity_EventScript_1E64B2 - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if 1, SootopolisCity_EventScript_1E64C5 release end @@ -1409,7 +1409,7 @@ SootopolisCity_Movement_1E64EF: @ 81E64EF SootopolisCity_EventScript_1E64F2:: @ 81E64F2 lockall - compare_var_to_value VAR_0x405E, 5 + compare VAR_0x405E, 5 goto_eq SootopolisCity_EventScript_1E6509 msgbox SootopolisCity_Text_1E72DB, 4 closemessage @@ -1426,7 +1426,7 @@ SootopolisCity_EventScript_1E6509:: @ 81E6509 SootopolisCity_EventScript_1E651F:: @ 81E651F lockall - compare_var_to_value VAR_0x405E, 5 + compare VAR_0x405E, 5 goto_eq SootopolisCity_EventScript_1E6536 msgbox SootopolisCity_Text_1E7460, 4 closemessage diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.inc b/data/scripts/maps/SootopolisCity_Gym_1F.inc index e28d8d13f..81bb9b7c2 100644 --- a/data/scripts/maps/SootopolisCity_Gym_1F.inc +++ b/data/scripts/maps/SootopolisCity_Gym_1F.inc @@ -19,11 +19,11 @@ SootopolisCity_Gym_1F_MapScript1_224E6A: @ 8224E6A end SootopolisCity_Gym_1F_EventScript_224E73:: @ 8224E73 - compare_var_to_value VAR_ICE_STEP_COUNT, 8 + compare VAR_ICE_STEP_COUNT, 8 goto_if 0, SootopolisCity_Gym_1F_EventScript_224ECA - compare_var_to_value VAR_ICE_STEP_COUNT, 28 + compare VAR_ICE_STEP_COUNT, 28 goto_if 0, SootopolisCity_Gym_1F_EventScript_224EB8 - compare_var_to_value VAR_ICE_STEP_COUNT, 67 + compare VAR_ICE_STEP_COUNT, 67 goto_if 0, SootopolisCity_Gym_1F_EventScript_224EA6 setmetatile 8, 4, 519, 0 setmetatile 8, 5, 519, 0 @@ -87,8 +87,8 @@ SootopolisCity_Gym_1F_Movement_224F42: @ 8224F42 SootopolisCity_Gym_1F_EventScript_224F44:: @ 8224F44 trainerbattle 1, TRAINER_JUAN_1, 0, SootopolisCity_Gym_1F_Text_225268, SootopolisCity_Gym_1F_Text_225432, SootopolisCity_Gym_1F_EventScript_224F82 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq SootopolisCity_Gym_1F_EventScript_225025 checkflag FLAG_0x0AC goto_if 0, SootopolisCity_Gym_1F_EventScript_224FF7 @@ -126,7 +126,7 @@ SootopolisCity_Gym_1F_EventScript_224F82:: @ 8224F82 SootopolisCity_Gym_1F_EventScript_224FD4:: @ 8224FD4 giveitem_std ITEM_TM03 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SootopolisCity_Gym_1F_EventScript_27205E msgbox SootopolisCity_Gym_1F_Text_2256C1, 4 setflag FLAG_0x0AC @@ -134,7 +134,7 @@ SootopolisCity_Gym_1F_EventScript_224FD4:: @ 8224FD4 SootopolisCity_Gym_1F_EventScript_224FF7:: @ 8224FF7 giveitem_std ITEM_TM03 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SootopolisCity_Gym_1F_EventScript_272054 msgbox SootopolisCity_Gym_1F_Text_2256C1, 4 setflag FLAG_0x0AC diff --git a/data/scripts/maps/SootopolisCity_House1.inc b/data/scripts/maps/SootopolisCity_House1.inc index 57ae7551f..7c898a0b2 100644 --- a/data/scripts/maps/SootopolisCity_House1.inc +++ b/data/scripts/maps/SootopolisCity_House1.inc @@ -8,7 +8,7 @@ SootopolisCity_House1_EventScript_22694D:: @ 822694D goto_eq SootopolisCity_House1_EventScript_226984 msgbox SootopolisCity_House1_Text_2269A1, 4 giveitem_std ITEM_TM31 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SootopolisCity_House1_EventScript_272054 setflag FLAG_0x079 msgbox SootopolisCity_House1_Text_226A13, 4 diff --git a/data/scripts/maps/SootopolisCity_House2.inc b/data/scripts/maps/SootopolisCity_House2.inc index 974dd7892..82270ca56 100644 --- a/data/scripts/maps/SootopolisCity_House2.inc +++ b/data/scripts/maps/SootopolisCity_House2.inc @@ -5,9 +5,9 @@ SootopolisCity_House2_EventScript_226A77:: @ 8226A77 lock faceplayer msgbox SootopolisCity_House2_Text_226AAB, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, SootopolisCity_House2_EventScript_226A99 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, SootopolisCity_House2_EventScript_226AA2 release end diff --git a/data/scripts/maps/SootopolisCity_House3.inc b/data/scripts/maps/SootopolisCity_House3.inc index e3d0c7be3..415f90642 100644 --- a/data/scripts/maps/SootopolisCity_House3.inc +++ b/data/scripts/maps/SootopolisCity_House3.inc @@ -5,7 +5,7 @@ SootopolisCity_House3_EventScript_226B72:: @ 8226B72 lock faceplayer msgbox SootopolisCity_House3_Text_226BA4, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq SootopolisCity_House3_EventScript_226B91 msgbox SootopolisCity_House3_Text_226C44, 4 release diff --git a/data/scripts/maps/SootopolisCity_House6.inc b/data/scripts/maps/SootopolisCity_House6.inc index 185ef284a..38c8456a3 100644 --- a/data/scripts/maps/SootopolisCity_House6.inc +++ b/data/scripts/maps/SootopolisCity_House6.inc @@ -7,11 +7,11 @@ SootopolisCity_House6_EventScript_226F5C:: @ 8226F5C checkflag FLAG_0x0F5 goto_eq SootopolisCity_House6_EventScript_226FA3 msgbox SootopolisCity_House6_Text_226FC3, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, SootopolisCity_House6_EventScript_226F99 msgbox SootopolisCity_House6_Text_227034, 4 givedecoration_std 117 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SootopolisCity_House6_EventScript_226FAD setflag FLAG_0x0F5 release diff --git a/data/scripts/maps/SootopolisCity_LotadAndSeedotHouse.inc b/data/scripts/maps/SootopolisCity_LotadAndSeedotHouse.inc index f8b4c6e2c..26a322b89 100644 --- a/data/scripts/maps/SootopolisCity_LotadAndSeedotHouse.inc +++ b/data/scripts/maps/SootopolisCity_LotadAndSeedotHouse.inc @@ -9,14 +9,14 @@ SootopolisCity_LotadAndSeedotHouse_EventScript_22722B:: @ 822722B special sub_81B94B0 waitstate copyvar VAR_RESULT, VAR_0x8004 - compare_var_to_value VAR_RESULT, 255 + compare VAR_RESULT, 255 goto_eq SootopolisCity_LotadAndSeedotHouse_EventScript_227272 special CompareSeedotSize - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq SootopolisCity_LotadAndSeedotHouse_EventScript_22727C - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_eq SootopolisCity_LotadAndSeedotHouse_EventScript_227286 - compare_var_to_value VAR_RESULT, 3 + compare VAR_RESULT, 3 goto_eq SootopolisCity_LotadAndSeedotHouse_EventScript_227290 release end @@ -39,7 +39,7 @@ SootopolisCity_LotadAndSeedotHouse_EventScript_227286:: @ 8227286 SootopolisCity_LotadAndSeedotHouse_EventScript_227290:: @ 8227290 msgbox SootopolisCity_LotadAndSeedotHouse_Text_227480, 4 giveitem_std ITEM_ELIXIR - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SootopolisCity_LotadAndSeedotHouse_EventScript_2272B2 closemessage release @@ -58,14 +58,14 @@ SootopolisCity_LotadAndSeedotHouse_EventScript_2272BC:: @ 82272BC special sub_81B94B0 waitstate copyvar VAR_RESULT, VAR_0x8004 - compare_var_to_value VAR_RESULT, 255 + compare VAR_RESULT, 255 goto_eq SootopolisCity_LotadAndSeedotHouse_EventScript_227303 special CompareLotadSize - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq SootopolisCity_LotadAndSeedotHouse_EventScript_22730D - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_eq SootopolisCity_LotadAndSeedotHouse_EventScript_227317 - compare_var_to_value VAR_RESULT, 3 + compare VAR_RESULT, 3 goto_eq SootopolisCity_LotadAndSeedotHouse_EventScript_227321 release end @@ -88,7 +88,7 @@ SootopolisCity_LotadAndSeedotHouse_EventScript_227317:: @ 8227317 SootopolisCity_LotadAndSeedotHouse_EventScript_227321:: @ 8227321 msgbox SootopolisCity_LotadAndSeedotHouse_Text_22776C, 4 giveitem_std ITEM_ELIXIR - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SootopolisCity_LotadAndSeedotHouse_EventScript_227343 closemessage release diff --git a/data/scripts/maps/SootopolisCity_Mart.inc b/data/scripts/maps/SootopolisCity_Mart.inc index b59ab9c93..26ab5497c 100644 --- a/data/scripts/maps/SootopolisCity_Mart.inc +++ b/data/scripts/maps/SootopolisCity_Mart.inc @@ -28,7 +28,7 @@ SootopolisCity_Mart_Pokemart_2267AC: @ 82267AC SootopolisCity_Mart_EventScript_2267C2:: @ 82267C2 lock faceplayer - compare_var_to_value VAR_0x40CA, 2 + compare VAR_0x40CA, 2 goto_if 4, SootopolisCity_Mart_EventScript_2267E2 checkflag FLAG_0x081 goto_if 0, SootopolisCity_Mart_EventScript_2267E2 @@ -44,7 +44,7 @@ SootopolisCity_Mart_EventScript_2267E2:: @ 82267E2 SootopolisCity_Mart_EventScript_2267EC:: @ 82267EC lock faceplayer - compare_var_to_value VAR_0x40CA, 2 + compare VAR_0x40CA, 2 goto_if 4, SootopolisCity_Mart_EventScript_22680C checkflag FLAG_0x081 goto_if 0, SootopolisCity_Mart_EventScript_22680C diff --git a/data/scripts/maps/SootopolisCity_MysteryEventsHouse_1F.inc b/data/scripts/maps/SootopolisCity_MysteryEventsHouse_1F.inc index ccd4558fd..019bdce10 100644 --- a/data/scripts/maps/SootopolisCity_MysteryEventsHouse_1F.inc +++ b/data/scripts/maps/SootopolisCity_MysteryEventsHouse_1F.inc @@ -6,9 +6,9 @@ SootopolisCity_MysteryEventsHouse_1F_MapScripts:: @ 8227953 SootopolisCity_MysteryEventsHouse_1F_MapScript1_22795E: @ 822795E setvar VAR_0x8004, 16 special sub_81A1780 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_22797D - compare_var_to_value VAR_0x40C0, 0 + compare VAR_0x40C0, 0 call_if 5, SootopolisCity_MysteryEventsHouse_1F_EventScript_227991 end @@ -39,11 +39,11 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7:: @ 82279B7 moveobjectoffscreen 1 applymovement 255, SootopolisCity_MysteryEventsHouse_1F_Movement_2725A6 waitmovement 0 - compare_var_to_value VAR_0x40C0, 1 + compare VAR_0x40C0, 1 call_if 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_227A04 - compare_var_to_value VAR_0x40C0, 2 + compare VAR_0x40C0, 2 call_if 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_227A0D - compare_var_to_value VAR_0x40C0, 3 + compare VAR_0x40C0, 3 call_if 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_227A16 special copy_player_party_from_sav1 setvar VAR_0x40C0, 0 @@ -76,9 +76,9 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_227A24:: @ 8227A24 faceplayer setvar VAR_0x8004, 16 special sub_81A1780 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227A4E - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 goto_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227A58 msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227B46, 4 release @@ -93,27 +93,27 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_227A58:: @ 8227A58 special copy_player_party_to_sav1 special sub_8139238 msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227BFC, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2 call SootopolisCity_MysteryEventsHouse_1F_EventScript_227AEF - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2 msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227CEB, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2 special copy_player_party_from_sav1 call SootopolisCity_MysteryEventsHouse_1F_EventScript_27134F - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2 special copy_player_party_to_sav1 special sub_80F94E8 msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227D21, 4 closemessage - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_227AFE - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_227B10 - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_227B22 warp SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F, 255, 3, 1 waitstate diff --git a/data/scripts/maps/SootopolisCity_MysteryEventsHouse_B1F.inc b/data/scripts/maps/SootopolisCity_MysteryEventsHouse_B1F.inc index 94733f189..f5b867405 100644 --- a/data/scripts/maps/SootopolisCity_MysteryEventsHouse_B1F.inc +++ b/data/scripts/maps/SootopolisCity_MysteryEventsHouse_B1F.inc @@ -22,14 +22,14 @@ SootopolisCity_MysteryEventsHouse_B1F_EventScript_227E68:: @ 8227E68 setvar VAR_0x8005, 0 special sub_8163AC4 waitstate - compare_var_to_value VAR_RESULT, 3 + compare VAR_RESULT, 3 call_if 1, SootopolisCity_MysteryEventsHouse_B1F_EventScript_227ECF - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, SootopolisCity_MysteryEventsHouse_B1F_EventScript_227EDD - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 call_if 1, SootopolisCity_MysteryEventsHouse_B1F_EventScript_227EE8 closemessage - special sp000_heal_pokemon + special HealPlayerParty applymovement 255, SootopolisCity_MysteryEventsHouse_B1F_Movement_227EF9 waitmovement 0 special copy_player_party_from_sav1 diff --git a/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc b/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc index b1b405335..fcb1b5863 100644 --- a/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc @@ -18,7 +18,7 @@ SootopolisCity_PokemonCenter_1F_EventScript_226500:: @ 8226500 SootopolisCity_PokemonCenter_1F_EventScript_22650E:: @ 822650E lock faceplayer - compare_var_to_value VAR_0x40CA, 2 + compare VAR_0x40CA, 2 goto_if 4, SootopolisCity_PokemonCenter_1F_EventScript_22652E checkflag FLAG_0x081 goto_if 0, SootopolisCity_PokemonCenter_1F_EventScript_22652E @@ -34,7 +34,7 @@ SootopolisCity_PokemonCenter_1F_EventScript_22652E:: @ 822652E SootopolisCity_PokemonCenter_1F_EventScript_226538:: @ 8226538 lock faceplayer - compare_var_to_value VAR_0x40CA, 2 + compare VAR_0x40CA, 2 goto_if 4, SootopolisCity_PokemonCenter_1F_EventScript_226558 checkflag FLAG_0x081 goto_if 0, SootopolisCity_PokemonCenter_1F_EventScript_226558 diff --git a/data/scripts/maps/SouthernIsland_Exterior.inc b/data/scripts/maps/SouthernIsland_Exterior.inc index de56c294b..ba1c6caec 100644 --- a/data/scripts/maps/SouthernIsland_Exterior.inc +++ b/data/scripts/maps/SouthernIsland_Exterior.inc @@ -10,7 +10,7 @@ SouthernIsland_Exterior_EventScript_2429D2:: @ 82429D2 lock faceplayer msgbox SouthernIsland_Exterior_Text_2A69F1, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SouthernIsland_Exterior_EventScript_242A17 msgbox SouthernIsland_Exterior_Text_2A6A5D, 4 closemessage diff --git a/data/scripts/maps/SouthernIsland_Interior.inc b/data/scripts/maps/SouthernIsland_Interior.inc index 1853c08b8..057c4581d 100644 --- a/data/scripts/maps/SouthernIsland_Interior.inc +++ b/data/scripts/maps/SouthernIsland_Interior.inc @@ -10,15 +10,15 @@ SouthernIsland_Interior_MapScript1_242A50: @ 8242A50 SouthernIsland_Interior_EventScript_242A5A:: @ 8242A5A specialvar VAR_RESULT, sub_8138B80 - compare_var_to_value VAR_RESULT, 7 + compare VAR_RESULT, 7 goto_if 5, SouthernIsland_Interior_EventScript_27374E removeobject 2 return SouthernIsland_Interior_MapScript1_242A6E: @ 8242A6E - compare_var_to_value VAR_0x40D5, 0 + compare VAR_0x40D5, 0 call_if 1, SouthernIsland_Interior_EventScript_242A8A - compare_var_to_value VAR_0x40D5, 0 + compare VAR_0x40D5, 0 call_if 5, SouthernIsland_Interior_EventScript_242A95 call SouthernIsland_Interior_EventScript_242AA0 end @@ -35,9 +35,9 @@ SouthernIsland_Interior_EventScript_242A95:: @ 8242A95 SouthernIsland_Interior_EventScript_242AA0:: @ 8242AA0 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SouthernIsland_Interior_EventScript_242AB8 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq SouthernIsland_Interior_EventScript_242ABE end @@ -82,20 +82,20 @@ SouthernIsland_Interior_EventScript_242AD0:: @ 8242AD0 delay 50 special RemoveScriptFieldObject setvar VAR_LAST_TALKED, 2 - compare_var_to_value VAR_0x40D5, 0 + compare VAR_0x40D5, 0 call_if 1, SouthernIsland_Interior_EventScript_242BA4 - compare_var_to_value VAR_0x40D5, 0 + compare VAR_0x40D5, 0 call_if 5, SouthernIsland_Interior_EventScript_242BB7 setflag FLAG_SYS_CTRL_OBJ_DELETE - special sub_80B08EC + special BattleSetup_StartLatiBattle waitstate clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, sub_8138B80 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq SouthernIsland_Interior_EventScript_242B81 - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 goto_eq SouthernIsland_Interior_EventScript_242B8F - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_eq SouthernIsland_Interior_EventScript_242B8F setflag FLAG_0x1C9 releaseall diff --git a/data/scripts/maps/TerraCave_End.inc b/data/scripts/maps/TerraCave_End.inc index a39856dda..63fc07f5b 100644 --- a/data/scripts/maps/TerraCave_End.inc +++ b/data/scripts/maps/TerraCave_End.inc @@ -10,7 +10,7 @@ TerraCave_End_MapScript1_23B0BB: @ 823B0BB TerraCave_End_EventScript_23B0C5:: @ 823B0C5 specialvar VAR_RESULT, sub_8138B80 - compare_var_to_value VAR_RESULT, 7 + compare VAR_RESULT, 7 goto_if 5, TerraCave_End_EventScript_27374E removeobject 1 return @@ -38,16 +38,16 @@ TerraCave_End_EventScript_23B0EC:: @ 823B0EC setvar VAR_LAST_TALKED, 1 setwildbattle SPECIES_GROUDON, 70, ITEM_NONE setflag FLAG_SYS_CTRL_OBJ_DELETE - special sub_80B0934 + special BattleSetup_StartLegendaryBattle waitstate clearflag FLAG_SYS_CTRL_OBJ_DELETE setvar VAR_0x4001, 0 specialvar VAR_RESULT, sub_8138B80 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq TerraCave_End_EventScript_23B155 - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 goto_eq TerraCave_End_EventScript_23B163 - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_eq TerraCave_End_EventScript_23B163 setvar VAR_0x4039, 1 setflag FLAG_0x1BF diff --git a/data/scripts/maps/TrainerHill_Elevator.inc b/data/scripts/maps/TrainerHill_Elevator.inc index 5efad0b86..c3644e0de 100644 --- a/data/scripts/maps/TrainerHill_Elevator.inc +++ b/data/scripts/maps/TrainerHill_Elevator.inc @@ -24,7 +24,7 @@ TrainerHill_Elevator_EventScript_269375:: @ 8269375 waitmovement 0 lockall msgbox TrainerHill_Elevator_Text_268F3E, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq TrainerHill_Elevator_EventScript_269360 releaseall applymovement 1, TrainerHill_Elevator_Movement_2693F0 diff --git a/data/scripts/maps/TrainerHill_Entrance.inc b/data/scripts/maps/TrainerHill_Entrance.inc index d4cc8a2ba..38ae5b85f 100644 --- a/data/scripts/maps/TrainerHill_Entrance.inc +++ b/data/scripts/maps/TrainerHill_Entrance.inc @@ -20,7 +20,7 @@ TrainerHill_Entrance_MapScript1_2680D0: @ 82680D0 setvar VAR_0x4000, 0 setvar VAR_0x8004, 9 special sp194_trainer_tower - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq TrainerHill_Entrance_EventScript_2680FF setobjectxy 255, 9, 6 applymovement 255, TrainerHill_Entrance_Movement_26837F @@ -29,7 +29,7 @@ TrainerHill_Entrance_MapScript1_2680D0: @ 82680D0 TrainerHill_Entrance_EventScript_2680FF:: @ 82680FF setvar VAR_0x8004, 16 special sp194_trainer_tower - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq TrainerHill_Entrance_EventScript_26811A applymovement 255, TrainerHill_Entrance_Movement_26837F end @@ -45,7 +45,7 @@ TrainerHill_Entrance_MapScript1_26811B: @ 826811B end TrainerHill_Entrance_MapScript1_268128: @ 8268128 - compare_var_to_value VAR_0x400D, 17 + compare VAR_0x400D, 17 call_if 1, TrainerHill_Entrance_EventScript_268134 end @@ -97,7 +97,7 @@ TrainerHill_Entrance_EventScript_2681DA:: @ 82681DA applymovement 255, TrainerHill_Entrance_Movement_268381 waitmovement 0 setvar VAR_0x40D6, 0 - special sp000_heal_pokemon + special HealPlayerParty releaseall TrainerHill_Entrance_EventScript_2681EE:: @ 82681EE @@ -116,7 +116,7 @@ TrainerHill_Entrance_EventScript_2681FD:: @ 82681FD faceplayer setvar VAR_0x8004, 10 special sp194_trainer_tower - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq TrainerHill_Entrance_EventScript_26821F msgbox TrainerHill_Entrance_Text_2686F4, 4 goto TrainerHill_Entrance_EventScript_268227 @@ -136,11 +136,11 @@ TrainerHill_Entrance_EventScript_268229:: @ 8268229 msgbox TrainerHill_Entrance_Text_2684C6, 4 setvar VAR_0x8004, 13 special sp194_trainer_tower - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, TrainerHill_Entrance_EventScript_26832E setvar VAR_0x8004, 8 special sp194_trainer_tower - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq TrainerHill_Entrance_EventScript_268275 msgbox TrainerHill_Entrance_Text_268564, 4 goto TrainerHill_Entrance_EventScript_26827D @@ -174,7 +174,7 @@ TrainerHill_Entrance_EventScript_2682C8:: @ 82682C8 special sp194_trainer_tower setvar VAR_0x40D6, 1 setvar VAR_0x4005, 0 - special sp000_heal_pokemon + special HealPlayerParty msgbox TrainerHill_Entrance_Text_26862A, 4 setvar VAR_0x8004, 0 special sp194_trainer_tower @@ -196,7 +196,7 @@ TrainerHill_Entrance_EventScript_26832E:: @ 826832E special sp194_trainer_tower setvar VAR_0x4005, 1 call TrainerHill_Entrance_EventScript_27134F - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq TrainerHill_Entrance_EventScript_26835C setvar VAR_0x8004, 14 special sp194_trainer_tower diff --git a/data/scripts/maps/Underwater_SealedChamber.inc b/data/scripts/maps/Underwater_SealedChamber.inc index 607a8e04d..f8c7b02af 100644 --- a/data/scripts/maps/Underwater_SealedChamber.inc +++ b/data/scripts/maps/Underwater_SealedChamber.inc @@ -4,9 +4,9 @@ Underwater_SealedChamber_MapScripts:: @ 82390C4 Underwater_SealedChamber_MapScript1_2390CA: @ 82390CA getplayerxy VAR_0x8004, VAR_0x8005 - compare_var_to_value VAR_0x8004, 12 + compare VAR_0x8004, 12 goto_if 5, Underwater_SealedChamber_EventScript_2390EA - compare_var_to_value VAR_0x8005, 44 + compare VAR_0x8005, 44 goto_if 5, Underwater_SealedChamber_EventScript_2390EA goto Underwater_SealedChamber_EventScript_2390F3 diff --git a/data/scripts/maps/UnknownMap_25_34.inc b/data/scripts/maps/UnknownMap_25_34.inc index ccecbbba6..32094137a 100644 --- a/data/scripts/maps/UnknownMap_25_34.inc +++ b/data/scripts/maps/UnknownMap_25_34.inc @@ -19,15 +19,15 @@ LinkContestRoom1_MapScript1_23B79F: @ 823B79F LinkContestRoom1_EventScript_23B7AF:: @ 823B7AF call LinkContestRoom1_EventScript_27A133 special sub_80F8FA0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, LinkContestRoom1_EventScript_23B7EF - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, LinkContestRoom1_EventScript_23B7F3 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 call_if 1, LinkContestRoom1_EventScript_23B7F7 - compare_var_to_value VAR_RESULT, 3 + compare VAR_RESULT, 3 call_if 1, LinkContestRoom1_EventScript_23B7FB - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 call_if 1, LinkContestRoom1_EventScript_23B7FF return @@ -52,7 +52,7 @@ LinkContestRoom1_EventScript_23B7FF:: @ 823B7FF return LinkContestRoom1_MapScript1_23B803: @ 823B803 - compare_var_to_value VAR_0x4009, 1 + compare VAR_0x4009, 1 call_if 1, LinkContestRoom1_EventScript_23B80F end @@ -82,7 +82,7 @@ LinkContestRoom1_EventScript_23B834:: @ 823B834 LinkContestRoom1_EventScript_23B842:: @ 823B842 call LinkContestRoom1_EventScript_23B8F8 call LinkContestRoom1_EventScript_23B858 - compare_var_to_value VAR_0x4000, 8 + compare VAR_0x4000, 8 goto_if 0, LinkContestRoom1_EventScript_23B842 return @@ -301,7 +301,7 @@ LinkContestRoom1_EventScript_23BB25:: @ 823BB25 LinkContestRoom1_EventScript_23BB2B:: @ 823BB2B specialvar VAR_RESULT, sub_80F9160 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LinkContestRoom1_EventScript_23BD86 switch VAR_0x4088 case 1, LinkContestRoom1_EventScript_23BB78 @@ -442,9 +442,9 @@ LinkContestRoom1_EventScript_23BEAC:: @ 823BEAC LilycoveCity_ContestLobby_EventScript_23BEB6:: @ 823BEB6 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_ContestLobby_EventScript_23BECE - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_23BED4 return diff --git a/data/scripts/maps/VerdanturfTown_BattleTentBattleRoom.inc b/data/scripts/maps/VerdanturfTown_BattleTentBattleRoom.inc index e2ff39cd7..d9d4211e7 100644 --- a/data/scripts/maps/VerdanturfTown_BattleTentBattleRoom.inc +++ b/data/scripts/maps/VerdanturfTown_BattleTentBattleRoom.inc @@ -10,9 +10,9 @@ VerdanturfTown_BattleTentBattleRoom_MapScript1_20230A: @ 820230A VerdanturfTown_BattleTentBattleRoom_EventScript_202310:: @ 8202310 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq VerdanturfTown_BattleTentBattleRoom_EventScript_202328 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq VerdanturfTown_BattleTentBattleRoom_EventScript_202333 return @@ -37,7 +37,7 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_202348:: @ 8202348 setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 special sub_81A1780 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if 5, VerdanturfTown_BattleTentBattleRoom_EventScript_20243C VerdanturfTown_BattleTentBattleRoom_EventScript_20236F:: @ 820236F @@ -88,15 +88,15 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_2023C8:: @ 82023C8 special sub_81A1780 playfanfare BGM_ME_ASA waitfanfare - special sp000_heal_pokemon + special HealPlayerParty VerdanturfTown_BattleTentBattleRoom_EventScript_20243C:: @ 820243C setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 special sub_81A1780 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, VerdanturfTown_BattleTentBattleRoom_EventScript_202565 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 call_if 1, VerdanturfTown_BattleTentBattleRoom_EventScript_20256C multichoice 20, 6, 104, 1 switch VAR_RESULT diff --git a/data/scripts/maps/VerdanturfTown_BattleTentLobby.inc b/data/scripts/maps/VerdanturfTown_BattleTentLobby.inc index 7ffd5c162..cd23003c7 100644 --- a/data/scripts/maps/VerdanturfTown_BattleTentLobby.inc +++ b/data/scripts/maps/VerdanturfTown_BattleTentLobby.inc @@ -133,7 +133,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201873:: @ 8201873 faceplayer setvar VAR_0x8004, 1 special sub_81B99B4 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if 5, VerdanturfTown_BattleTentLobby_EventScript_2017EE special copy_player_party_to_sav1 msgbox VerdanturfTown_BattleTentLobby_Text_2C50C3, 4 @@ -154,7 +154,7 @@ VerdanturfTown_BattleTentLobby_EventScript_2018CF:: @ 82018CF setvar VAR_RESULT, 2 setvar VAR_0x8004, 15 special sub_81A1780 - compare_var_to_value VAR_0x8004, 1 + compare VAR_0x8004, 1 goto_eq VerdanturfTown_BattleTentLobby_EventScript_2019E8 setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 @@ -166,7 +166,7 @@ VerdanturfTown_BattleTentLobby_EventScript_2018CF:: @ 82018CF setvar VAR_0x8005, 3 special sub_80F9490 waitstate - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq VerdanturfTown_BattleTentLobby_EventScript_201A34 msgbox VerdanturfTown_BattleTentLobby_Text_2C5662, 5 switch VAR_RESULT @@ -194,7 +194,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201954:: @ 8201954 delay 2 call VerdanturfTown_BattleTentLobby_EventScript_27134F setvar VAR_0x4000, 255 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq VerdanturfTown_BattleTentLobby_EventScript_201A1D VerdanturfTown_BattleTentLobby_EventScript_2019AE:: @ 82019AE @@ -281,7 +281,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201A7B:: @ 8201A7B goto_eq VerdanturfTown_BattleTentLobby_EventScript_201AB2 msgbox VerdanturfTown_BattleTentLobby_Text_201D9E, 4 giveitem_std ITEM_TM45 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq VerdanturfTown_BattleTentLobby_EventScript_272054 setflag FLAG_0x0EB msgbox VerdanturfTown_BattleTentLobby_Text_201E43, 4 diff --git a/data/scripts/maps/VictoryRoad_1F.inc b/data/scripts/maps/VictoryRoad_1F.inc index 8bc22aa3d..4dd00035a 100644 --- a/data/scripts/maps/VictoryRoad_1F.inc +++ b/data/scripts/maps/VictoryRoad_1F.inc @@ -3,9 +3,9 @@ VictoryRoad_1F_MapScripts:: @ 8235D7A .byte 0 VictoryRoad_1F_MapScript1_235D80: @ 8235D80 - compare_var_to_value VAR_0x40C3, 1 + compare VAR_0x40C3, 1 call_if 1, VictoryRoad_1F_EventScript_235D97 - compare_var_to_value VAR_0x40C3, 2 + compare VAR_0x40C3, 2 call_if 1, VictoryRoad_1F_EventScript_235DA3 end @@ -83,8 +83,8 @@ VictoryRoad_1F_EventScript_235E2C:: @ 8235E2C VictoryRoad_1F_EventScript_235E35:: @ 8235E35 trainerbattle 0, TRAINER_WALLY_3, 0, VictoryRoad_1F_Text_236073, VictoryRoad_1F_Text_2360DA - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq VictoryRoad_1F_EventScript_235E5C msgbox VictoryRoad_1F_Text_2360FE, 6 end diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc index 8ee62a5d5..1597a66eb 100644 --- a/data/scripts/mauville_man.inc +++ b/data/scripts/mauville_man.inc @@ -12,9 +12,9 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E0A6:: @ 828E0A6 lock faceplayer msgbox MauvilleCity_PokemonCenter_1F_Text_29038E, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E0C7 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E0EA end @@ -23,7 +23,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E0C7:: @ 828E0C7 special sub_8120340 delay 60 special sub_81201F4 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E0F4 msgbox MauvilleCity_PokemonCenter_1F_Text_2903E6, 4 release @@ -36,9 +36,9 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E0EA:: @ 828E0EA MauvilleCity_PokemonCenter_1F_EventScript_28E0F4:: @ 828E0F4 msgbox MauvilleCity_PokemonCenter_1F_Text_290421, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E113 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E15D end @@ -47,14 +47,14 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E113:: @ 828E113 call MauvilleCity_PokemonCenter_1F_EventScript_271E7C lock faceplayer - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E15D msgbox MauvilleCity_PokemonCenter_1F_Text_2904C1, 4 setvar VAR_0x8004, 1 special sub_8120340 delay 60 msgbox MauvilleCity_PokemonCenter_1F_Text_2904EB, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E113 special sub_8120210 msgbox MauvilleCity_PokemonCenter_1F_Text_290514, 4 @@ -72,7 +72,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E167:: @ 828E167 setflag FLAG_SYS_HIPSTER_MEET msgbox MauvilleCity_PokemonCenter_1F_Text_29054C, 4 special sub_8120358 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E18C msgbox MauvilleCity_PokemonCenter_1F_Text_290598, 4 release @@ -80,7 +80,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E167:: @ 828E167 MauvilleCity_PokemonCenter_1F_EventScript_28E18C:: @ 828E18C special sub_812038C - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E1A4 msgbox MauvilleCity_PokemonCenter_1F_Text_290602, 4 release @@ -155,10 +155,10 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E4D4:: @ 828E4D4 lock faceplayer msgbox MauvilleCity_PokemonCenter_1F_Text_28E1B1, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E503 special sub_8133CD8 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E50D message MauvilleCity_PokemonCenter_1F_Text_28E23F waitmessage @@ -178,15 +178,15 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E50D:: @ 828E50D MauvilleCity_PokemonCenter_1F_EventScript_28E517:: @ 828E517 special sub_8133EC0 waitstate - compare_var_to_value VAR_0x8004, 0 + compare VAR_0x8004, 0 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E558 - compare_var_to_value VAR_0x8004, 65535 + compare VAR_0x8004, 65535 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E562 msgbox MauvilleCity_PokemonCenter_1F_Text_28E2A9, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E56E special sub_8133CF4 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E57A goto MauvilleCity_PokemonCenter_1F_EventScript_28E584 end @@ -217,15 +217,15 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E584:: @ 828E584 msgbox MauvilleCity_PokemonCenter_1F_Text_28E323, 4 special sub_8133D8C waitstate - compare_var_to_value VAR_0x8006, 0 + compare VAR_0x8006, 0 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E5D4 - compare_var_to_value VAR_0x8006, 65535 + compare VAR_0x8006, 65535 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E5DE special sub_8133D2C - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E5EC msgbox MauvilleCity_PokemonCenter_1F_Text_28E3C4, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E584 special sub_8133E38 msgbox MauvilleCity_PokemonCenter_1F_Text_28E424, 4 @@ -702,23 +702,23 @@ MauvilleCity_PokemonCenter_1F_EventScript_29014A:: @ 829014A setvar VAR_0x800A, 0 setvar VAR_0x800B, 0 msgbox MauvilleCity_PokemonCenter_1F_Text_28E5F6, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_290219 specialvar VAR_RESULT, sub_81213B0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_2901DA message MauvilleCity_PokemonCenter_1F_Text_28E673 waitmessage special sub_8121388 waitstate - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_2901B7 setvar VAR_0x8008, 1 special sub_812139C waitmessage waitbuttonpress specialvar VAR_RESULT, sub_81213D8 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_2901BD goto MauvilleCity_PokemonCenter_1F_EventScript_29020F @@ -729,7 +729,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_2901B7:: @ 82901B7 MauvilleCity_PokemonCenter_1F_EventScript_2901BD:: @ 82901BD msgbox MauvilleCity_PokemonCenter_1F_Text_28E78A, 4 specialvar VAR_RESULT, sub_8121424 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_29022D goto MauvilleCity_PokemonCenter_1F_EventScript_2901E2 @@ -738,10 +738,10 @@ MauvilleCity_PokemonCenter_1F_EventScript_2901DA:: @ 82901DA MauvilleCity_PokemonCenter_1F_EventScript_2901E2:: @ 82901E2 msgbox MauvilleCity_PokemonCenter_1F_Text_28E7EE, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_290219 specialvar VAR_RESULT, sub_8121450 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_29020F msgbox MauvilleCity_PokemonCenter_1F_Text_28E881, 4 release @@ -787,25 +787,25 @@ MauvilleCity_PokemonCenter_1F_EventScript_2902F6:: @ 82902F6 lock faceplayer msgbox MauvilleCity_PokemonCenter_1F_Text_29022F, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_290317 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_29037A end MauvilleCity_PokemonCenter_1F_EventScript_290317:: @ 8290317 special sub_81203C4 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_290359 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_290384 end MauvilleCity_PokemonCenter_1F_EventScript_290331:: @ 8290331 special sub_81203C4 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_29034B - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_290384 end @@ -819,9 +819,9 @@ MauvilleCity_PokemonCenter_1F_EventScript_290359:: @ 8290359 special sub_8138AC0 waitmessage yesnobox 20, 8 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_290331 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_290331 end diff --git a/data/scripts/mystery_event_club.inc b/data/scripts/mystery_event_club.inc index f5fbeec34..3fba532bf 100644 --- a/data/scripts/mystery_event_club.inc +++ b/data/scripts/mystery_event_club.inc @@ -29,9 +29,9 @@ PetalburgCity_PokemonCenter_1F_EventScript_29159F:: @ 829159F call PetalburgCity_PokemonCenter_1F_EventScript_271E7C lock faceplayer - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq PetalburgCity_PokemonCenter_1F_EventScript_2915CB - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq PetalburgCity_PokemonCenter_1F_EventScript_2915D5 end @@ -81,9 +81,9 @@ PetalburgCity_PokemonCenter_1F_EventScript_291650:: @ 8291650 call PetalburgCity_PokemonCenter_1F_EventScript_271E7C lock faceplayer - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq PetalburgCity_PokemonCenter_1F_EventScript_2915CB - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq PetalburgCity_PokemonCenter_1F_EventScript_2915D5 end diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index 85952d9f0..abb8fed2e 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -8,9 +8,9 @@ LittlerootTown_MaysHouse_1F_EventScript_292704:: @ 8292704 msgbox LittlerootTown_BrendansHouse_1F_Text_1F7A1C, 4 applymovement VAR_0x8004, LittlerootTown_BrendansHouse_1F_Movement_27259E waitmovement 0 - compare_var_to_value VAR_0x8005, 0 + compare VAR_0x8005, 0 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_29274D - compare_var_to_value VAR_0x8005, 1 + compare VAR_0x8005, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292758 msgbox LittlerootTown_BrendansHouse_1F_Text_1F7A46, 4 closemessage @@ -69,9 +69,9 @@ LittlerootTown_MaysHouse_2F_EventScript_292799:: @ 8292799 setflag FLAG_0x2F2 setflag FLAG_0x2F3 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_2927DF - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_29280F playse SE_KAIDAN removeobject VAR_0x8008 @@ -114,7 +114,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_29283F:: @ 829283F LittlerootTown_BrendansHouse_2F_EventScript_292849:: @ 8292849 fadescreen 1 - special Special_StartWallClock + special StartWallClock waitstate return @@ -314,17 +314,17 @@ LittlerootTown_BrendansHouse_1F_EventScript_2929C5:: @ 82929C5 LittlerootTown_MaysHouse_1F_EventScript_2929C5:: @ 82929C5 lock faceplayer - compare_var_to_value VAR_0x4082, 4 + compare VAR_0x4082, 4 goto_eq LittlerootTown_BrendansHouse_1F_EventScript_292A0F - compare_var_to_value VAR_0x408C, 4 + compare VAR_0x408C, 4 goto_eq LittlerootTown_BrendansHouse_1F_EventScript_292A0F - checkflag FLAG_0x12F + checkflag FLAG_HAS_MATCH_CALL goto_eq LittlerootTown_BrendansHouse_1F_EventScript_292A19 checkflag FLAG_0x052 goto_eq LittlerootTown_BrendansHouse_1F_EventScript_292A86 - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 goto_eq LittlerootTown_BrendansHouse_1F_EventScript_292A94 - compare_var_to_value VAR_0x4092, 7 + compare VAR_0x4092, 7 goto_eq LittlerootTown_BrendansHouse_1F_EventScript_292AB0 msgbox LittlerootTown_BrendansHouse_1F_Text_1F7A1C, 4 release @@ -360,7 +360,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_292A51:: @ 8292A51 goto_eq LittlerootTown_BrendansHouse_1F_EventScript_292A86 msgbox LittlerootTown_BrendansHouse_1F_Text_1F7D73, 4 giveitem_std ITEM_AMULET_COIN - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LittlerootTown_BrendansHouse_1F_EventScript_272054 msgbox LittlerootTown_BrendansHouse_1F_Text_1F7DBE, 4 setflag FLAG_0x085 @@ -444,13 +444,13 @@ LittlerootTown_BrendansHouse_1F_EventScript_292AF2:: @ 8292AF2 LittlerootTown_MaysHouse_1F_EventScript_292AF2:: @ 8292AF2 lockall checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292C76 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292C86 - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292D08 - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292D13 applymovement VAR_0x8009, LittlerootTown_BrendansHouse_1F_Movement_27259E waitmovement 0 @@ -460,32 +460,32 @@ LittlerootTown_MaysHouse_1F_EventScript_292AF2:: @ 8292AF2 applymovement VAR_0x8009, LittlerootTown_BrendansHouse_1F_Movement_27259A waitmovement 0 delay 20 - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292C96 - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292CA1 msgbox LittlerootTown_BrendansHouse_1F_Text_1F800E, 4 giveitem_std ITEM_SS_TICKET msgbox LittlerootTown_BrendansHouse_1F_Text_1F80FE, 4 closemessage delay 20 - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292CAC - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292CC1 msgbox LittlerootTown_BrendansHouse_1F_Text_1F815B, 4 closemessage - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292CD6 - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292CEF playse SE_DOOR removeobject VAR_0x8009 setflag FLAG_0x123 delay 30 - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292D48 - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292D5D delay 20 msgbox LittlerootTown_BrendansHouse_1F_Text_1F81B9, 4 @@ -493,24 +493,24 @@ LittlerootTown_MaysHouse_1F_EventScript_292AF2:: @ 8292AF2 setflag FLAG_SYS_TV_LATI special TurnOnTVScreen delay 60 - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292D72 - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292D7D msgbox LittlerootTown_BrendansHouse_1F_Text_1F824B, 4 closemessage - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292D1E - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292D33 msgbox LittlerootTown_BrendansHouse_1F_Text_1F826F, 4 closemessage clearflag FLAG_SYS_TV_LATI setflag FLAG_0x0FF special TurnOffTVScreen - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292D88 - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292D9D msgbox LittlerootTown_BrendansHouse_1F_Text_1F8351, 4 multichoice 22, 8, 108, 1 diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index a93c44615..03ee0d510 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -239,7 +239,7 @@ LilycoveCity_ContestLobby_EventScript_293C3E:: @ 8293C3E applymovement 16, LilycoveCity_ContestLobby_Movement_294053 waitmovement 0 msgbox LilycoveCity_ContestLobby_Text_292DEE, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_293CEE goto LilycoveCity_ContestLobby_EventScript_293C70 end @@ -271,7 +271,7 @@ LilycoveCity_ContestLobby_EventScript_293C9C:: @ 8293C9C LilycoveCity_ContestLobby_EventScript_293CB9:: @ 8293CB9 msgbox LilycoveCity_ContestLobby_Text_292E57, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_293CD2 goto LilycoveCity_ContestLobby_EventScript_293CE0 end @@ -288,13 +288,13 @@ LilycoveCity_ContestLobby_EventScript_293CE0:: @ 8293CE0 LilycoveCity_ContestLobby_EventScript_293CEE:: @ 8293CEE checkitem ITEM_POKEBLOCK_CASE, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_ContestLobby_EventScript_293D43 specialvar VAR_RESULT, GetFirstFreePokeblockSlot - compare_var_to_value VAR_RESULT, 65535 + compare VAR_RESULT, 65535 goto_eq LilycoveCity_ContestLobby_EventScript_293D39 specialvar VAR_RESULT, PlayerHasBerries - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_ContestLobby_EventScript_293C7A msgbox LilycoveCity_ContestLobby_Text_292E28, 4 goto LilycoveCity_ContestLobby_EventScript_293CB9 @@ -325,7 +325,7 @@ LilycoveCity_ContestLobby_EventScript_293D4D:: @ 8293D4D applymovement 3, LilycoveCity_ContestLobby_Movement_294053 waitmovement 0 msgbox LilycoveCity_ContestLobby_Text_293201, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_293DC6 goto LilycoveCity_ContestLobby_EventScript_293D7D end @@ -342,7 +342,7 @@ LilycoveCity_ContestLobby_EventScript_293D87:: @ 8293D87 LilycoveCity_ContestLobby_EventScript_293D91:: @ 8293D91 msgbox LilycoveCity_ContestLobby_Text_29328C, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_293DAA goto LilycoveCity_ContestLobby_EventScript_293DB8 end @@ -359,16 +359,16 @@ LilycoveCity_ContestLobby_EventScript_293DB8:: @ 8293DB8 LilycoveCity_ContestLobby_EventScript_293DC6:: @ 8293DC6 specialvar VAR_RESULT, PlayerHasBerries - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_ContestLobby_EventScript_293D87 checkitem ITEM_POKEBLOCK_CASE, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_ContestLobby_EventScript_293E14 msgbox LilycoveCity_ContestLobby_Text_293237, 4 specialvar VAR_RESULT, GetFirstFreePokeblockSlot - compare_var_to_value VAR_RESULT, 65535 + compare VAR_RESULT, 65535 goto_if 5, LilycoveCity_ContestLobby_EventScript_293D91 - compare_var_to_value VAR_RESULT, 65535 + compare VAR_RESULT, 65535 goto_eq LilycoveCity_ContestLobby_EventScript_293E0A end @@ -391,7 +391,7 @@ LilycoveCity_ContestLobby_EventScript_293E1E:: @ 8293E1E applymovement VAR_0x8008, LilycoveCity_ContestLobby_Movement_294053 waitmovement 0 msgbox LilycoveCity_ContestLobby_Text_293842, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_293EA3 goto LilycoveCity_ContestLobby_EventScript_293E5A end @@ -408,7 +408,7 @@ LilycoveCity_ContestLobby_EventScript_293E64:: @ 8293E64 LilycoveCity_ContestLobby_EventScript_293E6E:: @ 8293E6E msgbox LilycoveCity_ContestLobby_Text_29357E, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_293E87 goto LilycoveCity_ContestLobby_EventScript_293E95 end @@ -425,16 +425,16 @@ LilycoveCity_ContestLobby_EventScript_293E95:: @ 8293E95 LilycoveCity_ContestLobby_EventScript_293EA3:: @ 8293EA3 specialvar VAR_RESULT, PlayerHasBerries - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_ContestLobby_EventScript_293E64 checkitem ITEM_POKEBLOCK_CASE, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_ContestLobby_EventScript_293EF1 msgbox LilycoveCity_ContestLobby_Text_29354E, 4 specialvar VAR_RESULT, GetFirstFreePokeblockSlot - compare_var_to_value VAR_RESULT, 65535 + compare VAR_RESULT, 65535 goto_if 5, LilycoveCity_ContestLobby_EventScript_293E6E - compare_var_to_value VAR_RESULT, 65535 + compare VAR_RESULT, 65535 goto_eq LilycoveCity_ContestLobby_EventScript_293EE7 end @@ -452,7 +452,7 @@ LilycoveCity_ContestLobby_EventScript_293EFB:: @ 8293EFB lockall setvar VAR_0x8009, 1 msgbox LilycoveCity_ContestLobby_Text_2C42F4, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_293F28 msgbox LilycoveCity_ContestLobby_Text_2C4332, 4 releaseall @@ -465,21 +465,21 @@ LilycoveCity_ContestLobby_EventScript_293F1E:: @ 8293F1E LilycoveCity_ContestLobby_EventScript_293F28:: @ 8293F28 checkitem ITEM_POKEBLOCK_CASE, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_ContestLobby_EventScript_293F8E specialvar VAR_RESULT, PlayerHasBerries - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_ContestLobby_EventScript_293F1E specialvar VAR_RESULT, GetFirstFreePokeblockSlot - compare_var_to_value VAR_RESULT, 65535 + compare VAR_RESULT, 65535 goto_if 5, LilycoveCity_ContestLobby_EventScript_293F64 - compare_var_to_value VAR_RESULT, 65535 + compare VAR_RESULT, 65535 goto_eq LilycoveCity_ContestLobby_EventScript_293F98 end LilycoveCity_ContestLobby_EventScript_293F64:: @ 8293F64 msgbox LilycoveCity_ContestLobby_Text_2C43FA, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, LilycoveCity_ContestLobby_EventScript_293F85 msgbox LilycoveCity_ContestLobby_Text_2C451B, 4 goto LilycoveCity_ContestLobby_EventScript_293D2C @@ -521,9 +521,9 @@ LilycoveCity_ContestLobby_EventScript_293FC8:: @ 8293FC8 faceplayer msgbox LilycoveCity_ContestLobby_Text_293A6B, 4 specialvar VAR_RESULT, PlayerHasBerries - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_293FEE - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_ContestLobby_EventScript_293FF8 end @@ -534,10 +534,10 @@ LilycoveCity_ContestLobby_EventScript_293FEE:: @ 8293FEE LilycoveCity_ContestLobby_EventScript_293FF8:: @ 8293FF8 checkitem ITEM_POKEBLOCK_CASE, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_ContestLobby_EventScript_294028 specialvar VAR_RESULT, GetFirstFreePokeblockSlot - compare_var_to_value VAR_RESULT, 65535 + compare VAR_RESULT, 65535 goto_eq LilycoveCity_ContestLobby_EventScript_294028 dodailyevents checkflag FLAG_0x921 @@ -565,23 +565,23 @@ LilycoveCity_ContestLobby_Movement_294053: @ 8294053 LilycoveCity_ContestLobby_EventScript_294055:: @ 8294055 lockall specialvar VAR_RESULT, PlayerHasBerries - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_ContestLobby_EventScript_2940B1 checkitem ITEM_POKEBLOCK_CASE, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_ContestLobby_EventScript_29416C specialvar VAR_RESULT, GetFirstFreePokeblockSlot - compare_var_to_value VAR_RESULT, 65535 + compare VAR_RESULT, 65535 goto_if 5, LilycoveCity_ContestLobby_EventScript_294092 - compare_var_to_value VAR_RESULT, 65535 + compare VAR_RESULT, 65535 goto_eq LilycoveCity_ContestLobby_EventScript_294162 end LilycoveCity_ContestLobby_EventScript_294092:: @ 8294092 msgbox LilycoveCity_ContestLobby_Text_2938CD, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_2940BB - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_ContestLobby_EventScript_294160 end @@ -592,24 +592,24 @@ LilycoveCity_ContestLobby_EventScript_2940B1:: @ 82940B1 LilycoveCity_ContestLobby_EventScript_2940BB:: @ 82940BB call LilycoveCity_ContestLobby_EventScript_27134F - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_ContestLobby_EventScript_294160 specialvar VAR_RESULT, sub_80093CC - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_2941ED message LilycoveCity_ContestLobby_Text_293955 waitmessage special sub_80B2FD8 waitstate - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_2941AA - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_eq LilycoveCity_ContestLobby_EventScript_294176 - compare_var_to_value VAR_RESULT, 3 + compare VAR_RESULT, 3 goto_eq LilycoveCity_ContestLobby_EventScript_294183 - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_eq LilycoveCity_ContestLobby_EventScript_294190 - compare_var_to_value VAR_RESULT, 6 + compare VAR_RESULT, 6 goto_eq LilycoveCity_ContestLobby_EventScript_29419D end @@ -713,22 +713,22 @@ LilycoveCity_ContestLobby_EventScript_2941F8:: @ 82941F8 LilycoveCity_ContestLobby_EventScript_294235:: @ 8294235 call LilycoveCity_ContestLobby_EventScript_294285 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_29428F - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_eq LilycoveCity_ContestLobby_EventScript_2941F8 - compare_var_to_value VAR_RESULT, 8 + compare VAR_RESULT, 8 goto_eq LilycoveCity_ContestLobby_EventScript_294235 release end LilycoveCity_ContestLobby_EventScript_29425D:: @ 829425D call LilycoveCity_ContestLobby_EventScript_29428A - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_29428F - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_eq LilycoveCity_ContestLobby_EventScript_2941F8 - compare_var_to_value VAR_RESULT, 8 + compare VAR_RESULT, 8 goto_eq LilycoveCity_ContestLobby_EventScript_29425D release end diff --git a/data/scripts/safari_zone.inc b/data/scripts/safari_zone.inc index a052c90cc..c2d217f93 100644 --- a/data/scripts/safari_zone.inc +++ b/data/scripts/safari_zone.inc @@ -14,7 +14,7 @@ EventScript_2A4B5D:: @ 82A4B5D EventScript_2A4B6F:: @ 82A4B6F lockall msgbox Text_2A4BF4, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq EventScript_2A4B85 releaseall end @@ -43,19 +43,19 @@ EventScript_2A4B9B:: @ 82A4B9B EventScript_2A4BAC:: @ 82A4BAC lockall special GetPokeblockFeederInFront - compare_var_to_value VAR_RESULT, 65535 + compare VAR_RESULT, 65535 goto_if 5, EventScript_2A4BEB msgbox Text_2A4C90, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq EventScript_2A4BD0 releaseall end EventScript_2A4BD0:: @ 82A4BD0 fadescreen 1 - special sub_8135908 + special OpenPokeblockCaseOnFeeder waitstate - compare_var_to_value VAR_RESULT, 65535 + compare VAR_RESULT, 65535 goto_if 5, EventScript_2A4BE2 end diff --git a/data/scripts/secret_power_tm.inc b/data/scripts/secret_power_tm.inc index 215f997b8..c75fb9b48 100644 --- a/data/scripts/secret_power_tm.inc +++ b/data/scripts/secret_power_tm.inc @@ -37,7 +37,7 @@ Route111_EventScript_2765FF:: @ 82765FF lock faceplayer msgbox Route111_Text_2762C9, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route111_EventScript_27661E msgbox Route111_Text_27655C, 4 release @@ -45,17 +45,17 @@ Route111_EventScript_2765FF:: @ 82765FF Route111_EventScript_27661E:: @ 827661E giveitem_std ITEM_TM43 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route111_EventScript_276680 msgbox Route111_Text_27636E, 4 closemessage setflag FLAG_0x060 clearflag FLAG_0x3B4 - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if 1, Route111_EventScript_27666A - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if 1, Route111_EventScript_27666A - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if 1, Route111_EventScript_276675 removeobject VAR_LAST_TALKED release diff --git a/data/scripts/tv.inc b/data/scripts/tv.inc index 7cf485835..8d1ac83eb 100644 --- a/data/scripts/tv.inc +++ b/data/scripts/tv.inc @@ -3,30 +3,30 @@ EventScript_27EE0B:: @ 827EE0B incrementgamestat 44 special ResetTVShowState specialvar VAR_RESULT, CheckForBigMovieOrEmergencyNewsOnTV - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_eq EventScript_27EE9A - compare_var_to_value VAR_RESULT, 1 + 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 specialvar VAR_RESULT, IsTVShowInSearchOfTrainersAiring - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq EventScript_27EEFF goto EventScript_27EEE9 end EventScript_27EE54:: @ 827EE54 specialvar VAR_0x8004, special_0x44 - compare_var_to_value VAR_0x8004, 255 + compare VAR_0x8004, 255 goto_eq EventScript_27EED8 specialvar VAR_RESULT, special_0x4a - compare_var_to_value VAR_RESULT, 255 + compare VAR_RESULT, 255 goto_eq EventScript_27EED8 copyvar VAR_0x8004, VAR_RESULT specialvar VAR_RESULT, special_0x45 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if 5, EventScript_27EEBA end @@ -55,7 +55,7 @@ EventScript_27EEBA:: @ 827EEBA special DoTVShow waitmessage waitbuttonpress - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if 5, EventScript_27EEBA goto EventScript_27EED0 end @@ -74,7 +74,7 @@ EventScript_27EED8:: @ 827EED8 EventScript_27EEE9:: @ 827EEE9 special DoPokeNews - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq EventScript_27EE54 waitmessage waitbuttonpress @@ -85,7 +85,7 @@ EventScript_27EEFF:: @ 827EEFF special DoTVShowInSearchOfTrainers waitmessage waitbuttonpress - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq EventScript_27EEFF goto EventScript_27EED0 end |