diff options
194 files changed, 1934 insertions, 1943 deletions
diff --git a/asm/field_control_avatar.s b/asm/field_control_avatar.s index 85799d9da..3e76d76e2 100644 --- a/asm/field_control_avatar.s +++ b/asm/field_control_avatar.s @@ -1641,11 +1641,11 @@ _0806D570: lsrs r0, 24 cmp r0, 0x1 bne _0806D5A4 - ldr r0, _0806D5A0 @ =EventScript_1A6AC8 + ldr r0, _0806D5A0 @ =EventScript_UseSurf b _0806D5E2 .align 2, 0 _0806D59C: .4byte 0x00000824 -_0806D5A0: .4byte EventScript_1A6AC8 +_0806D5A0: .4byte EventScript_UseSurf _0806D5A4: adds r0, r4, 0 bl MetatileBehavior_IsWaterfall diff --git a/asm/macros/event.inc b/asm/macros/event.inc index 19293e527..b6526f96f 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -234,14 +234,12 @@ .endm @ Generic compare macro which attempts to deduce argument types based on their values - @ Any values between 0x4000 to 0x4FFF and 0x8000 to 0x8FFF are considered event variable identifiers - .macro compare arg1, arg2 - .if ((\arg1 >> 12) == 4 || (\arg1 >> 12) == 8) && ((\arg2 >> 12) == 4 || (\arg2 >> 12) == 8) - compare_var_to_var \arg1, \arg2 - .elseif ((\arg1 >> 12) == 4 || (\arg1 >> 12) == 8) && (\arg2 >= 0 && \arg2 <= 0xFFFF) - compare_var_to_value \arg1, \arg2 + @ Any values between 0x4000 to 0x40FF and 0x8000 to 0x8014 are considered event variable identifiers + .macro compare var:req, arg:req + .if ((\arg >= VARS_START && \arg <= VARS_END) || (\arg >= SPECIAL_VARS_START && \arg <= SPECIAL_VARS_END)) + compare_var_to_var \var, \arg .else - .error "Invalid arguments for 'compare'" + compare_var_to_value \var, \arg .endif .endm @@ -1424,7 +1422,7 @@ .endm .macro case condition, dest - compare_var_to_value 0x8000, \condition + compare_var_to_value VAR_0x8000, \condition goto_if_eq \dest .endm @@ -1461,5 +1459,5 @@ .macro set_gym_trainers gym:req setvar VAR_0x8008, \gym - call EventScript_1A6B18 + call EventScript_SetGymTrainers .endm diff --git a/data/event_scripts.s b/data/event_scripts.s index 21fdffe43..523d08e27 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1,3 +1,4 @@ +#include "constants/global.h" #include "constants/flags.h" #include "constants/decorations.h" #include "constants/items.h" @@ -18,6 +19,7 @@ #include "constants/game_stat.h" #include "constants/menu.h" #include "constants/battle_setup.h" +#include "constants/map_scripts.h" .include "asm/macros.inc" .include "asm/macros/event.inc" .set FALSE, 0 @@ -57,12 +59,12 @@ gSpecialVars:: @ 815FD0C gStdScripts:: @ 8160450 .4byte gStdScript_0 .4byte gStdScript_1 - .4byte gStdScript_2 - .4byte gStdScript_3 - .4byte gStdScript_4 - .4byte gStdScript_5 + .4byte Std_MsgboxNPC + .4byte Std_MsgboxSign + .4byte Std_MsgboxDefault + .4byte Std_MsgboxYesNo .4byte gStdScript_Message_WaitButton_AndRelease - .4byte gStdScript_7 + .4byte Std_ObtainDecoration .4byte gStdScript_8 .4byte gStdScript_ItemMessageAndFanfare gStdScriptsEnd:: @@ -778,7 +780,7 @@ gStdScriptsEnd:: .include "data/maps/SixIsland_WaterPath_House2/text.inc" .include "data/maps/SevenIsland_SevaultCanyon_House/text.inc" -gStdScript_2:: @ 81A4E3F +Std_MsgboxNPC:: @ 81A4E3F lock faceplayer message 0x0 @@ -787,7 +789,7 @@ gStdScript_2:: @ 81A4E3F release return -gStdScript_3:: @ 81A4E4A +Std_MsgboxSign:: @ 81A4E4A lockall message 0x0 waitmessage @@ -795,13 +797,13 @@ gStdScript_3:: @ 81A4E4A releaseall return -gStdScript_4:: @ 81A4E54 +Std_MsgboxDefault:: @ 81A4E54 message 0x0 waitmessage waitbuttonpress return -gStdScript_5:: @ 81A4E5C +Std_MsgboxYesNo:: @ 81A4E5C message 0x0 waitmessage yesnobox 20, 8 @@ -809,14 +811,14 @@ gStdScript_5:: @ 81A4E5C gStdScript_ItemMessageAndFanfare:: @ 81A4E66 textcolor 3 - compare_var_to_value VAR_0x8002, MUS_FANFA1 + compare VAR_0x8002, MUS_FANFA1 call_if eq, EventScript_1A4EA2 - compare_var_to_value VAR_0x8002, MUS_FAN5 + compare VAR_0x8002, MUS_FAN5 call_if eq, EventScript_1A4EA6 message 0x0 waitmessage waitfanfare - compare_var_to_value VAR_0x8002, MUS_FANFA1 + compare VAR_0x8002, MUS_FANFA1 call_if eq, EventScript_1A4EAA giveitem VAR_0x8000, VAR_0x8001, 8 call EventScript_1A6675 @@ -855,7 +857,7 @@ EventScript_TryDoNormalTrainerBattle:: @ 81A4EC1 applymovement VAR_LAST_TALKED, Movement_1A4FC5 waitmovement 0 specialvar VAR_RESULT, ScrSpecial_HasTrainerBeenFought - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if ne, EventScript_1A4EE8 special PlayTrainerEncounterMusic special SetUpTrainerMovement @@ -869,10 +871,10 @@ EventScript_TryDoDoubleTrainerBattle:: @ 81A4EE9 faceplayer call EventScript_1A4FBA specialvar VAR_RESULT, ScrSpecial_HasTrainerBeenFought - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if ne, EventScript_1A4F20 special CheckForAlivePartyMons - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if ne, EventScript_1A4F19 special PlayTrainerEncounterMusic special SetUpTrainerMovement @@ -893,7 +895,7 @@ EventScript_DoTrainerBattle:: @ 81A4F21 waitmovement 0 special PlayTrainerEncounterMusic special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A501A battlebegin ontrainerbattleend @@ -901,7 +903,7 @@ EventScript_DoTrainerBattle:: @ 81A4F21 EventScript_TryDoRematchBattle:: @ 81A4F3E call EventScript_1A4FBA specialvar VAR_RESULT, ScrSpecial_GetTrainerEyeRematchFlag - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1A4F72 special PlayTrainerEncounterMusic special SetUpTrainerMovement @@ -909,7 +911,7 @@ EventScript_TryDoRematchBattle:: @ 81A4F3E waitmessage waitbuttonpress special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A4FB8 special ScrSpecial_StartTrainerEyeRematch waitstate @@ -921,10 +923,10 @@ EventScript_1A4F72:: @ 81A4F72 EventScript_TryDoDoubleRematchBattle:: @ 81A4F73 specialvar VAR_RESULT, ScrSpecial_GetTrainerEyeRematchFlag - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1A4FB0 special CheckForAlivePartyMons - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if ne, EventScript_1A4FB1 special PlayTrainerEncounterMusic special SetUpTrainerMovement @@ -932,7 +934,7 @@ EventScript_TryDoDoubleRematchBattle:: @ 81A4F73 waitmessage waitbuttonpress special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A4FB8 special ScrSpecial_StartTrainerEyeRematch waitstate @@ -967,19 +969,19 @@ EventScript_1A4FC7:: @ 81A4FC7 waitmessage waitbuttonpress special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A501A battlebegin specialvar VAR_RESULT, ScrSpecial_GetTrainerBattleMode - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1A5017 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A5019 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A5019 - compare_var_to_value VAR_RESULT, 6 + compare VAR_RESULT, 6 goto_if eq, EventScript_1A5019 - compare_var_to_value VAR_RESULT, 8 + compare VAR_RESULT, 8 goto_if eq, EventScript_1A5019 EventScript_1A5017:: @ 81A5017 @@ -1001,14 +1003,16 @@ gStdScript_Message_WaitButton_AndRelease:: @ 81A501F release return -gUnknown_81A5028:: @ 81A5028 +@ Unused +Text_WouldYouLikeToMixRecords:: @ 81A5028 .string "Would you like to mix records with\n" .string "other TRAINERS?$" -Text_1A505B:: @ 81A505B +@ Unused +Text_WeHopeToSeeYouAgain:: @ 81A505B .string "We hope to see you again!$" -Text_1A5075:: @ 81A5075 +Text_BootedUpPC:: @ 81A5075 .string "{PLAYER} booted up the PC.$" gUnknown_81A508A:: @ 81A508A @@ -1155,7 +1159,7 @@ Text_1A556E:: @ 81A556E Text_1A55A5:: @ 81A55A5 .string "{STR_VAR_1} used SURF!$" -Text_1A55B3:: @ 81A55B3 +Text_CurrentTooFast:: @ 81A55B3 .string "The current is much too fast!\n" .string "SURF can't be used here…$" @@ -1300,11 +1304,11 @@ gUnknown_81A5B60:: @ 81A5B60 .string "How is my old {STR_VAR_2}?\n" .string "My {STR_VAR_1} is doing great!$" -Text_1A5B88:: @ 81A5B88 +Text_CardKeyOpenedDoor:: @ 81A5B88 .string "Bingo!\n" .string "The CARD KEY opened the door!$" -Text_1A5BAD:: @ 81A5BAD +Text_ItNeedsCardKey:: @ 81A5BAD .string "No!\n" .string "It needs a CARD KEY!$" @@ -1345,7 +1349,7 @@ Text_1A5CCE:: @ 81A5CCE Text_1A5CD3:: @ 81A5CD3 .string "ドアは しまっている‥$" -Text_1A5CDF:: @ 81A5CDF +Text_TheDoorIsOpen:: @ 81A5CDF .string "The door is open…$" Text_1A5CF1:: @ 81A5CF1 @@ -1554,7 +1558,7 @@ EventScript_1A651A:: @ 81A651A call EventScript_1A6551 special sub_81130A8 specialvar VAR_RESULT, IsNationalPokedexEnabled - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if eq, EventScript_1A653B call EventScript_1A6541 return @@ -1590,7 +1594,7 @@ EventScript_1A6551:: @ 81A6551 EventScript_1A6578:: @ 81A6578 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 message Text_1A5483 waitmessage @@ -1622,13 +1626,13 @@ EventScript_1A65CE:: @ 81A65CE EventScript_1A65EC:: @ 81A65EC specialvar VAR_RESULT, Special_PlayerIsNotInTrainerTowerLobby - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1A661D specialvar VAR_RESULT, sp182_move_string copyvar VAR_0x8008, VAR_RESULT - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 goto_if eq, EventScript_1A661D - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 goto_if eq, EventScript_1A6636 end @@ -1682,53 +1686,48 @@ EventScript_1A6697:: @ 81A6697 bufferitemnameplural 1, VAR_0x8000, VAR_0x8001 checkitemtype VAR_0x8000 call EventScript_1A66BC - compare_var_to_value VAR_0x8007, 1 + compare VAR_0x8007, 1 call_if eq, EventScript_1A6749 - compare_var_to_value VAR_0x8007, 0 + compare VAR_0x8007, 0 call_if eq, EventScript_1A675E return EventScript_1A66BC:: @ 81A66BC switch VAR_RESULT - compare_var_to_value VAR_0x8000, 1 - goto_if eq, EventScript_1A66F9 - compare_var_to_value VAR_0x8000, 2 - goto_if eq, EventScript_1A6709 - compare_var_to_value VAR_0x8000, 3 - goto_if eq, EventScript_1A6719 - compare_var_to_value VAR_0x8000, 4 - goto_if eq, EventScript_1A6729 - compare_var_to_value VAR_0x8000, 5 - goto_if eq, EventScript_1A6739 + case POCKET_ITEMS, EventScript_1A66F9 + case POCKET_KEY_ITEMS, EventScript_1A6709 + case POCKET_POKE_BALLS, EventScript_1A6719 + case POCKET_TM_CASE, EventScript_1A6729 + case POCKET_BERRY_POUCH, EventScript_1A6739 end EventScript_1A66F9:: @ 81A66F9 getstdstring 2, 24 - compare_var_to_value VAR_0x8007, 1 + compare VAR_0x8007, 1 call_if eq, EventScript_1A6764 return EventScript_1A6709:: @ 81A6709 getstdstring 2, 25 - compare_var_to_value VAR_0x8007, 1 + compare VAR_0x8007, 1 call_if eq, EventScript_1A6764 return EventScript_1A6719:: @ 81A6719 getstdstring 2, 26 - compare_var_to_value VAR_0x8007, 1 + compare VAR_0x8007, 1 call_if eq, EventScript_1A6764 return EventScript_1A6729:: @ 81A6729 getstdstring 2, 27 - compare_var_to_value VAR_0x8007, 1 + compare VAR_0x8007, 1 call_if eq, EventScript_1A6768 return EventScript_1A6739:: @ 81A6739 getstdstring 2, 28 - compare_var_to_value VAR_0x8007, 1 + compare VAR_0x8007, 1 call_if eq, EventScript_1A6764 return @@ -1752,7 +1751,7 @@ EventScript_1A6768:: @ 81A6768 playfanfare MUS_FANFA1 return -gStdScript_7:: @ 81A676C +Std_ObtainDecoration:: @ 81A676C adddecor VAR_0x8000 copyvar VAR_0x8007, VAR_RESULT call EventScript_1A677A @@ -1760,9 +1759,9 @@ gStdScript_7:: @ 81A676C EventScript_1A677A:: @ 81A677A getdecorname 1, VAR_0x8000 - compare_var_to_value VAR_0x8007, 1 + compare VAR_0x8007, 1 call_if eq, EventScript_1A6795 - compare_var_to_value VAR_0x8007, 0 + compare VAR_0x8007, 0 call_if eq, EventScript_1A67AD return @@ -1790,9 +1789,9 @@ gStdScript_1:: @ 81A67B3 getitemname 1, VAR_0x8000 checkitemtype VAR_0x8000 call EventScript_1A66BC - compare_var_to_value VAR_0x8007, 1 + compare VAR_0x8007, 1 call_if eq, EventScript_1A67EE - compare_var_to_value VAR_0x8007, 0 + compare VAR_0x8007, 0 call_if eq, EventScript_1A682D release return @@ -1802,9 +1801,9 @@ EventScript_1A67EE:: @ 81A67EE additem VAR_0x8004, VAR_0x8005 specialvar VAR_RESULT, Special_ItemIsTM_GetMoveName copyvar VAR_0x8008, VAR_RESULT - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if eq, EventScript_1A6821 - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 call_if eq, EventScript_1A6827 waitfanfare waitmessage @@ -1829,12 +1828,12 @@ EventScript_PickUpHiddenItem:: @ 81A6843 lockall textcolor 3 waitse - compare_var_to_value VAR_0x8005, 0 + compare VAR_0x8005, 0 goto_if eq, EventScript_PickUpHiddenCoins call EventScript_GiveItem - compare_var_to_value VAR_0x8007, 1 + compare VAR_0x8007, 1 goto_if eq, EventScript_ItemInPocketMessage - compare_var_to_value VAR_0x8007, 0 + compare VAR_0x8007, 0 goto_if eq, EventScript_BagIsFullMessage end @@ -1847,9 +1846,9 @@ EventScript_GiveItem:: return EventScript_ItemInPocketMessage:: - compare_var_to_value VAR_0x8006, 1 + compare VAR_0x8006, 1 call_if eq, EventScript_FoundSingleItemMessage - compare_var_to_value VAR_0x8006, 1 + compare VAR_0x8006, 1 call_if ne, EventScript_FoundMultipleItemsMessage waitfanfare waitmessage @@ -1884,7 +1883,7 @@ EventScript_PickUpHiddenCoins:: goto_if FALSE, EventScript_HiddenCoinsButNoCoinCase checkcoins VAR_RESULT specialvar VAR_RESULT, Special_CheckAddCoins - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_HiddenCoinsButTheCoinCaseIsFull givecoins VAR_0x8006 getstdstring 1, 0x17 @@ -1917,7 +1916,7 @@ EventScript_HiddenCoinsButNoCoinCase:: gUnknown_81A6955:: @ 81A6955 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 lockall checkflag FLAG_SYS_PC_STORAGE_DISABLED @@ -1927,7 +1926,7 @@ gUnknown_81A6955:: @ 81A6955 setvar VAR_0x8004, 0 special Special_AnimatePcTurnOn playse SE_PC_ON - msgbox Text_1A5075 + msgbox Text_BootedUpPC goto EventScript_1A6998 end @@ -2011,7 +2010,7 @@ EventScript_1A6A7A:: @ 81A6A7A playse SE_PC_LOGIN msgbox Text_1A5BC6 msgbox Text_1A5C03, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1A6AB2 setflag FLAG_OAKS_RATING_IS_VIA_PC call EventScript_1A73E0 @@ -2030,60 +2029,60 @@ EventScript_1A6AC0:: @ 81A6AC0 fadescreen 0 return -EventScript_1A6AC8:: @ 81A6AC8 +EventScript_UseSurf:: @ 81A6AC8 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if eq, EventScript_1A6AC8_End + compare VAR_RESULT, 2 + goto_if eq, EventScript_UseSurfEnd checkpartymove MOVE_SURF - compare_var_to_value VAR_RESULT, 6 - goto_if eq, EventScript_1A6AC8_End + compare VAR_RESULT, PARTY_SIZE + goto_if eq, EventScript_UseSurfEnd getpartymonname 0, VAR_RESULT setfieldeffectarg 0, VAR_RESULT lockall msgbox Text_1A556E, 5 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_1A6AC8_Release + compare VAR_RESULT, 0 + goto_if eq, EventScript_UseSurfRelease msgbox Text_1A55A5 dofieldeffect FLDEFF_USE_SURF -EventScript_1A6AC8_Release:@ 81A6B0B +EventScript_UseSurfRelease:@ 81A6B0B releaseall -EventScript_1A6AC8_End: @ 81A6B0C +EventScript_UseSurfEnd: @ 81A6B0C end gUnknown_81A6B0D:: @ 81A6B0D lockall - msgbox Text_1A55B3 + msgbox Text_CurrentTooFast releaseall end -EventScript_1A6B18:: @ 81A6B18 +EventScript_SetGymTrainers:: @ 81A6B18 switch VAR_0x8008 - case 1, EventScript_1A6B76 - case 2, EventScript_1A6B7A - case 3, EventScript_1A6B81 - case 4, EventScript_1A6B8B - case 5, EventScript_1A6BA1 - case 6, EventScript_1A6BB4 - case 7, EventScript_1A6BCA - case 8, EventScript_1A6BE0 + case 1, EventScript_SetPewterGymTrainers + case 2, EventScript_SetCeruleanGymTrainers + case 3, EventScript_SetVermilionGymTrainers + case 4, EventScript_SetCeladonGymTrainers + case 5, EventScript_SetFuchsiaGymTrainers + case 6, EventScript_SetSaffronGymTrainers + case 7, EventScript_SetCinnabarGymTrainers + case 8, EventScript_SetViridianGymTrainers end -EventScript_1A6B76:: @ 81A6B76 +EventScript_SetPewterGymTrainers:: @ 81A6B76 settrainerflag TRAINER_CAMPER_LIAM return -EventScript_1A6B7A:: @ 81A6B7A +EventScript_SetCeruleanGymTrainers:: @ 81A6B7A settrainerflag TRAINER_PICNICKER_DIANA settrainerflag TRAINER_SWIMMER_MALE_LUIS return -EventScript_1A6B81:: @ 81A6B81 +EventScript_SetVermilionGymTrainers:: @ 81A6B81 settrainerflag TRAINER_SAILOR_DWAYNE settrainerflag TRAINER_ENGINEER_BAILY settrainerflag TRAINER_GENTLEMAN_TUCKER return -EventScript_1A6B8B:: @ 81A6B8B +EventScript_SetCeladonGymTrainers:: @ 81A6B8B settrainerflag TRAINER_LASS_KAY settrainerflag TRAINER_LASS_LISA settrainerflag TRAINER_PICNICKER_TINA @@ -2093,7 +2092,7 @@ EventScript_1A6B8B:: @ 81A6B8B settrainerflag TRAINER_COOLTRAINER_MARY return -EventScript_1A6BA1:: @ 81A6BA1 +EventScript_SetFuchsiaGymTrainers:: @ 81A6BA1 settrainerflag TRAINER_TAMER_PHIL settrainerflag TRAINER_TAMER_EDGAR settrainerflag TRAINER_JUGGLER_KIRK @@ -2102,7 +2101,7 @@ EventScript_1A6BA1:: @ 81A6BA1 settrainerflag TRAINER_JUGGLER_NATE return -EventScript_1A6BB4:: @ 81A6BB4 +EventScript_SetSaffronGymTrainers:: @ 81A6BB4 settrainerflag TRAINER_PSYCHIC_JOHAN settrainerflag TRAINER_PSYCHIC_TYRON settrainerflag TRAINER_PSYCHIC_CAMERON @@ -2112,7 +2111,7 @@ EventScript_1A6BB4:: @ 81A6BB4 settrainerflag TRAINER_CHANNELER_TASHA return -EventScript_1A6BCA:: @ 81A6BCA +EventScript_SetCinnabarGymTrainers:: @ 81A6BCA settrainerflag TRAINER_SUPER_NERD_ERIK settrainerflag TRAINER_SUPER_NERD_AVERY settrainerflag TRAINER_SUPER_NERD_DEREK @@ -2122,7 +2121,7 @@ EventScript_1A6BCA:: @ 81A6BCA settrainerflag TRAINER_BURGLAR_DUSTY return -EventScript_1A6BE0:: @ 81A6BE0 +EventScript_SetViridianGymTrainers:: @ 81A6BE0 settrainerflag TRAINER_TAMER_JASON settrainerflag TRAINER_TAMER_COLE settrainerflag TRAINER_BLACK_BELT_ATSUSHI @@ -2169,7 +2168,7 @@ gUnknown_81A6C32:: @ 81A6C32 lockall msgbox Text_1C0DF1 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 fadescreen 1 special Special_TownMap @@ -2188,6 +2187,7 @@ Text_1A6CA3:: @ 81A6CA3 .string "{STR_VAR_1} POKéMON seen and\n" .string "{STR_VAR_2} POKéMON owned.\p" .string "{SIZE}ÁPROF. OAK's rating:$" + gUnknown_81A6D17:: @ 81A6D17 .string "You still have lots to do.\p" .string "Go into every patch of grass you\n" @@ -2302,7 +2302,7 @@ Text_1A72F2:: @ 81A72F2 EventScript_1A737B:: @ 81A737B special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 special sub_8112364 checkflag FLAG_OAK_SAW_DEX_COMPLETION @@ -2324,9 +2324,9 @@ EventScript_1A73B6:: @ 81A73B6 copyvar VAR_0x8004, VAR_0x8009 special Special_GetProfOaksRatingMessage waitmessage - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if eq, EventScript_1A73D8 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if eq, EventScript_1A73DC waitfanfare waitbuttonpress @@ -2355,7 +2355,7 @@ EventScript_1A73E0:: @ 81A73E0 checkflag FLAG_OAKS_RATING_IS_VIA_PC call_if FALSE, EventScript_1A746D call EventScript_1A73B6 - compare_var_to_value VAR_0x800A, 0 + compare VAR_0x800A, 0 goto_if eq, EventScript_1A748F setvar VAR_0x8004, 1 specialvar VAR_RESULT, Special_GetPokedexCount @@ -2365,9 +2365,9 @@ EventScript_1A73E0:: @ 81A73E0 getnumberstring 1, VAR_0x8009 msgbox Text_1A71AA specialvar VAR_RESULT, HasAllMons - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1A7470 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A747E end @@ -2701,7 +2701,7 @@ gUnknown_81A7702:: @ 81A7702 lockall textcolor 3 msgbox Text_1A622C, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1A778A setvar VAR_0x8004, 14 call EventScript_1A6AC0 @@ -2709,11 +2709,11 @@ gUnknown_81A7702:: @ 81A7702 faceplayer specialvar VAR_0x8008, Special_GetMartClerkObjectId textcolor 0 - compare_var_to_value VAR_0x8004, 0 + compare VAR_0x8004, 0 goto_if eq, EventScript_1A774D - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1A778A - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A778C end @@ -2808,7 +2808,7 @@ EventScript_1A77F9:: @ 81A77F9 end EventScript_1A7803:: @ 81A7803 - compare_var_to_var VAR_MAP_SCENE_ROUTE23, VAR_0x4001 + compare VAR_MAP_SCENE_ROUTE23, VAR_0x4001 goto_if ge, EventScript_1A77EC switch VAR_0x4001 case 1, EventScript_1A78D5 @@ -2822,7 +2822,7 @@ EventScript_1A7803:: @ 81A7803 end EventScript_1A786C:: @ 81A786C - compare_var_to_var VAR_MAP_SCENE_ROUTE23, VAR_0x4001 + compare VAR_MAP_SCENE_ROUTE23, VAR_0x4001 goto_if ge, EventScript_1A77F9 switch VAR_0x4001 case 1, EventScript_1A78D5 @@ -3036,7 +3036,7 @@ EventScript_1A7AE0:: @ 81A7AE0 EventScript_1A7AE2:: @ 81A7AE2 msgbox Text_177460, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1A7B70 msgbox Text_17747B checkflag FLAG_POKEMON_MANSION_SWITCH_STATE @@ -3260,17 +3260,17 @@ EventScript_1A80FE:: @ 81A80FE releaseall end -EventScript_1A8135:: @ 81A8135 - msgbox Text_1A5BAD +EventScript_NeedCardKey:: @ 81A8135 + msgbox Text_ItNeedsCardKey releaseall end -EventScript_1A813F:: @ 81A813F - msgbox Text_1A5CDF +EventScript_DoorUnlocked:: @ 81A813F + msgbox Text_TheDoorIsOpen releaseall end -EventScript_1A8149:: @ 81A8149 +EventScript_Close2FDoor1:: @ 81A8149 setmetatile 5, 8, 944, 1 setmetatile 6, 8, 945, 1 setmetatile 5, 9, 952, 1 @@ -3278,7 +3278,7 @@ EventScript_1A8149:: @ 81A8149 setmetatile 6, 10, 821, 0 return -EventScript_1A8177:: @ 81A8177 +EventScript_Close2FDoor2:: @ 81A8177 setmetatile 5, 15, 944, 1 setmetatile 6, 15, 945, 1 setmetatile 5, 16, 952, 1 @@ -3286,7 +3286,7 @@ EventScript_1A8177:: @ 81A8177 setmetatile 6, 17, 821, 0 return -EventScript_1A81A5:: @ 81A81A5 +EventScript_Close3FDoor1:: @ 81A81A5 setmetatile 9, 11, 960, 1 setmetatile 10, 11, 961, 1 setmetatile 9, 12, 962, 1 @@ -3295,7 +3295,7 @@ EventScript_1A81A5:: @ 81A81A5 setmetatile 10, 13, 965, 1 return -EventScript_1A81DC:: @ 81A81DC +EventScript_Close3FDoor2:: @ 81A81DC setmetatile 20, 11, 960, 1 setmetatile 21, 11, 961, 1 setmetatile 20, 12, 962, 1 @@ -3304,7 +3304,7 @@ EventScript_1A81DC:: @ 81A81DC setmetatile 21, 13, 965, 1 return -EventScript_1A8213:: @ 81A8213 +EventScript_Close4FDoor1:: @ 81A8213 setmetatile 3, 16, 944, 1 setmetatile 4, 16, 945, 1 setmetatile 3, 17, 952, 1 @@ -3312,7 +3312,7 @@ EventScript_1A8213:: @ 81A8213 setmetatile 4, 18, 821, 0 return -EventScript_1A8241:: @ 81A8241 +EventScript_Close4FDoor2:: @ 81A8241 setmetatile 14, 11, 944, 1 setmetatile 15, 11, 945, 1 setmetatile 14, 12, 952, 1 @@ -3320,7 +3320,7 @@ EventScript_1A8241:: @ 81A8241 setmetatile 15, 13, 821, 0 return -EventScript_1A826F:: @ 81A826F +EventScript_Close5FDoor1:: @ 81A826F setmetatile 7, 8, 960, 1 setmetatile 8, 8, 961, 1 setmetatile 7, 9, 962, 1 @@ -3329,7 +3329,7 @@ EventScript_1A826F:: @ 81A826F setmetatile 8, 10, 965, 1 return -EventScript_1A82A6:: @ 81A82A6 +EventScript_Close5FDoor2:: @ 81A82A6 setmetatile 7, 17, 960, 1 setmetatile 8, 17, 961, 1 setmetatile 7, 18, 962, 1 @@ -3338,7 +3338,7 @@ EventScript_1A82A6:: @ 81A82A6 setmetatile 8, 19, 965, 1 return -EventScript_1A82DD:: @ 81A82DD +EventScript_Close5FDoor3:: @ 81A82DD setmetatile 18, 12, 960, 1 setmetatile 19, 12, 961, 1 setmetatile 18, 13, 962, 1 @@ -3347,7 +3347,7 @@ EventScript_1A82DD:: @ 81A82DD setmetatile 19, 14, 965, 1 return -EventScript_1A8314:: @ 81A8314 +EventScript_Close6FDoor:: @ 81A8314 setmetatile 5, 14, 960, 1 setmetatile 6, 14, 961, 1 setmetatile 5, 15, 962, 1 @@ -3356,7 +3356,7 @@ EventScript_1A8314:: @ 81A8314 setmetatile 6, 16, 965, 1 return -EventScript_1A834B:: @ 81A834B +EventScript_Close7FDoor1:: @ 81A834B setmetatile 11, 8, 944, 1 setmetatile 12, 8, 945, 1 setmetatile 11, 9, 952, 1 @@ -3364,7 +3364,7 @@ EventScript_1A834B:: @ 81A834B setmetatile 12, 10, 821, 0 return -EventScript_1A8379:: @ 81A8379 +EventScript_Close7FDoor2:: @ 81A8379 setmetatile 24, 7, 944, 1 setmetatile 25, 7, 945, 1 setmetatile 24, 8, 952, 1 @@ -3372,7 +3372,7 @@ EventScript_1A8379:: @ 81A8379 setmetatile 25, 9, 821, 0 return -EventScript_1A83A7:: @ 81A83A7 +EventScript_Close7FDoor3:: @ 81A83A7 setmetatile 25, 13, 944, 1 setmetatile 26, 13, 945, 1 setmetatile 25, 14, 952, 1 @@ -3380,7 +3380,7 @@ EventScript_1A83A7:: @ 81A83A7 setmetatile 26, 15, 821, 0 return -EventScript_1A83D5:: @ 81A83D5 +EventScript_Close8FDoor:: @ 81A83D5 setmetatile 5, 9, 960, 1 setmetatile 6, 9, 961, 1 setmetatile 5, 10, 962, 1 @@ -3389,7 +3389,7 @@ EventScript_1A83D5:: @ 81A83D5 setmetatile 6, 11, 965, 1 return -EventScript_1A840C:: @ 81A840C +EventScript_Close9FDoor1:: @ 81A840C setmetatile 2, 9, 960, 1 setmetatile 3, 9, 961, 1 setmetatile 2, 10, 962, 1 @@ -3398,7 +3398,7 @@ EventScript_1A840C:: @ 81A840C setmetatile 3, 11, 965, 1 return -EventScript_1A8443:: @ 81A8443 +EventScript_Close9FDoor2:: @ 81A8443 setmetatile 12, 15, 960, 1 setmetatile 13, 15, 961, 1 setmetatile 12, 16, 962, 1 @@ -3407,7 +3407,7 @@ EventScript_1A8443:: @ 81A8443 setmetatile 13, 17, 965, 1 return -EventScript_1A847A:: @ 81A847A +EventScript_Close9FDoor3:: @ 81A847A setmetatile 21, 6, 944, 1 setmetatile 22, 6, 945, 1 setmetatile 21, 7, 952, 1 @@ -3415,7 +3415,7 @@ EventScript_1A847A:: @ 81A847A setmetatile 22, 8, 821, 0 return -EventScript_1A84A8:: @ 81A84A8 +EventScript_Close9FDoor4:: @ 81A84A8 setmetatile 21, 12, 944, 1 setmetatile 22, 12, 945, 1 setmetatile 21, 13, 952, 1 @@ -3423,7 +3423,7 @@ EventScript_1A84A8:: @ 81A84A8 setmetatile 22, 14, 821, 0 return -EventScript_1A84D6:: @ 81A84D6 +EventScript_Close10FDoor:: @ 81A84D6 setmetatile 12, 11, 944, 1 setmetatile 13, 11, 945, 1 setmetatile 12, 12, 952, 1 @@ -3431,7 +3431,7 @@ EventScript_1A84D6:: @ 81A84D6 setmetatile 13, 13, 821, 0 return -EventScript_1A8504:: @ 81A8504 +EventScript_Close11FDoor:: @ 81A8504 setmetatile 5, 16, 944, 1 setmetatile 6, 16, 945, 1 setmetatile 5, 17, 952, 1 @@ -3439,7 +3439,7 @@ EventScript_1A8504:: @ 81A8504 setmetatile 6, 18, 821, 0 return -EventScript_1A8532:: @ 81A8532 +EventScript_Open2FDoor1:: @ 81A8532 setmetatile 5, 8, 821, 0 setmetatile 6, 8, 820, 0 setmetatile 5, 9, 821, 0 @@ -3447,7 +3447,7 @@ EventScript_1A8532:: @ 81A8532 setmetatile 6, 10, 820, 0 return -EventScript_1A8560:: @ 81A8560 +EventScript_Open2FDoor2:: @ 81A8560 setmetatile 5, 15, 821, 0 setmetatile 6, 15, 820, 0 setmetatile 5, 16, 821, 0 @@ -3455,7 +3455,7 @@ EventScript_1A8560:: @ 81A8560 setmetatile 6, 17, 820, 0 return -EventScript_1A858E:: @ 81A858E +EventScript_Open3FDoor1:: @ 81A858E setmetatile 9, 11, 839, 1 setmetatile 10, 11, 838, 1 setmetatile 9, 12, 821, 0 @@ -3464,7 +3464,7 @@ EventScript_1A858E:: @ 81A858E setmetatile 10, 13, 826, 0 return -EventScript_1A85C5:: @ 81A85C5 +EventScript_Open3FDoor2:: @ 81A85C5 setmetatile 20, 11, 839, 1 setmetatile 21, 11, 838, 1 setmetatile 20, 12, 821, 0 @@ -3473,7 +3473,7 @@ EventScript_1A85C5:: @ 81A85C5 setmetatile 21, 13, 826, 0 return -EventScript_1A85FC:: @ 81A85FC +EventScript_Open4FDoor1:: @ 81A85FC setmetatile 3, 16, 821, 0 setmetatile 4, 16, 820, 0 setmetatile 3, 17, 821, 0 @@ -3481,7 +3481,7 @@ EventScript_1A85FC:: @ 81A85FC setmetatile 4, 18, 820, 0 return -EventScript_1A862A:: @ 81A862A +EventScript_Open4FDoor2:: @ 81A862A setmetatile 14, 11, 821, 0 setmetatile 15, 11, 820, 0 setmetatile 14, 12, 821, 0 @@ -3489,7 +3489,7 @@ EventScript_1A862A:: @ 81A862A setmetatile 15, 13, 820, 0 return -EventScript_1A8658:: @ 81A8658 +EventScript_Open5FDoor1:: @ 81A8658 setmetatile 7, 8, 839, 1 setmetatile 8, 8, 838, 1 setmetatile 7, 9, 821, 0 @@ -3498,7 +3498,7 @@ EventScript_1A8658:: @ 81A8658 setmetatile 8, 10, 826, 0 return -EventScript_1A868F:: @ 81A868F +EventScript_Open5FDoor2:: @ 81A868F setmetatile 7, 17, 839, 1 setmetatile 8, 17, 838, 1 setmetatile 7, 18, 821, 0 @@ -3507,7 +3507,7 @@ EventScript_1A868F:: @ 81A868F setmetatile 8, 19, 826, 0 return -EventScript_1A86C6:: @ 81A86C6 +EventScript_Open5FDoor3:: @ 81A86C6 setmetatile 18, 12, 839, 1 setmetatile 19, 12, 838, 1 setmetatile 18, 13, 821, 0 @@ -3516,7 +3516,7 @@ EventScript_1A86C6:: @ 81A86C6 setmetatile 19, 14, 826, 0 return -EventScript_1A86FD:: @ 81A86FD +EventScript_Open6FDoor:: @ 81A86FD setmetatile 5, 14, 839, 1 setmetatile 6, 14, 838, 1 setmetatile 5, 15, 821, 0 @@ -3525,7 +3525,7 @@ EventScript_1A86FD:: @ 81A86FD setmetatile 6, 16, 826, 0 return -EventScript_1A8734:: @ 81A8734 +EventScript_Open7FDoor1:: @ 81A8734 setmetatile 11, 8, 821, 0 setmetatile 12, 8, 820, 0 setmetatile 11, 9, 821, 0 @@ -3533,7 +3533,7 @@ EventScript_1A8734:: @ 81A8734 setmetatile 12, 10, 820, 0 return -EventScript_1A8762:: @ 81A8762 +EventScript_Open7FDoor2:: @ 81A8762 setmetatile 24, 7, 821, 0 setmetatile 25, 7, 820, 0 setmetatile 24, 8, 821, 0 @@ -3541,7 +3541,7 @@ EventScript_1A8762:: @ 81A8762 setmetatile 25, 9, 820, 0 return -EventScript_1A8790:: @ 81A8790 +EventScript_Open7FDoor3:: @ 81A8790 setmetatile 25, 13, 821, 0 setmetatile 26, 13, 820, 0 setmetatile 25, 14, 821, 0 @@ -3549,7 +3549,7 @@ EventScript_1A8790:: @ 81A8790 setmetatile 26, 15, 820, 0 return -EventScript_1A87BE:: @ 81A87BE +EventScript_Open8FDoor:: @ 81A87BE setmetatile 5, 9, 839, 1 setmetatile 6, 9, 838, 1 setmetatile 5, 10, 821, 0 @@ -3558,7 +3558,7 @@ EventScript_1A87BE:: @ 81A87BE setmetatile 6, 11, 826, 0 return -EventScript_1A87F5:: @ 81A87F5 +EventScript_Open9FDoor1:: @ 81A87F5 setmetatile 2, 9, 839, 1 setmetatile 3, 9, 838, 1 setmetatile 2, 10, 821, 0 @@ -3567,7 +3567,7 @@ EventScript_1A87F5:: @ 81A87F5 setmetatile 3, 11, 826, 0 return -EventScript_1A882C:: @ 81A882C +EventScript_Open9FDoor2:: @ 81A882C setmetatile 12, 15, 839, 1 setmetatile 13, 15, 838, 1 setmetatile 12, 16, 821, 0 @@ -3576,7 +3576,7 @@ EventScript_1A882C:: @ 81A882C setmetatile 13, 17, 826, 0 return -EventScript_1A8863:: @ 81A8863 +EventScript_Open9FDoor3:: @ 81A8863 setmetatile 21, 6, 821, 0 setmetatile 22, 6, 820, 0 setmetatile 21, 7, 821, 0 @@ -3584,7 +3584,7 @@ EventScript_1A8863:: @ 81A8863 setmetatile 22, 8, 820, 0 return -EventScript_1A8891:: @ 81A8891 +EventScript_Open9FDoor4:: @ 81A8891 setmetatile 21, 12, 821, 0 setmetatile 22, 12, 820, 0 setmetatile 21, 13, 821, 0 @@ -3592,7 +3592,7 @@ EventScript_1A8891:: @ 81A8891 setmetatile 22, 14, 820, 0 return -EventScript_1A88BF:: @ 81A88BF +EventScript_Open10FDoor:: @ 81A88BF setmetatile 12, 11, 821, 0 setmetatile 13, 11, 820, 0 setmetatile 12, 12, 821, 0 @@ -3600,7 +3600,7 @@ EventScript_1A88BF:: @ 81A88BF setmetatile 13, 13, 820, 0 return -EventScript_1A88ED:: @ 81A88ED +EventScript_Open11FDoor:: @ 81A88ED setmetatile 5, 16, 821, 0 setmetatile 6, 16, 820, 0 setmetatile 5, 17, 821, 0 @@ -3608,236 +3608,236 @@ EventScript_1A88ED:: @ 81A88ED setmetatile 6, 18, 820, 0 return -SilphCo_2F_EventScript_1A891B:: @ 81A891B +SilphCo_2F_EventScript_Door1:: @ 81A891B lockall setvar VAR_0x4001, 1 setvar VAR_0x8004, 634 checkflag FLAG_SILPH_2F_DOOR_1 - goto_if TRUE, EventScript_1A813F - goto EventScript_1A8B23 + goto_if TRUE, EventScript_DoorUnlocked + goto EventScript_TryUnlockDoor end -SilphCo_2F_EventScript_1A8935:: @ 81A8935 +SilphCo_2F_EventScript_Door2:: @ 81A8935 lockall setvar VAR_0x4001, 2 setvar VAR_0x8004, 635 checkflag FLAG_SILPH_2F_DOOR_2 - goto_if TRUE, EventScript_1A813F - goto EventScript_1A8B23 + goto_if TRUE, EventScript_DoorUnlocked + goto EventScript_TryUnlockDoor end -SilphCo_3F_EventScript_1A894F:: @ 81A894F +SilphCo_3F_EventScript_Door1:: @ 81A894F lockall setvar VAR_0x4001, 3 setvar VAR_0x8004, 636 checkflag FLAG_SILPH_3F_DOOR_1 - goto_if TRUE, EventScript_1A813F - goto EventScript_1A8B23 + goto_if TRUE, EventScript_DoorUnlocked + goto EventScript_TryUnlockDoor end -SilphCo_3F_EventScript_1A8969:: @ 81A8969 +SilphCo_3F_EventScript_Door2:: @ 81A8969 lockall setvar VAR_0x4001, 4 setvar VAR_0x8004, 637 checkflag FLAG_SILPH_3F_DOOR_2 - goto_if TRUE, EventScript_1A813F - goto EventScript_1A8B23 + goto_if TRUE, EventScript_DoorUnlocked + goto EventScript_TryUnlockDoor end -SilphCo_4F_EventScript_1A8983:: @ 81A8983 +SilphCo_4F_EventScript_Door1:: @ 81A8983 lockall setvar VAR_0x4001, 5 setvar VAR_0x8004, 638 checkflag FLAG_SILPH_4F_DOOR_1 - goto_if TRUE, EventScript_1A813F - goto EventScript_1A8B23 + goto_if TRUE, EventScript_DoorUnlocked + goto EventScript_TryUnlockDoor end -SilphCo_4F_EventScript_1A899D:: @ 81A899D +SilphCo_4F_EventScript_Door2:: @ 81A899D lockall setvar VAR_0x4001, 6 setvar VAR_0x8004, 639 checkflag FLAG_SILPH_4F_DOOR_2 - goto_if TRUE, EventScript_1A813F - goto EventScript_1A8B23 + goto_if TRUE, EventScript_DoorUnlocked + goto EventScript_TryUnlockDoor end -SilphCo_5F_EventScript_1A89B7:: @ 81A89B7 +SilphCo_5F_EventScript_Door1:: @ 81A89B7 lockall setvar VAR_0x4001, 7 setvar VAR_0x8004, 640 checkflag FLAG_SILPH_5F_DOOR_1 - goto_if TRUE, EventScript_1A813F - goto EventScript_1A8B23 + goto_if TRUE, EventScript_DoorUnlocked + goto EventScript_TryUnlockDoor end -SilphCo_5F_EventScript_1A89D1:: @ 81A89D1 +SilphCo_5F_EventScript_Door2:: @ 81A89D1 lockall setvar VAR_0x4001, 8 setvar VAR_0x8004, 641 checkflag FLAG_SILPH_5F_DOOR_2 - goto_if TRUE, EventScript_1A813F - goto EventScript_1A8B23 + goto_if TRUE, EventScript_DoorUnlocked + goto EventScript_TryUnlockDoor end -SilphCo_5F_EventScript_1A89EB:: @ 81A89EB +SilphCo_5F_EventScript_Door3:: @ 81A89EB lockall setvar VAR_0x4001, 9 setvar VAR_0x8004, 642 checkflag FLAG_SILPH_5F_DOOR_3 - goto_if TRUE, EventScript_1A813F - goto EventScript_1A8B23 + goto_if TRUE, EventScript_DoorUnlocked + goto EventScript_TryUnlockDoor end -SilphCo_6F_EventScript_1A8A05:: @ 81A8A05 +SilphCo_6F_EventScript_Door:: @ 81A8A05 lockall setvar VAR_0x4001, 10 setvar VAR_0x8004, 643 checkflag FLAG_SILPH_6F_DOOR - goto_if TRUE, EventScript_1A813F - goto EventScript_1A8B23 + goto_if TRUE, EventScript_DoorUnlocked + goto EventScript_TryUnlockDoor end -SilphCo_7F_EventScript_1A8A1F:: @ 81A8A1F +SilphCo_7F_EventScript_Door1:: @ 81A8A1F lockall setvar VAR_0x4001, 11 setvar VAR_0x8004, 644 checkflag FLAG_SILPH_7F_DOOR_1 - goto_if TRUE, EventScript_1A813F - goto EventScript_1A8B23 + goto_if TRUE, EventScript_DoorUnlocked + goto EventScript_TryUnlockDoor end -SilphCo_7F_EventScript_1A8A39:: @ 81A8A39 +SilphCo_7F_EventScript_Door2:: @ 81A8A39 lockall setvar VAR_0x4001, 12 setvar VAR_0x8004, 645 checkflag FLAG_SILPH_7F_DOOR_2 - goto_if TRUE, EventScript_1A813F - goto EventScript_1A8B23 + goto_if TRUE, EventScript_DoorUnlocked + goto EventScript_TryUnlockDoor end -SilphCo_7F_EventScript_1A8A53:: @ 81A8A53 +SilphCo_7F_EventScript_Door3:: @ 81A8A53 lockall setvar VAR_0x4001, 13 setvar VAR_0x8004, 646 checkflag FLAG_SILPH_7F_DOOR_3 - goto_if TRUE, EventScript_1A813F - goto EventScript_1A8B23 + goto_if TRUE, EventScript_DoorUnlocked + goto EventScript_TryUnlockDoor end -SilphCo_8F_EventScript_1A8A6D:: @ 81A8A6D +SilphCo_8F_EventScript_Door:: @ 81A8A6D lockall setvar VAR_0x4001, 14 setvar VAR_0x8004, 647 checkflag FLAG_SILPH_8F_DOOR - goto_if TRUE, EventScript_1A813F - goto EventScript_1A8B23 + goto_if TRUE, EventScript_DoorUnlocked + goto EventScript_TryUnlockDoor end -SilphCo_9F_EventScript_1A8A87:: @ 81A8A87 +SilphCo_9F_EventScript_Door1:: @ 81A8A87 lockall setvar VAR_0x4001, 15 setvar VAR_0x8004, 648 checkflag FLAG_SILPH_9F_DOOR_1 - goto_if TRUE, EventScript_1A813F - goto EventScript_1A8B23 + goto_if TRUE, EventScript_DoorUnlocked + goto EventScript_TryUnlockDoor end -SilphCo_9F_EventScript_1A8AA1:: @ 81A8AA1 +SilphCo_9F_EventScript_Door2:: @ 81A8AA1 lockall setvar VAR_0x4001, 16 setvar VAR_0x8004, 649 checkflag FLAG_SILPH_9F_DOOR_2 - goto_if TRUE, EventScript_1A813F - goto EventScript_1A8B23 + goto_if TRUE, EventScript_DoorUnlocked + goto EventScript_TryUnlockDoor end -SilphCo_9F_EventScript_1A8ABB:: @ 81A8ABB +SilphCo_9F_EventScript_Door3:: @ 81A8ABB lockall setvar VAR_0x4001, 17 setvar VAR_0x8004, 650 checkflag FLAG_SILPH_9F_DOOR_3 - goto_if TRUE, EventScript_1A813F - goto EventScript_1A8B23 + goto_if TRUE, EventScript_DoorUnlocked + goto EventScript_TryUnlockDoor end -SilphCo_9F_EventScript_1A8AD5:: @ 81A8AD5 +SilphCo_9F_EventScript_Door4:: @ 81A8AD5 lockall setvar VAR_0x4001, 18 setvar VAR_0x8004, 651 checkflag FLAG_SILPH_9F_DOOR_4 - goto_if TRUE, EventScript_1A813F - goto EventScript_1A8B23 + goto_if TRUE, EventScript_DoorUnlocked + goto EventScript_TryUnlockDoor end -SilphCo_10F_EventScript_1A8AEF:: @ 81A8AEF +SilphCo_10F_EventScript_Door:: @ 81A8AEF lockall setvar VAR_0x4001, 19 setvar VAR_0x8004, 652 checkflag FLAG_SILPH_10F_DOOR - goto_if TRUE, EventScript_1A813F - goto EventScript_1A8B23 + goto_if TRUE, EventScript_DoorUnlocked + goto EventScript_TryUnlockDoor end -SilphCo_11F_EventScript_1A8B09:: @ 81A8B09 +SilphCo_11F_EventScript_Door:: @ 81A8B09 lockall setvar VAR_0x4001, 20 setvar VAR_0x8004, 653 checkflag FLAG_SILPH_11F_DOOR - goto_if TRUE, EventScript_1A813F - goto EventScript_1A8B23 + goto_if TRUE, EventScript_DoorUnlocked + goto EventScript_TryUnlockDoor end -EventScript_1A8B23:: @ 81A8B23 +EventScript_TryUnlockDoor:: @ 81A8B23 checkflag FLAG_HIDE_SILPH_CO_5F_CARD_KEY - goto_if TRUE, EventScript_1A8B32 - goto EventScript_1A8135 + goto_if TRUE, EventScript_OpenDoor + goto EventScript_NeedCardKey end -EventScript_1A8B32:: @ 81A8B32 +EventScript_OpenDoor:: @ 81A8B32 playfanfare MUS_FANFA1 - msgbox Text_1A5B88 + msgbox Text_CardKeyOpenedDoor waitfanfare - compare_var_to_value VAR_0x4001, 1 - call_if eq, EventScript_1A8532 - compare_var_to_value VAR_0x4001, 2 - call_if eq, EventScript_1A8560 - compare_var_to_value VAR_0x4001, 3 - call_if eq, EventScript_1A858E - compare_var_to_value VAR_0x4001, 4 - call_if eq, EventScript_1A85C5 - compare_var_to_value VAR_0x4001, 5 - call_if eq, EventScript_1A85FC - compare_var_to_value VAR_0x4001, 6 - call_if eq, EventScript_1A862A - compare_var_to_value VAR_0x4001, 7 - call_if eq, EventScript_1A8658 - compare_var_to_value VAR_0x4001, 8 - call_if eq, EventScript_1A868F - compare_var_to_value VAR_0x4001, 9 - call_if eq, EventScript_1A86C6 - compare_var_to_value VAR_0x4001, 10 - call_if eq, EventScript_1A86FD - compare_var_to_value VAR_0x4001, 11 - call_if eq, EventScript_1A8734 - compare_var_to_value VAR_0x4001, 12 - call_if eq, EventScript_1A8762 - compare_var_to_value VAR_0x4001, 13 - call_if eq, EventScript_1A8790 - compare_var_to_value VAR_0x4001, 14 - call_if eq, EventScript_1A87BE - compare_var_to_value VAR_0x4001, 15 - call_if eq, EventScript_1A87F5 - compare_var_to_value VAR_0x4001, 16 - call_if eq, EventScript_1A882C - compare_var_to_value VAR_0x4001, 17 - call_if eq, EventScript_1A8863 - compare_var_to_value VAR_0x4001, 18 - call_if eq, EventScript_1A8891 - compare_var_to_value VAR_0x4001, 19 - call_if eq, EventScript_1A88BF - compare_var_to_value VAR_0x4001, 20 - call_if eq, EventScript_1A88ED + compare VAR_0x4001, 1 + call_if eq, EventScript_Open2FDoor1 + compare VAR_0x4001, 2 + call_if eq, EventScript_Open2FDoor2 + compare VAR_0x4001, 3 + call_if eq, EventScript_Open3FDoor1 + compare VAR_0x4001, 4 + call_if eq, EventScript_Open3FDoor2 + compare VAR_0x4001, 5 + call_if eq, EventScript_Open4FDoor1 + compare VAR_0x4001, 6 + call_if eq, EventScript_Open4FDoor2 + compare VAR_0x4001, 7 + call_if eq, EventScript_Open5FDoor1 + compare VAR_0x4001, 8 + call_if eq, EventScript_Open5FDoor2 + compare VAR_0x4001, 9 + call_if eq, EventScript_Open5FDoor3 + compare VAR_0x4001, 10 + call_if eq, EventScript_Open6FDoor + compare VAR_0x4001, 11 + call_if eq, EventScript_Open7FDoor1 + compare VAR_0x4001, 12 + call_if eq, EventScript_Open7FDoor2 + compare VAR_0x4001, 13 + call_if eq, EventScript_Open7FDoor3 + compare VAR_0x4001, 14 + call_if eq, EventScript_Open8FDoor + compare VAR_0x4001, 15 + call_if eq, EventScript_Open9FDoor1 + compare VAR_0x4001, 16 + call_if eq, EventScript_Open9FDoor2 + compare VAR_0x4001, 17 + call_if eq, EventScript_Open9FDoor3 + compare VAR_0x4001, 18 + call_if eq, EventScript_Open9FDoor4 + compare VAR_0x4001, 19 + call_if eq, EventScript_Open10FDoor + compare VAR_0x4001, 20 + call_if eq, EventScript_Open11FDoor waitse playse SE_KI_GASYAN special DrawWholeMapView @@ -3871,7 +3871,7 @@ EventScript_1A8C3C:: @ 81A8C3C EventScript_1A8C57:: @ 81A8C57 specialvar VAR_RESULT, sub_80CC7B4 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A8C70 msgbox Text_1A5CF1 return @@ -3884,7 +3884,7 @@ EventScript_1A8C70:: @ 81A8C70 EventScript_1A8C82:: @ 81A8C82 specialvar VAR_RESULT, sub_80CC7B4 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A8C9B msgbox Text_1A5D31 return @@ -4009,7 +4009,7 @@ VermilionCity_PokemonCenter_1F_EventScript_1A8D08:: @ 81A8D08 msgbox Text_194234 setflag FLAG_GOT_VS_SEEKER giveitem ITEM_VS_SEEKER - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1A6BF9 msgbox Text_19430F release @@ -4025,9 +4025,9 @@ EventScript_ItemfinderDigUpUnderfootItem:: @ 81A8D49 textcolor 3 waitse call EventScript_GiveItem - compare_var_to_value VAR_0x8007, 1 + compare VAR_0x8007, 1 goto_if eq, EventScript_DigUpItemPutInPocket - compare_var_to_value VAR_0x8007, 0 + compare VAR_0x8007, 0 goto_if eq, EventScript_DigUpItemBagIsFull end @@ -4088,16 +4088,16 @@ EventScript_PoisonWhiteOut:: @ 81A8DFD textcolor 3 special ExecuteWhiteOut waitstate - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A8E11 releaseall end EventScript_1A8E11:: @ 81A8E11 checkmoney 1, 0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1A8E2E - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A8E3C end @@ -4157,9 +4157,9 @@ EventScript_1A8EC0:: @ 81A8EC0 return EventScript_1A8EC5:: @ 81A8EC5 - compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 + compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 goto_if ge, EventScript_1A911E - compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND, 4 + compare VAR_MAP_SCENE_CINNABAR_ISLAND, 4 goto_if ge, EventScript_1A8F12 multichoice 19, 6, MULTICHOICE_ISLAND_23, FALSE switch VAR_RESULT @@ -4180,9 +4180,9 @@ EventScript_1A8F12:: @ 81A8F12 end EventScript_1A8F54:: @ 81A8F54 - compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 + compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 goto_if ge, EventScript_1A911E - compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND, 4 + compare VAR_MAP_SCENE_CINNABAR_ISLAND, 4 goto_if ge, EventScript_1A8FA1 multichoice 19, 6, MULTICHOICE_ISLAND_13, FALSE switch VAR_RESULT @@ -4223,9 +4223,9 @@ EventScript_1A9004:: @ 81A9004 end EventScript_1A900F:: @ 81A900F - compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 + compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 goto_if ge, EventScript_1A911E - compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND, 4 + compare VAR_MAP_SCENE_CINNABAR_ISLAND, 4 goto_if ge, EventScript_1A905C multichoice 19, 6, MULTICHOICE_ISLAND_12, FALSE switch VAR_RESULT @@ -4248,9 +4248,9 @@ EventScript_1A905C:: @ 81A905C EventScript_1A909E:: @ 81A909E specialvar VAR_RESULT, sub_8147500 getnumberstring 0, VAR_RESULT - compare_var_to_value VAR_0x8004, SEAGALLOP_VERMILION_CITY + compare VAR_0x8004, SEAGALLOP_VERMILION_CITY goto_if eq, EventScript_1A90BE - compare_var_to_value VAR_0x8004, SEAGALLOP_VERMILION_CITY + compare VAR_0x8004, SEAGALLOP_VERMILION_CITY goto_if ne, EventScript_1A90CC end @@ -4268,7 +4268,7 @@ EventScript_1A90DA:: @ 81A90DA closemessage delay 20 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 special sub_8112364 fadescreen 1 @@ -4278,7 +4278,7 @@ EventScript_1A90DA:: @ 81A90DA EventScript_1A90F6:: @ 81A90F6 specialvar VAR_RESULT, sub_8147594 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A9108 release end @@ -4529,7 +4529,7 @@ gUnknown_81A93C0:: @ 81A93C0 Route3_EventScript_1A93C9:: @ 81A93C9 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_YOUNGSTER_BEN, 0, Text_183560, Text_1835A0 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A93F0 msgbox Text_1835B4, 6 end @@ -4542,7 +4542,7 @@ EventScript_1A93F0:: @ 81A93F0 Route3_EventScript_1A9407:: @ 81A9407 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_YOUNGSTER_CALVIN, 0, Text_183786, Text_1837BD specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A942E msgbox Text_1837CF, 6 end @@ -4555,7 +4555,7 @@ EventScript_1A942E:: @ 81A942E Route3_EventScript_1A9445:: @ 81A9445 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BUG_CATCHER_COLTON, 0, Text_1834E6, Text_183509 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A946C msgbox Text_18351C, 6 end @@ -4568,7 +4568,7 @@ EventScript_1A946C:: @ 81A946C Route3_EventScript_1A9483:: @ 81A9483 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BUG_CATCHER_GREG, 0, Text_183682, Text_1836B3 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A94AA msgbox Text_1836D9, 6 end @@ -4581,7 +4581,7 @@ EventScript_1A94AA:: @ 81A94AA Route3_EventScript_1A94C1:: @ 81A94C1 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BUG_CATCHER_JAMES, 0, Text_183807, Text_183837 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A94E8 msgbox Text_183849, 6 end @@ -4594,7 +4594,7 @@ EventScript_1A94E8:: @ 81A94E8 Route3_EventScript_1A94FF:: @ 81A94FF trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_JANICE, 0, Text_183616, Text_18363F specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A9526 msgbox Text_18364C, 6 end @@ -4607,7 +4607,7 @@ EventScript_1A9526:: @ 81A9526 Route3_EventScript_1A953D:: @ 81A953D trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_SALLY, 0, Text_18371B, Text_183746 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A9564 msgbox Text_18374F, 6 end @@ -4620,7 +4620,7 @@ EventScript_1A9564:: @ 81A9564 Route3_EventScript_1A957B:: @ 81A957B trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_ROBIN, 0, Text_18387A, Text_183891 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A95A2 msgbox Text_18389C, 6 end @@ -4633,7 +4633,7 @@ EventScript_1A95A2:: @ 81A95A2 Route4_EventScript_1A95B9:: @ 81A95B9 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_CRISSY, 0, Text_183906, Text_183938 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A95E0 msgbox Text_183957, 6 end @@ -4646,7 +4646,7 @@ EventScript_1A95E0:: @ 81A95E0 Route24_EventScript_1A95F7:: @ 81A95F7 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_YOUNGSTER_TIMMY, 0, Text_188F76, Text_188F95 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A961E msgbox Text_188FA7, 6 end @@ -4659,7 +4659,7 @@ EventScript_1A961E:: @ 81A961E Route24_EventScript_1A9635:: @ 81A9635 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BUG_CATCHER_CALE, 0, Text_18901B, Text_18908C specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A965C msgbox Text_18909E, 6 end @@ -4672,7 +4672,7 @@ EventScript_1A965C:: @ 81A965C Route24_EventScript_1A9673:: @ 81A9673 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_RELI, 0, Text_188F2C, Text_188F46 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A969A msgbox Text_188F53, 6 end @@ -4685,7 +4685,7 @@ EventScript_1A969A:: @ 81A969A Route24_EventScript_1A96B1:: @ 81A96B1 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_ALI, 0, Text_188FC9, Text_188FE7 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A96D8 msgbox Text_188FF9, 6 end @@ -4698,7 +4698,7 @@ EventScript_1A96D8:: @ 81A96D8 Route24_EventScript_1A96EF:: @ 81A96EF trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CAMPER_SHANE, 0, Text_188E74, Text_188E94 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A9716 msgbox Text_188EA3, 6 end @@ -4711,7 +4711,7 @@ EventScript_1A9716:: @ 81A9716 Route24_EventScript_1A972D:: @ 81A972D trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CAMPER_ETHAN, 0, Text_188ED9, Text_188EFA specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A9754 msgbox Text_188F0A, 6 end @@ -4724,7 +4724,7 @@ EventScript_1A9754:: @ 81A9754 Route25_EventScript_1A976B:: @ 81A976B trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_YOUNGSTER_JOEY, 0, Text_1890C0, Text_1890E6 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A9792 msgbox Text_1890F5, 6 end @@ -4737,7 +4737,7 @@ EventScript_1A9792:: @ 81A9792 Route25_EventScript_1A97A9:: @ 81A97A9 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_YOUNGSTER_DAN, 0, Text_189165, Text_1891A6 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A97D0 msgbox Text_1891B3, 6 end @@ -4750,7 +4750,7 @@ EventScript_1A97D0:: @ 81A97D0 Route25_EventScript_1A97E7:: @ 81A97E7 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_YOUNGSTER_CHAD, 0, Text_1892A9, Text_1892D9 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A980E msgbox Text_1892EF, 6 end @@ -4763,7 +4763,7 @@ EventScript_1A980E:: @ 81A980E Route25_EventScript_1A9825:: @ 81A9825 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_KELSEY, 0, Text_189247, Text_189261 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A984C msgbox Text_189281, 6 end @@ -4776,7 +4776,7 @@ EventScript_1A984C:: @ 81A984C Route25_EventScript_1A9863:: @ 81A9863 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_HALEY, 0, Text_189333, Text_189364 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A988A msgbox Text_189378, 6 end @@ -4789,7 +4789,7 @@ EventScript_1A988A:: @ 81A988A Route25_EventScript_1A98A1:: @ 81A98A1 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_FRANKLIN, 0, Text_1893A7, Text_1893EA specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A98C8 msgbox Text_1893FB, 6 end @@ -4802,7 +4802,7 @@ EventScript_1A98C8:: @ 81A98C8 Route25_EventScript_1A98DF:: @ 81A98DF trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_NOB, 0, Text_189423, Text_189459 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A9906 msgbox Text_18947E, 6 end @@ -4815,7 +4815,7 @@ EventScript_1A9906:: @ 81A9906 Route25_EventScript_1A991D:: @ 81A991D trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_WAYNE, 0, Text_1894DE, Text_18950A specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A9944 msgbox Text_18951C, 6 end @@ -4828,7 +4828,7 @@ EventScript_1A9944:: @ 81A9944 Route25_EventScript_1A995B:: @ 81A995B trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CAMPER_FLINT, 0, Text_1891EB, Text_189212 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A9982 msgbox Text_18921D, 6 end @@ -4841,7 +4841,7 @@ EventScript_1A9982:: @ 81A9982 Route6_EventScript_1A9999:: @ 81A9999 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BUG_CATCHER_KEIGO, 0, Text_183E9F, Text_183EC0 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A99C0 msgbox Text_183ED4, 6 end @@ -4854,7 +4854,7 @@ EventScript_1A99C0:: @ 81A99C0 Route6_EventScript_1A99D7:: @ 81A99D7 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BUG_CATCHER_ELIJAH, 0, Text_183FF0, Text_18401A specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A99FE msgbox Text_18402B, 6 end @@ -4867,7 +4867,7 @@ EventScript_1A99FE:: @ 81A99FE Route6_EventScript_1A9A15:: @ 81A9A15 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CAMPER_RICKY, 0, Text_183E04, Text_183E2A specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A9A3C msgbox Text_183E3C, 6 end @@ -4880,7 +4880,7 @@ EventScript_1A9A3C:: @ 81A9A3C Route6_EventScript_1A9A53:: @ 81A9A53 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CAMPER_JEFF, 0, Text_183F07, Text_183F24 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A9A7A msgbox Text_183F51, 6 end @@ -4893,7 +4893,7 @@ EventScript_1A9A7A:: @ 81A9A7A Route6_EventScript_1A9A91:: @ 81A9A91 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_NANCY, 0, Text_183E4E, Text_183E79 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A9AB8 msgbox Text_183E8D, 6 end @@ -4906,7 +4906,7 @@ EventScript_1A9AB8:: @ 81A9AB8 Route6_EventScript_1A9ACF:: @ 81A9ACF trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_ISABELLE, 0, Text_183F90, Text_183FAB specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A9AF6 msgbox Text_183FC4, 6 end @@ -4919,7 +4919,7 @@ EventScript_1A9AF6:: @ 81A9AF6 Route11_EventScript_1A9B0D:: @ 81A9B0D trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_YOUNGSTER_EDDIE, 0, Text_184FBD, Text_184FD8 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A9B34 msgbox Text_184FEF, 6 end @@ -4932,7 +4932,7 @@ EventScript_1A9B34:: @ 81A9B34 Route11_EventScript_1A9B4B:: @ 81A9B4B trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_YOUNGSTER_DILLON, 0, Text_18506A, Text_18509B specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A9B72 msgbox Text_1850CF, 6 end @@ -4945,7 +4945,7 @@ EventScript_1A9B72:: @ 81A9B72 Route11_EventScript_1A9B89:: @ 81A9B89 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_YOUNGSTER_YASU, 0, Text_18517B, Text_1851AC specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A9BB0 msgbox Text_1851D2, 6 end @@ -4958,7 +4958,7 @@ EventScript_1A9BB0:: @ 81A9BB0 Route11_EventScript_1A9BC7:: @ 81A9BC7 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_YOUNGSTER_DAVE, 0, Text_185285, Text_1852C1 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A9BEE msgbox Text_1852E3, 6 end @@ -4971,7 +4971,7 @@ EventScript_1A9BEE:: @ 81A9BEE Route11_EventScript_1A9C05:: @ 81A9C05 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_ENGINEER_BRAXTON, 0, Text_185011, Text_185037 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A9C2C msgbox Text_18504A, 6 end @@ -4984,7 +4984,7 @@ EventScript_1A9C2C:: @ 81A9C2C Route11_EventScript_1A9C43:: @ 81A9C43 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_ENGINEER_BERNIE, 0, Text_185236, Text_185250 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A9C6A msgbox Text_185266, 6 end @@ -4997,7 +4997,7 @@ EventScript_1A9C6A:: @ 81A9C6A Route11_EventScript_1A9C81:: @ 81A9C81 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_GAMER_HUGO, 0, Text_184F01, Text_184F15 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A9CA8 msgbox Text_184F2E, 6 end @@ -5010,7 +5010,7 @@ EventScript_1A9CA8:: @ 81A9CA8 Route11_EventScript_1A9CBF:: @ 81A9CBF trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_GAMER_JASPER, 0, Text_184F5D, Text_184F7E specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A9CE6 msgbox Text_184F8E, 6 end @@ -5023,7 +5023,7 @@ EventScript_1A9CE6:: @ 81A9CE6 Route11_EventScript_1A9CFD:: @ 81A9CFD trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_GAMER_DIRK, 0, Text_1850E9, Text_185105 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A9D24 msgbox Text_185114, 6 end @@ -5036,7 +5036,7 @@ EventScript_1A9D24:: @ 81A9D24 Route11_EventScript_1A9D3B:: @ 81A9D3B trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_GAMER_DARIAN, 0, Text_185135, Text_18514E specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A9D62 msgbox Text_185161, 6 end @@ -5049,7 +5049,7 @@ EventScript_1A9D62:: @ 81A9D62 Route9_EventScript_1A9D79:: @ 81A9D79 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BUG_CATCHER_BRENT, 0, Text_184A2F, Text_184A6A specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A9DA0 msgbox Text_184A8C, 6 end @@ -5062,7 +5062,7 @@ EventScript_1A9DA0:: @ 81A9DA0 Route9_EventScript_1A9DB7:: @ 81A9DB7 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BUG_CATCHER_CONNER, 0, Text_184B18, Text_184B32 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A9DDE msgbox Text_184B3B, 6 end @@ -5075,7 +5075,7 @@ EventScript_1A9DDE:: @ 81A9DDE Route9_EventScript_1A9DF5:: @ 81A9DF5 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CAMPER_CHRIS, 0, Text_184844, Text_18487E specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A9E1C msgbox Text_184890, 6 end @@ -5088,7 +5088,7 @@ EventScript_1A9E1C:: @ 81A9E1C Route9_EventScript_1A9E33:: @ 81A9E33 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CAMPER_DREW, 0, Text_18489E, Text_1848CC specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A9E5A msgbox Text_1848DE, 6 end @@ -5101,7 +5101,7 @@ EventScript_1A9E5A:: @ 81A9E5A Route9_EventScript_1A9E71:: @ 81A9E71 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_ALICIA, 0, Text_1847B7, Text_1847DF specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A9E98 msgbox Text_1847F0, 6 end @@ -5114,7 +5114,7 @@ EventScript_1A9E98:: @ 81A9E98 Route9_EventScript_1A9EAF:: @ 81A9EAF trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_CAITLIN, 0, Text_1848FF, Text_18491C specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A9ED6 msgbox Text_184931, 6 end @@ -5127,7 +5127,7 @@ EventScript_1A9ED6:: @ 81A9ED6 Route9_EventScript_1A9EED:: @ 81A9EED trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_ALAN, 0, Text_184ABE, Text_184AD5 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A9F14 msgbox Text_184AF1, 6 end @@ -5140,7 +5140,7 @@ EventScript_1A9F14:: @ 81A9F14 Route9_EventScript_1A9F2B:: @ 81A9F2B trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_BRICE, 0, Text_1849DF, Text_184A04 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A9F52 msgbox Text_184A11, 6 end @@ -5153,7 +5153,7 @@ EventScript_1A9F52:: @ 81A9F52 Route9_EventScript_1A9F69:: @ 81A9F69 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_JEREMY, 0, Text_18495E, Text_18497F specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A9F90 msgbox Text_1849B0, 6 end @@ -5166,7 +5166,7 @@ EventScript_1A9F90:: @ 81A9F90 Route10_EventScript_1A9FA7:: @ 81A9FA7 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_HEIDI, 0, Text_184CF1, Text_184D31 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A9FCE msgbox Text_184D4D, 6 end @@ -5179,7 +5179,7 @@ EventScript_1A9FCE:: @ 81A9FCE Route10_EventScript_1A9FE5:: @ 81A9FE5 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_CAROL, 0, Text_184E04, Text_184E3B specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AA00C msgbox Text_184E5E, 6 end @@ -5192,7 +5192,7 @@ EventScript_1AA00C:: @ 81AA00C Route10_EventScript_1AA023:: @ 81AA023 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_POKEMANIAC_MARK, 0, Text_184B8A, Text_184BE5 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AA04A msgbox Text_184BFB, 6 end @@ -5205,7 +5205,7 @@ EventScript_1AA04A:: @ 81AA04A Route10_EventScript_1AA061:: @ 81AA061 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_POKEMANIAC_HERMAN, 0, Text_184C86, Text_184CA7 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AA088 msgbox Text_184CBB, 6 end @@ -5218,7 +5218,7 @@ EventScript_1AA088:: @ 81AA088 Route10_EventScript_1AA09F:: @ 81AA09F trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_CLARK, 0, Text_184C1D, Text_184C2D specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AA0C6 msgbox Text_184C60, 6 end @@ -5231,7 +5231,7 @@ EventScript_1AA0C6:: @ 81AA0C6 Route10_EventScript_1AA0DD:: @ 81AA0DD trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_TRENT, 0, Text_184DAA, Text_184DCE specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AA104 msgbox Text_184DE4, 6 end @@ -5244,7 +5244,7 @@ EventScript_1AA104:: @ 81AA104 Route8_EventScript_1AA11B:: @ 81AA11B trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_PAIGE, 0, Text_1841ED, Text_184210 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AA142 msgbox Text_18421B, 6 end @@ -5257,7 +5257,7 @@ EventScript_1AA142:: @ 81AA142 Route8_EventScript_1AA159:: @ 81AA159 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_ANDREA, 0, Text_184321, Text_184346 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AA180 msgbox Text_184350, 6 end @@ -5270,7 +5270,7 @@ EventScript_1AA180:: @ 81AA180 Route8_EventScript_1AA197:: @ 81AA197 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_MEGAN, 0, Text_18437A, Text_1843A6 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AA1BE msgbox Text_1843D2, 6 end @@ -5283,7 +5283,7 @@ EventScript_1AA1BE:: @ 81AA1BE Route8_EventScript_1AA1D5:: @ 81AA1D5 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_JULIA, 0, Text_1844AC, Text_1844D6 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AA1FC msgbox Text_1844FD, 6 end @@ -5296,7 +5296,7 @@ EventScript_1AA1FC:: @ 81AA1FC Route8_EventScript_1AA213:: @ 81AA213 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SUPER_NERD_AIDAN, 0, Text_1840C5, Text_184100 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AA23A msgbox Text_18410E, 6 end @@ -5309,7 +5309,7 @@ EventScript_1AA23A:: @ 81AA23A Route8_EventScript_1AA251:: @ 81AA251 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SUPER_NERD_GLENN, 0, Text_18417C, Text_1841B6 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AA278 msgbox Text_1841C8, 6 end @@ -5322,7 +5322,7 @@ EventScript_1AA278:: @ 81AA278 Route8_EventScript_1AA28F:: @ 81AA28F trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SUPER_NERD_LESLIE, 0, Text_184257, Text_18427A specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AA2B6 msgbox Text_1842B3, 6 end @@ -5335,7 +5335,7 @@ EventScript_1AA2B6:: @ 81AA2B6 Route8_EventScript_1AA2CD:: @ 81AA2CD trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_GAMER_STAN, 0, Text_18412F, Text_18414D specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AA2F4 msgbox Text_184162, 6 end @@ -5348,7 +5348,7 @@ EventScript_1AA2F4:: @ 81AA2F4 Route8_EventScript_1AA30B:: @ 81AA30B trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_GAMER_RICH, 0, Text_184432, Text_18444F specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AA332 msgbox Text_184466, 6 end @@ -5361,7 +5361,7 @@ EventScript_1AA332:: @ 81AA332 Route8_EventScript_1AA349:: @ 81AA349 trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_TWINS_ELI_ANNE, 0, Text_1845A4, Text_1845D0, Text_184616 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AA374 msgbox Text_1845F2, 6 end @@ -5374,7 +5374,7 @@ EventScript_1AA374:: @ 81AA374 Route8_EventScript_1AA38F:: @ 81AA38F trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_TWINS_ELI_ANNE, 0, Text_18464A, Text_184675, Text_1846AF specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AA3BA msgbox Text_18468B, 6 end @@ -5387,7 +5387,7 @@ EventScript_1AA3BA:: @ 81AA3BA Route8_EventScript_1AA3D5:: @ 81AA3D5 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIKER_RICARDO, 0, Text_1846E2, Text_1846FC specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AA3FC msgbox Text_184719, 6 end @@ -5400,7 +5400,7 @@ EventScript_1AA3FC:: @ 81AA3FC Route8_EventScript_1AA413:: @ 81AA413 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIKER_JAREN, 0, Text_184742, Text_184767 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AA43A msgbox Text_18477A, 6 end @@ -5413,7 +5413,7 @@ EventScript_1AA43A:: @ 81AA43A Route12_EventScript_1AA451:: @ 81AA451 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_FISHERMAN_NED, 0, Text_185402, Text_18541B specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AA478 msgbox Text_185432, 6 end @@ -5426,7 +5426,7 @@ EventScript_1AA478:: @ 81AA478 Route12_EventScript_1AA48F:: @ 81AA48F trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_FISHERMAN_CHIP, 0, Text_18544E, Text_185475 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AA4B6 msgbox Text_185488, 6 end @@ -5439,7 +5439,7 @@ EventScript_1AA4B6:: @ 81AA4B6 Route12_EventScript_1AA4CD:: @ 81AA4CD trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_FISHERMAN_HANK, 0, Text_1855E1, Text_185606 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AA4F4 msgbox Text_185616, 6 end @@ -5452,7 +5452,7 @@ EventScript_1AA4F4:: @ 81AA4F4 Route12_EventScript_1AA50B:: @ 81AA50B trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_FISHERMAN_ELLIOT, 0, Text_185682, Text_1856D0 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AA532 msgbox Text_1856DF, 6 end @@ -5465,7 +5465,7 @@ EventScript_1AA532:: @ 81AA532 Route12_EventScript_1AA549:: @ 81AA549 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_FISHERMAN_ANDREW, 0, Text_18570E, Text_185744 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AA570 msgbox Text_18574D, 6 end @@ -5478,7 +5478,7 @@ EventScript_1AA570:: @ 81AA570 Route12_EventScript_1AA587:: @ 81AA587 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_ROCKER_LUCA, 0, Text_185547, Text_18559B specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AA5AE msgbox Text_1855A6, 6 end @@ -5491,7 +5491,7 @@ EventScript_1AA5AE:: @ 81AA5AE Route12_EventScript_1AA5C5:: @ 81AA5C5 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CAMPER_JUSTIN, 0, Text_1854B9, Text_1854ED specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AA5EC msgbox Text_1854F2, 6 end @@ -5504,7 +5504,7 @@ EventScript_1AA5EC:: @ 81AA5EC Route12_EventScript_1AA603:: @ 81AA603 trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_YOUNG_COUPLE_GIA_JES, 0, Text_1857C5, Text_1857F1, Text_185842 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AA62E msgbox Text_18581F, 6 end @@ -5517,7 +5517,7 @@ EventScript_1AA62E:: @ 81AA62E Route12_EventScript_1AA649:: @ 81AA649 trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_YOUNG_COUPLE_GIA_JES, 0, Text_1858A6, Text_1858D0, Text_185908 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AA674 msgbox Text_1858E2, 6 end @@ -5530,7 +5530,7 @@ EventScript_1AA674:: @ 81AA674 Route13_EventScript_1AA68F:: @ 81AA68F trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIKER_JARED, 0, Text_185D05, Text_185D1D specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AA6B6 msgbox Text_185D33, 6 end @@ -5543,7 +5543,7 @@ EventScript_1AA6B6:: @ 81AA6B6 Route13_EventScript_1AA6CD:: @ 81AA6CD trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BEAUTY_LOLA, 0, Text_185BFC, Text_185C1F specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AA6F4 msgbox Text_185C35, 6 end @@ -5556,7 +5556,7 @@ EventScript_1AA6F4:: @ 81AA6F4 Route13_EventScript_1AA70B:: @ 81AA70B trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BEAUTY_SHEILA, 0, Text_185C69, Text_185C95 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AA732 msgbox Text_185CA8, 6 end @@ -5569,7 +5569,7 @@ EventScript_1AA732:: @ 81AA732 Route13_EventScript_1AA749:: @ 81AA749 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_SEBASTIAN, 0, Text_185955, Text_18597E specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AA770 msgbox Text_1859A2, 6 end @@ -5582,7 +5582,7 @@ EventScript_1AA770:: @ 81AA770 Route13_EventScript_1AA787:: @ 81AA787 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_PERRY, 0, Text_185B8F, Text_185BCA specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AA7AE msgbox Text_185BDB, 6 end @@ -5595,7 +5595,7 @@ EventScript_1AA7AE:: @ 81AA7AE Route13_EventScript_1AA7C5:: @ 81AA7C5 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_ROBERT, 0, Text_185D3D, Text_185D7B specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AA7EC msgbox Text_185D89, 6 end @@ -5608,7 +5608,7 @@ EventScript_1AA7EC:: @ 81AA7EC Route13_EventScript_1AA803:: @ 81AA803 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_ALMA, 0, Text_185B12, Text_185B48 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AA82A msgbox Text_185B67, 6 end @@ -5621,7 +5621,7 @@ EventScript_1AA82A:: @ 81AA82A Route13_EventScript_1AA841:: @ 81AA841 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_SUSIE, 0, Text_1859CF, Text_1859EC specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AA868 msgbox Text_1859F9, 6 end @@ -5634,7 +5634,7 @@ EventScript_1AA868:: @ 81AA868 Route13_EventScript_1AA87F:: @ 81AA87F trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_VALERIE, 0, Text_185A37, Text_185A56 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AA8A6 msgbox Text_185A62, 6 end @@ -5647,7 +5647,7 @@ EventScript_1AA8A6:: @ 81AA8A6 Route13_EventScript_1AA8BD:: @ 81AA8BD trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_GWEN, 0, Text_185A91, Text_185AC1 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AA8E4 msgbox Text_185ADE, 6 end @@ -5660,7 +5660,7 @@ EventScript_1AA8E4:: @ 81AA8E4 Route14_EventScript_1AA8FB:: @ 81AA8FB trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIKER_MALIK, 0, Text_186344, Text_186362 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AA922 msgbox Text_18636E, 6 end @@ -5673,7 +5673,7 @@ EventScript_1AA922:: @ 81AA922 Route14_EventScript_1AA939:: @ 81AA939 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIKER_LUKAS, 0, Text_1861F7, Text_186223 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AA960 msgbox Text_186239, 6 end @@ -5686,7 +5686,7 @@ EventScript_1AA960:: @ 81AA960 Route14_EventScript_1AA977:: @ 81AA977 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIKER_ISAAC, 0, Text_186263, Text_186291 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AA99E msgbox Text_18629D, 6 end @@ -5699,7 +5699,7 @@ EventScript_1AA99E:: @ 81AA99E Route14_EventScript_1AA9B5:: @ 81AA9B5 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIKER_GERALD, 0, Text_1862BD, Text_1862EF specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AA9DC msgbox Text_1862F8, 6 end @@ -5712,7 +5712,7 @@ EventScript_1AA9DC:: @ 81AA9DC Route14_EventScript_1AA9F3:: @ 81AA9F3 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_DONALD, 0, Text_1860D9, Text_18610A specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AAA1A msgbox Text_18611D, 6 end @@ -5725,7 +5725,7 @@ EventScript_1AAA1A:: @ 81AAA1A Route14_EventScript_1AAA31:: @ 81AAA31 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_BENNY, 0, Text_18618E, Text_1861B3 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AAA58 msgbox Text_1861BE, 6 end @@ -5738,7 +5738,7 @@ EventScript_1AAA58:: @ 81AAA58 Route14_EventScript_1AAA6F:: @ 81AAA6F trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_CARTER, 0, Text_185E4D, Text_185E81 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AAA96 msgbox Text_185E9C, 6 end @@ -5751,7 +5751,7 @@ EventScript_1AAA96:: @ 81AAA96 Route14_EventScript_1AAAAD:: @ 81AAAAD trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_MITCH, 0, Text_185EDF, Text_185F0B specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AAAD4 msgbox Text_185F1A, 6 end @@ -5764,7 +5764,7 @@ EventScript_1AAAD4:: @ 81AAAD4 Route14_EventScript_1AAAEB:: @ 81AAAEB trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_BECK, 0, Text_185F46, Text_185FAE specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AAB12 msgbox Text_185FBB, 6 end @@ -5777,7 +5777,7 @@ EventScript_1AAB12:: @ 81AAB12 Route14_EventScript_1AAB29:: @ 81AAB29 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_MARLON, 0, Text_186021, Text_18607C specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AAB50 msgbox Text_186091, 6 end @@ -5790,7 +5790,7 @@ EventScript_1AAB50:: @ 81AAB50 Route14_EventScript_1AAB67:: @ 81AAB67 trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_TWINS_KIRI_JAN, 0, Text_1863B7, Text_1863EA, Text_18642E specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AAB92 msgbox Text_18640D, 6 end @@ -5803,7 +5803,7 @@ EventScript_1AAB92:: @ 81AAB92 Route14_EventScript_1AABAD:: @ 81AABAD trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_TWINS_KIRI_JAN, 0, Text_18645B, Text_186487, Text_1864D3 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AABD8 msgbox Text_18649C, 6 end @@ -5816,7 +5816,7 @@ EventScript_1AABD8:: @ 81AABD8 Route15_EventScript_1AABF3:: @ 81AABF3 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIKER_ERNEST, 0, Text_1868B6, Text_1868E8 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AAC1A msgbox Text_1868F1, 6 end @@ -5829,7 +5829,7 @@ EventScript_1AAC1A:: @ 81AAC1A Route15_EventScript_1AAC31:: @ 81AAC31 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIKER_ALEX, 0, Text_186936, Text_186968 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AAC58 msgbox Text_18697C, 6 end @@ -5842,7 +5842,7 @@ EventScript_1AAC58:: @ 81AAC58 Route15_EventScript_1AAC6F:: @ 81AAC6F trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BEAUTY_GRACE, 0, Text_18678B, Text_1867C1 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AAC96 msgbox Text_1867DA, 6 end @@ -5855,7 +5855,7 @@ EventScript_1AAC96:: @ 81AAC96 Route15_EventScript_1AACAD:: @ 81AACAD trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BEAUTY_OLIVIA, 0, Text_18680C, Text_186841 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AACD4 msgbox Text_18686F, 6 end @@ -5868,7 +5868,7 @@ EventScript_1AACD4:: @ 81AACD4 Route15_EventScript_1AACEB:: @ 81AACEB trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_EDWIN, 0, Text_18664F, Text_18667A specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AAD12 msgbox Text_18668D, 6 end @@ -5881,7 +5881,7 @@ EventScript_1AAD12:: @ 81AAD12 Route15_EventScript_1AAD29:: @ 81AAD29 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_CHESTER, 0, Text_1866D1, Text_186707 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AAD50 msgbox Text_18671A, 6 end @@ -5894,7 +5894,7 @@ EventScript_1AAD50:: @ 81AAD50 Route15_EventScript_1AAD67:: @ 81AAD67 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_YAZMIN, 0, Text_186A22, Text_186A40 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AAD8E msgbox Text_186A55, 6 end @@ -5907,7 +5907,7 @@ EventScript_1AAD8E:: @ 81AAD8E Route15_EventScript_1AADA5:: @ 81AADA5 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_KINDRA, 0, Text_18650B, Text_186549 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AADCC msgbox Text_18655A, 6 end @@ -5920,7 +5920,7 @@ EventScript_1AADCC:: @ 81AADCC Route15_EventScript_1AADE3:: @ 81AADE3 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_BECKY, 0, Text_1865D3, Text_186612 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AAE0A msgbox Text_18661D, 6 end @@ -5933,7 +5933,7 @@ EventScript_1AAE0A:: @ 81AAE0A Route15_EventScript_1AAE21:: @ 81AAE21 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_CELIA, 0, Text_1869BA, Text_1869E6 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AAE48 msgbox Text_1869F4, 6 end @@ -5946,7 +5946,7 @@ EventScript_1AAE48:: @ 81AAE48 Route15_EventScript_1AAE5F:: @ 81AAE5F trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_CRUSH_KIN_RON_MYA, 0, Text_186A95, Text_186ACB, Text_186B46 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AAE8A msgbox Text_186B0A, 6 end @@ -5959,7 +5959,7 @@ EventScript_1AAE8A:: @ 81AAE8A Route15_EventScript_1AAEA5:: @ 81AAEA5 trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_CRUSH_KIN_RON_MYA, 0, Text_186B89, Text_186BB1, Text_186BFE specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AAED0 msgbox Text_186BD2, 6 end @@ -5972,7 +5972,7 @@ EventScript_1AAED0:: @ 81AAED0 Route16_EventScript_1AAEEB:: @ 81AAEEB trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIKER_LAO, 0, Text_186C4D, Text_186C5F specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AAF12 msgbox Text_186C75, 6 end @@ -5985,7 +5985,7 @@ EventScript_1AAF12:: @ 81AAF12 Route16_EventScript_1AAF29:: @ 81AAF29 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIKER_HIDEO, 0, Text_186D39, Text_186D52 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AAF50 msgbox Text_186D5A, 6 end @@ -5998,7 +5998,7 @@ EventScript_1AAF50:: @ 81AAF50 Route16_EventScript_1AAF67:: @ 81AAF67 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIKER_RUBEN, 0, Text_186E86, Text_186EB4 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AAF8E msgbox Text_186EC7, 6 end @@ -6011,7 +6011,7 @@ EventScript_1AAF8E:: @ 81AAF8E Route16_EventScript_1AAFA5:: @ 81AAFA5 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CUE_BALL_KOJI, 0, Text_186CA2, Text_186CBB specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AAFCC msgbox Text_186CC5, 6 end @@ -6024,7 +6024,7 @@ EventScript_1AAFCC:: @ 81AAFCC Route16_EventScript_1AAFE3:: @ 81AAFE3 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CUE_BALL_LUKE, 0, Text_186CE5, Text_186D06 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AB00A msgbox Text_186D16, 6 end @@ -6037,7 +6037,7 @@ EventScript_1AB00A:: @ 81AB00A Route16_EventScript_1AB021:: @ 81AB021 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CUE_BALL_CAMRON, 0, Text_186DD9, Text_186E0D specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AB048 msgbox Text_186E1C, 6 end @@ -6050,7 +6050,7 @@ EventScript_1AB048:: @ 81AB048 Route16_EventScript_1AB05F:: @ 81AB05F trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_YOUNG_COUPLE_LEA_JED, 0, Text_186FBD, Text_186FFA, Text_187057 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AB08A msgbox Text_187027, 6 end @@ -6063,7 +6063,7 @@ EventScript_1AB08A:: @ 81AB08A Route16_EventScript_1AB0A5:: @ 81AB0A5 trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_YOUNG_COUPLE_LEA_JED, 0, Text_187097, Text_1870CC, Text_187120 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AB0D0 msgbox Text_1870F9, 6 end @@ -6076,7 +6076,7 @@ EventScript_1AB0D0:: @ 81AB0D0 Route17_EventScript_1AB0EB:: @ 81AB0EB trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIKER_BILLY, 0, Text_1872BD, Text_1872E3 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AB112 msgbox Text_1872EB, 6 end @@ -6089,7 +6089,7 @@ EventScript_1AB112:: @ 81AB112 Route17_EventScript_1AB129:: @ 81AB129 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIKER_NIKOLAS, 0, Text_18730A, Text_187325 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AB150 msgbox Text_187333, 6 end @@ -6102,7 +6102,7 @@ EventScript_1AB150:: @ 81AB150 Route17_EventScript_1AB167:: @ 81AB167 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIKER_JAXON, 0, Text_187456, Text_187472 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AB18E msgbox Text_187479, 6 end @@ -6115,7 +6115,7 @@ EventScript_1AB18E:: @ 81AB18E Route17_EventScript_1AB1A5:: @ 81AB1A5 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIKER_WILLIAM, 0, Text_18749B, Text_1874B6 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AB1CC msgbox Text_1874C9, 6 end @@ -6128,7 +6128,7 @@ EventScript_1AB1CC:: @ 81AB1CC Route17_EventScript_1AB1E3:: @ 81AB1E3 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CUE_BALL_RAUL, 0, Text_18717E, Text_1871AE specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AB20A msgbox Text_1871BA, 6 end @@ -6141,7 +6141,7 @@ EventScript_1AB20A:: @ 81AB20A Route17_EventScript_1AB221:: @ 81AB221 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CUE_BALL_ISAIAH, 0, Text_187228, Text_187254 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AB248 msgbox Text_18725A, 6 end @@ -6154,7 +6154,7 @@ EventScript_1AB248:: @ 81AB248 Route17_EventScript_1AB25F:: @ 81AB25F trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CUE_BALL_ZEEK, 0, Text_187362, Text_187395 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AB286 msgbox Text_18739F, 6 end @@ -6167,7 +6167,7 @@ EventScript_1AB286:: @ 81AB286 Route17_EventScript_1AB29D:: @ 81AB29D trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CUE_BALL_JAMAL, 0, Text_1873D1, Text_1873EB specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AB2C4 msgbox Text_1873FF, 6 end @@ -6180,7 +6180,7 @@ EventScript_1AB2C4:: @ 81AB2C4 Route17_EventScript_1AB2DB:: @ 81AB2DB trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CUE_BALL_COREY, 0, Text_18741D, Text_187429 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AB302 msgbox Text_187432, 6 end @@ -6193,7 +6193,7 @@ EventScript_1AB302:: @ 81AB302 Route17_EventScript_1AB319:: @ 81AB319 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIKER_VIRGIL, 0, Text_18727D, Text_187295 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AB340 msgbox Text_1872A5, 6 end @@ -6206,7 +6206,7 @@ EventScript_1AB340:: @ 81AB340 Route18_EventScript_1AB357:: @ 81AB357 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_WILTON, 0, Text_187640, Text_187672 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AB37E msgbox Text_187677, 6 end @@ -6219,7 +6219,7 @@ EventScript_1AB37E:: @ 81AB37E Route18_EventScript_1AB395:: @ 81AB395 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_RAMIRO, 0, Text_18768C, Text_1876B3 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AB3BC msgbox Text_1876C5, 6 end @@ -6232,7 +6232,7 @@ EventScript_1AB3BC:: @ 81AB3BC Route18_EventScript_1AB3D3:: @ 81AB3D3 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_JACOB, 0, Text_187704, Text_187726 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AB3FA msgbox Text_18772C, 6 end @@ -6245,7 +6245,7 @@ EventScript_1AB3FA:: @ 81AB3FA Route19_EventScript_1AB411:: @ 81AB411 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_RICHARD, 0, Text_1877A3, Text_1877DF specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AB438 msgbox Text_1877EE, 6 end @@ -6258,7 +6258,7 @@ EventScript_1AB438:: @ 81AB438 Route19_EventScript_1AB44F:: @ 81AB44F trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_REECE, 0, Text_187811, Text_18783E specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AB476 msgbox Text_187852, 6 end @@ -6271,7 +6271,7 @@ EventScript_1AB476:: @ 81AB476 Route19_EventScript_1AB48D:: @ 81AB48D trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_MATTHEW, 0, Text_187884, Text_1878A5 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AB4B4 msgbox Text_1878B1, 6 end @@ -6284,7 +6284,7 @@ EventScript_1AB4B4:: @ 81AB4B4 Route19_EventScript_1AB4CB:: @ 81AB4CB trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_DOUGLAS, 0, Text_1878DD, Text_1878F8 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AB4F2 msgbox Text_1878FE, 6 end @@ -6297,7 +6297,7 @@ EventScript_1AB4F2:: @ 81AB4F2 Route19_EventScript_1AB509:: @ 81AB509 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_DAVID, 0, Text_187925, Text_187955 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AB530 msgbox Text_18795B, 6 end @@ -6310,7 +6310,7 @@ EventScript_1AB530:: @ 81AB530 Route19_EventScript_1AB547:: @ 81AB547 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_TONY, 0, Text_187985, Text_1879C3 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AB56E msgbox Text_1879D3, 6 end @@ -6323,7 +6323,7 @@ EventScript_1AB56E:: @ 81AB56E Route19_EventScript_1AB585:: @ 81AB585 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_AXLE, 0, Text_187AFA, Text_187B25 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AB5AC msgbox Text_187B35, 6 end @@ -6336,7 +6336,7 @@ EventScript_1AB5AC:: @ 81AB5AC Route19_EventScript_1AB5C3:: @ 81AB5C3 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_FEMALE_ANYA, 0, Text_187A11, Text_187A44 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AB5EA msgbox Text_187A50, 6 end @@ -6349,7 +6349,7 @@ EventScript_1AB5EA:: @ 81AB5EA Route19_EventScript_1AB601:: @ 81AB601 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_FEMALE_ALICE, 0, Text_187A9E, Text_187AC1 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AB628 msgbox Text_187ACA, 6 end @@ -6362,7 +6362,7 @@ EventScript_1AB628:: @ 81AB628 Route19_EventScript_1AB63F:: @ 81AB63F trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_FEMALE_CONNIE, 0, Text_187B5D, Text_187B85 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AB666 msgbox Text_187B94, 6 end @@ -6375,7 +6375,7 @@ EventScript_1AB666:: @ 81AB666 Route19_EventScript_1AB67D:: @ 81AB67D trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_SIS_AND_BRO_LIA_LUC, 0, Text_187C32, Text_187C6F, Text_187CF2 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AB6A8 msgbox Text_187C9E, 6 end @@ -6388,7 +6388,7 @@ EventScript_1AB6A8:: @ 81AB6A8 Route19_EventScript_1AB6C3:: @ 81AB6C3 trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_SIS_AND_BRO_LIA_LUC, 0, Text_187D45, Text_187D7E, Text_187DE8 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AB6EE msgbox Text_187DAD, 6 end @@ -6401,7 +6401,7 @@ EventScript_1AB6EE:: @ 81AB6EE Route20_EventScript_1AB709:: @ 81AB709 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_BARRY, 0, Text_187E40, Text_187E7B specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AB730 msgbox Text_187E83, 6 end @@ -6414,7 +6414,7 @@ EventScript_1AB730:: @ 81AB730 Route20_EventScript_1AB747:: @ 81AB747 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_DEAN, 0, Text_187FDB, Text_187FF7 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AB76E msgbox Text_187FFE, 6 end @@ -6427,7 +6427,7 @@ EventScript_1AB76E:: @ 81AB76E Route20_EventScript_1AB785:: @ 81AB785 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_DARRIN, 0, Text_18802E, Text_18805C specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AB7AC msgbox Text_18806D, 6 end @@ -6440,7 +6440,7 @@ EventScript_1AB7AC:: @ 81AB7AC Route20_EventScript_1AB7C3:: @ 81AB7C3 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_FEMALE_TIFFANY, 0, Text_187F24, Text_187F5A specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AB7EA msgbox Text_187F61, 6 end @@ -6453,7 +6453,7 @@ EventScript_1AB7EA:: @ 81AB7EA Route20_EventScript_1AB801:: @ 81AB801 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_FEMALE_NORA, 0, Text_1880F8, Text_188119 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AB828 msgbox Text_188139, 6 end @@ -6466,7 +6466,7 @@ EventScript_1AB828:: @ 81AB828 Route20_EventScript_1AB83F:: @ 81AB83F trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_FEMALE_MELISSA, 0, Text_188218, Text_18825C specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AB866 msgbox Text_18827B, 6 end @@ -6479,7 +6479,7 @@ EventScript_1AB866:: @ 81AB866 Route20_EventScript_1AB87D:: @ 81AB87D trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_FEMALE_SHIRLEY, 0, Text_187EBB, Text_187EED specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AB8A4 msgbox Text_187EF6, 6 end @@ -6492,7 +6492,7 @@ EventScript_1AB8A4:: @ 81AB8A4 Route20_EventScript_1AB8BB:: @ 81AB8BB trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_ROGER, 0, Text_18808E, Text_1880AB specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AB8E2 msgbox Text_1880C8, 6 end @@ -6505,7 +6505,7 @@ EventScript_1AB8E2:: @ 81AB8E2 Route20_EventScript_1AB8F9:: @ 81AB8F9 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_MISSY, 0, Text_188165, Text_1881A3 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AB920 msgbox Text_1881B8, 6 end @@ -6518,7 +6518,7 @@ EventScript_1AB920:: @ 81AB920 Route20_EventScript_1AB937:: @ 81AB937 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_IRENE, 0, Text_187F78, Text_187F92 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AB95E msgbox Text_187FA3, 6 end @@ -6531,7 +6531,7 @@ EventScript_1AB95E:: @ 81AB95E Route21_North_EventScript_1AB975:: @ 81AB975 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_FISHERMAN_RONALD, 0, Text_18835A, Text_188383 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AB99C msgbox Text_188389, 6 end @@ -6544,7 +6544,7 @@ EventScript_1AB99C:: @ 81AB99C Route21_South_EventScript_1AB9B3:: @ 81AB9B3 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_FISHERMAN_CLAUDE, 0, Text_1885D8, Text_1885F8 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AB9DA msgbox Text_188632, 6 end @@ -6557,7 +6557,7 @@ EventScript_1AB9DA:: @ 81AB9DA Route21_North_EventScript_1AB9F1:: @ 81AB9F1 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_FISHERMAN_WADE, 0, Text_1883C6, Text_1883E9 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1ABA18 msgbox Text_18841D, 6 end @@ -6570,7 +6570,7 @@ EventScript_1ABA18:: @ 81ABA18 Route21_South_EventScript_1ABA2F:: @ 81ABA2F trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_FISHERMAN_NOLAN, 0, Text_18868C, Text_1886AE specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1ABA56 msgbox Text_1886C5, 6 end @@ -6583,7 +6583,7 @@ EventScript_1ABA56:: @ 81ABA56 Route21_North_EventScript_1ABA6D:: @ 81ABA6D trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_SPENCER, 0, Text_18843C, Text_18845F specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1ABA94 msgbox Text_188465, 6 end @@ -6596,7 +6596,7 @@ EventScript_1ABA94:: @ 81ABA94 Route21_South_EventScript_1ABAAB:: @ 81ABAAB trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_JACK, 0, Text_1884D4, Text_1884F0 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1ABAD2 msgbox Text_1884FF, 6 end @@ -6609,7 +6609,7 @@ EventScript_1ABAD2:: @ 81ABAD2 Route21_South_EventScript_1ABAE9:: @ 81ABAE9 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_JEROME, 0, Text_18851F, Text_188543 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1ABB10 msgbox Text_188555, 6 end @@ -6622,7 +6622,7 @@ EventScript_1ABB10:: @ 81ABB10 Route21_South_EventScript_1ABB27:: @ 81ABB27 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_ROLAND, 0, Text_188592, Text_1885B2 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1ABB4E msgbox Text_1885BF, 6 end @@ -6635,7 +6635,7 @@ EventScript_1ABB4E:: @ 81ABB4E Route21_North_EventScript_1ABB65:: @ 81ABB65 trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_SIS_AND_BRO_LIL_IAN, 0, Text_1886E2, Text_188712, Text_18875E specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1ABB90 msgbox Text_188734, 6 end @@ -6648,7 +6648,7 @@ EventScript_1ABB90:: @ 81ABB90 Route21_North_EventScript_1ABBAB:: @ 81ABBAB trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_SIS_AND_BRO_LIL_IAN, 0, Text_1887B4, Text_1887F1, Text_188850 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1ABBD6 msgbox Text_188812, 6 end @@ -6661,7 +6661,7 @@ EventScript_1ABBD6:: @ 81ABBD6 OneIsland_KindleRoad_EventScript_1ABBF1:: @ 81ABBF1 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_FEMALE_MARIA, 0, Text_18961F, Text_18964D specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1ABC18 msgbox Text_189657, 6 end @@ -6674,7 +6674,7 @@ EventScript_1ABC18:: @ 81ABC18 OneIsland_KindleRoad_EventScript_1ABC2F:: @ 81ABC2F trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_FEMALE_ABIGAIL, 0, Text_18968C, Text_1896AC specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1ABC56 msgbox Text_1896C1, 6 end @@ -6687,7 +6687,7 @@ EventScript_1ABC56:: @ 81ABC56 OneIsland_KindleRoad_EventScript_1ABC6D:: @ 81ABC6D trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_FINN, 0, Text_1896F9, Text_189728 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1ABC94 msgbox Text_189740, 6 end @@ -6700,7 +6700,7 @@ EventScript_1ABC94:: @ 81ABC94 OneIsland_KindleRoad_EventScript_1ABCAB:: @ 81ABCAB trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_GARRETT, 0, Text_189767, Text_1897A4 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1ABCD2 msgbox Text_1897C5, 6 end @@ -6713,7 +6713,7 @@ EventScript_1ABCD2:: @ 81ABCD2 OneIsland_KindleRoad_EventScript_1ABCE9:: @ 81ABCE9 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_FISHERMAN_TOMMY, 0, Text_1897FF, Text_189833 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1ABD10 msgbox Text_18984B, 6 end @@ -6726,7 +6726,7 @@ EventScript_1ABD10:: @ 81ABD10 OneIsland_KindleRoad_EventScript_1ABD27:: @ 81ABD27 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CRUSH_GIRL_SHARON, 0, Text_189883, Text_1898AB specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1ABD4E msgbox Text_1898C4, 6 end @@ -6739,7 +6739,7 @@ EventScript_1ABD4E:: @ 81ABD4E OneIsland_KindleRoad_EventScript_1ABD65:: @ 81ABD65 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CRUSH_GIRL_TANYA, 0, Text_1898F0, Text_18991B specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1ABD8C msgbox Text_18992C, 6 end @@ -6752,7 +6752,7 @@ EventScript_1ABD8C:: @ 81ABD8C OneIsland_KindleRoad_EventScript_1ABDA3:: @ 81ABDA3 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BLACK_BELT_SHEA, 0, Text_189950, Text_18998C specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1ABDCA msgbox Text_189998, 6 end @@ -6765,7 +6765,7 @@ EventScript_1ABDCA:: @ 81ABDCA OneIsland_KindleRoad_EventScript_1ABDE1:: @ 81ABDE1 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BLACK_BELT_HUGH, 0, Text_1899CE, Text_189A0A specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1ABE08 msgbox Text_189A13, 6 end @@ -6778,7 +6778,7 @@ EventScript_1ABE08:: @ 81ABE08 OneIsland_KindleRoad_EventScript_1ABE1F:: @ 81ABE1F trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CAMPER_BRYCE, 0, Text_189A53, Text_189A92 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1ABE46 msgbox Text_189A9F, 6 end @@ -6791,7 +6791,7 @@ EventScript_1ABE46:: @ 81ABE46 OneIsland_KindleRoad_EventScript_1ABE5D:: @ 81ABE5D trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_CLAIRE, 0, Text_189ACB, Text_189B0B specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1ABE84 msgbox Text_189B24, 6 end @@ -6804,7 +6804,7 @@ EventScript_1ABE84:: @ 81ABE84 OneIsland_KindleRoad_EventScript_1ABE9B:: @ 81ABE9B trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_CRUSH_KIN_MIK_KIA, 0, Text_189B4D, Text_189B84, Text_189BDE specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1ABEC6 msgbox Text_189BA3, 6 end @@ -6817,7 +6817,7 @@ EventScript_1ABEC6:: @ 81ABEC6 OneIsland_KindleRoad_EventScript_1ABEE1:: @ 81ABEE1 trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_CRUSH_KIN_MIK_KIA, 0, Text_189C33, Text_189C62, Text_189CAB specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1ABF0C msgbox Text_189C7E, 6 end @@ -6830,7 +6830,7 @@ EventScript_1ABF0C:: @ 81ABF0C OneIsland_TreasureBeach_EventScript_1ABF27:: @ 81ABF27 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_FEMALE_AMARA, 0, Text_189D5A, Text_189D8B specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1ABF4E msgbox Text_189DA3, 6 end @@ -6843,7 +6843,7 @@ EventScript_1ABF4E:: @ 81ABF4E ThreeIsland_BondBridge_EventScript_1ABF65:: @ 81ABF65 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_AROMA_LADY_NIKKI, 0, Text_189E42, Text_189E72 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1ABF8C msgbox Text_189E9E, 6 end @@ -6856,7 +6856,7 @@ EventScript_1ABF8C:: @ 81ABF8C ThreeIsland_BondBridge_EventScript_1ABFA3:: @ 81ABFA3 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_AROMA_LADY_VIOLET, 0, Text_189ED4, Text_189EFA specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1ABFCA msgbox Text_189F21, 6 end @@ -6869,7 +6869,7 @@ EventScript_1ABFCA:: @ 81ABFCA ThreeIsland_BondBridge_EventScript_1ABFE1:: @ 81ABFE1 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TUBER_AMIRA, 0, Text_189F63, Text_189F9A specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AC008 msgbox Text_189FA8, 6 end @@ -6882,7 +6882,7 @@ EventScript_1AC008:: @ 81AC008 ThreeIsland_BondBridge_EventScript_1AC01F:: @ 81AC01F trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TUBER_ALEXIS, 0, Text_189FDB, Text_189FEE specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AC046 msgbox Text_18A000, 6 end @@ -6895,7 +6895,7 @@ EventScript_1AC046:: @ 81AC046 ThreeIsland_BondBridge_EventScript_1AC05D:: @ 81AC05D trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_FEMALE_TISHA, 0, Text_18A01F, Text_18A053 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AC084 msgbox Text_18A082, 6 end @@ -6908,7 +6908,7 @@ EventScript_1AC084:: @ 81AC084 ThreeIsland_BondBridge_EventScript_1AC09B:: @ 81AC09B trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_TWINS_JOY_MEG, 0, Text_18A0C4, Text_18A0F7, Text_18A138 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AC0C6 msgbox Text_18A106, 6 end @@ -6921,7 +6921,7 @@ EventScript_1AC0C6:: @ 81AC0C6 ThreeIsland_BondBridge_EventScript_1AC0E1:: @ 81AC0E1 trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_TWINS_JOY_MEG, 0, Text_18A179, Text_18A1A3, Text_18A1CD specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AC10C msgbox Text_18A1B2, 6 end @@ -6934,7 +6934,7 @@ EventScript_1AC10C:: @ 81AC10C FiveIsland_ResortGorgeous_EventScript_1AC127:: @ 81AC127 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PAINTER_DAISY, 0, Text_18A3E2, Text_18A40E specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AC14E msgbox Text_18A430, 6 end @@ -6947,7 +6947,7 @@ EventScript_1AC14E:: @ 81AC14E FiveIsland_ResortGorgeous_EventScript_1AC165:: @ 81AC165 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PAINTER_CELINA, 0, Text_18A461, Text_18A49E specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AC18C msgbox Text_18A4C6, 6 end @@ -6960,7 +6960,7 @@ EventScript_1AC18C:: @ 81AC18C FiveIsland_ResortGorgeous_EventScript_1AC1A3:: @ 81AC1A3 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PAINTER_RAYNA, 0, Text_18A50E, Text_18A535 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AC1CA msgbox Text_18A555, 6 end @@ -6973,7 +6973,7 @@ EventScript_1AC1CA:: @ 81AC1CA FiveIsland_ResortGorgeous_EventScript_1AC1E1:: @ 81AC1E1 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LADY_JACKI, 0, Text_18A5B9, Text_18A5EE specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AC208 msgbox Text_18A601, 6 end @@ -6986,7 +6986,7 @@ EventScript_1AC208:: @ 81AC208 FiveIsland_ResortGorgeous_EventScript_1AC21F:: @ 81AC21F trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LADY_GILLIAN, 0, Text_18A645, Text_18A67F specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AC246 msgbox Text_18A699, 6 end @@ -6999,7 +6999,7 @@ EventScript_1AC246:: @ 81AC246 FiveIsland_ResortGorgeous_EventScript_1AC25D:: @ 81AC25D trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_YOUNGSTER_DESTIN, 0, Text_18A6DA, Text_18A6FE specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AC284 msgbox Text_18A715, 6 end @@ -7012,7 +7012,7 @@ EventScript_1AC284:: @ 81AC284 FiveIsland_ResortGorgeous_EventScript_1AC29B:: @ 81AC29B trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_TOBY, 0, Text_18A74A, Text_18A786 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AC2C2 msgbox Text_18A7AC, 6 end @@ -7025,7 +7025,7 @@ EventScript_1AC2C2:: @ 81AC2C2 FiveIsland_WaterLabyrinth_EventScript_1AC2D9:: @ 81AC2D9 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PKMN_BREEDER_ALIZE, 0, Text_18AAD5, Text_18AB0B specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AC300 msgbox Text_18AB37, 6 end @@ -7038,7 +7038,7 @@ EventScript_1AC300:: @ 81AC300 FiveIsland_MemorialPillar_EventScript_1AC317:: @ 81AC317 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_MILO, 0, Text_18AE50, Text_18AEA8 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AC33E msgbox Text_18AEB6, 6 end @@ -7051,7 +7051,7 @@ EventScript_1AC33E:: @ 81AC33E FiveIsland_MemorialPillar_EventScript_1AC355:: @ 81AC355 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_CHAZ, 0, Text_18AEDC, Text_18AF39 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AC37C msgbox Text_18AF45, 6 end @@ -7064,7 +7064,7 @@ EventScript_1AC37C:: @ 81AC37C FiveIsland_MemorialPillar_EventScript_1AC393:: @ 81AC393 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BIRD_KEEPER_HAROLD, 0, Text_18AF72, Text_18AFCC specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AC3BA msgbox Text_18AFF2, 6 end @@ -7077,7 +7077,7 @@ EventScript_1AC3BA:: @ 81AC3BA SixIsland_OutcastIsland_EventScript_1AC3D1:: @ 81AC3D1 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_FISHERMAN_TYLOR, 0, Text_18B400, Text_18B43B specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AC3F8 msgbox Text_18B451, 6 end @@ -7090,7 +7090,7 @@ EventScript_1AC3F8:: @ 81AC3F8 SixIsland_OutcastIsland_EventScript_1AC40F:: @ 81AC40F trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_MYMO, 0, Text_18B48F, Text_18B4C5 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AC436 msgbox Text_18B4D1, 6 end @@ -7103,7 +7103,7 @@ EventScript_1AC436:: @ 81AC436 SixIsland_OutcastIsland_EventScript_1AC44D:: @ 81AC44D trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_FEMALE_NICOLE, 0, Text_18B4FA, Text_18B539 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AC474 msgbox Text_18B573, 6 end @@ -7116,7 +7116,7 @@ EventScript_1AC474:: @ 81AC474 SixIsland_OutcastIsland_EventScript_1AC48B:: @ 81AC48B trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_SIS_AND_BRO_AVA_GEB, 0, Text_18B5C8, Text_18B5F4, Text_18B660 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AC4B6 msgbox Text_18B62E, 6 end @@ -7129,7 +7129,7 @@ EventScript_1AC4B6:: @ 81AC4B6 SixIsland_OutcastIsland_EventScript_1AC4D1:: @ 81AC4D1 trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_SIS_AND_BRO_AVA_GEB, 0, Text_18B6C1, Text_18B6EF, Text_18B762 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AC4FC msgbox Text_18B720, 6 end @@ -7142,7 +7142,7 @@ EventScript_1AC4FC:: @ 81AC4FC SixIsland_GreenPath_EventScript_1AC517:: @ 81AC517 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PSYCHIC_JACLYN, 0, Text_18B7B0, Text_18B7F0 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AC53E msgbox Text_18B7FD, 6 end @@ -7155,7 +7155,7 @@ EventScript_1AC53E:: @ 81AC53E SixIsland_WaterPath_EventScript_1AC555:: @ 81AC555 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_AROMA_LADY_ROSE, 0, Text_18B896, Text_18B8C8 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AC57C msgbox Text_18B8F7, 6 end @@ -7168,7 +7168,7 @@ EventScript_1AC57C:: @ 81AC57C SixIsland_WaterPath_EventScript_1AC593:: @ 81AC593 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_JUGGLER_EDWARD, 0, Text_18B959, Text_18B988 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AC5BA msgbox Text_18B9A5, 6 end @@ -7181,7 +7181,7 @@ EventScript_1AC5BA:: @ 81AC5BA SixIsland_WaterPath_EventScript_1AC5D1:: @ 81AC5D1 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_SAMIR, 0, Text_18B9EC, Text_18BA47 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AC5F8 msgbox Text_18BA57, 6 end @@ -7194,7 +7194,7 @@ EventScript_1AC5F8:: @ 81AC5F8 SixIsland_WaterPath_EventScript_1AC60F:: @ 81AC60F trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_FEMALE_DENISE, 0, Text_18BA86, Text_18BAC0 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AC636 msgbox Text_18BAE0, 6 end @@ -7207,7 +7207,7 @@ EventScript_1AC636:: @ 81AC636 SixIsland_WaterPath_EventScript_1AC64D:: @ 81AC64D trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_TWINS_MIU_MIA, 0, Text_18BBBA, Text_18BBE2, Text_18BC24 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AC678 msgbox Text_18BBF6, 6 end @@ -7220,7 +7220,7 @@ EventScript_1AC678:: @ 81AC678 SixIsland_WaterPath_EventScript_1AC693:: @ 81AC693 trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_TWINS_MIU_MIA, 0, Text_18BC5A, Text_18BC84, Text_18BCCF specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AC6BE msgbox Text_18BCAE, 6 end @@ -7233,7 +7233,7 @@ EventScript_1AC6BE:: @ 81AC6BE SixIsland_WaterPath_EventScript_1AC6D9:: @ 81AC6D9 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_EARL, 0, Text_18BB2D, Text_18BB62 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AC700 msgbox Text_18BB8B, 6 end @@ -7246,7 +7246,7 @@ EventScript_1AC700:: @ 81AC700 SixIsland_RuinValley_EventScript_1AC717:: @ 81AC717 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_RUIN_MANIAC_STANLY, 0, Text_18BE5D, Text_18BE9B specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AC73E msgbox Text_18BEA0, 6 end @@ -7259,7 +7259,7 @@ EventScript_1AC73E:: @ 81AC73E SixIsland_RuinValley_EventScript_1AC755:: @ 81AC755 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_RUIN_MANIAC_FOSTER, 0, Text_18BF05, Text_18BF33 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AC77C msgbox Text_18BF6C, 6 end @@ -7272,7 +7272,7 @@ EventScript_1AC77C:: @ 81AC77C SixIsland_RuinValley_EventScript_1AC793:: @ 81AC793 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_RUIN_MANIAC_LARRY, 0, Text_18BFC5, Text_18C03B specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AC7BA msgbox Text_18C04C, 6 end @@ -7285,7 +7285,7 @@ EventScript_1AC7BA:: @ 81AC7BA SixIsland_RuinValley_EventScript_1AC7D1:: @ 81AC7D1 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_DARYL, 0, Text_18C09C, Text_18C0BB specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AC7F8 msgbox Text_18C0EA, 6 end @@ -7298,7 +7298,7 @@ EventScript_1AC7F8:: @ 81AC7F8 SixIsland_RuinValley_EventScript_1AC80F:: @ 81AC80F trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_POKEMANIAC_HECTOR, 0, Text_18C10A, Text_18C140 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AC836 msgbox Text_18C17A, 6 end @@ -7311,7 +7311,7 @@ EventScript_1AC836:: @ 81AC836 SevenIsland_TrainerTower_EventScript_1AC84D:: @ 81AC84D trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PSYCHIC_DARIO, 0, Text_18C1ED, Text_18C205 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AC874 msgbox Text_18C20E, 6 end @@ -7324,7 +7324,7 @@ EventScript_1AC874:: @ 81AC874 SevenIsland_TrainerTower_EventScript_1AC88B:: @ 81AC88B trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PSYCHIC_RODETTE, 0, Text_18C283, Text_18C2BC specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AC8B2 msgbox Text_18C2D5, 6 end @@ -7337,7 +7337,7 @@ EventScript_1AC8B2:: @ 81AC8B2 SevenIsland_SevaultCanyon_Entrance_EventScript_1AC8C9:: @ 81AC8C9 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_AROMA_LADY_MIAH, 0, Text_18C3BC, Text_18C3E7 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AC8F0 msgbox Text_18C3FF, 6 end @@ -7350,7 +7350,7 @@ EventScript_1AC8F0:: @ 81AC8F0 SevenIsland_SevaultCanyon_Entrance_EventScript_1AC907:: @ 81AC907 trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_YOUNG_COUPLE_EVE_JON, 0, Text_18C632, Text_18C662, Text_18C6AB specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AC932 msgbox Text_18C683, 6 end @@ -7363,7 +7363,7 @@ EventScript_1AC932:: @ 81AC932 SevenIsland_SevaultCanyon_Entrance_EventScript_1AC94D:: @ 81AC94D trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_YOUNG_COUPLE_EVE_JON, 0, Text_18C700, Text_18C73B, Text_18C7BD specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AC978 msgbox Text_18C773, 6 end @@ -7376,7 +7376,7 @@ EventScript_1AC978:: @ 81AC978 SevenIsland_SevaultCanyon_Entrance_EventScript_1AC993:: @ 81AC993 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_JUGGLER_MASON, 0, Text_18C44B, Text_18C473 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AC9BA msgbox Text_18C4BA, 6 end @@ -7389,7 +7389,7 @@ EventScript_1AC9BA:: @ 81AC9BA SevenIsland_SevaultCanyon_Entrance_EventScript_1AC9D1:: @ 81AC9D1 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PKMN_RANGER_NICOLAS, 0, Text_18C500, Text_18C543 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1AC9F8 msgbox Text_18C54B, 6 end @@ -7402,7 +7402,7 @@ EventScript_1AC9F8:: @ 81AC9F8 SevenIsland_SevaultCanyon_Entrance_EventScript_1ACA0F:: @ 81ACA0F trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PKMN_RANGER_MADELINE, 0, Text_18C5AA, Text_18C5CD specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1ACA36 msgbox Text_18C5F5, 6 end @@ -7415,7 +7415,7 @@ EventScript_1ACA36:: @ 81ACA36 SevenIsland_SevaultCanyon_EventScript_1ACA4D:: @ 81ACA4D trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CRUSH_GIRL_CYNDY, 0, Text_18C887, Text_18C8A6 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1ACA74 msgbox Text_18C8C2, 6 end @@ -7428,7 +7428,7 @@ EventScript_1ACA74:: @ 81ACA74 SevenIsland_SevaultCanyon_EventScript_1ACA8B:: @ 81ACA8B trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TAMER_EVAN, 0, Text_18C8FD, Text_18C980 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1ACAB2 msgbox Text_18C999, 6 end @@ -7441,7 +7441,7 @@ EventScript_1ACAB2:: @ 81ACAB2 SevenIsland_SevaultCanyon_EventScript_1ACAC9:: @ 81ACAC9 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PKMN_RANGER_JACKSON, 0, Text_18CA2F, Text_18CA6F specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1ACAF0 msgbox Text_18CA9C, 6 end @@ -7454,7 +7454,7 @@ EventScript_1ACAF0:: @ 81ACAF0 SevenIsland_SevaultCanyon_EventScript_1ACB07:: @ 81ACB07 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PKMN_RANGER_KATELYN, 0, Text_18CB16, Text_18CB3E specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1ACB2E msgbox Text_18CB6C, 6 end @@ -7467,7 +7467,7 @@ EventScript_1ACB2E:: @ 81ACB2E SevenIsland_SevaultCanyon_EventScript_1ACB45:: @ 81ACB45 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_COOLTRAINER_LEROY, 0, Text_18CBB4, Text_18CBE0 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1ACB6C msgbox Text_18CC09, 6 end @@ -7480,7 +7480,7 @@ EventScript_1ACB6C:: @ 81ACB6C SevenIsland_SevaultCanyon_EventScript_1ACB83:: @ 81ACB83 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_COOLTRAINER_MICHELLE, 0, Text_18CC4F, Text_18CCAE specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1ACBAA msgbox Text_18CCEA, 6 end @@ -7493,7 +7493,7 @@ EventScript_1ACBAA:: @ 81ACBAA SevenIsland_SevaultCanyon_EventScript_1ACBC1:: @ 81ACBC1 trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_COOL_COUPLE_LEX_NYA, 0, Text_18CD49, Text_18CD75, Text_18CDE2 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1ACBEC msgbox Text_18CD9C, 6 end @@ -7506,7 +7506,7 @@ EventScript_1ACBEC:: @ 81ACBEC SevenIsland_SevaultCanyon_EventScript_1ACC07:: @ 81ACC07 trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_COOL_COUPLE_LEX_NYA, 0, Text_18CE20, Text_18CE5A, Text_18CEF4 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1ACC32 msgbox Text_18CE78, 6 end @@ -7519,7 +7519,7 @@ EventScript_1ACC32:: @ 81ACC32 SevenIsland_TanobyRuins_EventScript_1ACC4D:: @ 81ACC4D trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_RUIN_MANIAC_BRANDON, 0, Text_18CFFB, Text_18D02A specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1ACC74 msgbox Text_18D061, 6 end @@ -7532,7 +7532,7 @@ EventScript_1ACC74:: @ 81ACC74 SevenIsland_TanobyRuins_EventScript_1ACC8B:: @ 81ACC8B trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_RUIN_MANIAC_BENJAMIN, 0, Text_18D0D9, Text_18D108 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1ACCB2 msgbox Text_18D125, 6 end @@ -7545,7 +7545,7 @@ EventScript_1ACCB2:: @ 81ACCB2 SevenIsland_TanobyRuins_EventScript_1ACCC9:: @ 81ACCC9 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PAINTER_EDNA, 0, Text_18D18F, Text_18D1B5 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1ACCF0 msgbox Text_18D1E3, 6 end @@ -7558,7 +7558,7 @@ EventScript_1ACCF0:: @ 81ACCF0 SevenIsland_TanobyRuins_EventScript_1ACD07:: @ 81ACD07 trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_GENTLEMAN_CLIFFORD, 0, Text_18D22F, Text_18D26D specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1ACD2E msgbox Text_18D284, 6 end @@ -7867,10 +7867,10 @@ CeladonCity_GameCorner_EventScript_1B2867:: @ 81B2867 lockall showmoneybox 0, 0, 0 msgbox gUnknown_81B1D7D, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1B2926 checkmoney 50, 0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1B292B playse SE_SHOP takemoney 50, 0 @@ -7956,7 +7956,7 @@ EventScript_1B2951:: @ 81B2951 waitmovement 0 applymovement 1, Movement_1A75DD waitmovement 0 - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 goto_if eq, EventScript_1B2B8E message gUnknown_81B1EF8 waitmessage @@ -7969,10 +7969,10 @@ EventScript_1B2994:: @ 81B2994 applymovement 1, Movement_1A75E1 waitmovement 0 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 special sub_8112364 - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 goto_if eq, EventScript_1B29C6 message gUnknown_81B2025 waitmessage @@ -8064,18 +8064,18 @@ EventScript_1B2B8E:: @ 81B2B8E end EventScript_1B2B98:: @ 81B2B98 - compare_var_to_value VAR_0x8004, 39 + compare VAR_0x8004, 39 goto_if le, EventScript_1B2BC5 - compare_var_to_value VAR_0x8004, 99 + compare VAR_0x8004, 99 goto_if le, EventScript_1B2BE3 - compare_var_to_value VAR_0x8004, 199 + compare VAR_0x8004, 199 goto_if le, EventScript_1B2C01 - compare_var_to_value VAR_0x8004, 200 + compare VAR_0x8004, 200 goto_if ge, EventScript_1B2C1F end EventScript_1B2BC5:: @ 81B2BC5 - compare_var_to_value VAR_HOF_BRAG_STATE, 1 + compare VAR_HOF_BRAG_STATE, 1 goto_if eq, EventScript_1B2C3D setvar VAR_HOF_BRAG_STATE, 1 msgbox gUnknown_81B206E @@ -8085,7 +8085,7 @@ EventScript_1B2BE2:: @ 81B2BE2 end EventScript_1B2BE3:: @ 81B2BE3 - compare_var_to_value VAR_HOF_BRAG_STATE, 2 + compare VAR_HOF_BRAG_STATE, 2 goto_if eq, EventScript_1B2C3D setvar VAR_HOF_BRAG_STATE, 2 msgbox gUnknown_81B20CF @@ -8095,7 +8095,7 @@ EventScript_1B2C00:: @ 81B2C00 end EventScript_1B2C01:: @ 81B2C01 - compare_var_to_value VAR_HOF_BRAG_STATE, 3 + compare VAR_HOF_BRAG_STATE, 3 goto_if eq, EventScript_1B2C3D setvar VAR_HOF_BRAG_STATE, 3 msgbox gUnknown_81B2133 @@ -8105,7 +8105,7 @@ EventScript_1B2C1E:: @ 81B2C1E end EventScript_1B2C1F:: @ 81B2C1F - compare_var_to_value VAR_HOF_BRAG_STATE, 4 + compare VAR_HOF_BRAG_STATE, 4 goto_if eq, EventScript_1B2C47 setvar VAR_HOF_BRAG_STATE, 4 msgbox gUnknown_81B21C4 @@ -8135,18 +8135,18 @@ EventScript_1B2C51:: @ 81B2C51 end EventScript_1B2C62:: @ 81B2C62 - compare_var_to_value VAR_0x8005, 99 + compare VAR_0x8005, 99 goto_if le, EventScript_1B2C8F - compare_var_to_value VAR_0x8005, 199 + compare VAR_0x8005, 199 goto_if le, EventScript_1B2CAD - compare_var_to_value VAR_0x8005, 299 + compare VAR_0x8005, 299 goto_if le, EventScript_1B2CCB - compare_var_to_value VAR_0x8005, 300 + compare VAR_0x8005, 300 goto_if ge, EventScript_1B2CE9 end EventScript_1B2C8F:: @ 81B2C8F - compare_var_to_value VAR_EGG_BRAG_STATE, 1 + compare VAR_EGG_BRAG_STATE, 1 goto_if eq, EventScript_1B2D07 setvar VAR_EGG_BRAG_STATE, 1 msgbox gUnknown_81B2308 @@ -8156,7 +8156,7 @@ EventScript_1B2CAC:: @ 81B2CAC end EventScript_1B2CAD:: @ 81B2CAD - compare_var_to_value VAR_EGG_BRAG_STATE, 2 + compare VAR_EGG_BRAG_STATE, 2 goto_if eq, EventScript_1B2D07 setvar VAR_EGG_BRAG_STATE, 2 msgbox gUnknown_81B2372 @@ -8166,7 +8166,7 @@ EventScript_1B2CCA:: @ 81B2CCA end EventScript_1B2CCB:: @ 81B2CCB - compare_var_to_value VAR_EGG_BRAG_STATE, 3 + compare VAR_EGG_BRAG_STATE, 3 goto_if eq, EventScript_1B2D07 setvar VAR_EGG_BRAG_STATE, 3 msgbox gUnknown_81B23E0 @@ -8176,7 +8176,7 @@ EventScript_1B2CE8:: @ 81B2CE8 end EventScript_1B2CE9:: @ 81B2CE9 - compare_var_to_value VAR_EGG_BRAG_STATE, 4 + compare VAR_EGG_BRAG_STATE, 4 goto_if eq, EventScript_1B2D11 setvar VAR_EGG_BRAG_STATE, 4 msgbox gUnknown_81B2448 @@ -8206,18 +8206,18 @@ EventScript_1B2D1B:: @ 81B2D1B end EventScript_1B2D2C:: @ 81B2D2C - compare_var_to_value VAR_0x8006, 19 + compare VAR_0x8006, 19 goto_if le, EventScript_1B2D59 - compare_var_to_value VAR_0x8006, 49 + compare VAR_0x8006, 49 goto_if le, EventScript_1B2D77 - compare_var_to_value VAR_0x8006, 99 + compare VAR_0x8006, 99 goto_if le, EventScript_1B2D95 - compare_var_to_value VAR_0x8006, 100 + compare VAR_0x8006, 100 goto_if ge, EventScript_1B2DB3 end EventScript_1B2D59:: @ 81B2D59 - compare_var_to_value VAR_LINK_WIN_BRAG_STATE, 1 + compare VAR_LINK_WIN_BRAG_STATE, 1 goto_if eq, EventScript_1B2DD1 setvar VAR_LINK_WIN_BRAG_STATE, 1 msgbox gUnknown_81B25A7 @@ -8227,7 +8227,7 @@ EventScript_1B2D76:: @ 81B2D76 end EventScript_1B2D77:: @ 81B2D77 - compare_var_to_value VAR_LINK_WIN_BRAG_STATE, 2 + compare VAR_LINK_WIN_BRAG_STATE, 2 goto_if eq, EventScript_1B2DD1 setvar VAR_LINK_WIN_BRAG_STATE, 2 msgbox gUnknown_81B2609 @@ -8237,7 +8237,7 @@ EventScript_1B2D94:: @ 81B2D94 end EventScript_1B2D95:: @ 81B2D95 - compare_var_to_value VAR_LINK_WIN_BRAG_STATE, 3 + compare VAR_LINK_WIN_BRAG_STATE, 3 goto_if eq, EventScript_1B2DD1 setvar VAR_LINK_WIN_BRAG_STATE, 3 msgbox gUnknown_81B267B @@ -8247,7 +8247,7 @@ EventScript_1B2DB2:: @ 81B2DB2 end EventScript_1B2DB3:: @ 81B2DB3 - compare_var_to_value VAR_LINK_WIN_BRAG_STATE, 4 + compare VAR_LINK_WIN_BRAG_STATE, 4 goto_if eq, EventScript_1B2DDB setvar VAR_LINK_WIN_BRAG_STATE, 4 msgbox gUnknown_81B26F6 @@ -8306,7 +8306,7 @@ ViridianCity_PokemonCenter_2F_MapScript4_1BB1B4:: @ 81BB1B4 EventScript_1BB1BA:: @ 81BB1BA specialvar VAR_RESULT, ValidateReceivedWonderCard - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1BB1CE clearflag FLAG_HIDE_MG_DELIVERYMEN return @@ -8336,7 +8336,7 @@ CeladonCity_PokemonCenter_2F_EventScript_1BB1D2:: @ 81BB1D2 LavenderTown_PokemonCenter_2F_EventScript_1BB1D2:: @ 81BB1D2 ViridianCity_PokemonCenter_2F_EventScript_1BB1D2:: @ 81BB1D2 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 special sub_8112364 execram @@ -8374,7 +8374,7 @@ ViridianCity_PokemonCenter_2F_MapScript2_1BB1ED:: @ 81BB1ED .2byte 0 EventScript_1BB227:: @ 81BB227 - compare_var_to_value VAR_0x8007, 0 + compare VAR_0x8007, 0 goto_if eq, EventScript_1BB236 turnobject VAR_0x8007, 3 EventScript_1BB236: @@ -8400,19 +8400,19 @@ TwoIsland_JoyfulGameCorner_MapScript4_1BB237:: @ 81BB237 TwoIsland_PokemonCenter_2F_MapScript3_1BB237:: @ 81BB237 VermilionCity_PokemonCenter_2F_MapScript3_1BB237:: @ 81BB237 ViridianCity_PokemonCenter_2F_MapScript3_1BB237:: @ 81BB237 - compare_var_to_value VAR_0x406F, 1 + compare VAR_0x406F, 1 goto_if eq, EventScript_1BB285 - compare_var_to_value VAR_0x406F, 2 + compare VAR_0x406F, 2 goto_if eq, EventScript_1BB285 - compare_var_to_value VAR_0x406F, 5 + compare VAR_0x406F, 5 goto_if eq, EventScript_1BB285 - compare_var_to_value VAR_0x406F, 3 + compare VAR_0x406F, 3 goto_if eq, EventScript_1BB28B - compare_var_to_value VAR_0x406F, 6 + compare VAR_0x406F, 6 goto_if eq, EventScript_1BB291 - compare_var_to_value VAR_0x406F, 7 + compare VAR_0x406F, 7 goto_if eq, EventScript_1BB297 - compare_var_to_value VAR_0x406F, 8 + compare VAR_0x406F, 8 goto_if eq, EventScript_1BB29D end @@ -8491,7 +8491,7 @@ EventScript_1BB315:: @ 81BB315 special sub_811390C setvar VAR_0x406F, 0 textcolor 1 - compare_var_to_value VAR_0x8007, 0 + compare VAR_0x8007, 0 goto_if eq, EventScript_1BB40A applymovement VAR_0x8007, Movement_1BB88F waitmovement 0 @@ -8517,7 +8517,7 @@ EventScript_1BB367:: @ 81BB367 special sub_811390C setvar VAR_0x406F, 0 textcolor 1 - compare_var_to_value VAR_0x8007, 0 + compare VAR_0x8007, 0 goto_if eq, EventScript_1BB40A applymovement 255, Movement_1BB8A0 waitmovement 0 @@ -8541,7 +8541,7 @@ EventScript_1BB3B4:: @ 81BB3B4 special sub_811390C setvar VAR_0x406F, 0 textcolor 1 - compare_var_to_value VAR_0x8007, 0 + compare VAR_0x8007, 0 goto_if eq, EventScript_1BB40A applymovement 255, Movement_1BB8A0 waitmovement 0 @@ -8645,7 +8645,7 @@ EventScript_1BB519:: @ 81BB519 EventScript_1BB51A:: @ 81BB51A special CheckForAlivePartyMons - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if ne, EventScript_1BB533 setvar VAR_0x8004, 2 goto EventScript_1BB54C @@ -8669,7 +8669,7 @@ EventScript_1BB54B:: @ 81BB54B EventScript_1BB54C:: @ 81BB54C call EventScript_1A4EAF - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1BB82F message gUnknown_81BC4AC waitmessage @@ -8678,17 +8678,17 @@ EventScript_1BB54C:: @ 81BB54C special sub_8081064 waitstate call EventScript_1A6675 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1BB5B3 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1BB80F - compare_var_to_value VAR_RESULT, 3 + compare VAR_RESULT, 3 goto_if eq, EventScript_1BB81F - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 goto_if eq, EventScript_1BB63C - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_if eq, EventScript_1BB82F - compare_var_to_value VAR_RESULT, 6 + compare VAR_RESULT, 6 goto_if eq, EventScript_1BB7FF end @@ -8716,7 +8716,7 @@ EventScript_1BB5B3:: @ 81BB5B3 closedoor 9, 1 waitdooranim release - compare_var_to_value VAR_0x8004, 5 + compare VAR_0x8004, 5 goto_if eq, EventScript_1BB62C special SetCableClubWarp warp MAP_UNKNOWN_MAP_00_00, 255, 6, 8 @@ -8780,10 +8780,10 @@ EventScript_1BB69B:: @ 81BB69B EventScript_1BB6AB:: @ 81BB6AB copyvar VAR_0x8007, VAR_LAST_TALKED call EventScript_1BB79C - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1BB82F call EventScript_1A4EAF - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1BB82F message gUnknown_81BC4AC waitmessage @@ -8792,21 +8792,21 @@ EventScript_1BB6AB:: @ 81BB6AB special sub_80810CC waitstate call EventScript_1A6675 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1BB73D - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1BB80F - compare_var_to_value VAR_RESULT, 3 + compare VAR_RESULT, 3 goto_if eq, EventScript_1BB81F - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 goto_if eq, EventScript_1BB857 - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_if eq, EventScript_1BB82F - compare_var_to_value VAR_RESULT, 6 + compare VAR_RESULT, 6 goto_if eq, EventScript_1BB7FF - compare_var_to_value VAR_RESULT, 7 + compare VAR_RESULT, 7 goto_if eq, EventScript_1BB7DF - compare_var_to_value VAR_RESULT, 9 + compare VAR_RESULT, 9 goto_if eq, EventScript_1BB7EF end @@ -8840,10 +8840,10 @@ EventScript_1BB73D:: @ 81BB73D EventScript_1BB79C:: @ 81BB79C specialvar VAR_RESULT, CalculatePlayerPartyCount - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if lt, EventScript_1BB7C2 specialvar VAR_RESULT, GetNameOfEnigmaBerryInPlayerParty - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1BB7D0 setvar VAR_RESULT, 1 return @@ -8990,7 +8990,7 @@ Movement_1BB8A2:: @ 81BB8A2 gUnknown_81BB8A7:: @ 81BB8A7 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 lockall fadescreen 1 @@ -9021,7 +9021,7 @@ UnknownMap_00_03_EventScript_1BB8DB:: @ 81BB8DB fadescreen 1 special sub_80A0334 waitstate - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1BB94F setvar VAR_0x8005, 0 textcolor 3 @@ -9034,7 +9034,7 @@ UnknownMap_00_03_EventScript_1BB8F8:: @ 81BB8F8 fadescreen 1 special sub_80A0334 waitstate - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1BB94F setvar VAR_0x8005, 1 textcolor 3 @@ -9047,7 +9047,7 @@ UnknownMap_00_03_EventScript_1BB915:: @ 81BB915 fadescreen 1 special sub_80A0334 waitstate - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1BB94F setvar VAR_0x8005, 2 textcolor 3 @@ -9060,7 +9060,7 @@ UnknownMap_00_03_EventScript_1BB932:: @ 81BB932 fadescreen 1 special sub_80A0334 waitstate - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1BB94F setvar VAR_0x8005, 3 textcolor 3 @@ -9149,7 +9149,7 @@ UnknownMap_00_02_EventScript_1BB9D3:: @ 81BB9D3 gUnknown_81BB9D4:: @ 81BB9D4 textcolor 3 msgbox gUnknown_81BC7A1, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1BB9F0 erasebox 0, 0, 29, 19 releaseall @@ -9170,7 +9170,7 @@ gUnknown_81BB9FC:: @ 81BB9FC EventScript_1BBA04:: @ 81BBA04 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 special sub_8112364 lock @@ -9178,11 +9178,11 @@ EventScript_1BBA04:: @ 81BBA04 checkflag FLAG_SYS_POKEDEX_GET goto_if FALSE, EventScript_1BB877 specialvar VAR_RESULT, Special_BadEggInParty - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1BB867 copyvar VAR_0x8007, VAR_LAST_TALKED specialvar VAR_RESULT, IsWirelessAdapterConnected - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1BBB60 message Text_1BD65B waitmessage @@ -9210,10 +9210,10 @@ EventScript_1BBA93:: @ 81BBA93 EventScript_1BBA94:: @ 81BBA94 call EventScript_1BBB1E - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1BB82F call EventScript_1A4EAF - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1BB82F msgbox gUnknown_81BD86A closemessage @@ -9246,10 +9246,10 @@ EventScript_1BBA94:: @ 81BBA94 EventScript_1BBB1E:: @ 81BBB1E specialvar VAR_RESULT, CountPartyNonEggMons - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if lt, EventScript_1BBB44 specialvar VAR_RESULT, GetNameOfEnigmaBerryInPlayerParty - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1BBB52 setvar VAR_RESULT, 1 return @@ -9279,7 +9279,7 @@ EventScript_1BBB6A:: @ 81BBB6A checkflag FLAG_SYS_POKEDEX_GET goto_if FALSE, EventScript_1BB877 msgbox gUnknown_81BDB85, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1BBB92 msgbox gUnknown_81BDBF8 release @@ -9292,7 +9292,7 @@ EventScript_1BBB92:: @ 81BBB92 EventScript_1BBB9C:: @ 81BBB9C special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 special sub_8112364 lock @@ -9300,10 +9300,10 @@ EventScript_1BBB9C:: @ 81BBB9C checkflag FLAG_SYS_POKEDEX_GET goto_if FALSE, EventScript_1BB877 specialvar VAR_RESULT, Special_BadEggInParty - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1BB867 specialvar VAR_RESULT, IsWirelessAdapterConnected - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1BB44A message Text_1BD28D waitmessage @@ -9336,10 +9336,10 @@ EventScript_1BBC32:: @ 81BBC32 EventScript_1BBC69:: @ 81BBC69 msgbox gUnknown_81BD317, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1BB82F call EventScript_1BB79C - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1BB82F setvar VAR_0x8004, 3 goto EventScript_1BBD6F @@ -9369,7 +9369,7 @@ EventScript_1BBCF4:: @ 81BBCF4 EventScript_1BBCF5:: @ 81BBCF5 special CheckForAlivePartyMons - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if ne, EventScript_1BBD0E setvar VAR_0x8004, 1 goto EventScript_1BBD6F @@ -9400,10 +9400,10 @@ EventScript_1BBD34:: @ 81BBD34 EventScript_1BBD35:: @ 81BBD35 msgbox gUnknown_81BD362, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1BB82F special CheckHasAtLeastOneBerry - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1BBD61 setvar VAR_0x8004, 5 goto EventScript_1BBD6F @@ -9420,7 +9420,7 @@ EventScript_1BBD6E:: @ 81BBD6E EventScript_1BBD6F:: @ 81BBD6F call EventScript_1A4EAF - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1BB82F switch VAR_0x8004 case 3, EventScript_1BBDBC @@ -9445,22 +9445,22 @@ EventScript_1BBDBC:: @ 81BBDBC EventScript_1BBE00:: @ 81BBE00 call EventScript_1BBF78 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1BBF88 - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_if eq, EventScript_1BBDBC - compare_var_to_value VAR_RESULT, 8 + compare VAR_RESULT, 8 goto_if eq, EventScript_1BBE00 release return EventScript_1BBE28:: @ 81BBE28 call EventScript_1BBF80 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1BBF88 - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_if eq, EventScript_1BBDBC - compare_var_to_value VAR_RESULT, 8 + compare VAR_RESULT, 8 goto_if eq, EventScript_1BBE28 release return @@ -9480,22 +9480,22 @@ EventScript_1BBE50:: @ 81BBE50 EventScript_1BBE94:: @ 81BBE94 call EventScript_1BBF78 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1BBF88 - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_if eq, EventScript_1BBE50 - compare_var_to_value VAR_RESULT, 8 + compare VAR_RESULT, 8 goto_if eq, EventScript_1BBE94 release return EventScript_1BBEBC:: @ 81BBEBC call EventScript_1BBF80 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1BBF88 - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_if eq, EventScript_1BBE50 - compare_var_to_value VAR_RESULT, 8 + compare VAR_RESULT, 8 goto_if eq, EventScript_1BBEBC release return @@ -9515,22 +9515,22 @@ EventScript_1BBEE4:: @ 81BBEE4 EventScript_1BBF28:: @ 81BBF28 call EventScript_1BBF78 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1BBF88 - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_if eq, EventScript_1BBEE4 - compare_var_to_value VAR_RESULT, 8 + compare VAR_RESULT, 8 goto_if eq, EventScript_1BBF28 release return EventScript_1BBF50:: @ 81BBF50 call EventScript_1BBF80 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1BBF88 - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_if eq, EventScript_1BBEE4 - compare_var_to_value VAR_RESULT, 8 + compare VAR_RESULT, 8 goto_if eq, EventScript_1BBF50 release return @@ -9575,13 +9575,13 @@ EventScript_1BBF88:: @ 81BBF88 gUnknown_81BBFD8:: @ 81BBFD8 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 lockall checkflag FLAG_SYS_POKEDEX_GET goto_if FALSE, EventScript_1BB881 specialvar VAR_RESULT, IsWirelessAdapterConnected - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1BC016 special HelpSystem_Disable fadescreen 1 @@ -9645,7 +9645,7 @@ ViridianCity_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C EventScript_1BC060:: @ 81BC060 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 special sub_8112364 lock @@ -9677,7 +9677,7 @@ EventScript_1BC0C4:: @ 81BC0C4 EventScript_1BC0CE:: @ 81BC0CE special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 special sub_8112364 lock @@ -9685,7 +9685,7 @@ EventScript_1BC0CE:: @ 81BC0CE message Text_1BCF69 waitmessage specialvar VAR_RESULT, IsWirelessAdapterConnected - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1BC29C delay 60 special HelpSystem_Disable @@ -9702,16 +9702,16 @@ EventScript_1BC0CE:: @ 81BC0CE EventScript_1BC13A:: @ 81BC13A setvar VAR_0x8005, 0 special sub_8149A18 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1BC2A6 msgbox gUnknown_81BD059 setvar VAR_0x8005, 0 special ChooseMonForWirelessMinigame waitstate - compare_var_to_value VAR_0x8004, 6 + compare VAR_0x8004, 6 goto_if ge, EventScript_1BB83F call EventScript_1A4EAF - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1BB83F setvar VAR_0x8004, 4 goto EventScript_1BC1CE @@ -9722,16 +9722,16 @@ EventScript_1BC183:: @ 81BC183 EventScript_1BC184:: @ 81BC184 setvar VAR_0x8005, 1 special sub_81537C0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1BC2A6 msgbox gUnknown_81BD059 setvar VAR_0x8005, 1 special ChooseMonForWirelessMinigame waitstate - compare_var_to_value VAR_0x8004, 6 + compare VAR_0x8004, 6 goto_if ge, EventScript_1BB83F call EventScript_1A4EAF - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1BB83F setvar VAR_0x8004, 6 goto EventScript_1BC1CE @@ -9754,22 +9754,22 @@ EventScript_1BC1CE:: @ 81BC1CE EventScript_1BC212:: @ 81BC212 call EventScript_1BBF78 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1BC262 - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_if eq, EventScript_1BC1CE - compare_var_to_value VAR_RESULT, 8 + compare VAR_RESULT, 8 goto_if eq, EventScript_1BC212 release return EventScript_1BC23A:: @ 81BC23A call EventScript_1BBF80 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1BC262 - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_if eq, EventScript_1BC1CE - compare_var_to_value VAR_RESULT, 8 + compare VAR_RESULT, 8 goto_if eq, EventScript_1BC23A release return @@ -9801,11 +9801,11 @@ EventScript_1BC29C:: @ 81BC29C EventScript_1BC2A6:: @ 81BC2A6 msgbox gUnknown_81BD0CF, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1BB83F - compare_var_to_value VAR_0x8005, 0 + compare VAR_0x8005, 0 call_if eq, EventScript_1BC2D5 - compare_var_to_value VAR_0x8005, 1 + compare VAR_0x8005, 1 call_if eq, EventScript_1BC2DE goto EventScript_1BB83F @@ -9822,7 +9822,7 @@ EventScript_1BC2DE:: @ 81BC2DE TwoIsland_JoyfulGameCorner_EventScript_1BC2E7:: @ 81BC2E7 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 lockall special sub_814B504 @@ -9832,7 +9832,7 @@ TwoIsland_JoyfulGameCorner_EventScript_1BC2E7:: @ 81BC2E7 TwoIsland_JoyfulGameCorner_EventScript_1BC2FC:: @ 81BC2FC special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 lockall special sub_8153810 @@ -10296,19 +10296,19 @@ gUnknown_81BDEDF:: @ 81BDEDF EventScript_InteractWithCutTreeObject:: @ 81BDF13 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 lockall checkflag FLAG_BADGE02_GET goto_if FALSE, EventScript_1BDF87 checkpartymove MOVE_CUT - compare_var_to_value VAR_RESULT, 6 + compare VAR_RESULT, 6 goto_if eq, EventScript_1BDF87 setfieldeffectarg 0, VAR_RESULT getpartymonname 0, VAR_RESULT getmovename 1, MOVE_CUT msgbox gUnknown_81BDF94, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1BDF91 msgbox gUnknown_81BDFD7 closemessage @@ -10359,19 +10359,19 @@ gUnknown_81BDFE3:: @ 81BDFE3 EventScript_InteractWithRockSmashRockObject:: @ 81BE00C special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 lockall checkflag FLAG_BADGE06_GET goto_if FALSE, EventScript_1BE091 checkpartymove MOVE_ROCK_SMASH - compare_var_to_value VAR_RESULT, 6 + compare VAR_RESULT, 6 goto_if eq, EventScript_1BE091 setfieldeffectarg 0, VAR_RESULT getpartymonname 0, VAR_RESULT getmovename 1, MOVE_ROCK_SMASH msgbox Text_1BE09D, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1BE09A msgbox gUnknown_81BDFD7 closemessage @@ -10392,7 +10392,7 @@ EventScript_1BE06F:: @ 81BE06F waitmovement 0 removeobject VAR_LAST_TALKED special ScrSpecial_RockSmashWildEncounter - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1BE08D waitstate releaseall @@ -10425,7 +10425,7 @@ gUnknown_81BE0E2:: @ 81BE0E2 EventScript_InteractWithStrengthBoulderObject:: @ 81BE11D special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 lockall checkflag FLAG_BADGE04_GET @@ -10433,11 +10433,11 @@ EventScript_InteractWithStrengthBoulderObject:: @ 81BE11D checkflag FLAG_SYS_STRENGTH_ACTIVE goto_if TRUE, EventScript_1BE18E checkpartymove MOVE_STRENGTH - compare_var_to_value VAR_RESULT, 6 + compare VAR_RESULT, 6 goto_if eq, EventScript_1BE185 setfieldeffectarg 0, VAR_RESULT msgbox gUnknown_81BE19A, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1BE197 closemessage dofieldeffect FLDEFF_USE_STRENGTH @@ -10490,16 +10490,16 @@ gUnknown_81BE284:: @ 81BE284 gUnknown_81BE2B7:: @ 81BE2B7 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 lockall checkpartymove MOVE_WATERFALL - compare_var_to_value VAR_RESULT, 6 + compare VAR_RESULT, 6 goto_if eq, EventScript_1BE300 getpartymonname 0, VAR_RESULT setfieldeffectarg 0, VAR_RESULT msgbox gUnknown_81BE33F, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1BE308 msgbox gUnknown_81BE378 dofieldeffect FLDEFF_USE_WATERFALL @@ -10528,13 +10528,13 @@ gUnknown_81BE378:: @ 81BE378 EventScript_1BE38B:: @ 81BE38B lockall checkpartymove MOVE_DIVE - compare_var_to_value VAR_RESULT, 6 + compare VAR_RESULT, 6 goto_if eq, EventScript_1BE3CA getpartymonname 0, VAR_RESULT setfieldeffectarg 0, VAR_RESULT setfieldeffectarg 1, 1 msgbox gUnknown_81BE469, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1BE3D2 msgbox gUnknown_81BE49B dofieldeffect FLDEFF_USE_DIVE @@ -10551,13 +10551,13 @@ EventScript_1BE3D2: EventScript_1BE3D4:: @ 81BE3D4 lockall checkpartymove MOVE_DIVE - compare_var_to_value VAR_RESULT, 6 + compare VAR_RESULT, 6 goto_if eq, EventScript_1BE412 getpartymonname 0, VAR_RESULT setfieldeffectarg 0, VAR_RESULT setfieldeffectarg 1, 1 msgbox gUnknown_81BE4EF, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1BE429 msgbox gUnknown_81BE49B dofieldeffect FLDEFF_USE_DIVE @@ -11280,7 +11280,7 @@ SilphCo_4F_EventScript_1BEE09:: @ 81BEE09 PewterCity_PokemonCenter_1F_EventScript_1BEE16:: @ 81BEE16 lock faceplayer - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 goto_if eq, EventScript_1BEE3A checkflag FLAG_SYS_SET_TRAINER_CARD_PROFILE goto_if TRUE, EventScript_1BEECD @@ -11382,11 +11382,11 @@ EventScript_1BEF5A:: @ 81BEF5A call EventScript_1A6AC0 lock faceplayer - compare_var_to_value VAR_0x8004, 0 + compare VAR_0x8004, 0 goto_if eq, EventScript_1BEF3F - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1BEE9E - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1BEEA8 end @@ -11460,16 +11460,16 @@ gUnknown_81BF36A:: @ 81BF36A Route5_PokemonDayCare_EventScript_1BF398:: @ 81BF398 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 lock faceplayer showmoneybox 0, 0, 0 specialvar VAR_RESULT, IsThereMonInRoute5Daycare - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1BF46E msgbox Text_19DD66, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1BF3DD msgbox Text_19DDB2 goto EventScript_1BF541 @@ -11477,7 +11477,7 @@ Route5_PokemonDayCare_EventScript_1BF398:: @ 81BF398 EventScript_1BF3DD:: @ 81BF3DD specialvar VAR_RESULT, CountPartyNonEggMons - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1BF452 msgbox Text_19DDBE fadescreen 1 @@ -11485,10 +11485,10 @@ EventScript_1BF3DD:: @ 81BF3DD special ChooseSendDaycareMon waitstate showmoneybox 0, 0, 0 - compare_var_to_value VAR_0x8004, 6 + compare VAR_0x8004, 6 goto_if ge, EventScript_1BF444 specialvar VAR_RESULT, CountPartyAliveNonEggMons_IgnoreVar0x8004Slot - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1BF460 specialvar VAR_0x8005, GetSelectedMonNickAndSpecies msgbox Text_19DDF9 @@ -11519,13 +11519,13 @@ EventScript_1BF460:: @ 81BF460 EventScript_1BF46E:: @ 81BF46E setvar VAR_0x8004, 0 specialvar VAR_RESULT, GetNumLevelsGainedForRoute5DaycareMon - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if ne, EventScript_1BF4AA - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if eq, EventScript_1BF4B3 special GetCostToWithdrawRoute5DaycareMon msgbox Text_19DE80, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1BF4BC goto EventScript_1BF444 end @@ -11540,10 +11540,10 @@ EventScript_1BF4B3:: @ 81BF4B3 EventScript_1BF4BC:: @ 81BF4BC specialvar VAR_RESULT, CalculatePlayerPartyCount - compare_var_to_value VAR_RESULT, 6 + compare VAR_RESULT, 6 goto_if eq, EventScript_1BF533 specialvar VAR_RESULT, IsEnoughForCostInVar0x8005 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1BF4EA msgbox Text_19E001 goto EventScript_1BF541 @@ -11744,7 +11744,7 @@ EventScript_1BFB98:: @ 81BFB98 EventScript_SafariRetire:: @ 81BFBAA lockall msgbox Text_1BFBE9, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1BFBC0 releaseall end @@ -13405,15 +13405,15 @@ VictoryRoad_2F_EventScript_1C47AE:: @ 81C47AE checkflag FLAG_TUTOR_DOUBLE_EDGE goto_if TRUE, EventScript_1C480C msgbox Text_1749F9, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C4802 call EventScript_1C4F37 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C4802 msgbox Text_174AE2 setvar VAR_0x8005, MOVETUTOR_DOUBLE_EDGE call EventScript_1C4F30 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C4802 setflag FLAG_TUTOR_DOUBLE_EDGE goto EventScript_1C480C @@ -13435,15 +13435,15 @@ EventScript_1C4816:: @ 81C4816 checkflag FLAG_TUTOR_THUNDER_WAVE goto_if TRUE, EventScript_1C4874 msgbox Text_175711, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C486A call EventScript_1C4F37 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C486A msgbox Text_1757C1 setvar VAR_0x8005, MOVETUTOR_THUNDER_WAVE call EventScript_1C4F30 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C486A setflag FLAG_TUTOR_THUNDER_WAVE goto EventScript_1C4874 @@ -13465,15 +13465,15 @@ RockTunnel_B1F_EventScript_1C487E:: @ 81C487E checkflag FLAG_TUTOR_ROCK_SLIDE goto_if TRUE, EventScript_1C48DC msgbox Text_1799E0, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C48D2 call EventScript_1C4F37 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C48D2 msgbox Text_179AE1 setvar VAR_0x8005, MOVETUTOR_ROCK_SLIDE call EventScript_1C4F30 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C48D2 setflag FLAG_TUTOR_ROCK_SLIDE goto EventScript_1C48DC @@ -13495,15 +13495,15 @@ MtEmber_Exterior_EventScript_1C48E6:: @ 81C48E6 checkflag FLAG_TUTOR_EXPLOSION goto_if TRUE, EventScript_1C4944 msgbox Text_17A642, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C493A call EventScript_1C4F37 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C493A msgbox Text_17A717 setvar VAR_0x8005, MOVETUTOR_EXPLOSION call EventScript_1C4F30 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C493A setflag FLAG_TUTOR_EXPLOSION goto EventScript_1C4944 @@ -13525,15 +13525,15 @@ Route4_EventScript_1C494E:: @ 81C494E checkflag FLAG_TUTOR_META_PUNCH goto_if TRUE, EventScript_1C49AC msgbox Text_1839D5, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C49A2 call EventScript_1C4F37 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C49A2 msgbox Text_183ABF setvar VAR_0x8005, MOVETUTOR_MEGA_PUNCH call EventScript_1C4F30 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C49A2 setflag FLAG_TUTOR_META_PUNCH goto EventScript_1C49AC @@ -13555,15 +13555,15 @@ Route4_EventScript_1C49B6:: @ 81C49B6 checkflag FLAG_TUTOR_MEGA_KICK goto_if TRUE, EventScript_1C4A14 msgbox Text_183B74, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C4A0A call EventScript_1C4F37 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C4A0A msgbox Text_183C68 setvar VAR_0x8005, MOVETUTOR_MEGA_KICK call EventScript_1C4F30 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C4A0A setflag FLAG_TUTOR_MEGA_KICK goto EventScript_1C4A14 @@ -13585,15 +13585,15 @@ EventScript_1C4A1E:: @ 81C4A1E checkflag FLAG_TUTOR_DREAM_EATER goto_if TRUE, EventScript_1C4A7C msgbox Text_17E316, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C4A72 call EventScript_1C4F37 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C4A72 msgbox Text_17E3F1 setvar VAR_0x8005, MOVETUTOR_DREAM_EATER call EventScript_1C4F30 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C4A72 setflag FLAG_TUTOR_DREAM_EATER goto EventScript_1C4A7C @@ -13615,15 +13615,15 @@ EventScript_1C4A86:: @ 81C4A86 checkflag FLAG_TUTOR_SOFT_BOILED goto_if TRUE, EventScript_1C4AE4 msgbox Text_180388, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C4ADA call EventScript_1C4F37 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C4ADA msgbox Text_180484 setvar VAR_0x8005, MOVETUTOR_SOFT_BOILED call EventScript_1C4F30 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C4ADA setflag FLAG_TUTOR_SOFT_BOILED goto EventScript_1C4AE4 @@ -13645,15 +13645,15 @@ FuchsiaCity_EventScript_1C4AEE:: @ 81C4AEE checkflag FLAG_TUTOR_SUBSTITUTE goto_if TRUE, EventScript_1C4B4C msgbox Text_180948, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C4B42 call EventScript_1C4F37 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C4B42 msgbox Text_180A57 setvar VAR_0x8005, MOVETUTOR_SUBSTITUTE call EventScript_1C4F30 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C4B42 setflag FLAG_TUTOR_SUBSTITUTE goto EventScript_1C4B4C @@ -13675,15 +13675,15 @@ SevenIsland_EventScript_1C4B56:: @ 81C4B56 checkflag FLAG_TUTOR_SWORDS_DANCE goto_if TRUE, EventScript_1C4BB4 msgbox Text_182F01, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C4BAA call EventScript_1C4F37 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C4BAA msgbox Text_182FD9 setvar VAR_0x8005, MOVETUTOR_SWORDS_DANCE call EventScript_1C4F30 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C4BAA setflag FLAG_TUTOR_SWORDS_DANCE goto EventScript_1C4BB4 @@ -13705,15 +13705,15 @@ PewterCity_Museum_1F_EventScript_1C4BBE:: @ 81C4BBE checkflag FLAG_TUTOR_SEISMIC_TOSS goto_if TRUE, EventScript_1C4C1C msgbox Text_1909A3, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C4C12 call EventScript_1C4F37 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C4C12 msgbox Text_190AD5 setvar VAR_0x8005, MOVETUTOR_SEISMIC_TOSS call EventScript_1C4F30 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C4C12 setflag FLAG_TUTOR_SEISMIC_TOSS goto EventScript_1C4C1C @@ -13735,15 +13735,15 @@ EventScript_1C4C26:: @ 81C4C26 checkflag FLAG_TUTOR_COUNTER goto_if TRUE, EventScript_1C4C84 msgbox Text_195928, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C4C7A call EventScript_1C4F37 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C4C7A msgbox Text_195A08 setvar VAR_0x8005, MOVETUTOR_COUNTER call EventScript_1C4F30 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C4C7A setflag FLAG_TUTOR_COUNTER goto EventScript_1C4C84 @@ -13765,15 +13765,15 @@ EventScript_1C4C8E:: @ 81C4C8E checkflag FLAG_TUTOR_METRONOME goto_if TRUE, EventScript_1C4CEC msgbox Text_19A137, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C4CE2 call EventScript_1C4F37 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C4CE2 msgbox Text_19A1EA setvar VAR_0x8005, MOVETUTOR_METRONOME call EventScript_1C4F30 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C4CE2 setflag FLAG_TUTOR_METRONOME goto EventScript_1C4CEC @@ -13793,17 +13793,17 @@ EventScript_1C4CF6:: @ 81C4CF6 checkflag FLAG_TUTOR_MIMIC goto_if TRUE, EventScript_1C4D59 msgbox Text_19AD85, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C4D4F call EventScript_1C4F37 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C4D4F msgbox Text_19ADEE setvar VAR_0x8005, MOVETUTOR_MIMIC call EventScript_1C4F30 lock faceplayer - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C4D4F removeitem ITEM_POKE_DOLL, 1 setflag FLAG_TUTOR_MIMIC @@ -13817,9 +13817,9 @@ EventScript_1C4D4F:: @ 81C4D4F EventScript_1C4D59:: @ 81C4D59 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if eq, EventScript_1C4D72 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if eq, EventScript_1C4D7B release end @@ -13838,15 +13838,15 @@ FourIsland_House1_EventScript_1C4D84:: @ 81C4D84 checkflag FLAG_TUTOR_BODY_SLAM goto_if TRUE, EventScript_1C4DE2 msgbox Text_1A3505, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C4DD8 call EventScript_1C4F37 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C4DD8 msgbox Text_1A35DA setvar VAR_0x8005, MOVETUTOR_BODY_SLAM call EventScript_1C4F30 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C4DD8 setflag FLAG_TUTOR_BODY_SLAM goto EventScript_1C4DE2 @@ -13864,7 +13864,7 @@ EventScript_1C4DE2:: @ 81C4DE2 TwoIsland_CapeBrink_House_EventScript_1C4DEC:: @ 81C4DEC special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 special sub_8112364 lock @@ -13876,22 +13876,22 @@ TwoIsland_CapeBrink_House_EventScript_1C4DEC:: @ 81C4DEC getfirstpartymonname 0 msgbox Text_1A46C6 specialvar VAR_RESULT, Special_CapeBrinkGetMoveToTeachLeadPokemon - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C4F26 copyvar VAR_0x8009, VAR_0x8005 - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if eq, EventScript_1C4EF0 - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 call_if eq, EventScript_1C4EFB - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if eq, EventScript_1C4F06 - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if eq, EventScript_1C4F11 msgbox Text_1A4751, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C4F1C call EventScript_1C4F37 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C4F1C msgbox Text_1A4814 closemessage @@ -13916,7 +13916,7 @@ EventScript_1C4EA1:: @ 81C4EA1 EventScript_1C4EAB:: @ 81C4EAB copyvar VAR_0x8005, VAR_0x8009 specialvar VAR_RESULT, Special_HasLearnedAllMovesFromCapeBrinkTutor - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1C4ECD msgbox Text_1A4865 setflag FLAG_TEMP_2 @@ -13931,7 +13931,7 @@ EventScript_1C4ECD:: @ 81C4ECD EventScript_1C4EDA:: @ 81C4EDA call EventScript_1C4F30 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C4F1C goto EventScript_1C4EAB end @@ -14050,7 +14050,7 @@ EventScript_1C4FC5:: @ 81C4FC5 setvar VAR_0x400E, 1 setvar VAR_0x8004, 5 special sub_815D9E8 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1C4FFE setobjectxyperm 2, 10, 12 setobjectmovementtype 2, 9 @@ -14095,14 +14095,14 @@ EventScript_1C5050:: @ 81C5050 setvar VAR_0x4002, 1 setvar VAR_0x8004, 5 special sub_815D9E8 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1C5072 setvar VAR_0x400E, 1 setvar VAR_0x400F, 1 EventScript_1C5072: setvar VAR_0x8004, 18 special sub_815D9E8 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1C5086 end @@ -14144,7 +14144,7 @@ EventScript_1C510D:: @ 81C510D setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 addvar VAR_0x4003, 1 - compare_var_to_value VAR_0x4003, 1 + compare VAR_0x4003, 1 goto_if eq, EventScript_1C5146 setvar VAR_0x4003, 0 EventScript_1C5146: @@ -14377,7 +14377,7 @@ SevenIsland_TrainerTower_1F_EventScript_1C54B4:: @ 81C54B4 setvar VAR_0x4003, 0 setvar VAR_0x8004, 16 special sub_815D9E8 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if ne, EventScript_1C5528 setvar VAR_0x8004, 19 special sub_815D9E8 @@ -14397,7 +14397,7 @@ SevenIsland_TrainerTower_1F_EventScript_1C54EA:: @ 81C54EA setvar VAR_0x4003, 1 setvar VAR_0x8004, 16 special sub_815D9E8 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if ne, EventScript_1C5528 setvar VAR_0x8004, 19 special sub_815D9E8 diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc index 0d7c001ee..9959c058d 100644 --- a/data/maps/BirthIsland_Exterior/scripts.inc +++ b/data/maps/BirthIsland_Exterior/scripts.inc @@ -38,7 +38,7 @@ BirthIsland_Exterior_MapScript2_165253:: @ 8165253 EventScript_16525D:: @ 816525D specialvar VAR_RESULT, Special_GetBattleOutcome - compare_var_to_value VAR_RESULT, B_OUTCOME_CAUGHT + compare VAR_RESULT, B_OUTCOME_CAUGHT goto_if ne, EventScript_1A77A9 removeobject 2 return @@ -47,7 +47,7 @@ BirthIsland_Exterior_EventScript_165271:: @ 8165271 lock faceplayer special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 special sub_8112364 special Special_DeoxysSound @@ -96,11 +96,11 @@ EventScript_1652C0:: @ 81652C0 waitstate clearflag FLAG_SYS_SPECIAL_WILD_BATTLE specialvar VAR_RESULT, Special_GetBattleOutcome - compare_var_to_value VAR_RESULT, B_OUTCOME_WON + compare VAR_RESULT, B_OUTCOME_WON goto_if eq, EventScript_16533A - compare_var_to_value VAR_RESULT, B_OUTCOME_RAN + compare VAR_RESULT, B_OUTCOME_RAN goto_if eq, EventScript_165348 - compare_var_to_value VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED + compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED goto_if eq, EventScript_165348 setflag FLAG_FOUGHT_DEOXYS release diff --git a/data/maps/CeladonCity_Condominiums_1F/scripts.inc b/data/maps/CeladonCity_Condominiums_1F/scripts.inc index fe1da2c67..11a685e53 100644 --- a/data/maps/CeladonCity_Condominiums_1F/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_1F/scripts.inc @@ -13,7 +13,7 @@ CeladonCity_Condominiums_1F_EventScript_16C321:: @ 816C321 msgbox gUnknown_81960C9 setflag FLAG_GOT_TEA giveitem ITEM_TEA - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1A6BF9 msgbox gUnknown_8196109 release diff --git a/data/maps/CeladonCity_Condominiums_3F/scripts.inc b/data/maps/CeladonCity_Condominiums_3F/scripts.inc index 258846f29..5bdf8bf20 100644 --- a/data/maps/CeladonCity_Condominiums_3F/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_3F/scripts.inc @@ -17,7 +17,7 @@ CeladonCity_Condominiums_3F_EventScript_16C3F6:: @ 816C3F6 lock faceplayer specialvar VAR_RESULT, HasAllKantoMons - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16C412 msgbox gUnknown_8196356 release @@ -32,7 +32,7 @@ EventScript_16C418:: @ 816C418 waitmessage delay 60 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 special Special_ShowDiploma waitstate diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc b/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc index a18215910..1d5879580 100644 --- a/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc @@ -10,11 +10,11 @@ CeladonCity_Condominiums_RoofRoom_EventScript_16C46D:: @ 816C46D faceplayer setvar VAR_0x4001, SPECIES_EEVEE givemon SPECIES_EEVEE, 25, ITEM_NONE, 0, 0, 0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16C4A6 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16C4DA - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A927C release end @@ -27,7 +27,7 @@ EventScript_16C4A6:: @ 816C4A6 waitfanfare getspeciesname 0, SPECIES_EEVEE msgbox gUnknown_81A56A7, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16C514 call EventScript_1A8C27 call EventScript_1A74EB @@ -42,7 +42,7 @@ EventScript_16C4DA:: @ 816C4DA waitfanfare getspeciesname 0, SPECIES_EEVEE msgbox gUnknown_81A56A7, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16C509 call EventScript_1A8C33 goto EventScript_16C509 diff --git a/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc index 0627bf3a0..8f4c34162 100644 --- a/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc @@ -15,7 +15,7 @@ CeladonCity_DepartmentStore_2F_EventScript_16BB07:: @ 816BB07 CeladonCity_DepartmentStore_2F_EventScript_16BB10:: @ 816BB10 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 lock faceplayer @@ -43,7 +43,7 @@ Items_16BB38:: @ 816BB38 CeladonCity_DepartmentStore_2F_EventScript_16BB4E:: @ 816BB4E special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 lock faceplayer diff --git a/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc index 84f290500..7d358f621 100644 --- a/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc @@ -15,7 +15,7 @@ CeladonCity_DepartmentStore_4F_EventScript_16BC01:: @ 816BC01 CeladonCity_DepartmentStore_4F_EventScript_16BC0A:: @ 816BC0A special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 lock faceplayer diff --git a/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc index 66bc95b26..8556833c7 100644 --- a/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc @@ -15,7 +15,7 @@ CeladonCity_DepartmentStore_5F_EventScript_16BC53:: @ 816BC53 CeladonCity_DepartmentStore_5F_EventScript_16BC5C:: @ 816BC5C special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 lock faceplayer @@ -41,7 +41,7 @@ Items_16BC84:: @ 816BC84 CeladonCity_DepartmentStore_5F_EventScript_16BC96:: @ 816BC96 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 lock faceplayer diff --git a/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc b/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc index 3fcd14e8a..06963d348 100644 --- a/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc @@ -61,7 +61,7 @@ EventScript_16C1F3:: @ 816C1F3 EventScript_16C246:: @ 816C246 setvar VAR_0x8006, 4 setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_1F, 255, 6, 1 - compare_var_to_value VAR_ELEVATOR_FLOOR, 4 + compare VAR_ELEVATOR_FLOOR, 4 goto_if eq, EventScript_16C30E call EventScript_16C313 setvar VAR_ELEVATOR_FLOOR, 4 @@ -71,7 +71,7 @@ EventScript_16C246:: @ 816C246 EventScript_16C26E:: @ 816C26E setvar VAR_0x8006, 5 setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_2F, 255, 6, 1 - compare_var_to_value VAR_ELEVATOR_FLOOR, 5 + compare VAR_ELEVATOR_FLOOR, 5 goto_if eq, EventScript_16C30E call EventScript_16C313 setvar VAR_ELEVATOR_FLOOR, 5 @@ -81,7 +81,7 @@ EventScript_16C26E:: @ 816C26E EventScript_16C296:: @ 816C296 setvar VAR_0x8006, 6 setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_3F, 255, 6, 1 - compare_var_to_value VAR_ELEVATOR_FLOOR, 6 + compare VAR_ELEVATOR_FLOOR, 6 goto_if eq, EventScript_16C30E call EventScript_16C313 setvar VAR_ELEVATOR_FLOOR, 6 @@ -91,7 +91,7 @@ EventScript_16C296:: @ 816C296 EventScript_16C2BE:: @ 816C2BE setvar VAR_0x8006, 7 setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_4F, 255, 6, 1 - compare_var_to_value VAR_ELEVATOR_FLOOR, 7 + compare VAR_ELEVATOR_FLOOR, 7 goto_if eq, EventScript_16C30E call EventScript_16C313 setvar VAR_ELEVATOR_FLOOR, 7 @@ -101,7 +101,7 @@ EventScript_16C2BE:: @ 816C2BE EventScript_16C2E6:: @ 816C2E6 setvar VAR_0x8006, 8 setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_5F, 255, 6, 1 - compare_var_to_value VAR_ELEVATOR_FLOOR, 8 + compare VAR_ELEVATOR_FLOOR, 8 goto_if eq, EventScript_16C30E call EventScript_16C313 setvar VAR_ELEVATOR_FLOOR, 8 diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc index da6ec9c0b..68dd32b65 100644 --- a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc @@ -3,13 +3,13 @@ CeladonCity_DepartmentStore_Roof_MapScripts:: @ 816BCCC CeladonCity_DepartmentStore_Roof_EventScript_16BCCD:: @ 816BCCD special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 special sub_8112364 lock faceplayer call EventScript_16BCF6 - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 goto_if eq, EventScript_16C00E goto EventScript_16BD3E end @@ -17,13 +17,13 @@ CeladonCity_DepartmentStore_Roof_EventScript_16BCCD:: @ 816BCCD EventScript_16BCF6:: @ 816BCF6 setvar VAR_0x4001, 0 checkitem ITEM_FRESH_WATER, 1 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if eq, EventScript_16BD2C checkitem ITEM_SODA_POP, 1 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if eq, EventScript_16BD32 checkitem ITEM_LEMONADE, 1 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if eq, EventScript_16BD38 return @@ -41,7 +41,7 @@ EventScript_16BD38:: @ 816BD38 EventScript_16BD3E:: @ 816BD3E msgbox gUnknown_8195D22, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16C00C textcolor 3 message Text_195D5F @@ -150,7 +150,7 @@ EventScript_16BF7C:: @ 816BF7C getitemname 1, VAR_0x8009 removeitem VAR_0x8008, 1 checkitemspace VAR_0x8009, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16C002 additem VAR_0x8009, 1 textcolor 3 @@ -160,11 +160,11 @@ EventScript_16BF7C:: @ 816BF7C waitfanfare giveitem VAR_0x8009, 1, 8 call EventScript_1A6675 - compare_var_to_value VAR_0x8008, ITEM_FRESH_WATER + compare VAR_0x8008, ITEM_FRESH_WATER call_if eq, EventScript_16BFDE - compare_var_to_value VAR_0x8008, ITEM_SODA_POP + compare VAR_0x8008, ITEM_SODA_POP call_if eq, EventScript_16BFEA - compare_var_to_value VAR_0x8008, ITEM_LEMONADE + compare VAR_0x8008, ITEM_LEMONADE call_if eq, EventScript_16BFF6 release end @@ -261,16 +261,16 @@ EventScript_16C0C4:: @ 816C0C4 return EventScript_16C0CB:: @ 816C0CB - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16C131 checkitemspace VAR_0x4000, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16C13F - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 call_if eq, EventScript_16C0B6 - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if eq, EventScript_16C0BD - compare_var_to_value VAR_0x4001, 2 + compare VAR_0x4001, 2 call_if eq, EventScript_16C0C4 updatemoneybox 0, 0, 0 getitemname 0, VAR_0x4000 diff --git a/data/maps/CeladonCity_GameCorner/scripts.inc b/data/maps/CeladonCity_GameCorner/scripts.inc index 65aa9a529..1a2403837 100644 --- a/data/maps/CeladonCity_GameCorner/scripts.inc +++ b/data/maps/CeladonCity_GameCorner/scripts.inc @@ -21,7 +21,7 @@ CeladonCity_GameCorner_EventScript_16C684:: @ 816C684 CeladonCity_GameCorner_EventScript_16C68D:: @ 816C68D special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 lock faceplayer @@ -41,18 +41,18 @@ CeladonCity_GameCorner_EventScript_16C68D:: @ 816C68D EventScript_16C6E6:: @ 816C6E6 checkflag FLAG_GOT_COIN_CASE goto_if FALSE, EventScript_16C790 - compare_var_to_value VAR_0x8009, 0 + compare VAR_0x8009, 0 goto_if eq, EventScript_16C734 - compare_var_to_value VAR_0x8009, 1 + compare VAR_0x8009, 1 goto_if eq, EventScript_16C706 end EventScript_16C706:: @ 816C706 checkcoins VAR_0x4001 - compare_var_to_value VAR_0x4001, 9500 + compare VAR_0x4001, 9500 goto_if ge, EventScript_16C79E checkmoney 10000, 0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16C7AC givecoins 500 takemoney 10000, 0 @@ -61,10 +61,10 @@ EventScript_16C706:: @ 816C706 EventScript_16C734:: @ 816C734 checkcoins VAR_0x4001 - compare_var_to_value VAR_0x4001, 9950 + compare VAR_0x4001, 9950 goto_if ge, EventScript_16C79E checkmoney 1000, 0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16C7AC givecoins 50 takemoney 1000, 0 @@ -135,7 +135,7 @@ CeladonCity_GameCorner_EventScript_16C7E7:: @ 816C7E7 checkflag FLAG_GOT_COIN_CASE goto_if FALSE, EventScript_16C839 checkcoins VAR_0x4001 - compare_var_to_value VAR_0x4001, 9990 + compare VAR_0x4001, 9990 goto_if ge, EventScript_16C82B givecoins 10 textcolor 3 @@ -199,7 +199,7 @@ CeladonCity_GameCorner_EventScript_16C89E:: @ 816C89E checkflag FLAG_GOT_COIN_CASE goto_if FALSE, EventScript_16C839 checkcoins VAR_0x4001 - compare_var_to_value VAR_0x4001, 9980 + compare VAR_0x4001, 9980 goto_if ge, EventScript_16C8E2 givecoins 20 textcolor 3 @@ -229,7 +229,7 @@ CeladonCity_GameCorner_EventScript_16C8FE:: @ 816C8FE checkflag FLAG_GOT_COIN_CASE goto_if FALSE, EventScript_16C839 checkcoins VAR_0x4001 - compare_var_to_value VAR_0x4001, 9980 + compare VAR_0x4001, 9980 goto_if ge, EventScript_16C942 givecoins 20 textcolor 3 @@ -264,7 +264,7 @@ EventScript_16C96C:: @ 816C96C checkflag FLAG_GOT_COIN_CASE goto_if FALSE, EventScript_16CAA0 msgbox gUnknown_8196F46, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16C96A setfieldeffectarg 0, 255 setfieldeffectarg 1, 10 @@ -434,9 +434,9 @@ CeladonCity_GameCorner_EventScript_16CAF5:: @ 816CAF5 EventScript_16CB10:: @ 816CB10 msgbox gUnknown_8196E9B closemessage - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if eq, EventScript_16CB34 - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if ne, EventScript_16CB3F removeobject 11 release diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc index 33f5da4bb..4a037e9eb 100644 --- a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc +++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc @@ -15,7 +15,7 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_16CB88:: @ 816CB88 checkflag FLAG_GOT_COIN_CASE goto_if FALSE, EventScript_16CD99 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 showcoinsbox 0, 0 msgbox gUnknown_8197057 @@ -109,10 +109,10 @@ EventScript_16CC55:: @ 816CC55 EventScript_16CC65:: @ 816CC65 getspeciesname 0, VAR_0x4001 msgbox gUnknown_819709D, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16CC10 checkcoins VAR_RESULT - compare_var_to_var VAR_RESULT, VAR_0x4002 + compare VAR_RESULT, VAR_0x4002 goto_if lt, EventScript_16CDA5 textcolor 3 switch VAR_0x4001 @@ -179,11 +179,11 @@ EventScript_16CD3D:: @ 816CD3D end EventScript_16CD52:: @ 816CD52 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16CDB3 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16CDE0 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_16CD74 end @@ -222,7 +222,7 @@ EventScript_16CDB3:: @ 816CDB3 waitmessage waitfanfare msgbox gUnknown_81A56A7, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16CD83 goto EventScript_16CC10 end @@ -236,7 +236,7 @@ EventScript_16CDE0:: @ 816CDE0 waitmessage waitfanfare msgbox gUnknown_81A56A7, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16CE12 call EventScript_1A8C33 goto EventScript_16CE12 @@ -253,7 +253,7 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_16CE1D:: @ 816CE1D checkflag FLAG_GOT_COIN_CASE goto_if FALSE, EventScript_16CD99 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 showcoinsbox 0, 0 msgbox gUnknown_8197057 @@ -311,7 +311,7 @@ EventScript_16CEF5:: @ 816CEF5 EventScript_16CF09:: @ 816CF09 msgbox gUnknown_81970B2, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16CC10 goto EventScript_16CF3F end @@ -319,7 +319,7 @@ EventScript_16CF09:: @ 816CF09 EventScript_16CF22:: @ 816CF22 getitemname 0, VAR_0x4001 msgbox gUnknown_819709D, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16CC10 goto EventScript_16CF3F end @@ -327,10 +327,10 @@ EventScript_16CF22:: @ 816CF22 EventScript_16CF3F:: @ 816CF3F getitemname 0, VAR_0x4001 checkcoins VAR_RESULT - compare_var_to_var VAR_RESULT, VAR_0x4002 + compare VAR_RESULT, VAR_0x4002 goto_if lt, EventScript_16CDA5 checkitemspace VAR_0x4001, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16CF79 takecoins VAR_0x4002 updatecoinsbox 0, 5 @@ -351,7 +351,7 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_16CF88:: @ 816CF88 checkflag FLAG_GOT_COIN_CASE goto_if FALSE, EventScript_16CD99 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 showcoinsbox 0, 0 msgbox gUnknown_8197057 diff --git a/data/maps/CeladonCity_Gym/scripts.inc b/data/maps/CeladonCity_Gym/scripts.inc index b92e99fe1..d7c14ecd3 100644 --- a/data/maps/CeladonCity_Gym/scripts.inc +++ b/data/maps/CeladonCity_Gym/scripts.inc @@ -23,7 +23,7 @@ EventScript_16D0A0:: @ 816D0A0 EventScript_16D0C6:: @ 816D0C6 msgbox gUnknown_8197327 checkitemspace ITEM_TM19, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16D107 additem ITEM_TM19, 1 giveitemfanfaremsg gUnknown_81973BA, ITEM_TM19 diff --git a/data/maps/CeladonCity_Restaurant/scripts.inc b/data/maps/CeladonCity_Restaurant/scripts.inc index 82ecb417e..9b85b36f3 100644 --- a/data/maps/CeladonCity_Restaurant/scripts.inc +++ b/data/maps/CeladonCity_Restaurant/scripts.inc @@ -16,7 +16,7 @@ CeladonCity_Restaurant_EventScript_16D1FD:: @ 816D1FD goto_if TRUE, EventScript_16D24B msgbox gUnknown_81979C1 checkitemspace ITEM_COIN_CASE, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16D241 additem ITEM_COIN_CASE, 1 giveitemfanfaremsg gUnknown_8197A38, ITEM_COIN_CASE diff --git a/data/maps/CeruleanCave_B1F/scripts.inc b/data/maps/CeruleanCave_B1F/scripts.inc index 5c51d2601..01e077b3c 100644 --- a/data/maps/CeruleanCave_B1F/scripts.inc +++ b/data/maps/CeruleanCave_B1F/scripts.inc @@ -10,7 +10,7 @@ CeruleanCave_B1F_MapScript1_1624C9:: @ 81624C9 EventScript_1624D3:: @ 81624D3 specialvar VAR_RESULT, Special_GetBattleOutcome - compare_var_to_value VAR_RESULT, B_OUTCOME_CAUGHT + compare VAR_RESULT, B_OUTCOME_CAUGHT goto_if ne, EventScript_1A77A9 removeobject VAR_LAST_TALKED return @@ -26,7 +26,7 @@ EventScript_1624F1:: @ 81624F1 CeruleanCave_B1F_EventScript_1624F5:: @ 81624F5 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 special sub_8112364 lock @@ -45,11 +45,11 @@ CeruleanCave_B1F_EventScript_1624F5:: @ 81624F5 waitstate clearflag FLAG_SYS_SPECIAL_WILD_BATTLE specialvar VAR_RESULT, Special_GetBattleOutcome - compare_var_to_value VAR_RESULT, B_OUTCOME_WON + compare VAR_RESULT, B_OUTCOME_WON goto_if eq, EventScript_162558 - compare_var_to_value VAR_RESULT, B_OUTCOME_RAN + compare VAR_RESULT, B_OUTCOME_RAN goto_if eq, EventScript_162561 - compare_var_to_value VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED + compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED goto_if eq, EventScript_162561 setflag FLAG_FOUGHT_MEWTWO release diff --git a/data/maps/CeruleanCity/scripts.inc b/data/maps/CeruleanCity/scripts.inc index bd660c660..dd68b4bcc 100644 --- a/data/maps/CeruleanCity/scripts.inc +++ b/data/maps/CeruleanCity/scripts.inc @@ -43,21 +43,21 @@ EventScript_1664CC:: @ 81664CC waitmovement 0 msgbox gUnknown_817EAD7 setvar VAR_LAST_TALKED, 8 - compare_var_to_value VAR_STARTER_MON, 2 + compare VAR_STARTER_MON, 2 call_if eq, EventScript_166582 - compare_var_to_value VAR_STARTER_MON, 1 + compare VAR_STARTER_MON, 1 call_if eq, EventScript_16658D - compare_var_to_value VAR_STARTER_MON, 0 + compare VAR_STARTER_MON, 0 call_if eq, EventScript_166598 famechecker FAMECHECKER_BILL, 0 msgbox gUnknown_817EB95 closemessage playbgm MUS_RIVAL2, 0 - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 call_if eq, EventScript_1665A3 - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if eq, EventScript_1665A3 - compare_var_to_value VAR_0x4001, 2 + compare VAR_0x4001, 2 call_if eq, EventScript_1665B5 msgbox gUnknown_817ECD4 setvar VAR_MAP_SCENE_CERULEAN_CITY_RIVAL, 1 @@ -185,7 +185,7 @@ CeruleanCity_EventScript_166603:: @ 8166603 EventScript_16662E:: @ 816662E msgbox gUnknown_817EE9C checkitemspace ITEM_TM28, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_166677 additem ITEM_TM28, 1 giveitemfanfaremsg gUnknown_817EEBF, ITEM_TM28 @@ -283,11 +283,11 @@ CeruleanCity_EventScript_16674F:: @ 816674F lock random 3 copyvar VAR_0x8008, VAR_RESULT - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 call_if eq, EventScript_1667B0 - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if eq, EventScript_1667B6 - compare_var_to_value VAR_0x8008, 2 + compare VAR_0x8008, 2 call_if eq, EventScript_1667BC waitmessage delay 40 @@ -295,11 +295,11 @@ CeruleanCity_EventScript_16674F:: @ 816674F applymovement 5, Movement_1A75D9 waitmovement 0 delay 30 - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 call_if eq, EventScript_1667C2 - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if eq, EventScript_1667CB - compare_var_to_value VAR_0x8008, 2 + compare VAR_0x8008, 2 call_if eq, EventScript_1667D4 release end @@ -332,13 +332,13 @@ CeruleanCity_EventScript_1667DD:: @ 81667DD lock random 4 copyvar VAR_0x8008, VAR_RESULT - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 call_if eq, EventScript_166814 - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if eq, EventScript_16681D - compare_var_to_value VAR_0x8008, 2 + compare VAR_0x8008, 2 call_if eq, EventScript_166826 - compare_var_to_value VAR_0x8008, 3 + compare VAR_0x8008, 3 call_if eq, EventScript_16682F release end diff --git a/data/maps/CeruleanCity_Gym/scripts.inc b/data/maps/CeruleanCity_Gym/scripts.inc index a37d3435b..fedec7e89 100644 --- a/data/maps/CeruleanCity_Gym/scripts.inc +++ b/data/maps/CeruleanCity_Gym/scripts.inc @@ -22,7 +22,7 @@ EventScript_16AAD3:: @ 816AAD3 EventScript_16AAF9:: @ 816AAF9 msgbox gUnknown_81922F7 checkitemspace ITEM_TM03, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16AB3A additem ITEM_TM03, 1 giveitemfanfaremsg gUnknown_81923F1, ITEM_TM03 diff --git a/data/maps/CeruleanCity_House3/scripts.inc b/data/maps/CeruleanCity_House3/scripts.inc index 36ce99bdb..13ec2b2fd 100644 --- a/data/maps/CeruleanCity_House3/scripts.inc +++ b/data/maps/CeruleanCity_House3/scripts.inc @@ -13,13 +13,13 @@ CeruleanCity_House3_EventScript_16A9B1:: @ 816A9B1 checkflag FLAG_DID_ZYNX_TRADE goto_if TRUE, EventScript_16AA23 msgbox gUnknown_81A59FE, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16AA0B call EventScript_1A8CBD - compare_var_to_value VAR_0x8004, 6 + compare VAR_0x8004, 6 goto_if ge, EventScript_16AA0B call EventScript_1A8CC9 - compare_var_to_var VAR_RESULT, VAR_0x8009 + compare VAR_RESULT, VAR_0x8009 goto_if ne, EventScript_16AA15 call EventScript_1A8CD9 msgbox gUnknown_81A5A9D diff --git a/data/maps/CeruleanCity_House4/scripts.inc b/data/maps/CeruleanCity_House4/scripts.inc index afbb35c5f..174bf6a7c 100644 --- a/data/maps/CeruleanCity_House4/scripts.inc +++ b/data/maps/CeruleanCity_House4/scripts.inc @@ -3,25 +3,25 @@ CeruleanCity_House4_MapScripts:: @ 816ACEE CeruleanCity_House4_EventScript_16ACEF:: @ 816ACEF special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 special sub_8112364 lock specialvar VAR_0x8004, Special_GetMENewsJisanItemAndState copyvar VAR_0x8008, VAR_RESULT - compare_var_to_value VAR_0x8004, 0 + compare VAR_0x8004, 0 goto_if eq, EventScript_CeruleanCity_House4_NoNews - compare_var_to_value VAR_0x8004, 1 + compare VAR_0x8004, 1 goto_if eq, EventScript_CeruleanCity_House4_News1 - compare_var_to_value VAR_0x8004, 2 + compare VAR_0x8004, 2 goto_if eq, EventScript_CeruleanCity_House4_News2 - compare_var_to_value VAR_0x8004, 3 + compare VAR_0x8004, 3 goto_if eq, EventScript_CeruleanCity_House4_NewsNotSpread - compare_var_to_value VAR_0x8004, 4 + compare VAR_0x8004, 4 goto_if eq, EventScript_CeruleanCity_House4_NewsSpread1 - compare_var_to_value VAR_0x8004, 5 + compare VAR_0x8004, 5 goto_if eq, EventScript_CeruleanCity_House4_NewsSpread2 - compare_var_to_value VAR_0x8004, 6 + compare VAR_0x8004, 6 goto_if eq, EventScript_CeruleanCity_House4_NewsDone end @@ -34,7 +34,7 @@ EventScript_CeruleanCity_House4_News1:: @ 816AD63 call EventScript_CeruleanCity_House4_MovementReactionToNews msgbox gUnknown_8192B43 giveitem VAR_0x8008 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16AE45 release end @@ -43,7 +43,7 @@ EventScript_CeruleanCity_House4_News2:: @ 816AD89 call EventScript_CeruleanCity_House4_MovementReactionToNews msgbox gUnknown_8192C07 giveitem VAR_0x8008, 4 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16AE45 release end @@ -59,7 +59,7 @@ EventScript_CeruleanCity_House4_NewsSpread1:: @ 816ADC3 call EventScript_CeruleanCity_House4_MovementReactionToNews msgbox gUnknown_8192D4B giveitem VAR_0x8008 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16AE45 release end @@ -68,7 +68,7 @@ EventScript_CeruleanCity_House4_NewsSpread2:: @ 816ADE9 call EventScript_CeruleanCity_House4_MovementReactionToNews msgbox gUnknown_8192DE3 giveitem VAR_0x8008, 4 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16AE45 release end diff --git a/data/maps/CeruleanCity_House5/scripts.inc b/data/maps/CeruleanCity_House5/scripts.inc index 79cd75785..ae2c8cad5 100644 --- a/data/maps/CeruleanCity_House5/scripts.inc +++ b/data/maps/CeruleanCity_House5/scripts.inc @@ -7,14 +7,14 @@ CeruleanCity_House5_EventScript_16AE50:: @ 816AE50 checkflag FLAG_GOT_POWDER_JAR goto_if TRUE, EventScript_16AEB7 msgbox gUnknown_8192F67, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16AEAD checkflag FLAG_SYS_GOT_BERRY_POUCH goto_if FALSE, EventScript_16AEA3 msgbox gUnknown_8193003 setflag FLAG_GOT_POWDER_JAR giveitem ITEM_POWDER_JAR - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1A6BF9 msgbox gUnknown_8193033 release @@ -143,20 +143,20 @@ EventScript_16B048:: @ 816B048 EventScript_16B055:: @ 816B055 msgbox gUnknown_819331E, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16AEC8 copyvar VAR_0x8004, VAR_0x8009 specialvar VAR_RESULT, sub_815EEB0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16B0CC giveitem VAR_0x8008 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16B0BF copyvar VAR_0x8004, VAR_0x8009 special sub_815EF5C special sub_815F070 msgbox gUnknown_819337A, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16AEC8 msgbox gUnknown_81933FB special sub_815F114 @@ -177,7 +177,7 @@ EventScript_16B0CC:: @ 816B0CC CeruleanCity_House5_EventScript_16B0DA:: @ 816B0DA lockall special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 special sub_814EA7C waitstate diff --git a/data/maps/CeruleanCity_Mart/scripts.inc b/data/maps/CeruleanCity_Mart/scripts.inc index c99795d35..eda64ebfe 100644 --- a/data/maps/CeruleanCity_Mart/scripts.inc +++ b/data/maps/CeruleanCity_Mart/scripts.inc @@ -11,7 +11,7 @@ CeruleanCity_Mart_EventScript_16ACA7:: @ 816ACA7 CeruleanCity_Mart_EventScript_16ACB0:: @ 816ACB0 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 lock faceplayer diff --git a/data/maps/CinnabarIsland/scripts.inc b/data/maps/CinnabarIsland/scripts.inc index 2ebce51b7..4a971c1a5 100644 --- a/data/maps/CinnabarIsland/scripts.inc +++ b/data/maps/CinnabarIsland/scripts.inc @@ -6,11 +6,11 @@ CinnabarIsland_MapScripts:: @ 8166ED6 CinnabarIsland_MapScript1_166EE1:: @ 8166EE1 setworldmapflag FLAG_WORLD_MAP_CINNABAR_ISLAND call EventScript_166F5E - compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND, 1 + compare VAR_MAP_SCENE_CINNABAR_ISLAND, 1 call_if eq, EventScript_166F24 - compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND, 3 + compare VAR_MAP_SCENE_CINNABAR_ISLAND, 3 call_if eq, EventScript_166F52 - compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND_2, 1 + compare VAR_MAP_SCENE_CINNABAR_ISLAND_2, 1 call_if eq, EventScript_166F0B end @@ -24,7 +24,7 @@ EventScript_166F0B:: @ 8166F0B EventScript_166F24:: @ 8166F24 getplayerxy VAR_0x8004, VAR_0x8005 - compare_var_to_value VAR_0x8004, 18 + compare VAR_0x8004, 18 goto_if ge, EventScript_166F4A setflag FLAG_TEMP_2 setobjectxyperm 3, 18, 12 @@ -108,9 +108,9 @@ EventScript_166FCD:: @ 8166FCD call_if TRUE, EventScript_167053 msgbox gUnknown_8180C90 msgbox gUnknown_8180CAA, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_167068 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_167078 end diff --git a/data/maps/CinnabarIsland_Gym/scripts.inc b/data/maps/CinnabarIsland_Gym/scripts.inc index 9e67b156d..f2959212c 100644 --- a/data/maps/CinnabarIsland_Gym/scripts.inc +++ b/data/maps/CinnabarIsland_Gym/scripts.inc @@ -75,7 +75,7 @@ EventScript_16DA06:: @ 816DA06 EventScript_16DA34:: @ 816DA34 msgbox gUnknown_819969E checkitemspace ITEM_TM38, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16DA75 additem ITEM_TM38, 1 giveitemfanfaremsg gUnknown_81996FF, ITEM_TM38 @@ -227,9 +227,9 @@ CinnabarIsland_Gym_EventScript_16DBF4:: @ 816DBF4 EventScript_16DC00:: @ 816DC00 msgbox gUnknown_8199C9F msgbox gUnknown_8199D5A, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16DC43 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16DC6A end @@ -275,9 +275,9 @@ EventScript_16DC6A:: @ 816DC6A end EventScript_16DC7A:: @ 816DC7A - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 call_if eq, EventScript_16DCB4 - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if eq, EventScript_16DCC6 textcolor 0 msgbox gUnknown_819983F @@ -324,9 +324,9 @@ CinnabarIsland_Gym_EventScript_16DCE9:: @ 816DCE9 EventScript_16DCF5:: @ 816DCF5 msgbox gUnknown_8199C9F msgbox gUnknown_8199D79, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16DD41 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16DD1C end @@ -354,9 +354,9 @@ EventScript_16DD41:: @ 816DD41 end EventScript_16DD51:: @ 816DD51 - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 call_if eq, EventScript_16DD8B - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if eq, EventScript_16DD9D textcolor 0 msgbox gUnknown_81998BD @@ -412,9 +412,9 @@ CinnabarIsland_Gym_EventScript_16DDC7:: @ 816DDC7 EventScript_16DDD3:: @ 816DDD3 msgbox gUnknown_8199C9F msgbox gUnknown_8199DA9, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16DE1F - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16DDFA end @@ -442,9 +442,9 @@ EventScript_16DE1F:: @ 816DE1F end EventScript_16DE2F:: @ 816DE2F - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 call_if eq, EventScript_16DE69 - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if eq, EventScript_16DE7B textcolor 0 msgbox gUnknown_8199948 @@ -491,9 +491,9 @@ CinnabarIsland_Gym_EventScript_16DE9E:: @ 816DE9E EventScript_16DEAA:: @ 816DEAA msgbox gUnknown_8199C9F msgbox gUnknown_8199DC6, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16DEF6 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16DED1 end @@ -521,9 +521,9 @@ EventScript_16DEF6:: @ 816DEF6 end EventScript_16DF06:: @ 816DF06 - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 call_if eq, EventScript_16DF40 - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if eq, EventScript_16DF52 textcolor 0 msgbox gUnknown_81999B7 @@ -570,9 +570,9 @@ CinnabarIsland_Gym_EventScript_16DF75:: @ 816DF75 EventScript_16DF81:: @ 816DF81 msgbox gUnknown_8199C9F msgbox gUnknown_8199E00, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16DFA8 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16DFCD end @@ -600,9 +600,9 @@ EventScript_16DFCD:: @ 816DFCD end EventScript_16DFDD:: @ 816DFDD - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 call_if eq, EventScript_16E017 - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if eq, EventScript_16E029 textcolor 0 msgbox gUnknown_8199A7F @@ -649,9 +649,9 @@ CinnabarIsland_Gym_EventScript_16E04C:: @ 816E04C EventScript_16E058:: @ 816E058 msgbox gUnknown_8199C9F msgbox gUnknown_8199E36, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16E0A4 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16E07F end @@ -679,9 +679,9 @@ EventScript_16E0A4:: @ 816E0A4 end EventScript_16E0B4:: @ 816E0B4 - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 call_if eq, EventScript_16E0EE - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if eq, EventScript_16E100 textcolor 0 msgbox gUnknown_8199AFC diff --git a/data/maps/CinnabarIsland_Mart/scripts.inc b/data/maps/CinnabarIsland_Mart/scripts.inc index 85ad79e4e..a303f9b27 100644 --- a/data/maps/CinnabarIsland_Mart/scripts.inc +++ b/data/maps/CinnabarIsland_Mart/scripts.inc @@ -11,7 +11,7 @@ CinnabarIsland_Mart_EventScript_16EA19:: @ 816EA19 CinnabarIsland_Mart_EventScript_16EA22:: @ 816EA22 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 lock faceplayer diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc index 640446bf0..77f003f56 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc @@ -30,7 +30,7 @@ CinnabarIsland_PokemonCenter_1F_EventScript_16E90A:: @ 816E90A lock faceplayer msgbox gUnknown_819A725, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16E9A5 msgbox gUnknown_819A785 closemessage @@ -39,11 +39,11 @@ CinnabarIsland_PokemonCenter_1F_EventScript_16E90A:: @ 816E90A setflag FLAG_SPECIAL_FLAG_0x4001 setflag FLAG_HIDE_CINNABAR_POKECENTER_BILL delay 20 - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 call_if eq, EventScript_16E96F - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if eq, EventScript_16E981 - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if eq, EventScript_16E993 removeobject 7 setvar VAR_MAP_SCENE_CINNABAR_ISLAND_2, 1 diff --git a/data/maps/CinnabarIsland_PokemonLab_Entrance/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_Entrance/scripts.inc index 780103629..275161475 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Entrance/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonLab_Entrance/scripts.inc @@ -3,7 +3,7 @@ CinnabarIsland_PokemonLab_Entrance_MapScripts:: @ 816E273 .byte 0 CinnabarIsland_PokemonLab_Entrance_MapScript1_16E279:: @ 816E279 - compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 1 + compare VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 1 call_if eq, EventScript_16E285 end diff --git a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc index 27fb47f63..03562d9c1 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc @@ -9,13 +9,13 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E401:: @ 816E401 checkflag FLAG_DID_SEELOR_TRADE goto_if TRUE, EventScript_16E473 msgbox gUnknown_81A597B, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16E45B call EventScript_1A8CBD - compare_var_to_value VAR_0x8004, 6 + compare VAR_0x8004, 6 goto_if ge, EventScript_16E45B call EventScript_1A8CC9 - compare_var_to_var VAR_RESULT, VAR_0x8009 + compare VAR_RESULT, VAR_0x8009 goto_if ne, EventScript_16E465 call EventScript_1A8CD9 msgbox gUnknown_81A59DA @@ -45,20 +45,20 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E47D:: @ 816E47D setvar VAR_RESULT, 0 checkflag FLAG_REVIVED_AMBER call_if TRUE, EventScript_16E8A1 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16E897 - compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 2 + compare VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 2 goto_if eq, EventScript_16E736 - compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 1 + compare VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 1 goto_if eq, EventScript_16E72C call EventScript_16E4EC - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16E544 call EventScript_16E504 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16E586 call EventScript_16E51C - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16E5C8 msgbox gUnknown_819A282 goto EventScript_16E53A @@ -101,7 +101,7 @@ EventScript_16E544:: @ 816E544 message Text_19A282 waitmessage call EventScript_16E51C - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16E5FA multichoice 0, 0, MULTICHOICE_HELIX, FALSE switch VAR_RESULT @@ -114,7 +114,7 @@ EventScript_16E586:: @ 816E586 message Text_19A282 waitmessage call EventScript_16E51C - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16E631 multichoice 0, 0, MULTICHOICE_DOME, FALSE switch VAR_RESULT @@ -155,7 +155,7 @@ EventScript_16E668:: @ 816E668 getspeciesname 0, SPECIES_OMANYTE getitemname 1, ITEM_HELIX_FOSSIL msgbox gUnknown_819A3D4, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16E722 msgbox gUnknown_819A45D textcolor 0 @@ -170,7 +170,7 @@ EventScript_16E6A6:: @ 816E6A6 getspeciesname 0, SPECIES_KABUTO getitemname 1, ITEM_DOME_FOSSIL msgbox gUnknown_819A3D4, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16E722 msgbox gUnknown_819A45D textcolor 0 @@ -185,7 +185,7 @@ EventScript_16E6E4:: @ 816E6E4 getspeciesname 0, SPECIES_AERODACTYL getitemname 1, ITEM_OLD_AMBER msgbox gUnknown_819A3D4, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16E722 msgbox gUnknown_819A45D textcolor 0 @@ -207,11 +207,11 @@ EventScript_16E72C:: @ 816E72C end EventScript_16E736:: @ 816E736 - compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, 1 + compare VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, 1 goto_if eq, EventScript_16E758 - compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, 2 + compare VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, 2 goto_if eq, EventScript_16E79D - compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, 3 + compare VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, 3 goto_if eq, EventScript_16E7E2 end @@ -220,12 +220,12 @@ EventScript_16E758:: @ 816E758 getspeciesname 0, SPECIES_OMANYTE msgbox gUnknown_819A34F givemon SPECIES_OMANYTE, 5, ITEM_NONE, 0, 0, 0 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A927C setflag FLAG_REVIVED_HELIX - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16E827 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16E85B end @@ -234,12 +234,12 @@ EventScript_16E79D:: @ 816E79D getspeciesname 0, SPECIES_KABUTO msgbox gUnknown_819A34F givemon SPECIES_KABUTO, 5, ITEM_NONE, 0, 0, 0 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A927C setflag FLAG_REVIVED_DOME - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16E827 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16E85B end @@ -248,12 +248,12 @@ EventScript_16E7E2:: @ 816E7E2 getspeciesname 0, SPECIES_AERODACTYL msgbox gUnknown_819A34F givemon SPECIES_AERODACTYL, 5, ITEM_NONE, 0, 0, 0 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A927C setflag FLAG_REVIVED_AMBER - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16E827 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16E85B end @@ -265,7 +265,7 @@ EventScript_16E827:: @ 816E827 waitfanfare setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 0 msgbox gUnknown_81A56A7, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16E895 call EventScript_1A8C27 call EventScript_1A74EB @@ -280,7 +280,7 @@ EventScript_16E85B:: @ 816E85B waitfanfare setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 0 msgbox gUnknown_81A56A7, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16E88A call EventScript_1A8C33 goto EventScript_16E88A diff --git a/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc index 8a7dc8df1..5eaf24fa4 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc @@ -13,13 +13,13 @@ CinnabarIsland_PokemonLab_Lounge_EventScript_16E2C2:: @ 816E2C2 checkflag FLAG_DID_ESPHERE_TRADE goto_if TRUE, EventScript_16E334 msgbox gUnknown_81A59FE, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16E31C call EventScript_1A8CBD - compare_var_to_value VAR_0x8004, 6 + compare VAR_0x8004, 6 goto_if ge, EventScript_16E31C call EventScript_1A8CC9 - compare_var_to_var VAR_RESULT, VAR_0x8009 + compare VAR_RESULT, VAR_0x8009 goto_if ne, EventScript_16E326 call EventScript_1A8CD9 msgbox gUnknown_81A5A9D @@ -53,17 +53,17 @@ CinnabarIsland_PokemonLab_Lounge_EventScript_16E33E:: @ 816E33E checkflag FLAG_DID_TANGENY_TRADE goto_if TRUE, EventScript_16E3D4 msgbox gUnknown_81A5AD6, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16E3BC special Special_ChooseMonFromParty waitstate copyvar VAR_0x800A, VAR_0x8004 - compare_var_to_value VAR_0x8004, 6 + compare VAR_0x8004, 6 goto_if ge, EventScript_16E3BC copyvar VAR_0x8005, VAR_0x800A specialvar VAR_RESULT, GetTradeSpecies copyvar VAR_0x800B, VAR_RESULT - compare_var_to_var VAR_RESULT, VAR_0x8009 + compare VAR_RESULT, VAR_0x8009 goto_if ne, EventScript_16E3C6 copyvar VAR_0x8004, VAR_0x8008 copyvar VAR_0x8005, VAR_0x800A diff --git a/data/maps/FiveIsland_LostCave_Room10/scripts.inc b/data/maps/FiveIsland_LostCave_Room10/scripts.inc index b214279d1..cb7b90267 100644 --- a/data/maps/FiveIsland_LostCave_Room10/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Room10/scripts.inc @@ -26,7 +26,7 @@ EventScript_164C52:: @ 8164C52 waitmovement 0 msgbox gUnknown_817D062 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_164CB6 trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_LADY_SELPHY, 0, Text_17D086 msgbox gUnknown_817D0B2 diff --git a/data/maps/FiveIsland_MemorialPillar/scripts.inc b/data/maps/FiveIsland_MemorialPillar/scripts.inc index a47767ca0..45d8694e4 100644 --- a/data/maps/FiveIsland_MemorialPillar/scripts.inc +++ b/data/maps/FiveIsland_MemorialPillar/scripts.inc @@ -27,7 +27,7 @@ EventScript_168A18:: @ 8168A18 EventScript_168A22:: @ 8168A22 msgbox gUnknown_818B282 giveitem ITEM_TM42 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_168AFE call EventScript_168AE8 release @@ -35,7 +35,7 @@ EventScript_168A22:: @ 8168A22 FiveIsland_MemorialPillar_EventScript_168A48:: @ 8168A48 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 special sub_8112364 lockall @@ -45,14 +45,14 @@ FiveIsland_MemorialPillar_EventScript_168A48:: @ 8168A48 goto_if TRUE, EventScript_168B0B msgbox gUnknown_818B095 checkitem ITEM_LEMONADE, 1 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_168A86 releaseall end EventScript_168A86:: @ 8168A86 msgbox gUnknown_818B105, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_168A9B releaseall end @@ -69,7 +69,7 @@ EventScript_168A9B:: @ 8168A9B textcolor 0 msgbox gUnknown_818B171 giveitem ITEM_TM42 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_168AFE call EventScript_168AE8 releaseall diff --git a/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc b/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc index 1d1610ace..c46cd1b33 100644 --- a/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc +++ b/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc @@ -3,16 +3,16 @@ FiveIsland_ResortGorgeous_House_MapScripts:: @ 8171EBD FiveIsland_ResortGorgeous_House_EventScript_171EBE:: @ 8171EBE special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 special sub_8112364 lock faceplayer checkflag FLAG_TEMP_2 goto_if TRUE, EventScript_172043 - compare_var_to_value VAR_RESORT_GORGEOUS_REQUESTED_MON, 0xFFFF + compare VAR_RESORT_GORGEOUS_REQUESTED_MON, 0xFFFF goto_if eq, EventScript_171F0B - compare_var_to_value VAR_RESORT_GORGEOUS_REQUESTED_MON, SPECIES_NONE + compare VAR_RESORT_GORGEOUS_REQUESTED_MON, SPECIES_NONE goto_if ne, EventScript_171F19 msgbox gUnknown_81A42A0 goto EventScript_171EFE @@ -32,7 +32,7 @@ EventScript_171F0B:: @ 8171F0B EventScript_171F19:: @ 8171F19 copyvar VAR_0x8004, VAR_RESORT_GORGEOUS_REQUESTED_MON specialvar VAR_RESULT, Special_PlayerPartyContainsSpecies - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_171F34 goto EventScript_171EFE end @@ -52,18 +52,18 @@ EventScript_171F34:: @ 8171F34 textcolor 0 msgbox gUnknown_81A4566 closemessage - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if eq, EventScript_171FCD - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 call_if eq, EventScript_171FE9 - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if eq, EventScript_171FFE - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if eq, EventScript_17201A moveobjectoffscreen 2 msgbox gUnknown_81A458E giveitem VAR_RESORT_GORGEOUS_REWARD - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_172025 setflag FLAG_TEMP_2 setvar VAR_RESORT_GORGEOUS_REQUESTED_MON, 0 diff --git a/data/maps/FiveIsland_RocketWarehouse/scripts.inc b/data/maps/FiveIsland_RocketWarehouse/scripts.inc index e6fb90088..1215fb092 100644 --- a/data/maps/FiveIsland_RocketWarehouse/scripts.inc +++ b/data/maps/FiveIsland_RocketWarehouse/scripts.inc @@ -78,7 +78,7 @@ FiveIsland_RocketWarehouse_EventScript_164014:: @ 8164014 EventScript_16402F:: @ 816402F getplayerxy VAR_0x8004, VAR_0x8005 - compare_var_to_value VAR_0x8004, 24 + compare VAR_0x8004, 24 call_if le, EventScript_164065 msgbox gUnknown_817BA64 closemessage @@ -112,36 +112,36 @@ FiveIsland_RocketWarehouse_EventScript_164087:: @ 8164087 EventScript_1640A2:: @ 81640A2 getplayerxy VAR_0x8004, VAR_0x8005 specialvar VAR_RESULT, GetPlayerFacingDirection - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 call_if eq, EventScript_16412E msgbox gUnknown_817B7AE closemessage - compare_var_to_value VAR_0x8004, 24 + compare VAR_0x8004, 24 call_if le, EventScript_164144 - compare_var_to_value VAR_0x8004, 25 + compare VAR_0x8004, 25 call_if eq, EventScript_16414F - compare_var_to_value VAR_0x8004, 26 + compare VAR_0x8004, 26 call_if eq, EventScript_16415A - compare_var_to_value VAR_0x8004, 27 + compare VAR_0x8004, 27 call_if eq, EventScript_16415A playse SE_PIN call EventScript_163F47 special DrawWholeMapView waitse - compare_var_to_value VAR_0x8004, 24 + compare VAR_0x8004, 24 call_if le, EventScript_164165 - compare_var_to_value VAR_0x8004, 25 + compare VAR_0x8004, 25 call_if eq, EventScript_164165 - compare_var_to_value VAR_0x8004, 26 + compare VAR_0x8004, 26 call_if eq, EventScript_164165 - compare_var_to_value VAR_0x8004, 27 + compare VAR_0x8004, 27 call_if eq, EventScript_164170 msgbox gUnknown_817B7FA release end EventScript_16412E:: @ 816412E - compare_var_to_value VAR_0x8004, 27 + compare VAR_0x8004, 27 goto_if eq, EventScript_1A77A9 applymovement 255, Movement_1A75EB waitmovement 0 diff --git a/data/maps/FiveIsland_WaterLabyrinth/scripts.inc b/data/maps/FiveIsland_WaterLabyrinth/scripts.inc index a334ab2df..def665782 100644 --- a/data/maps/FiveIsland_WaterLabyrinth/scripts.inc +++ b/data/maps/FiveIsland_WaterLabyrinth/scripts.inc @@ -3,7 +3,7 @@ FiveIsland_WaterLabyrinth_MapScripts:: @ 816884D FiveIsland_WaterLabyrinth_EventScript_16884E:: @ 816884E special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 special sub_8112364 lock @@ -14,7 +14,7 @@ FiveIsland_WaterLabyrinth_EventScript_16884E:: @ 816884E goto_if TRUE, EventScript_16892C msgbox gUnknown_818A80D specialvar VAR_RESULT, Special_GetLeadMonFriendship - compare_var_to_value VAR_RESULT, 6 + compare VAR_RESULT, 6 goto_if eq, EventScript_1688AC msgbox gUnknown_818A88F release @@ -33,7 +33,7 @@ EventScript_1688AC:: @ 81688AC EventScript_1688BA:: @ 81688BA countpokemon - compare_var_to_value VAR_RESULT, 6 + compare VAR_RESULT, 6 goto_if eq, EventScript_16891F setflag FLAG_GOT_TOGEPI_EGG giveegg SPECIES_TOGEPI @@ -50,12 +50,12 @@ EventScript_1688E3:: @ 81688E3 getspeciesname 1, SPECIES_TOGEPI setvar VAR_0x8004, SPECIES_TOGEPI specialvar VAR_RESULT, Special_PlayerPartyContainsSpeciesWithPlayerID - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_168895 getspeciesname 1, SPECIES_TOGETIC setvar VAR_0x8004, SPECIES_TOGETIC specialvar VAR_RESULT, Special_PlayerPartyContainsSpeciesWithPlayerID - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_168895 msgbox gUnknown_818A9C0 release diff --git a/data/maps/FourIsland/scripts.inc b/data/maps/FourIsland/scripts.inc index 68788f93a..0515c29b5 100644 --- a/data/maps/FourIsland/scripts.inc +++ b/data/maps/FourIsland/scripts.inc @@ -5,7 +5,7 @@ FourIsland_MapScripts:: @ 8167CAE FourIsland_MapScript1_167CB9:: @ 8167CB9 setworldmapflag FLAG_WORLD_MAP_FOUR_ISLAND - compare_var_to_value VAR_MAP_SCENE_FOUR_ISLAND, 0 + compare VAR_MAP_SCENE_FOUR_ISLAND, 0 call_if eq, EventScript_167CCD call EventScript_167CD1 end @@ -72,18 +72,18 @@ Movement_167D52:: @ 8167D52 FourIsland_EventScript_167D55:: @ 8167D55 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 special sub_8112364 lock faceplayer special GetDaycareMonNicknames specialvar VAR_RESULT, GetDaycareState - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_167D9B - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_167E0C - compare_var_to_value VAR_RESULT, 3 + compare VAR_RESULT, 3 goto_if eq, EventScript_167E19 msgbox gUnknown_81BF555 release @@ -91,10 +91,10 @@ FourIsland_EventScript_167D55:: @ 8167D55 EventScript_167D9B:: @ 8167D9B msgbox gUnknown_81BF5E3, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_167DD1 msgbox gUnknown_81BF7B6, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_167DD1 msgbox gUnknown_81BF6CF clearflag FLAG_PENDING_DAYCARE_EGG @@ -104,7 +104,7 @@ EventScript_167D9B:: @ 8167D9B EventScript_167DD1:: @ 8167DD1 specialvar VAR_RESULT, CalculatePlayerPartyCount - compare_var_to_value VAR_RESULT, 6 + compare VAR_RESULT, 6 goto_if ne, EventScript_167DEB msgbox gUnknown_81BF6F0 release diff --git a/data/maps/FourIsland_IcefallCave_Back/scripts.inc b/data/maps/FourIsland_IcefallCave_Back/scripts.inc index 684c7506c..582b068ec 100644 --- a/data/maps/FourIsland_IcefallCave_Back/scripts.inc +++ b/data/maps/FourIsland_IcefallCave_Back/scripts.inc @@ -3,7 +3,7 @@ FourIsland_IcefallCave_Back_MapScripts:: @ 8163D82 .byte 0 FourIsland_IcefallCave_Back_MapScript1_163D88:: @ 8163D88 - compare_var_to_value VAR_MAP_SCENE_ICEFALL_CAVE_BACK, 1 + compare VAR_MAP_SCENE_ICEFALL_CAVE_BACK, 1 call_if eq, EventScript_163D94 end diff --git a/data/maps/FourIsland_Mart/scripts.inc b/data/maps/FourIsland_Mart/scripts.inc index c74ac396a..fc3664764 100644 --- a/data/maps/FourIsland_Mart/scripts.inc +++ b/data/maps/FourIsland_Mart/scripts.inc @@ -3,7 +3,7 @@ FourIsland_Mart_MapScripts:: @ 8171CAD FourIsland_Mart_EventScript_171CAE:: @ 8171CAE special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 lock faceplayer diff --git a/data/maps/FourIsland_PokemonDayCare/scripts.inc b/data/maps/FourIsland_PokemonDayCare/scripts.inc index c91cc86e5..3b82f3521 100644 --- a/data/maps/FourIsland_PokemonDayCare/scripts.inc +++ b/data/maps/FourIsland_PokemonDayCare/scripts.inc @@ -3,19 +3,19 @@ FourIsland_PokemonDayCare_MapScripts:: @ 817193F FourIsland_PokemonDayCare_EventScript_171940:: @ 8171940 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 lock faceplayer specialvar VAR_RESULT, GetDaycareState - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_171A2E - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_171A52 - compare_var_to_value VAR_RESULT, 3 + compare VAR_RESULT, 3 goto_if eq, EventScript_171B86 msgbox gUnknown_81BF7E4, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_171993 msgbox gUnknown_81BF916 release @@ -23,16 +23,16 @@ FourIsland_PokemonDayCare_EventScript_171940:: @ 8171940 EventScript_171993:: @ 8171993 specialvar VAR_RESULT, CountPartyNonEggMons - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_171A1A msgbox gUnknown_81BF839 fadescreen 1 special ChooseSendDaycareMon waitstate - compare_var_to_value VAR_0x8004, 6 + compare VAR_0x8004, 6 goto_if ge, EventScript_1719F7 specialvar VAR_RESULT, CountPartyAliveNonEggMons_IgnoreVar0x8004Slot - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_171A24 specialvar VAR_0x8005, GetSelectedMonNickAndSpecies waitse @@ -42,7 +42,7 @@ EventScript_171993:: @ 8171993 special StoreSelectedPokemonInDaycare incrementgamestat GAME_STAT_USED_DAYCARE specialvar VAR_RESULT, GetDaycareState - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_171A01 release end @@ -54,7 +54,7 @@ EventScript_1719F7:: @ 81719F7 EventScript_171A01:: @ 8171A01 msgbox gUnknown_81BF89F, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_171993 goto EventScript_1719F7 end @@ -80,7 +80,7 @@ EventScript_171A38:: @ 8171A38 EventScript_171A41:: @ 8171A41 specialvar VAR_RESULT, GetNumLevelsGainedFromDaycare - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if ne, EventScript_171A38 return @@ -89,26 +89,26 @@ EventScript_171A52:: @ 8171A52 setvar VAR_0x8004, 0 call EventScript_171A41 msgbox gUnknown_81BF89F, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_171993 msgbox gUnknown_81BFAE8, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_171A90 goto EventScript_1719F7 end EventScript_171A90:: @ 8171A90 specialvar VAR_RESULT, CalculatePlayerPartyCount - compare_var_to_value VAR_RESULT, 6 + compare VAR_RESULT, 6 goto_if eq, EventScript_171B67 specialvar VAR_RESULT, GetDaycareState setvar VAR_0x8004, 0 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_171ACF special ShowDaycareLevelMenu waitstate copyvar VAR_0x8004, VAR_RESULT - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1719F7 goto EventScript_171ACF end @@ -116,14 +116,14 @@ EventScript_171A90:: @ 8171A90 EventScript_171ACF:: @ 8171ACF special GetDaycareCost msgbox gUnknown_81BFA3B, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_171AEB goto EventScript_1719F7 end EventScript_171AEB:: @ 8171AEB specialvar VAR_RESULT, IsEnoughForCostInVar0x8005 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_171B05 msgbox gUnknown_81BF932 release @@ -143,14 +143,14 @@ EventScript_171B05:: @ 8171B05 call EventScript_1A6675 waitmoncry specialvar VAR_RESULT, GetDaycareState - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_171B4E goto EventScript_1719F7 end EventScript_171B4E:: @ 8171B4E msgbox gUnknown_81BF94F, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_171A90 goto EventScript_1719F7 end @@ -192,7 +192,7 @@ EventScript_171B86:: @ 8171B86 setvar VAR_0x8004, 1 call EventScript_171A41 msgbox gUnknown_81BFAE8, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_171A90 msgbox gUnknown_81BF976 release @@ -201,7 +201,7 @@ EventScript_171B86:: @ 8171B86 EventScript_171BBF:: @ 8171BBF special ShowDaycareLevelMenu waitstate - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1719F7 copyvar VAR_0x8004, VAR_RESULT specialvar VAR_RESULT, TakePokemonFromDaycare diff --git a/data/maps/FuchsiaCity_Building1/scripts.inc b/data/maps/FuchsiaCity_Building1/scripts.inc index 2a07b6bb0..f4c0c1625 100644 --- a/data/maps/FuchsiaCity_Building1/scripts.inc +++ b/data/maps/FuchsiaCity_Building1/scripts.inc @@ -9,9 +9,9 @@ FuchsiaCity_Building1_EventScript_16D74C:: @ 816D74C checkflag FLAG_HIDE_SAFARI_ZONE_WEST_GOLD_TEETH goto_if TRUE, EventScript_16D780 msgbox gUnknown_8198DF9, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if eq, EventScript_16D7E8 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if eq, EventScript_16D7F1 release end @@ -25,9 +25,9 @@ EventScript_16D780:: @ 816D780 msgbox gUnknown_8198EAA call EventScript_1A6675 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if eq, EventScript_16D7D6 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if eq, EventScript_16D7DF additem ITEM_HM04, 1 giveitemfanfaremsg gUnknown_8199068, ITEM_HM04 diff --git a/data/maps/FuchsiaCity_Gym/scripts.inc b/data/maps/FuchsiaCity_Gym/scripts.inc index 8160e0fb3..21bb1e306 100644 --- a/data/maps/FuchsiaCity_Gym/scripts.inc +++ b/data/maps/FuchsiaCity_Gym/scripts.inc @@ -22,7 +22,7 @@ EventScript_16D580:: @ 816D580 EventScript_16D5A6:: @ 816D5A6 msgbox gUnknown_819850E checkitemspace ITEM_TM06, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16D5E7 additem ITEM_TM06, 1 giveitemfanfaremsg gUnknown_819858F, ITEM_TM06 diff --git a/data/maps/FuchsiaCity_House2/scripts.inc b/data/maps/FuchsiaCity_House2/scripts.inc index 4470655ff..e8116fc69 100644 --- a/data/maps/FuchsiaCity_House2/scripts.inc +++ b/data/maps/FuchsiaCity_House2/scripts.inc @@ -7,7 +7,7 @@ FuchsiaCity_House2_EventScript_16D817:: @ 816D817 checkflag FLAG_GOT_GOOD_ROD goto_if TRUE, EventScript_16D83F msgbox gUnknown_819918E, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16D849 msgbox gUnknown_8199337 release @@ -21,7 +21,7 @@ EventScript_16D83F:: @ 816D83F EventScript_16D849:: @ 816D849 msgbox gUnknown_8199207 checkitemspace ITEM_GOOD_ROD, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16D88A additem ITEM_GOOD_ROD, 1 giveitemfanfaremsg gUnknown_819925E, ITEM_GOOD_ROD diff --git a/data/maps/FuchsiaCity_House3/scripts.inc b/data/maps/FuchsiaCity_House3/scripts.inc index da4f19e60..058fc44f6 100644 --- a/data/maps/FuchsiaCity_House3/scripts.inc +++ b/data/maps/FuchsiaCity_House3/scripts.inc @@ -5,7 +5,7 @@ FuchsiaCity_House3_EventScript_16D895:: @ 816D895 lock faceplayer msgbox gUnknown_81993B9, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16D8B0 goto EventScript_16D941 end @@ -14,23 +14,23 @@ EventScript_16D8B0:: @ 816D8B0 msgbox gUnknown_8199421 special Special_ChooseMonFromParty waitstate - compare_var_to_value VAR_0x8004, 6 + compare VAR_0x8004, 6 goto_if ge, EventScript_16D941 special IsSelectedMonEgg - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16D937 special ScrSpecial_CountPokemonMoves - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16D92A msgbox gUnknown_8199445 fadescreen 1 special SelectMove fadescreen 0 - compare_var_to_value VAR_0x8005, 4 + compare VAR_0x8005, 4 goto_if eq, EventScript_16D8B0 special ScrSpecial_GetPokemonNicknameAndMoveName msgbox gUnknown_8199485, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16D919 goto EventScript_16D941 end diff --git a/data/maps/FuchsiaCity_Mart/scripts.inc b/data/maps/FuchsiaCity_Mart/scripts.inc index dea51b320..04854d419 100644 --- a/data/maps/FuchsiaCity_Mart/scripts.inc +++ b/data/maps/FuchsiaCity_Mart/scripts.inc @@ -11,7 +11,7 @@ FuchsiaCity_Mart_EventScript_16D4EA:: @ 816D4EA FuchsiaCity_Mart_EventScript_16D4F3:: @ 816D4F3 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 lock faceplayer diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc index 777e88a96..e521d70d4 100644 --- a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc +++ b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc @@ -38,7 +38,7 @@ EventScript_16D312:: @ 816D312 lockall textcolor 0 msgbox gUnknown_8197E1A, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16D345 msgbox gUnknown_8197E48 closemessage @@ -102,7 +102,7 @@ EventScript_16D391:: @ 816D391 waitmovement 0 showmoneybox 0, 0, 0 msgbox gUnknown_8197C87, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16D3CA msgbox gUnknown_8197DE9 goto EventScript_16D49A @@ -111,7 +111,7 @@ EventScript_16D391:: @ 816D391 EventScript_16D3CA:: @ 816D3CA call EventScript_16D462 checkmoney 500, 0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16D48C takemoney 500, 0 updatemoneybox 0, 0, 0 @@ -124,11 +124,11 @@ EventScript_16D3CA:: @ 816D3CA msgbox gUnknown_8197D80 closemessage hidemoneybox 0, 0 - compare_var_to_value VAR_0x4002, 0 + compare VAR_0x4002, 0 call_if eq, EventScript_16D44C - compare_var_to_value VAR_0x4002, 1 + compare VAR_0x4002, 1 call_if eq, EventScript_16D441 - compare_var_to_value VAR_0x4002, 2 + compare VAR_0x4002, 2 call_if eq, EventScript_16D457 special EnterSafariMode setvar VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 2 @@ -153,10 +153,10 @@ EventScript_16D457:: @ 816D457 EventScript_16D462:: @ 816D462 countpokemon - compare_var_to_value VAR_RESULT, 6 + compare VAR_RESULT, 6 goto_if ne, EventScript_1A77A9 specialvar VAR_RESULT, Special_IsThereRoomInAnyBoxForMorePokemon - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1A77A9 msgbox gUnknown_81BFEAC goto EventScript_16D49A @@ -200,7 +200,7 @@ FuchsiaCity_SafariZone_Entrance_EventScript_16D4B7:: @ 816D4B7 lock faceplayer msgbox gUnknown_8197EB0, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16D4D6 msgbox gUnknown_819809E release diff --git a/data/maps/IndigoPlateau_Exterior/scripts.inc b/data/maps/IndigoPlateau_Exterior/scripts.inc index 01f9f6a62..c8bd4aa30 100644 --- a/data/maps/IndigoPlateau_Exterior/scripts.inc +++ b/data/maps/IndigoPlateau_Exterior/scripts.inc @@ -5,7 +5,7 @@ IndigoPlateau_Exterior_MapScripts:: @ 816723B IndigoPlateau_Exterior_MapScript1_167246:: @ 8167246 setworldmapflag FLAG_WORLD_MAP_INDIGO_PLATEAU_EXTERIOR - compare_var_to_value VAR_MAP_SCENE_INDIGO_PLATEAU_EXTERIOR, 1 + compare VAR_MAP_SCENE_INDIGO_PLATEAU_EXTERIOR, 1 call_if eq, EventScript_IndigoPlateau_Exterior_PlayCreditsMusic end diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc b/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc index f3c9c7c3f..8d15b25fe 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc +++ b/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc @@ -6,7 +6,7 @@ IndigoPlateau_PokemonCenter_1F_MapScripts:: @ 816EA5A IndigoPlateau_PokemonCenter_1F_MapScript1_16EA65:: @ 816EA65 setrespawn SPAWN_INDIGO_PLATEAU specialvar VAR_RESULT, IsNationalPokedexEnabled - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if eq, EventScript_16EA79 end @@ -20,7 +20,7 @@ IndigoPlateau_PokemonCenter_1F_EventScript_16EA8A:: @ 816EA8A lock faceplayer specialvar VAR_RESULT, IsNationalPokedexEnabled - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16EAA6 msgbox gUnknown_819A8D8 release @@ -44,7 +44,7 @@ IndigoPlateau_PokemonCenter_1F_EventScript_16EAC3:: @ 816EAC3 IndigoPlateau_PokemonCenter_1F_EventScript_16EACC:: @ 816EACC special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 lock faceplayer diff --git a/data/maps/LavenderTown/scripts.inc b/data/maps/LavenderTown/scripts.inc index dfd6cb3d7..f290f8d14 100644 --- a/data/maps/LavenderTown/scripts.inc +++ b/data/maps/LavenderTown/scripts.inc @@ -12,7 +12,7 @@ LavenderTown_EventScript_16687D:: @ 816687D lock faceplayer msgbox gUnknown_817F52E, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16689C msgbox gUnknown_817F568 release diff --git a/data/maps/LavenderTown_House2/scripts.inc b/data/maps/LavenderTown_House2/scripts.inc index cd9e5e8d7..3b5cd8d4c 100644 --- a/data/maps/LavenderTown_House2/scripts.inc +++ b/data/maps/LavenderTown_House2/scripts.inc @@ -5,9 +5,9 @@ LavenderTown_House2_EventScript_16B266:: @ 816B266 lock faceplayer msgbox gUnknown_8193A4B, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16B287 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16B2AA end @@ -15,9 +15,9 @@ EventScript_16B287:: @ 816B287 msgbox gUnknown_8193AA6 special Special_ChooseMonFromParty waitstate - compare_var_to_value VAR_0x8004, 6 + compare VAR_0x8004, 6 goto_if lt, EventScript_16B2B4 - compare_var_to_value VAR_0x8004, 6 + compare VAR_0x8004, 6 goto_if ge, EventScript_16B2AA end @@ -28,20 +28,20 @@ EventScript_16B2AA:: @ 816B2AA EventScript_16B2B4:: @ 816B2B4 specialvar VAR_RESULT, Special_GetSpeciesOfPartySlot_x8004 - compare_var_to_value VAR_RESULT, SPECIES_EGG + compare VAR_RESULT, SPECIES_EGG goto_if eq, EventScript_16B307 special TV_CopyNicknameToStringVar1AndEnsureTerminated special TV_CheckMonOTIDEqualsPlayerID - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16B311 specialvar VAR_RESULT, Special_BufferMonOTNameAndCompareToPlayerName special TV_CopyNicknameToStringVar1AndEnsureTerminated - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16B311 msgbox gUnknown_8193AD2, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16B31B - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16B2AA end @@ -60,7 +60,7 @@ EventScript_16B31B:: @ 816B31B call EventScript_1A74EB specialvar VAR_RESULT, NameRaterWasNicknameChanged special TV_CopyNicknameToStringVar1AndEnsureTerminated - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16B345 msgbox gUnknown_8193BF0 release diff --git a/data/maps/LavenderTown_Mart/scripts.inc b/data/maps/LavenderTown_Mart/scripts.inc index 47cef8633..f5ebc9bc8 100644 --- a/data/maps/LavenderTown_Mart/scripts.inc +++ b/data/maps/LavenderTown_Mart/scripts.inc @@ -15,7 +15,7 @@ LavenderTown_Mart_EventScript_16B362:: @ 816B362 LavenderTown_Mart_EventScript_16B36B:: @ 816B36B special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 lock faceplayer diff --git a/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc b/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc index d82308203..328ba64de 100644 --- a/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc +++ b/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc @@ -8,7 +8,7 @@ LavenderTown_VolunteerPokemonHouse_EventScript_16B14A:: @ 816B14A goto_if TRUE, EventScript_16B196 msgbox gUnknown_81936FF checkitemspace ITEM_POKE_FLUTE, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16B1A0 setflag FLAG_GOT_POKE_FLUTE additem ITEM_POKE_FLUTE, 1 diff --git a/data/maps/MtEmber_Exterior/scripts.inc b/data/maps/MtEmber_Exterior/scripts.inc index 1ee18f696..b76eb8502 100644 --- a/data/maps/MtEmber_Exterior/scripts.inc +++ b/data/maps/MtEmber_Exterior/scripts.inc @@ -5,7 +5,7 @@ MtEmber_Exterior_MapScripts:: @ 8163946 MtEmber_Exterior_MapScript1_163951:: @ 8163951 setworldmapflag FLAG_WORLD_MAP_MT_EMBER_EXTERIOR - compare_var_to_value VAR_MAP_SCENE_MT_EMBER_EXTERIOR, 2 + compare VAR_MAP_SCENE_MT_EMBER_EXTERIOR, 2 call_if eq, EventScript_163960 end @@ -15,7 +15,7 @@ EventScript_163960:: @ 8163960 return MtEmber_Exterior_MapScript2_163969:: @ 8163969 - compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4 + compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4 call_if ge, EventScript_163975 end @@ -27,7 +27,7 @@ MtEmber_Exterior_EventScript_16397F:: @ 816397F lock checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_43 goto_if eq, EventScript_16399E - compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4 + compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4 goto_if eq, EventScript_1639A8 msgbox gUnknown_817A82A release @@ -65,7 +65,7 @@ MtEmber_Exterior_EventScript_1639F0:: @ 81639F0 faceplayer checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_44 goto_if eq, EventScript_163A1B - compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4 + compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4 goto_if eq, EventScript_163A25 msgbox gUnknown_817A88C closemessage diff --git a/data/maps/MtEmber_Summit/scripts.inc b/data/maps/MtEmber_Summit/scripts.inc index 3f8256837..4d4662e6e 100644 --- a/data/maps/MtEmber_Summit/scripts.inc +++ b/data/maps/MtEmber_Summit/scripts.inc @@ -10,7 +10,7 @@ MtEmber_Summit_MapScript2_163B07:: @ 8163B07 EventScript_163B11:: @ 8163B11 specialvar VAR_RESULT, Special_GetBattleOutcome - compare_var_to_value VAR_RESULT, B_OUTCOME_CAUGHT + compare VAR_RESULT, B_OUTCOME_CAUGHT goto_if ne, EventScript_1A77A9 removeobject VAR_LAST_TALKED return @@ -26,7 +26,7 @@ EventScript_163B2F:: @ 8163B2F MtEmber_Summit_EventScript_163B33:: @ 8163B33 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 special sub_8112364 lock @@ -45,11 +45,11 @@ MtEmber_Summit_EventScript_163B33:: @ 8163B33 waitstate clearflag FLAG_SYS_SPECIAL_WILD_BATTLE specialvar VAR_RESULT, Special_GetBattleOutcome - compare_var_to_value VAR_RESULT, B_OUTCOME_WON + compare VAR_RESULT, B_OUTCOME_WON goto_if eq, EventScript_163B96 - compare_var_to_value VAR_RESULT, B_OUTCOME_RAN + compare VAR_RESULT, B_OUTCOME_RAN goto_if eq, EventScript_163B9F - compare_var_to_value VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED + compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED goto_if eq, EventScript_163B9F setflag FLAG_FOUGHT_MOLTRES release diff --git a/data/maps/MtMoon_B2F/scripts.inc b/data/maps/MtMoon_B2F/scripts.inc index 5c26a3ad1..f0e2ff9f8 100644 --- a/data/maps/MtMoon_B2F/scripts.inc +++ b/data/maps/MtMoon_B2F/scripts.inc @@ -57,7 +57,7 @@ MtMoon_B2F_EventScript_16071B:: @ 816071B lock faceplayer msgbox gUnknown_8172E77, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1607DE removeobject 1 additem ITEM_DOME_FOSSIL, 1 @@ -90,7 +90,7 @@ MtMoon_B2F_EventScript_16077F:: @ 816077F lock faceplayer msgbox gUnknown_8172E94, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1607DE removeobject 2 additem ITEM_HELIX_FOSSIL, 1 diff --git a/data/maps/NavelRock_Base/scripts.inc b/data/maps/NavelRock_Base/scripts.inc index 20cff0f8f..dfe55b6b2 100644 --- a/data/maps/NavelRock_Base/scripts.inc +++ b/data/maps/NavelRock_Base/scripts.inc @@ -27,14 +27,14 @@ NavelRock_Base_MapScript2_165116:: @ 8165116 EventScript_165120:: @ 8165120 specialvar VAR_RESULT, Special_GetBattleOutcome - compare_var_to_value VAR_RESULT, B_OUTCOME_CAUGHT + compare VAR_RESULT, B_OUTCOME_CAUGHT goto_if ne, EventScript_1A77A9 removeobject 1 return NavelRock_Base_EventScript_165134:: @ 8165134 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 special sub_8112364 lock @@ -69,11 +69,11 @@ NavelRock_Base_EventScript_165134:: @ 8165134 waitstate clearflag FLAG_SYS_SPECIAL_WILD_BATTLE specialvar VAR_RESULT, Special_GetBattleOutcome - compare_var_to_value VAR_RESULT, B_OUTCOME_WON + compare VAR_RESULT, B_OUTCOME_WON goto_if eq, EventScript_1651D9 - compare_var_to_value VAR_RESULT, B_OUTCOME_RAN + compare VAR_RESULT, B_OUTCOME_RAN goto_if eq, EventScript_1651E7 - compare_var_to_value VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED + compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED goto_if eq, EventScript_1651E7 setflag FLAG_FOUGHT_LUGIA release diff --git a/data/maps/NavelRock_Exterior/scripts.inc b/data/maps/NavelRock_Exterior/scripts.inc index 26ef2885c..20e7fdcbe 100644 --- a/data/maps/NavelRock_Exterior/scripts.inc +++ b/data/maps/NavelRock_Exterior/scripts.inc @@ -1,7 +1,7 @@ NavelRock_Exterior_MapScripts:: @ 81646AE - map_script 3, NavelRock_Exterior_MapScript1_1646B4 + map_script MAP_SCRIPT_ON_TRANSITION, NavelRock_Exterior_OnTransition .byte 0 -NavelRock_Exterior_MapScript1_1646B4:: @ 81646B4 +NavelRock_Exterior_OnTransition:: @ 81646B4 setworldmapflag FLAG_WORLD_MAP_NAVEL_ROCK_EXTERIOR end diff --git a/data/maps/NavelRock_Summit/scripts.inc b/data/maps/NavelRock_Summit/scripts.inc index 563ef520f..050f05518 100644 --- a/data/maps/NavelRock_Summit/scripts.inc +++ b/data/maps/NavelRock_Summit/scripts.inc @@ -30,14 +30,14 @@ NavelRock_Summit_MapScript2_164FDD:: @ 8164FDD EventScript_164FE7:: @ 8164FE7 specialvar VAR_RESULT, Special_GetBattleOutcome - compare_var_to_value VAR_RESULT, B_OUTCOME_CAUGHT + compare VAR_RESULT, B_OUTCOME_CAUGHT goto_if ne, EventScript_1A77A9 removeobject 1 return NavelRock_Summit_EventScript_164FFB:: @ 8164FFB special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 special sub_8112364 lockall @@ -74,11 +74,11 @@ NavelRock_Summit_EventScript_164FFB:: @ 8164FFB clearflag FLAG_SYS_SPECIAL_WILD_BATTLE setvar VAR_LAST_TALKED, 1 specialvar VAR_RESULT, Special_GetBattleOutcome - compare_var_to_value VAR_RESULT, B_OUTCOME_WON + compare VAR_RESULT, B_OUTCOME_WON goto_if eq, EventScript_1650B4 - compare_var_to_value VAR_RESULT, B_OUTCOME_RAN + compare VAR_RESULT, B_OUTCOME_RAN goto_if eq, EventScript_1650C2 - compare_var_to_value VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED + compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED goto_if eq, EventScript_1650C2 setflag FLAG_FOUGHT_HO_OH releaseall diff --git a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc index a1d5b25a7..778f63fed 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc @@ -6,7 +6,7 @@ OneIsland_PokemonCenter_1F_MapScripts:: @ 8170BF8 .byte 0 OneIsland_PokemonCenter_1F_MapScript3_170C0D:: @ 8170C0D - compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 + compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 call_if ge, EventScript_170C22 checkflag FLAG_SYS_CAN_LINK_WITH_RS call_if TRUE, EventScript_170C36 @@ -28,11 +28,11 @@ EventScript_170C36:: @ 8170C36 OneIsland_PokemonCenter_1F_MapScript1_170C4E:: @ 8170C4E setrespawn SPAWN_ONE_ISLAND - compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 6 + compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 6 call_if eq, EventScript_170C73 - compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 0 + compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 0 call_if eq, EventScript_170C79 - compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 2 + compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 2 call_if eq, EventScript_170C90 end @@ -112,9 +112,9 @@ EventScript_170CB1:: @ 8170CB1 additem ITEM_TRI_PASS, 1 giveitemfanfaremsg gUnknown_81A231B, ITEM_TRI_PASS, 1, MUS_FAN5 msgbox gUnknown_81A1150 - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 + compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 call_if ge, EventScript_170E46 - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 + compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 call_if lt, EventScript_170E58 setflag FLAG_SYS_SEVII_MAP_123 msgbox gUnknown_81A1230 @@ -208,22 +208,22 @@ EventScript_170EB1:: @ 8170EB1 OneIsland_PokemonCenter_1F_EventScript_170EC5:: @ 8170EC5 lock faceplayer - compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 7 + compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 7 goto_if eq, EventScript_170F35 - compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 6 + compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 6 goto_if eq, EventScript_170F9B checkflag FLAG_RECOVERED_SAPPHIRE goto_if TRUE, EventScript_170FA5 - compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 + compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 goto_if eq, EventScript_17103A checkflag FLAG_GOT_RUBY goto_if TRUE, EventScript_171044 - compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4 + compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4 goto_if eq, EventScript_1710F2 specialvar VAR_RESULT, IsNationalPokedexEnabled - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1710FC - compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 3 + compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 3 goto_if eq, EventScript_171134 msgbox gUnknown_81A1321 closemessage @@ -235,9 +235,9 @@ OneIsland_PokemonCenter_1F_EventScript_170EC5:: @ 8170EC5 EventScript_170F35:: @ 8170F35 msgbox gUnknown_81A1EBD random 3 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_170F6D - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_170F84 famechecker FAMECHECKER_BILL, 5 msgbox gUnknown_81A2076 @@ -324,14 +324,14 @@ EventScript_171044:: @ 8171044 applymovement 3, Movement_1A75E1 waitmovement 0 msgbox gUnknown_81A19AA, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_171099 goto EventScript_1710B2 end EventScript_171099:: @ 8171099 msgbox gUnknown_81A1A08, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_171099 goto EventScript_1710B2 end @@ -466,13 +466,13 @@ EventScript_1711DA:: @ 81711DA waitmovement 0 msgbox gUnknown_81A13B8 closemessage - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if eq, EventScript_1712E4 - compare_var_to_value VAR_0x4001, 2 + compare VAR_0x4001, 2 call_if eq, EventScript_1712EF - compare_var_to_value VAR_0x4001, 3 + compare VAR_0x4001, 3 call_if eq, EventScript_1712FA - compare_var_to_value VAR_0x4001, 4 + compare VAR_0x4001, 4 call_if eq, EventScript_171305 delay 10 msgbox gUnknown_81A13CB diff --git a/data/maps/PalletTown/scripts.inc b/data/maps/PalletTown/scripts.inc index d4e6c0cf3..852c6425f 100644 --- a/data/maps/PalletTown/scripts.inc +++ b/data/maps/PalletTown/scripts.inc @@ -7,16 +7,16 @@ PalletTown_MapScript1_165465:: @ 8165465 setworldmapflag FLAG_WORLD_MAP_PALLET_TOWN checkflag FLAG_PALLET_LADY_NOT_BLOCKING_SIGN call_if TRUE, EventScript_165488 - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 0 + compare VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 0 call_if eq, EventScript_1654A8 - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1 + compare VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1 call_if eq, EventScript_1654A2 end EventScript_165488:: @ 8165488 checkflag FLAG_PALLET_TOWN_LADY_MOVED_FROM_SIGN goto_if FALSE, EventScript_1A77A9 - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1 + compare VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1 goto_if ge, EventScript_1A77A9 setvar VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1 return @@ -59,7 +59,7 @@ EventScript_1654D8:: @ 81654D8 copyvar VAR_0x8009, VAR_0x8006 getnumberstring 0, VAR_0x8008 getnumberstring 1, VAR_0x8009 - compare_var_to_value VAR_0x8009, 60 + compare VAR_0x8009, 60 goto_if lt, EventScript_165593 msgbox gUnknown_817D9AA closemessage @@ -199,17 +199,17 @@ EventScript_165605:: @ 8165605 waitmovement 0 delay 30 addobject 3 - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 call_if eq, EventScript_1656B8 - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if eq, EventScript_1656C3 delay 30 msgbox gUnknown_817D74A closemessage delay 30 - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 call_if eq, EventScript_1656CE - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if eq, EventScript_1656E0 opendoor 16, 13 waitdooranim @@ -374,11 +374,11 @@ Movement_165758:: @ 8165758 PalletTown_EventScript_16575C:: @ 816575C lock - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 2 + compare VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 2 goto_if eq, EventScript_1657ED - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1 + compare VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1 goto_if eq, EventScript_165815 - compare_var_to_value VAR_0x4002, 1 + compare VAR_0x4002, 1 goto_if eq, EventScript_1658C2 checkflag FLAG_TEMP_2 goto_if TRUE, EventScript_165801 @@ -392,9 +392,9 @@ PalletTown_EventScript_16575C:: @ 816575C waitmovement 0 msgbox gUnknown_81B1C9F closemessage - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if eq, EventScript_1657D7 - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if ne, EventScript_1657E2 moveobjectoffscreen 1 setflag FLAG_TEMP_2 diff --git a/data/maps/PalletTown_GarysHouse/scripts.inc b/data/maps/PalletTown_GarysHouse/scripts.inc index 42c7d44ad..eb1b0d890 100644 --- a/data/maps/PalletTown_GarysHouse/scripts.inc +++ b/data/maps/PalletTown_GarysHouse/scripts.inc @@ -3,9 +3,9 @@ PalletTown_GarysHouse_MapScripts:: @ 8168D27 .byte 0 PalletTown_GarysHouse_MapScript1_168D2D:: @ 8168D2D - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 + compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 call_if lt, EventScript_168D44 - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 + compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 call_if ge, EventScript_168D50 end @@ -24,13 +24,13 @@ PalletTown_GarysHouse_EventScript_168D56:: @ 8168D56 famechecker FAMECHECKER_DAISY, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 checkflag FLAG_SYS_GAME_CLEAR goto_if TRUE, EventScript_168DB9 - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 goto_if eq, EventScript_168EEC - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 + compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 goto_if eq, EventScript_168F59 - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 1 + compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 1 goto_if eq, EventScript_168EF6 - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1 + compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1 goto_if ge, EventScript_168DAF msgbox gUnknown_818D58C closemessage @@ -46,23 +46,23 @@ EventScript_168DAF:: @ 8168DAF EventScript_168DB9:: @ 8168DB9 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 special sub_8112364 - compare_var_to_value VAR_MASSAGE_COOLDOWN_STEP_COUNTER, 500 + compare VAR_MASSAGE_COOLDOWN_STEP_COUNTER, 500 goto_if lt, EventScript_168E46 msgbox gUnknown_818D7D3, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_168E3C msgbox gUnknown_818D8B2 special Special_ChooseMonFromParty waitstate lock faceplayer - compare_var_to_value VAR_0x8004, 6 + compare VAR_0x8004, 6 goto_if ge, EventScript_168E3C specialvar VAR_RESULT, Special_GetSpeciesOfPartySlot_x8004 - compare_var_to_value VAR_RESULT, SPECIES_EGG + compare VAR_RESULT, SPECIES_EGG goto_if eq, EventScript_168E32 msgbox gUnknown_818D8CC closemessage @@ -143,7 +143,7 @@ EventScript_168EF6:: @ 8168EF6 msgbox gUnknown_818D60A closemessage checkitemspace ITEM_TOWN_MAP, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_168F4F applymovement 1, Movement_1A75EB waitmovement 0 diff --git a/data/maps/PalletTown_PlayersHouse_1F/scripts.inc b/data/maps/PalletTown_PlayersHouse_1F/scripts.inc index 900dd06aa..0ea8cf4c6 100644 --- a/data/maps/PalletTown_PlayersHouse_1F/scripts.inc +++ b/data/maps/PalletTown_PlayersHouse_1F/scripts.inc @@ -7,9 +7,9 @@ PalletTown_PlayersHouse_1F_EventScript_168C09:: @ 8168C09 checkflag FLAG_BEAT_RIVAL_IN_OAKS_LAB goto_if TRUE, EventScript_168C4A checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if eq, EventScript_168C38 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if eq, EventScript_168C41 closemessage applymovement 1, Movement_1A75E5 @@ -35,7 +35,7 @@ EventScript_168C4A:: @ 8168C4A PalletTown_PlayersHouse_1F_EventScript_168C62:: @ 8168C62 lockall - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 goto_if eq, EventScript_168C78 msgbox gUnknown_818D4F9 releaseall @@ -43,9 +43,9 @@ PalletTown_PlayersHouse_1F_EventScript_168C62:: @ 8168C62 EventScript_168C78:: @ 8168C78 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if eq, EventScript_168C91 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if eq, EventScript_168C9A releaseall end diff --git a/data/maps/PalletTown_PlayersHouse_2F/scripts.inc b/data/maps/PalletTown_PlayersHouse_2F/scripts.inc index dc90bc7bf..9a61ce24c 100644 --- a/data/maps/PalletTown_PlayersHouse_2F/scripts.inc +++ b/data/maps/PalletTown_PlayersHouse_2F/scripts.inc @@ -4,7 +4,7 @@ PalletTown_PlayersHouse_2F_MapScripts:: @ 8168CA3 .byte 0 PalletTown_PlayersHouse_2F_MapScript1_168CAE:: @ 8168CAE - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PLAYERS_HOUSE_2F, 0 + compare VAR_MAP_SCENE_PALLET_TOWN_PLAYERS_HOUSE_2F, 0 call_if eq, EventScript_168CBA end @@ -32,7 +32,7 @@ PalletTown_PlayersHouse_2F_EventScript_168CDB:: @ 8168CDB gUnknown_8168CE4:: @ 8168CE4 PalletTown_PlayersHouse_2F_EventScript_168CE4:: @ 8168CE4 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 lockall setvar VAR_0x8004, 32 diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc index 850182c08..cd94b5929 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc +++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc @@ -6,11 +6,11 @@ PalletTown_ProfessorOaksLab_MapScripts:: @ 8168F7E PalletTown_ProfessorOaksLab_MapScript1_168F8E:: @ 8168F8E setflag FLAG_VISITED_OAKS_LAB - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1 + compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1 call_if eq, EventScript_168FC6 - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 7 + compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 7 call_if eq, EventScript_168FD5 - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 8 + compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 8 call_if eq, EventScript_168FC0 checkflag FLAG_GOT_POKEBALLS_FROM_OAK_AFTER_22_RIVAL call_if TRUE, EventScript_168FBC @@ -66,32 +66,32 @@ EventScript_169002:: @ 8169002 EventScript_169035:: @ 8169035 msgbox gUnknown_818EE60 closemessage - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if eq, EventScript_169174 - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 call_if eq, EventScript_1691BB - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if eq, EventScript_169194 - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if eq, EventScript_169194 msgbox gUnknown_818EF59 fadedefaultbgm msgbox gUnknown_818F004 - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if eq, EventScript_1691DB - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if eq, EventScript_1691E6 textcolor 3 msgbox gUnknown_818F062 closemessage call EventScript_1A6675 - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if eq, EventScript_1691F1 - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 call_if eq, EventScript_1691FC - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if eq, EventScript_169215 - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if eq, EventScript_169227 addobject 9 addobject 10 @@ -101,13 +101,13 @@ EventScript_169035:: @ 8169035 removeobject 9 removeobject 10 delay 30 - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if eq, EventScript_169845 - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 call_if eq, EventScript_169850 - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if eq, EventScript_16985B - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if eq, EventScript_16986D textcolor 3 playfanfare MUS_FAN5 @@ -120,13 +120,13 @@ EventScript_169035:: @ 8169035 msgbox gUnknown_818F1DB closemessage playbgm MUS_RIVAL2, 0 - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if eq, EventScript_169B69 - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 call_if eq, EventScript_169B7B - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if eq, EventScript_169B7B - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if eq, EventScript_169B7B removeobject 8 fadedefaultbgm @@ -311,20 +311,20 @@ EventScript_16930B:: @ 816930B closemessage applymovement 4, Movement_1A75F1 waitmovement 0 - compare_var_to_value VAR_STARTER_MON, 0 + compare VAR_STARTER_MON, 0 goto_if eq, EventScript_1693D2 - compare_var_to_value VAR_STARTER_MON, 1 + compare VAR_STARTER_MON, 1 goto_if eq, EventScript_16944D - compare_var_to_value VAR_STARTER_MON, 2 + compare VAR_STARTER_MON, 2 goto_if eq, EventScript_16935A end EventScript_16935A:: @ 816935A - compare_var_to_value VAR_0x4002, 1 + compare VAR_0x4002, 1 goto_if eq, EventScript_16937C - compare_var_to_value VAR_0x4002, 2 + compare VAR_0x4002, 2 goto_if eq, EventScript_16938C - compare_var_to_value VAR_0x4002, 3 + compare VAR_0x4002, 3 goto_if eq, EventScript_16939C end @@ -376,11 +376,11 @@ Movement_1693CD:: @ 81693CD step_end EventScript_1693D2:: @ 81693D2 - compare_var_to_value VAR_0x4002, 1 + compare VAR_0x4002, 1 goto_if eq, EventScript_1693F4 - compare_var_to_value VAR_0x4002, 2 + compare VAR_0x4002, 2 goto_if eq, EventScript_169404 - compare_var_to_value VAR_0x4002, 3 + compare VAR_0x4002, 3 goto_if eq, EventScript_169414 end @@ -435,11 +435,11 @@ Movement_169447:: @ 8169447 step_end EventScript_16944D:: @ 816944D - compare_var_to_value VAR_0x4002, 1 + compare VAR_0x4002, 1 goto_if eq, EventScript_16946F - compare_var_to_value VAR_0x4002, 2 + compare VAR_0x4002, 2 goto_if eq, EventScript_16947F - compare_var_to_value VAR_0x4002, 3 + compare VAR_0x4002, 3 goto_if eq, EventScript_16948F end @@ -492,11 +492,11 @@ EventScript_1694C2:: @ 81694C2 msgbox gUnknown_818DE38 closemessage playbgm MUS_RIVAL2, 0 - compare_var_to_value VAR_0x4002, 1 + compare VAR_0x4002, 1 call_if eq, EventScript_169504 - compare_var_to_value VAR_0x4002, 2 + compare VAR_0x4002, 2 call_if eq, EventScript_169516 - compare_var_to_value VAR_0x4002, 3 + compare VAR_0x4002, 3 call_if eq, EventScript_169528 removeobject 8 playse SE_KAIDAN @@ -574,9 +574,9 @@ Movement_169559:: @ 8169559 PalletTown_ProfessorOaksLab_EventScript_16955F:: @ 816955F lock faceplayer - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 + compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 goto_if eq, EventScript_16958B - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2 + compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2 goto_if eq, EventScript_169581 msgbox gUnknown_818DC67 release @@ -597,21 +597,21 @@ PalletTown_ProfessorOaksLab_EventScript_169595:: @ 8169595 faceplayer checkflag FLAG_TEMP_2 goto_if TRUE, EventScript_169600 - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 9 + compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 9 goto_if eq, EventScript_169903 - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 8 + compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 8 goto_if eq, EventScript_169A6E checkflag FLAG_SYS_GAME_CLEAR goto_if TRUE, EventScript_1699CE - compare_var_to_value VAR_MAP_SCENE_CERULEAN_CITY_RIVAL, 1 + compare VAR_MAP_SCENE_CERULEAN_CITY_RIVAL, 1 goto_if eq, EventScript_169903 - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 6 + compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 6 goto_if eq, EventScript_1698D6 - compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 1 + compare VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 1 goto_if ge, EventScript_16961E - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 4 + compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 4 goto_if eq, EventScript_169614 - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 + compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 goto_if eq, EventScript_16960A msgbox gUnknown_818E116 release @@ -645,13 +645,13 @@ EventScript_16961E:: @ 816961E playbgm MUS_RIVAL1, 0 msgbox gUnknown_818DE8D closemessage - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if eq, EventScript_169A82 - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 call_if eq, EventScript_169AC1 - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if eq, EventScript_169A9E - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if eq, EventScript_169A9E fadedefaultbgm msgbox gUnknown_818DE99 @@ -662,23 +662,23 @@ EventScript_16961E:: @ 816961E waitmovement 0 applymovement 4, Movement_1A75DD waitmovement 0 - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 call_if eq, EventScript_169ADD - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if eq, EventScript_169B14 - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if eq, EventScript_169AF5 - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if eq, EventScript_169B86 msgbox gUnknown_818E508 closemessage - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if eq, EventScript_169882 - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 call_if eq, EventScript_16988D - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if eq, EventScript_1698A6 - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if eq, EventScript_1698B8 msgbox gUnknown_818E536 closemessage @@ -691,13 +691,13 @@ EventScript_16961E:: @ 816961E delay 10 removeobject 10 delay 25 - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if eq, EventScript_169845 - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 call_if eq, EventScript_169850 - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if eq, EventScript_16985B - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if eq, EventScript_16986D delay 10 textcolor 3 @@ -716,24 +716,24 @@ EventScript_16961E:: @ 816961E famechecker FAMECHECKER_OAK, 1 msgbox gUnknown_818E784 msgbox gUnknown_818DEC8 - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if eq, EventScript_169B33 - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 call_if eq, EventScript_169B45 - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if eq, EventScript_169B57 - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if eq, EventScript_169B57 msgbox gUnknown_818DEF3 closemessage playbgm MUS_RIVAL2, 0 - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if eq, EventScript_169B69 - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 call_if eq, EventScript_169B7B - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if eq, EventScript_169B7B - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if eq, EventScript_169B7B removeobject 8 fadedefaultbgm @@ -839,7 +839,7 @@ EventScript_1698D6:: @ 81698D6 copyvar VAR_0x8009, VAR_0x8006 getnumberstring 0, VAR_0x8008 getnumberstring 1, VAR_0x8009 - compare_var_to_value VAR_0x8009, 1 + compare VAR_0x8009, 1 goto_if eq, EventScript_1699FB goto EventScript_169903 end @@ -856,13 +856,13 @@ EventScript_169913:: @ 8169913 delay 40 message Text_1A7291 waitmessage - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if eq, EventScript_169964 - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 call_if eq, EventScript_16996F - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if eq, EventScript_16997A - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if eq, EventScript_169985 applymovement 4, Movement_1A75E1 waitmovement 0 @@ -970,7 +970,7 @@ Movement_1699C5: EventScript_1699CE:: @ 81699CE call EventScript_1A737B closemessage - compare_var_to_value VAR_0x8009, 60 + compare VAR_0x8009, 60 goto_if lt, EventScript_1699F9 checkflag FLAG_WORLD_MAP_ONE_ISLAND goto_if FALSE, EventScript_1699F9 @@ -985,7 +985,7 @@ EventScript_1699F9:: @ 81699F9 EventScript_1699FB:: @ 81699FB special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 special sub_8112364 checkflag FLAG_OAK_SKIP_22_RIVAL_CHECK @@ -993,13 +993,13 @@ EventScript_1699FB:: @ 81699FB checkflag FLAG_GOT_POKEBALLS_FROM_OAK_AFTER_22_RIVAL goto_if TRUE, EventScript_169A78 checkitem ITEM_POKE_BALL, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_169A34 goto EventScript_169A6E end EventScript_169A34:: @ 8169A34 - compare_var_to_value VAR_MAP_SCENE_ROUTE22, 2 + compare VAR_MAP_SCENE_ROUTE22, 2 goto_if ge, EventScript_169A45 goto EventScript_169A6E end @@ -1153,9 +1153,9 @@ PalletTown_ProfessorOaksLab_EventScript_169BAB:: @ 8169BAB setvar VAR_OAKSLAB_PLAYER_STARTER_SPECIES, SPECIES_BULBASAUR setvar VAR_OAKSLAB_RIVAL_STARTER_SPECIES, SPECIES_CHARMANDER setvar VAR_OAKSLAB_RIVAL_STARTER_OBJID, 7 - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 + compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 goto_if ge, EventScript_169DE4 - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2 + compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2 goto_if eq, EventScript_169BE1 msgbox gUnknown_818EA19 release @@ -1166,35 +1166,35 @@ EventScript_169BE1:: @ 8169BE1 waitmovement 0 drawmonpic VAR_OAKSLAB_PLAYER_STARTER_SPECIES, 10, 3 textcolor 0 - compare_var_to_value VAR_OAKSLAB_PLAYER_STARTER_NO, 0 + compare VAR_OAKSLAB_PLAYER_STARTER_NO, 0 goto_if eq, EventScript_OakDescribesBulbasaur - compare_var_to_value VAR_OAKSLAB_PLAYER_STARTER_NO, 1 + compare VAR_OAKSLAB_PLAYER_STARTER_NO, 1 goto_if eq, EventScript_OakDescribesCharmander - compare_var_to_value VAR_OAKSLAB_PLAYER_STARTER_NO, 2 + compare VAR_OAKSLAB_PLAYER_STARTER_NO, 2 goto_if eq, EventScript_OakDescribesSquirtle end EventScript_OakDescribesBulbasaur:: @ 8169C14 msgbox gUnknown_818E272, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_ThisPokeIsRealyEnergetic - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_DeclinedStarter end EventScript_OakDescribesCharmander:: @ 8169C33 msgbox gUnknown_818E207, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_ThisPokeIsRealyEnergetic - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_DeclinedStarter end EventScript_OakDescribesSquirtle:: @ 8169C52 msgbox gUnknown_818E194, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_ThisPokeIsRealyEnergetic - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_DeclinedStarter end @@ -1218,9 +1218,9 @@ EventScript_ThisPokeIsRealyEnergetic:: @ 8169C74 playfanfare MUS_FAN5 waitfanfare msgbox gUnknown_81A56A7, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_GiveNicknameToStarter - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_SkipGiveNicknameToStarter end @@ -1232,11 +1232,11 @@ EventScript_GiveNicknameToStarter:: @ 8169CCC EventScript_SkipGiveNicknameToStarter:: @ 8169CDC closemessage - compare_var_to_value VAR_OAKSLAB_PLAYER_STARTER_NO, 0 + compare VAR_OAKSLAB_PLAYER_STARTER_NO, 0 goto_if eq, EventScript_RivalWalksToCharmander - compare_var_to_value VAR_OAKSLAB_PLAYER_STARTER_NO, 1 + compare VAR_OAKSLAB_PLAYER_STARTER_NO, 1 goto_if eq, EventScript_RivalWalksToSquirtle - compare_var_to_value VAR_OAKSLAB_PLAYER_STARTER_NO, 2 + compare VAR_OAKSLAB_PLAYER_STARTER_NO, 2 goto_if eq, EventScript_RivalWalksToBulbasaur end @@ -1313,9 +1313,9 @@ PalletTown_ProfessorOaksLab_EventScript_169D78:: @ 8169D78 setvar VAR_OAKSLAB_PLAYER_STARTER_SPECIES, SPECIES_SQUIRTLE setvar VAR_OAKSLAB_RIVAL_STARTER_SPECIES, SPECIES_BULBASAUR setvar VAR_OAKSLAB_RIVAL_STARTER_OBJID, 5 - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 + compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 goto_if ge, EventScript_169DE4 - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2 + compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2 goto_if eq, EventScript_169BE1 msgbox gUnknown_818EA19 release @@ -1328,9 +1328,9 @@ PalletTown_ProfessorOaksLab_EventScript_169DAE:: @ 8169DAE setvar VAR_OAKSLAB_PLAYER_STARTER_SPECIES, SPECIES_CHARMANDER setvar VAR_OAKSLAB_RIVAL_STARTER_SPECIES, SPECIES_SQUIRTLE setvar VAR_OAKSLAB_RIVAL_STARTER_OBJID, 6 - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 + compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 goto_if ge, EventScript_169DE4 - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2 + compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2 goto_if eq, EventScript_169BE1 msgbox gUnknown_818EA19 release @@ -1393,7 +1393,7 @@ PalletTown_ProfessorOaksLab_EventScript_169E71:: @ 8169E71 PalletTown_ProfessorOaksLab_EventScript_169E7A:: @ 8169E7A lockall - compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 6 + compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 6 goto_if ge, EventScript_169E90 msgbox gUnknown_818EA84 releaseall diff --git a/data/maps/PewterCity/scripts.inc b/data/maps/PewterCity/scripts.inc index 352da6d31..8328a8f04 100644 --- a/data/maps/PewterCity/scripts.inc +++ b/data/maps/PewterCity/scripts.inc @@ -13,7 +13,7 @@ PewterCity_EventScript_165B9D:: @ 8165B9D msgbox gUnknown_817E67E closemessage playbgm MUS_ANNAI, 0 - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if eq, EventScript_165BD3 msgbox gUnknown_817E6C7 closemessage @@ -445,11 +445,11 @@ EventScript_165DBE:: @ 8165DBE msgbox gUnknown_817E67E closemessage playbgm MUS_ANNAI, 0 - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 call_if eq, EventScript_165E0A - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if eq, EventScript_165E26 - compare_var_to_value VAR_0x4001, 2 + compare VAR_0x4001, 2 call_if eq, EventScript_165E42 msgbox gUnknown_817E6C7 closemessage @@ -1032,19 +1032,19 @@ PewterCity_EventScript_16607E:: @ 816607E lock faceplayer msgbox gUnknown_817E53E, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_166136 msgbox gUnknown_817E589 closemessage delay 10 playbgm MUS_ANNAI, 0 - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if eq, EventScript_1660EE - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 call_if eq, EventScript_166100 - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if eq, EventScript_166112 - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if eq, EventScript_166124 msgbox gUnknown_817E5AC closemessage @@ -1351,7 +1351,7 @@ PewterCity_EventScript_166244:: @ 8166244 lock faceplayer msgbox gUnknown_817E602, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_166263 msgbox gUnknown_817E644 release @@ -1416,11 +1416,11 @@ PewterCity_EventScript_1662D1:: @ 81662D1 EventScript_1662DE:: @ 81662DE textcolor 0 - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if eq, EventScript_1663CA - compare_var_to_value VAR_0x4001, 2 + compare VAR_0x4001, 2 call_if eq, EventScript_1663CA - compare_var_to_value VAR_0x4001, 3 + compare VAR_0x4001, 3 call_if eq, EventScript_1663CA waitse playse SE_PIN @@ -1429,13 +1429,13 @@ EventScript_1662DE:: @ 81662DE applymovement 7, Movement_1A75DD waitmovement 0 msgbox gUnknown_817E902 - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 call_if eq, EventScript_1663D5 - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if eq, EventScript_1663DA - compare_var_to_value VAR_0x4001, 2 + compare VAR_0x4001, 2 call_if eq, EventScript_1663E6 - compare_var_to_value VAR_0x4001, 3 + compare VAR_0x4001, 3 call_if eq, EventScript_1663FC msgbox gUnknown_817E90C textcolor 3 @@ -1451,13 +1451,13 @@ EventScript_1662DE:: @ 81662DE call EventScript_1A6675 msgbox gUnknown_817EA06 closemessage - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 call_if eq, EventScript_166412 - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if eq, EventScript_16641D - compare_var_to_value VAR_0x4001, 2 + compare VAR_0x4001, 2 call_if eq, EventScript_166428 - compare_var_to_value VAR_0x4001, 3 + compare VAR_0x4001, 3 call_if eq, EventScript_166433 delay 30 textcolor 3 diff --git a/data/maps/PewterCity_Gym/scripts.inc b/data/maps/PewterCity_Gym/scripts.inc index 39a6be51b..906a53650 100644 --- a/data/maps/PewterCity_Gym/scripts.inc +++ b/data/maps/PewterCity_Gym/scripts.inc @@ -24,7 +24,7 @@ EventScript_16A5C5:: @ 816A5C5 EventScript_16A5F3:: @ 816A5F3 msgbox gUnknown_8190FC1 checkitemspace ITEM_TM39, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16A634 additem ITEM_TM39, 1 giveitemfanfaremsg gUnknown_8190FDB, ITEM_TM39 @@ -49,9 +49,9 @@ PewterCity_Gym_EventScript_16A655:: @ 816A655 checkflag FLAG_DEFEATED_BROCK goto_if TRUE, EventScript_16A67F msgbox gUnknown_8191298, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16A689 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16A697 end diff --git a/data/maps/PewterCity_Mart/scripts.inc b/data/maps/PewterCity_Mart/scripts.inc index e45959442..adbde2b4c 100644 --- a/data/maps/PewterCity_Mart/scripts.inc +++ b/data/maps/PewterCity_Mart/scripts.inc @@ -11,7 +11,7 @@ PewterCity_Mart_EventScript_16A6D7:: @ 816A6D7 PewterCity_Mart_EventScript_16A6E0:: @ 816A6E0 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 lock faceplayer diff --git a/data/maps/PewterCity_Museum_1F/scripts.inc b/data/maps/PewterCity_Museum_1F/scripts.inc index 7e4973a15..bdf57e5c0 100644 --- a/data/maps/PewterCity_Museum_1F/scripts.inc +++ b/data/maps/PewterCity_Museum_1F/scripts.inc @@ -4,11 +4,11 @@ PewterCity_Museum_1F_MapScripts:: @ 816A31A PewterCity_Museum_1F_EventScript_16A31B:: @ 816A31B lock faceplayer - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 goto_if eq, EventScript_16A348 - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 goto_if eq, EventScript_16A348 - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 goto_if eq, EventScript_16A348 msgbox gUnknown_8190539 release @@ -16,9 +16,9 @@ PewterCity_Museum_1F_EventScript_16A31B:: @ 816A31B EventScript_16A348:: @ 816A348 msgbox gUnknown_8190550, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16A367 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16A37B end @@ -64,7 +64,7 @@ EventScript_16A3D1:: @ 816A3D1 textcolor 0 showmoneybox 0, 0, 0 msgbox gUnknown_81904B5, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16A402 msgbox gUnknown_81904F9 closemessage @@ -76,14 +76,14 @@ EventScript_16A3D1:: @ 816A3D1 EventScript_16A402:: @ 816A402 checkmoney 50, 0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16A476 closemessage - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 call_if eq, EventScript_16A455 - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if eq, EventScript_16A460 - compare_var_to_value VAR_0x4001, 2 + compare VAR_0x4001, 2 call_if eq, EventScript_16A46B playse SE_SHOP takemoney 50, 0 @@ -156,7 +156,7 @@ PewterCity_Museum_1F_EventScript_16A4AE:: @ 816A4AE goto_if TRUE, EventScript_16A4FF msgbox gUnknown_8190717 checkitemspace ITEM_OLD_AMBER, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16A4F5 setflag FLAG_GOT_OLD_AMBER removeobject 4 diff --git a/data/maps/PokemonLeague_AgathasRoom/scripts.inc b/data/maps/PokemonLeague_AgathasRoom/scripts.inc index 260a2acff..e04da7f80 100644 --- a/data/maps/PokemonLeague_AgathasRoom/scripts.inc +++ b/data/maps/PokemonLeague_AgathasRoom/scripts.inc @@ -13,7 +13,7 @@ PokemonLeague_AgathasRoom_MapScript1_162825:: @ 8162825 PokemonLeague_AgathasRoom_MapScript2_162830:: @ 8162830 checkflag FLAG_DEFEATED_AGATHA call_if TRUE, EventScript_16284B - compare_var_to_value VAR_MAP_SCENE_POKEMON_LEAGUE, 3 + compare VAR_MAP_SCENE_POKEMON_LEAGUE, 3 call_if eq, EventScript_162845 end diff --git a/data/maps/PokemonLeague_BrunosRoom/scripts.inc b/data/maps/PokemonLeague_BrunosRoom/scripts.inc index afbaad9e6..64bbd0614 100644 --- a/data/maps/PokemonLeague_BrunosRoom/scripts.inc +++ b/data/maps/PokemonLeague_BrunosRoom/scripts.inc @@ -13,7 +13,7 @@ PokemonLeague_BrunosRoom_MapScript1_16269A:: @ 816269A PokemonLeague_BrunosRoom_MapScript2_1626A5:: @ 81626A5 checkflag FLAG_DEFEATED_BRUNO call_if TRUE, EventScript_1626C0 - compare_var_to_value VAR_MAP_SCENE_POKEMON_LEAGUE, 2 + compare VAR_MAP_SCENE_POKEMON_LEAGUE, 2 call_if eq, EventScript_1626BA end @@ -87,13 +87,13 @@ EventScript_16276E:: @ 816276E EventScript_162779:: @ 8162779 msgbox gUnknown_8178420 closemessage - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if eq, EventScript_1627FA - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 call_if eq, EventScript_1627EF - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if eq, EventScript_162805 - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if eq, EventScript_162805 release end @@ -103,13 +103,13 @@ EventScript_1627B0:: @ 81627B0 call EventScript_1A7506 msgbox gUnknown_8178420 closemessage - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if eq, EventScript_1627FA - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 call_if eq, EventScript_1627EF - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if eq, EventScript_162805 - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if eq, EventScript_162805 release end diff --git a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc index 8b0fff2ce..449f0f741 100644 --- a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc +++ b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc @@ -7,11 +7,11 @@ PokemonLeague_ChampionsRoom_MapScripts:: @ 8162AE2 PokemonLeague_ChampionsRoom_MapScript2_162AF2:: @ 8162AF2 setvar VAR_0x8004, 4 call EventScript_1A75D5 - compare_var_to_value VAR_STARTER_MON, 2 + compare VAR_STARTER_MON, 2 call_if eq, EventScript_162B1E - compare_var_to_value VAR_STARTER_MON, 1 + compare VAR_STARTER_MON, 1 call_if eq, EventScript_162B31 - compare_var_to_value VAR_STARTER_MON, 0 + compare VAR_STARTER_MON, 0 call_if eq, EventScript_162B44 end @@ -64,7 +64,7 @@ EventScript_162B76:: @ 8162B76 checkflag FLAG_SYS_GAME_CLEAR call_if TRUE, EventScript_162CBC special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_162C68 setflag FLAG_TEMP_3 setflag FLAG_TEMP_5 @@ -116,20 +116,20 @@ EventScript_162C68:: @ 8162C68 end EventScript_162C6F:: @ 8162C6F - compare_var_to_value VAR_STARTER_MON, 2 + compare VAR_STARTER_MON, 2 call_if eq, EventScript_162CC5 - compare_var_to_value VAR_STARTER_MON, 1 + compare VAR_STARTER_MON, 1 call_if eq, EventScript_162CD0 - compare_var_to_value VAR_STARTER_MON, 0 + compare VAR_STARTER_MON, 0 call_if eq, EventScript_162CDB return EventScript_162C91:: @ 8162C91 - compare_var_to_value VAR_STARTER_MON, 2 + compare VAR_STARTER_MON, 2 call_if eq, EventScript_162CE6 - compare_var_to_value VAR_STARTER_MON, 1 + compare VAR_STARTER_MON, 1 call_if eq, EventScript_162CF1 - compare_var_to_value VAR_STARTER_MON, 0 + compare VAR_STARTER_MON, 0 call_if eq, EventScript_162CFC return diff --git a/data/maps/PokemonLeague_LancesRoom/scripts.inc b/data/maps/PokemonLeague_LancesRoom/scripts.inc index 0ec0cb7e6..4cadcee31 100644 --- a/data/maps/PokemonLeague_LancesRoom/scripts.inc +++ b/data/maps/PokemonLeague_LancesRoom/scripts.inc @@ -11,7 +11,7 @@ PokemonLeague_LancesRoom_MapScript1_162942:: @ 8162942 end PokemonLeague_LancesRoom_MapScript2_16294D:: @ 816294D - compare_var_to_value VAR_MAP_SCENE_POKEMON_LEAGUE, 4 + compare VAR_MAP_SCENE_POKEMON_LEAGUE, 4 call_if eq, EventScript_162962 checkflag FLAG_DEFEATED_LANCE call_if TRUE, EventScript_162968 diff --git a/data/maps/PokemonLeague_LoreleisRoom/scripts.inc b/data/maps/PokemonLeague_LoreleisRoom/scripts.inc index df1cf1579..dd337943d 100644 --- a/data/maps/PokemonLeague_LoreleisRoom/scripts.inc +++ b/data/maps/PokemonLeague_LoreleisRoom/scripts.inc @@ -14,7 +14,7 @@ PokemonLeague_LoreleisRoom_MapScript1_162586:: @ 8162586 PokemonLeague_LoreleisRoom_MapScript2_162591:: @ 8162591 checkflag FLAG_DEFEATED_LORELEI call_if TRUE, EventScript_1625AC - compare_var_to_value VAR_MAP_SCENE_POKEMON_LEAGUE, 1 + compare VAR_MAP_SCENE_POKEMON_LEAGUE, 1 call_if eq, EventScript_1625A6 end diff --git a/data/maps/PokemonTower_1F/scripts.inc b/data/maps/PokemonTower_1F/scripts.inc index e98796864..dd8b16a70 100644 --- a/data/maps/PokemonTower_1F/scripts.inc +++ b/data/maps/PokemonTower_1F/scripts.inc @@ -22,7 +22,7 @@ PokemonTower_1F_EventScript_16325A:: @ 816325A lock faceplayer checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_163272 msgbox gUnknown_8179BFC release diff --git a/data/maps/PokemonTower_2F/scripts.inc b/data/maps/PokemonTower_2F/scripts.inc index ff5fd8b9b..908948740 100644 --- a/data/maps/PokemonTower_2F/scripts.inc +++ b/data/maps/PokemonTower_2F/scripts.inc @@ -20,9 +20,9 @@ PokemonTower_2F_EventScript_16329B:: @ 816329B EventScript_1632A7:: @ 81632A7 textcolor 0 playbgm MUS_RIVAL1, 0 - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 call_if eq, EventScript_163339 - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if eq, EventScript_16334B applymovement 1, Movement_1A75DB waitmovement 0 @@ -30,18 +30,18 @@ EventScript_1632A7:: @ 81632A7 waitmovement 0 msgbox gUnknown_8179CFF setvar VAR_LAST_TALKED, 1 - compare_var_to_value VAR_STARTER_MON, 2 + compare VAR_STARTER_MON, 2 call_if eq, EventScript_16335D - compare_var_to_value VAR_STARTER_MON, 1 + compare VAR_STARTER_MON, 1 call_if eq, EventScript_163368 - compare_var_to_value VAR_STARTER_MON, 0 + compare VAR_STARTER_MON, 0 call_if eq, EventScript_163373 msgbox gUnknown_8179DD4 closemessage playbgm MUS_RIVAL2, 0 - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 call_if eq, EventScript_16337E - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if eq, EventScript_163389 playse SE_KAIDAN delay 25 diff --git a/data/maps/PokemonTower_6F/scripts.inc b/data/maps/PokemonTower_6F/scripts.inc index 1f889c052..65127f0ab 100644 --- a/data/maps/PokemonTower_6F/scripts.inc +++ b/data/maps/PokemonTower_6F/scripts.inc @@ -6,13 +6,13 @@ PokemonTower_6F_EventScript_1634B8:: @ 81634B8 textcolor 2 msgbox gUnknown_817A2F8 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 setwildbattle SPECIES_MAROWAK, 30, ITEM_NONE special ScrSpecial_StartMarowakBattle waitstate special sub_8112364 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1634F5 applymovement 255, Movement_163512 waitmovement 0 diff --git a/data/maps/PokemonTower_7F/scripts.inc b/data/maps/PokemonTower_7F/scripts.inc index f39d15c7e..5a91f843e 100644 --- a/data/maps/PokemonTower_7F/scripts.inc +++ b/data/maps/PokemonTower_7F/scripts.inc @@ -24,11 +24,11 @@ EventScript_1635A1:: @ 81635A1 msgbox gUnknown_817A3AF closemessage getplayerxy VAR_0x8004, VAR_0x8005 - compare_var_to_value VAR_0x8004, 10 + compare VAR_0x8004, 10 goto_if eq, EventScript_1635E0 - compare_var_to_value VAR_0x8004, 11 + compare VAR_0x8004, 11 goto_if eq, EventScript_1635F0 - compare_var_to_value VAR_0x8004, 9 + compare VAR_0x8004, 9 goto_if eq, EventScript_163600 applymovement 2, Movement_16362C waitmovement 0 @@ -112,9 +112,9 @@ EventScript_163658:: @ 8163658 msgbox gUnknown_817A477 closemessage getplayerxy VAR_0x8004, VAR_0x8005 - compare_var_to_value VAR_0x8004, 12 + compare VAR_0x8004, 12 goto_if eq, EventScript_163699 - compare_var_to_value VAR_0x8004, 13 + compare VAR_0x8004, 13 goto_if eq, EventScript_1636A9 applymovement 3, Movement_1636C6 waitmovement 0 @@ -177,9 +177,9 @@ EventScript_1636F1:: @ 81636F1 msgbox gUnknown_817A506 closemessage getplayerxy VAR_0x8004, VAR_0x8005 - compare_var_to_value VAR_0x8004, 10 + compare VAR_0x8004, 10 goto_if eq, EventScript_163725 - compare_var_to_value VAR_0x8004, 9 + compare VAR_0x8004, 9 goto_if eq, EventScript_163735 applymovement 4, Movement_163754 waitmovement 0 diff --git a/data/maps/PowerPlant/scripts.inc b/data/maps/PowerPlant/scripts.inc index aa16e1881..9255df5e0 100644 --- a/data/maps/PowerPlant/scripts.inc +++ b/data/maps/PowerPlant/scripts.inc @@ -10,7 +10,7 @@ PowerPlant_MapScript1_16376F:: @ 816376F EventScript_163779:: @ 8163779 specialvar VAR_RESULT, Special_GetBattleOutcome - compare_var_to_value VAR_RESULT, B_OUTCOME_CAUGHT + compare VAR_RESULT, B_OUTCOME_CAUGHT goto_if ne, EventScript_1A77A9 removeobject VAR_LAST_TALKED return @@ -39,7 +39,7 @@ EventScript_1637B4:: @ 81637B4 PowerPlant_EventScript_1637B8:: @ 81637B8 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 special sub_8112364 lock @@ -58,11 +58,11 @@ PowerPlant_EventScript_1637B8:: @ 81637B8 waitstate clearflag FLAG_SYS_SPECIAL_WILD_BATTLE specialvar VAR_RESULT, Special_GetBattleOutcome - compare_var_to_value VAR_RESULT, B_OUTCOME_WON + compare VAR_RESULT, B_OUTCOME_WON goto_if eq, EventScript_16381B - compare_var_to_value VAR_RESULT, B_OUTCOME_RAN + compare VAR_RESULT, B_OUTCOME_RAN goto_if eq, EventScript_163824 - compare_var_to_value VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED + compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED goto_if eq, EventScript_163824 setflag FLAG_FOUGHT_ZAPDOS release @@ -80,7 +80,7 @@ EventScript_163824:: @ 8163824 PowerPlant_EventScript_16382F:: @ 816382F special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 lock faceplayer @@ -94,11 +94,11 @@ PowerPlant_EventScript_16382F:: @ 816382F clearflag FLAG_SYS_SPECIAL_WILD_BATTLE special sub_8112364 specialvar VAR_RESULT, Special_GetBattleOutcome - compare_var_to_value VAR_RESULT, B_OUTCOME_WON + compare VAR_RESULT, B_OUTCOME_WON goto_if eq, EventScript_163884 - compare_var_to_value VAR_RESULT, B_OUTCOME_RAN + compare VAR_RESULT, B_OUTCOME_RAN goto_if eq, EventScript_163884 - compare_var_to_value VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED + compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED goto_if eq, EventScript_163884 setflag FLAG_FOUGHT_POWER_PLANT_ELECTRODE_1 release @@ -111,7 +111,7 @@ EventScript_163884:: @ 8163884 PowerPlant_EventScript_16388D:: @ 816388D special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 lock faceplayer @@ -125,11 +125,11 @@ PowerPlant_EventScript_16388D:: @ 816388D clearflag FLAG_SYS_SPECIAL_WILD_BATTLE special sub_8112364 specialvar VAR_RESULT, Special_GetBattleOutcome - compare_var_to_value VAR_RESULT, B_OUTCOME_WON + compare VAR_RESULT, B_OUTCOME_WON goto_if eq, EventScript_1638E2 - compare_var_to_value VAR_RESULT, B_OUTCOME_RAN + compare VAR_RESULT, B_OUTCOME_RAN goto_if eq, EventScript_1638E2 - compare_var_to_value VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED + compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED goto_if eq, EventScript_1638E2 setflag FLAG_FOUGHT_POWER_PLANT_ELECTRODE_2 release diff --git a/data/maps/RockTunnel_1F/scripts.inc b/data/maps/RockTunnel_1F/scripts.inc index c2bb38afc..e96d22bb1 100644 --- a/data/maps/RockTunnel_1F/scripts.inc +++ b/data/maps/RockTunnel_1F/scripts.inc @@ -1,8 +1,8 @@ RockTunnel_1F_MapScripts:: @ 8162DD6 - map_script 3, RockTunnel_1F_MapScript1_162DDC + map_script MAP_SCRIPT_ON_TRANSITION, RockTunnel_1F_OnTransition .byte 0 -RockTunnel_1F_MapScript1_162DDC:: @ 8162DDC +RockTunnel_1F_OnTransition:: @ 8162DDC setworldmapflag FLAG_WORLD_MAP_ROCK_TUNNEL_1F end diff --git a/data/maps/RocketHideout_B4F/scripts.inc b/data/maps/RocketHideout_B4F/scripts.inc index 0ab5b0490..20b36dd57 100644 --- a/data/maps/RocketHideout_B4F/scripts.inc +++ b/data/maps/RocketHideout_B4F/scripts.inc @@ -8,7 +8,7 @@ RocketHideout_B4F_MapScript1_1612EE:: @ 81612EE call_if eq, EventScript_161311 checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_17 call_if eq, EventScript_161311 - compare_var_to_value VAR_0x4001, 2 + compare VAR_0x4001, 2 call_if ne, EventScript_16146A end @@ -42,7 +42,7 @@ RocketHideout_B4F_EventScript_161363:: @ 8161363 faceplayer removeobject 2 giveitem ITEM_SILPH_SCOPE - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1A6BF9 release end @@ -66,7 +66,7 @@ RocketHideout_B4F_EventScript_1613AD:: @ 81613AD setflag FLAG_CAN_USE_ROCKET_HIDEOUT_LIFT removeobject 4 giveitem ITEM_LIFT_KEY - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1A6BF9 release end @@ -82,9 +82,9 @@ EventScript_1613E9:: @ 81613E9 call_if eq, EventScript_161311 checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_17 call_if eq, EventScript_161311 - compare_var_to_value VAR_0x4001, 2 + compare VAR_0x4001, 2 call_if eq, EventScript_1614A1 - compare_var_to_value VAR_0x4001, 2 + compare VAR_0x4001, 2 call_if eq, EventScript_161462 release end @@ -100,9 +100,9 @@ EventScript_161433:: @ 8161433 call_if eq, EventScript_161311 checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_17 call_if eq, EventScript_161311 - compare_var_to_value VAR_0x4001, 2 + compare VAR_0x4001, 2 call_if eq, EventScript_1614A1 - compare_var_to_value VAR_0x4001, 2 + compare VAR_0x4001, 2 call_if eq, EventScript_161462 release end diff --git a/data/maps/RocketHideout_Elevator/scripts.inc b/data/maps/RocketHideout_Elevator/scripts.inc index 2b593b1bb..145364418 100644 --- a/data/maps/RocketHideout_Elevator/scripts.inc +++ b/data/maps/RocketHideout_Elevator/scripts.inc @@ -53,7 +53,7 @@ EventScript_161554:: @ 8161554 EventScript_161591:: @ 8161591 setvar VAR_0x8006, 3 setdynamicwarp MAP_ROCKET_HIDEOUT_B1F, 255, 24, 25 - compare_var_to_value VAR_ELEVATOR_FLOOR, 3 + compare VAR_ELEVATOR_FLOOR, 3 goto_if eq, EventScript_161609 call EventScript_16160E setvar VAR_ELEVATOR_FLOOR, 3 @@ -65,7 +65,7 @@ EventScript_1615B8:: @ 81615B8 EventScript_1615B9:: @ 81615B9 setvar VAR_0x8006, 2 setdynamicwarp MAP_ROCKET_HIDEOUT_B2F, 255, 28, 16 - compare_var_to_value VAR_ELEVATOR_FLOOR, 2 + compare VAR_ELEVATOR_FLOOR, 2 goto_if eq, EventScript_161609 call EventScript_16160E setvar VAR_ELEVATOR_FLOOR, 2 @@ -77,7 +77,7 @@ EventScript_1615E0:: @ 81615E0 EventScript_1615E1:: @ 81615E1 setvar VAR_0x8006, 0 setdynamicwarp MAP_ROCKET_HIDEOUT_B4F, 255, 20, 23 - compare_var_to_value VAR_ELEVATOR_FLOOR, 0 + compare VAR_ELEVATOR_FLOOR, 0 goto_if eq, EventScript_161609 call EventScript_16160E setvar VAR_ELEVATOR_FLOOR, 0 diff --git a/data/maps/Route1/scripts.inc b/data/maps/Route1/scripts.inc index ef784e8ee..54906ebbe 100644 --- a/data/maps/Route1/scripts.inc +++ b/data/maps/Route1/scripts.inc @@ -9,7 +9,7 @@ Route1_EventScript_167EFE:: @ 8167EFE msgbox gUnknown_818329D textcolor 3 checkitemspace ITEM_POTION, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1A6BF9 getitemname 1, ITEM_POTION playfanfare MUS_FANFA1 diff --git a/data/maps/Route10_PokemonCenter_1F/scripts.inc b/data/maps/Route10_PokemonCenter_1F/scripts.inc index 44d9939c0..9e62817c0 100644 --- a/data/maps/Route10_PokemonCenter_1F/scripts.inc +++ b/data/maps/Route10_PokemonCenter_1F/scripts.inc @@ -34,17 +34,17 @@ Route10_PokemonCenter_1F_EventScript_16FC65:: @ 816FC65 checkflag FLAG_GOT_EVERSTONE_FROM_OAKS_AIDE goto_if TRUE, EventScript_16FCE7 msgbox gUnknown_819E5FB, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1A7AD1 setvar VAR_0x8004, 0 specialvar VAR_RESULT, Special_GetPokedexCount getnumberstring 2, VAR_0x8006 call EventScript_16FCF1 - compare_var_to_value VAR_0x8006, 20 + compare VAR_0x8006, 20 goto_if lt, EventScript_1A7ABD msgbox gUnknown_819E733 checkitemspace ITEM_EVERSTONE, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1A7AC7 additem ITEM_EVERSTONE, 1 giveitemfanfaremsg gUnknown_819E786, ITEM_EVERSTONE diff --git a/data/maps/Route11_EastEntrance_2F/scripts.inc b/data/maps/Route11_EastEntrance_2F/scripts.inc index 0140d8de3..fe9f21907 100644 --- a/data/maps/Route11_EastEntrance_2F/scripts.inc +++ b/data/maps/Route11_EastEntrance_2F/scripts.inc @@ -26,13 +26,13 @@ Route11_EastEntrance_2F_EventScript_16FD5C:: @ 816FD5C checkflag FLAG_DID_NINA_TRADE goto_if TRUE, EventScript_16FDCE msgbox gUnknown_81A597B, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16FDB6 call EventScript_1A8CBD - compare_var_to_value VAR_0x8004, 6 + compare VAR_0x8004, 6 goto_if ge, EventScript_16FDB6 call EventScript_1A8CC9 - compare_var_to_var VAR_RESULT, VAR_0x8009 + compare VAR_RESULT, VAR_0x8009 goto_if ne, EventScript_16FDC0 call EventScript_1A8CD9 msgbox gUnknown_81A59DA @@ -63,17 +63,17 @@ Route11_EastEntrance_2F_EventScript_16FDD8:: @ 816FDD8 checkflag FLAG_GOT_ITEMFINDER goto_if TRUE, EventScript_16FE5A msgbox gUnknown_819E9E5, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1A7AD1 setvar VAR_0x8004, 0 specialvar VAR_RESULT, Special_GetPokedexCount getnumberstring 2, VAR_0x8006 call EventScript_16FE64 - compare_var_to_value VAR_0x8006, 30 + compare VAR_0x8006, 30 goto_if lt, EventScript_1A7ABD msgbox gUnknown_819EAE4 checkitemspace ITEM_ITEMFINDER, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1A7AC7 additem ITEM_ITEMFINDER, 1 giveitemfanfaremsg gUnknown_819EB37, ITEM_ITEMFINDER diff --git a/data/maps/Route12/scripts.inc b/data/maps/Route12/scripts.inc index 446d9047d..a468a579f 100644 --- a/data/maps/Route12/scripts.inc +++ b/data/maps/Route12/scripts.inc @@ -17,11 +17,11 @@ Route12_EventScript_168014:: @ 8168014 checkflag FLAG_GOT_POKE_FLUTE goto_if FALSE, EventScript_168099 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 special sub_8112364 msgbox gUnknown_81853CC, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16808D call EventScript_1A924B setwildbattle SPECIES_SNORLAX, 30, ITEM_NONE @@ -35,11 +35,11 @@ Route12_EventScript_168014:: @ 8168014 dowildbattle clearflag FLAG_SYS_SPECIAL_WILD_BATTLE specialvar VAR_RESULT, Special_GetBattleOutcome - compare_var_to_value VAR_RESULT, B_OUTCOME_WON + compare VAR_RESULT, B_OUTCOME_WON goto_if eq, EventScript_16808F - compare_var_to_value VAR_RESULT, B_OUTCOME_RAN + compare VAR_RESULT, B_OUTCOME_RAN goto_if eq, EventScript_16808F - compare_var_to_value VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED + compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED goto_if eq, EventScript_16808F release end diff --git a/data/maps/Route12_FishingHouse/scripts.inc b/data/maps/Route12_FishingHouse/scripts.inc index 0f0aa4f68..317ffe41c 100644 --- a/data/maps/Route12_FishingHouse/scripts.inc +++ b/data/maps/Route12_FishingHouse/scripts.inc @@ -7,7 +7,7 @@ Route12_FishingHouse_EventScript_16FF0C:: @ 816FF0C checkflag FLAG_GOT_SUPER_ROD goto_if TRUE, EventScript_16FF7F msgbox gUnknown_819EFE0, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16FF34 msgbox gUnknown_819F1FA release @@ -15,7 +15,7 @@ Route12_FishingHouse_EventScript_16FF0C:: @ 816FF0C EventScript_16FF34:: @ 816FF34 checkitemspace ITEM_SUPER_ROD, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16FF75 additem ITEM_SUPER_ROD, 1 msgbox gUnknown_819F05B @@ -32,28 +32,28 @@ EventScript_16FF75:: @ 816FF75 EventScript_16FF7F:: @ 816FF7F special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 special sub_8112364 setvar VAR_0x8004, SPECIES_MAGIKARP specialvar VAR_RESULT, Special_PlayerPartyContainsSpecies - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16FFF5 special GetMagikarpSizeRecordInfo msgbox gUnknown_819F2DB special Special_ChooseMonFromParty waitstate copyvar VAR_RESULT, VAR_0x8004 - compare_var_to_value VAR_RESULT, 6 + compare VAR_RESULT, 6 goto_if ge, EventScript_16FFFF special CompareMagikarpSize - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_170001 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_17000B - compare_var_to_value VAR_RESULT, 3 + compare VAR_RESULT, 3 goto_if eq, EventScript_170031 - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 goto_if eq, EventScript_17001E release end @@ -90,7 +90,7 @@ EventScript_170031:: @ 8170031 setflag FLAG_GOT_RECORD_SETTING_MAGIKARP msgbox gUnknown_819F31B giveitem ITEM_NET_BALL - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_17005D msgbox gUnknown_819F395 release diff --git a/data/maps/Route12_NorthEntrance_2F/scripts.inc b/data/maps/Route12_NorthEntrance_2F/scripts.inc index fe288a6d1..44c1629fc 100644 --- a/data/maps/Route12_NorthEntrance_2F/scripts.inc +++ b/data/maps/Route12_NorthEntrance_2F/scripts.inc @@ -15,12 +15,12 @@ Route12_NorthEntrance_2F_EventScript_16FE8A:: @ 816FE8A checkflag FLAG_GOT_TM27 goto_if TRUE, EventScript_16FF01 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if eq, EventScript_16FEE5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if eq, EventScript_16FEEE checkitemspace ITEM_TM27, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16FEF7 additem ITEM_TM27, 1 giveitemfanfaremsg gUnknown_819EE9F, ITEM_TM27 diff --git a/data/maps/Route15_WestEntrance_2F/scripts.inc b/data/maps/Route15_WestEntrance_2F/scripts.inc index 1b491d4e5..09983fed1 100644 --- a/data/maps/Route15_WestEntrance_2F/scripts.inc +++ b/data/maps/Route15_WestEntrance_2F/scripts.inc @@ -24,17 +24,17 @@ Route15_WestEntrance_2F_EventScript_1700B9:: @ 81700B9 checkflag FLAG_GOT_EXP_SHARE_FROM_OAKS_AIDE goto_if TRUE, EventScript_17013B msgbox gUnknown_819F5AB, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1A7AD1 setvar VAR_0x8004, 0 specialvar VAR_RESULT, Special_GetPokedexCount getnumberstring 2, VAR_0x8006 call EventScript_170145 - compare_var_to_value VAR_0x8006, 50 + compare VAR_0x8006, 50 goto_if lt, EventScript_1A7ABD msgbox gUnknown_819F6AA checkitemspace ITEM_EXP_SHARE, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1A7AC7 additem ITEM_EXP_SHARE, 1 giveitemfanfaremsg gUnknown_819F6FD, ITEM_EXP_SHARE diff --git a/data/maps/Route16/scripts.inc b/data/maps/Route16/scripts.inc index 0bc8d6c8a..a69fbf22a 100644 --- a/data/maps/Route16/scripts.inc +++ b/data/maps/Route16/scripts.inc @@ -14,7 +14,7 @@ EventScript_1680FF:: @ 81680FF return Route16_MapScript2_168103:: @ 8168103 - compare_var_to_value VAR_MAP_SCENE_ROUTE16, 1 + compare VAR_MAP_SCENE_ROUTE16, 1 call_if eq, EventScript_16810F end @@ -36,11 +36,11 @@ Route16_EventScript_168121:: @ 8168121 checkflag FLAG_GOT_POKE_FLUTE goto_if FALSE, EventScript_1681A3 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 special sub_8112364 msgbox gUnknown_81853CC, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_168197 call EventScript_1A924B setwildbattle SPECIES_SNORLAX, 30, ITEM_NONE @@ -53,11 +53,11 @@ Route16_EventScript_168121:: @ 8168121 dowildbattle clearflag FLAG_SYS_SPECIAL_WILD_BATTLE specialvar VAR_RESULT, Special_GetBattleOutcome - compare_var_to_value VAR_RESULT, B_OUTCOME_WON + compare VAR_RESULT, B_OUTCOME_WON goto_if eq, EventScript_168199 - compare_var_to_value VAR_RESULT, B_OUTCOME_RAN + compare VAR_RESULT, B_OUTCOME_RAN goto_if eq, EventScript_168199 - compare_var_to_value VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED + compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED goto_if eq, EventScript_168199 release end diff --git a/data/maps/Route16_House/scripts.inc b/data/maps/Route16_House/scripts.inc index 6da2bb12a..d6c4c7a9c 100644 --- a/data/maps/Route16_House/scripts.inc +++ b/data/maps/Route16_House/scripts.inc @@ -8,7 +8,7 @@ Route16_House_EventScript_17014F:: @ 817014F goto_if TRUE, EventScript_1701A5 msgbox gUnknown_819F851 checkitemspace ITEM_HM02, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_17019B additem ITEM_HM02, 1 giveitemfanfaremsg gUnknown_819F8C0, ITEM_HM02 diff --git a/data/maps/Route16_NorthEntrance_1F/scripts.inc b/data/maps/Route16_NorthEntrance_1F/scripts.inc index 32d392818..ff5c43dd3 100644 --- a/data/maps/Route16_NorthEntrance_1F/scripts.inc +++ b/data/maps/Route16_NorthEntrance_1F/scripts.inc @@ -53,13 +53,13 @@ EventScript_170220:: @ 8170220 applymovement 255, Movement_1A75E9 waitmovement 0 delay 20 - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if eq, EventScript_170279 - compare_var_to_value VAR_0x8008, 2 + compare VAR_0x8008, 2 call_if eq, EventScript_170284 - compare_var_to_value VAR_0x8008, 3 + compare VAR_0x8008, 3 call_if eq, EventScript_17028F - compare_var_to_value VAR_0x8008, 4 + compare VAR_0x8008, 4 call_if eq, EventScript_17029A msgbox gUnknown_819F95F closemessage diff --git a/data/maps/Route16_NorthEntrance_2F/scripts.inc b/data/maps/Route16_NorthEntrance_2F/scripts.inc index 777967038..da054fd84 100644 --- a/data/maps/Route16_NorthEntrance_2F/scripts.inc +++ b/data/maps/Route16_NorthEntrance_2F/scripts.inc @@ -24,17 +24,17 @@ Route16_NorthEntrance_2F_EventScript_1702E3:: @ 81702E3 checkflag FLAG_GOT_AMULET_COIN_FROM_OAKS_AIDE goto_if TRUE, EventScript_170365 msgbox gUnknown_819FB0E, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1A7AD1 setvar VAR_0x8004, 0 specialvar VAR_RESULT, Special_GetPokedexCount getnumberstring 2, VAR_0x8006 call EventScript_17036F - compare_var_to_value VAR_0x8006, 40 + compare VAR_0x8006, 40 goto_if lt, EventScript_1A7ABD msgbox gUnknown_819FC15 checkitemspace ITEM_AMULET_COIN, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1A7AC7 additem ITEM_AMULET_COIN, 1 giveitemfanfaremsg gUnknown_819FC68, ITEM_AMULET_COIN diff --git a/data/maps/Route18/scripts.inc b/data/maps/Route18/scripts.inc index cc6d11221..b50bf30c1 100644 --- a/data/maps/Route18/scripts.inc +++ b/data/maps/Route18/scripts.inc @@ -4,7 +4,7 @@ Route18_MapScripts:: @ 81681F6 .byte 0 Route18_MapScript1_168201:: @ 8168201 - compare_var_to_value VAR_MAP_SCENE_ROUTE16, 1 + compare VAR_MAP_SCENE_ROUTE16, 1 call_if eq, EventScript_16820D end diff --git a/data/maps/Route18_EastEntrance_1F/scripts.inc b/data/maps/Route18_EastEntrance_1F/scripts.inc index 784d1d37f..25fe611c0 100644 --- a/data/maps/Route18_EastEntrance_1F/scripts.inc +++ b/data/maps/Route18_EastEntrance_1F/scripts.inc @@ -53,13 +53,13 @@ EventScript_1703D6:: @ 81703D6 applymovement 255, Movement_1A75E9 waitmovement 0 delay 20 - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if eq, EventScript_17042F - compare_var_to_value VAR_0x8008, 2 + compare VAR_0x8008, 2 call_if eq, EventScript_17043A - compare_var_to_value VAR_0x8008, 3 + compare VAR_0x8008, 3 call_if eq, EventScript_170445 - compare_var_to_value VAR_0x8008, 4 + compare VAR_0x8008, 4 call_if eq, EventScript_170450 msgbox gUnknown_819FD0C closemessage diff --git a/data/maps/Route18_EastEntrance_2F/scripts.inc b/data/maps/Route18_EastEntrance_2F/scripts.inc index d262aad30..afe1dd754 100644 --- a/data/maps/Route18_EastEntrance_2F/scripts.inc +++ b/data/maps/Route18_EastEntrance_2F/scripts.inc @@ -17,13 +17,13 @@ Route18_EastEntrance_2F_EventScript_17047E:: @ 817047E checkflag FLAG_DID_MARC_TRADE goto_if TRUE, EventScript_1704F0 msgbox gUnknown_81A597B, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1704D8 call EventScript_1A8CBD - compare_var_to_value VAR_0x8004, 6 + compare VAR_0x8004, 6 goto_if ge, EventScript_1704D8 call EventScript_1A8CC9 - compare_var_to_var VAR_RESULT, VAR_0x8009 + compare VAR_RESULT, VAR_0x8009 goto_if ne, EventScript_1704E2 call EventScript_1A8CD9 msgbox gUnknown_81A59DA diff --git a/data/maps/Route20/scripts.inc b/data/maps/Route20/scripts.inc index be0098a71..1d277231d 100644 --- a/data/maps/Route20/scripts.inc +++ b/data/maps/Route20/scripts.inc @@ -1,8 +1,8 @@ Route20_MapScripts:: @ 816823B - map_script 3, Route20_MapScript1_168241 + map_script MAP_SCRIPT_ON_TRANSITION, Route20_OnTransition .byte 0 -Route20_MapScript1_168241:: @ 8168241 +Route20_OnTransition:: @ 8168241 checkflag FLAG_STOPPED_SEAFOAM_B3F_CURRENT call_if FALSE, EventScript_168254 checkflag FLAG_STOPPED_SEAFOAM_B4F_CURRENT diff --git a/data/maps/Route22/scripts.inc b/data/maps/Route22/scripts.inc index 8a775e09c..e68c25b17 100644 --- a/data/maps/Route22/scripts.inc +++ b/data/maps/Route22/scripts.inc @@ -31,29 +31,29 @@ EventScript_1682BE:: @ 81682BE textcolor 0 playbgm MUS_RIVAL1, 0 addobject 1 - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 call_if eq, EventScript_168350 - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if eq, EventScript_168350 - compare_var_to_value VAR_0x4001, 2 + compare VAR_0x4001, 2 call_if eq, EventScript_16835B delay 6 msgbox gUnknown_8188890 - compare_var_to_value VAR_STARTER_MON, 2 + compare VAR_STARTER_MON, 2 call_if eq, EventScript_16836D - compare_var_to_value VAR_STARTER_MON, 1 + compare VAR_STARTER_MON, 1 call_if eq, EventScript_16837C - compare_var_to_value VAR_STARTER_MON, 0 + compare VAR_STARTER_MON, 0 call_if eq, EventScript_16838B msgbox gUnknown_8188974 closemessage delay 10 playbgm MUS_RIVAL2, 0 - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 call_if eq, EventScript_16839A - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if eq, EventScript_16839A - compare_var_to_value VAR_0x4001, 2 + compare VAR_0x4001, 2 call_if eq, EventScript_1683A5 fadedefaultbgm removeobject 1 @@ -197,19 +197,19 @@ EventScript_16841F:: @ 816841F textcolor 0 playbgm MUS_RIVAL1, 0 addobject 1 - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 call_if eq, EventScript_16849C - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if eq, EventScript_16849C - compare_var_to_value VAR_0x4001, 2 + compare VAR_0x4001, 2 call_if eq, EventScript_1684A7 msgbox gUnknown_8188A3C setvar VAR_LAST_TALKED, 1 - compare_var_to_value VAR_STARTER_MON, 2 + compare VAR_STARTER_MON, 2 call_if eq, EventScript_1684B9 - compare_var_to_value VAR_STARTER_MON, 1 + compare VAR_STARTER_MON, 1 call_if eq, EventScript_1684C4 - compare_var_to_value VAR_STARTER_MON, 0 + compare VAR_STARTER_MON, 0 call_if eq, EventScript_1684CF msgbox gUnknown_8188B29 closemessage diff --git a/data/maps/Route24/scripts.inc b/data/maps/Route24/scripts.inc index 2760e17a3..30e5a753e 100644 --- a/data/maps/Route24/scripts.inc +++ b/data/maps/Route24/scripts.inc @@ -4,11 +4,11 @@ Route24_MapScripts:: @ 816861F Route24_EventScript_168620:: @ 8168620 lock faceplayer - compare_var_to_value VAR_MAP_SCENE_ROUTE24, 1 + compare VAR_MAP_SCENE_ROUTE24, 1 goto_if eq, EventScript_168656 msgbox gUnknown_8188C3C checkitemspace ITEM_NUGGET, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16864C call EventScript_1686B9 release @@ -38,15 +38,15 @@ Route24_EventScript_16866C:: @ 816866C EventScript_168678:: @ 8168678 textcolor 0 - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 call_if eq, EventScript_1686FD - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if eq, EventScript_168708 applymovement 255, Movement_1A75EB waitmovement 0 msgbox gUnknown_8188C3C checkitemspace ITEM_NUGGET, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_168713 call EventScript_1686B9 releaseall @@ -80,7 +80,7 @@ EventScript_168713:: @ 8168713 closemessage applymovement 255, Movement_168743 waitmovement 0 - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 call_if eq, EventScript_168733 release end diff --git a/data/maps/Route25_SeaCottage/scripts.inc b/data/maps/Route25_SeaCottage/scripts.inc index e8d016a02..bfa331bef 100644 --- a/data/maps/Route25_SeaCottage/scripts.inc +++ b/data/maps/Route25_SeaCottage/scripts.inc @@ -28,9 +28,9 @@ Route25_SeaCottage_EventScript_17054B:: @ 817054B checkflag FLAG_HELPED_BILL_IN_SEA_COTTAGE goto_if TRUE, EventScript_17064A checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_170580 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_17058E end @@ -45,18 +45,18 @@ EventScript_17058E:: @ 817058E end EventScript_17059C:: @ 817059C - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if eq, EventScript_170600 msgbox gUnknown_819FFD3 closemessage delay 10 - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 call_if eq, EventScript_17062A - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if eq, EventScript_170635 - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if eq, EventScript_170635 - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if eq, EventScript_170635 opendoor 10, 3 waitdooranim @@ -72,9 +72,9 @@ EventScript_17059C:: @ 817059C EventScript_170600:: @ 8170600 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if eq, EventScript_170618 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if eq, EventScript_170621 return @@ -104,12 +104,12 @@ EventScript_170640:: @ 8170640 EventScript_17064A:: @ 817064A famechecker FAMECHECKER_BILL, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if eq, EventScript_1706AC - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if eq, EventScript_1706B5 checkitemspace ITEM_SS_TICKET, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1706BE additem ITEM_SS_TICKET, 1 giveitemfanfaremsg gUnknown_81A028E, ITEM_SS_TICKET, 1, MUS_FAN5 diff --git a/data/maps/Route2_EastBuilding/scripts.inc b/data/maps/Route2_EastBuilding/scripts.inc index de3889bf4..002c928ab 100644 --- a/data/maps/Route2_EastBuilding/scripts.inc +++ b/data/maps/Route2_EastBuilding/scripts.inc @@ -8,17 +8,17 @@ Route2_EastBuilding_EventScript_16F67F:: @ 816F67F checkflag FLAG_GOT_HM05 goto_if TRUE, EventScript_16F701 msgbox gUnknown_819D64F, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1A7AD1 setvar VAR_0x8004, 0 specialvar VAR_RESULT, Special_GetPokedexCount getnumberstring 2, VAR_0x8006 call EventScript_16F70B - compare_var_to_value VAR_0x8006, 10 + compare VAR_0x8006, 10 goto_if lt, EventScript_1A7ABD msgbox gUnknown_819D74E checkitemspace ITEM_HM05, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1A7AC7 additem ITEM_HM05, 1 giveitemfanfaremsg gUnknown_819D7A1, ITEM_HM05 diff --git a/data/maps/Route2_House/scripts.inc b/data/maps/Route2_House/scripts.inc index 62367586d..0f5604fa3 100644 --- a/data/maps/Route2_House/scripts.inc +++ b/data/maps/Route2_House/scripts.inc @@ -13,13 +13,13 @@ Route2_House_EventScript_16F602:: @ 816F602 checkflag FLAG_DID_MIMIEN_TRADE goto_if TRUE, EventScript_16F674 msgbox gUnknown_81A597B, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16F65C call EventScript_1A8CBD - compare_var_to_value VAR_0x8004, 6 + compare VAR_0x8004, 6 goto_if ge, EventScript_16F65C call EventScript_1A8CC9 - compare_var_to_var VAR_RESULT, VAR_0x8009 + compare VAR_RESULT, VAR_0x8009 goto_if ne, EventScript_16F666 call EventScript_1A8CD9 msgbox gUnknown_81A59DA diff --git a/data/maps/Route4_PokemonCenter_1F/scripts.inc b/data/maps/Route4_PokemonCenter_1F/scripts.inc index 4b485bbbd..23b4162a0 100644 --- a/data/maps/Route4_PokemonCenter_1F/scripts.inc +++ b/data/maps/Route4_PokemonCenter_1F/scripts.inc @@ -25,9 +25,9 @@ Route4_PokemonCenter_1F_EventScript_16F75F:: @ 816F75F goto_if TRUE, EventScript_16F8A2 showmoneybox 0, 0, 0 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16F786 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16F794 end @@ -42,26 +42,26 @@ EventScript_16F794:: @ 816F794 end EventScript_16F7A2:: @ 816F7A2 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16F888 checkmoney 500, 0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16F895 textcolor 3 setvar VAR_0x4001, 129 givemon SPECIES_MAGIKARP, 5, ITEM_NONE, 0, 0, 0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16F7F6 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16F822 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_16F8AC end EventScript_16F7F6:: @ 816F7F6 call EventScript_16F86F msgbox gUnknown_81A56A7, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16F861 call EventScript_1A8C27 fadescreen 1 @@ -74,7 +74,7 @@ EventScript_16F7F6:: @ 816F7F6 EventScript_16F822:: @ 816F822 call EventScript_16F86F msgbox gUnknown_81A56A7, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16F84B fadescreen 1 hidemoneybox 0, 0 diff --git a/data/maps/Route5_SouthEntrance/scripts.inc b/data/maps/Route5_SouthEntrance/scripts.inc index fd8a5f6fc..5340a57ec 100644 --- a/data/maps/Route5_SouthEntrance/scripts.inc +++ b/data/maps/Route5_SouthEntrance/scripts.inc @@ -44,11 +44,11 @@ EventScript_16F958:: @ 816F958 EventScript_16F963:: @ 816F963 msgbox gUnknown_819E09B closemessage - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 call_if eq, EventScript_16F99C - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if eq, EventScript_16F9A7 - compare_var_to_value VAR_0x4001, 2 + compare VAR_0x4001, 2 call_if eq, EventScript_16F9B2 msgbox gUnknown_819E0C1 setvar VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES, 1 diff --git a/data/maps/Route6_NorthEntrance/scripts.inc b/data/maps/Route6_NorthEntrance/scripts.inc index 6edd20f21..e039b9a09 100644 --- a/data/maps/Route6_NorthEntrance/scripts.inc +++ b/data/maps/Route6_NorthEntrance/scripts.inc @@ -44,11 +44,11 @@ EventScript_16FA1E:: @ 816FA1E EventScript_16FA29:: @ 816FA29 msgbox gUnknown_819E1D1 closemessage - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 call_if eq, EventScript_16FA62 - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if eq, EventScript_16FA6D - compare_var_to_value VAR_0x4001, 2 + compare VAR_0x4001, 2 call_if eq, EventScript_16FA78 msgbox gUnknown_819E1F7 setvar VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES, 1 diff --git a/data/maps/Route7_EastEntrance/scripts.inc b/data/maps/Route7_EastEntrance/scripts.inc index f8885b53d..613a84bf2 100644 --- a/data/maps/Route7_EastEntrance/scripts.inc +++ b/data/maps/Route7_EastEntrance/scripts.inc @@ -44,11 +44,11 @@ EventScript_16FAE5:: @ 816FAE5 EventScript_16FAF0:: @ 816FAF0 msgbox gUnknown_819E307 closemessage - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 call_if eq, EventScript_16FB29 - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if eq, EventScript_16FB34 - compare_var_to_value VAR_0x4001, 2 + compare VAR_0x4001, 2 call_if eq, EventScript_16FB3F msgbox gUnknown_819E32D setvar VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES, 1 diff --git a/data/maps/Route8_WestEntrance/scripts.inc b/data/maps/Route8_WestEntrance/scripts.inc index dfdb0b7ae..f657d318f 100644 --- a/data/maps/Route8_WestEntrance/scripts.inc +++ b/data/maps/Route8_WestEntrance/scripts.inc @@ -54,11 +54,11 @@ EventScript_16FBC1:: @ 816FBC1 EventScript_16FBCC:: @ 816FBCC msgbox gUnknown_819E43D closemessage - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 call_if eq, EventScript_16FC05 - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if eq, EventScript_16FC10 - compare_var_to_value VAR_0x4001, 2 + compare VAR_0x4001, 2 call_if eq, EventScript_16FC1B msgbox gUnknown_819E463 setvar VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES, 1 diff --git a/data/maps/SSAnne_1F_Room4/scripts.inc b/data/maps/SSAnne_1F_Room4/scripts.inc index 2bede7e12..f13ffc7e9 100644 --- a/data/maps/SSAnne_1F_Room4/scripts.inc +++ b/data/maps/SSAnne_1F_Room4/scripts.inc @@ -5,7 +5,7 @@ SSAnne_1F_Room4_EventScript_160C44:: @ 8160C44 lock faceplayer checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_160C5C msgbox gUnknown_8173BA4 release diff --git a/data/maps/SSAnne_1F_Room6/scripts.inc b/data/maps/SSAnne_1F_Room6/scripts.inc index 755c01a91..1898942d2 100644 --- a/data/maps/SSAnne_1F_Room6/scripts.inc +++ b/data/maps/SSAnne_1F_Room6/scripts.inc @@ -5,7 +5,7 @@ SSAnne_1F_Room6_EventScript_160DF3:: @ 8160DF3 lock faceplayer msgbox gUnknown_817445B, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_160E18 closemessage call EventScript_FadeOut_Heal_FadeIn @@ -15,7 +15,7 @@ SSAnne_1F_Room6_EventScript_160DF3:: @ 8160DF3 EventScript_160E18:: @ 8160E18 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_160E2E msgbox gUnknown_8174515 release diff --git a/data/maps/SSAnne_2F_Corridor/scripts.inc b/data/maps/SSAnne_2F_Corridor/scripts.inc index 82d75a686..3d67e7dd0 100644 --- a/data/maps/SSAnne_2F_Corridor/scripts.inc +++ b/data/maps/SSAnne_2F_Corridor/scripts.inc @@ -35,29 +35,29 @@ EventScript_160903:: @ 8160903 applymovement 1, Movement_1A75ED waitmovement 0 delay 20 - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 call_if eq, EventScript_1609AD - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if eq, EventScript_1609B8 - compare_var_to_value VAR_0x4001, 2 + compare VAR_0x4001, 2 call_if eq, EventScript_1609CA msgbox gUnknown_8173035 setvar VAR_LAST_TALKED, 1 - compare_var_to_value VAR_STARTER_MON, 2 + compare VAR_STARTER_MON, 2 call_if eq, EventScript_1609DC - compare_var_to_value VAR_STARTER_MON, 1 + compare VAR_STARTER_MON, 1 call_if eq, EventScript_1609E7 - compare_var_to_value VAR_STARTER_MON, 0 + compare VAR_STARTER_MON, 0 call_if eq, EventScript_1609F2 msgbox gUnknown_8173164 closemessage delay 10 playbgm MUS_RIVAL2, 0 - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 call_if eq, EventScript_1609FD - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if eq, EventScript_160A08 - compare_var_to_value VAR_0x4001, 2 + compare VAR_0x4001, 2 call_if eq, EventScript_160A13 fadedefaultbgm removeobject 1 diff --git a/data/maps/SSAnne_Exterior/scripts.inc b/data/maps/SSAnne_Exterior/scripts.inc index 15cc43b1f..e2cfc4eb9 100644 --- a/data/maps/SSAnne_Exterior/scripts.inc +++ b/data/maps/SSAnne_Exterior/scripts.inc @@ -14,9 +14,9 @@ SSAnne_Exterior_MapScript2_16084F:: @ 816084F SSAnne_Exterior_160859:: @ 8160859 lockall getplayerxy VAR_0x8004, VAR_0x8005 - compare_var_to_value VAR_0x8005, 6 + compare VAR_0x8005, 6 call_if le, EventScript_1608A1 - compare_var_to_value VAR_0x8005, 7 + compare VAR_0x8005, 7 call_if ge, EventScript_1608AC fadenewbgm MUS_NAMINORI delay 50 diff --git a/data/maps/SSAnne_Kitchen/scripts.inc b/data/maps/SSAnne_Kitchen/scripts.inc index 8ab022028..97ca7f889 100644 --- a/data/maps/SSAnne_Kitchen/scripts.inc +++ b/data/maps/SSAnne_Kitchen/scripts.inc @@ -19,11 +19,11 @@ SSAnne_Kitchen_EventScript_160ACE:: @ 8160ACE msgbox gUnknown_8173570 random 3 copyvar VAR_0x8008, VAR_RESULT - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 call_if eq, EventScript_160B03 - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if eq, EventScript_160B0C - compare_var_to_value VAR_0x8008, 2 + compare VAR_0x8008, 2 call_if eq, EventScript_160B15 release end diff --git a/data/maps/SafariZone_SecretHouse/scripts.inc b/data/maps/SafariZone_SecretHouse/scripts.inc index a4b3b1910..fe7a4f6fa 100644 --- a/data/maps/SafariZone_SecretHouse/scripts.inc +++ b/data/maps/SafariZone_SecretHouse/scripts.inc @@ -8,7 +8,7 @@ SafariZone_SecretHouse_EventScript_162453:: @ 8162453 goto_if TRUE, EventScript_1624A9 msgbox gUnknown_8177DC1 checkitemspace ITEM_HM03, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16249F additem ITEM_HM03, 1 giveitemfanfaremsg gUnknown_8177E92, ITEM_HM03 diff --git a/data/maps/SaffronCity_Dojo/scripts.inc b/data/maps/SaffronCity_Dojo/scripts.inc index 8481db66c..5790fce0f 100644 --- a/data/maps/SaffronCity_Dojo/scripts.inc +++ b/data/maps/SaffronCity_Dojo/scripts.inc @@ -29,7 +29,7 @@ SaffronCity_Dojo_EventScript_16EC00:: @ 816EC00 textcolor 0 msgbox gUnknown_819B44E, MSGBOX_YESNO call EventScript_1A6675 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16EC82 erasemonpic release @@ -52,7 +52,7 @@ SaffronCity_Dojo_EventScript_16EC46:: @ 816EC46 textcolor 0 msgbox gUnknown_819B49E, MSGBOX_YESNO call EventScript_1A6675 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16EC82 erasemonpic release @@ -61,11 +61,11 @@ SaffronCity_Dojo_EventScript_16EC46:: @ 816EC46 EventScript_16EC82:: @ 816EC82 erasemonpic givemon VAR_0x4001, 25, ITEM_NONE, 0, 0, 0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16ECB5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16ECEC - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A927C release end @@ -79,7 +79,7 @@ EventScript_16ECB5:: @ 816ECB5 waitfanfare setflag FLAG_GOT_HITMON_FROM_DOJO msgbox gUnknown_81A56A7, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16ED29 call EventScript_1A8C27 call EventScript_1A74EB @@ -95,7 +95,7 @@ EventScript_16ECEC:: @ 816ECEC waitfanfare setflag FLAG_GOT_HITMON_FROM_DOJO msgbox gUnknown_81A56A7, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16ED1E call EventScript_1A8C33 goto EventScript_16ED1E diff --git a/data/maps/SaffronCity_Gym/scripts.inc b/data/maps/SaffronCity_Gym/scripts.inc index 159cb1729..ad09c3e36 100644 --- a/data/maps/SaffronCity_Gym/scripts.inc +++ b/data/maps/SaffronCity_Gym/scripts.inc @@ -23,7 +23,7 @@ EventScript_16EE0A:: @ 816EE0A EventScript_16EE3D:: @ 816EE3D msgbox gUnknown_819B6FA checkitemspace ITEM_TM04, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16EE7E additem ITEM_TM04, 1 giveitemfanfaremsg gUnknown_819B7D3, ITEM_TM04 diff --git a/data/maps/SaffronCity_House1_2F/scripts.inc b/data/maps/SaffronCity_House1_2F/scripts.inc index 54b0a5a65..4ad832d23 100644 --- a/data/maps/SaffronCity_House1_2F/scripts.inc +++ b/data/maps/SaffronCity_House1_2F/scripts.inc @@ -19,18 +19,18 @@ SaffronCity_House1_2F_EventScript_16EB70:: @ 816EB70 SaffronCity_House1_2F_EventScript_16EB7B:: @ 816EB7B special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 special sub_8112364 lock faceplayer checkitem ITEM_POKE_DOLL, 1 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1C4CF6 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if eq, EventScript_16EBB7 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if eq, EventScript_16EBC0 release end diff --git a/data/maps/SaffronCity_House3/scripts.inc b/data/maps/SaffronCity_House3/scripts.inc index 8a1ec97b5..3e7b07c0d 100644 --- a/data/maps/SaffronCity_House3/scripts.inc +++ b/data/maps/SaffronCity_House3/scripts.inc @@ -8,7 +8,7 @@ SaffronCity_House3_EventScript_16F05F:: @ 816F05F goto_if TRUE, EventScript_16F0B5 msgbox gUnknown_819C142 checkitemspace ITEM_TM29, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16F0AB additem ITEM_TM29, 1 giveitemfanfaremsg gUnknown_819C16C, ITEM_TM29 diff --git a/data/maps/SaffronCity_Mart/scripts.inc b/data/maps/SaffronCity_Mart/scripts.inc index 5b77e5864..b4e263da3 100644 --- a/data/maps/SaffronCity_Mart/scripts.inc +++ b/data/maps/SaffronCity_Mart/scripts.inc @@ -11,7 +11,7 @@ SaffronCity_Mart_EventScript_16EFAC:: @ 816EFAC SaffronCity_Mart_EventScript_16EFB5:: @ 816EFB5 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 lock faceplayer diff --git a/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc b/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc index 0f2b92262..c9b2ca3a6 100644 --- a/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc @@ -25,7 +25,7 @@ SaffronCity_PokemonCenter_1F_EventScript_16F00D:: @ 816F00D SaffronCity_PokemonCenter_1F_EventScript_16F016:: @ 816F016 lock faceplayer - compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 + compare VAR_MAP_SCENE_SILPH_CO_11F, 1 goto_if eq, EventScript_16F02D msgbox gUnknown_819C0B4 release diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc b/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc index 426226422..dbf2c8f3f 100644 --- a/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc +++ b/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc @@ -71,9 +71,9 @@ Movement_16F13E:: @ 816F13E step_end SaffronCity_PokemonTrainerFanClub_MapScript2_16F144:: @ 816F144 - compare_var_to_value VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 1 + compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 1 goto_if eq, EventScript_16F267 - compare_var_to_value VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 2 + compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 2 goto_if eq, EventScript_16F15B end @@ -81,35 +81,35 @@ EventScript_16F15B:: @ 816F15B special UpdateMovedSaffronFanClubMembers setvar VAR_0x8004, 0 specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if eq, EventScript_16F207 setvar VAR_0x8004, 1 specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if eq, EventScript_16F213 setvar VAR_0x8004, 2 specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if eq, EventScript_16F21F setvar VAR_0x8004, 3 specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if eq, EventScript_16F22B setvar VAR_0x8004, 4 specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if eq, EventScript_16F237 setvar VAR_0x8004, 5 specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if eq, EventScript_16F243 setvar VAR_0x8004, 6 specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if eq, EventScript_16F24F setvar VAR_0x8004, 7 specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if eq, EventScript_16F25B end @@ -166,13 +166,13 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F281:: @ 816F281 faceplayer setvar VAR_0x8004, 0 special BufferStreakTrainerText - compare_var_to_value VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0 + compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0 goto_if eq, EventScript_16F2EE specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16F2C0 specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers - compare_var_to_value VAR_RESULT, 7 + compare VAR_RESULT, 7 goto_if eq, EventScript_16F2E4 msgbox gUnknown_819C420 release @@ -180,7 +180,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F281:: @ 816F281 EventScript_16F2C0:: @ 816F2C0 specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16F2DA msgbox gUnknown_819C390 release @@ -206,13 +206,13 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F2F8:: @ 816F2F8 faceplayer setvar VAR_0x8004, 3 special BufferStreakTrainerText - compare_var_to_value VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0 + compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0 goto_if eq, EventScript_16F365 specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16F337 specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers - compare_var_to_value VAR_RESULT, 7 + compare VAR_RESULT, 7 goto_if eq, EventScript_16F35B msgbox gUnknown_819CBD3 release @@ -220,7 +220,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F2F8:: @ 816F2F8 EventScript_16F337:: @ 816F337 specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16F351 msgbox gUnknown_819CB32 release @@ -246,13 +246,13 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F36F:: @ 816F36F faceplayer setvar VAR_0x8004, 1 special BufferStreakTrainerText - compare_var_to_value VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0 + compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0 goto_if eq, EventScript_16F3DC specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16F3AE specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers - compare_var_to_value VAR_RESULT, 7 + compare VAR_RESULT, 7 goto_if eq, EventScript_16F3D2 msgbox gUnknown_819C6BA release @@ -260,7 +260,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F36F:: @ 816F36F EventScript_16F3AE:: @ 816F3AE specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16F3C8 msgbox gUnknown_819C5A9 release @@ -286,13 +286,13 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F3E6:: @ 816F3E6 faceplayer setvar VAR_0x8004, 2 special BufferStreakTrainerText - compare_var_to_value VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0 + compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0 goto_if eq, EventScript_16F453 specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16F425 specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers - compare_var_to_value VAR_RESULT, 7 + compare VAR_RESULT, 7 goto_if eq, EventScript_16F449 msgbox gUnknown_819C986 release @@ -300,7 +300,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F3E6:: @ 816F3E6 EventScript_16F425:: @ 816F425 specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16F43F msgbox gUnknown_819C81E release @@ -327,10 +327,10 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F45D:: @ 816F45D setvar VAR_0x8004, 5 special BufferStreakTrainerText specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16F491 specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers - compare_var_to_value VAR_RESULT, 7 + compare VAR_RESULT, 7 goto_if eq, EventScript_16F4B5 msgbox gUnknown_819D01F release @@ -338,7 +338,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F45D:: @ 816F45D EventScript_16F491:: @ 816F491 specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16F4AB msgbox gUnknown_819CEDF release @@ -360,10 +360,10 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F4BF:: @ 816F4BF setvar VAR_0x8004, 4 special BufferStreakTrainerText specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16F4F3 specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers - compare_var_to_value VAR_RESULT, 7 + compare VAR_RESULT, 7 goto_if eq, EventScript_16F517 msgbox gUnknown_819CDDA release @@ -371,7 +371,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F4BF:: @ 816F4BF EventScript_16F4F3:: @ 816F4F3 specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16F50D msgbox gUnknown_819CCF3 release @@ -393,10 +393,10 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F521:: @ 816F521 setvar VAR_0x8004, 6 special BufferStreakTrainerText specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16F555 specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers - compare_var_to_value VAR_RESULT, 7 + compare VAR_RESULT, 7 goto_if eq, EventScript_16F579 msgbox gUnknown_819D1AE release @@ -404,7 +404,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F521:: @ 816F521 EventScript_16F555:: @ 816F555 specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16F56F msgbox gUnknown_819D0E3 release @@ -426,10 +426,10 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F583:: @ 816F583 setvar VAR_0x8004, 7 special BufferStreakTrainerText specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16F5B7 specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers - compare_var_to_value VAR_RESULT, 7 + compare VAR_RESULT, 7 goto_if eq, EventScript_16F5DB msgbox gUnknown_819D3D2 release @@ -437,7 +437,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F583:: @ 816F583 EventScript_16F5B7:: @ 816F5B7 specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16F5D1 msgbox gUnknown_819D2B4 release diff --git a/data/maps/SeafoamIslands_1F/scripts.inc b/data/maps/SeafoamIslands_1F/scripts.inc index 336c75f9f..5cb6d2208 100644 --- a/data/maps/SeafoamIslands_1F/scripts.inc +++ b/data/maps/SeafoamIslands_1F/scripts.inc @@ -1,7 +1,7 @@ SeafoamIslands_1F_MapScripts:: @ 8162F43 - map_script 3, SeafoamIslands_1F_MapScript1_162F49 + map_script MAP_SCRIPT_ON_TRANSITION, SeafoamIslands_1F_OnTransition .byte 0 -SeafoamIslands_1F_MapScript1_162F49:: @ 8162F49 +SeafoamIslands_1F_OnTransition:: @ 8162F49 setworldmapflag FLAG_WORLD_MAP_SEAFOAM_ISLANDS_1F end diff --git a/data/maps/SeafoamIslands_B3F/scripts.inc b/data/maps/SeafoamIslands_B3F/scripts.inc index c566ab522..0ea5df1b7 100644 --- a/data/maps/SeafoamIslands_B3F/scripts.inc +++ b/data/maps/SeafoamIslands_B3F/scripts.inc @@ -16,7 +16,7 @@ EventScript_162F6D:: @ 8162F6D call_if FALSE, EventScript_162FF0 checkflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_2 call_if FALSE, EventScript_162FF0 - compare_var_to_value VAR_0x4002, 2 + compare VAR_0x4002, 2 call_if eq, EventScript_162F90 return @@ -39,12 +39,12 @@ EventScript_162FA2:: @ 8162FA2 call_if FALSE, EventScript_162FF0 checkflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_2 call_if FALSE, EventScript_162FF0 - compare_var_to_value VAR_0x4002, 2 + compare VAR_0x4002, 2 goto_if eq, EventScript_16300C getplayerxy VAR_0x8008, VAR_0x8009 - compare_var_to_value VAR_0x8008, 24 + compare VAR_0x8008, 24 call_if lt, EventScript_162FF6 - compare_var_to_value VAR_0x8008, 24 + compare VAR_0x8008, 24 call_if ge, EventScript_163001 setvar VAR_MAP_SCENE_SEAFOAM_ISLANDS_B4F, 1 warp MAP_SEAFOAM_ISLANDS_B4F, 255, 27, 21 diff --git a/data/maps/SeafoamIslands_B4F/scripts.inc b/data/maps/SeafoamIslands_B4F/scripts.inc index 8d69a4808..1a25b02f8 100644 --- a/data/maps/SeafoamIslands_B4F/scripts.inc +++ b/data/maps/SeafoamIslands_B4F/scripts.inc @@ -13,7 +13,7 @@ SeafoamIslands_B4F_MapScript2_163048:: @ 8163048 EventScript_163052:: @ 8163052 specialvar VAR_RESULT, Special_GetBattleOutcome - compare_var_to_value VAR_RESULT, B_OUTCOME_CAUGHT + compare VAR_RESULT, B_OUTCOME_CAUGHT goto_if ne, EventScript_1A77A9 removeobject VAR_LAST_TALKED return @@ -33,7 +33,7 @@ EventScript_163082:: @ 8163082 call_if FALSE, EventScript_163169 checkflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_2 call_if FALSE, EventScript_163169 - compare_var_to_value VAR_0x4002, 2 + compare VAR_0x4002, 2 call_if eq, EventScript_1630A5 return @@ -55,7 +55,7 @@ SeafoamIslands_B4F_MapScript3_1630B1:: @ 81630B1 call_if FALSE, EventScript_163169 checkflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_2 call_if FALSE, EventScript_163169 - compare_var_to_value VAR_0x4002, 2 + compare VAR_0x4002, 2 goto_if eq, EventScript_1630D4 end @@ -99,12 +99,12 @@ EventScript_163121:: @ 8163121 call_if FALSE, EventScript_163169 checkflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_2 call_if FALSE, EventScript_163169 - compare_var_to_value VAR_0x4002, 2 + compare VAR_0x4002, 2 goto_if eq, EventScript_163185 getplayerxy VAR_0x8008, VAR_0x8009 - compare_var_to_value VAR_0x8008, 9 + compare VAR_0x8008, 9 call_if lt, EventScript_16316F - compare_var_to_value VAR_0x8008, 9 + compare VAR_0x8008, 9 call_if ge, EventScript_16317A special sub_805D1A8 setvar VAR_0x4001, 0 @@ -164,7 +164,7 @@ Movement_1631AA:: @ 81631AA SeafoamIslands_B4F_EventScript_1631AC:: @ 81631AC special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 special sub_8112364 lock @@ -183,11 +183,11 @@ SeafoamIslands_B4F_EventScript_1631AC:: @ 81631AC waitstate clearflag FLAG_SYS_SPECIAL_WILD_BATTLE specialvar VAR_RESULT, Special_GetBattleOutcome - compare_var_to_value VAR_RESULT, B_OUTCOME_WON + compare VAR_RESULT, B_OUTCOME_WON goto_if eq, EventScript_16320F - compare_var_to_value VAR_RESULT, B_OUTCOME_RAN + compare VAR_RESULT, B_OUTCOME_RAN goto_if eq, EventScript_163218 - compare_var_to_value VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED + compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED goto_if eq, EventScript_163218 setflag FLAG_FOUGHT_ARTICUNO release diff --git a/data/maps/SevenIsland_House_Room1/scripts.inc b/data/maps/SevenIsland_House_Room1/scripts.inc index fd83fa051..aa4e7f1ae 100644 --- a/data/maps/SevenIsland_House_Room1/scripts.inc +++ b/data/maps/SevenIsland_House_Room1/scripts.inc @@ -5,9 +5,9 @@ SevenIsland_House_Room1_MapScripts:: @ 817088A SevenIsland_House_Room1_MapScript1_170895:: @ 8170895 special ValidateEReaderTrainer - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if eq, EventScript_1708AF - compare_var_to_value VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 0 + compare VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 0 call_if ne, EventScript_1708C3 end @@ -39,11 +39,11 @@ EventScript_1708E9:: @ 1708E9 moveobjectoffscreen 1 applymovement 255, Movement_1A75E9 waitmovement 0 - compare_var_to_value VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 1 + compare VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 1 call_if eq, EventScript_170938 - compare_var_to_value VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 2 + compare VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 2 call_if eq, EventScript_170941 - compare_var_to_value VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 3 + compare VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 3 call_if eq, EventScript_17094A special LoadPlayerParty setvar VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 0 @@ -75,9 +75,9 @@ SevenIsland_House_Room1_EventScript_170958:: @ 8170958 lock faceplayer special ValidateEReaderTrainer - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if eq, EventScript_17097D - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 goto_if eq, EventScript_170987 msgbox gUnknown_81A049B release @@ -92,27 +92,27 @@ EventScript_170987:: @ 8170987 special SavePlayerParty special Special_BufferEReaderTrainerName5 msgbox gUnknown_81A0598, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_170A11 call EventScript_170A1E - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_170A11 msgbox gUnknown_81A0788, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_170A11 special LoadPlayerParty call EventScript_1A4EAF - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_170A11 special SavePlayerParty special ReducePlayerPartyToThree msgbox gUnknown_81A07C4 closemessage - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if eq, EventScript_170A2D - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if eq, EventScript_170A3F - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if eq, EventScript_170A51 warp MAP_SEVEN_ISLAND_HOUSE_ROOM2, 255, 3, 1 waitstate diff --git a/data/maps/SevenIsland_House_Room2/scripts.inc b/data/maps/SevenIsland_House_Room2/scripts.inc index f2928f916..03a64b8e6 100644 --- a/data/maps/SevenIsland_House_Room2/scripts.inc +++ b/data/maps/SevenIsland_House_Room2/scripts.inc @@ -22,11 +22,11 @@ EventScript_170A97:: @ 8170A97 setvar VAR_0x8005, 0 special StartSpecialBattle waitstate - compare_var_to_value VAR_RESULT, 3 + compare VAR_RESULT, 3 call_if eq, EventScript_170AFE - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if eq, EventScript_170B0C - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 call_if eq, EventScript_170B17 closemessage special sp000_heal_pokemon diff --git a/data/maps/SevenIsland_Mart/scripts.inc b/data/maps/SevenIsland_Mart/scripts.inc index 58312009f..d4a17878b 100644 --- a/data/maps/SevenIsland_Mart/scripts.inc +++ b/data/maps/SevenIsland_Mart/scripts.inc @@ -3,7 +3,7 @@ SevenIsland_Mart_MapScripts:: @ 8170B30 SevenIsland_Mart_EventScript_170B31:: @ 8170B31 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 lock faceplayer diff --git a/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc b/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc index dcf37028d..1703a174c 100644 --- a/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc +++ b/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc @@ -15,12 +15,12 @@ SevenIsland_SevaultCanyon_House_EventScript_172183:: @ 8172183 msgbox gUnknown_81A4D72 textcolor 3 msgbox gUnknown_81A4DAF, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_172225 msgbox gUnknown_81A4DD8 closemessage call EventScript_1A6675 - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 call_if ne, EventScript_172206 delay 30 playbgm MUS_P_SCHOOL, 0 diff --git a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc index 442e13942..41e452568 100644 --- a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc +++ b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc @@ -28,77 +28,77 @@ EventScript_164E07:: @ 8164E07 SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E39:: @ 8164E39 lockall - compare_var_to_value VAR_0x4001, 100 + compare VAR_0x4001, 100 goto_if eq, EventScript_164F8A call EventScript_164F2E setvar VAR_0x4001, 100 - compare_var_to_value VAR_0x4008, 7 + compare VAR_0x4008, 7 goto_if eq, EventScript_164F8C releaseall end SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E5C:: @ 8164E5C lockall - compare_var_to_value VAR_0x4002, 100 + compare VAR_0x4002, 100 goto_if eq, EventScript_164F8A call EventScript_164F2E setvar VAR_0x4002, 100 - compare_var_to_value VAR_0x4008, 7 + compare VAR_0x4008, 7 goto_if eq, EventScript_164F8C releaseall end SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E7F:: @ 8164E7F lockall - compare_var_to_value VAR_0x4003, 100 + compare VAR_0x4003, 100 goto_if eq, EventScript_164F8A call EventScript_164F2E setvar VAR_0x4003, 100 - compare_var_to_value VAR_0x4008, 7 + compare VAR_0x4008, 7 goto_if eq, EventScript_164F8C releaseall end SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EA2:: @ 8164EA2 lockall - compare_var_to_value VAR_0x4004, 100 + compare VAR_0x4004, 100 goto_if eq, EventScript_164F8A call EventScript_164F2E setvar VAR_0x4004, 100 - compare_var_to_value VAR_0x4008, 7 + compare VAR_0x4008, 7 goto_if eq, EventScript_164F8C releaseall end SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EC5:: @ 8164EC5 lockall - compare_var_to_value VAR_0x4005, 100 + compare VAR_0x4005, 100 goto_if eq, EventScript_164F8A call EventScript_164F2E setvar VAR_0x4005, 100 - compare_var_to_value VAR_0x4008, 7 + compare VAR_0x4008, 7 goto_if eq, EventScript_164F8C releaseall end SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EE8:: @ 8164EE8 lockall - compare_var_to_value VAR_0x4006, 100 + compare VAR_0x4006, 100 goto_if eq, EventScript_164F8A call EventScript_164F2E setvar VAR_0x4006, 100 - compare_var_to_value VAR_0x4008, 7 + compare VAR_0x4008, 7 goto_if eq, EventScript_164F8C releaseall end SevenIsland_SevaultCanyon_TanobyKey_EventScript_164F0B:: @ 8164F0B lockall - compare_var_to_value VAR_0x4007, 100 + compare VAR_0x4007, 100 goto_if eq, EventScript_164F8A call EventScript_164F2E setvar VAR_0x4007, 100 - compare_var_to_value VAR_0x4008, 7 + compare VAR_0x4008, 7 goto_if eq, EventScript_164F8C releaseall end diff --git a/data/maps/SevenIsland_TrainerTower/scripts.inc b/data/maps/SevenIsland_TrainerTower/scripts.inc index e0b5f78c0..9e3139dd3 100644 --- a/data/maps/SevenIsland_TrainerTower/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower/scripts.inc @@ -1,8 +1,8 @@ SevenIsland_TrainerTower_MapScripts:: @ 8168BD5 - map_script 3, SevenIsland_TrainerTower_MapScript1_168BDB + map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TrainerTower_OnTransition .byte 0 -SevenIsland_TrainerTower_MapScript1_168BDB:: @ 8168BDB +SevenIsland_TrainerTower_OnTransition:: @ 8168BDB setvar VAR_MAP_SCENE_TRAINER_TOWER, 0 end diff --git a/data/maps/SevenIsland_TrainerTower_1F/scripts.inc b/data/maps/SevenIsland_TrainerTower_1F/scripts.inc index eb9475260..4987c1142 100644 --- a/data/maps/SevenIsland_TrainerTower_1F/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_1F/scripts.inc @@ -1,7 +1,7 @@ SevenIsland_TrainerTower_1F_MapScripts:: @ 81646B8 - map_script 5, SevenIsland_TrainerTower_1F_MapScript1_1C4F54 - map_script 3, SevenIsland_TrainerTower_1F_MapScript2_1C4F62 - map_script 2, SevenIsland_TrainerTower_1F_MapScript3_1C5046 + map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_1F_MapScript1_1C4F54 + map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TrainerTower_1F_MapScript2_1C4F62 + map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_1F_MapScript3_1C5046 .byte 0 SevenIsland_TrainerTower_2F_EventScript_1646C8:: @ 81646C8 diff --git a/data/maps/SevenIsland_TrainerTower_2F/scripts.inc b/data/maps/SevenIsland_TrainerTower_2F/scripts.inc index 91107975b..9e61d0dfd 100644 --- a/data/maps/SevenIsland_TrainerTower_2F/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_2F/scripts.inc @@ -1,7 +1,7 @@ SevenIsland_TrainerTower_2F_MapScripts:: @ 81646E6 - map_script 5, SevenIsland_TrainerTower_2F_MapScript1_1C4F54 - map_script 3, SevenIsland_TrainerTower_2F_MapScript2_1C4F62 - map_script 2, SevenIsland_TrainerTower_2F_MapScript3_1C5046 + map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_2F_MapScript1_1C4F54 + map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TrainerTower_2F_MapScript2_1C4F62 + map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_2F_MapScript3_1C5046 .byte 0 SevenIsland_TrainerTower_2F_EventScript_1646F6:: @ 81646F6 diff --git a/data/maps/SevenIsland_TrainerTower_3F/scripts.inc b/data/maps/SevenIsland_TrainerTower_3F/scripts.inc index c4ecde9a0..e9afcff6c 100644 --- a/data/maps/SevenIsland_TrainerTower_3F/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_3F/scripts.inc @@ -1,7 +1,7 @@ SevenIsland_TrainerTower_3F_MapScripts:: @ 8164714 - map_script 5, SevenIsland_TrainerTower_3F_MapScript1_1C4F54 - map_script 3, SevenIsland_TrainerTower_3F_MapScript2_1C4F62 - map_script 2, SevenIsland_TrainerTower_3F_MapScript3_1C5046 + map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_3F_MapScript1_1C4F54 + map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TrainerTower_3F_MapScript2_1C4F62 + map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_3F_MapScript3_1C5046 .byte 0 SevenIsland_TrainerTower_3F_EventScript_164724:: @ 8164724 diff --git a/data/maps/SevenIsland_TrainerTower_4F/scripts.inc b/data/maps/SevenIsland_TrainerTower_4F/scripts.inc index 32d17a844..cfa0be11b 100644 --- a/data/maps/SevenIsland_TrainerTower_4F/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_4F/scripts.inc @@ -1,7 +1,7 @@ SevenIsland_TrainerTower_4F_MapScripts:: @ 8164742 - map_script 5, SevenIsland_TrainerTower_4F_MapScript1_1C4F54 - map_script 3, SevenIsland_TrainerTower_4F_MapScript2_1C4F62 - map_script 2, SevenIsland_TrainerTower_4F_MapScript3_1C5046 + map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_4F_MapScript1_1C4F54 + map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TrainerTower_4F_MapScript2_1C4F62 + map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_4F_MapScript3_1C5046 .byte 0 SevenIsland_TrainerTower_4F_EventScript_164752:: @ 8164752 diff --git a/data/maps/SevenIsland_TrainerTower_5F/scripts.inc b/data/maps/SevenIsland_TrainerTower_5F/scripts.inc index 5c461c0e8..35ccdf129 100644 --- a/data/maps/SevenIsland_TrainerTower_5F/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_5F/scripts.inc @@ -1,7 +1,7 @@ SevenIsland_TrainerTower_5F_MapScripts:: @ 8164770 - map_script 5, SevenIsland_TrainerTower_5F_MapScript1_1C4F54 - map_script 3, SevenIsland_TrainerTower_5F_MapScript2_1C4F62 - map_script 2, SevenIsland_TrainerTower_5F_MapScript3_1C5046 + map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_5F_MapScript1_1C4F54 + map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TrainerTower_5F_MapScript2_1C4F62 + map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_5F_MapScript3_1C5046 .byte 0 SevenIsland_TrainerTower_5F_EventScript_164780:: @ 8164780 diff --git a/data/maps/SevenIsland_TrainerTower_6F/scripts.inc b/data/maps/SevenIsland_TrainerTower_6F/scripts.inc index 5dd711203..361c92749 100644 --- a/data/maps/SevenIsland_TrainerTower_6F/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_6F/scripts.inc @@ -1,7 +1,7 @@ SevenIsland_TrainerTower_6F_MapScripts:: @ 816479E - map_script 5, SevenIsland_TrainerTower_6F_MapScript1_1C4F54 - map_script 3, SevenIsland_TrainerTower_6F_MapScript2_1C4F62 - map_script 2, SevenIsland_TrainerTower_6F_MapScript3_1C5046 + map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_6F_MapScript1_1C4F54 + map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TrainerTower_6F_MapScript2_1C4F62 + map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_6F_MapScript3_1C5046 .byte 0 SevenIsland_TrainerTower_6F_EventScript_1647AE:: @ 81647AE diff --git a/data/maps/SevenIsland_TrainerTower_7F/scripts.inc b/data/maps/SevenIsland_TrainerTower_7F/scripts.inc index 2a74cfb91..be0036605 100644 --- a/data/maps/SevenIsland_TrainerTower_7F/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_7F/scripts.inc @@ -1,7 +1,7 @@ SevenIsland_TrainerTower_7F_MapScripts:: @ 81647CC - map_script 5, SevenIsland_TrainerTower_7F_MapScript1_1C4F54 - map_script 3, SevenIsland_TrainerTower_7F_MapScript2_1C4F62 - map_script 2, SevenIsland_TrainerTower_7F_MapScript3_1C5046 + map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_7F_MapScript1_1C4F54 + map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TrainerTower_7F_MapScript2_1C4F62 + map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_7F_MapScript3_1C5046 .byte 0 SevenIsland_TrainerTower_7F_EventScript_1647DC:: @ 81647DC diff --git a/data/maps/SevenIsland_TrainerTower_8F/scripts.inc b/data/maps/SevenIsland_TrainerTower_8F/scripts.inc index 1219425d0..b51982f48 100644 --- a/data/maps/SevenIsland_TrainerTower_8F/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_8F/scripts.inc @@ -1,7 +1,7 @@ SevenIsland_TrainerTower_8F_MapScripts:: @ 81647FA - map_script 5, SevenIsland_TrainerTower_8F_MapScript1_1C4F54 - map_script 3, SevenIsland_TrainerTower_8F_MapScript2_1C4F62 - map_script 2, SevenIsland_TrainerTower_8F_MapScript3_1C5046 + map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_8F_MapScript1_1C4F54 + map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TrainerTower_8F_MapScript2_1C4F62 + map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_8F_MapScript3_1C5046 .byte 0 SevenIsland_TrainerTower_8F_EventScript_16480A:: @ 816480A diff --git a/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc b/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc index e8ee2450f..96d1e6be7 100644 --- a/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc @@ -1,6 +1,6 @@ SevenIsland_TrainerTower_Elevator_MapScripts:: @ 8164AF8 - map_script 5, SevenIsland_TrainerTower_Elevator_MapScript1_1C4F54 - map_script 2, SevenIsland_TrainerTower_Elevator_MapScript2_1C5046 + map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_Elevator_MapScript1_1C4F54 + map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_Elevator_MapScript2_1C5046 .byte 0 SevenIsland_TrainerTower_Elevator_EventScript_164B03:: @ 8164B03 @@ -40,7 +40,7 @@ EventScript_164B5E:: @ 8164B5E EventScript_164B90:: @ 8164B90 setvar VAR_0x8006, 3 setdynamicwarp MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY, 255, 17, 8 - compare_var_to_value VAR_ELEVATOR_FLOOR, 3 + compare VAR_ELEVATOR_FLOOR, 3 goto_if eq, EventScript_164BD3 call EventScript_164BD8 setvar VAR_ELEVATOR_FLOOR, 3 diff --git a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc b/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc index 142f33ee3..e09c67109 100644 --- a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc @@ -1,18 +1,18 @@ SevenIsland_TrainerTower_Lobby_MapScripts:: @ 8164839 - map_script 5, SevenIsland_TrainerTower_Lobby_MapScript1_164853 - map_script 7, SevenIsland_TrainerTower_Lobby_MapScript2_164887 - map_script 3, SevenIsland_TrainerTower_Lobby_MapScript3_1648AD - map_script 1, SevenIsland_TrainerTower_Lobby_MapScript4_164897 - map_script 2, SevenIsland_TrainerTower_Lobby_MapScript5_1648B6 + map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_Lobby_OnResume + map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, SevenIsland_TrainerTower_Lobby_OnReturnToField + map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TrainerTower_Lobby_OnTransition + map_script MAP_SCRIPT_ON_LOAD, SevenIsland_TrainerTower_Lobby_OnLoad + map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_Lobby_OnFrame .byte 0 -SevenIsland_TrainerTower_Lobby_MapScript1_164853:: @ 8164853 +SevenIsland_TrainerTower_Lobby_OnResume:: @ 8164853 setvar VAR_0x4002, 0 setvar VAR_0x8004, 10 special sub_815D9E8 setvar VAR_0x8004, 18 special sub_815D9E8 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_164886 setvar VAR_0x4000, 0 setobjectxy 255, 9, 7 @@ -21,7 +21,7 @@ SevenIsland_TrainerTower_Lobby_MapScript1_164853:: @ 8164853 EventScript_164886:: @ 8164886 end -SevenIsland_TrainerTower_Lobby_MapScript2_164887:: @ 8164887 +SevenIsland_TrainerTower_Lobby_OnReturnToField:: @ 8164887 addobject 1 addobject 2 addobject 3 @@ -29,8 +29,8 @@ SevenIsland_TrainerTower_Lobby_MapScript2_164887:: @ 8164887 addobject 5 end -SevenIsland_TrainerTower_Lobby_MapScript4_164897:: @ 8164897 - compare_var_to_value VAR_0x400D, 17 +SevenIsland_TrainerTower_Lobby_OnLoad:: @ 8164897 + compare VAR_0x400D, 17 call_if eq, EventScript_1648A3 end @@ -38,12 +38,12 @@ EventScript_1648A3:: @ 81648A3 setmetatile 17, 10, 647, 0 return -SevenIsland_TrainerTower_Lobby_MapScript3_1648AD:: @ 81648AD +SevenIsland_TrainerTower_Lobby_OnTransition:: @ 81648AD setworldmapflag FLAG_WORLD_MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY getplayerxy VAR_0x400D, VAR_RESULT end -SevenIsland_TrainerTower_Lobby_MapScript5_1648B6:: @ 81648B6 +SevenIsland_TrainerTower_Lobby_OnFrame:: @ 81648B6 map_script_2 VAR_0x4000, 0, EventScript_1648ED map_script_2 VAR_0x400D, 0x11, EventScript_1648C8 .2byte 0 @@ -111,7 +111,7 @@ SevenIsland_TrainerTower_Lobby_EventScript_164966:: @ 8164966 faceplayer setvar VAR_0x8004, 20 special sub_815D9E8 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_164988 msgbox gUnknown_817C9A2 goto EventScript_164990 @@ -125,7 +125,7 @@ EventScript_164990:: @ 8164990 SevenIsland_TrainerTower_Lobby_EventScript_164992:: @ 8164992 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 lock faceplayer @@ -158,7 +158,7 @@ SevenIsland_TrainerTower_Lobby_EventScript_1649CE:: @ 81649CE msgbox gUnknown_817C794 setvar VAR_0x8004, 17 special sub_815D9E8 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_164A00 msgbox gUnknown_817C7D9 goto EventScript_164A08 diff --git a/data/maps/SilphCo_10F/map.json b/data/maps/SilphCo_10F/map.json index f3e5abafe..7176da07c 100644 --- a/data/maps/SilphCo_10F/map.json +++ b/data/maps/SilphCo_10F/map.json @@ -143,28 +143,28 @@ "x": 12, "y": 11, "elevation": 0, - "script": "SilphCo_10F_EventScript_1A8AEF" + "script": "SilphCo_10F_EventScript_Door" }, { "type": "bg_event_type_0", "x": 13, "y": 11, "elevation": 0, - "script": "SilphCo_10F_EventScript_1A8AEF" + "script": "SilphCo_10F_EventScript_Door" }, { "type": "bg_event_type_0", "x": 12, "y": 12, "elevation": 0, - "script": "SilphCo_10F_EventScript_1A8AEF" + "script": "SilphCo_10F_EventScript_Door" }, { "type": "bg_event_type_0", "x": 13, "y": 12, "elevation": 0, - "script": "SilphCo_10F_EventScript_1A8AEF" + "script": "SilphCo_10F_EventScript_Door" }, { "type": "hidden_item", diff --git a/data/maps/SilphCo_10F/scripts.inc b/data/maps/SilphCo_10F/scripts.inc index 0b8e0e2cb..3efd6025e 100644 --- a/data/maps/SilphCo_10F/scripts.inc +++ b/data/maps/SilphCo_10F/scripts.inc @@ -4,13 +4,13 @@ SilphCo_10F_MapScripts:: @ 8161D86 SilphCo_10F_MapScript1_161D8C:: @ 8161D8C checkflag FLAG_SILPH_10F_DOOR - call_if FALSE, EventScript_1A84D6 + call_if FALSE, EventScript_Close10FDoor end SilphCo_10F_EventScript_161D96:: @ 8161D96 lock faceplayer - compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 + compare VAR_MAP_SCENE_SILPH_CO_11F, 1 goto_if ge, EventScript_161DAD msgbox gUnknown_8176DBA release diff --git a/data/maps/SilphCo_11F/map.json b/data/maps/SilphCo_11F/map.json index bd9d83597..8d34641e8 100644 --- a/data/maps/SilphCo_11F/map.json +++ b/data/maps/SilphCo_11F/map.json @@ -141,28 +141,28 @@ "x": 5, "y": 16, "elevation": 3, - "script": "SilphCo_11F_EventScript_1A8B09" + "script": "SilphCo_11F_EventScript_Door" }, { "type": "bg_event_type_0", "x": 5, "y": 17, "elevation": 3, - "script": "SilphCo_11F_EventScript_1A8B09" + "script": "SilphCo_11F_EventScript_Door" }, { "type": "bg_event_type_0", "x": 6, "y": 16, "elevation": 3, - "script": "SilphCo_11F_EventScript_1A8B09" + "script": "SilphCo_11F_EventScript_Door" }, { "type": "bg_event_type_0", "x": 6, "y": 17, "elevation": 3, - "script": "SilphCo_11F_EventScript_1A8B09" + "script": "SilphCo_11F_EventScript_Door" }, { "type": "hidden_item", diff --git a/data/maps/SilphCo_11F/scripts.inc b/data/maps/SilphCo_11F/scripts.inc index 292498c7b..4465e16b7 100644 --- a/data/maps/SilphCo_11F/scripts.inc +++ b/data/maps/SilphCo_11F/scripts.inc @@ -4,7 +4,7 @@ SilphCo_11F_MapScripts:: @ 8161DEE SilphCo_11F_MapScript1_161DF4:: @ 8161DF4 checkflag FLAG_SILPH_11F_DOOR - call_if FALSE, EventScript_1A8504 + call_if FALSE, EventScript_Close11FDoor end SilphCo_11F_EventScript_161DFE:: @ 8161DFE @@ -13,12 +13,12 @@ SilphCo_11F_EventScript_161DFE:: @ 8161DFE checkflag FLAG_GOT_MASTER_BALL_FROM_SILPH goto_if TRUE, EventScript_161E75 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if eq, EventScript_161E59 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if eq, EventScript_161E62 checkitemspace ITEM_MASTER_BALL, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_161E6B additem ITEM_MASTER_BALL, 1 giveitemfanfaremsg gUnknown_8176FBD, ITEM_MASTER_BALL, 1, MUS_FAN5 @@ -72,9 +72,9 @@ EventScript_161EA0:: @ 8161EA0 delay 25 msgbox gUnknown_8177108 closemessage - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 call_if eq, EventScript_161F00 - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if eq, EventScript_161F12 setvar VAR_LAST_TALKED, 3 trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_BOSS_GIOVANNI_2, 0, Text_1771AB diff --git a/data/maps/SilphCo_2F/map.json b/data/maps/SilphCo_2F/map.json index a2d405b3a..d937d283c 100644 --- a/data/maps/SilphCo_2F/map.json +++ b/data/maps/SilphCo_2F/map.json @@ -137,56 +137,56 @@ "x": 5, "y": 8, "elevation": 0, - "script": "SilphCo_2F_EventScript_1A891B" + "script": "SilphCo_2F_EventScript_Door1" }, { "type": "bg_event_type_0", "x": 6, "y": 8, "elevation": 0, - "script": "SilphCo_2F_EventScript_1A891B" + "script": "SilphCo_2F_EventScript_Door1" }, { "type": "bg_event_type_0", "x": 5, "y": 9, "elevation": 0, - "script": "SilphCo_2F_EventScript_1A891B" + "script": "SilphCo_2F_EventScript_Door1" }, { "type": "bg_event_type_0", "x": 6, "y": 9, "elevation": 0, - "script": "SilphCo_2F_EventScript_1A891B" + "script": "SilphCo_2F_EventScript_Door1" }, { "type": "bg_event_type_0", "x": 5, "y": 15, "elevation": 0, - "script": "SilphCo_2F_EventScript_1A8935" + "script": "SilphCo_2F_EventScript_Door2" }, { "type": "bg_event_type_0", "x": 6, "y": 15, "elevation": 0, - "script": "SilphCo_2F_EventScript_1A8935" + "script": "SilphCo_2F_EventScript_Door2" }, { "type": "bg_event_type_0", "x": 5, "y": 16, "elevation": 0, - "script": "SilphCo_2F_EventScript_1A8935" + "script": "SilphCo_2F_EventScript_Door2" }, { "type": "bg_event_type_0", "x": 6, "y": 16, "elevation": 0, - "script": "SilphCo_2F_EventScript_1A8935" + "script": "SilphCo_2F_EventScript_Door2" }, { "type": "hidden_item", diff --git a/data/maps/SilphCo_2F/scripts.inc b/data/maps/SilphCo_2F/scripts.inc index 1d08e777b..caafb4f23 100644 --- a/data/maps/SilphCo_2F/scripts.inc +++ b/data/maps/SilphCo_2F/scripts.inc @@ -4,9 +4,9 @@ SilphCo_2F_MapScripts:: @ 8161641 SilphCo_2F_MapScript1_161647:: @ 8161647 checkflag FLAG_SILPH_2F_DOOR_1 - call_if FALSE, EventScript_1A8149 + call_if FALSE, EventScript_Close2FDoor1 checkflag FLAG_SILPH_2F_DOOR_2 - call_if FALSE, EventScript_1A8177 + call_if FALSE, EventScript_Close2FDoor2 end SilphCo_2F_EventScript_16165A:: @ 816165A diff --git a/data/maps/SilphCo_3F/map.json b/data/maps/SilphCo_3F/map.json index 5581d6926..e4daa7636 100644 --- a/data/maps/SilphCo_3F/map.json +++ b/data/maps/SilphCo_3F/map.json @@ -145,56 +145,56 @@ "x": 10, "y": 12, "elevation": 3, - "script": "SilphCo_3F_EventScript_1A894F" + "script": "SilphCo_3F_EventScript_Door1" }, { "type": "bg_event_type_0", "x": 10, "y": 13, "elevation": 3, - "script": "SilphCo_3F_EventScript_1A894F" + "script": "SilphCo_3F_EventScript_Door1" }, { "type": "bg_event_type_0", "x": 21, "y": 12, "elevation": 3, - "script": "SilphCo_3F_EventScript_1A8969" + "script": "SilphCo_3F_EventScript_Door2" }, { "type": "bg_event_type_0", "x": 21, "y": 13, "elevation": 3, - "script": "SilphCo_3F_EventScript_1A8969" + "script": "SilphCo_3F_EventScript_Door2" }, { "type": "bg_event_type_0", "x": 9, "y": 12, "elevation": 3, - "script": "SilphCo_3F_EventScript_1A894F" + "script": "SilphCo_3F_EventScript_Door1" }, { "type": "bg_event_type_0", "x": 9, "y": 13, "elevation": 3, - "script": "SilphCo_3F_EventScript_1A894F" + "script": "SilphCo_3F_EventScript_Door1" }, { "type": "bg_event_type_0", "x": 20, "y": 12, "elevation": 3, - "script": "SilphCo_3F_EventScript_1A8969" + "script": "SilphCo_3F_EventScript_Door2" }, { "type": "bg_event_type_0", "x": 20, "y": 13, "elevation": 3, - "script": "SilphCo_3F_EventScript_1A8969" + "script": "SilphCo_3F_EventScript_Door2" }, { "type": "hidden_item", diff --git a/data/maps/SilphCo_3F/scripts.inc b/data/maps/SilphCo_3F/scripts.inc index 8187e8e45..8ce210653 100644 --- a/data/maps/SilphCo_3F/scripts.inc +++ b/data/maps/SilphCo_3F/scripts.inc @@ -4,15 +4,15 @@ SilphCo_3F_MapScripts:: @ 81616C5 SilphCo_3F_MapScript1_1616CB:: @ 81616CB checkflag FLAG_SILPH_3F_DOOR_1 - call_if FALSE, EventScript_1A81A5 + call_if FALSE, EventScript_Close3FDoor1 checkflag FLAG_SILPH_3F_DOOR_2 - call_if FALSE, EventScript_1A81DC + call_if FALSE, EventScript_Close3FDoor2 end SilphCo_3F_EventScript_1616DE:: @ 81616DE lock faceplayer - compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 + compare VAR_MAP_SCENE_SILPH_CO_11F, 1 goto_if ge, EventScript_1616F5 msgbox gUnknown_81758AD release diff --git a/data/maps/SilphCo_4F/map.json b/data/maps/SilphCo_4F/map.json index 2bfb46286..813b7cfb6 100644 --- a/data/maps/SilphCo_4F/map.json +++ b/data/maps/SilphCo_4F/map.json @@ -176,56 +176,56 @@ "x": 3, "y": 16, "elevation": 0, - "script": "SilphCo_4F_EventScript_1A8983" + "script": "SilphCo_4F_EventScript_Door1" }, { "type": "bg_event_type_0", "x": 4, "y": 16, "elevation": 0, - "script": "SilphCo_4F_EventScript_1A8983" + "script": "SilphCo_4F_EventScript_Door1" }, { "type": "bg_event_type_0", "x": 3, "y": 17, "elevation": 0, - "script": "SilphCo_4F_EventScript_1A8983" + "script": "SilphCo_4F_EventScript_Door1" }, { "type": "bg_event_type_0", "x": 4, "y": 17, "elevation": 0, - "script": "SilphCo_4F_EventScript_1A8983" + "script": "SilphCo_4F_EventScript_Door1" }, { "type": "bg_event_type_0", "x": 15, "y": 11, "elevation": 0, - "script": "SilphCo_4F_EventScript_1A899D" + "script": "SilphCo_4F_EventScript_Door2" }, { "type": "bg_event_type_0", "x": 14, "y": 11, "elevation": 0, - "script": "SilphCo_4F_EventScript_1A899D" + "script": "SilphCo_4F_EventScript_Door2" }, { "type": "bg_event_type_0", "x": 14, "y": 12, "elevation": 0, - "script": "SilphCo_4F_EventScript_1A899D" + "script": "SilphCo_4F_EventScript_Door2" }, { "type": "bg_event_type_0", "x": 15, "y": 12, "elevation": 0, - "script": "SilphCo_4F_EventScript_1A899D" + "script": "SilphCo_4F_EventScript_Door2" }, { "type": "hidden_item", diff --git a/data/maps/SilphCo_4F/scripts.inc b/data/maps/SilphCo_4F/scripts.inc index 176b6a4d3..b5ef8541d 100644 --- a/data/maps/SilphCo_4F/scripts.inc +++ b/data/maps/SilphCo_4F/scripts.inc @@ -4,15 +4,15 @@ SilphCo_4F_MapScripts:: @ 8161736 SilphCo_4F_MapScript1_16173C:: @ 816173C checkflag FLAG_SILPH_4F_DOOR_1 - call_if FALSE, EventScript_1A8213 + call_if FALSE, EventScript_Close4FDoor1 checkflag FLAG_SILPH_4F_DOOR_2 - call_if FALSE, EventScript_1A8241 + call_if FALSE, EventScript_Close4FDoor2 end SilphCo_4F_EventScript_16174F:: @ 816174F lock faceplayer - compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 + compare VAR_MAP_SCENE_SILPH_CO_11F, 1 goto_if ge, EventScript_161766 msgbox gUnknown_81759F5 release diff --git a/data/maps/SilphCo_5F/map.json b/data/maps/SilphCo_5F/map.json index a59f7836b..656894ec2 100644 --- a/data/maps/SilphCo_5F/map.json +++ b/data/maps/SilphCo_5F/map.json @@ -199,84 +199,84 @@ "x": 8, "y": 9, "elevation": 0, - "script": "SilphCo_5F_EventScript_1A89B7" + "script": "SilphCo_5F_EventScript_Door1" }, { "type": "bg_event_type_0", "x": 8, "y": 10, "elevation": 0, - "script": "SilphCo_5F_EventScript_1A89B7" + "script": "SilphCo_5F_EventScript_Door1" }, { "type": "bg_event_type_0", "x": 8, "y": 18, "elevation": 0, - "script": "SilphCo_5F_EventScript_1A89D1" + "script": "SilphCo_5F_EventScript_Door2" }, { "type": "bg_event_type_0", "x": 8, "y": 19, "elevation": 0, - "script": "SilphCo_5F_EventScript_1A89D1" + "script": "SilphCo_5F_EventScript_Door2" }, { "type": "bg_event_type_0", "x": 19, "y": 13, "elevation": 0, - "script": "SilphCo_5F_EventScript_1A89EB" + "script": "SilphCo_5F_EventScript_Door3" }, { "type": "bg_event_type_0", "x": 19, "y": 14, "elevation": 0, - "script": "SilphCo_5F_EventScript_1A89EB" + "script": "SilphCo_5F_EventScript_Door3" }, { "type": "bg_event_type_0", "x": 7, "y": 9, "elevation": 0, - "script": "SilphCo_5F_EventScript_1A89B7" + "script": "SilphCo_5F_EventScript_Door1" }, { "type": "bg_event_type_0", "x": 7, "y": 10, "elevation": 0, - "script": "SilphCo_5F_EventScript_1A89B7" + "script": "SilphCo_5F_EventScript_Door1" }, { "type": "bg_event_type_0", "x": 7, "y": 19, "elevation": 0, - "script": "SilphCo_5F_EventScript_1A89D1" + "script": "SilphCo_5F_EventScript_Door2" }, { "type": "bg_event_type_0", "x": 7, "y": 18, "elevation": 0, - "script": "SilphCo_5F_EventScript_1A89D1" + "script": "SilphCo_5F_EventScript_Door2" }, { "type": "bg_event_type_0", "x": 18, "y": 13, "elevation": 0, - "script": "SilphCo_5F_EventScript_1A89EB" + "script": "SilphCo_5F_EventScript_Door3" }, { "type": "bg_event_type_0", "x": 18, "y": 14, "elevation": 0, - "script": "SilphCo_5F_EventScript_1A89EB" + "script": "SilphCo_5F_EventScript_Door3" }, { "type": "bg_event_type_0", diff --git a/data/maps/SilphCo_5F/scripts.inc b/data/maps/SilphCo_5F/scripts.inc index a87e88d33..ce1f8374b 100644 --- a/data/maps/SilphCo_5F/scripts.inc +++ b/data/maps/SilphCo_5F/scripts.inc @@ -4,17 +4,17 @@ SilphCo_5F_MapScripts:: @ 81617BE SilphCo_5F_MapScript1_1617C4:: @ 81617C4 checkflag FLAG_SILPH_5F_DOOR_1 - call_if FALSE, EventScript_1A826F + call_if FALSE, EventScript_Close5FDoor1 checkflag FLAG_SILPH_5F_DOOR_2 - call_if FALSE, EventScript_1A82A6 + call_if FALSE, EventScript_Close5FDoor2 checkflag FLAG_SILPH_5F_DOOR_3 - call_if FALSE, EventScript_1A82DD + call_if FALSE, EventScript_Close5FDoor3 end SilphCo_5F_EventScript_1617E0:: @ 81617E0 lock faceplayer - compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 + compare VAR_MAP_SCENE_SILPH_CO_11F, 1 goto_if ge, EventScript_1617F7 msgbox gUnknown_8175B70 release diff --git a/data/maps/SilphCo_6F/map.json b/data/maps/SilphCo_6F/map.json index 82eda6e92..4cc812918 100644 --- a/data/maps/SilphCo_6F/map.json +++ b/data/maps/SilphCo_6F/map.json @@ -188,28 +188,28 @@ "x": 6, "y": 15, "elevation": 0, - "script": "SilphCo_6F_EventScript_1A8A05" + "script": "SilphCo_6F_EventScript_Door" }, { "type": "bg_event_type_0", "x": 6, "y": 16, "elevation": 0, - "script": "SilphCo_6F_EventScript_1A8A05" + "script": "SilphCo_6F_EventScript_Door" }, { "type": "bg_event_type_0", "x": 5, "y": 15, "elevation": 0, - "script": "SilphCo_6F_EventScript_1A8A05" + "script": "SilphCo_6F_EventScript_Door" }, { "type": "bg_event_type_0", "x": 5, "y": 16, "elevation": 0, - "script": "SilphCo_6F_EventScript_1A8A05" + "script": "SilphCo_6F_EventScript_Door" }, { "type": "hidden_item", diff --git a/data/maps/SilphCo_6F/scripts.inc b/data/maps/SilphCo_6F/scripts.inc index fd4d470eb..131d636b7 100644 --- a/data/maps/SilphCo_6F/scripts.inc +++ b/data/maps/SilphCo_6F/scripts.inc @@ -4,13 +4,13 @@ SilphCo_6F_MapScripts:: @ 8161881 SilphCo_6F_MapScript1_161887:: @ 8161887 checkflag FLAG_SILPH_6F_DOOR - call_if FALSE, EventScript_1A8314 + call_if FALSE, EventScript_Close6FDoor end SilphCo_6F_EventScript_161891:: @ 8161891 lock faceplayer - compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 + compare VAR_MAP_SCENE_SILPH_CO_11F, 1 goto_if ge, EventScript_1618A8 msgbox gUnknown_817607E release @@ -24,7 +24,7 @@ EventScript_1618A8:: @ 81618A8 SilphCo_6F_EventScript_1618B2:: @ 81618B2 lock faceplayer - compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 + compare VAR_MAP_SCENE_SILPH_CO_11F, 1 goto_if ge, EventScript_1618C9 msgbox gUnknown_8175F24 release @@ -38,7 +38,7 @@ EventScript_1618C9:: @ 81618C9 SilphCo_6F_EventScript_1618D3:: @ 81618D3 lock faceplayer - compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 + compare VAR_MAP_SCENE_SILPH_CO_11F, 1 goto_if ge, EventScript_1618EA msgbox gUnknown_8175F70 release @@ -52,7 +52,7 @@ EventScript_1618EA:: @ 81618EA SilphCo_6F_EventScript_1618F4:: @ 81618F4 lock faceplayer - compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 + compare VAR_MAP_SCENE_SILPH_CO_11F, 1 goto_if ge, EventScript_16190B msgbox gUnknown_8175FAA release @@ -66,7 +66,7 @@ EventScript_16190B:: @ 816190B SilphCo_6F_EventScript_161915:: @ 8161915 lock faceplayer - compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 + compare VAR_MAP_SCENE_SILPH_CO_11F, 1 goto_if ge, EventScript_16192C msgbox gUnknown_8176012 release diff --git a/data/maps/SilphCo_7F/map.json b/data/maps/SilphCo_7F/map.json index ec2735f05..e470111f8 100644 --- a/data/maps/SilphCo_7F/map.json +++ b/data/maps/SilphCo_7F/map.json @@ -227,84 +227,84 @@ "x": 11, "y": 8, "elevation": 0, - "script": "SilphCo_7F_EventScript_1A8A1F" + "script": "SilphCo_7F_EventScript_Door1" }, { "type": "bg_event_type_0", "x": 12, "y": 8, "elevation": 0, - "script": "SilphCo_7F_EventScript_1A8A1F" + "script": "SilphCo_7F_EventScript_Door1" }, { "type": "bg_event_type_0", "x": 11, "y": 9, "elevation": 0, - "script": "SilphCo_7F_EventScript_1A8A1F" + "script": "SilphCo_7F_EventScript_Door1" }, { "type": "bg_event_type_0", "x": 12, "y": 9, "elevation": 0, - "script": "SilphCo_7F_EventScript_1A8A1F" + "script": "SilphCo_7F_EventScript_Door1" }, { "type": "bg_event_type_0", "x": 24, "y": 7, "elevation": 0, - "script": "SilphCo_7F_EventScript_1A8A39" + "script": "SilphCo_7F_EventScript_Door2" }, { "type": "bg_event_type_0", "x": 25, "y": 7, "elevation": 0, - "script": "SilphCo_7F_EventScript_1A8A39" + "script": "SilphCo_7F_EventScript_Door2" }, { "type": "bg_event_type_0", "x": 25, "y": 8, "elevation": 0, - "script": "SilphCo_7F_EventScript_1A8A39" + "script": "SilphCo_7F_EventScript_Door2" }, { "type": "bg_event_type_0", "x": 24, "y": 8, "elevation": 0, - "script": "SilphCo_7F_EventScript_1A8A39" + "script": "SilphCo_7F_EventScript_Door2" }, { "type": "bg_event_type_0", "x": 25, "y": 13, "elevation": 0, - "script": "SilphCo_7F_EventScript_1A8A53" + "script": "SilphCo_7F_EventScript_Door3" }, { "type": "bg_event_type_0", "x": 26, "y": 13, "elevation": 0, - "script": "SilphCo_7F_EventScript_1A8A53" + "script": "SilphCo_7F_EventScript_Door3" }, { "type": "bg_event_type_0", "x": 25, "y": 14, "elevation": 0, - "script": "SilphCo_7F_EventScript_1A8A53" + "script": "SilphCo_7F_EventScript_Door3" }, { "type": "bg_event_type_0", "x": 26, "y": 14, "elevation": 0, - "script": "SilphCo_7F_EventScript_1A8A53" + "script": "SilphCo_7F_EventScript_Door3" }, { "type": "hidden_item", diff --git a/data/maps/SilphCo_7F/scripts.inc b/data/maps/SilphCo_7F/scripts.inc index 8f1fa6648..9c0e76620 100644 --- a/data/maps/SilphCo_7F/scripts.inc +++ b/data/maps/SilphCo_7F/scripts.inc @@ -5,15 +5,15 @@ SilphCo_7F_MapScripts:: @ 8161984 SilphCo_7F_MapScript1_16198F:: @ 816198F checkflag FLAG_SILPH_7F_DOOR_1 - call_if FALSE, EventScript_1A834B + call_if FALSE, EventScript_Close7FDoor1 checkflag FLAG_SILPH_7F_DOOR_2 - call_if FALSE, EventScript_1A8379 + call_if FALSE, EventScript_Close7FDoor2 checkflag FLAG_SILPH_7F_DOOR_3 - call_if FALSE, EventScript_1A83A7 + call_if FALSE, EventScript_Close7FDoor3 end SilphCo_7F_MapScript2_1619AB:: @ 81619AB - compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 + compare VAR_MAP_SCENE_SILPH_CO_11F, 1 call_if ge, EventScript_1619B7 end @@ -46,24 +46,24 @@ EventScript_1619D4:: @ 81619D4 applymovement 1, Movement_1A75DD waitmovement 0 msgbox gUnknown_8176710 - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 call_if eq, EventScript_161A73 - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if eq, EventScript_161A7F msgbox gUnknown_8176727 setvar VAR_LAST_TALKED, 1 - compare_var_to_value VAR_STARTER_MON, 2 + compare VAR_STARTER_MON, 2 call_if eq, EventScript_161A80 - compare_var_to_value VAR_STARTER_MON, 1 + compare VAR_STARTER_MON, 1 call_if eq, EventScript_161A8B - compare_var_to_value VAR_STARTER_MON, 0 + compare VAR_STARTER_MON, 0 call_if eq, EventScript_161A96 msgbox gUnknown_8176827 closemessage playbgm MUS_RIVAL2, 0 - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 call_if eq, EventScript_161AA1 - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if eq, EventScript_161AAC playse SE_TK_WARPIN fadedefaultbgm @@ -135,11 +135,11 @@ SilphCo_7F_EventScript_161AC8:: @ 8161AC8 msgbox gUnknown_8176266 setvar VAR_0x4001, SPECIES_LAPRAS givemon SPECIES_LAPRAS, 25, ITEM_NONE, 0, 0, 0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_161B12 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_161B45 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A927C release end @@ -152,7 +152,7 @@ EventScript_161B12:: @ 8161B12 waitfanfare getspeciesname 0, SPECIES_LAPRAS msgbox gUnknown_81A56A7, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_161B7E call EventScript_1A8C27 call EventScript_1A74EB @@ -169,7 +169,7 @@ EventScript_161B45:: @ 8161B45 waitfanfare getspeciesname 0, SPECIES_LAPRAS msgbox gUnknown_81A56A7, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_161B73 call EventScript_1A8C33 goto EventScript_161B73 @@ -199,7 +199,7 @@ EventScript_161B8D:: @ 8161B8D SilphCo_7F_EventScript_161B97:: @ 8161B97 lock faceplayer - compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 + compare VAR_MAP_SCENE_SILPH_CO_11F, 1 goto_if ge, EventScript_161BAE msgbox gUnknown_8176444 release @@ -213,7 +213,7 @@ EventScript_161BAE:: @ 8161BAE SilphCo_7F_EventScript_161BB8:: @ 8161BB8 lock faceplayer - compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 + compare VAR_MAP_SCENE_SILPH_CO_11F, 1 goto_if ge, EventScript_161BCF msgbox gUnknown_81764C2 release @@ -227,7 +227,7 @@ EventScript_161BCF:: @ 8161BCF SilphCo_7F_EventScript_161BD9:: @ 8161BD9 lock faceplayer - compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 + compare VAR_MAP_SCENE_SILPH_CO_11F, 1 goto_if ge, EventScript_161BF0 msgbox gUnknown_8176532 release diff --git a/data/maps/SilphCo_8F/map.json b/data/maps/SilphCo_8F/map.json index 7d1f410dc..629519c25 100644 --- a/data/maps/SilphCo_8F/map.json +++ b/data/maps/SilphCo_8F/map.json @@ -150,28 +150,28 @@ "x": 6, "y": 10, "elevation": 0, - "script": "SilphCo_8F_EventScript_1A8A6D" + "script": "SilphCo_8F_EventScript_Door" }, { "type": "bg_event_type_0", "x": 6, "y": 11, "elevation": 0, - "script": "SilphCo_8F_EventScript_1A8A6D" + "script": "SilphCo_8F_EventScript_Door" }, { "type": "bg_event_type_0", "x": 5, "y": 11, "elevation": 0, - "script": "SilphCo_8F_EventScript_1A8A6D" + "script": "SilphCo_8F_EventScript_Door" }, { "type": "bg_event_type_0", "x": 5, "y": 10, "elevation": 0, - "script": "SilphCo_8F_EventScript_1A8A6D" + "script": "SilphCo_8F_EventScript_Door" }, { "type": "hidden_item", diff --git a/data/maps/SilphCo_8F/scripts.inc b/data/maps/SilphCo_8F/scripts.inc index 30b19804b..1b3b81d36 100644 --- a/data/maps/SilphCo_8F/scripts.inc +++ b/data/maps/SilphCo_8F/scripts.inc @@ -4,13 +4,13 @@ SilphCo_8F_MapScripts:: @ 8161C5F SilphCo_8F_MapScript1_161C65:: @ 8161C65 checkflag FLAG_SILPH_8F_DOOR - call_if FALSE, EventScript_1A83D5 + call_if FALSE, EventScript_Close8FDoor end SilphCo_8F_EventScript_161C6F:: @ 8161C6F lock faceplayer - compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 + compare VAR_MAP_SCENE_SILPH_CO_11F, 1 goto_if ge, EventScript_161C86 msgbox gUnknown_817696D release diff --git a/data/maps/SilphCo_9F/map.json b/data/maps/SilphCo_9F/map.json index b350f620c..722ca91e7 100644 --- a/data/maps/SilphCo_9F/map.json +++ b/data/maps/SilphCo_9F/map.json @@ -120,112 +120,112 @@ "x": 3, "y": 10, "elevation": 0, - "script": "SilphCo_9F_EventScript_1A8A87" + "script": "SilphCo_9F_EventScript_Door1" }, { "type": "bg_event_type_0", "x": 3, "y": 11, "elevation": 0, - "script": "SilphCo_9F_EventScript_1A8A87" + "script": "SilphCo_9F_EventScript_Door1" }, { "type": "bg_event_type_0", "x": 13, "y": 16, "elevation": 0, - "script": "SilphCo_9F_EventScript_1A8AA1" + "script": "SilphCo_9F_EventScript_Door2" }, { "type": "bg_event_type_0", "x": 13, "y": 17, "elevation": 0, - "script": "SilphCo_9F_EventScript_1A8AA1" + "script": "SilphCo_9F_EventScript_Door2" }, { "type": "bg_event_type_0", "x": 21, "y": 6, "elevation": 0, - "script": "SilphCo_9F_EventScript_1A8ABB" + "script": "SilphCo_9F_EventScript_Door3" }, { "type": "bg_event_type_0", "x": 22, "y": 6, "elevation": 0, - "script": "SilphCo_9F_EventScript_1A8ABB" + "script": "SilphCo_9F_EventScript_Door3" }, { "type": "bg_event_type_0", "x": 22, "y": 7, "elevation": 0, - "script": "SilphCo_9F_EventScript_1A8ABB" + "script": "SilphCo_9F_EventScript_Door3" }, { "type": "bg_event_type_0", "x": 21, "y": 7, "elevation": 0, - "script": "SilphCo_9F_EventScript_1A8ABB" + "script": "SilphCo_9F_EventScript_Door3" }, { "type": "bg_event_type_0", "x": 21, "y": 13, "elevation": 0, - "script": "SilphCo_9F_EventScript_1A8AD5" + "script": "SilphCo_9F_EventScript_Door4" }, { "type": "bg_event_type_0", "x": 21, "y": 12, "elevation": 0, - "script": "SilphCo_9F_EventScript_1A8AD5" + "script": "SilphCo_9F_EventScript_Door4" }, { "type": "bg_event_type_0", "x": 22, "y": 12, "elevation": 0, - "script": "SilphCo_9F_EventScript_1A8AD5" + "script": "SilphCo_9F_EventScript_Door4" }, { "type": "bg_event_type_0", "x": 22, "y": 13, "elevation": 0, - "script": "SilphCo_9F_EventScript_1A8AD5" + "script": "SilphCo_9F_EventScript_Door4" }, { "type": "bg_event_type_0", "x": 2, "y": 11, "elevation": 0, - "script": "SilphCo_9F_EventScript_1A8A87" + "script": "SilphCo_9F_EventScript_Door1" }, { "type": "bg_event_type_0", "x": 2, "y": 10, "elevation": 0, - "script": "SilphCo_9F_EventScript_1A8A87" + "script": "SilphCo_9F_EventScript_Door1" }, { "type": "bg_event_type_0", "x": 12, "y": 16, "elevation": 0, - "script": "SilphCo_9F_EventScript_1A8AA1" + "script": "SilphCo_9F_EventScript_Door2" }, { "type": "bg_event_type_0", "x": 12, "y": 17, "elevation": 0, - "script": "SilphCo_9F_EventScript_1A8AA1" + "script": "SilphCo_9F_EventScript_Door2" }, { "type": "hidden_item", diff --git a/data/maps/SilphCo_9F/scripts.inc b/data/maps/SilphCo_9F/scripts.inc index b19f5a182..fb8098d1c 100644 --- a/data/maps/SilphCo_9F/scripts.inc +++ b/data/maps/SilphCo_9F/scripts.inc @@ -4,19 +4,19 @@ SilphCo_9F_MapScripts:: @ 8161CDE SilphCo_9F_MapScript1_161CE4:: @ 8161CE4 checkflag FLAG_SILPH_9F_DOOR_1 - call_if FALSE, EventScript_1A840C + call_if FALSE, EventScript_Close9FDoor1 checkflag FLAG_SILPH_9F_DOOR_2 - call_if FALSE, EventScript_1A8443 + call_if FALSE, EventScript_Close9FDoor2 checkflag FLAG_SILPH_9F_DOOR_3 - call_if FALSE, EventScript_1A847A + call_if FALSE, EventScript_Close9FDoor3 checkflag FLAG_SILPH_9F_DOOR_4 - call_if FALSE, EventScript_1A84A8 + call_if FALSE, EventScript_Close9FDoor4 end SilphCo_9F_EventScript_161D09:: @ 8161D09 lock faceplayer - compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 + compare VAR_MAP_SCENE_SILPH_CO_11F, 1 goto_if ge, EventScript_161D2E msgbox gUnknown_8176B54 closemessage diff --git a/data/maps/SilphCo_Elevator/scripts.inc b/data/maps/SilphCo_Elevator/scripts.inc index 4d75eec38..a6ecf471a 100644 --- a/data/maps/SilphCo_Elevator/scripts.inc +++ b/data/maps/SilphCo_Elevator/scripts.inc @@ -33,7 +33,7 @@ SilphCo_Elevator_EventScript_161F6F:: @ 8161F6F EventScript_16202F:: @ 816202F setvar VAR_0x8006, 4 setdynamicwarp MAP_SILPH_CO_1F, 255, 22, 3 - compare_var_to_value VAR_ELEVATOR_FLOOR, 4 + compare VAR_ELEVATOR_FLOOR, 4 goto_if eq, EventScript_1621E7 call EventScript_1621EC setvar VAR_ELEVATOR_FLOOR, 4 @@ -45,7 +45,7 @@ EventScript_162056:: @ 8162056 EventScript_162057:: @ 8162057 setvar VAR_0x8006, 5 setdynamicwarp MAP_SILPH_CO_2F, 255, 22, 3 - compare_var_to_value VAR_ELEVATOR_FLOOR, 5 + compare VAR_ELEVATOR_FLOOR, 5 goto_if eq, EventScript_1621E7 call EventScript_1621EC setvar VAR_ELEVATOR_FLOOR, 5 @@ -57,7 +57,7 @@ EventScript_16207E:: @ 816207E EventScript_16207F:: @ 816207F setvar VAR_0x8006, 6 setdynamicwarp MAP_SILPH_CO_3F, 255, 22, 3 - compare_var_to_value VAR_ELEVATOR_FLOOR, 6 + compare VAR_ELEVATOR_FLOOR, 6 goto_if eq, EventScript_1621E7 call EventScript_1621EC setvar VAR_ELEVATOR_FLOOR, 6 @@ -69,7 +69,7 @@ EventScript_1620A6:: @ 81620A6 EventScript_1620A7:: @ 81620A7 setvar VAR_0x8006, 7 setdynamicwarp MAP_SILPH_CO_4F, 255, 22, 3 - compare_var_to_value VAR_ELEVATOR_FLOOR, 7 + compare VAR_ELEVATOR_FLOOR, 7 goto_if eq, EventScript_1621E7 call EventScript_1621EC setvar VAR_ELEVATOR_FLOOR, 7 @@ -81,7 +81,7 @@ EventScript_1620CE:: @ 81620CE EventScript_1620CF:: @ 81620CF setvar VAR_0x8006, 8 setdynamicwarp MAP_SILPH_CO_5F, 255, 22, 3 - compare_var_to_value VAR_ELEVATOR_FLOOR, 8 + compare VAR_ELEVATOR_FLOOR, 8 goto_if eq, EventScript_1621E7 call EventScript_1621EC setvar VAR_ELEVATOR_FLOOR, 8 @@ -93,7 +93,7 @@ EventScript_1620F6:: @ 81620F6 EventScript_1620F7:: @ 81620F7 setvar VAR_0x8006, 9 setdynamicwarp MAP_SILPH_CO_6F, 255, 20, 3 - compare_var_to_value VAR_ELEVATOR_FLOOR, 9 + compare VAR_ELEVATOR_FLOOR, 9 goto_if eq, EventScript_1621E7 call EventScript_1621EC setvar VAR_ELEVATOR_FLOOR, 9 @@ -105,7 +105,7 @@ EventScript_16211E:: @ 816211E EventScript_16211F:: @ 816211F setvar VAR_0x8006, 10 setdynamicwarp MAP_SILPH_CO_7F, 255, 23, 3 - compare_var_to_value VAR_ELEVATOR_FLOOR, 10 + compare VAR_ELEVATOR_FLOOR, 10 goto_if eq, EventScript_1621E7 call EventScript_1621EC setvar VAR_ELEVATOR_FLOOR, 10 @@ -117,7 +117,7 @@ EventScript_162146:: @ 8162146 EventScript_162147:: @ 8162147 setvar VAR_0x8006, 11 setdynamicwarp MAP_SILPH_CO_8F, 255, 22, 3 - compare_var_to_value VAR_ELEVATOR_FLOOR, 11 + compare VAR_ELEVATOR_FLOOR, 11 goto_if eq, EventScript_1621E7 call EventScript_1621EC setvar VAR_ELEVATOR_FLOOR, 11 @@ -129,7 +129,7 @@ EventScript_16216E:: @ 816216E EventScript_16216F:: @ 816216F setvar VAR_0x8006, 12 setdynamicwarp MAP_SILPH_CO_9F, 255, 24, 3 - compare_var_to_value VAR_ELEVATOR_FLOOR, 12 + compare VAR_ELEVATOR_FLOOR, 12 goto_if eq, EventScript_1621E7 call EventScript_1621EC setvar VAR_ELEVATOR_FLOOR, 12 @@ -141,7 +141,7 @@ EventScript_162196:: @ 8162196 EventScript_162197:: @ 8162197 setvar VAR_0x8006, 13 setdynamicwarp MAP_SILPH_CO_10F, 255, 13, 3 - compare_var_to_value VAR_ELEVATOR_FLOOR, 13 + compare VAR_ELEVATOR_FLOOR, 13 goto_if eq, EventScript_1621E7 call EventScript_1621EC setvar VAR_ELEVATOR_FLOOR, 13 @@ -153,7 +153,7 @@ EventScript_1621BE:: @ 81621BE EventScript_1621BF:: @ 81621BF setvar VAR_0x8006, 14 setdynamicwarp MAP_SILPH_CO_11F, 255, 13, 3 - compare_var_to_value VAR_ELEVATOR_FLOOR, 14 + compare VAR_ELEVATOR_FLOOR, 14 goto_if eq, EventScript_1621E7 call EventScript_1621EC setvar VAR_ELEVATOR_FLOOR, 14 diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc b/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc index 64ef24b72..afb5f0251 100644 --- a/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc +++ b/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc @@ -16,13 +16,13 @@ SixIsland_DottedHole_SapphireRoom_EventScript_1641B5:: @ 81641B5 applymovement 2, Movement_16440F waitmovement 0 playse SE_W070 - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if eq, EventScript_16430F - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 call_if eq, EventScript_16430F - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if eq, EventScript_16431A - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if eq, EventScript_16431A setvar VAR_0x8004, 3 setvar VAR_0x8005, 0 @@ -30,43 +30,43 @@ SixIsland_DottedHole_SapphireRoom_EventScript_1641B5:: @ 81641B5 setvar VAR_0x8007, 3 special Special_ShakeScreen delay 60 - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if eq, EventScript_164325 - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 call_if eq, EventScript_164330 - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if eq, EventScript_16433B - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if eq, EventScript_164346 textcolor 0 msgbox gUnknown_817BD97 closemessage - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if eq, EventScript_164351 - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 call_if eq, EventScript_164366 - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if eq, EventScript_16437B - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if eq, EventScript_164390 removeobject 1 - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if eq, EventScript_1642F9 - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 call_if eq, EventScript_1642F9 - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if eq, EventScript_164304 - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if eq, EventScript_164304 msgbox gUnknown_817BDD4 closemessage - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if eq, EventScript_1643A5 - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 call_if eq, EventScript_1643B7 - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if eq, EventScript_1643C9 - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if eq, EventScript_1643DB playse SE_KAIDAN delay 35 diff --git a/data/maps/SixIsland_Mart/scripts.inc b/data/maps/SixIsland_Mart/scripts.inc index 1bdf7756b..2558fc999 100644 --- a/data/maps/SixIsland_Mart/scripts.inc +++ b/data/maps/SixIsland_Mart/scripts.inc @@ -3,7 +3,7 @@ SixIsland_Mart_MapScripts:: @ 8171E65 SixIsland_Mart_EventScript_171E66:: @ 8171E66 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 lock faceplayer diff --git a/data/maps/SixIsland_PatternBush/scripts.inc b/data/maps/SixIsland_PatternBush/scripts.inc index 11192b895..9f0d085fe 100644 --- a/data/maps/SixIsland_PatternBush/scripts.inc +++ b/data/maps/SixIsland_PatternBush/scripts.inc @@ -5,9 +5,9 @@ SixIsland_PatternBush_MapScripts:: @ 8164559 SixIsland_PatternBush_MapScript1_16455F:: @ 816455F setworldmapflag FLAG_WORLD_MAP_SIX_ISLAND_PATTERN_BUSH getplayerxy VAR_0x4001, VAR_0x4002 - compare_var_to_value VAR_0x4001, 50 + compare VAR_0x4001, 50 call_if ge, EventScript_16457E - compare_var_to_value VAR_0x4001, 49 + compare VAR_0x4001, 49 call_if le, EventScript_164587 end diff --git a/data/maps/SixIsland_PokemonCenter_1F/scripts.inc b/data/maps/SixIsland_PokemonCenter_1F/scripts.inc index 1ad4df1ed..751b78f94 100644 --- a/data/maps/SixIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/SixIsland_PokemonCenter_1F/scripts.inc @@ -6,7 +6,7 @@ SixIsland_PokemonCenter_1F_MapScripts:: @ 8171D6A SixIsland_PokemonCenter_1F_MapScript1_171D7A:: @ 8171D7A setrespawn SPAWN_SIX_ISLAND - compare_var_to_value VAR_MAP_SCENE_SIX_ISLAND_POKEMON_CENTER_1F, 0 + compare VAR_MAP_SCENE_SIX_ISLAND_POKEMON_CENTER_1F, 0 call_if eq, EventScript_171D89 end diff --git a/data/maps/SixIsland_RuinValley/scripts.inc b/data/maps/SixIsland_RuinValley/scripts.inc index 2b7ecf655..0e315cfdf 100644 --- a/data/maps/SixIsland_RuinValley/scripts.inc +++ b/data/maps/SixIsland_RuinValley/scripts.inc @@ -27,7 +27,7 @@ SixIsland_RuinValley_EventScript_168B94:: @ 8168B94 checkflag FLAG_USED_CUT_ON_RUIN_VALLEY_BRAILLE goto_if TRUE, EventScript_168BC1 msgbox gUnknown_818BDC0, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_168BCB msgbox gUnknown_818BE11 braillemessage gUnknown_81A929B diff --git a/data/maps/SixIsland_WaterPath_House1/scripts.inc b/data/maps/SixIsland_WaterPath_House1/scripts.inc index d38e40aac..1561e5c36 100644 --- a/data/maps/SixIsland_WaterPath_House1/scripts.inc +++ b/data/maps/SixIsland_WaterPath_House1/scripts.inc @@ -5,28 +5,28 @@ SixIsland_WaterPath_House1_EventScript_17206D:: @ 817206D lock faceplayer special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 special sub_8112364 setvar VAR_0x8004, SPECIES_HERACROSS specialvar VAR_RESULT, Special_PlayerPartyContainsSpecies - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1720E5 special GetHeracrossSizeRecordInfo msgbox gUnknown_81A4A3F special Special_ChooseMonFromParty waitstate copyvar VAR_RESULT, VAR_0x8004 - compare_var_to_value VAR_RESULT, 6 + compare VAR_RESULT, 6 goto_if ge, EventScript_1720EF special CompareHeracrossSize - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1720F1 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1720FB - compare_var_to_value VAR_RESULT, 3 + compare VAR_RESULT, 3 goto_if eq, EventScript_172121 - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 goto_if eq, EventScript_17210E release end @@ -63,7 +63,7 @@ EventScript_172121:: @ 8172121 setflag FLAG_GOT_NEST_BALL_FROM_WATER_PATH_HOUSE_1 msgbox gUnknown_81A4A88 giveitem ITEM_NEST_BALL - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_17214D msgbox gUnknown_81A4AD9 release diff --git a/data/maps/ThreeIsland/scripts.inc b/data/maps/ThreeIsland/scripts.inc index 93fdc39a5..718524fcf 100644 --- a/data/maps/ThreeIsland/scripts.inc +++ b/data/maps/ThreeIsland/scripts.inc @@ -6,7 +6,7 @@ ThreeIsland_MapScript1_1677B3:: @ 81677B3 setworldmapflag FLAG_WORLD_MAP_THREE_ISLAND checkflag FLAG_RESCUED_LOSTELLE call_if TRUE, EventScript_1677CB - compare_var_to_value VAR_MAP_SCENE_THREE_ISLAND, 4 + compare VAR_MAP_SCENE_THREE_ISLAND, 4 call_if eq, EventScript_1677CF end @@ -30,7 +30,7 @@ ThreeIsland_EventScript_1677E5:: @ 81677E5 lock checkflag FLAG_GOT_FULL_RESTORE_FROM_THREE_ISLAND_DEFENDER goto_if TRUE, EventScript_167806 - compare_var_to_value VAR_MAP_SCENE_THREE_ISLAND, 4 + compare VAR_MAP_SCENE_THREE_ISLAND, 4 goto_if eq, EventScript_16781A setvar VAR_0x4001, 0 call EventScript_16786F @@ -49,7 +49,7 @@ EventScript_16781A:: @ 816781A waitmovement 0 msgbox gUnknown_818275A checkitemspace ITEM_FULL_RESTORE, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_167865 giveitemfanfaremsg gUnknown_81827BE, ITEM_FULL_RESTORE additem ITEM_FULL_RESTORE, 1 @@ -64,36 +64,36 @@ EventScript_167865:: @ 8167865 end EventScript_16786F:: @ 816786F - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if eq, EventScript_167947 - compare_var_to_value VAR_0x4001, 2 + compare VAR_0x4001, 2 call_if eq, EventScript_167947 applymovement 1, Movement_167A1B waitmovement 0 msgbox gUnknown_81820C0 - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 call_if eq, EventScript_167952 - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if eq, EventScript_167952 - compare_var_to_value VAR_0x4001, 2 + compare VAR_0x4001, 2 call_if eq, EventScript_16795D applymovement 5, Movement_167A19 waitmovement 0 msgbox gUnknown_8182125 - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 call_if eq, EventScript_167931 - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if eq, EventScript_167931 - compare_var_to_value VAR_0x4001, 2 + compare VAR_0x4001, 2 call_if eq, EventScript_167973 applymovement 2, Movement_167A1B waitmovement 0 msgbox gUnknown_81821A9 - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 call_if eq, EventScript_167952 - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if eq, EventScript_167952 - compare_var_to_value VAR_0x4001, 2 + compare VAR_0x4001, 2 call_if eq, EventScript_16795D applymovement 4, Movement_167A19 waitmovement 0 @@ -122,21 +122,21 @@ EventScript_167952:: @ 8167952 EventScript_16795D:: @ 816795D getplayerxy VAR_0x8004, VAR_0x8005 - compare_var_to_value VAR_0x8004, 9 + compare VAR_0x8004, 9 goto_if ge, EventScript_167931 goto EventScript_167952 end EventScript_167973:: @ 8167973 getplayerxy VAR_0x8004, VAR_0x8005 - compare_var_to_value VAR_0x8004, 9 + compare VAR_0x8004, 9 goto_if ge, EventScript_167947 goto EventScript_167931 end ThreeIsland_EventScript_167989:: @ 8167989 lock - compare_var_to_value VAR_MAP_SCENE_THREE_ISLAND, 4 + compare VAR_MAP_SCENE_THREE_ISLAND, 4 goto_if eq, EventScript_1679A1 setvar VAR_0x4001, 1 call EventScript_16786F @@ -223,7 +223,7 @@ EventScript_167A59:: @ 8167A59 waitmovement 0 playbgm MUS_SHOUNEN, 0 msgbox gUnknown_81823ED, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_167C35 msgbox gUnknown_818247D setvar VAR_LAST_TALKED, 5 @@ -256,15 +256,15 @@ EventScript_167A59:: @ 8167A59 msgbox gUnknown_81825E2 closemessage delay 45 - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 call_if eq, EventScript_167BC6 - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if eq, EventScript_167BD8 - compare_var_to_value VAR_0x4001, 2 + compare VAR_0x4001, 2 call_if eq, EventScript_167BEA - compare_var_to_value VAR_0x4001, 3 + compare VAR_0x4001, 3 call_if eq, EventScript_167C03 - compare_var_to_value VAR_0x4001, 4 + compare VAR_0x4001, 4 call_if eq, EventScript_167C1C playbgm MUS_SHOUNEN, 0 msgbox gUnknown_8182623 diff --git a/data/maps/ThreeIsland_BerryForest/scripts.inc b/data/maps/ThreeIsland_BerryForest/scripts.inc index 3119a1d44..f26f7edb9 100644 --- a/data/maps/ThreeIsland_BerryForest/scripts.inc +++ b/data/maps/ThreeIsland_BerryForest/scripts.inc @@ -18,7 +18,7 @@ ThreeIsland_BerryForest_EventScript_163C83:: @ 8163C83 waitmovement 0 msgbox gUnknown_817AE8E special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 waitse playmoncry SPECIES_HYPNO, 2 @@ -30,7 +30,7 @@ ThreeIsland_BerryForest_EventScript_163C83:: @ 8163C83 waitmovement 0 msgbox gUnknown_817AEE1 giveitem ITEM_IAPAPA_BERRY - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if eq, EventScript_163D19 special Special_BufferBigGuyOrBigGirlString msgbox gUnknown_817AF3B diff --git a/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc b/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc index 8d5b37ed7..0830e168c 100644 --- a/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc +++ b/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc @@ -6,9 +6,9 @@ ThreeIsland_DunsparceTunnel_MapScript1_164D2C:: @ 8164D2C setworldmapflag FLAG_WORLD_MAP_THREE_ISLAND_DUNSPARCE_TUNNEL specialvar VAR_RESULT, IsNationalPokedexEnabled copyvar VAR_0x8008, VAR_RESULT - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if eq, EventScript_164D50 - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 call_if eq, EventScript_164D54 end @@ -27,7 +27,7 @@ ThreeIsland_DunsparceTunnel_EventScript_164D60:: @ 8164D60 checkflag FLAG_GOT_NUGGET_FROM_DUNSPARCE_TUNNEL goto_if TRUE, EventScript_164DC2 specialvar VAR_RESULT, IsNationalPokedexEnabled - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_164D90 msgbox gUnknown_817D13B closemessage @@ -39,7 +39,7 @@ ThreeIsland_DunsparceTunnel_EventScript_164D60:: @ 8164D60 EventScript_164D90:: @ 8164D90 msgbox gUnknown_817D1C9 giveitem ITEM_NUGGET - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_164DB8 setflag FLAG_GOT_NUGGET_FROM_DUNSPARCE_TUNNEL goto EventScript_164DC2 diff --git a/data/maps/ThreeIsland_Mart/scripts.inc b/data/maps/ThreeIsland_Mart/scripts.inc index ec0caa100..171eff139 100644 --- a/data/maps/ThreeIsland_Mart/scripts.inc +++ b/data/maps/ThreeIsland_Mart/scripts.inc @@ -3,7 +3,7 @@ ThreeIsland_Mart_MapScripts:: @ 817188C ThreeIsland_Mart_EventScript_17188D:: @ 817188D special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 lock faceplayer diff --git a/data/maps/ThreeIsland_Port/scripts.inc b/data/maps/ThreeIsland_Port/scripts.inc index 1aff12731..842bd794d 100644 --- a/data/maps/ThreeIsland_Port/scripts.inc +++ b/data/maps/ThreeIsland_Port/scripts.inc @@ -10,9 +10,9 @@ ThreeIsland_Port_MapScript1_16878F:: @ 816878F ThreeIsland_Port_EventScript_168796:: @ 8168796 lock faceplayer - compare_var_to_value VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 2 + compare VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 2 goto_if ge, EventScript_1687B8 - compare_var_to_value VAR_MAP_SCENE_THREE_ISLAND, 4 + compare VAR_MAP_SCENE_THREE_ISLAND, 4 goto_if ge, EventScript_1687C2 msgbox gUnknown_818A307 release diff --git a/data/maps/TwoIsland/scripts.inc b/data/maps/TwoIsland/scripts.inc index 3d35a89c1..3ecbbaa87 100644 --- a/data/maps/TwoIsland/scripts.inc +++ b/data/maps/TwoIsland/scripts.inc @@ -69,15 +69,15 @@ EventScript_167606:: @ 8167606 TwoIsland_EventScript_16760F:: @ 816760F special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 lock faceplayer - compare_var_to_value VAR_MAP_SCENE_TWO_ISLAND, 4 + compare VAR_MAP_SCENE_TWO_ISLAND, 4 goto_if eq, EventScript_167646 - compare_var_to_value VAR_MAP_SCENE_TWO_ISLAND, 3 + compare VAR_MAP_SCENE_TWO_ISLAND, 3 goto_if eq, EventScript_16765E - compare_var_to_value VAR_MAP_SCENE_TWO_ISLAND, 2 + compare VAR_MAP_SCENE_TWO_ISLAND, 2 goto_if eq, EventScript_167676 goto EventScript_16768E end @@ -121,11 +121,11 @@ EventScript_16768E:: @ 816768E EventScript_1676A6:: @ 81676A6 message Text_1A6211 waitmessage - compare_var_to_value VAR_MAP_SCENE_TWO_ISLAND, 4 + compare VAR_MAP_SCENE_TWO_ISLAND, 4 goto_if eq, EventScript_167728 - compare_var_to_value VAR_MAP_SCENE_TWO_ISLAND, 3 + compare VAR_MAP_SCENE_TWO_ISLAND, 3 goto_if eq, EventScript_167708 - compare_var_to_value VAR_MAP_SCENE_TWO_ISLAND, 2 + compare VAR_MAP_SCENE_TWO_ISLAND, 2 goto_if eq, EventScript_1676EC goto EventScript_1676D3 end diff --git a/data/maps/TwoIsland_House/scripts.inc b/data/maps/TwoIsland_House/scripts.inc index 40c68cb7e..f2761d7e2 100644 --- a/data/maps/TwoIsland_House/scripts.inc +++ b/data/maps/TwoIsland_House/scripts.inc @@ -3,7 +3,7 @@ TwoIsland_House_MapScripts:: @ 8171618 TwoIsland_House_EventScript_171619:: @ 8171619 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 special sub_8112364 lock @@ -20,10 +20,10 @@ TwoIsland_House_EventScript_171619:: @ 8171619 EventScript_17164F:: @ 817164F checkitem ITEM_BIG_MUSHROOM, 1 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if eq, EventScript_1717A8 checkitem ITEM_TINY_MUSHROOM, 2 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if eq, EventScript_1717AC checkflag FLAG_TEMP_2 goto_if TRUE, EventScript_171687 @@ -46,7 +46,7 @@ EventScript_171696:: @ 8171696 EventScript_1716A5:: @ 81716A5 msgbox gUnknown_81A2C63, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_17179E goto EventScript_1716BE end @@ -55,12 +55,12 @@ EventScript_1716BE:: @ 81716BE msgbox gUnknown_81A2CC3 special SelectMoveTutorMon waitstate - compare_var_to_value VAR_0x8004, 6 + compare VAR_0x8004, 6 goto_if ge, EventScript_17179E special IsSelectedMonEgg - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_171790 - compare_var_to_value VAR_0x8005, 0 + compare VAR_0x8005, 0 goto_if eq, EventScript_171782 goto EventScript_1716F4 end @@ -69,7 +69,7 @@ EventScript_1716F4:: @ 81716F4 msgbox gUnknown_81A2CE1 special DisplayMoveTutorMenu waitstate - compare_var_to_value VAR_0x8004, 0 + compare VAR_0x8004, 0 goto_if eq, EventScript_1716BE checkflag FLAG_TEMP_4 goto_if TRUE, EventScript_17175B diff --git a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc index 798435eaf..53b72c2db 100644 --- a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc +++ b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc @@ -125,7 +125,7 @@ Movement_17152F:: @ 817152F TwoIsland_JoyfulGameCorner_EventScript_171535:: @ 8171535 lock faceplayer - compare_var_to_value VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 4 + compare VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 4 goto_if eq, EventScript_1BC060 checkflag FLAG_RESCUED_LOSTELLE goto_if TRUE, EventScript_171555 @@ -141,11 +141,11 @@ EventScript_171555:: @ 8171555 TwoIsland_JoyfulGameCorner_EventScript_17155F:: @ 817155F lock faceplayer - compare_var_to_value VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 4 + compare VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 4 goto_if eq, EventScript_1BC0CE checkflag FLAG_GOT_MOON_STONE_FROM_JOYFUL_GAME_CORNER goto_if TRUE, EventScript_1715F5 - compare_var_to_value VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 3 + compare VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 3 goto_if eq, EventScript_17158A msgbox gUnknown_81A2743 release @@ -169,7 +169,7 @@ EventScript_17158A:: @ 817158A EventScript_1715C4:: @ 81715C4 checkitemspace ITEM_MOON_STONE, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1715FF additem ITEM_MOON_STONE, 1 setflag FLAG_GOT_MOON_STONE_FROM_JOYFUL_GAME_CORNER diff --git a/data/maps/UndergroundPath_NorthEntrance/scripts.inc b/data/maps/UndergroundPath_NorthEntrance/scripts.inc index 4d5a806e2..39e8c1fcc 100644 --- a/data/maps/UndergroundPath_NorthEntrance/scripts.inc +++ b/data/maps/UndergroundPath_NorthEntrance/scripts.inc @@ -9,13 +9,13 @@ UndergroundPath_NorthEntrance_EventScript_160E39:: @ 8160E39 checkflag FLAG_DID_MS_NIDO_TRADE goto_if TRUE, EventScript_160EAB msgbox gUnknown_81A5AD6, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_160E93 call EventScript_1A8CBD - compare_var_to_value VAR_0x8004, 6 + compare VAR_0x8004, 6 goto_if ge, EventScript_160E93 call EventScript_1A8CC9 - compare_var_to_var VAR_RESULT, VAR_0x8009 + compare VAR_RESULT, VAR_0x8009 goto_if ne, EventScript_160E9D call EventScript_1A8CD9 msgbox gUnknown_81A5B4A diff --git a/data/maps/VermilionCity/scripts.inc b/data/maps/VermilionCity/scripts.inc index fcacff2e3..cb5186fe1 100644 --- a/data/maps/VermilionCity/scripts.inc +++ b/data/maps/VermilionCity/scripts.inc @@ -37,7 +37,7 @@ VermilionCity_EventScript_166917:: @ 8166917 VermilionCity_EventScript_166920:: @ 8166920 lock faceplayer - compare_var_to_value VAR_MAP_SCENE_VERMILION_CITY, 3 + compare VAR_MAP_SCENE_VERMILION_CITY, 3 goto_if eq, EventScript_166937 msgbox gUnknown_817F776 release @@ -51,7 +51,7 @@ EventScript_166937:: @ 8166937 VermilionCity_EventScript_166941:: @ 8166941 lock faceplayer - compare_var_to_value VAR_MAP_SCENE_VERMILION_CITY, 3 + compare VAR_MAP_SCENE_VERMILION_CITY, 3 goto_if eq, EventScript_166996 msgbox gUnknown_817FA22 release @@ -61,7 +61,7 @@ EventScript_166958:: @ 8166958 checkflag FLAG_SYS_GOT_MYSTIC_TICKET goto_if FALSE, EventScript_1A77B0 checkitem ITEM_MYSTIC_TICKET, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1A77B0 goto EventScript_1A77AA end @@ -70,16 +70,16 @@ EventScript_166977:: @ 8166977 checkflag FLAG_SYS_GOT_AURORA_TICKET goto_if FALSE, EventScript_1A77B0 checkitem ITEM_AURORA_TICKET, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_1A77B0 goto EventScript_1A77AA end EventScript_166996:: @ 8166996 setvar VAR_0x8004, SEAGALLOP_VERMILION_CITY - compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 + compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 goto_if ge, EventScript_1669BB - compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 1 + compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 1 goto_if ge, EventScript_166B3B msgbox gUnknown_817FB10 release @@ -87,14 +87,14 @@ EventScript_166996:: @ 8166996 EventScript_1669BB:: @ 81669BB special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 special sub_8112364 call EventScript_166958 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_1669FD call EventScript_166977 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_166A5F setvar VAR_0x8004, SEAGALLOP_VERMILION_CITY message Text_17FBB8 @@ -104,7 +104,7 @@ EventScript_1669BB:: @ 81669BB EventScript_1669FD:: @ 81669FD call EventScript_166977 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_166AB1 checkflag FLAG_SHOWED_MYSTICTICKET_TO_CAPTAIN call_if FALSE, EventScript_166A53 @@ -209,7 +209,7 @@ EventScript_166BA0:: @ 8166BA0 applymovement 6, Movement_1A75E7 applymovement 255, Movement_1A75EB waitmovement 0 - compare_var_to_value VAR_MAP_SCENE_VERMILION_CITY, 3 + compare VAR_MAP_SCENE_VERMILION_CITY, 3 goto_if eq, EventScript_166BED msgbox gUnknown_817FA3C checkflag FLAG_GOT_SS_TICKET @@ -227,9 +227,9 @@ EventScript_166BDE:: @ 8166BDE EventScript_166BED:: @ 8166BED setvar VAR_0x8004, SEAGALLOP_VERMILION_CITY - compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 + compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 goto_if ge, EventScript_1669BB - compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 1 + compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 1 goto_if ge, EventScript_166B3B msgbox gUnknown_817FB10 closemessage diff --git a/data/maps/VermilionCity_Gym/scripts.inc b/data/maps/VermilionCity_Gym/scripts.inc index 5d08e2b3a..a654dea5a 100644 --- a/data/maps/VermilionCity_Gym/scripts.inc +++ b/data/maps/VermilionCity_Gym/scripts.inc @@ -140,7 +140,7 @@ VermilionCity_Gym_EventScript_16B837:: @ 816B837 EventScript_16B843:: @ 816B843 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 special sub_8112364 copyvar VAR_0x8004, VAR_0x4000 @@ -149,7 +149,7 @@ EventScript_16B843:: @ 816B843 goto_if TRUE, EventScript_16B8E5 checkflag FLAG_TEMP_1 goto_if TRUE, EventScript_16B89E - compare_var_to_var VAR_0x8004, VAR_0x8008 + compare VAR_0x8004, VAR_0x8008 goto_if eq, EventScript_16B885 msgbox gUnknown_8195289 releaseall @@ -166,7 +166,7 @@ EventScript_16B885:: @ 816B885 end EventScript_16B89E:: @ 816B89E - compare_var_to_var VAR_0x8005, VAR_0x8008 + compare VAR_0x8005, VAR_0x8008 goto_if eq, EventScript_16B8CB msgbox gUnknown_819536C clearflag FLAG_TEMP_1 @@ -234,7 +234,7 @@ EventScript_16B9AB:: @ 816B9AB EventScript_16B9AF:: @ 816B9AF msgbox gUnknown_8194CFA checkitemspace ITEM_TM34, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16B9F0 additem ITEM_TM34, 1 giveitemfanfaremsg gUnknown_8194D87, ITEM_TM34 diff --git a/data/maps/VermilionCity_House1/scripts.inc b/data/maps/VermilionCity_House1/scripts.inc index 6020f9cb0..cfa7f143e 100644 --- a/data/maps/VermilionCity_House1/scripts.inc +++ b/data/maps/VermilionCity_House1/scripts.inc @@ -7,7 +7,7 @@ VermilionCity_House1_EventScript_16B3A7:: @ 816B3A7 checkflag FLAG_GOT_OLD_ROD goto_if TRUE, EventScript_16B3CF msgbox gUnknown_8193EC1, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16B3D9 msgbox gUnknown_8194028 release @@ -20,7 +20,7 @@ EventScript_16B3CF:: @ 816B3CF EventScript_16B3D9:: @ 816B3D9 checkitemspace ITEM_OLD_ROD, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16B41A additem ITEM_OLD_ROD, 1 msgbox gUnknown_8193F2A diff --git a/data/maps/VermilionCity_House2/scripts.inc b/data/maps/VermilionCity_House2/scripts.inc index fa9fd6453..e24705d6d 100644 --- a/data/maps/VermilionCity_House2/scripts.inc +++ b/data/maps/VermilionCity_House2/scripts.inc @@ -9,13 +9,13 @@ VermilionCity_House2_EventScript_16B5D7:: @ 816B5D7 checkflag FLAG_DID_CH_DING_TRADE goto_if TRUE, EventScript_16B649 msgbox gUnknown_81949CB, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16B631 call EventScript_1A8CBD - compare_var_to_value VAR_0x8004, 6 + compare VAR_0x8004, 6 goto_if ge, EventScript_16B631 call EventScript_1A8CC9 - compare_var_to_var VAR_RESULT, VAR_0x8009 + compare VAR_RESULT, VAR_0x8009 goto_if ne, EventScript_16B63B call EventScript_1A8CD9 msgbox gUnknown_8194A44 diff --git a/data/maps/VermilionCity_Mart/scripts.inc b/data/maps/VermilionCity_Mart/scripts.inc index d7beb6e7e..49bf508ee 100644 --- a/data/maps/VermilionCity_Mart/scripts.inc +++ b/data/maps/VermilionCity_Mart/scripts.inc @@ -11,7 +11,7 @@ VermilionCity_Mart_EventScript_16B65D:: @ 816B65D VermilionCity_Mart_EventScript_16B666:: @ 816B666 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 lock faceplayer diff --git a/data/maps/VermilionCity_PokemonFanClub/scripts.inc b/data/maps/VermilionCity_PokemonFanClub/scripts.inc index 397c174ea..bb6e7e041 100644 --- a/data/maps/VermilionCity_PokemonFanClub/scripts.inc +++ b/data/maps/VermilionCity_PokemonFanClub/scripts.inc @@ -7,7 +7,7 @@ VermilionCity_PokemonFanClub_EventScript_16B47F:: @ 816B47F checkflag FLAG_GOT_BIKE_VOUCHER goto_if TRUE, EventScript_16B4A7 msgbox gUnknown_819457E, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_16B4B1 msgbox gUnknown_8194860 release @@ -21,7 +21,7 @@ EventScript_16B4A7:: @ 816B4A7 EventScript_16B4B1:: @ 816B4B1 msgbox gUnknown_8194628 checkitemspace ITEM_BIKE_VOUCHER, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16B4F2 setflag FLAG_GOT_BIKE_VOUCHER additem ITEM_BIKE_VOUCHER, 1 diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc index 20759c714..cd77c97b1 100644 --- a/data/maps/VictoryRoad_1F/scripts.inc +++ b/data/maps/VictoryRoad_1F/scripts.inc @@ -4,7 +4,7 @@ VictoryRoad_1F_MapScripts:: @ 8160F05 .byte 0 VictoryRoad_1F_MapScript1_160F10:: @ 8160F10 - compare_var_to_value VAR_MAP_SCENE_VICTORY_ROAD_1F, 100 + compare VAR_MAP_SCENE_VICTORY_ROAD_1F, 100 call_if ne, EventScript_160F1C end @@ -19,7 +19,7 @@ VictoryRoad_1F_MapScript2_160F2F:: @ 8160F2F VictoryRoad_1F_EventScript_160F33:: @ 8160F33 lockall - compare_var_to_value VAR_MAP_SCENE_VICTORY_ROAD_1F, 100 + compare VAR_MAP_SCENE_VICTORY_ROAD_1F, 100 goto_if eq, EventScript_160F62 setmetatile 12, 14, 721, 0 setmetatile 12, 15, 737, 0 diff --git a/data/maps/VictoryRoad_2F/scripts.inc b/data/maps/VictoryRoad_2F/scripts.inc index d2fa2e8b4..e2018c27e 100644 --- a/data/maps/VictoryRoad_2F/scripts.inc +++ b/data/maps/VictoryRoad_2F/scripts.inc @@ -3,9 +3,9 @@ VictoryRoad_2F_MapScripts:: @ 8160F92 .byte 0 VictoryRoad_2F_MapScript1_160F98:: @ 8160F98 - compare_var_to_value VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER1, 100 + compare VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER1, 100 call_if ne, EventScript_160FAF - compare_var_to_value VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER2, 100 + compare VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER2, 100 call_if ne, EventScript_160FC2 end @@ -21,7 +21,7 @@ EventScript_160FC2:: @ 8160FC2 VictoryRoad_2F_EventScript_160FD5:: @ 8160FD5 lockall - compare_var_to_value VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER1, 100 + compare VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER1, 100 goto_if eq, EventScript_161004 setmetatile 13, 10, 721, 0 setmetatile 13, 11, 737, 0 @@ -39,7 +39,7 @@ EventScript_161004:: @ 8161004 VictoryRoad_2F_EventScript_161006:: @ 8161006 lockall - compare_var_to_value VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER2, 100 + compare VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER2, 100 goto_if eq, EventScript_161035 setmetatile 33, 16, 721, 0 setmetatile 33, 17, 737, 0 diff --git a/data/maps/VictoryRoad_3F/scripts.inc b/data/maps/VictoryRoad_3F/scripts.inc index fe77da24d..6f6b4b5bd 100644 --- a/data/maps/VictoryRoad_3F/scripts.inc +++ b/data/maps/VictoryRoad_3F/scripts.inc @@ -3,7 +3,7 @@ VictoryRoad_3F_MapScripts:: @ 81610AA .byte 0 VictoryRoad_3F_MapScript1_1610B0:: @ 81610B0 - compare_var_to_value VAR_MAP_SCENE_VICTORY_ROAD_3F, 100 + compare VAR_MAP_SCENE_VICTORY_ROAD_3F, 100 call_if ne, EventScript_1610BC end @@ -14,7 +14,7 @@ EventScript_1610BC:: @ 81610BC VictoryRoad_3F_EventScript_1610CF:: @ 81610CF lockall - compare_var_to_value VAR_MAP_SCENE_VICTORY_ROAD_3F, 100 + compare VAR_MAP_SCENE_VICTORY_ROAD_3F, 100 goto_if eq, EventScript_161101 setmetatile 12, 12, 721, 0 setmetatile 12, 13, 737, 0 diff --git a/data/maps/ViridianCity/scripts.inc b/data/maps/ViridianCity/scripts.inc index 070c162c6..a9bc4d4b1 100644 --- a/data/maps/ViridianCity/scripts.inc +++ b/data/maps/ViridianCity/scripts.inc @@ -4,13 +4,13 @@ ViridianCity_MapScripts:: @ 81658D3 ViridianCity_MapScript1_1658D9:: @ 81658D9 setworldmapflag FLAG_WORLD_MAP_VIRIDIAN_CITY - compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 0 + compare VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 0 call_if eq, EventScript_165920 - compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 1 + compare VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 1 call_if eq, EventScript_16590F - compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 2 + compare VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 2 call_if ge, EventScript_165909 - compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_GYM_DOOR, 0 + compare VAR_MAP_SCENE_VIRIDIAN_CITY_GYM_DOOR, 0 call_if eq, EventScript_165931 end @@ -90,7 +90,7 @@ ViridianCity_EventScript_1659C1:: @ 81659C1 ViridianCity_EventScript_1659CA:: @ 81659CA lock faceplayer - compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_GYM_DOOR, 1 + compare VAR_MAP_SCENE_VIRIDIAN_CITY_GYM_DOOR, 1 goto_if eq, EventScript_1659EC msgbox gUnknown_817DB39 closemessage @@ -109,17 +109,17 @@ ViridianCity_EventScript_1659F6:: @ 81659F6 faceplayer checkflag FLAG_BADGE01_GET goto_if TRUE, EventScript_165A23 - compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 2 + compare VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 2 goto_if ge, EventScript_165A4A - compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 1 + compare VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 1 goto_if eq, EventScript_165A54 - compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 0 + compare VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 0 goto_if eq, EventScript_165A84 end EventScript_165A23:: @ 8165A23 msgbox gUnknown_817E046, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_165A40 msgbox gUnknown_817E0EA release @@ -148,7 +148,7 @@ EventScript_165A5B:: @ 8165A5B EventScript_165A65:: @ 8165A65 msgbox gUnknown_817DE9B special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 special sub_8112364 special ScrSpecial_StartOldManTutorialBattle @@ -166,9 +166,9 @@ ViridianCity_EventScript_165A8F:: @ 8165A8F lock faceplayer msgbox gUnknown_817DB98, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if eq, EventScript_165AB0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_165ABA end @@ -185,7 +185,7 @@ EventScript_165ABA:: @ 8165ABA ViridianCity_EventScript_165AC4:: @ 8165AC4 lock faceplayer - compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 0 + compare VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 0 goto_if eq, EventScript_165ADB msgbox gUnknown_817DC99 release @@ -243,7 +243,7 @@ EventScript_165B4C:: @ 8165B4C msgbox gUnknown_817DD4E closemessage special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 special sub_8112364 special ScrSpecial_StartOldManTutorialBattle diff --git a/data/maps/ViridianCity_Gym/scripts.inc b/data/maps/ViridianCity_Gym/scripts.inc index f3d9bfe10..43660d1ae 100644 --- a/data/maps/ViridianCity_Gym/scripts.inc +++ b/data/maps/ViridianCity_Gym/scripts.inc @@ -27,7 +27,7 @@ EventScript_169F04:: @ 8169F04 EventScript_169F2F:: @ 8169F2F msgbox gUnknown_818F586 checkitemspace ITEM_TM26, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_169F70 additem ITEM_TM26, 1 giveitemfanfaremsg gUnknown_818F675, ITEM_TM26 diff --git a/data/maps/ViridianCity_House2/scripts.inc b/data/maps/ViridianCity_House2/scripts.inc index 1c25dd3e4..8a777331e 100644 --- a/data/maps/ViridianCity_House2/scripts.inc +++ b/data/maps/ViridianCity_House2/scripts.inc @@ -25,15 +25,15 @@ ViridianCity_House2_EventScript_16A0AB:: @ 816A0AB lockall msgbox gUnknown_818FC65 msgbox gUnknown_818FF19, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16A11B msgbox gUnknown_818FD23 msgbox gUnknown_818FF19, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16A11B msgbox gUnknown_818FDA8 msgbox gUnknown_818FF19, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_16A11B msgbox gUnknown_818FE5C applymovement 2, Movement_1A75E9 diff --git a/data/maps/ViridianCity_Mart/scripts.inc b/data/maps/ViridianCity_Mart/scripts.inc index 95c45ea7d..f16afdd2e 100644 --- a/data/maps/ViridianCity_Mart/scripts.inc +++ b/data/maps/ViridianCity_Mart/scripts.inc @@ -54,10 +54,10 @@ Movement_16A262:: @ 816A262 ViridianCity_Mart_EventScript_16A268:: @ 816A268 lock faceplayer - compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 1 + compare VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 1 goto_if eq, EventScript_16A2A4 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 message Text_1A6211 waitmessage diff --git a/data/mystery_event_msg.s b/data/mystery_event_msg.s index a62ebb8b8..08655098e 100644 --- a/data/mystery_event_msg.s +++ b/data/mystery_event_msg.s @@ -43,7 +43,7 @@ MysteryEventScript_SurfPichu:: @ 8488EB5 SurfPichu_GiveIfPossible: @ 8488EC4 specialvar VAR_EVENT_PICHU_SLOT, CalculatePlayerPartyCount - compare_var_to_value VAR_EVENT_PICHU_SLOT, 6 + compare VAR_EVENT_PICHU_SLOT, 6 vgoto_if TRUE, SurfPichu_FullParty setflag FLAG_MYSTERY_EVENT_DONE vcall SurfPichu_GiveEgg @@ -70,15 +70,15 @@ SurfPichu_GiveEgg: @ 8488EF6 giveegg SPECIES_PICHU setmonobedient VAR_EVENT_PICHU_SLOT setmonmetlocation VAR_EVENT_PICHU_SLOT, 0xff - compare_var_to_value VAR_EVENT_PICHU_SLOT, 1 + compare VAR_EVENT_PICHU_SLOT, 1 vgoto_if TRUE, SurfPichu_Slot1 - compare_var_to_value VAR_EVENT_PICHU_SLOT, 2 + compare VAR_EVENT_PICHU_SLOT, 2 vgoto_if TRUE, SurfPichu_Slot2 - compare_var_to_value VAR_EVENT_PICHU_SLOT, 3 + compare VAR_EVENT_PICHU_SLOT, 3 vgoto_if TRUE, SurfPichu_Slot3 - compare_var_to_value VAR_EVENT_PICHU_SLOT, 4 + compare VAR_EVENT_PICHU_SLOT, 4 vgoto_if TRUE, SurfPichu_Slot4 - compare_var_to_value VAR_EVENT_PICHU_SLOT, 5 + compare VAR_EVENT_PICHU_SLOT, 5 vgoto_if TRUE, SurfPichu_Slot5 return @@ -118,7 +118,7 @@ sText_FullParty: @ 8488FE3 MysteryEventScript_VisitingTrainer:: @ 848903A setvaddress MysteryEventScript_VisitingTrainer special ValidateEReaderTrainer - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 vgoto_if TRUE, MysteryEventScript_VisitingTrainerArrived lock faceplayer @@ -171,7 +171,7 @@ MysteryEventScript_BattleCard:: @ 84892B9 vgoto_if TRUE, MysteryEventScript_BattleCardInfo setorcopyvar VAR_RESULT, 2 specialvar VAR_0x8008, Special_BattleCardAction - compare_var_to_value VAR_0x8008, 3 + compare VAR_0x8008, 3 vgoto_if FALSE, MysteryEventScript_BattleCardInfo lock faceplayer @@ -222,13 +222,13 @@ MysteryEventScript_AuroraTicket:: @ 84894B9 checkflag FLAG_FOUGHT_DEOXYS vgoto_if TRUE, AuroraTicket_Obtained checkitem ITEM_AURORA_TICKET, 1 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 vgoto_if TRUE, AuroraTicket_Obtained vmessage sText_AuroraTicket1 waitmessage waitbuttonpress checkitemspace ITEM_AURORA_TICKET, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 vgoto_if TRUE, AuroraTicket_NoBagSpace giveitem ITEM_AURORA_TICKET setflag FLAG_SYS_GOT_AURORA_TICKET @@ -286,13 +286,13 @@ MysteryEventScript_MysticTicket:: @ 8489689 checkflag FLAG_FOUGHT_HO_OH vgoto_if TRUE, MysticTicket_Obtained checkitem ITEM_MYSTIC_TICKET, 1 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 vgoto_if TRUE, MysticTicket_Obtained vmessage sText_MysticTicket2 waitmessage waitbuttonpress checkitemspace ITEM_MYSTIC_TICKET, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 vgoto_if TRUE, MysticTicket_NoBagSpace giveitem ITEM_MYSTIC_TICKET setflag FLAG_SYS_GOT_MYSTIC_TICKET @@ -342,7 +342,7 @@ sText_MysticTicketNoPlace: @ 84897EE MysteryEventScript_AlteringCave:: @ 8489862 setvaddress MysteryEventScript_AlteringCave addvar VAR_ALTERING_CAVE_WILD_SET, 1 - compare_var_to_value VAR_ALTERING_CAVE_WILD_SET, 10 + compare VAR_ALTERING_CAVE_WILD_SET, 10 vgoto_if FALSE, MysteryEventScript_AlteringCave_ setvar VAR_ALTERING_CAVE_WILD_SET, 0 MysteryEventScript_AlteringCave_: @ 848987C diff --git a/data/strings.s b/data/strings.s index d1bbeef49..4e77b6063 100644 --- a/data/strings.s +++ b/data/strings.s @@ -1557,7 +1557,7 @@ gText_KeyItems:: @ 0x8417B17 gText_PokeBalls:: @ 0x8417B21 .string "POKé BALLS$" -gText_TmsgUnknown_8417B2CHms:: @ 0x8417B2C +gText_TMsAndHMs:: @ 0x8417B2C .string "TMs & HMs$" gText_Berries:: @ 0x8417B36 diff --git a/include/constants/global.h b/include/constants/global.h index 68c4f8246..4a4c83c62 100644 --- a/include/constants/global.h +++ b/include/constants/global.h @@ -7,24 +7,19 @@ #define POKEMON_NAME_LENGTH 10 #define OT_NAME_LENGTH 7 -enum -{ - VERSION_SAPPHIRE = 1, - VERSION_RUBY = 2, - VERSION_EMERALD = 3, - VERSION_FIRE_RED = 4, - VERSION_LEAF_GREEN = 5, -}; - -enum LanguageId { - LANGUAGE_JAPANESE = 1, - LANGUAGE_ENGLISH = 2, - LANGUAGE_FRENCH = 3, - LANGUAGE_ITALIAN = 4, - LANGUAGE_GERMAN = 5, +#define VERSION_SAPPHIRE 1 +#define VERSION_RUBY 2 +#define VERSION_EMERALD 3 +#define VERSION_FIRE_RED 4 +#define VERSION_LEAF_GREEN 5 + +#define LANGUAGE_JAPANESE 1 +#define LANGUAGE_ENGLISH 2 +#define LANGUAGE_FRENCH 3 +#define LANGUAGE_ITALIAN 4 +#define LANGUAGE_GERMAN 5 // 6 goes unused but the theory is it was meant to be Korean - LANGUAGE_SPANISH = 7, -}; +#define LANGUAGE_SPANISH 7 #ifdef ENGLISH #define GAME_LANGUAGE (LANGUAGE_ENGLISH) @@ -37,49 +32,32 @@ enum LanguageId { #define BAG_TMHM_COUNT 58 #define BAG_BERRIES_COUNT 43 -enum -{ - MALE, - FEMALE -}; +#define MALE 0 +#define FEMALE 1 -enum -{ - OPTIONS_BUTTON_MODE_HELP, - OPTIONS_BUTTON_MODE_LR, - OPTIONS_BUTTON_MODE_L_EQUALS_A -}; +#define OPTIONS_BUTTON_MODE_HELP 0 +#define OPTIONS_BUTTON_MODE_LR 1 +#define OPTIONS_BUTTON_MODE_L_EQUALS_A 2 -enum -{ - OPTIONS_TEXT_SPEED_SLOW, - OPTIONS_TEXT_SPEED_MID, - OPTIONS_TEXT_SPEED_FAST -}; +#define OPTIONS_TEXT_SPEED_SLOW 0 +#define OPTIONS_TEXT_SPEED_MID 1 +#define OPTIONS_TEXT_SPEED_FAST 2 -enum -{ - OPTIONS_SOUND_MONO, - OPTIONS_SOUND_STEREO -}; +#define OPTIONS_SOUND_MONO 0 +#define OPTIONS_SOUND_STEREO 1 -enum -{ - OPTIONS_BATTLE_STYLE_SHIFT, - OPTIONS_BATTLE_STYLE_SET -}; +#define OPTIONS_BATTLE_STYLE_SHIFT 0 +#define OPTIONS_BATTLE_STYLE_SET 1 -enum -{ - POCKET_ITEMS = 1, - POCKET_KEY_ITEMS, - POCKET_POKE_BALLS, - POCKET_TM_CASE, - POCKET_BERRY_POUCH, -}; +#define POCKET_ITEMS 1 +#define POCKET_KEY_ITEMS 2 +#define POCKET_POKE_BALLS 3 +#define POCKET_TM_CASE 4 +#define POCKET_BERRY_POUCH 5 #define NUM_BAG_POCKETS 5 +#define PARTY_SIZE 6 #define MULTI_PARTY_SIZE PARTY_SIZE / 2 #endif //GUARD_CONSTANTS_GLOBAL_H diff --git a/include/constants/map_scripts.h b/include/constants/map_scripts.h new file mode 100644 index 000000000..2ef3d2544 --- /dev/null +++ b/include/constants/map_scripts.h @@ -0,0 +1,12 @@ +#ifndef GUARD_CONSTANTS_MAP_SCRIPTS_H +#define GUARD_CONSTANTS_MAP_SCRIPTS_H + +#define MAP_SCRIPT_ON_LOAD 1 +#define MAP_SCRIPT_ON_FRAME_TABLE 2 +#define MAP_SCRIPT_ON_TRANSITION 3 +#define MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE 4 +#define MAP_SCRIPT_ON_RESUME 5 +#define MAP_SCRIPT_ON_DIVE_WARP 6 +#define MAP_SCRIPT_ON_RETURN_TO_FIELD 7 + +#endif // GUARD_CONSTANTS_MAP_SCRIPTS_H diff --git a/include/constants/vars.h b/include/constants/vars.h index 3f171ede8..3635aef6b 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -303,7 +303,10 @@ #define VAR_0x40FE 0x40FE #define VAR_0x40FF 0x40FF -#define SPECIAL_VARS_START 0x8000 +#define VARS_END 0x40FF + +#define SPECIAL_VARS_START 0x8000 + #define VAR_0x8000 0x8000 #define VAR_0x8001 0x8001 #define VAR_0x8002 0x8002 @@ -326,4 +329,6 @@ #define VAR_MON_BOX_POS 0x8013 #define VAR_TEXT_COLOR 0x8014 +#define SPECIAL_VARS_END 0x8014 + #endif // GUARD_CONSTANTS_VARS_H diff --git a/include/global.h b/include/global.h index f4d21704b..d8ea62d5c 100644 --- a/include/global.h +++ b/include/global.h @@ -295,8 +295,6 @@ struct SaveBlock2 extern struct SaveBlock2 *gSaveBlock2Ptr; -#define PARTY_SIZE 6 - struct SecretBaseParty { u32 personality[PARTY_SIZE]; @@ -406,7 +404,7 @@ struct UnkMauvilleOldManStruct u8 unk_2D95; /*0x2D96*/ u16 mauvilleOldMan_ecArray[6]; /*0x2DA2*/ u16 mauvilleOldMan_ecArray2[6]; - /*0x2DAE*/ u8 playerName[8]; + /*0x2DAE*/ u8 playerName[PLAYER_NAME_LENGTH + 1]; /*0x2DB6*/ u8 filler_2DB6[0x3]; /*0x2DB9*/ u8 playerTrainerId[4]; u8 unk_2DBD; diff --git a/include/strings.h b/include/strings.h index 90fd49b52..4379ebb65 100644 --- a/include/strings.h +++ b/include/strings.h @@ -823,7 +823,7 @@ extern const u8 gText_Tough_2[]; extern const u8 gText_Items[]; extern const u8 gText_KeyItems[]; extern const u8 gText_PokeBalls[]; -extern const u8 gText_TmsgUnknown_8417B2CHms[]; +extern const u8 gText_TMsAndHMs[]; extern const u8 gText_Berries[]; extern const u8 gText_Boulderbadge[]; extern const u8 gText_Cascadebadge[]; diff --git a/src/script_menu.c b/src/script_menu.c index 4ebd0f8f8..be8578cd0 100644 --- a/src/script_menu.c +++ b/src/script_menu.c @@ -579,7 +579,7 @@ const u8 *const gStdStringPtrs[] = { gText_Items, gText_KeyItems, gText_PokeBalls, - gText_TmsgUnknown_8417B2CHms, + gText_TMsAndHMs, gText_Berries, gText_Boulderbadge, gText_Cascadebadge, |