diff options
189 files changed, 1914 insertions, 1899 deletions
diff --git a/asm/macros/event.inc b/asm/macros/event.inc index c29d886ec..d2164c72f 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -226,6 +226,21 @@ .2byte \var2 .endm + @ Generic compare macro which attempts to deduce argument types based on their values + @ Any negative values are considered local variable indentifiers + @ Any values between 0x4000 to 0x4FFF and 0x8000 to 0x8FFF are considered event variable identifiers + .macro compare arg1, arg2 + .if (\arg1 < 0) && (\arg2 >= 0 && \arg2 < 0xFF) + compare_local_to_imm -\arg1, \arg2 + .elseif ((\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_imm \arg1, \arg2 + .else + .error "Invalid arguments for 'compare'" + .endif + .endm + @ Calls the native C function stored at `func`. .macro callnative func .byte 0x23 diff --git a/data-de/event_scripts.s b/data-de/event_scripts.s index 1885e00f0..5751e440d 100644 --- a/data-de/event_scripts.s +++ b/data-de/event_scripts.s @@ -430,7 +430,7 @@ EventScript_15F3E2: EventScript_15F419: msgbox UnknownString_81A38FB, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq EventScript_15F384 closebutton special SecretBasePC_PackUp @@ -476,13 +476,13 @@ gUnknown_0815F49A:: @ 815F49A EventScript_15F4A1: special sub_80BC56C - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq EventScript_15F4E0 - compare_var_to_imm RESULT, 2 + compare RESULT, 2 goto_if_eq EventScript_15F503 special sub_80BC224 msgbox UnknownString_81A3958, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq EventScript_15F452 msgbox UnknownString_81A3A22, 3 special sub_80BC5BC @@ -492,7 +492,7 @@ EventScript_15F4A1: EventScript_15F4E0: msgbox UnknownString_81A3982, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq EventScript_15F452 msgbox UnknownString_81A3A3A, 3 special sub_80BC5BC @@ -526,13 +526,13 @@ gUnknown_0815F523:: @ 815F523 gUnknown_0815F528:: @ 815F528 special GetShieldToyTVDecorationInfo - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq EventScript_15F558 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq EventScript_15F561 - compare_var_to_imm RESULT, 2 + compare RESULT, 2 goto_if_eq EventScript_15F56A - compare_var_to_imm RESULT, 3 + compare RESULT, 3 goto_if_eq EventScript_15F573 end @@ -942,7 +942,7 @@ gUnknown_0819F818:: @ 819F818 applymovement LAST_TALKED, Movement_19F8F0 waitmovement 0 specialvar RESULT, ScrSpecial_HasTrainerBeenFought - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if 5, EventScript_19F83F special PlayTrainerEncounterMusic special sub_8082524 @@ -956,10 +956,10 @@ gUnknown_0819F840:: @ 819F840 faceplayer call EventScript_19F8E5 specialvar RESULT, ScrSpecial_HasTrainerBeenFought - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if 5, EventScript_19F877 special CheckForAlivePartyMons - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if 5, EventScript_19F870 special PlayTrainerEncounterMusic special sub_8082524 @@ -985,7 +985,7 @@ gUnknown_0819F878:: @ 819F878 gUnknown_0819F887:: @ 819F887 call EventScript_19F8E5 specialvar RESULT, ScrSpecial_GetTrainerEyeRematchFlag - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq EventScript_19F8AD special PlayTrainerEncounterMusic special sub_8082524 @@ -1002,10 +1002,10 @@ EventScript_19F8AD: gUnknown_0819F8AE:: @ 819F8AE specialvar RESULT, ScrSpecial_GetTrainerEyeRematchFlag - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq EventScript_19F8DD special CheckForAlivePartyMons - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if 5, EventScript_19F8DE special PlayTrainerEncounterMusic special sub_8082524 @@ -1042,15 +1042,15 @@ EventScript_19F8F2: waitbutton reptrainerbattle specialvar RESULT, ScrSpecial_GetTrainerBattleMode - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq EventScript_19F934 - compare_var_to_imm RESULT, 2 + compare RESULT, 2 goto_if_eq EventScript_19F936 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq EventScript_19F936 - compare_var_to_imm RESULT, 6 + compare RESULT, 6 goto_if_eq EventScript_19F936 - compare_var_to_imm RESULT, 8 + compare RESULT, 8 goto_if_eq EventScript_19F936 EventScript_19F934: @@ -1341,11 +1341,11 @@ EventScript_19FC84: return gUnknown_0819FC9F:: @ 819FC9F - compare_var_to_imm 0x4096, 1 + compare 0x4096, 1 goto_if_eq EventScript_19FCC1 - compare_var_to_imm 0x4096, 2 + compare 0x4096, 2 goto_if_eq EventScript_19FCD7 - compare_var_to_imm 0x4096, 3 + compare 0x4096, 3 goto_if_eq EventScript_19FCF0 end @@ -1439,9 +1439,9 @@ VerdanturfTown_PokemonCenter_1F_EventScript_19FD5B:: @ 819FD5B lock faceplayer msgbox gText_NurseJoy_Welcome, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_19FD7C - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_19FDC7 end @@ -1477,9 +1477,9 @@ OldaleTown_PokemonCenter_1F_EventScript_19FDC7:: @ 819FDC7 OldaleTown_PokemonCenter_1F_EventScript_19FDCE:: @ 819FDCE specialvar RESULT, IsPokerusInParty - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_19FDEA - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_19FDB0 end @@ -1504,9 +1504,9 @@ Std_ObtainItem_: @ 819FE07 bufferitem 1, 0x8000 checkitemtype 0x8000 call GetItem_HandlePocket - compare_var_to_imm 0x8007, 0x1 + compare 0x8007, 0x1 call_if 1, Std_ObtainItem_Success - compare_var_to_imm 0x8007, 0x0 + compare 0x8007, 0x0 call_if 1, Std_ObtainItem_Fail return @@ -1521,31 +1521,31 @@ GetItem_HandlePocket: GetItem_HandlePocket_Items: bufferstd 2, 0xE - compare_var_to_imm 0x8007, 1 + compare 0x8007, 1 call_if 1, PlayGetItemFanfare return GetItem_HandlePocket_KeyItems: bufferstd 2, 0xF - compare_var_to_imm 0x8007, 1 + compare 0x8007, 1 call_if 1, PlayGetItemFanfare return GetItem_HandlePocket_PokeBalls: bufferstd 2, 0x10 - compare_var_to_imm 0x8007, 1 + compare 0x8007, 1 call_if 1, PlayGetItemFanfare return GetItem_HandlePocket_TMsHMs: bufferstd 2, 0x11 - compare_var_to_imm 0x8007, 1 + compare 0x8007, 1 call_if 1, PlayGetTMHMFanfare return GetItem_HandlePocket_Berries: bufferstd 2, 0x12 - compare_var_to_imm 0x8007, 1 + compare 0x8007, 1 call_if 1, PlayGetItemFanfare return @@ -1577,9 +1577,9 @@ Std_ObtainDecoration: @ 819FEDA Std_ObtainDecoration_: @ 819FEE8 bufferdecor 1, 0x8000 - compare_var_to_imm 0x8007, 1 + compare 0x8007, 1 call_if 1, Std_ObtainDecoration_Success - compare_var_to_imm 0x8007, 0 + compare 0x8007, 0 call_if 1, Std_ObtainDecoration_Fail return @@ -1605,9 +1605,9 @@ Std_FindItem: @ 819FF21 bufferitem 1, 0x8000 checkitemtype 0x8000 call GetItem_HandlePocket - compare_var_to_imm 0x8007, 1 + compare 0x8007, 1 call_if 1, Std_FindItem_Success - compare_var_to_imm 0x8007, 0 + compare 0x8007, 0 call_if 1, Std_FindItem_Fail release return @@ -1634,9 +1634,9 @@ HiddenItemScript:: @ 819FF7B bufferitem 0x1, 0x8005 checkitemtype 0x8005 call GetItem_HandlePocket - compare_var_to_imm 0x8007, 1 + compare 0x8007, 1 goto_if_eq HiddenItemScript_Success - compare_var_to_imm 0x8007, 0 + compare 0x8007, 0 goto_if_eq HiddenItemScript_Fail end @@ -1660,9 +1660,9 @@ UnusedMixRecordsScript: @ 819FFD5 lock faceplayer msgbox UnusedMixRecordsPromptText, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq UnusedMixRecordsScript_Yes - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq UnusedMixRecordsScript_Done goto UnusedMixRecordsScript_Done UnusedMixRecordsScript_Yes: @ 819FFFA @@ -1817,13 +1817,13 @@ Route109_EventScript_1A010C:: @ 81A010C UseSurfScript:: @ 81A0117 checkattack MOVE_SURF - compare_var_to_imm RESULT, 6 + compare RESULT, 6 goto_if_eq UseSurfScript_NoMon bufferpartypoke 0, RESULT setanimation 0, RESULT lockall msgbox UseSurfPromptText, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq UseSurfScript_No msgbox UsedSurfText, 4 doanimation 9 @@ -1842,9 +1842,9 @@ Route110_EventScript_1A014E:: @ 81A014E Route119_EventScript_1A014E:: @ 81A014E RustboroCity_EventScript_1A014E:: @ 81A014E checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq RustboroCity_EventScript_1A0166 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq RustboroCity_EventScript_1A016C end @@ -1860,9 +1860,9 @@ LavaridgeTown_EventScript_1A0172:: @ 81A0172 Route110_EventScript_1A0172:: @ 81A0172 Route119_EventScript_1A0172:: @ 81A0172 checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LavaridgeTown_EventScript_1A018A - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LavaridgeTown_EventScript_1A0190 end @@ -2142,23 +2142,23 @@ Route109_EventScript_1A02EF:: @ 81A02EF LittlerootTown_ProfessorBirchsLab_EventScript_1A02F4:: @ 81A02F4 Route101_EventScript_1A02F4:: @ 81A02F4 Route103_EventScript_1A02F4:: @ 81A02F4 - compare_var_to_imm 0x4085, 0 + compare 0x4085, 0 goto_if_eq Route101_EventScript_1A14DC - compare_var_to_imm 0x4049, 0 + compare 0x4049, 0 call_if 1, Route101_EventScript_1A0358 - compare_var_to_imm 0x4049, 1 + compare 0x4049, 1 call_if 1, Route101_EventScript_1A0358 - compare_var_to_imm 0x4049, 2 + compare 0x4049, 2 call_if 1, Route101_EventScript_1A0365 - compare_var_to_imm 0x4049, 3 + compare 0x4049, 3 call_if 1, Route101_EventScript_1A0365 - compare_var_to_imm 0x4049, 4 + compare 0x4049, 4 call_if 1, Route101_EventScript_1A0372 - compare_var_to_imm 0x4049, 5 + compare 0x4049, 5 call_if 1, Route101_EventScript_1A0372 - compare_var_to_imm 0x4049, 6 + compare 0x4049, 6 call_if 1, Route101_EventScript_1A0358 - compare_var_to_imm 0x4049, 7 + compare 0x4049, 7 call_if 1, Route101_EventScript_1A0358 return @@ -2189,7 +2189,7 @@ Route103_EventScript_1A037F:: @ 81A037F lock faceplayer msgbox Route101_Text_1C4449, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route101_EventScript_1A039B call Route101_EventScript_1A03B0 release @@ -2218,7 +2218,7 @@ Route101_EventScript_1A03B0:: @ 81A03B0 buffernum 1, 0x8009 msgbox Route101_Text_1C44DC, 4 call Route101_EventScript_1A03A5 - compare_var_to_imm 0x800a, 0 + compare 0x800a, 0 goto_if_eq Route101_EventScript_1A14DC setvar 0x8004, 1 specialvar RESULT, ScriptGetPokedexInfo @@ -2285,9 +2285,9 @@ Movement_1A047A: BattleTower_Outside_EventScript_1A047C:: @ 81A047C SouthernIsland_Exterior_EventScript_1A047C:: @ 81A047C - compare_var_to_imm FACING, 1 + compare FACING, 1 call_if 1, BattleTower_Outside_EventScript_160B2F - compare_var_to_imm FACING, 3 + compare FACING, 3 call_if 1, BattleTower_Outside_EventScript_160B3A delay 30 spriteinvisible 255, 0, 0 @@ -2430,7 +2430,7 @@ Route119_EventScript_1A0587:: @ 81A0587 Route119_EventScript_1A0594:: @ 81A0594 Route120_EventScript_1A0594:: @ 81A0594 checkitem ITEM_DEVON_SCOPE, 1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route119_EventScript_1A05AE msgbox Route119_Text_171B93, 4 release @@ -2438,7 +2438,7 @@ Route120_EventScript_1A0594:: @ 81A0594 Route119_EventScript_1A05AE:: @ 81A05AE msgbox Route119_Text_171BB6, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route119_EventScript_1A05C3 release end @@ -2455,19 +2455,19 @@ Route119_EventScript_1A05C3:: @ 81A05C3 delay 40 waitpokecry setwildbattle SPECIES_KECLEON, 30, ITEM_NONE - compare_var_to_imm 0x8004, 1 + compare 0x8004, 1 call_if 1, Route119_EventScript_1A0646 - compare_var_to_imm 0x8004, 2 + compare 0x8004, 2 call_if 1, Route119_EventScript_1A064A - compare_var_to_imm 0x8004, 3 + compare 0x8004, 3 call_if 1, Route119_EventScript_1A064E - compare_var_to_imm 0x8004, 4 + compare 0x8004, 4 call_if 1, Route119_EventScript_1A0652 - compare_var_to_imm 0x8004, 5 + compare 0x8004, 5 call_if 1, Route119_EventScript_1A0656 - compare_var_to_imm 0x8004, 6 + compare 0x8004, 6 call_if 1, Route119_EventScript_1A065A - compare_var_to_imm 0x8004, 7 + compare 0x8004, 7 call_if 1, Route119_EventScript_1A065E setflag 2145 dowildbattle @@ -3263,7 +3263,7 @@ gUnknown_081A14B8:: @ 81A14B8 lockall special ExecuteWhiteOut waitstate - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq EventScript_1A14CA releaseall end @@ -3618,32 +3618,32 @@ SecretBase_RedCave1_Text_1A2BA4:: @ 81A2BA4 gUnknown_081A2C51:: @ 81A2C51 special sub_80BB70C special sub_80BB63C - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq EventScript_1A2E45 checkattack MOVE_SECRET_POWER setanimation 0, RESULT bufferattack 1, MOVE_SECRET_POWER - compare_var_to_imm 0x8007, 1 + compare 0x8007, 1 goto_if_eq EventScript_1A2CB0 - compare_var_to_imm 0x8007, 2 + compare 0x8007, 2 goto_if_eq EventScript_1A2CB0 - compare_var_to_imm 0x8007, 3 + compare 0x8007, 3 goto_if_eq EventScript_1A2CB0 - compare_var_to_imm 0x8007, 4 + compare 0x8007, 4 goto_if_eq EventScript_1A2CB0 - compare_var_to_imm 0x8007, 5 + compare 0x8007, 5 goto_if_eq EventScript_1A2D08 - compare_var_to_imm 0x8007, 6 + compare 0x8007, 6 goto_if_eq EventScript_1A2D60 end EventScript_1A2CB0: lockall - compare_var_to_imm RESULT, 6 + compare RESULT, 6 goto_if_eq EventScript_1A2CF1 bufferpartypoke 0, RESULT msgbox UnknownString_8198F34, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq EventScript_1A2F3A msgbox UsedCutRockSmashText, 4 closebutton @@ -3670,11 +3670,11 @@ EventScript_1A2CFA: EventScript_1A2D08: lockall - compare_var_to_imm RESULT, 6 + compare RESULT, 6 goto_if_eq EventScript_1A2D49 bufferpartypoke 0, RESULT msgbox UnknownString_81A197B, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq EventScript_1A2F3A msgbox UsedCutRockSmashText, 4 closebutton @@ -3701,11 +3701,11 @@ EventScript_1A2D52: EventScript_1A2D60: lockall - compare_var_to_imm RESULT, 6 + compare RESULT, 6 goto_if_eq EventScript_1A2DA1 bufferpartypoke 0, RESULT msgbox UnknownString_81A1A4B, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq EventScript_1A2F3A msgbox UsedCutRockSmashText, 4 closebutton @@ -3749,7 +3749,7 @@ SecretBase_RedCave1_EventScript_1A2DDE:: @ 81A2DDE waitmovement 0 setvar 0x4097, 1 msgbox SecretBase_RedCave1_Text_198F89, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A2E08 closebutton playse 9 @@ -3773,7 +3773,7 @@ gUnknown_081A2E14:: @ 81A2E14 setvar 0x4097, 1 playse 9 special sub_80BC114 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq EventScript_1A2E38 clearflag 173 special sub_80BBAF0 @@ -3790,57 +3790,57 @@ EventScript_1A2E38: EventScript_1A2E45: checkattack MOVE_SECRET_POWER - compare_var_to_imm RESULT, 6 + compare RESULT, 6 goto_if_eq EventScript_1A2EF7 setanimation 0, RESULT setorcopyvar 0x8004, RESULT lockall special GetSecretBaseNearbyMapName msgbox UnknownString_81A3C71, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq EventScript_1A2F3A msgbox UnknownString_81A38FB, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq EventScript_1A2F3A fadescreen 1 special sub_80BC50C closebutton fadescreen 0 msgbox UnknownString_81A3CC9, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq EventScript_1A2F3A bufferpartypoke 0, 0x8004 bufferattack 1, MOVE_SECRET_POWER msgbox UsedCutRockSmashText, 4 closebutton closebutton - compare_var_to_imm 0x8007, 1 + compare 0x8007, 1 goto_if_eq gUnknown_081A2CE6 - compare_var_to_imm 0x8007, 2 + compare 0x8007, 2 goto_if_eq gUnknown_081A2CE6 - compare_var_to_imm 0x8007, 3 + compare 0x8007, 3 goto_if_eq gUnknown_081A2CE6 - compare_var_to_imm 0x8007, 4 + compare 0x8007, 4 goto_if_eq gUnknown_081A2CE6 - compare_var_to_imm 0x8007, 5 + compare 0x8007, 5 goto_if_eq gUnknown_081A2D3E - compare_var_to_imm 0x8007, 6 + compare 0x8007, 6 goto_if_eq gUnknown_081A2D96 releaseall end EventScript_1A2EF7:: - compare_var_to_imm 0x8007, 1 + compare 0x8007, 1 goto_if_eq EventScript_1A2CF1 - compare_var_to_imm 0x8007, 2 + compare 0x8007, 2 goto_if_eq EventScript_1A2CF1 - compare_var_to_imm 0x8007, 3 + compare 0x8007, 3 goto_if_eq EventScript_1A2CF1 - compare_var_to_imm 0x8007, 4 + compare 0x8007, 4 goto_if_eq EventScript_1A2CF1 - compare_var_to_imm 0x8007, 5 + compare 0x8007, 5 goto_if_eq EventScript_1A2D49 - compare_var_to_imm 0x8007, 6 + compare 0x8007, 6 goto_if_eq EventScript_1A2DA1 end @@ -3893,10 +3893,10 @@ gUnknown_081A2F8A:: @ 81A2F8A EventScript_1A2F95: special sub_8100A7C - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq EventScript_1A2FBF addvar 0x8004, 1 - compare_var_to_imm 0x8005, 0 + compare 0x8005, 0 goto_if_eq EventScript_1A2F95 disappear 0x8006 setflag 0x8005 @@ -3931,42 +3931,42 @@ SecretBase_YellowCave2_EventScript_1A2FC0:: @ 81A2FC0 SecretBase_YellowCave3_EventScript_1A2FC0:: @ 81A2FC0 SecretBase_YellowCave4_EventScript_1A2FC0:: @ 81A2FC0 special sub_80BCE90 - compare_var_to_imm 0x8004, 0 + compare 0x8004, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A3032 - compare_var_to_imm 0x8004, 1 + compare 0x8004, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A30AE - compare_var_to_imm 0x8004, 2 + compare 0x8004, 2 goto_if_eq SecretBase_RedCave1_EventScript_1A312A - compare_var_to_imm 0x8004, 3 + compare 0x8004, 3 goto_if_eq SecretBase_RedCave1_EventScript_1A31A6 - compare_var_to_imm 0x8004, 4 + compare 0x8004, 4 goto_if_eq SecretBase_RedCave1_EventScript_1A3222 - compare_var_to_imm 0x8004, 5 + compare 0x8004, 5 goto_if_eq SecretBase_RedCave1_EventScript_1A329E - compare_var_to_imm 0x8004, 6 + compare 0x8004, 6 goto_if_eq SecretBase_RedCave1_EventScript_1A331A - compare_var_to_imm 0x8004, 7 + compare 0x8004, 7 goto_if_eq SecretBase_RedCave1_EventScript_1A3396 - compare_var_to_imm 0x8004, 8 + compare 0x8004, 8 goto_if_eq SecretBase_RedCave1_EventScript_1A3412 - compare_var_to_imm 0x8004, 9 + compare 0x8004, 9 goto_if_eq SecretBase_RedCave1_EventScript_1A348E end SecretBase_RedCave1_EventScript_1A3032:: @ 81A3032 checkflag 2052 goto_if 0, SecretBase_RedCave1_EventScript_1A3086 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A30A5 lock faceplayer msgbox SecretBase_RedCave1_Text_1A1AEA, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A308F setvar RESULT, 1 special sub_80BCE4C call S_DoSaveDialog - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A308F hidebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A1B83, 4 @@ -3991,17 +3991,17 @@ SecretBase_RedCave1_EventScript_1A30A5:: @ 81A30A5 SecretBase_RedCave1_EventScript_1A30AE:: @ 81A30AE checkflag 2052 goto_if 0, SecretBase_RedCave1_EventScript_1A3102 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A3121 lock faceplayer msgbox SecretBase_RedCave1_Text_1A1E67, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A310B setvar RESULT, 1 special sub_80BCE4C call S_DoSaveDialog - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A310B hidebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A1F04, 4 @@ -4026,17 +4026,17 @@ SecretBase_RedCave1_EventScript_1A3121:: @ 81A3121 SecretBase_RedCave1_EventScript_1A312A:: @ 81A312A checkflag 2052 goto_if 0, SecretBase_RedCave1_EventScript_1A317E - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A319D lock faceplayer msgbox SecretBase_RedCave1_Text_1A218F, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A3187 setvar RESULT, 1 special sub_80BCE4C call S_DoSaveDialog - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A3187 hidebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A2220, 4 @@ -4061,17 +4061,17 @@ SecretBase_RedCave1_EventScript_1A319D:: @ 81A319D SecretBase_RedCave1_EventScript_1A31A6:: @ 81A31A6 checkflag 2052 goto_if 0, SecretBase_RedCave1_EventScript_1A31FA - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A3219 lock faceplayer msgbox SecretBase_RedCave1_Text_1A24E1, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A3203 setvar RESULT, 1 special sub_80BCE4C call S_DoSaveDialog - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A3203 hidebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A256F, 4 @@ -4096,17 +4096,17 @@ SecretBase_RedCave1_EventScript_1A3219:: @ 81A3219 SecretBase_RedCave1_EventScript_1A3222:: @ 81A3222 checkflag 2052 goto_if 0, SecretBase_RedCave1_EventScript_1A3276 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A3295 lock faceplayer msgbox SecretBase_RedCave1_Text_1A2830, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A327F setvar RESULT, 1 special sub_80BCE4C call S_DoSaveDialog - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A327F hidebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A28D7, 4 @@ -4131,17 +4131,17 @@ SecretBase_RedCave1_EventScript_1A3295:: @ 81A3295 SecretBase_RedCave1_EventScript_1A329E:: @ 81A329E checkflag 2052 goto_if 0, SecretBase_RedCave1_EventScript_1A32F2 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A3311 lock faceplayer msgbox SecretBase_RedCave1_Text_1A1CB2, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A32FB setvar RESULT, 1 special sub_80BCE4C call S_DoSaveDialog - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A32FB hidebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A1D48, 4 @@ -4166,17 +4166,17 @@ SecretBase_RedCave1_EventScript_1A3311:: @ 81A3311 SecretBase_RedCave1_EventScript_1A331A:: @ 81A331A checkflag 2052 goto_if 0, SecretBase_RedCave1_EventScript_1A336E - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A338D lock faceplayer msgbox SecretBase_RedCave1_Text_1A2026, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A3377 setvar RESULT, 1 special sub_80BCE4C call S_DoSaveDialog - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A3377 hidebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A2095, 4 @@ -4201,17 +4201,17 @@ SecretBase_RedCave1_EventScript_1A338D:: @ 81A338D SecretBase_RedCave1_EventScript_1A3396:: @ 81A3396 checkflag 2052 goto_if 0, SecretBase_RedCave1_EventScript_1A33EA - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A3409 lock faceplayer msgbox SecretBase_RedCave1_Text_1A236A, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A33F3 setvar RESULT, 1 special sub_80BCE4C call S_DoSaveDialog - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A33F3 hidebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A2405, 4 @@ -4236,17 +4236,17 @@ SecretBase_RedCave1_EventScript_1A3409:: @ 81A3409 SecretBase_RedCave1_EventScript_1A3412:: @ 81A3412 checkflag 2052 goto_if 0, SecretBase_RedCave1_EventScript_1A3466 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A3485 lock faceplayer msgbox SecretBase_RedCave1_Text_1A2663, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A346F setvar RESULT, 1 special sub_80BCE4C call S_DoSaveDialog - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A346F hidebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A2710, 4 @@ -4271,17 +4271,17 @@ SecretBase_RedCave1_EventScript_1A3485:: @ 81A3485 SecretBase_RedCave1_EventScript_1A348E:: @ 81A348E checkflag 2052 goto_if 0, SecretBase_RedCave1_EventScript_1A34E2 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A3501 lock faceplayer msgbox SecretBase_RedCave1_Text_1A2A13, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A34EB setvar RESULT, 1 special sub_80BCE4C call S_DoSaveDialog - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A34EB hidebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A2AE2, 4 @@ -4413,13 +4413,13 @@ SlateportCity_PokemonFanClub_EventScript_1ADE46:: @ 81ADE46 SlateportCity_PokemonFanClub_EventScript_1ADE4D:: @ 81ADE4D setvar 0x8005, 1 special sub_80BF2C4 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADED6 copyvar 0x8009, 0x8006 msgbox SlateportCity_PokemonFanClub_Text_1A8704, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADE84 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADEB9 end @@ -4431,9 +4431,9 @@ SlateportCity_PokemonFanClub_EventScript_1ADE84:: @ 81ADE84 call SlateportCity_PokemonFanClub_EventScript_1A00F3 lock faceplayer - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADEC3 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADEB9 end @@ -4458,24 +4458,24 @@ SlateportCity_OceanicMuseum_1F_EventScript_1ADEE0:: @ 81ADEE0 faceplayer setvar 0x8005, 2 special sub_80BF2C4 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF96 copyvar 0x8009, 0x8006 checkflag 105 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF25 setflag 105 msgbox SlateportCity_OceanicMuseum_1F_Text_1A927F, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF44 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF79 end SlateportCity_OceanicMuseum_1F_EventScript_1ADF25:: @ 81ADF25 msgbox SlateportCity_OceanicMuseum_1F_Text_1A934C, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF44 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF79 end @@ -4487,9 +4487,9 @@ SlateportCity_OceanicMuseum_1F_EventScript_1ADF44:: @ 81ADF44 call SlateportCity_OceanicMuseum_1F_EventScript_1A00F3 lock faceplayer - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF83 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF79 end @@ -4513,17 +4513,17 @@ SlateportCity_PokemonFanClub_EventScript_1ADFA0:: @ 81ADFA0 lock faceplayer specialvar RESULT, sub_80BF544 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADE4D setvar 0x8005, 3 special sub_80BF2C4 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1AE0AC copyvar 0x8009, 0x8006 msgbox SlateportCity_PokemonFanClub_Text_1A82F1, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADFE9 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1AE0A2 end @@ -4559,14 +4559,14 @@ SlateportCity_PokemonFanClub_EventScript_1AE04A:: @ 81AE04A call SlateportCity_PokemonFanClub_EventScript_1A00F3 lock faceplayer - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1AE0A2 msgbox SlateportCity_PokemonFanClub_Text_1A852D, 4 setvar 0x8006, 1 call SlateportCity_PokemonFanClub_EventScript_1A00F3 lock faceplayer - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1AE0A2 msgbox SlateportCity_PokemonFanClub_Text_1A85A6, 4 copyvar 0x8007, 0x800a @@ -4594,13 +4594,13 @@ VerdanturfTown_ContestLobby_EventScript_1AE0B6:: @ 81AE0B6 goto_if_eq FallarborTown_ContestLobby_EventScript_1AE17E setvar 0x8005, 6 special sub_80BF2C4 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq FallarborTown_ContestLobby_EventScript_1AE17E copyvar 0x8009, 0x8006 msgbox FallarborTown_ContestLobby_Text_1A6F7C, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq FallarborTown_ContestLobby_EventScript_1AE0F8 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1AE12D end @@ -4612,9 +4612,9 @@ FallarborTown_ContestLobby_EventScript_1AE0F8:: @ 81AE0F8 call FallarborTown_ContestLobby_EventScript_1A00F3 lock faceplayer - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq FallarborTown_ContestLobby_EventScript_1AE137 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1AE12D end @@ -4633,7 +4633,7 @@ FallarborTown_ContestLobby_EventScript_1AE137:: @ 81AE137 call FallarborTown_ContestLobby_EventScript_1A00F3 lock faceplayer - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1AE12D msgbox FallarborTown_ContestLobby_Text_1A7153, 4 setflag 2 @@ -4650,11 +4650,11 @@ FallarborTown_ContestLobby_EventScript_1AE188:: @ 81AE188 LilycoveCity_ContestLobby_EventScript_1AE188:: @ 81AE188 SlateportCity_ContestLobby_EventScript_1AE188:: @ 81AE188 VerdanturfTown_ContestLobby_EventScript_1AE188:: @ 81AE188 - compare_var_to_imm 0x4086, 2 + compare 0x4086, 2 goto_if 5, FallarborTown_ContestLobby_EventScript_1AE1FE setvar 0x8005, 6 special sub_80BF2C4 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq FallarborTown_ContestLobby_EventScript_1AE1FE switch 0x4088 case 0, FallarborTown_ContestLobby_EventScript_1AE1FE @@ -4691,13 +4691,13 @@ BattleTower_Lobby_EventScript_1AE1FF:: @ 81AE1FF goto_if_eq BattleTower_Lobby_EventScript_1AE2E3 setvar 0x8005, 7 special sub_80BF2C4 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq BattleTower_Lobby_EventScript_1AE2E3 copyvar 0x8009, 0x8006 msgbox BattleTower_Lobby_Text_1A776D, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq BattleTower_Lobby_EventScript_1AE241 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_1AE297 end @@ -4706,9 +4706,9 @@ BattleTower_Lobby_EventScript_1AE241:: @ 81AE241 waittext multichoice 19, 8, 45, 1 copyvar 0x8008, RESULT - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, BattleTower_Lobby_EventScript_1AE2A1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, BattleTower_Lobby_EventScript_1AE2AA msgbox BattleTower_Lobby_Text_1A79EB, 4 setvar 0x8004, 12 @@ -4716,9 +4716,9 @@ BattleTower_Lobby_EventScript_1AE241:: @ 81AE241 call BattleTower_Lobby_EventScript_1A00F3 lock faceplayer - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq BattleTower_Lobby_EventScript_1AE2B3 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_1AE2D9 end @@ -4736,7 +4736,7 @@ BattleTower_Lobby_EventScript_1AE2AA:: @ 81AE2AA return BattleTower_Lobby_EventScript_1AE2B3:: @ 81AE2B3 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_1AE2D9 msgbox BattleTower_Lobby_Text_1A7A6E, 4 setflag 2 @@ -4756,11 +4756,11 @@ BattleTower_Lobby_EventScript_1AE2E3:: @ 81AE2E3 end BattleTower_Lobby_EventScript_1AE2ED:: @ 81AE2ED - compare_var_to_imm 0x40bc, 0 + compare 0x40bc, 0 goto_if_eq BattleTower_Lobby_EventScript_1AE30F setvar 0x8005, 7 special sub_80BF2C4 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq BattleTower_Lobby_EventScript_1AE30F clearflag 918 return @@ -4822,11 +4822,11 @@ Text_RepelWoreOff: @ 81C33EF MauvilleCity_GameCorner_EventScript_1C407E:: @ 81C407E checkitem ITEM_COIN_CASE, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 0 event_96 2 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1C40DA addvar 0x8004, 128 goto MauvilleCity_GameCorner_EventScript_1C40DA @@ -4834,11 +4834,11 @@ MauvilleCity_GameCorner_EventScript_1C407E:: @ 81C407E MauvilleCity_GameCorner_EventScript_1C40AC:: @ 81C40AC checkitem ITEM_COIN_CASE, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 1 event_96 2 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1C40DA addvar 0x8004, 128 goto MauvilleCity_GameCorner_EventScript_1C40DA diff --git a/data-de/field_move_scripts.inc b/data-de/field_move_scripts.inc index 40748401b..59635ee4f 100644 --- a/data-de/field_move_scripts.inc +++ b/data-de/field_move_scripts.inc @@ -3,13 +3,13 @@ S_CuttableTree:: @ 81B0DCC checkflag 2055 goto_if 0, CannotUseCut checkattack MOVE_CUT - compare_var_to_imm RESULT, 6 + compare RESULT, 6 goto_if_eq CannotUseCut setanimation 0, RESULT bufferpartypoke 0, RESULT bufferattack 1, MOVE_CUT msgbox UseCutPromptText, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Cut_ChoseNo msgbox UsedCutRockSmashText, 4 closebutton @@ -64,13 +64,13 @@ S_BreakableRock:: @ 81B0EB7 checkflag 2057 goto_if 0, CannotUseRockSmash checkattack MOVE_ROCK_SMASH - compare_var_to_imm RESULT, 6 + compare RESULT, 6 goto_if_eq CannotUseRockSmash setanimation 0, RESULT bufferpartypoke 0, RESULT bufferattack 1, MOVE_ROCK_SMASH msgbox UseRockSmashPromptText, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq RockSmash_ChoseNo msgbox UsedCutRockSmashText, 4 closebutton @@ -91,10 +91,10 @@ DoRockSmashMovement: @ 81B0F0C waitmovement 0 disappear LAST_TALKED specialvar RESULT, sub_810F5BC - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq DoRockSmashMovement_Done special ScrSpecial_RockSmashWildEncounter - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq DoRockSmashMovement_Done waitstate releaseall @@ -133,11 +133,11 @@ S_PushableBoulder:: @ 81B0FCB checkflag 2089 goto_if_eq AlreadyUsedStrength checkattack 70 - compare_var_to_imm RESULT, 6 + compare RESULT, 6 goto_if_eq CannotUseStrength setanimation 0, RESULT msgbox UseStrengthPromptText, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Strength_ChoseNo closebutton doanimation 40 @@ -194,12 +194,12 @@ AlreadyUsedStrengthText: @ 81B1127 S_UseWaterfall:: @ 81B115A lockall checkattack MOVE_WATERFALL - compare_var_to_imm RESULT, 6 + compare RESULT, 6 goto_if_eq Waterfall_NoMonKnows bufferpartypoke 0, RESULT setanimation 0, RESULT msgbox UseWaterfallPromptText, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Waterfall_Done msgbox UsedWaterfallText, 4 doanimation 43 @@ -227,13 +227,13 @@ UsedWaterfallText: @ 81B120D UseDiveScript:: @ 81B1220 lockall checkattack MOVE_DIVE - compare_var_to_imm RESULT, 6 + compare RESULT, 6 goto_if_eq CannotUseDive bufferpartypoke 0, RESULT setanimation 0, RESULT setanimation 1, 1 msgbox UseDivePromptText, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Dive_Done msgbox UsedDiveText, 4 doanimation 44 @@ -250,13 +250,13 @@ Dive_Done: @ 81B1267 S_UseDiveUnderwater:: @ 81B1269 lockall checkattack MOVE_DIVE - compare_var_to_imm RESULT, 6 + compare RESULT, 6 goto_if_eq UnderwaterCannotUseDive bufferpartypoke 0, RESULT setanimation 0, RESULT setanimation 1, 1 msgbox UnderwaterUseDivePromptText, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq UnderwaterDive_Done msgbox UsedDiveText, 4 doanimation 44 diff --git a/data/event_scripts.s b/data/event_scripts.s index f31a00e2a..0db608cd5 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -430,7 +430,7 @@ EventScript_15F3E2: EventScript_15F419: msgbox UnknownString_81A38FB, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq EventScript_15F384 closebutton special SecretBasePC_PackUp @@ -476,13 +476,13 @@ gUnknown_0815F49A:: @ 815F49A EventScript_15F4A1: special sub_80BC56C - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq EventScript_15F4E0 - compare_var_to_imm RESULT, 2 + compare RESULT, 2 goto_if_eq EventScript_15F503 special sub_80BC224 msgbox UnknownString_81A3958, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq EventScript_15F452 msgbox UnknownString_81A3A22, 3 special sub_80BC5BC @@ -492,7 +492,7 @@ EventScript_15F4A1: EventScript_15F4E0: msgbox UnknownString_81A3982, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq EventScript_15F452 msgbox UnknownString_81A3A3A, 3 special sub_80BC5BC @@ -526,13 +526,13 @@ gUnknown_0815F523:: @ 815F523 gUnknown_0815F528:: @ 815F528 special GetShieldToyTVDecorationInfo - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq EventScript_15F558 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq EventScript_15F561 - compare_var_to_imm RESULT, 2 + compare RESULT, 2 goto_if_eq EventScript_15F56A - compare_var_to_imm RESULT, 3 + compare RESULT, 3 goto_if_eq EventScript_15F573 end @@ -936,7 +936,7 @@ gUnknown_0819F818:: @ 819F818 applymovement LAST_TALKED, Movement_19F8F0 waitmovement 0 specialvar RESULT, ScrSpecial_HasTrainerBeenFought - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if 5, EventScript_19F83F special PlayTrainerEncounterMusic special sub_8082524 @@ -950,10 +950,10 @@ gUnknown_0819F840:: @ 819F840 faceplayer call EventScript_19F8E5 specialvar RESULT, ScrSpecial_HasTrainerBeenFought - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if 5, EventScript_19F877 special CheckForAlivePartyMons - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if 5, EventScript_19F870 special PlayTrainerEncounterMusic special sub_8082524 @@ -979,7 +979,7 @@ gUnknown_0819F878:: @ 819F878 gUnknown_0819F887:: @ 819F887 call EventScript_19F8E5 specialvar RESULT, ScrSpecial_GetTrainerEyeRematchFlag - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq EventScript_19F8AD special PlayTrainerEncounterMusic special sub_8082524 @@ -996,10 +996,10 @@ EventScript_19F8AD: gUnknown_0819F8AE:: @ 819F8AE specialvar RESULT, ScrSpecial_GetTrainerEyeRematchFlag - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq EventScript_19F8DD special CheckForAlivePartyMons - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if 5, EventScript_19F8DE special PlayTrainerEncounterMusic special sub_8082524 @@ -1036,15 +1036,15 @@ EventScript_19F8F2: waitbutton reptrainerbattle specialvar RESULT, ScrSpecial_GetTrainerBattleMode - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq EventScript_19F934 - compare_var_to_imm RESULT, 2 + compare RESULT, 2 goto_if_eq EventScript_19F936 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq EventScript_19F936 - compare_var_to_imm RESULT, 6 + compare RESULT, 6 goto_if_eq EventScript_19F936 - compare_var_to_imm RESULT, 8 + compare RESULT, 8 goto_if_eq EventScript_19F936 EventScript_19F934: @@ -1335,11 +1335,11 @@ EventScript_19FC84: return gUnknown_0819FC9F:: @ 819FC9F - compare_var_to_imm 0x4096, 1 + compare 0x4096, 1 goto_if_eq EventScript_19FCC1 - compare_var_to_imm 0x4096, 2 + compare 0x4096, 2 goto_if_eq EventScript_19FCD7 - compare_var_to_imm 0x4096, 3 + compare 0x4096, 3 goto_if_eq EventScript_19FCF0 end @@ -1433,9 +1433,9 @@ VerdanturfTown_PokemonCenter_1F_EventScript_19FD5B:: @ 819FD5B lock faceplayer msgbox gText_NurseJoy_Welcome, MSGBOX_YESNO - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq do_heal_party - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq dont_heal_party end @@ -1471,9 +1471,9 @@ dont_heal_party:: @ 819FDC7 OldaleTown_PokemonCenter_1F_EventScript_19FDCE:: @ 819FDCE specialvar RESULT, IsPokerusInParty - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_19FDEA - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_19FDB0 end @@ -1498,9 +1498,9 @@ Std_ObtainItem_: @ 819FE07 bufferitem 1, 0x8000 checkitemtype 0x8000 call GetItem_HandlePocket - compare_var_to_imm 0x8007, 0x1 + compare 0x8007, 0x1 call_if 1, Std_ObtainItem_Success - compare_var_to_imm 0x8007, 0x0 + compare 0x8007, 0x0 call_if 1, Std_ObtainItem_Fail return @@ -1515,31 +1515,31 @@ GetItem_HandlePocket: GetItem_HandlePocket_Items: bufferstd 2, 0xE - compare_var_to_imm 0x8007, 1 + compare 0x8007, 1 call_if 1, PlayGetItemFanfare return GetItem_HandlePocket_KeyItems: bufferstd 2, 0xF - compare_var_to_imm 0x8007, 1 + compare 0x8007, 1 call_if 1, PlayGetItemFanfare return GetItem_HandlePocket_PokeBalls: bufferstd 2, 0x10 - compare_var_to_imm 0x8007, 1 + compare 0x8007, 1 call_if 1, PlayGetItemFanfare return GetItem_HandlePocket_TMsHMs: bufferstd 2, 0x11 - compare_var_to_imm 0x8007, 1 + compare 0x8007, 1 call_if 1, PlayGetTMHMFanfare return GetItem_HandlePocket_Berries: bufferstd 2, 0x12 - compare_var_to_imm 0x8007, 1 + compare 0x8007, 1 call_if 1, PlayGetItemFanfare return @@ -1571,9 +1571,9 @@ Std_ObtainDecoration: @ 819FEDA Std_ObtainDecoration_: @ 819FEE8 bufferdecor 1, 0x8000 - compare_var_to_imm 0x8007, 1 + compare 0x8007, 1 call_if 1, Std_ObtainDecoration_Success - compare_var_to_imm 0x8007, 0 + compare 0x8007, 0 call_if 1, Std_ObtainDecoration_Fail return @@ -1599,9 +1599,9 @@ Std_FindItem: @ 819FF21 bufferitem 1, 0x8000 checkitemtype 0x8000 call GetItem_HandlePocket - compare_var_to_imm 0x8007, 1 + compare 0x8007, 1 call_if 1, Std_FindItem_Success - compare_var_to_imm 0x8007, 0 + compare 0x8007, 0 call_if 1, Std_FindItem_Fail release return @@ -1628,9 +1628,9 @@ HiddenItemScript:: @ 819FF7B bufferitem 0x1, 0x8005 checkitemtype 0x8005 call GetItem_HandlePocket - compare_var_to_imm 0x8007, 1 + compare 0x8007, 1 goto_if_eq HiddenItemScript_Success - compare_var_to_imm 0x8007, 0 + compare 0x8007, 0 goto_if_eq HiddenItemScript_Fail end @@ -1654,9 +1654,9 @@ UnusedMixRecordsScript: @ 819FFD5 lock faceplayer msgbox UnusedMixRecordsPromptText, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq UnusedMixRecordsScript_Yes - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq UnusedMixRecordsScript_Done goto UnusedMixRecordsScript_Done UnusedMixRecordsScript_Yes: @ 819FFFA @@ -1811,13 +1811,13 @@ Route109_EventScript_1A010C:: @ 81A010C UseSurfScript:: @ 81A0117 checkattack MOVE_SURF - compare_var_to_imm RESULT, 6 + compare RESULT, 6 goto_if_eq UseSurfScript_NoMon bufferpartypoke 0, RESULT setanimation 0, RESULT lockall msgbox UseSurfPromptText, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq UseSurfScript_No msgbox UsedSurfText, 4 doanimation 9 @@ -1836,9 +1836,9 @@ Route110_EventScript_1A014E:: @ 81A014E Route119_EventScript_1A014E:: @ 81A014E RustboroCity_EventScript_1A014E:: @ 81A014E checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq RustboroCity_EventScript_1A0166 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq RustboroCity_EventScript_1A016C end @@ -1854,9 +1854,9 @@ LavaridgeTown_EventScript_1A0172:: @ 81A0172 Route110_EventScript_1A0172:: @ 81A0172 Route119_EventScript_1A0172:: @ 81A0172 checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LavaridgeTown_EventScript_1A018A - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LavaridgeTown_EventScript_1A0190 end @@ -2136,23 +2136,23 @@ Route109_EventScript_1A02EF:: @ 81A02EF LittlerootTown_ProfessorBirchsLab_EventScript_1A02F4:: @ 81A02F4 Route101_EventScript_1A02F4:: @ 81A02F4 Route103_EventScript_1A02F4:: @ 81A02F4 - compare_var_to_imm 0x4085, 0 + compare 0x4085, 0 goto_if_eq Route101_EventScript_1A14DC - compare_var_to_imm 0x4049, 0 + compare 0x4049, 0 call_if 1, Route101_EventScript_1A0358 - compare_var_to_imm 0x4049, 1 + compare 0x4049, 1 call_if 1, Route101_EventScript_1A0358 - compare_var_to_imm 0x4049, 2 + compare 0x4049, 2 call_if 1, Route101_EventScript_1A0365 - compare_var_to_imm 0x4049, 3 + compare 0x4049, 3 call_if 1, Route101_EventScript_1A0365 - compare_var_to_imm 0x4049, 4 + compare 0x4049, 4 call_if 1, Route101_EventScript_1A0372 - compare_var_to_imm 0x4049, 5 + compare 0x4049, 5 call_if 1, Route101_EventScript_1A0372 - compare_var_to_imm 0x4049, 6 + compare 0x4049, 6 call_if 1, Route101_EventScript_1A0358 - compare_var_to_imm 0x4049, 7 + compare 0x4049, 7 call_if 1, Route101_EventScript_1A0358 return @@ -2183,7 +2183,7 @@ Route103_EventScript_1A037F:: @ 81A037F lock faceplayer msgbox Route101_Text_1C4449, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route101_EventScript_1A039B call Route101_EventScript_1A03B0 release @@ -2212,7 +2212,7 @@ Route101_EventScript_1A03B0:: @ 81A03B0 buffernum 1, 0x8009 msgbox Route101_Text_1C44DC, 4 call Route101_EventScript_1A03A5 - compare_var_to_imm 0x800a, 0 + compare 0x800a, 0 goto_if_eq Route101_EventScript_1A14DC setvar 0x8004, 1 specialvar RESULT, ScriptGetPokedexInfo @@ -2279,9 +2279,9 @@ Movement_1A047A: BattleTower_Outside_EventScript_1A047C:: @ 81A047C SouthernIsland_Exterior_EventScript_1A047C:: @ 81A047C - compare_var_to_imm FACING, 1 + compare FACING, 1 call_if 1, BattleTower_Outside_EventScript_160B2F - compare_var_to_imm FACING, 3 + compare FACING, 3 call_if 1, BattleTower_Outside_EventScript_160B3A delay 30 spriteinvisible 255, 0, 0 @@ -2424,7 +2424,7 @@ Route119_EventScript_1A0587:: @ 81A0587 Route119_EventScript_1A0594:: @ 81A0594 Route120_EventScript_1A0594:: @ 81A0594 checkitem ITEM_DEVON_SCOPE, 1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route119_EventScript_1A05AE msgbox Route119_Text_171B93, 4 release @@ -2432,7 +2432,7 @@ Route120_EventScript_1A0594:: @ 81A0594 Route119_EventScript_1A05AE:: @ 81A05AE msgbox Route119_Text_171BB6, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route119_EventScript_1A05C3 release end @@ -2449,19 +2449,19 @@ Route119_EventScript_1A05C3:: @ 81A05C3 delay 40 waitpokecry setwildbattle SPECIES_KECLEON, 30, ITEM_NONE - compare_var_to_imm 0x8004, 1 + compare 0x8004, 1 call_if 1, Route119_EventScript_1A0646 - compare_var_to_imm 0x8004, 2 + compare 0x8004, 2 call_if 1, Route119_EventScript_1A064A - compare_var_to_imm 0x8004, 3 + compare 0x8004, 3 call_if 1, Route119_EventScript_1A064E - compare_var_to_imm 0x8004, 4 + compare 0x8004, 4 call_if 1, Route119_EventScript_1A0652 - compare_var_to_imm 0x8004, 5 + compare 0x8004, 5 call_if 1, Route119_EventScript_1A0656 - compare_var_to_imm 0x8004, 6 + compare 0x8004, 6 call_if 1, Route119_EventScript_1A065A - compare_var_to_imm 0x8004, 7 + compare 0x8004, 7 call_if 1, Route119_EventScript_1A065E setflag 2145 dowildbattle @@ -3253,7 +3253,7 @@ gUnknown_081A14B8:: @ 81A14B8 lockall special ExecuteWhiteOut waitstate - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq EventScript_1A14CA releaseall end @@ -3597,32 +3597,32 @@ SecretBase_RedCave1_Text_1A2BA4:: @ 81A2BA4 gUnknown_081A2C51:: @ 81A2C51 special sub_80BB70C special sub_80BB63C - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq EventScript_1A2E45 checkattack MOVE_SECRET_POWER setanimation 0, RESULT bufferattack 1, MOVE_SECRET_POWER - compare_var_to_imm 0x8007, 1 + compare 0x8007, 1 goto_if_eq EventScript_1A2CB0 - compare_var_to_imm 0x8007, 2 + compare 0x8007, 2 goto_if_eq EventScript_1A2CB0 - compare_var_to_imm 0x8007, 3 + compare 0x8007, 3 goto_if_eq EventScript_1A2CB0 - compare_var_to_imm 0x8007, 4 + compare 0x8007, 4 goto_if_eq EventScript_1A2CB0 - compare_var_to_imm 0x8007, 5 + compare 0x8007, 5 goto_if_eq EventScript_1A2D08 - compare_var_to_imm 0x8007, 6 + compare 0x8007, 6 goto_if_eq EventScript_1A2D60 end EventScript_1A2CB0: lockall - compare_var_to_imm RESULT, 6 + compare RESULT, 6 goto_if_eq EventScript_1A2CF1 bufferpartypoke 0, RESULT msgbox UnknownString_8198F34, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq EventScript_1A2F3A msgbox UsedCutRockSmashText, 4 closebutton @@ -3649,11 +3649,11 @@ EventScript_1A2CFA: EventScript_1A2D08: lockall - compare_var_to_imm RESULT, 6 + compare RESULT, 6 goto_if_eq EventScript_1A2D49 bufferpartypoke 0, RESULT msgbox UnknownString_81A197B, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq EventScript_1A2F3A msgbox UsedCutRockSmashText, 4 closebutton @@ -3680,11 +3680,11 @@ EventScript_1A2D52: EventScript_1A2D60: lockall - compare_var_to_imm RESULT, 6 + compare RESULT, 6 goto_if_eq EventScript_1A2DA1 bufferpartypoke 0, RESULT msgbox UnknownString_81A1A4B, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq EventScript_1A2F3A msgbox UsedCutRockSmashText, 4 closebutton @@ -3728,7 +3728,7 @@ SecretBase_RedCave1_EventScript_1A2DDE:: @ 81A2DDE waitmovement 0 setvar 0x4097, 1 msgbox SecretBase_RedCave1_Text_198F89, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A2E08 closebutton playse 9 @@ -3752,7 +3752,7 @@ gUnknown_081A2E14:: @ 81A2E14 setvar 0x4097, 1 playse 9 special sub_80BC114 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq EventScript_1A2E38 clearflag 173 special sub_80BBAF0 @@ -3769,57 +3769,57 @@ EventScript_1A2E38: EventScript_1A2E45: checkattack MOVE_SECRET_POWER - compare_var_to_imm RESULT, 6 + compare RESULT, 6 goto_if_eq EventScript_1A2EF7 setanimation 0, RESULT setorcopyvar 0x8004, RESULT lockall special GetSecretBaseNearbyMapName msgbox UnknownString_81A3C71, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq EventScript_1A2F3A msgbox UnknownString_81A38FB, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq EventScript_1A2F3A fadescreen 1 special sub_80BC50C closebutton fadescreen 0 msgbox UnknownString_81A3CC9, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq EventScript_1A2F3A bufferpartypoke 0, 0x8004 bufferattack 1, MOVE_SECRET_POWER msgbox UsedCutRockSmashText, 4 closebutton closebutton - compare_var_to_imm 0x8007, 1 + compare 0x8007, 1 goto_if_eq gUnknown_081A2CE6 - compare_var_to_imm 0x8007, 2 + compare 0x8007, 2 goto_if_eq gUnknown_081A2CE6 - compare_var_to_imm 0x8007, 3 + compare 0x8007, 3 goto_if_eq gUnknown_081A2CE6 - compare_var_to_imm 0x8007, 4 + compare 0x8007, 4 goto_if_eq gUnknown_081A2CE6 - compare_var_to_imm 0x8007, 5 + compare 0x8007, 5 goto_if_eq gUnknown_081A2D3E - compare_var_to_imm 0x8007, 6 + compare 0x8007, 6 goto_if_eq gUnknown_081A2D96 releaseall end EventScript_1A2EF7:: - compare_var_to_imm 0x8007, 1 + compare 0x8007, 1 goto_if_eq EventScript_1A2CF1 - compare_var_to_imm 0x8007, 2 + compare 0x8007, 2 goto_if_eq EventScript_1A2CF1 - compare_var_to_imm 0x8007, 3 + compare 0x8007, 3 goto_if_eq EventScript_1A2CF1 - compare_var_to_imm 0x8007, 4 + compare 0x8007, 4 goto_if_eq EventScript_1A2CF1 - compare_var_to_imm 0x8007, 5 + compare 0x8007, 5 goto_if_eq EventScript_1A2D49 - compare_var_to_imm 0x8007, 6 + compare 0x8007, 6 goto_if_eq EventScript_1A2DA1 end @@ -3872,10 +3872,10 @@ gUnknown_081A2F8A:: @ 81A2F8A EventScript_1A2F95: special sub_8100A7C - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq EventScript_1A2FBF addvar 0x8004, 1 - compare_var_to_imm 0x8005, 0 + compare 0x8005, 0 goto_if_eq EventScript_1A2F95 disappear 0x8006 setflag 0x8005 @@ -3910,42 +3910,42 @@ SecretBase_YellowCave2_EventScript_1A2FC0:: @ 81A2FC0 SecretBase_YellowCave3_EventScript_1A2FC0:: @ 81A2FC0 SecretBase_YellowCave4_EventScript_1A2FC0:: @ 81A2FC0 special sub_80BCE90 - compare_var_to_imm 0x8004, 0 + compare 0x8004, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A3032 - compare_var_to_imm 0x8004, 1 + compare 0x8004, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A30AE - compare_var_to_imm 0x8004, 2 + compare 0x8004, 2 goto_if_eq SecretBase_RedCave1_EventScript_1A312A - compare_var_to_imm 0x8004, 3 + compare 0x8004, 3 goto_if_eq SecretBase_RedCave1_EventScript_1A31A6 - compare_var_to_imm 0x8004, 4 + compare 0x8004, 4 goto_if_eq SecretBase_RedCave1_EventScript_1A3222 - compare_var_to_imm 0x8004, 5 + compare 0x8004, 5 goto_if_eq SecretBase_RedCave1_EventScript_1A329E - compare_var_to_imm 0x8004, 6 + compare 0x8004, 6 goto_if_eq SecretBase_RedCave1_EventScript_1A331A - compare_var_to_imm 0x8004, 7 + compare 0x8004, 7 goto_if_eq SecretBase_RedCave1_EventScript_1A3396 - compare_var_to_imm 0x8004, 8 + compare 0x8004, 8 goto_if_eq SecretBase_RedCave1_EventScript_1A3412 - compare_var_to_imm 0x8004, 9 + compare 0x8004, 9 goto_if_eq SecretBase_RedCave1_EventScript_1A348E end SecretBase_RedCave1_EventScript_1A3032:: @ 81A3032 checkflag 2052 goto_if 0, SecretBase_RedCave1_EventScript_1A3086 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A30A5 lock faceplayer msgbox SecretBase_RedCave1_Text_1A1AEA, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A308F setvar RESULT, 1 special sub_80BCE4C call S_DoSaveDialog - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A308F hidebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A1B83, 4 @@ -3970,17 +3970,17 @@ SecretBase_RedCave1_EventScript_1A30A5:: @ 81A30A5 SecretBase_RedCave1_EventScript_1A30AE:: @ 81A30AE checkflag 2052 goto_if 0, SecretBase_RedCave1_EventScript_1A3102 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A3121 lock faceplayer msgbox SecretBase_RedCave1_Text_1A1E67, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A310B setvar RESULT, 1 special sub_80BCE4C call S_DoSaveDialog - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A310B hidebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A1F04, 4 @@ -4005,17 +4005,17 @@ SecretBase_RedCave1_EventScript_1A3121:: @ 81A3121 SecretBase_RedCave1_EventScript_1A312A:: @ 81A312A checkflag 2052 goto_if 0, SecretBase_RedCave1_EventScript_1A317E - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A319D lock faceplayer msgbox SecretBase_RedCave1_Text_1A218F, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A3187 setvar RESULT, 1 special sub_80BCE4C call S_DoSaveDialog - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A3187 hidebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A2220, 4 @@ -4040,17 +4040,17 @@ SecretBase_RedCave1_EventScript_1A319D:: @ 81A319D SecretBase_RedCave1_EventScript_1A31A6:: @ 81A31A6 checkflag 2052 goto_if 0, SecretBase_RedCave1_EventScript_1A31FA - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A3219 lock faceplayer msgbox SecretBase_RedCave1_Text_1A24E1, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A3203 setvar RESULT, 1 special sub_80BCE4C call S_DoSaveDialog - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A3203 hidebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A256F, 4 @@ -4075,17 +4075,17 @@ SecretBase_RedCave1_EventScript_1A3219:: @ 81A3219 SecretBase_RedCave1_EventScript_1A3222:: @ 81A3222 checkflag 2052 goto_if 0, SecretBase_RedCave1_EventScript_1A3276 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A3295 lock faceplayer msgbox SecretBase_RedCave1_Text_1A2830, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A327F setvar RESULT, 1 special sub_80BCE4C call S_DoSaveDialog - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A327F hidebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A28D7, 4 @@ -4110,17 +4110,17 @@ SecretBase_RedCave1_EventScript_1A3295:: @ 81A3295 SecretBase_RedCave1_EventScript_1A329E:: @ 81A329E checkflag 2052 goto_if 0, SecretBase_RedCave1_EventScript_1A32F2 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A3311 lock faceplayer msgbox SecretBase_RedCave1_Text_1A1CB2, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A32FB setvar RESULT, 1 special sub_80BCE4C call S_DoSaveDialog - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A32FB hidebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A1D48, 4 @@ -4145,17 +4145,17 @@ SecretBase_RedCave1_EventScript_1A3311:: @ 81A3311 SecretBase_RedCave1_EventScript_1A331A:: @ 81A331A checkflag 2052 goto_if 0, SecretBase_RedCave1_EventScript_1A336E - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A338D lock faceplayer msgbox SecretBase_RedCave1_Text_1A2026, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A3377 setvar RESULT, 1 special sub_80BCE4C call S_DoSaveDialog - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A3377 hidebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A2095, 4 @@ -4180,17 +4180,17 @@ SecretBase_RedCave1_EventScript_1A338D:: @ 81A338D SecretBase_RedCave1_EventScript_1A3396:: @ 81A3396 checkflag 2052 goto_if 0, SecretBase_RedCave1_EventScript_1A33EA - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A3409 lock faceplayer msgbox SecretBase_RedCave1_Text_1A236A, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A33F3 setvar RESULT, 1 special sub_80BCE4C call S_DoSaveDialog - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A33F3 hidebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A2405, 4 @@ -4215,17 +4215,17 @@ SecretBase_RedCave1_EventScript_1A3409:: @ 81A3409 SecretBase_RedCave1_EventScript_1A3412:: @ 81A3412 checkflag 2052 goto_if 0, SecretBase_RedCave1_EventScript_1A3466 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A3485 lock faceplayer msgbox SecretBase_RedCave1_Text_1A2663, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A346F setvar RESULT, 1 special sub_80BCE4C call S_DoSaveDialog - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A346F hidebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A2710, 4 @@ -4250,17 +4250,17 @@ SecretBase_RedCave1_EventScript_1A3485:: @ 81A3485 SecretBase_RedCave1_EventScript_1A348E:: @ 81A348E checkflag 2052 goto_if 0, SecretBase_RedCave1_EventScript_1A34E2 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A3501 lock faceplayer msgbox SecretBase_RedCave1_Text_1A2A13, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A34EB setvar RESULT, 1 special sub_80BCE4C call S_DoSaveDialog - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A34EB hidebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A2AE2, 4 @@ -4381,13 +4381,13 @@ SlateportCity_PokemonFanClub_EventScript_1ADE46:: @ 81ADE46 SlateportCity_PokemonFanClub_EventScript_1ADE4D:: @ 81ADE4D setvar 0x8005, 1 special sub_80BF2C4 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADED6 copyvar 0x8009, 0x8006 msgbox SlateportCity_PokemonFanClub_Text_1A8704, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADE84 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADEB9 end @@ -4399,9 +4399,9 @@ SlateportCity_PokemonFanClub_EventScript_1ADE84:: @ 81ADE84 call SlateportCity_PokemonFanClub_EventScript_1A00F3 lock faceplayer - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADEC3 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADEB9 end @@ -4426,24 +4426,24 @@ SlateportCity_OceanicMuseum_1F_EventScript_1ADEE0:: @ 81ADEE0 faceplayer setvar 0x8005, 2 special sub_80BF2C4 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF96 copyvar 0x8009, 0x8006 checkflag 105 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF25 setflag 105 msgbox SlateportCity_OceanicMuseum_1F_Text_1A927F, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF44 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF79 end SlateportCity_OceanicMuseum_1F_EventScript_1ADF25:: @ 81ADF25 msgbox SlateportCity_OceanicMuseum_1F_Text_1A934C, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF44 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF79 end @@ -4455,9 +4455,9 @@ SlateportCity_OceanicMuseum_1F_EventScript_1ADF44:: @ 81ADF44 call SlateportCity_OceanicMuseum_1F_EventScript_1A00F3 lock faceplayer - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF83 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF79 end @@ -4481,17 +4481,17 @@ SlateportCity_PokemonFanClub_EventScript_1ADFA0:: @ 81ADFA0 lock faceplayer specialvar RESULT, sub_80BF544 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADE4D setvar 0x8005, 3 special sub_80BF2C4 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1AE0AC copyvar 0x8009, 0x8006 msgbox SlateportCity_PokemonFanClub_Text_1A82F1, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADFE9 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1AE0A2 end @@ -4527,14 +4527,14 @@ SlateportCity_PokemonFanClub_EventScript_1AE04A:: @ 81AE04A call SlateportCity_PokemonFanClub_EventScript_1A00F3 lock faceplayer - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1AE0A2 msgbox SlateportCity_PokemonFanClub_Text_1A852D, 4 setvar 0x8006, 1 call SlateportCity_PokemonFanClub_EventScript_1A00F3 lock faceplayer - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1AE0A2 msgbox SlateportCity_PokemonFanClub_Text_1A85A6, 4 copyvar 0x8007, 0x800a @@ -4562,13 +4562,13 @@ VerdanturfTown_ContestLobby_EventScript_1AE0B6:: @ 81AE0B6 goto_if_eq FallarborTown_ContestLobby_EventScript_1AE17E setvar 0x8005, 6 special sub_80BF2C4 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq FallarborTown_ContestLobby_EventScript_1AE17E copyvar 0x8009, 0x8006 msgbox FallarborTown_ContestLobby_Text_1A6F7C, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq FallarborTown_ContestLobby_EventScript_1AE0F8 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1AE12D end @@ -4580,9 +4580,9 @@ FallarborTown_ContestLobby_EventScript_1AE0F8:: @ 81AE0F8 call FallarborTown_ContestLobby_EventScript_1A00F3 lock faceplayer - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq FallarborTown_ContestLobby_EventScript_1AE137 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1AE12D end @@ -4601,7 +4601,7 @@ FallarborTown_ContestLobby_EventScript_1AE137:: @ 81AE137 call FallarborTown_ContestLobby_EventScript_1A00F3 lock faceplayer - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1AE12D msgbox FallarborTown_ContestLobby_Text_1A7153, 4 setflag 2 @@ -4618,11 +4618,11 @@ FallarborTown_ContestLobby_EventScript_1AE188:: @ 81AE188 LilycoveCity_ContestLobby_EventScript_1AE188:: @ 81AE188 SlateportCity_ContestLobby_EventScript_1AE188:: @ 81AE188 VerdanturfTown_ContestLobby_EventScript_1AE188:: @ 81AE188 - compare_var_to_imm 0x4086, 2 + compare 0x4086, 2 goto_if 5, FallarborTown_ContestLobby_EventScript_1AE1FE setvar 0x8005, 6 special sub_80BF2C4 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq FallarborTown_ContestLobby_EventScript_1AE1FE switch 0x4088 case 0, FallarborTown_ContestLobby_EventScript_1AE1FE @@ -4659,13 +4659,13 @@ BattleTower_Lobby_EventScript_1AE1FF:: @ 81AE1FF goto_if_eq BattleTower_Lobby_EventScript_1AE2E3 setvar 0x8005, 7 special sub_80BF2C4 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq BattleTower_Lobby_EventScript_1AE2E3 copyvar 0x8009, 0x8006 msgbox BattleTower_Lobby_Text_1A776D, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq BattleTower_Lobby_EventScript_1AE241 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_1AE297 end @@ -4674,9 +4674,9 @@ BattleTower_Lobby_EventScript_1AE241:: @ 81AE241 waittext multichoice 19, 8, 45, 1 copyvar 0x8008, RESULT - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, BattleTower_Lobby_EventScript_1AE2A1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, BattleTower_Lobby_EventScript_1AE2AA msgbox BattleTower_Lobby_Text_1A79EB, 4 setvar 0x8004, 12 @@ -4684,9 +4684,9 @@ BattleTower_Lobby_EventScript_1AE241:: @ 81AE241 call BattleTower_Lobby_EventScript_1A00F3 lock faceplayer - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq BattleTower_Lobby_EventScript_1AE2B3 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_1AE2D9 end @@ -4704,7 +4704,7 @@ BattleTower_Lobby_EventScript_1AE2AA:: @ 81AE2AA return BattleTower_Lobby_EventScript_1AE2B3:: @ 81AE2B3 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_1AE2D9 msgbox BattleTower_Lobby_Text_1A7A6E, 4 setflag 2 @@ -4724,11 +4724,11 @@ BattleTower_Lobby_EventScript_1AE2E3:: @ 81AE2E3 end BattleTower_Lobby_EventScript_1AE2ED:: @ 81AE2ED - compare_var_to_imm 0x40bc, 0 + compare 0x40bc, 0 goto_if_eq BattleTower_Lobby_EventScript_1AE30F setvar 0x8005, 7 special sub_80BF2C4 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq BattleTower_Lobby_EventScript_1AE30F clearflag 918 return @@ -4790,11 +4790,11 @@ Text_RepelWoreOff: @ 81C33EF MauvilleCity_GameCorner_EventScript_1C407E:: @ 81C407E checkitem ITEM_COIN_CASE, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 0 event_96 2 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1C40DA addvar 0x8004, 128 goto MauvilleCity_GameCorner_EventScript_1C40DA @@ -4802,11 +4802,11 @@ MauvilleCity_GameCorner_EventScript_1C407E:: @ 81C407E MauvilleCity_GameCorner_EventScript_1C40AC:: @ 81C40AC checkitem ITEM_COIN_CASE, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 1 event_96 2 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1C40DA addvar 0x8004, 128 goto MauvilleCity_GameCorner_EventScript_1C40DA diff --git a/data/field_move_scripts.inc b/data/field_move_scripts.inc index ac70163aa..7df5ac90f 100644 --- a/data/field_move_scripts.inc +++ b/data/field_move_scripts.inc @@ -3,13 +3,13 @@ S_CuttableTree:: @ 81B0DCC checkflag 2055 goto_if 0, CannotUseCut checkattack MOVE_CUT - compare_var_to_imm RESULT, 6 + compare RESULT, 6 goto_if_eq CannotUseCut setanimation 0, RESULT bufferpartypoke 0, RESULT bufferattack 1, MOVE_CUT msgbox UseCutPromptText, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Cut_ChoseNo msgbox UsedCutRockSmashText, 4 closebutton @@ -61,13 +61,13 @@ S_BreakableRock:: @ 81B0EB7 checkflag 2057 goto_if 0, CannotUseRockSmash checkattack MOVE_ROCK_SMASH - compare_var_to_imm RESULT, 6 + compare RESULT, 6 goto_if_eq CannotUseRockSmash setanimation 0, RESULT bufferpartypoke 0, RESULT bufferattack 1, MOVE_ROCK_SMASH msgbox UseRockSmashPromptText, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq RockSmash_ChoseNo msgbox UsedCutRockSmashText, 4 closebutton @@ -88,10 +88,10 @@ DoRockSmashMovement: @ 81B0F0C waitmovement 0 disappear LAST_TALKED specialvar RESULT, sub_810F5BC - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq DoRockSmashMovement_Done special ScrSpecial_RockSmashWildEncounter - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq DoRockSmashMovement_Done waitstate releaseall @@ -130,11 +130,11 @@ S_PushableBoulder:: @ 81B0FCB checkflag 2089 goto_if_eq AlreadyUsedStrength checkattack 70 - compare_var_to_imm RESULT, 6 + compare RESULT, 6 goto_if_eq CannotUseStrength setanimation 0, RESULT msgbox UseStrengthPromptText, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Strength_ChoseNo closebutton doanimation 40 @@ -191,12 +191,12 @@ AlreadyUsedStrengthText: @ 81B1127 S_UseWaterfall:: @ 81B115A lockall checkattack MOVE_WATERFALL - compare_var_to_imm RESULT, 6 + compare RESULT, 6 goto_if_eq Waterfall_NoMonKnows bufferpartypoke 0, RESULT setanimation 0, RESULT msgbox UseWaterfallPromptText, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Waterfall_Done msgbox UsedWaterfallText, 4 doanimation 43 @@ -224,13 +224,13 @@ UsedWaterfallText: @ 81B120D UseDiveScript:: @ 81B1220 lockall checkattack MOVE_DIVE - compare_var_to_imm RESULT, 6 + compare RESULT, 6 goto_if_eq CannotUseDive bufferpartypoke 0, RESULT setanimation 0, RESULT setanimation 1, 1 msgbox UseDivePromptText, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Dive_Done msgbox UsedDiveText, 4 doanimation 44 @@ -247,13 +247,13 @@ Dive_Done: @ 81B1267 S_UseDiveUnderwater:: @ 81B1269 lockall checkattack MOVE_DIVE - compare_var_to_imm RESULT, 6 + compare RESULT, 6 goto_if_eq UnderwaterCannotUseDive bufferpartypoke 0, RESULT setanimation 0, RESULT setanimation 1, 1 msgbox UnderwaterUseDivePromptText, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq UnderwaterDive_Done msgbox UsedDiveText, 4 doanimation 44 diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc index 573144019..0ed7749bc 100644 --- a/data/scripts/berry_tree.inc +++ b/data/scripts/berry_tree.inc @@ -22,7 +22,7 @@ Route102_EventScript_1A153D:: @ 81A153D lock faceplayer specialvar RESULT, PlayerHasBerries - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route102_EventScript_1A1558 message Route102_Text_1A16B6 waittext @@ -32,9 +32,9 @@ Route102_EventScript_1A153D:: @ 81A153D Route102_EventScript_1A1558:: @ 81A1558 msgbox Route102_Text_1A16CD, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route102_EventScript_1A1577 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route102_EventScript_1A1593 end @@ -43,7 +43,7 @@ Route102_EventScript_1A1577:: @ 81A1577 closebutton special sub_80B4EE4 waitstate - compare_var_to_imm ITEM_ID, 0 + compare ITEM_ID, 0 goto_if_eq Route102_EventScript_1A1593 removeitem ITEM_ID, 1 call Route102_EventScript_1A16A9 @@ -82,9 +82,9 @@ Route102_EventScript_1A15BC:: @ 81A15BC goto Route102_EventScript_1A165F Route102_EventScript_1A15CE:: @ 81A15CE - compare_var_to_imm 0x8005, 0 + compare 0x8005, 0 goto_if_eq Route102_EventScript_1A15F2 - compare_var_to_imm 0x8005, 4 + compare 0x8005, 4 goto_if_eq Route102_EventScript_1A15EB buffertext 1, Route102_Text_1A17B7 return @@ -102,14 +102,14 @@ Route102_EventScript_1A15F9:: @ 81A15F9 lock faceplayer msgbox Route102_Text_1A17C0, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route102_EventScript_1A161D - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route102_EventScript_1A164B Route102_EventScript_1A161D:: @ 81A161D special FieldObjectInteractionPickBerryTree - compare_var_to_imm 0x8004, 0 + compare 0x8004, 0 goto_if_eq Route102_EventScript_1A1642 special FieldObjectInteractionRemoveBerryTree message Route102_Text_1A17FD @@ -146,12 +146,12 @@ gUnknown_081A1654:: @ 81A1654 Route102_EventScript_1A165F:: @ 81A165F checkitem ITEM_WAILMER_PAIL, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route102_EventScript_1A168D msgbox Route102_Text_1A18E6, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route102_EventScript_1A1693 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route102_EventScript_1A168D Route102_EventScript_1A168D:: @ 81A168D diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 605846334..b25bc12bd 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -39,15 +39,15 @@ RustboroCity_PokemonCenter_2F_MapScript1_1A3D32:: @ 81A3D32 SlateportCity_PokemonCenter_2F_MapScript1_1A3D32:: @ 81A3D32 SootopolisCity_PokemonCenter_2F_MapScript1_1A3D32:: @ 81A3D32 VerdanturfTown_PokemonCenter_2F_MapScript1_1A3D32:: @ 81A3D32 - compare_var_to_imm 0x4087, 1 + compare 0x4087, 1 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3D6A - compare_var_to_imm 0x4087, 2 + compare 0x4087, 2 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3D6A - compare_var_to_imm 0x4087, 5 + compare 0x4087, 5 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3D6A - compare_var_to_imm 0x4087, 3 + compare 0x4087, 3 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3D74 - compare_var_to_imm 0x4087, 4 + compare 0x4087, 4 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3D7E end @@ -90,7 +90,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3DB2:: @ 81A3DB2 setvar 0x4087, 0 applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A4358 waitmovement 0 - compare_var_to_imm 0x8007, 0 + compare 0x8007, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3DD9 applymovement 0x8007, OldaleTown_PokemonCenter_2F_Movement_1A4354 waitmovement 0 @@ -101,7 +101,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3DD9:: @ 81A3DD9 OldaleTown_PokemonCenter_2F_EventScript_1A3DDA:: @ 81A3DDA special CloseLink setvar 0x4087, 0 - compare_var_to_imm 0x8007, 0 + compare 0x8007, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3E0C applymovement 0x8007, OldaleTown_PokemonCenter_2F_Movement_1A4356 waitmovement 0 @@ -128,7 +128,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3E17:: @ 81A3E17 OldaleTown_PokemonCenter_2F_EventScript_1A3E30:: @ 81A3E30 special CloseLink setvar 0x4087, 0 - compare_var_to_imm 0x8007, 0 + compare 0x8007, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3E0C applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A4361 waitmovement 0 @@ -192,26 +192,26 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3EBC:: @ 81A3EBC OldaleTown_PokemonCenter_2F_EventScript_1A3EF2:: @ 81A3EF2 call S_DoSaveDialog - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4319 call OldaleTown_PokemonCenter_2F_EventScript_1A3FEF - compare_var_to_imm 0x8004, 0 + compare 0x8004, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4319 message OldaleTown_PokemonCenter_2F_Text_1A490C waittext special sub_808347C waitstate - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3F5E - compare_var_to_imm RESULT, 2 + compare RESULT, 2 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4301 - compare_var_to_imm RESULT, 3 + compare RESULT, 3 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A430D - compare_var_to_imm RESULT, 4 + compare RESULT, 4 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4068 - compare_var_to_imm RESULT, 5 + compare RESULT, 5 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4319 - compare_var_to_imm RESULT, 6 + compare RESULT, 6 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A42F5 OldaleTown_PokemonCenter_2F_EventScript_1A3F5E:: @ 81A3F5E @@ -237,7 +237,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3F5E:: @ 81A3F5E setdoorclosed 5, 1 doorchange release - compare_var_to_imm 0x8004, 5 + compare 0x8004, 5 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3FCD special SetCableClubWarp warp SingleBattleColosseum, 255, 6, 8 @@ -281,7 +281,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A403C:: @ 81A403C OldaleTown_PokemonCenter_2F_EventScript_1A4042:: @ 81A4042 special CheckForAlivePartyMons - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if 5, OldaleTown_PokemonCenter_2F_EventScript_1A4056 setvar 0x8004, 2 return @@ -352,33 +352,33 @@ VerdanturfTown_PokemonCenter_2F_EventScript_1A40CC:: @ 81A40CC lock faceplayer msgbox OldaleTown_PokemonCenter_2F_Text_1A457E, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4319 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A40FA OldaleTown_PokemonCenter_2F_EventScript_1A40FA:: @ 81A40FA call OldaleTown_PokemonCenter_2F_EventScript_1A41BB - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4319 call S_DoSaveDialog - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4319 message OldaleTown_PokemonCenter_2F_Text_1A490C waittext special sub_80834E4 waitstate - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4166 - compare_var_to_imm RESULT, 2 + compare RESULT, 2 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4301 - compare_var_to_imm RESULT, 3 + compare RESULT, 3 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A430D - compare_var_to_imm RESULT, 4 + compare RESULT, 4 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A432D - compare_var_to_imm RESULT, 5 + compare RESULT, 5 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4319 - compare_var_to_imm RESULT, 6 + compare RESULT, 6 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A42F5 OldaleTown_PokemonCenter_2F_EventScript_1A4166:: @ 81A4166 @@ -406,10 +406,10 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4166:: @ 81A4166 OldaleTown_PokemonCenter_2F_EventScript_1A41BB:: @ 81A41BB specialvar RESULT, CalculatePlayerPartyCount - compare_var_to_imm RESULT, 2 + compare RESULT, 2 goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_1A41E1 specialvar RESULT, GetNameOfEnigmaBerryInPlayerParty - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A41EE setvar RESULT, 1 return @@ -449,14 +449,14 @@ VerdanturfTown_PokemonCenter_2F_EventScript_1A41FB:: @ 81A41FB lock faceplayer msgbox OldaleTown_PokemonCenter_2F_Text_1A45FE, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4319 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4229 OldaleTown_PokemonCenter_2F_EventScript_1A4229:: @ 81A4229 call S_DoSaveDialog - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4319 message OldaleTown_PokemonCenter_2F_Text_1A490C waittext @@ -464,19 +464,19 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4229:: @ 81A4229 waitstate special sub_80835D8 waitstate - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4294 - compare_var_to_imm RESULT, 2 + compare RESULT, 2 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4301 - compare_var_to_imm RESULT, 3 + compare RESULT, 3 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A430D - compare_var_to_imm RESULT, 4 + compare RESULT, 4 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A432D - compare_var_to_imm RESULT, 5 + compare RESULT, 5 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4319 - compare_var_to_imm RESULT, 6 + compare RESULT, 6 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A42F5 - compare_var_to_imm RESULT, 7 + compare RESULT, 7 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A42E9 OldaleTown_PokemonCenter_2F_EventScript_1A4294:: @ 81A4294 @@ -619,7 +619,7 @@ DoubleBattleColosseum_EventScript_1A4383:: @ 81A4383 fadescreen 1 special sub_80C5568 waitstate - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq DoubleBattleColosseum_EventScript_1A43EF setvar 0x8005, 0 special sub_8083B90 @@ -630,7 +630,7 @@ DoubleBattleColosseum_EventScript_1A439E:: @ 81A439E fadescreen 1 special sub_80C5568 waitstate - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq DoubleBattleColosseum_EventScript_1A43EF setvar 0x8005, 1 special sub_8083B90 @@ -641,7 +641,7 @@ DoubleBattleColosseum_EventScript_1A43B9:: @ 81A43B9 fadescreen 1 special sub_80C5568 waitstate - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq DoubleBattleColosseum_EventScript_1A43EF setvar 0x8005, 2 special sub_8083B90 @@ -652,7 +652,7 @@ DoubleBattleColosseum_EventScript_1A43D4:: @ 81A43D4 fadescreen 1 special sub_80C5568 waitstate - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq DoubleBattleColosseum_EventScript_1A43EF setvar 0x8005, 3 special sub_8083B90 @@ -690,7 +690,7 @@ RecordCorner_EventScript_1A4418:: @ 81A4418 setvar 0x8005, 0 special sub_80B929C waitstate - compare_var_to_imm 0x4001, 0 + compare 0x4001, 0 goto_if 5, RecordCorner_EventScript_1A446C end @@ -698,7 +698,7 @@ RecordCorner_EventScript_1A442D:: @ 81A442D setvar 0x8005, 1 special sub_80B929C waitstate - compare_var_to_imm 0x4001, 0 + compare 0x4001, 0 goto_if 5, RecordCorner_EventScript_1A446C end @@ -706,7 +706,7 @@ RecordCorner_EventScript_1A4442:: @ 81A4442 setvar 0x8005, 2 special sub_80B929C waitstate - compare_var_to_imm 0x4001, 0 + compare 0x4001, 0 goto_if 5, RecordCorner_EventScript_1A446C end @@ -714,7 +714,7 @@ RecordCorner_EventScript_1A4457:: @ 81A4457 setvar 0x8005, 3 special sub_80B929C waitstate - compare_var_to_imm 0x4001, 0 + compare 0x4001, 0 goto_if 5, RecordCorner_EventScript_1A446C end @@ -770,7 +770,7 @@ TradeCenter_EventScript_1A44AD:: @ 81A44AD end RecordCorner_EventScript_1A44BC:: @ 81A44BC - compare_var_to_imm 0x4000, 0 + compare 0x4000, 0 goto_if 5, RecordCorner_EventScript_1A44D6 special sub_8064EAC message RecordCorner_Text_1A4DD7 @@ -791,7 +791,7 @@ RecordCorner_EventScript_1A44D6:: @ 81A44D6 TradeRoom_PromptToCancelLink:: @ 81A44E5 msgbox TradeRoom_WillLinkBeTerminated, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq TradeRoom_TerminateLink hidebox 0, 0, 29, 19 end diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index 836fa10dd..acf5597ea 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -5,16 +5,16 @@ VerdanturfTown_ContestLobby_EventScript_1A4E92:: @ 81A4E92 lock faceplayer checkitem ITEM_CONTEST_PASS, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, FallarborTown_ContestLobby_EventScript_1A4EDD - compare_var_to_imm 0x408a, 0 + compare 0x408a, 0 goto_if 5, FallarborTown_ContestLobby_EventScript_1A4F4E checkflag 1 goto_if_eq FallarborTown_ContestLobby_EventScript_1A4F8F bufferstd 0, 0x800b msgbox FallarborTown_ContestLobby_Text_1A5DFC, 4 checkitem ITEM_CONTEST_PASS, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1A4EE1 setflag 1 goto FallarborTown_ContestLobby_EventScript_1A4F8F @@ -25,7 +25,7 @@ FallarborTown_ContestLobby_EventScript_1A4EDD:: @ 81A4EDD return FallarborTown_ContestLobby_EventScript_1A4EE1:: @ 81A4EE1 - compare_var_to_imm CONTEST_RANK, 0 + compare CONTEST_RANK, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1A4EF6 msgbox FallarborTown_ContestLobby_Text_1A6340, 4 releaseall @@ -33,7 +33,7 @@ FallarborTown_ContestLobby_EventScript_1A4EE1:: @ 81A4EE1 FallarborTown_ContestLobby_EventScript_1A4EF6:: @ 81A4EF6 msgbox FallarborTown_ContestLobby_Text_1A64F4, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq FallarborTown_ContestLobby_EventScript_1A4F13 msgbox FallarborTown_ContestLobby_Text_1A65EA, 4 releaseall @@ -63,7 +63,7 @@ FallarborTown_ContestLobby_EventScript_1A4F4E:: @ 81A4F4E FallarborTown_ContestLobby_EventScript_1A4F67:: @ 81A4F67 giveitem ITEM_LUXURY_BALL - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1A4F86 setvar 0x408a, 0 closebutton @@ -120,18 +120,18 @@ FallarborTown_ContestLobby_EventScript_1A503E:: @ 81A503E FallarborTown_ContestLobby_EventScript_1A5048:: @ 81A5048 msgbox FallarborTown_ContestLobby_Text_1A6319, 4 choosecontestpkmn - compare_var_to_imm 0x8004, 255 + compare 0x8004, 255 goto_if_eq FallarborTown_ContestLobby_EventScript_1A5097 special sub_80C43F4 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1A50C8 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq FallarborTown_ContestLobby_EventScript_1A50D7 - compare_var_to_imm RESULT, 2 + compare RESULT, 2 goto_if_eq FallarborTown_ContestLobby_EventScript_1A50FB - compare_var_to_imm RESULT, 3 + compare RESULT, 3 goto_if_eq FallarborTown_ContestLobby_EventScript_1A511F - compare_var_to_imm RESULT, 4 + compare RESULT, 4 goto_if_eq FallarborTown_ContestLobby_EventScript_1A512E end @@ -270,7 +270,7 @@ LinkContestRoom1_EventScript_1A5245:: @ 81A5245 return LinkContestRoom1_EventScript_1A525F:: @ 81A525F - compare_var_to_imm 0x4088, 5 + compare 0x4088, 5 goto_if_eq LinkContestRoom1_EventScript_1A5273 msgbox LinkContestRoom1_Text_1A68F0, 3 return @@ -287,20 +287,20 @@ LinkContestRoom1_EventScript_1A527A:: @ 81A527A call LinkContestRoom1_EventScript_1A53E5 call LinkContestRoom1_EventScript_1A5880 addvar 0x8006, 1 - compare_var_to_imm 0x8006, 4 + compare 0x8006, 4 goto_if 5, LinkContestRoom1_EventScript_1A527A call LinkContestRoom1_EventScript_1A5377 setvar 0x4001, 6 return LinkContestRoom1_EventScript_1A52AE:: @ 81A52AE - compare_var_to_imm 0x8006, 0 + compare 0x8006, 0 goto_if_eq LinkContestRoom1_EventScript_1A52DB - compare_var_to_imm 0x8006, 1 + compare 0x8006, 1 goto_if_eq LinkContestRoom1_EventScript_1A52ED - compare_var_to_imm 0x8006, 2 + compare 0x8006, 2 goto_if_eq LinkContestRoom1_EventScript_1A52FF - compare_var_to_imm 0x8006, 3 + compare 0x8006, 3 goto_if_eq LinkContestRoom1_EventScript_1A5311 return @@ -357,7 +357,7 @@ LinkContestRoom1_EventScript_1A5323:: @ 81A5323 return LinkContestRoom1_EventScript_1A535E:: @ 81A535E - compare_var_to_imm 0x4088, 5 + compare 0x4088, 5 goto_if_eq LinkContestRoom1_EventScript_1A5370 message LinkContestRoom1_Text_1A6A04 waittext @@ -385,7 +385,7 @@ LinkContestRoom1_EventScript_1A5377:: @ 81A5377 return LinkContestRoom1_EventScript_1A53B3:: @ 81A53B3 - compare_var_to_imm 0x4088, 5 + compare 0x4088, 5 goto_if_eq LinkContestRoom1_EventScript_1A53C7 msgbox LinkContestRoom1_Text_1A6A1F, 4 return @@ -396,7 +396,7 @@ LinkContestRoom1_EventScript_1A53C7:: @ 81A53C7 return LinkContestRoom1_EventScript_1A53CE:: @ 81A53CE - compare_var_to_imm 0x4088, 5 + compare 0x4088, 5 goto_if_eq LinkContestRoom1_EventScript_1A53DF message LinkContestRoom1_Text_1A6AE1 return @@ -431,15 +431,15 @@ LinkContestRoom1_EventScript_1A53E5:: @ 81A53E5 LinkContestRoom1_EventScript_1A5455:: @ 81A5455 special sub_80C47A0 - compare_var_to_imm 0x4088, 1 + compare 0x4088, 1 call_if 1, LinkContestRoom1_EventScript_1A555A - compare_var_to_imm 0x4088, 2 + compare 0x4088, 2 call_if 1, LinkContestRoom1_EventScript_1A55B8 - compare_var_to_imm 0x4088, 3 + compare 0x4088, 3 call_if 1, LinkContestRoom1_EventScript_1A5616 - compare_var_to_imm 0x4088, 4 + compare 0x4088, 4 call_if 1, LinkContestRoom1_EventScript_1A5674 - compare_var_to_imm 0x4088, 5 + compare 0x4088, 5 call_if 1, LinkContestRoom1_EventScript_1A56D2 setvar 0x4001, 9 setvar 0x4002, 9 @@ -449,7 +449,7 @@ LinkContestRoom1_EventScript_1A5455:: @ 81A5455 setvar 0x4006, 9 setvar 0x4007, 9 setvar 0x4008, 9 - compare_var_to_imm 0x4000, 0 + compare 0x4000, 0 call_if 2, LinkContestRoom1_EventScript_1A54EB setvar 0x4001, 0 setvar 0x4002, 0 @@ -464,123 +464,123 @@ LinkContestRoom1_EventScript_1A5455:: @ 81A5455 LinkContestRoom1_EventScript_1A54EB:: @ 81A54EB setvar RESULT, 8 special ScriptRandom - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LinkContestRoom1_EventScript_1A5760 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, LinkContestRoom1_EventScript_1A5784 - compare_var_to_imm RESULT, 2 + compare RESULT, 2 call_if 1, LinkContestRoom1_EventScript_1A57A8 - compare_var_to_imm RESULT, 3 + compare RESULT, 3 call_if 1, LinkContestRoom1_EventScript_1A57CC - compare_var_to_imm RESULT, 4 + compare RESULT, 4 call_if 1, LinkContestRoom1_EventScript_1A57F0 - compare_var_to_imm RESULT, 5 + compare RESULT, 5 call_if 1, LinkContestRoom1_EventScript_1A5814 - compare_var_to_imm RESULT, 6 + compare RESULT, 6 call_if 1, LinkContestRoom1_EventScript_1A5838 - compare_var_to_imm RESULT, 7 + compare RESULT, 7 call_if 1, LinkContestRoom1_EventScript_1A585C - compare_var_to_imm 0x4000, 0 + compare 0x4000, 0 goto_if 2, LinkContestRoom1_EventScript_1A54EB waitmovement 0 return LinkContestRoom1_EventScript_1A555A:: @ 81A555A - compare_var_to_imm 0x8004, 80 + compare 0x8004, 80 goto_if 2, LinkContestRoom1_EventScript_1A575A - compare_var_to_imm 0x8004, 70 + compare 0x8004, 70 goto_if 2, LinkContestRoom1_EventScript_1A5754 - compare_var_to_imm 0x8004, 60 + compare 0x8004, 60 goto_if 2, LinkContestRoom1_EventScript_1A574E - compare_var_to_imm 0x8004, 50 + compare 0x8004, 50 goto_if 2, LinkContestRoom1_EventScript_1A5748 - compare_var_to_imm 0x8004, 40 + compare 0x8004, 40 goto_if 2, LinkContestRoom1_EventScript_1A5742 - compare_var_to_imm 0x8004, 30 + compare 0x8004, 30 goto_if 2, LinkContestRoom1_EventScript_1A573C - compare_var_to_imm 0x8004, 20 + compare 0x8004, 20 goto_if 2, LinkContestRoom1_EventScript_1A5736 - compare_var_to_imm 0x8004, 10 + compare 0x8004, 10 goto_if 2, LinkContestRoom1_EventScript_1A5730 setvar 0x4000, 0 return LinkContestRoom1_EventScript_1A55B8:: @ 81A55B8 - compare_var_to_imm 0x8004, 230 + compare 0x8004, 230 goto_if 2, LinkContestRoom1_EventScript_1A575A - compare_var_to_imm 0x8004, 210 + compare 0x8004, 210 goto_if 2, LinkContestRoom1_EventScript_1A5754 - compare_var_to_imm 0x8004, 190 + compare 0x8004, 190 goto_if 2, LinkContestRoom1_EventScript_1A574E - compare_var_to_imm 0x8004, 170 + compare 0x8004, 170 goto_if 2, LinkContestRoom1_EventScript_1A5748 - compare_var_to_imm 0x8004, 150 + compare 0x8004, 150 goto_if 2, LinkContestRoom1_EventScript_1A5742 - compare_var_to_imm 0x8004, 130 + compare 0x8004, 130 goto_if 2, LinkContestRoom1_EventScript_1A573C - compare_var_to_imm 0x8004, 110 + compare 0x8004, 110 goto_if 2, LinkContestRoom1_EventScript_1A5736 - compare_var_to_imm 0x8004, 90 + compare 0x8004, 90 goto_if 2, LinkContestRoom1_EventScript_1A5730 setvar 0x4000, 0 return LinkContestRoom1_EventScript_1A5616:: @ 81A5616 - compare_var_to_imm 0x8004, 380 + compare 0x8004, 380 goto_if 2, LinkContestRoom1_EventScript_1A575A - compare_var_to_imm 0x8004, 350 + compare 0x8004, 350 goto_if 2, LinkContestRoom1_EventScript_1A5754 - compare_var_to_imm 0x8004, 320 + compare 0x8004, 320 goto_if 2, LinkContestRoom1_EventScript_1A574E - compare_var_to_imm 0x8004, 290 + compare 0x8004, 290 goto_if 2, LinkContestRoom1_EventScript_1A5748 - compare_var_to_imm 0x8004, 260 + compare 0x8004, 260 goto_if 2, LinkContestRoom1_EventScript_1A5742 - compare_var_to_imm 0x8004, 230 + compare 0x8004, 230 goto_if 2, LinkContestRoom1_EventScript_1A573C - compare_var_to_imm 0x8004, 200 + compare 0x8004, 200 goto_if 2, LinkContestRoom1_EventScript_1A5736 - compare_var_to_imm 0x8004, 170 + compare 0x8004, 170 goto_if 2, LinkContestRoom1_EventScript_1A5730 setvar 0x4000, 0 return LinkContestRoom1_EventScript_1A5674:: @ 81A5674 - compare_var_to_imm 0x8004, 600 + compare 0x8004, 600 goto_if 2, LinkContestRoom1_EventScript_1A575A - compare_var_to_imm 0x8004, 560 + compare 0x8004, 560 goto_if 2, LinkContestRoom1_EventScript_1A5754 - compare_var_to_imm 0x8004, 520 + compare 0x8004, 520 goto_if 2, LinkContestRoom1_EventScript_1A574E - compare_var_to_imm 0x8004, 480 + compare 0x8004, 480 goto_if 2, LinkContestRoom1_EventScript_1A5748 - compare_var_to_imm 0x8004, 440 + compare 0x8004, 440 goto_if 2, LinkContestRoom1_EventScript_1A5742 - compare_var_to_imm 0x8004, 400 + compare 0x8004, 400 goto_if 2, LinkContestRoom1_EventScript_1A573C - compare_var_to_imm 0x8004, 360 + compare 0x8004, 360 goto_if 2, LinkContestRoom1_EventScript_1A5736 - compare_var_to_imm 0x8004, 320 + compare 0x8004, 320 goto_if 2, LinkContestRoom1_EventScript_1A5730 setvar 0x4000, 0 return LinkContestRoom1_EventScript_1A56D2:: @ 81A56D2 - compare_var_to_imm 0x8004, 600 + compare 0x8004, 600 goto_if 2, LinkContestRoom1_EventScript_1A575A - compare_var_to_imm 0x8004, 550 + compare 0x8004, 550 goto_if 2, LinkContestRoom1_EventScript_1A5754 - compare_var_to_imm 0x8004, 500 + compare 0x8004, 500 goto_if 2, LinkContestRoom1_EventScript_1A574E - compare_var_to_imm 0x8004, 450 + compare 0x8004, 450 goto_if 2, LinkContestRoom1_EventScript_1A5748 - compare_var_to_imm 0x8004, 400 + compare 0x8004, 400 goto_if 2, LinkContestRoom1_EventScript_1A5742 - compare_var_to_imm 0x8004, 300 + compare 0x8004, 300 goto_if 2, LinkContestRoom1_EventScript_1A573C - compare_var_to_imm 0x8004, 200 + compare 0x8004, 200 goto_if 2, LinkContestRoom1_EventScript_1A5736 - compare_var_to_imm 0x8004, 100 + compare 0x8004, 100 goto_if 2, LinkContestRoom1_EventScript_1A5730 setvar 0x4000, 0 return @@ -618,7 +618,7 @@ LinkContestRoom1_EventScript_1A575A:: @ 81A575A return LinkContestRoom1_EventScript_1A5760:: @ 81A5760 - compare_var_to_imm 0x4001, 1 + compare 0x4001, 1 goto_if_eq LinkContestRoom1_EventScript_1A5783 applymovement 6, LinkContestRoom1_Movement_1A5D8D playse 21 @@ -631,7 +631,7 @@ LinkContestRoom1_EventScript_1A5783:: @ 81A5783 return LinkContestRoom1_EventScript_1A5784:: @ 81A5784 - compare_var_to_imm 0x4002, 1 + compare 0x4002, 1 goto_if_eq LinkContestRoom1_EventScript_1A57A7 applymovement 12, LinkContestRoom1_Movement_1A5D8D playse 21 @@ -644,7 +644,7 @@ LinkContestRoom1_EventScript_1A57A7:: @ 81A57A7 return LinkContestRoom1_EventScript_1A57A8:: @ 81A57A8 - compare_var_to_imm 0x4003, 1 + compare 0x4003, 1 goto_if_eq LinkContestRoom1_EventScript_1A57CB applymovement 7, LinkContestRoom1_Movement_1A5D8D playse 21 @@ -657,7 +657,7 @@ LinkContestRoom1_EventScript_1A57CB:: @ 81A57CB return LinkContestRoom1_EventScript_1A57CC:: @ 81A57CC - compare_var_to_imm 0x4004, 1 + compare 0x4004, 1 goto_if_eq LinkContestRoom1_EventScript_1A57EF applymovement 8, LinkContestRoom1_Movement_1A5D8D playse 21 @@ -670,7 +670,7 @@ LinkContestRoom1_EventScript_1A57EF:: @ 81A57EF return LinkContestRoom1_EventScript_1A57F0:: @ 81A57F0 - compare_var_to_imm 0x4005, 1 + compare 0x4005, 1 goto_if_eq LinkContestRoom1_EventScript_1A5813 applymovement 9, LinkContestRoom1_Movement_1A5D8D playse 21 @@ -683,7 +683,7 @@ LinkContestRoom1_EventScript_1A5813:: @ 81A5813 return LinkContestRoom1_EventScript_1A5814:: @ 81A5814 - compare_var_to_imm 0x4006, 1 + compare 0x4006, 1 goto_if_eq LinkContestRoom1_EventScript_1A5837 applymovement 10, LinkContestRoom1_Movement_1A5D8D playse 21 @@ -696,7 +696,7 @@ LinkContestRoom1_EventScript_1A5837:: @ 81A5837 return LinkContestRoom1_EventScript_1A5838:: @ 81A5838 - compare_var_to_imm 0x4007, 1 + compare 0x4007, 1 goto_if_eq LinkContestRoom1_EventScript_1A585B applymovement 11, LinkContestRoom1_Movement_1A5D8D playse 21 @@ -709,7 +709,7 @@ LinkContestRoom1_EventScript_1A585B:: @ 81A585B return LinkContestRoom1_EventScript_1A585C:: @ 81A585C - compare_var_to_imm 0x4008, 1 + compare 0x4008, 1 goto_if_eq LinkContestRoom1_EventScript_1A587F applymovement 15, LinkContestRoom1_Movement_1A5D8D playse 21 @@ -782,7 +782,7 @@ LinkContestRoom1_EventScript_1A58EE:: @ 81A58EE return LinkContestRoom1_EventScript_1A5930:: @ 81A5930 - compare_var_to_imm 0x4088, 5 + compare 0x4088, 5 goto_if_eq LinkContestRoom1_EventScript_1A5944 msgbox LinkContestRoom1_Text_1A6AF5, 3 return @@ -809,7 +809,7 @@ LinkContestRoom1_EventScript_1A594A:: @ 81A594A return LinkContestRoom1_EventScript_1A5984:: @ 81A5984 - compare_var_to_imm 0x4088, 5 + compare 0x4088, 5 goto_if_eq LinkContestRoom1_EventScript_1A5998 msgbox LinkContestRoom1_Text_1A6C06, 4 return @@ -821,7 +821,7 @@ LinkContestRoom1_EventScript_1A5998:: @ 81A5998 return LinkContestRoom1_EventScript_1A59A2:: @ 81A59A2 - compare_var_to_imm 0x4088, 5 + compare 0x4088, 5 goto_if_eq LinkContestRoom1_EventScript_1A59B6 msgbox LinkContestRoom1_Text_1A6C21, 4 return @@ -833,7 +833,7 @@ LinkContestRoom1_EventScript_1A59B6:: @ 81A59B6 return LinkContestRoom1_EventScript_1A59C0:: @ 81A59C0 - compare_var_to_imm 0x4088, 5 + compare 0x4088, 5 goto_if_eq LinkContestRoom1_EventScript_1A59D4 msgbox LinkContestRoom1_Text_1A6C9D, 4 return @@ -845,7 +845,7 @@ LinkContestRoom1_EventScript_1A59D4:: @ 81A59D4 return LinkContestRoom1_EventScript_1A59DE:: @ 81A59DE - compare_var_to_imm 0x4088, 5 + compare 0x4088, 5 goto_if_eq LinkContestRoom1_EventScript_1A59F2 msgbox LinkContestRoom1_Text_1A6D16, 4 return @@ -895,7 +895,7 @@ LinkContestRoom1_EventScript_1A5A49:: @ 81A5A49 return LinkContestRoom1_EventScript_1A5A75:: @ 81A5A75 - compare_var_to_imm 0x4088, 5 + compare 0x4088, 5 goto_if_eq LinkContestRoom1_EventScript_1A5A89 msgbox LinkContestRoom1_Text_1A6D3C, 4 return @@ -908,7 +908,7 @@ LinkContestRoom1_EventScript_1A5A89:: @ 81A5A89 LinkContestRoom1_EventScript_1A5A90:: @ 81A5A90 addvar 0x4001, 1 lockall - compare_var_to_imm 0x4088, 1 + compare 0x4088, 1 call_if 2, LinkContestRoom1_EventScript_1A5AE4 applymovement 9, LinkContestRoom1_Movement_1A5DB7 applymovement 12, LinkContestRoom1_Movement_1A5DBB @@ -918,7 +918,7 @@ LinkContestRoom1_EventScript_1A5A90:: @ 81A5A90 applymovement 11, LinkContestRoom1_Movement_1A5DBB applymovement 6, LinkContestRoom1_Movement_1A5DB3 applymovement 8, LinkContestRoom1_Movement_1A5DAF - compare_var_to_imm 0x4001, 4 + compare 0x4001, 4 goto_if 5, LinkContestRoom1_EventScript_1A5A90 delay 30 return @@ -993,7 +993,7 @@ LinkContestRoom1_EventScript_1A5AE4:: @ 81A5AE4 return LinkContestRoom1_EventScript_1A5BAB:: @ 81A5BAB - compare_var_to_imm 0x4088, 5 + compare 0x4088, 5 goto_if_eq LinkContestRoom1_EventScript_1A5C4C call LinkContestRoom1_EventScript_1A5C12 checkflag 2 @@ -1007,7 +1007,7 @@ LinkContestRoom1_EventScript_1A5BAB:: @ 81A5BAB call LinkContestRoom1_EventScript_1A5A90 delay 30 special sub_80C4CF8 - compare_var_to_imm 0x8004, 1 + compare 0x8004, 1 goto_if_eq LinkContestRoom1_EventScript_1A5C46 return @@ -1016,24 +1016,24 @@ LinkContestRoom1_EventScript_1A5BF6:: @ 81A5BF6 msgbox LinkContestRoom1_Text_1A6DF1, 3 delay 90 special sub_80C4CF8 - compare_var_to_imm 0x8004, 1 + compare 0x8004, 1 goto_if_eq LinkContestRoom1_EventScript_1A5C46 return LinkContestRoom1_EventScript_1A5C12:: @ 81A5C12 specialvar RESULT, sub_80C4440 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LinkContestRoom1_EventScript_1A5C23 return LinkContestRoom1_EventScript_1A5C23:: @ 81A5C23 special sub_80C47C0 - compare_var_to_imm 0x8005, 3 + compare 0x8005, 3 goto_if_eq LinkContestRoom1_EventScript_1A5C32 return LinkContestRoom1_EventScript_1A5C32:: @ 81A5C32 - compare_var_to_imm CONTEST_RANK, 3 + compare CONTEST_RANK, 3 goto_if_eq LinkContestRoom1_EventScript_1A5C41 setflag 2 return @@ -1053,7 +1053,7 @@ LinkContestRoom1_EventScript_1A5C4C:: @ 81A5C4C delay 60 call LinkContestRoom1_EventScript_1A5C6A special sub_80C4CF8 - compare_var_to_imm 0x8004, 1 + compare 0x8004, 1 goto_if_eq LinkContestRoom1_EventScript_1A5C64 closebutton return @@ -1065,7 +1065,7 @@ LinkContestRoom1_EventScript_1A5C64:: @ 81A5C64 LinkContestRoom1_EventScript_1A5C6A:: @ 81A5C6A special sub_80C496C special sub_80C47C0 - compare_var_to_var 0x8004, 0x8005 + compare 0x8004, 0x8005 goto_if_eq LinkContestRoom1_EventScript_1A5C7C return @@ -1111,19 +1111,19 @@ LinkContestRoom1_EventScript_1A5CD8:: @ 81A5CD8 LinkContestRoom1_EventScript_1A5CE5:: @ 81A5CE5 special sub_80C47C0 - compare_var_to_imm 0x8005, 3 + compare 0x8005, 3 goto_if_eq LinkContestRoom1_EventScript_1A5CFC msgbox LinkContestRoom1_Text_1A6DF1, 3 return LinkContestRoom1_EventScript_1A5CFC:: @ 81A5CFC - compare_var_to_imm 0x4088, 2 + compare 0x4088, 2 call_if 1, LinkContestRoom1_EventScript_1A5C42 inccounter GAME_STAT_WON_CONTEST specialvar RESULT, sub_80C4440 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LinkContestRoom1_EventScript_1A5D5B - compare_var_to_imm CONTEST_RANK, 3 + compare CONTEST_RANK, 3 goto_if_eq LinkContestRoom1_EventScript_1A5D3B msgbox LinkContestRoom1_Text_1A6DF1, 3 return @@ -1135,7 +1135,7 @@ LinkContestRoom1_EventScript_1A5D2D:: @ 81A5D2D LinkContestRoom1_EventScript_1A5D3B:: @ 81A5D3B giveitem ITEM_LUXURY_BALL - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LinkContestRoom1_EventScript_1A5D2D msgbox LinkContestRoom1_Text_1A6DF1, 3 return diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index ed515d15b..62a2d6224 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -3,11 +3,11 @@ Route117_EventScript_1B222D:: @ 81B222D faceplayer special sp0B5_daycare specialvar RESULT, sp0B6_daycare - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route117_EventScript_1B2262 - compare_var_to_imm RESULT, 2 + compare RESULT, 2 goto_if_eq Route117_EventScript_1B22E7 - compare_var_to_imm RESULT, 3 + compare RESULT, 3 goto_if_eq Route117_EventScript_1B22FE msgbox Route117_Text_1B25CB, 4 release @@ -15,10 +15,10 @@ Route117_EventScript_1B222D:: @ 81B222D Route117_EventScript_1B2262:: @ 81B2262 msgbox Route117_Text_1B2659, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route117_EventScript_1B2298 msgbox Route117_Text_1B28C4, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route117_EventScript_1B2298 msgbox Route117_Text_1B2745, 4 clearflag 134 @@ -28,7 +28,7 @@ Route117_EventScript_1B2262:: @ 81B2262 Route117_EventScript_1B2298:: @ 81B2298 specialvar RESULT, CalculatePlayerPartyCount - compare_var_to_imm RESULT, 6 + compare RESULT, 6 goto_if 5, Route117_EventScript_1B22B2 msgbox Route117_Text_1B2766, 4 release @@ -48,7 +48,7 @@ Route117_EventScript_1B22B2:: @ 81B22B2 Route117_EventScript_1B22CD:: @ 81B22CD specialvar RESULT, sub_8042B4C - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, Route117_EventScript_1B22DE return @@ -82,14 +82,14 @@ Route117_PokemonDayCare_EventScript_1B2327:: @ 81B2327 lock faceplayer specialvar RESULT, sp0B6_daycare - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route117_PokemonDayCare_EventScript_1B2407 - compare_var_to_imm RESULT, 2 + compare RESULT, 2 goto_if_eq Route117_PokemonDayCare_EventScript_1B242B - compare_var_to_imm RESULT, 3 + compare RESULT, 3 goto_if_eq Route117_PokemonDayCare_EventScript_1B2558 msgbox Route117_PokemonDayCare_Text_1B28F2, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route117_PokemonDayCare_EventScript_1B236C msgbox Route117_PokemonDayCare_Text_1B2A14, 4 release @@ -97,16 +97,16 @@ Route117_PokemonDayCare_EventScript_1B2327:: @ 81B2327 Route117_PokemonDayCare_EventScript_1B236C:: @ 81B236C specialvar RESULT, sub_8095B6C - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route117_PokemonDayCare_EventScript_1B23F3 msgbox Route117_PokemonDayCare_Text_1B2947, 4 fadescreen 1 special ChooseSendDaycareMon waitstate - compare_var_to_imm 0x8004, 255 + compare 0x8004, 255 goto_if_eq Route117_PokemonDayCare_EventScript_1B23D0 specialvar RESULT, sub_8095C10 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route117_PokemonDayCare_EventScript_1B23FD specialvar 0x8005, sub_8042328 waitse @@ -116,7 +116,7 @@ Route117_PokemonDayCare_EventScript_1B236C:: @ 81B236C special Daycare_SendPokemon_Special inccounter GAME_STAT_USED_DAYCARE specialvar RESULT, sp0B6_daycare - compare_var_to_imm RESULT, 2 + compare RESULT, 2 goto_if_eq Route117_PokemonDayCare_EventScript_1B23DA release end @@ -128,7 +128,7 @@ Route117_PokemonDayCare_EventScript_1B23D0:: @ 81B23D0 Route117_PokemonDayCare_EventScript_1B23DA:: @ 81B23DA msgbox Route117_PokemonDayCare_Text_1B29AD, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route117_PokemonDayCare_EventScript_1B236C goto Route117_PokemonDayCare_EventScript_1B23D0 end @@ -154,7 +154,7 @@ Route117_PokemonDayCare_EventScript_1B2411:: @ 81B2411 Route117_PokemonDayCare_EventScript_1B241A:: @ 81B241A specialvar RESULT, sub_80417B8 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 5, Route117_PokemonDayCare_EventScript_1B2411 return @@ -163,26 +163,26 @@ Route117_PokemonDayCare_EventScript_1B242B:: @ 81B242B setvar 0x8004, 0 call Route117_PokemonDayCare_EventScript_1B241A msgbox Route117_PokemonDayCare_Text_1B29AD, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route117_PokemonDayCare_EventScript_1B236C msgbox Route117_PokemonDayCare_Text_1B2BF6, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route117_PokemonDayCare_EventScript_1B2469 goto Route117_PokemonDayCare_EventScript_1B23D0 end Route117_PokemonDayCare_EventScript_1B2469:: @ 81B2469 specialvar RESULT, CalculatePlayerPartyCount - compare_var_to_imm RESULT, 6 + compare RESULT, 6 goto_if_eq Route117_PokemonDayCare_EventScript_1B2539 specialvar RESULT, sp0B6_daycare setvar 0x8004, 0 - compare_var_to_imm RESULT, 2 + compare RESULT, 2 goto_if_eq Route117_PokemonDayCare_EventScript_1B24A8 special ShowDaycareLevelMenu waitstate copyvar 0x8004, RESULT - compare_var_to_imm RESULT, 2 + compare RESULT, 2 goto_if_eq Route117_PokemonDayCare_EventScript_1B23D0 goto Route117_PokemonDayCare_EventScript_1B24A8 end @@ -190,14 +190,14 @@ Route117_PokemonDayCare_EventScript_1B2469:: @ 81B2469 Route117_PokemonDayCare_EventScript_1B24A8:: @ 81B24A8 special sub_8041770 msgbox Route117_PokemonDayCare_Text_1B2B49, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route117_PokemonDayCare_EventScript_1B24C4 goto Route117_PokemonDayCare_EventScript_1B23D0 end Route117_PokemonDayCare_EventScript_1B24C4:: @ 81B24C4 specialvar RESULT, sub_80B7CE8 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route117_PokemonDayCare_EventScript_1B24DE msgbox Route117_PokemonDayCare_Text_1B2A30, 4 release @@ -215,14 +215,14 @@ Route117_PokemonDayCare_EventScript_1B24DE:: @ 81B24DE msgbox Route117_PokemonDayCare_Text_1B2B93, 4 waitpokecry specialvar RESULT, sp0B6_daycare - compare_var_to_imm RESULT, 2 + compare RESULT, 2 goto_if_eq Route117_PokemonDayCare_EventScript_1B2520 goto Route117_PokemonDayCare_EventScript_1B23D0 end Route117_PokemonDayCare_EventScript_1B2520:: @ 81B2520 msgbox Route117_PokemonDayCare_Text_1B2A4F, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route117_PokemonDayCare_EventScript_1B2469 goto Route117_PokemonDayCare_EventScript_1B23D0 end @@ -264,7 +264,7 @@ Route117_PokemonDayCare_EventScript_1B2558:: @ 81B2558 setvar 0x8004, 1 call Route117_PokemonDayCare_EventScript_1B241A msgbox Route117_PokemonDayCare_Text_1B2BF6, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route117_PokemonDayCare_EventScript_1B2469 msgbox Route117_PokemonDayCare_Text_1B2A76, 4 release @@ -273,7 +273,7 @@ Route117_PokemonDayCare_EventScript_1B2558:: @ 81B2558 @ 81B2591 special ShowDaycareLevelMenu waitstate - compare_var_to_imm RESULT, 2 + compare RESULT, 2 goto_if_eq Route117_PokemonDayCare_EventScript_1B23D0 copyvar 0x8004, RESULT specialvar RESULT, sub_8041648 diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc index b8c284fec..cad2c6a48 100644 --- a/data/scripts/gabby_and_ty.inc +++ b/data/scripts/gabby_and_ty.inc @@ -202,11 +202,11 @@ Route120_EventScript_1AE582:: @ 81AE582 Route111_EventScript_1AE5A2:: @ 81AE5A2 special GabbyAndTyBeforeInterview special GabbyAndTySetScriptVarsToFieldObjectLocalIds - compare_var_to_imm FACING, 2 + compare FACING, 2 call_if 1, Route111_EventScript_1AE5E0 - compare_var_to_imm FACING, 1 + compare FACING, 1 call_if 1, Route111_EventScript_1AE5EB - compare_var_to_imm FACING, 4 + compare FACING, 4 call_if 1, Route111_EventScript_1AE5FD checkflag 1 goto_if_eq Route111_EventScript_1AE73A @@ -236,16 +236,16 @@ Route118_EventScript_1AE60F:: @ 81AE60F Route120_EventScript_1AE60F:: @ 81AE60F special GabbyAndTyBeforeInterview special GabbyAndTySetScriptVarsToFieldObjectLocalIds - compare_var_to_imm FACING, 2 + compare FACING, 2 call_if 1, Route111_EventScript_1AE5E0 - compare_var_to_imm FACING, 1 + compare FACING, 1 call_if 1, Route111_EventScript_1AE5EB - compare_var_to_imm FACING, 4 + compare FACING, 4 call_if 1, Route111_EventScript_1AE5FD checkflag 1 goto_if_eq Route111_EventScript_1AE73A specialvar RESULT, GabbyAndTyGetLastQuote - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route111_EventScript_1AE69F msgbox Route111_Text_1AC10A, 4 specialvar RESULT, sub_80BDD18 @@ -300,14 +300,14 @@ Route111_EventScript_1AE6E5:: @ 81AE6E5 end Route111_EventScript_1AE6F3:: @ 81AE6F3 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route111_EventScript_1AE72D msgbox Route111_Text_1AC40F, 4 setvar 0x8004, 10 call Route111_EventScript_1A00F3 lock faceplayer - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route111_EventScript_1AE72D msgbox Route111_Text_1AC487, 4 special sub_80BDC14 diff --git a/data/scripts/magma_chimney.inc b/data/scripts/magma_chimney.inc index f373a76a6..01bdb7c31 100644 --- a/data/scripts/magma_chimney.inc +++ b/data/scripts/magma_chimney.inc @@ -67,9 +67,9 @@ MtChimney_EventScript_1B2CCB:: @ 81B2CCB fadescreen 0 movespriteperm 1, 10, 12 reappear 1 - compare_var_to_imm FACING, 4 + compare FACING, 4 call_if 1, MtChimney_EventScript_1B2D7D - compare_var_to_imm FACING, 2 + compare FACING, 2 call_if 1, MtChimney_EventScript_1B2D88 applymovement 255, MtChimney_Movement_1A083F waitmovement 0 @@ -79,9 +79,9 @@ MtChimney_EventScript_1B2CCB:: @ 81B2CCB msgbox MtChimney_Text_1B3FFE, 4 .endif closebutton - compare_var_to_imm FACING, 4 + compare FACING, 4 call_if 1, MtChimney_EventScript_1B2D93 - compare_var_to_imm FACING, 2 + compare FACING, 2 call_if 1, MtChimney_EventScript_1B2D9E disappear 1 setflag 927 diff --git a/data/scripts/maps/AbandonedShip_CaptainsOffice.inc b/data/scripts/maps/AbandonedShip_CaptainsOffice.inc index 97871a9f5..eb912028a 100644 --- a/data/scripts/maps/AbandonedShip_CaptainsOffice.inc +++ b/data/scripts/maps/AbandonedShip_CaptainsOffice.inc @@ -7,7 +7,7 @@ AbandonedShip_CaptainsOffice_EventScript_15EAF5:: @ 815EAF5 checkflag 294 goto_if_eq AbandonedShip_CaptainsOffice_EventScript_15EB2D checkitem ITEM_SCANNER, 1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq AbandonedShip_CaptainsOffice_EventScript_15EB23 checkflag 1078 goto_if_eq AbandonedShip_CaptainsOffice_EventScript_15EB2D diff --git a/data/scripts/maps/AbandonedShip_Corridors_B1F.inc b/data/scripts/maps/AbandonedShip_Corridors_B1F.inc index 85531be99..f3c3c0aa0 100644 --- a/data/scripts/maps/AbandonedShip_Corridors_B1F.inc +++ b/data/scripts/maps/AbandonedShip_Corridors_B1F.inc @@ -31,7 +31,7 @@ AbandonedShip_Corridors_B1F_EventScript_15E9D3:: @ 815E9D3 checkflag 239 goto_if_eq AbandonedShip_Corridors_B1F_EventScript_15EA14 checkitem ITEM_STORAGE_KEY, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq AbandonedShip_Corridors_B1F_EventScript_15EA0A msgbox AbandonedShip_Corridors_B1F_Text_198692, 4 playse 21 diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc b/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc index fe833b47c..29a89a620 100644 --- a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc +++ b/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc @@ -63,7 +63,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EBF3:: @ 815EBF3 checkflag 240 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7 checkitem ITEM_ROOM_1_KEY, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECCF msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4 playse 21 @@ -79,7 +79,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EC2A:: @ 815EC2A checkflag 241 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7 checkitem ITEM_ROOM_2_KEY, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECD9 msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4 playse 21 @@ -95,7 +95,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EC61:: @ 815EC61 checkflag 242 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7 checkitem ITEM_ROOM_4_KEY, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECE3 msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4 playse 21 @@ -111,7 +111,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EC98:: @ 815EC98 checkflag 243 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7 checkitem ITEM_ROOM_6_KEY, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECED msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4 playse 21 diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc b/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc index 4f3e0f099..cc9074e35 100644 --- a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc +++ b/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc @@ -10,11 +10,11 @@ AbandonedShip_HiddenFloorRooms_EventScript_15ED11:: @ 815ED11 setvar 0x4001, 1 getplayerxy 0x4002, 0x4003 setvar 0x4004, 1 - compare_var_to_imm 0x4002, 21 + compare 0x4002, 21 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15ED89 - compare_var_to_imm 0x4002, 36 + compare 0x4002, 36 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15ED8F - compare_var_to_imm 0x4003, 2 + compare 0x4003, 2 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15ED95 switch 0x4004 case 1, AbandonedShip_HiddenFloorRooms_EventScript_15ED9B @@ -44,7 +44,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_15ED9B:: @ 815ED9B setanimation 2, 0 doanimation 54 specialvar RESULT, sub_810F4D4 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE8B checkanimation 54 delay 10 @@ -55,10 +55,10 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EDC4:: @ 815EDC4 AbandonedShip_HiddenFloorRooms_EventScript_15EDC5:: @ 815EDC5 specialvar RESULT, sub_810F488 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15EDEA delay 20 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE6B checkanimation 54 delay 10 @@ -78,7 +78,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EDEB:: @ 815EDEB setanimation 2, 0 doanimation 54 specialvar RESULT, sub_810F4FC - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE9B checkanimation 54 delay 10 @@ -99,7 +99,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EE23:: @ 815EE23 setanimation 2, 0 doanimation 54 specialvar RESULT, sub_810F4B0 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE7B checkanimation 54 delay 10 diff --git a/data/scripts/maps/AbandonedShip_Rooms2_1F.inc b/data/scripts/maps/AbandonedShip_Rooms2_1F.inc index 4feecded6..5e8ab1062 100644 --- a/data/scripts/maps/AbandonedShip_Rooms2_1F.inc +++ b/data/scripts/maps/AbandonedShip_Rooms2_1F.inc @@ -4,7 +4,7 @@ AbandonedShip_Rooms2_1F_MapScripts:: @ 815EA67 AbandonedShip_Rooms2_1F_EventScript_15EA68:: @ 815EA68 trainerbattle 4, OPPONENT_LOIS_AND_HAL_1, 0, AbandonedShip_Rooms2_1F_Text_1987C1, AbandonedShip_Rooms2_1F_Text_1987FE, AbandonedShip_Rooms2_1F_Text_19887F specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq AbandonedShip_Rooms2_1F_EventScript_15EA93 msgbox AbandonedShip_Rooms2_1F_Text_198835, 6 end @@ -17,7 +17,7 @@ AbandonedShip_Rooms2_1F_EventScript_15EA93:: @ 815EA93 AbandonedShip_Rooms2_1F_EventScript_15EAAE:: @ 815EAAE trainerbattle 4, OPPONENT_LOIS_AND_HAL_1, 0, AbandonedShip_Rooms2_1F_Text_1988CC, AbandonedShip_Rooms2_1F_Text_198916, AbandonedShip_Rooms2_1F_Text_19899A specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq AbandonedShip_Rooms2_1F_EventScript_15EAD9 msgbox AbandonedShip_Rooms2_1F_Text_198934, 6 end diff --git a/data/scripts/maps/BattleTower_Corridor.inc b/data/scripts/maps/BattleTower_Corridor.inc index 26570cd66..9d4fbc844 100644 --- a/data/scripts/maps/BattleTower_Corridor.inc +++ b/data/scripts/maps/BattleTower_Corridor.inc @@ -4,7 +4,7 @@ BattleTower_Corridor_MapScripts:: @ 8160845 .byte 0 BattleTower_Corridor_MapScript1_160850:: @ 8160850 - compare_var_to_imm 0x8006, 1 + compare 0x8006, 1 goto_if_eq BattleTower_Corridor_EventScript_16086E setmaptile 12, 0, 519, 0 setmaptile 12, 1, 527, 0 @@ -21,7 +21,7 @@ BattleTower_Corridor_MapScript2_160881:: @ 8160881 BattleTower_Corridor_EventScript_16088B:: @ 816088B setvar 0x4000, 1 - compare_var_to_imm 0x8006, 1 + compare 0x8006, 1 goto_if_eq BattleTower_Corridor_EventScript_1608B1 applymovement 1, BattleTower_Corridor_Movement_1608D5 applymovement 255, BattleTower_Corridor_Movement_1608D4 diff --git a/data/scripts/maps/BattleTower_Lobby.inc b/data/scripts/maps/BattleTower_Lobby.inc index bd4f4ecd1..61b2da5e7 100644 --- a/data/scripts/maps/BattleTower_Lobby.inc +++ b/data/scripts/maps/BattleTower_Lobby.inc @@ -18,7 +18,7 @@ BattleTower_Lobby_EventScript_16029C:: @ 816029C checkflag 237 goto_if_eq BattleTower_Lobby_EventScript_1602CD specialvar 0x8007, sub_810F404 - compare_var_to_imm 0x8007, 50 + compare 0x8007, 50 goto_if 0, BattleTower_Lobby_EventScript_1602E4 clearflag 941 special sub_810F8FC @@ -26,7 +26,7 @@ BattleTower_Lobby_EventScript_16029C:: @ 816029C BattleTower_Lobby_EventScript_1602CD:: @ 81602CD specialvar 0x8007, sub_810F404 - compare_var_to_imm 0x8007, 100 + compare 0x8007, 100 goto_if 0, BattleTower_Lobby_EventScript_1602E4 clearflag 941 special sub_810F8FC @@ -77,10 +77,10 @@ BattleTower_Lobby_EventScript_160342:: @ 8160342 waittext setvar 0x8004, 0 special sub_81358A4 - compare_var_to_imm RESULT, 6 + compare RESULT, 6 goto_if_eq BattleTower_Lobby_EventScript_16037D special sub_8135E50 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_16037D message BattleTower_Lobby_Text_19A6BE waittext @@ -91,7 +91,7 @@ BattleTower_Lobby_EventScript_160342:: @ 8160342 BattleTower_Lobby_EventScript_16037D:: @ 816037D setvar 0x8004, 8 special sub_81358A4 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq BattleTower_Lobby_EventScript_1603AD message BattleTower_Lobby_Text_19A589 waittext @@ -118,7 +118,7 @@ BattleTower_Lobby_EventScript_1603AD:: @ 81603AD waitfanfare setvar 0x8004, 9 special sub_81358A4 - compare_var_to_imm RESULT, 49 + compare RESULT, 49 goto_if 5, BattleTower_Lobby_EventScript_1603F8 msgbox BattleTower_Lobby_Text_19A617, 4 @@ -186,7 +186,7 @@ BattleTower_Lobby_EventScript_16049E:: @ 816049E faceplayer setvar 0x8004, 0 special sub_81358A4 - compare_var_to_imm RESULT, 6 + compare RESULT, 6 goto_if_eq BattleTower_Lobby_EventScript_160342 special SavePlayerParty msgbox BattleTower_Lobby_Text_199F2C, 4 @@ -209,7 +209,7 @@ BattleTower_Lobby_EventScript_1604FA:: @ 81604FA case 2, BattleTower_Lobby_EventScript_160652 case 127, BattleTower_Lobby_EventScript_160652 special CheckPartyBattleTowerBanlist - compare_var_to_imm 0x8004, 1 + compare 0x8004, 1 goto_if_eq BattleTower_Lobby_EventScript_16060D setvar 0x8004, 1 copyvar 0x8005, RESULT @@ -219,7 +219,7 @@ BattleTower_Lobby_EventScript_1604FA:: @ 81604FA fadescreen 1 special ChooseBattleTowerPlayerParty waitstate - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_16064F msgbox BattleTower_Lobby_Text_199FDA, 5 switch RESULT @@ -245,7 +245,7 @@ BattleTower_Lobby_EventScript_160587:: @ 8160587 call S_DoSaveDialog setvar 0x4000, 5 hidebox 0, 0, 15, 10 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_160642 inccounter GAME_STAT_ENTERED_BATTLE_TOWER special SavePlayerParty @@ -347,9 +347,9 @@ BattleTower_Lobby_EventScript_1606CC:: @ 81606CC call BattleTower_Lobby_EventScript_1A00F3 lock faceplayer - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_160701 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq BattleTower_Lobby_EventScript_16070B end @@ -394,7 +394,7 @@ BattleTower_Lobby_EventScript_160733:: @ 8160733 msgbox BattleTower_Lobby_Text_19A9EE, 4 setvar 0x8008, 42 givedecoration 42 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_1607AF setflag 237 msgbox BattleTower_Lobby_Text_19ABAA, 4 @@ -403,12 +403,12 @@ BattleTower_Lobby_EventScript_160733:: @ 8160733 BattleTower_Lobby_EventScript_160773:: @ 8160773 specialvar RESULT, sub_810F404 - compare_var_to_imm RESULT, 100 + compare RESULT, 100 goto_if 0, BattleTower_Lobby_EventScript_1607C5 msgbox BattleTower_Lobby_Text_19AAC4, 4 setvar 0x8008, 43 givedecoration 43 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_1607AF setflag 238 msgbox BattleTower_Lobby_Text_19ABAA, 4 diff --git a/data/scripts/maps/BattleTower_Outside.inc b/data/scripts/maps/BattleTower_Outside.inc index 2f88db2db..f577f39fa 100644 --- a/data/scripts/maps/BattleTower_Outside.inc +++ b/data/scripts/maps/BattleTower_Outside.inc @@ -13,7 +13,7 @@ BattleTower_Outside_EventScript_160168:: @ 8160168 faceplayer msgbox BattleTower_Outside_Text_199D06, 4 checkitem ITEM_SS_TICKET, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq BattleTower_Outside_EventScript_1601C6 message BattleTower_Outside_Text_199D9D waittext @@ -36,7 +36,7 @@ BattleTower_Outside_EventScript_1601C6:: @ 81601C6 BattleTower_Outside_EventScript_1601D0:: @ 81601D0 msgbox BattleTower_Outside_Text_199DF2, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq BattleTower_Outside_EventScript_160226 msgbox BattleTower_Outside_Text_199E4B, 4 call BattleTower_Outside_EventScript_160232 @@ -47,7 +47,7 @@ BattleTower_Outside_EventScript_1601D0:: @ 81601D0 BattleTower_Outside_EventScript_1601FB:: @ 81601FB msgbox BattleTower_Outside_Text_199E0E, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq BattleTower_Outside_EventScript_160226 msgbox BattleTower_Outside_Text_199E4B, 4 call BattleTower_Outside_EventScript_160232 diff --git a/data/scripts/maps/CaveOfOrigin_B4F.inc b/data/scripts/maps/CaveOfOrigin_B4F.inc index 4d27844a7..dcd97f069 100644 --- a/data/scripts/maps/CaveOfOrigin_B4F.inc +++ b/data/scripts/maps/CaveOfOrigin_B4F.inc @@ -66,7 +66,7 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 waitstate clearflag 2145 specialvar RESULT, sub_810E300 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, CaveOfOrigin_B4F_EventScript_15DE73 setflag 816 setflag 855 diff --git a/data/scripts/maps/DewfordTown.inc b/data/scripts/maps/DewfordTown.inc index f8265d1cf..09835c0b9 100644 --- a/data/scripts/maps/DewfordTown.inc +++ b/data/scripts/maps/DewfordTown.inc @@ -43,7 +43,7 @@ DewfordTown_EventScript_14E06B:: @ 814E06B DewfordTown_EventScript_14E076:: @ 814E076 msgbox DewfordTown_Text_16B3BC, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq DewfordTown_EventScript_14E093 msgbox DewfordTown_Text_16B471, 4 release @@ -77,9 +77,9 @@ DewfordTown_EventScript_14E0C6:: @ 814E0C6 checkflag 257 goto_if_eq DewfordTown_EventScript_14E11B msgbox DewfordTown_Text_16B665, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq DewfordTown_EventScript_14E0F0 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq DewfordTown_EventScript_14E111 end @@ -100,9 +100,9 @@ DewfordTown_EventScript_14E11B:: @ 814E11B message DewfordTown_Text_16B84E waittext multichoice 20, 8, 50, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq DewfordTown_EventScript_14E13D - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq DewfordTown_EventScript_14E147 end @@ -599,9 +599,9 @@ DewfordTown_EventScript_14E413:: @ 814E413 faceplayer call DewfordTown_EventScript_1A0102 msgbox DewfordTown_Text_16B9CE, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq DewfordTown_EventScript_14E439 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq DewfordTown_EventScript_14E443 end @@ -616,15 +616,15 @@ DewfordTown_EventScript_14E443:: @ 814E443 call DewfordTown_EventScript_1A00F3 lock faceplayer - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq DewfordTown_EventScript_14E46E - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq DewfordTown_EventScript_14E485 end DewfordTown_EventScript_14E46E:: @ 814E46E inccounter GAME_STAT_STARTED_TRENDS - compare_var_to_imm 0x8004, 0 + compare 0x8004, 0 goto_if_eq DewfordTown_EventScript_14E48F msgbox DewfordTown_Text_16BB44, 4 release diff --git a/data/scripts/maps/DewfordTown_Gym.inc b/data/scripts/maps/DewfordTown_Gym.inc index 8f57e549a..034bca1bc 100644 --- a/data/scripts/maps/DewfordTown_Gym.inc +++ b/data/scripts/maps/DewfordTown_Gym.inc @@ -11,11 +11,11 @@ DewfordTown_Gym_EventScript_153071:: @ 8153071 goto_if_eq DewfordTown_Gym_EventScript_1530AA call DewfordTown_Gym_EventScript_153122 copyvar 0x8001, 0x8000 - compare_var_to_imm 0x8000, 0 + compare 0x8000, 0 goto_if_eq DewfordTown_Gym_EventScript_1530BA - compare_var_to_imm 0x8000, 1 + compare 0x8000, 1 goto_if_eq DewfordTown_Gym_EventScript_1530B6 - compare_var_to_imm 0x8000, 2 + compare 0x8000, 2 goto_if_eq DewfordTown_Gym_EventScript_1530B2 goto DewfordTown_Gym_EventScript_1530AE @@ -42,14 +42,14 @@ DewfordTown_Gym_EventScript_1530BA:: @ 81530BA DewfordTown_Gym_EventScript_1530BE:: @ 81530BE call DewfordTown_Gym_EventScript_153122 nop1 - compare_var_to_var 0x8000, 0x8001 + compare 0x8000, 0x8001 goto_if_eq DewfordTown_Gym_EventScript_1530F5 copyvar 0x8001, 0x8000 - compare_var_to_imm 0x8000, 1 + compare 0x8000, 1 goto_if_eq DewfordTown_Gym_EventScript_1530F6 - compare_var_to_imm 0x8000, 2 + compare 0x8000, 2 goto_if_eq DewfordTown_Gym_EventScript_153101 - compare_var_to_imm 0x8000, 3 + compare 0x8000, 3 goto_if_eq DewfordTown_Gym_EventScript_15310C DewfordTown_Gym_EventScript_1530F5:: @ 81530F5 @@ -115,7 +115,7 @@ DewfordTown_Gym_EventScript_153177:: @ 8153177 setflag 1204 setflag 2056 addvar 0x4085, 1 - compare_var_to_imm 0x4085, 6 + compare 0x4085, 6 call_if 1, DewfordTown_Gym_EventScript_1A00FB setvar 0x8008, 2 call DewfordTown_Gym_EventScript_1A01C0 @@ -124,7 +124,7 @@ DewfordTown_Gym_EventScript_153177:: @ 8153177 DewfordTown_Gym_EventScript_1531B5:: @ 81531B5 giveitem ITEM_TM08 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq DewfordTown_Gym_EventScript_1A029B msgbox DewfordTown_Gym_Text_1753BF, 4 setflag 166 diff --git a/data/scripts/maps/DewfordTown_Hall.inc b/data/scripts/maps/DewfordTown_Hall.inc index 0b19ef92d..78b5f5044 100644 --- a/data/scripts/maps/DewfordTown_Hall.inc +++ b/data/scripts/maps/DewfordTown_Hall.inc @@ -6,7 +6,7 @@ DewfordTown_Hall_EventScript_153293:: @ 8153293 faceplayer call DewfordTown_Hall_EventScript_1A0102 special sub_80FA5E4 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq DewfordTown_Hall_EventScript_1532B2 msgbox DewfordTown_Hall_Text_1754C9, 4 release @@ -31,9 +31,9 @@ DewfordTown_Hall_EventScript_1532CD:: @ 81532CD call DewfordTown_Hall_EventScript_1A0102 special sub_80EB83C msgbox DewfordTown_Hall_Text_1755F9, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq DewfordTown_Hall_EventScript_1532F6 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq DewfordTown_Hall_EventScript_153300 end @@ -191,14 +191,14 @@ DewfordTown_Hall_EventScript_1534FC:: @ 81534FC DewfordTown_Hall_EventScript_1534FD:: @ 81534FD applymovement 8, DewfordTown_Hall_Movement_153599 waitmovement 0 - compare_var_to_imm 0x8008, 0 + compare 0x8008, 0 goto_if_eq DewfordTown_Hall_EventScript_15351E - compare_var_to_imm 0x8008, 1 + compare 0x8008, 1 goto_if_eq DewfordTown_Hall_EventScript_153534 end DewfordTown_Hall_EventScript_15351E:: @ 815351E - compare_var_to_imm FACING, 4 + compare FACING, 4 goto_if_eq DewfordTown_Hall_EventScript_1534FC applymovement 255, DewfordTown_Hall_Movement_1A0843 waitmovement 0 @@ -210,16 +210,16 @@ DewfordTown_Hall_EventScript_153534:: @ 8153534 DewfordTown_Hall_EventScript_153535:: @ 8153535 applymovement 7, DewfordTown_Hall_Movement_15359B waitmovement 0 - compare_var_to_imm 0x8008, 0 + compare 0x8008, 0 goto_if_eq DewfordTown_Hall_EventScript_153556 - compare_var_to_imm 0x8008, 1 + compare 0x8008, 1 goto_if_eq DewfordTown_Hall_EventScript_153583 end DewfordTown_Hall_EventScript_153556:: @ 8153556 - compare_var_to_imm FACING, 2 + compare FACING, 2 call_if 1, DewfordTown_Hall_EventScript_15356D - compare_var_to_imm FACING, 1 + compare FACING, 1 call_if 1, DewfordTown_Hall_EventScript_153578 return @@ -234,7 +234,7 @@ DewfordTown_Hall_EventScript_153578:: @ 8153578 return DewfordTown_Hall_EventScript_153583:: @ 8153583 - compare_var_to_imm FACING, 3 + compare FACING, 3 goto_if_eq DewfordTown_Hall_EventScript_1534FC applymovement 255, DewfordTown_Hall_Movement_1A083F waitmovement 0 @@ -256,7 +256,7 @@ DewfordTown_Hall_EventScript_15359D:: @ 815359D goto_if_eq DewfordTown_Hall_EventScript_1535D1 msgbox DewfordTown_Hall_Text_175E13, 4 giveitem ITEM_TM36 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq DewfordTown_Hall_EventScript_1A029B setflag 230 release diff --git a/data/scripts/maps/DewfordTown_House2.inc b/data/scripts/maps/DewfordTown_House2.inc index b3b3eef34..befe47404 100644 --- a/data/scripts/maps/DewfordTown_House2.inc +++ b/data/scripts/maps/DewfordTown_House2.inc @@ -8,7 +8,7 @@ DewfordTown_House2_EventScript_1535DC:: @ 81535DC goto_if_eq DewfordTown_House2_EventScript_153615 msgbox DewfordTown_House2_Text_175EFE, 4 giveitem ITEM_SILK_SCARF - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq DewfordTown_House2_EventScript_15360B setflag 289 release diff --git a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc index 45df01e78..669da34f9 100644 --- a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc +++ b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc @@ -53,16 +53,16 @@ EverGrandeCity_ChampionsRoom_EventScript_15B821:: @ 815B821 closebutton playse 8 checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, EverGrandeCity_ChampionsRoom_EventScript_15B87C - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, EverGrandeCity_ChampionsRoom_EventScript_15B881 reappear 2 call EverGrandeCity_ChampionsRoom_EventScript_15B9BD checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq EverGrandeCity_ChampionsRoom_EventScript_15B886 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq EverGrandeCity_ChampionsRoom_EventScript_15B8BB end @@ -128,9 +128,9 @@ EverGrandeCity_ChampionsRoom_EventScript_15B8F0:: @ 815B8F0 waitmovement 0 msgbox EverGrandeCity_ChampionsRoom_Text_191546, 4 checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, EverGrandeCity_ChampionsRoom_EventScript_15B9AB - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, EverGrandeCity_ChampionsRoom_EventScript_15B9B4 closebutton applymovement 1, EverGrandeCity_ChampionsRoom_Movement_15B9FF diff --git a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc index a283c4c2a..ee171824f 100644 --- a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc +++ b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc @@ -26,7 +26,7 @@ EverGrandeCity_DrakesRoom_EventScript_15B736:: @ 815B736 EverGrandeCity_DrakesRoom_MapScript1_15B743:: @ 815B743 checkflag 1248 call_if 1, EverGrandeCity_DrakesRoom_EventScript_15B758 - compare_var_to_imm 0x409c, 4 + compare 0x409c, 4 call_if 1, EverGrandeCity_DrakesRoom_EventScript_15B75E end diff --git a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc b/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc index f00f82f2e..8ebf7939f 100644 --- a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc +++ b/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc @@ -26,7 +26,7 @@ EverGrandeCity_GlaciasRoom_EventScript_15B69C:: @ 815B69C EverGrandeCity_GlaciasRoom_MapScript1_15B6A9:: @ 815B6A9 checkflag 1247 call_if 1, EverGrandeCity_GlaciasRoom_EventScript_15B6BE - compare_var_to_imm 0x409c, 3 + compare 0x409c, 3 call_if 1, EverGrandeCity_GlaciasRoom_EventScript_15B6C4 end diff --git a/data/scripts/maps/EverGrandeCity_HallOfFame.inc b/data/scripts/maps/EverGrandeCity_HallOfFame.inc index 0bb327fd4..d0fb7922f 100644 --- a/data/scripts/maps/EverGrandeCity_HallOfFame.inc +++ b/data/scripts/maps/EverGrandeCity_HallOfFame.inc @@ -44,9 +44,9 @@ EverGrandeCity_HallOfFame_EventScript_15BBA8:: @ 815BBA8 setvar 0x4001, 1 call EverGrandeCity_HallOfFame_EventScript_19FC13 checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq EverGrandeCity_HallOfFame_EventScript_15BC41 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq EverGrandeCity_HallOfFame_EventScript_15BC4D end diff --git a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc b/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc index 2b5266ade..b8fe90a01 100644 --- a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc +++ b/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc @@ -26,7 +26,7 @@ EverGrandeCity_PhoebesRoom_EventScript_15B602:: @ 815B602 EverGrandeCity_PhoebesRoom_MapScript1_15B60F:: @ 815B60F checkflag 1246 call_if 1, EverGrandeCity_PhoebesRoom_EventScript_15B624 - compare_var_to_imm 0x409c, 2 + compare 0x409c, 2 call_if 1, EverGrandeCity_PhoebesRoom_EventScript_15B62A end diff --git a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc index 93f9c5fcb..f15f05904 100644 --- a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc +++ b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc @@ -50,9 +50,9 @@ EverGrandeCity_PokemonLeague_EventScript_15BAD2:: @ 815BAD2 checkflag 263 goto_if_eq EverGrandeCity_PokemonLeague_EventScript_15BB57 getplayerxy 0x4000, 0x4001 - compare_var_to_imm 0x4000, 11 + compare 0x4000, 11 call_if 4, EverGrandeCity_PokemonLeague_EventScript_15BB34 - compare_var_to_imm 0x4000, 8 + compare 0x4000, 8 call_if 3, EverGrandeCity_PokemonLeague_EventScript_15BB3F message EverGrandeCity_PokemonLeague_Text_1916FD waittext diff --git a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc b/data/scripts/maps/EverGrandeCity_SidneysRoom.inc index 564b2b806..3f472ca3f 100644 --- a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc +++ b/data/scripts/maps/EverGrandeCity_SidneysRoom.inc @@ -7,7 +7,7 @@ EverGrandeCity_SidneysRoom_MapScripts:: @ 815B53F EverGrandeCity_SidneysRoom_MapScript1_15B54F:: @ 815B54F checkflag 1245 call_if 1, EverGrandeCity_SidneysRoom_EventScript_15B564 - compare_var_to_imm 0x409c, 1 + compare 0x409c, 1 call_if 1, EverGrandeCity_SidneysRoom_EventScript_15B56A end diff --git a/data/scripts/maps/FallarborTown_House1.inc b/data/scripts/maps/FallarborTown_House1.inc index 1971593cb..0228fe25d 100644 --- a/data/scripts/maps/FallarborTown_House1.inc +++ b/data/scripts/maps/FallarborTown_House1.inc @@ -11,7 +11,7 @@ FallarborTown_House1_EventScript_153BB5:: @ 8153BB5 checkflag 229 goto_if_eq FallarborTown_House1_EventScript_153C54 checkitem ITEM_METEORITE, 1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq FallarborTown_House1_EventScript_153BDA msgbox FallarborTown_House1_Text_177755, 4 release @@ -22,11 +22,11 @@ FallarborTown_House1_EventScript_153BDA:: @ 8153BDA call_if 0, FallarborTown_House1_EventScript_153C2D checkflag 2 call_if 1, FallarborTown_House1_EventScript_153C3E - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq FallarborTown_House1_EventScript_153C47 msgbox FallarborTown_House1_Text_1778C4, 4 giveitem ITEM_TM27 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq FallarborTown_House1_EventScript_1A029B setvar 0x8004, 280 call FallarborTown_House1_EventScript_1A067F diff --git a/data/scripts/maps/FallarborTown_House2.inc b/data/scripts/maps/FallarborTown_House2.inc index f25f02da5..3b215a697 100644 --- a/data/scripts/maps/FallarborTown_House2.inc +++ b/data/scripts/maps/FallarborTown_House2.inc @@ -14,7 +14,7 @@ FallarborTown_House2_EventScript_153C91:: @ 8153C91 FallarborTown_House2_EventScript_153CB6:: @ 8153CB6 checkitem ITEM_HEART_SCALE, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq FallarborTown_House2_EventScript_153D60 msgbox FallarborTown_House2_Text_177BDB, 5 switch RESULT @@ -26,12 +26,12 @@ FallarborTown_House2_EventScript_153CE4:: @ 8153CE4 msgbox FallarborTown_House2_Text_177C3F, 4 special sub_80F9A4C waitstate - compare_var_to_imm 0x8004, 255 + compare 0x8004, 255 goto_if_eq FallarborTown_House2_EventScript_153D60 special sub_80FA148 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq FallarborTown_House2_EventScript_153D52 - compare_var_to_imm 0x8005, 0 + compare 0x8005, 0 goto_if_eq FallarborTown_House2_EventScript_153D44 goto FallarborTown_House2_EventScript_153D1A end @@ -40,7 +40,7 @@ FallarborTown_House2_EventScript_153D1A:: @ 8153D1A msgbox FallarborTown_House2_Text_177C5D, 4 special sub_8132670 waitstate - compare_var_to_imm 0x8004, 0 + compare 0x8004, 0 goto_if_eq FallarborTown_House2_EventScript_153CE4 msgbox FallarborTown_House2_Text_177CC3, 4 removeitem ITEM_HEART_SCALE, 1 diff --git a/data/scripts/maps/FortreeCity.inc b/data/scripts/maps/FortreeCity.inc index c63273d5b..e0bac8007 100644 --- a/data/scripts/maps/FortreeCity.inc +++ b/data/scripts/maps/FortreeCity.inc @@ -57,7 +57,7 @@ FortreeCity_EventScript_14C9B3:: @ 814C9B3 lock faceplayer checkitem ITEM_DEVON_SCOPE, 1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq FortreeCity_EventScript_14C9CF msgbox FortreeCity_Text_167868, 4 release @@ -65,7 +65,7 @@ FortreeCity_EventScript_14C9B3:: @ 814C9B3 FortreeCity_EventScript_14C9CF:: @ 814C9CF msgbox FortreeCity_Text_16788B, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq FortreeCity_EventScript_14C9E4 release end diff --git a/data/scripts/maps/FortreeCity_Gym.inc b/data/scripts/maps/FortreeCity_Gym.inc index d601aabab..8744141cb 100644 --- a/data/scripts/maps/FortreeCity_Gym.inc +++ b/data/scripts/maps/FortreeCity_Gym.inc @@ -37,7 +37,7 @@ FortreeCity_Gym_EventScript_157F15:: @ 8157F15 FortreeCity_Gym_EventScript_157F3E:: @ 8157F3E giveitem ITEM_TM40 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq FortreeCity_Gym_EventScript_1A029B msgbox FortreeCity_Gym_Text_185F4A, 4 setflag 170 diff --git a/data/scripts/maps/FortreeCity_House1.inc b/data/scripts/maps/FortreeCity_House1.inc index d21b82e51..3809e1f01 100644 --- a/data/scripts/maps/FortreeCity_House1.inc +++ b/data/scripts/maps/FortreeCity_House1.inc @@ -11,17 +11,17 @@ FortreeCity_House1_EventScript_157E13:: @ 8157E13 specialvar RESULT, sub_804D89C copyvar 0x8009, RESULT msgbox FortreeCity_House1_Text_18568C, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq FortreeCity_House1_EventScript_157E95 special sub_80F9A0C waitstate copyvar 0x800a, 0x8004 - compare_var_to_imm 0x8004, 255 + compare 0x8004, 255 goto_if_eq FortreeCity_House1_EventScript_157E95 copyvar 0x8005, 0x800a specialvar RESULT, sub_804DB2C copyvar 0x800b, RESULT - compare_var_to_var RESULT, 0x8009 + compare RESULT, 0x8009 goto_if 5, FortreeCity_House1_EventScript_157E9F copyvar 0x8004, 0x8008 copyvar 0x8005, 0x800a diff --git a/data/scripts/maps/FortreeCity_House2.inc b/data/scripts/maps/FortreeCity_House2.inc index ce1dd2344..f210dd3ac 100644 --- a/data/scripts/maps/FortreeCity_House2.inc +++ b/data/scripts/maps/FortreeCity_House2.inc @@ -22,7 +22,7 @@ FortreeCity_House2_EventScript_1580B4:: @ 81580B4 case 0, FortreeCity_House2_EventScript_158161 msgbox FortreeCity_House2_Text_1864C6, 4 giveitem ITEM_TM10 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq FortreeCity_House2_EventScript_1A029B setflag 264 msgbox FortreeCity_House2_Text_18652F, 4 diff --git a/data/scripts/maps/FortreeCity_House4.inc b/data/scripts/maps/FortreeCity_House4.inc index f13b29249..f7f8391d4 100644 --- a/data/scripts/maps/FortreeCity_House4.inc +++ b/data/scripts/maps/FortreeCity_House4.inc @@ -35,7 +35,7 @@ FortreeCity_House4_EventScript_1581D6:: @ 81581D6 waitmovement 0 msgbox FortreeCity_House4_Text_186881, 4 giveitem ITEM_MENTAL_HERB - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq FortreeCity_House4_EventScript_1A029B setflag 223 releaseall diff --git a/data/scripts/maps/GraniteCave_StevensRoom.inc b/data/scripts/maps/GraniteCave_StevensRoom.inc index ed6a1a784..06f234f28 100644 --- a/data/scripts/maps/GraniteCave_StevensRoom.inc +++ b/data/scripts/maps/GraniteCave_StevensRoom.inc @@ -10,17 +10,17 @@ GraniteCave_StevensRoom_EventScript_15CBFA:: @ 815CBFA setflag 189 msgbox GraniteCave_StevensRoom_Text_194BDD, 4 giveitem ITEM_TM47 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, GraniteCave_StevensRoom_EventScript_15CC83 msgbox GraniteCave_StevensRoom_Text_194C8D, 4 closebutton - compare_var_to_imm FACING, 2 + compare FACING, 2 call_if 1, GraniteCave_StevensRoom_EventScript_15CC6D - compare_var_to_imm FACING, 1 + compare FACING, 1 call_if 1, GraniteCave_StevensRoom_EventScript_15CC78 - compare_var_to_imm FACING, 3 + compare FACING, 3 call_if 1, GraniteCave_StevensRoom_EventScript_15CC6D - compare_var_to_imm FACING, 4 + compare FACING, 4 call_if 1, GraniteCave_StevensRoom_EventScript_15CC6D playse 9 disappear 1 diff --git a/data/scripts/maps/InsideOfTruck.inc b/data/scripts/maps/InsideOfTruck.inc index e5782b63e..7a13cbe78 100644 --- a/data/scripts/maps/InsideOfTruck.inc +++ b/data/scripts/maps/InsideOfTruck.inc @@ -17,9 +17,9 @@ InsideOfTruck_EventScript_15FC29:: @ 815FC29 lockall setflag 0x4000 checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq InsideOfTruck_EventScript_15FC45 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq InsideOfTruck_EventScript_15FC68 end diff --git a/data/scripts/maps/JaggedPass.inc b/data/scripts/maps/JaggedPass.inc index 98b367006..6f910d0ad 100644 --- a/data/scripts/maps/JaggedPass.inc +++ b/data/scripts/maps/JaggedPass.inc @@ -8,7 +8,7 @@ JaggedPass_MapScript1_15D271:: @ 815D271 end JaggedPass_MapScript1_15D274:: @ 815D274 - compare_var_to_imm 0x40bd, 1 + compare 0x40bd, 1 call_if 1, JaggedPass_EventScript_15D280 end @@ -25,7 +25,7 @@ JaggedPass_EventScript_15D285:: @ 815D285 JaggedPass_EventScript_15D29C:: @ 815D29C trainerbattle 0, OPPONENT_DIANA_1, 0, JaggedPass_Text_195E9E, JaggedPass_Text_195EDF specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq JaggedPass_EventScript_15D2C3 msgbox JaggedPass_Text_195F04, 6 end @@ -38,7 +38,7 @@ JaggedPass_EventScript_15D2C3:: @ 815D2C3 JaggedPass_EventScript_15D2DA:: @ 815D2DA trainerbattle 0, OPPONENT_ETHAN_1, 0, JaggedPass_Text_195FF2, JaggedPass_Text_196032 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq JaggedPass_EventScript_15D301 msgbox JaggedPass_Text_196077, 6 end diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc index d35fcaae5..d24280efa 100644 --- a/data/scripts/maps/LavaridgeTown.inc +++ b/data/scripts/maps/LavaridgeTown.inc @@ -9,7 +9,7 @@ LavaridgeTown_MapScript1_14E4AE:: @ 814E4AE call_if 1, LavaridgeTown_EventScript_14E4DF call LavaridgeTown_EventScript_1A014E call LavaridgeTown_EventScript_1A0172 - compare_var_to_imm 0x4053, 2 + compare 0x4053, 2 call_if 1, LavaridgeTown_EventScript_14E4D0 end @@ -44,16 +44,16 @@ LavaridgeTown_EventScript_14E4ED:: @ 814E4ED applymovement 8, LavaridgeTown_Movement_1A0835 waitmovement 0 checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LavaridgeTown_EventScript_14E56B - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, LavaridgeTown_EventScript_14E570 - compare_var_to_imm 0x8008, 1 + compare 0x8008, 1 call_if 1, LavaridgeTown_EventScript_14E68F checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LavaridgeTown_EventScript_14E5AB - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LavaridgeTown_EventScript_14E5D0 end @@ -70,14 +70,14 @@ LavaridgeTown_EventScript_14E575:: @ 814E575 faceplayer setvar 0x8008, 0 checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LavaridgeTown_EventScript_14E56B - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, LavaridgeTown_EventScript_14E570 checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LavaridgeTown_EventScript_14E5AB - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LavaridgeTown_EventScript_14E5D0 end @@ -99,22 +99,22 @@ LavaridgeTown_EventScript_14E5D0:: @ 814E5D0 LavaridgeTown_EventScript_14E5F5:: @ 814E5F5 closebutton - compare_var_to_imm 0x8008, 1 + compare 0x8008, 1 call_if 1, LavaridgeTown_EventScript_14E646 - compare_var_to_imm 0x8008, 0 + compare 0x8008, 0 call_if 1, LavaridgeTown_EventScript_14E64E disappear 8 reappear 7 delay 30 - compare_var_to_imm 0x8008, 1 + compare 0x8008, 1 call_if 1, LavaridgeTown_EventScript_14E69A - compare_var_to_imm 0x8008, 0 + compare 0x8008, 0 call_if 1, LavaridgeTown_EventScript_14E6A5 disappear 7 setvar 0x4053, 2 savebgm 0 fadedefaultbgm - compare_var_to_imm 0x8008, 0 + compare 0x8008, 0 goto_if_eq LavaridgeTown_EventScript_14E644 releaseall end @@ -128,13 +128,13 @@ LavaridgeTown_EventScript_14E646:: @ 814E646 return LavaridgeTown_EventScript_14E64E:: @ 814E64E - compare_var_to_imm FACING, 2 + compare FACING, 2 call_if 1, LavaridgeTown_EventScript_14E67B - compare_var_to_imm FACING, 1 + compare FACING, 1 call_if 1, LavaridgeTown_EventScript_14E680 - compare_var_to_imm FACING, 3 + compare FACING, 3 call_if 1, LavaridgeTown_EventScript_14E685 - compare_var_to_imm FACING, 4 + compare FACING, 4 call_if 1, LavaridgeTown_EventScript_14E68A return @@ -165,13 +165,13 @@ LavaridgeTown_EventScript_14E69A:: @ 814E69A return LavaridgeTown_EventScript_14E6A5:: @ 814E6A5 - compare_var_to_imm FACING, 2 + compare FACING, 2 call_if 1, LavaridgeTown_EventScript_14E6D2 - compare_var_to_imm FACING, 1 + compare FACING, 1 call_if 1, LavaridgeTown_EventScript_14E6D2 - compare_var_to_imm FACING, 3 + compare FACING, 3 call_if 1, LavaridgeTown_EventScript_14E6DD - compare_var_to_imm FACING, 4 + compare FACING, 4 call_if 1, LavaridgeTown_EventScript_14E6D2 return @@ -237,7 +237,7 @@ LavaridgeTown_Movement_14E70E:: @ 814E70E LavaridgeTown_EventScript_14E710:: @ 814E710 specialvar RESULT, player_get_direction_lower_nybble - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LavaridgeTown_EventScript_14E721 end @@ -275,10 +275,10 @@ LavaridgeTown_EventScript_14E75A:: @ 814E75A checkflag 266 goto_if_eq LavaridgeTown_EventScript_14E79E msgbox LavaridgeTown_Text_16C174, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LavaridgeTown_EventScript_14E7B2 countpokemon - compare_var_to_imm RESULT, 6 + compare RESULT, 6 goto_if_eq LavaridgeTown_EventScript_14E7A8 msgbox LavaridgeTown_Text_16C2B6, 4 setflag 266 diff --git a/data/scripts/maps/LavaridgeTown_Gym_1F.inc b/data/scripts/maps/LavaridgeTown_Gym_1F.inc index 68f93443a..e22d4471f 100644 --- a/data/scripts/maps/LavaridgeTown_Gym_1F.inc +++ b/data/scripts/maps/LavaridgeTown_Gym_1F.inc @@ -84,7 +84,7 @@ LavaridgeTown_Gym_1F_EventScript_153766:: @ 8153766 setflag 1213 setflag 2058 addvar 0x4085, 1 - compare_var_to_imm 0x4085, 6 + compare 0x4085, 6 call_if 1, LavaridgeTown_Gym_1F_EventScript_1A00FB setvar 0x8008, 4 call LavaridgeTown_Gym_1F_EventScript_1A01C0 @@ -95,7 +95,7 @@ LavaridgeTown_Gym_1F_EventScript_153766:: @ 8153766 LavaridgeTown_Gym_1F_EventScript_1537A7:: @ 81537A7 giveitem ITEM_TM50 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LavaridgeTown_Gym_1F_EventScript_1A029B msgbox LavaridgeTown_Gym_1F_Text_176B8F, 4 setflag 168 diff --git a/data/scripts/maps/LavaridgeTown_HerbShop.inc b/data/scripts/maps/LavaridgeTown_HerbShop.inc index bf148186a..c924684bc 100644 --- a/data/scripts/maps/LavaridgeTown_HerbShop.inc +++ b/data/scripts/maps/LavaridgeTown_HerbShop.inc @@ -32,7 +32,7 @@ LavaridgeTown_HerbShop_EventScript_153655:: @ 8153655 goto_if_eq LavaridgeTown_HerbShop_EventScript_153684 msgbox LavaridgeTown_HerbShop_Text_1761A2, 4 giveitem ITEM_CHARCOAL - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LavaridgeTown_HerbShop_EventScript_1A029B setflag 254 release diff --git a/data/scripts/maps/LilycoveCity.inc b/data/scripts/maps/LilycoveCity.inc index b8410429b..7031eb530 100644 --- a/data/scripts/maps/LilycoveCity.inc +++ b/data/scripts/maps/LilycoveCity.inc @@ -70,7 +70,7 @@ LilycoveCity_EventScript_14CB74:: @ 814CB74 random 10 addvar RESULT, 133 giveitem RESULT - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LilycoveCity_EventScript_1A029B setflag 2255 msgbox LilycoveCity_Text_1C5B1D, 4 @@ -248,9 +248,9 @@ LilycoveCity_EventScript_14CD46:: @ 814CD46 lock faceplayer checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LilycoveCity_EventScript_14CD60 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LilycoveCity_EventScript_14CDD3 end @@ -260,7 +260,7 @@ LilycoveCity_EventScript_14CD60:: @ 814CD60 call_if 1, LilycoveCity_EventScript_14CDB0 checkflag 286 call_if 0, LilycoveCity_EventScript_14CDB9 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LilycoveCity_EventScript_14CDC2 msgbox LilycoveCity_Text_167B94, 4 switch 0x4023 @@ -291,7 +291,7 @@ LilycoveCity_EventScript_14CDD3:: @ 814CDD3 call_if 1, LilycoveCity_EventScript_14CE23 checkflag 286 call_if 0, LilycoveCity_EventScript_14CE2C - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LilycoveCity_EventScript_14CE35 msgbox LilycoveCity_Text_1680A9, 4 switch 0x4023 @@ -351,9 +351,9 @@ LilycoveCity_EventScript_14CEA6:: @ 814CEA6 setvar RESULT, 0 checkflag 2060 call_if 1, LilycoveCity_EventScript_14CEDE - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LilycoveCity_EventScript_14CEEE - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, LilycoveCity_EventScript_14CEF7 clearflag 722 clearflag 849 @@ -388,9 +388,9 @@ LilycoveCity_EventScript_14CF12:: @ 814CF12 setvar RESULT, 0 checkflag 2060 call_if 1, LilycoveCity_EventScript_14CEDE - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LilycoveCity_EventScript_14CF47 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, LilycoveCity_EventScript_14CF50 clearflag 760 goto LilycoveCity_EventScript_14CF6B diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index d775fd440..1020e9d2b 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -31,9 +31,9 @@ LilycoveCity_ContestLobby_EventScript_158898:: @ 8158898 showcontestwinner 0 lockall msgbox LilycoveCity_ContestLobby_Text_1889FD, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LilycoveCity_ContestLobby_EventScript_1588DE - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LilycoveCity_ContestLobby_EventScript_158918 releaseall end @@ -44,7 +44,7 @@ LilycoveCity_ContestLobby_EventScript_1588DE:: @ 81588DE special sub_80C4CEC setvar 0x4099, 0 specialvar RESULT, GiveMonArtistRibbon - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, LilycoveCity_ContestLobby_EventScript_158948 applymovement 4, LilycoveCity_ContestLobby_Movement_158A43 waitmovement 0 @@ -56,7 +56,7 @@ LilycoveCity_ContestLobby_EventScript_1588DE:: @ 81588DE LilycoveCity_ContestLobby_EventScript_158918:: @ 8158918 msgbox LilycoveCity_ContestLobby_Text_188C41, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LilycoveCity_ContestLobby_EventScript_1588DE msgbox LilycoveCity_ContestLobby_Text_188CBD, 4 closebutton @@ -205,9 +205,9 @@ LilycoveCity_ContestLobby_EventScript_158A6A:: @ 8158A6A fadescreen 1 showcontestwinner 0 msgbox LilycoveCity_ContestLobby_Text_1889FD, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LilycoveCity_ContestLobby_EventScript_158AAE - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LilycoveCity_ContestLobby_EventScript_158AE8 end @@ -217,7 +217,7 @@ LilycoveCity_ContestLobby_EventScript_158AAE:: @ 8158AAE special sub_80C4CEC setvar 0x4099, 0 specialvar RESULT, GiveMonArtistRibbon - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, LilycoveCity_ContestLobby_EventScript_158B18 applymovement 11, LilycoveCity_ContestLobby_Movement_158B6D waitmovement 0 @@ -229,7 +229,7 @@ LilycoveCity_ContestLobby_EventScript_158AAE:: @ 8158AAE LilycoveCity_ContestLobby_EventScript_158AE8:: @ 8158AE8 msgbox LilycoveCity_ContestLobby_Text_188C41, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LilycoveCity_ContestLobby_EventScript_158AAE msgbox LilycoveCity_ContestLobby_Text_188CBD, 4 closebutton @@ -305,7 +305,7 @@ LilycoveCity_ContestLobby_Movement_158B7C:: @ 8158B7C LilycoveCity_ContestLobby_EventScript_158B85:: @ 8158B85 lockall checkitem ITEM_CONTEST_PASS, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LilycoveCity_ContestLobby_EventScript_158BBA checkflag 2 goto_if_eq LilycoveCity_ContestLobby_EventScript_158BAE @@ -328,11 +328,11 @@ LilycoveCity_ContestLobby_EventScript_158BBA:: @ 8158BBA LilycoveCity_ContestLobby_EventScript_158BC4:: @ 8158BC4 msgbox LilycoveCity_ContestLobby_Text_188521, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LilycoveCity_ContestLobby_EventScript_158C35 call S_DoSaveDialog hidebox 0, 0, 15, 9 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LilycoveCity_ContestLobby_EventScript_158C35 setflag 3 return @@ -361,18 +361,18 @@ LilycoveCity_ContestLobby_EventScript_158C42:: @ 8158C42 msgbox LilycoveCity_ContestLobby_Text_188703, 4 setvar CONTEST_RANK, 0 choosecontestpkmn - compare_var_to_imm 0x8004, 255 + compare 0x8004, 255 goto_if_eq LilycoveCity_ContestLobby_EventScript_158CEA special sub_80C43F4 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LilycoveCity_ContestLobby_EventScript_158C96 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LilycoveCity_ContestLobby_EventScript_158CC0 - compare_var_to_imm RESULT, 2 + compare RESULT, 2 goto_if_eq LilycoveCity_ContestLobby_EventScript_158CC0 - compare_var_to_imm RESULT, 3 + compare RESULT, 3 goto_if_eq LilycoveCity_ContestLobby_EventScript_158CA4 - compare_var_to_imm RESULT, 4 + compare RESULT, 4 goto_if_eq LilycoveCity_ContestLobby_EventScript_158CB2 end @@ -420,11 +420,11 @@ LilycoveCity_ContestLobby_EventScript_158D24:: @ 8158D24 copyvar 0x8004, RESULT special sub_808363C waitstate - compare_var_to_imm RESULT, 3 + compare RESULT, 3 goto_if_eq LilycoveCity_ContestLobby_EventScript_158D90 - compare_var_to_imm RESULT, 5 + compare RESULT, 5 goto_if_eq LilycoveCity_ContestLobby_EventScript_158DA1 - compare_var_to_imm RESULT, 6 + compare RESULT, 6 goto_if_eq LilycoveCity_ContestLobby_EventScript_158DB2 message2 LilycoveCity_ContestLobby_Text_18872A waittext @@ -569,7 +569,7 @@ LilycoveCity_ContestLobby_Movement_158EAE:: @ 8158EAE LilycoveCity_ContestLobby_EventScript_158EB0:: @ 8158EB0 specialvar RESULT, sub_80C5044 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LilycoveCity_ContestLobby_EventScript_158EE8 setvar 0x800b, 8 setvar CONTEST_RANK, 3 diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc index 98aec1d7a..0a51aff26 100644 --- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc +++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc @@ -9,7 +9,7 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_1583A1:: @ 81583A1 checkflag 2 call_if 1, LilycoveCity_CoveLilyMotel_2F_EventScript_1583DD specialvar RESULT, sub_8090FC0 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LilycoveCity_CoveLilyMotel_2F_EventScript_1583D0 release end diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc index fdf1c76e3..43f110577 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc @@ -22,7 +22,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A39C:: @ 815A39C LilycoveCity_DepartmentStoreElevator_EventScript_15A402:: @ 815A402 setdynamicwarp LilycoveCity_DepartmentStore_1F, 255, 2, 1 - compare_var_to_imm 0x4043, 0 + compare 0x4043, 0 goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 setvar 0x4043, 0 @@ -31,7 +31,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A402:: @ 815A402 LilycoveCity_DepartmentStoreElevator_EventScript_15A425:: @ 815A425 setdynamicwarp LilycoveCity_DepartmentStore_2F, 255, 2, 1 - compare_var_to_imm 0x4043, 1 + compare 0x4043, 1 goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 setvar 0x4043, 1 @@ -40,7 +40,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A425:: @ 815A425 LilycoveCity_DepartmentStoreElevator_EventScript_15A448:: @ 815A448 setdynamicwarp LilycoveCity_DepartmentStore_3F, 255, 2, 1 - compare_var_to_imm 0x4043, 2 + compare 0x4043, 2 goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 setvar 0x4043, 2 @@ -49,7 +49,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A448:: @ 815A448 LilycoveCity_DepartmentStoreElevator_EventScript_15A46B:: @ 815A46B setdynamicwarp LilycoveCity_DepartmentStore_4F, 255, 2, 1 - compare_var_to_imm 0x4043, 3 + compare 0x4043, 3 goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 setvar 0x4043, 3 @@ -58,7 +58,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A46B:: @ 815A46B LilycoveCity_DepartmentStoreElevator_EventScript_15A48E:: @ 815A48E setdynamicwarp LilycoveCity_DepartmentStore_5F, 255, 2, 1 - compare_var_to_imm 0x4043, 4 + compare 0x4043, 4 goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 setvar 0x4043, 4 diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc index 3295bf6ee..b01d74129 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc @@ -4,9 +4,9 @@ LilycoveCity_DepartmentStoreRooftop_MapScripts:: @ 815A13F LilycoveCity_DepartmentStoreRooftop_MapScript1_15A145:: @ 815A145 event_96 3 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A15F - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A163 end @@ -52,7 +52,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A1A0:: @ 815A1A0 lock faceplayer event_96 3 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A1BA msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C61F, 4 release @@ -127,22 +127,22 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A260:: @ 815A260 return LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 - compare_var_to_imm 0x4001, 0 + compare 0x4001, 0 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A23D - compare_var_to_imm 0x4001, 1 + compare 0x4001, 1 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A244 - compare_var_to_imm 0x4001, 2 + compare 0x4001, 2 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A24B - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A37A checkitemspace 0x4000, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388 - compare_var_to_imm 0x4001, 0 + compare 0x4001, 0 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A252 - compare_var_to_imm 0x4001, 1 + compare 0x4001, 1 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A259 - compare_var_to_imm 0x4001, 2 + compare 0x4001, 2 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A260 updatemoney 0, 0 nop @@ -154,10 +154,10 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 bufferstd 2, 14 msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C8C, 4 random 64 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if 5, LilycoveCity_DepartmentStoreRooftop_EventScript_15A36E checkitemspace 0x4000, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388 playse 106 msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C780, 4 @@ -166,10 +166,10 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 bufferstd 2, 14 msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C8C, 4 random 64 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if 5, LilycoveCity_DepartmentStoreRooftop_EventScript_15A36E checkitemspace 0x4000, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388 playse 106 msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C780, 4 diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc index 4ee36a21d..311dac1ab 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc @@ -9,12 +9,12 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E lock faceplayer dodailyevents - compare_var_to_imm 0x4045, 0 + compare 0x4045, 0 goto_if 5, LilycoveCity_DepartmentStore_1F_EventScript_159EB1 checkflag 2250 goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E4C msgbox LilycoveCity_DepartmentStore_1F_Text_1C4B5E, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E56 setflag 2250 message LilycoveCity_DepartmentStore_1F_Text_1C4CC6 @@ -33,24 +33,24 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E delay 10 applymovement 2, LilycoveCity_DepartmentStore_1F_Movement_1A0839 waitmovement 0 - compare_var_to_imm 0x8004, 0 + compare 0x8004, 0 goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E60 inccounter GAME_STAT_WON_POKEMON_LOTTERY - compare_var_to_imm 0x8006, 0 + compare 0x8006, 0 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E3A - compare_var_to_imm 0x8006, 1 + compare 0x8006, 1 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E43 bufferitem 0, 0x8005 - compare_var_to_imm 0x8004, 1 + compare 0x8004, 1 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E78 - compare_var_to_imm 0x8004, 2 + compare 0x8004, 2 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E81 - compare_var_to_imm 0x8004, 3 + compare 0x8004, 3 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E8A - compare_var_to_imm 0x8004, 4 + compare 0x8004, 4 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E93 giveitem 0x8005 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E9C goto LilycoveCity_DepartmentStore_1F_EventScript_159E6E end @@ -112,7 +112,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_159EA7:: @ 8159EA7 LilycoveCity_DepartmentStore_1F_EventScript_159EB1:: @ 8159EB1 msgbox LilycoveCity_DepartmentStore_1F_Text_1C4FCC, 4 giveitem 0x4045 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159EA7 setvar 0x4045, 0 release diff --git a/data/scripts/maps/LilycoveCity_Harbor.inc b/data/scripts/maps/LilycoveCity_Harbor.inc index 8998d6268..94b2d53a9 100644 --- a/data/scripts/maps/LilycoveCity_Harbor.inc +++ b/data/scripts/maps/LilycoveCity_Harbor.inc @@ -10,7 +10,7 @@ LilycoveCity_Harbor_EventScript_1598A2:: @ 81598A2 lock faceplayer checkitem ITEM_EON_TICKET, 1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LilycoveCity_Harbor_EventScript_1599EE goto LilycoveCity_Harbor_EventScript_1598BA end @@ -25,7 +25,7 @@ LilycoveCity_Harbor_EventScript_1598BA:: @ 81598BA LilycoveCity_Harbor_EventScript_1598CD:: @ 81598CD msgbox LilycoveCity_Harbor_Text_18B36F, 4 checkitem ITEM_SS_TICKET, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LilycoveCity_Harbor_EventScript_159929 message LilycoveCity_Harbor_Text_18B406 waittext @@ -48,7 +48,7 @@ LilycoveCity_Harbor_EventScript_159929:: @ 8159929 LilycoveCity_Harbor_EventScript_159933:: @ 8159933 msgbox LilycoveCity_Harbor_Text_18B47D, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LilycoveCity_Harbor_EventScript_15997E setvar 0x40b4, 5 call LilycoveCity_Harbor_EventScript_15998A @@ -59,7 +59,7 @@ LilycoveCity_Harbor_EventScript_159933:: @ 8159933 LilycoveCity_Harbor_EventScript_15995B:: @ 815995B msgbox LilycoveCity_Harbor_Text_18B499, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LilycoveCity_Harbor_EventScript_15997E call LilycoveCity_Harbor_EventScript_15998A warp BattleTower_Outside, 255, 19, 23 @@ -80,9 +80,9 @@ LilycoveCity_Harbor_EventScript_15998A:: @ 815998A waitmovement 0 delay 30 spriteinvisible LAST_TALKED, 13, 10 - compare_var_to_imm FACING, 2 + compare FACING, 2 call_if 1, LilycoveCity_Harbor_EventScript_1599D9 - compare_var_to_imm FACING, 4 + compare FACING, 4 call_if 1, LilycoveCity_Harbor_EventScript_1599CE delay 30 spriteinvisible 255, 0, 0 @@ -129,9 +129,9 @@ LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE waitmovement 0 delay 30 disappear 4 - compare_var_to_imm FACING, 2 + compare FACING, 2 call_if 1, LilycoveCity_Harbor_EventScript_1599D9 - compare_var_to_imm FACING, 4 + compare FACING, 4 call_if 1, LilycoveCity_Harbor_EventScript_1599CE delay 30 spriteinvisible 255, 0, 0 diff --git a/data/scripts/maps/LilycoveCity_House2.inc b/data/scripts/maps/LilycoveCity_House2.inc index cbf015eb3..d3399f5ac 100644 --- a/data/scripts/maps/LilycoveCity_House2.inc +++ b/data/scripts/maps/LilycoveCity_House2.inc @@ -8,7 +8,7 @@ LilycoveCity_House2_EventScript_159BA3:: @ 8159BA3 goto_if_eq LilycoveCity_House2_EventScript_159BDA msgbox LilycoveCity_House2_Text_18B83C, 4 giveitem ITEM_TM44 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LilycoveCity_House2_EventScript_1A029B setflag 234 msgbox LilycoveCity_House2_Text_18B883, 4 diff --git a/data/scripts/maps/LilycoveCity_House3.inc b/data/scripts/maps/LilycoveCity_House3.inc index 452c0567f..fa5a30862 100644 --- a/data/scripts/maps/LilycoveCity_House3.inc +++ b/data/scripts/maps/LilycoveCity_House3.inc @@ -11,7 +11,7 @@ LilycoveCity_House3_EventScript_159BF3:: @ 8159BF3 lock faceplayer msgbox LilycoveCity_House3_Text_18B8CC, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LilycoveCity_House3_EventScript_159C1D msgbox LilycoveCity_House3_Text_18BA2B, 4 closebutton diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc index 7611b0ef5..db55695e6 100644 --- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc +++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc @@ -11,9 +11,9 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_158425:: @ 8158425 message LilycoveCity_LilycoveMuseum_1F_Text_1873B9 waittext multichoice 20, 8, 16, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_158458 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_15844F end @@ -23,9 +23,9 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_15844F:: @ 815844F LilycoveCity_LilycoveMuseum_1F_EventScript_158458:: @ 8158458 msgbox LilycoveCity_LilycoveMuseum_1F_Text_187495, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_158477 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_158481 end diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc index 6fb0f07b1..f63068d74 100644 --- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc +++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc @@ -125,7 +125,7 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_15875C:: @ 815875C applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_1A0839 msgbox LilycoveCity_LilycoveMuseum_2F_Text_188120, 4 givedecoration 44 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158783 setflag 236 closebutton diff --git a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc index 978eb6569..02558e9d3 100644 --- a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc +++ b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc @@ -16,19 +16,19 @@ LilycoveCity_MoveDeletersHouse_EventScript_159ADE:: @ 8159ADE msgbox LilycoveCity_MoveDeletersHouse_Text_18B68C, 4 special sub_80F9A0C waitstate - compare_var_to_imm 0x8004, 255 + compare 0x8004, 255 goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159B7B special sub_80FA148 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159B71 special ScrSpecial_CountPokemonMoves - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159B64 msgbox LilycoveCity_MoveDeletersHouse_Text_18B6B0, 4 fadescreen 1 special sub_80F9EEC fadescreen 0 - compare_var_to_imm 0x8005, 4 + compare 0x8005, 4 goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159ADE special ScrSpecial_GetPokemonNicknameAndMoveName msgbox LilycoveCity_MoveDeletersHouse_Text_18B6F2, 5 diff --git a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc index eb1882043..4d6401502 100644 --- a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc +++ b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc @@ -61,9 +61,9 @@ LilycoveCity_PokemonTrainerFanClub_Movement_15940C:: @ 815940C step_end LilycoveCity_PokemonTrainerFanClub_MapScript1_159412:: @ 8159412 - compare_var_to_imm 0x4095, 1 + compare 0x4095, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159515 - compare_var_to_imm 0x4095, 2 + compare 0x4095, 2 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159429 end @@ -71,35 +71,35 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159429:: @ 8159429 special sub_810FCE8 setvar 0x8004, 8 specialvar RESULT, sub_810FD60 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594D5 setvar 0x8004, 9 specialvar RESULT, sub_810FD60 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594DD setvar 0x8004, 10 specialvar RESULT, sub_810FD60 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594E5 setvar 0x8004, 11 specialvar RESULT, sub_810FD60 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594ED setvar 0x8004, 12 specialvar RESULT, sub_810FD60 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594F5 setvar 0x8004, 13 specialvar RESULT, sub_810FD60 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594FD setvar 0x8004, 14 specialvar RESULT, sub_810FD60 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_159505 setvar 0x8004, 15 specialvar RESULT, sub_810FD60 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_15950D end @@ -148,13 +148,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15952F:: @ 815952F faceplayer setvar 0x8004, 13 special sub_810FDAC - compare_var_to_imm 0x4095, 0 + compare 0x4095, 0 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15959C specialvar RESULT, sub_810FD60 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15956E specialvar RESULT, sub_810FCB0 - compare_var_to_imm RESULT, 7 + compare RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159592 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A400, 4 release @@ -162,7 +162,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15952F:: @ 815952F LilycoveCity_PokemonTrainerFanClub_EventScript_15956E:: @ 815956E specialvar RESULT, sub_810FCB0 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159588 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A36A, 4 release @@ -188,13 +188,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_1595A6:: @ 81595A6 faceplayer setvar 0x8004, 8 special sub_810FDAC - compare_var_to_imm 0x4095, 0 + compare 0x4095, 0 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159613 specialvar RESULT, sub_810FD60 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1595E5 specialvar RESULT, sub_810FCB0 - compare_var_to_imm RESULT, 7 + compare RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159609 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A629, 4 release @@ -202,7 +202,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_1595A6:: @ 81595A6 LilycoveCity_PokemonTrainerFanClub_EventScript_1595E5:: @ 81595E5 specialvar RESULT, sub_810FCB0 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1595FF msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A584, 4 release @@ -228,13 +228,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15961D:: @ 815961D faceplayer setvar 0x8004, 9 special sub_810FDAC - compare_var_to_imm 0x4095, 0 + compare 0x4095, 0 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15968A specialvar RESULT, sub_810FD60 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15965C specialvar RESULT, sub_810FCB0 - compare_var_to_imm RESULT, 7 + compare RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159680 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A814, 4 release @@ -242,7 +242,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15961D:: @ 815961D LilycoveCity_PokemonTrainerFanClub_EventScript_15965C:: @ 815965C specialvar RESULT, sub_810FCB0 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159676 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A71E, 4 release @@ -268,13 +268,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159694:: @ 8159694 faceplayer setvar 0x8004, 10 special sub_810FDAC - compare_var_to_imm 0x4095, 0 + compare 0x4095, 0 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159701 specialvar RESULT, sub_810FD60 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1596D3 specialvar RESULT, sub_810FCB0 - compare_var_to_imm RESULT, 7 + compare RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1596F7 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AB0A, 4 release @@ -282,7 +282,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159694:: @ 8159694 LilycoveCity_PokemonTrainerFanClub_EventScript_1596D3:: @ 81596D3 specialvar RESULT, sub_810FCB0 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1596ED msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AA39, 4 release @@ -309,10 +309,10 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15970B:: @ 815970B setvar 0x8004, 11 special sub_810FDAC specialvar RESULT, sub_810FD60 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15973F specialvar RESULT, sub_810FCB0 - compare_var_to_imm RESULT, 7 + compare RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159763 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18ACC7, 4 release @@ -320,7 +320,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15970B:: @ 815970B LilycoveCity_PokemonTrainerFanClub_EventScript_15973F:: @ 815973F specialvar RESULT, sub_810FCB0 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159759 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AC15, 4 release @@ -342,10 +342,10 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15976D:: @ 815976D setvar 0x8004, 12 special sub_810FDAC specialvar RESULT, sub_810FD60 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1597A1 specialvar RESULT, sub_810FCB0 - compare_var_to_imm RESULT, 7 + compare RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1597C5 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AE63, 4 release @@ -353,7 +353,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15976D:: @ 815976D LilycoveCity_PokemonTrainerFanClub_EventScript_1597A1:: @ 81597A1 specialvar RESULT, sub_810FCB0 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1597BB msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AD6D, 4 release @@ -375,10 +375,10 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_1597CF:: @ 81597CF setvar 0x8004, 14 special sub_810FDAC specialvar RESULT, sub_810FD60 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159803 specialvar RESULT, sub_810FCB0 - compare_var_to_imm RESULT, 7 + compare RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159827 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18B030, 4 release @@ -386,7 +386,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_1597CF:: @ 81597CF LilycoveCity_PokemonTrainerFanClub_EventScript_159803:: @ 8159803 specialvar RESULT, sub_810FCB0 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15981D msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AF62, 4 release @@ -408,10 +408,10 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159831:: @ 8159831 setvar 0x8004, 15 special sub_810FDAC specialvar RESULT, sub_810FD60 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159865 specialvar RESULT, sub_810FCB0 - compare_var_to_imm RESULT, 7 + compare RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159889 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18B1FD, 4 release @@ -419,7 +419,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159831:: @ 8159831 LilycoveCity_PokemonTrainerFanClub_EventScript_159865:: @ 8159865 specialvar RESULT, sub_810FCB0 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15987F msgbox LilycoveCity_PokemonTrainerFanClub_Text_18B16E, 4 release diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc index e3f9b1dc7..0f1dc96d9 100644 --- a/data/scripts/maps/LittlerootTown.inc +++ b/data/scripts/maps/LittlerootTown.inc @@ -5,19 +5,19 @@ LittlerootTown_MapScripts:: @ 814D509 LittlerootTown_MapScript1_14D514:: @ 814D514 setflag 2063 - compare_var_to_imm 0x4092, 2 + compare 0x4092, 2 call_if 1, LittlerootTown_EventScript_14D57B checkflag 82 call_if 0, LittlerootTown_EventScript_14D583 - compare_var_to_imm 0x4050, 3 + compare 0x4050, 3 call_if 1, LittlerootTown_EventScript_14D5A6 - compare_var_to_imm 0x4082, 4 + compare 0x4082, 4 call_if 1, LittlerootTown_EventScript_14D570 - compare_var_to_imm 0x408c, 4 + compare 0x408c, 4 call_if 1, LittlerootTown_EventScript_14D570 - compare_var_to_imm 0x40c7, 1 + compare 0x40c7, 1 call_if 1, LittlerootTown_EventScript_14D567 - compare_var_to_imm 0x408d, 3 + compare 0x408d, 3 call_if 1, LittlerootTown_EventScript_14D563 end @@ -40,7 +40,7 @@ LittlerootTown_EventScript_14D57B:: @ 814D57B return LittlerootTown_EventScript_14D583:: @ 814D583 - compare_var_to_imm 0x4050, 0 + compare 0x4050, 0 goto_if_eq LittlerootTown_EventScript_14D59A movespriteperm 1, 10, 1 spritebehave 1, 7 @@ -55,9 +55,9 @@ LittlerootTown_EventScript_14D5A6:: @ 814D5A6 clearflag 752 spritebehave 4, 8 checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LittlerootTown_EventScript_14D5C5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, LittlerootTown_EventScript_14D5CD return @@ -191,7 +191,7 @@ LittlerootTown_EventScript_14D6DF:: @ 814D6DF goto_if_eq LittlerootTown_EventScript_14D72F checkflag 82 goto_if_eq LittlerootTown_EventScript_14D722 - compare_var_to_imm 0x4050, 0 + compare 0x4050, 0 goto_if 5, LittlerootTown_EventScript_14D708 msgbox LittlerootTown_Text_16ACEB, 4 release @@ -334,9 +334,9 @@ LittlerootTown_EventScript_14D7FF:: @ 814D7FF LittlerootTown_EventScript_14D808:: @ 814D808 lockall checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LittlerootTown_EventScript_14D822 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, LittlerootTown_EventScript_14D82B releaseall end @@ -352,9 +352,9 @@ LittlerootTown_EventScript_14D82B:: @ 814D82B LittlerootTown_EventScript_14D834:: @ 814D834 lockall checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LittlerootTown_EventScript_14D84E - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, LittlerootTown_EventScript_14D857 releaseall end @@ -407,27 +407,27 @@ LittlerootTown_EventScript_14D8AA:: @ 814D8AA LittlerootTown_EventScript_14D8B6:: @ 814D8B6 checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LittlerootTown_EventScript_14D93C - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, LittlerootTown_EventScript_14D947 checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LittlerootTown_EventScript_14D926 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, LittlerootTown_EventScript_14D931 msgbox LittlerootTown_Text_16A8EE, 4 closebutton checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LittlerootTown_EventScript_14D952 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, LittlerootTown_EventScript_14D995 call LittlerootTown_EventScript_14DD38 checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LittlerootTown_EventScript_14DAAA - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, LittlerootTown_EventScript_14DAED goto LittlerootTown_EventScript_14DD2B end @@ -453,32 +453,32 @@ LittlerootTown_EventScript_14D947:: @ 814D947 return LittlerootTown_EventScript_14D952:: @ 814D952 - compare_var_to_imm 0x8008, 0 + compare 0x8008, 0 call_if 1, LittlerootTown_EventScript_14D9D8 - compare_var_to_imm 0x8008, 1 + compare 0x8008, 1 call_if 1, LittlerootTown_EventScript_14D9ED - compare_var_to_imm 0x8008, 2 + compare 0x8008, 2 call_if 1, LittlerootTown_EventScript_14DA02 - compare_var_to_imm 0x8008, 3 + compare 0x8008, 3 call_if 1, LittlerootTown_EventScript_14DA17 - compare_var_to_imm 0x8008, 4 + compare 0x8008, 4 call_if 1, LittlerootTown_EventScript_14DA2C - compare_var_to_imm 0x8008, 5 + compare 0x8008, 5 call_if 1, LittlerootTown_EventScript_14DA41 return LittlerootTown_EventScript_14D995:: @ 814D995 - compare_var_to_imm 0x8008, 0 + compare 0x8008, 0 call_if 1, LittlerootTown_EventScript_14D9D8 - compare_var_to_imm 0x8008, 1 + compare 0x8008, 1 call_if 1, LittlerootTown_EventScript_14D9ED - compare_var_to_imm 0x8008, 2 + compare 0x8008, 2 call_if 1, LittlerootTown_EventScript_14DA56 - compare_var_to_imm 0x8008, 3 + compare 0x8008, 3 call_if 1, LittlerootTown_EventScript_14DA6B - compare_var_to_imm 0x8008, 4 + compare 0x8008, 4 call_if 1, LittlerootTown_EventScript_14DA80 - compare_var_to_imm 0x8008, 5 + compare 0x8008, 5 call_if 1, LittlerootTown_EventScript_14DA95 return @@ -553,32 +553,32 @@ LittlerootTown_EventScript_14DA95:: @ 814DA95 return LittlerootTown_EventScript_14DAAA:: @ 814DAAA - compare_var_to_imm 0x8008, 0 + compare 0x8008, 0 call_if 1, LittlerootTown_EventScript_14DB30 - compare_var_to_imm 0x8008, 1 + compare 0x8008, 1 call_if 1, LittlerootTown_EventScript_14DB3B - compare_var_to_imm 0x8008, 2 + compare 0x8008, 2 call_if 1, LittlerootTown_EventScript_14DB46 - compare_var_to_imm 0x8008, 3 + compare 0x8008, 3 call_if 1, LittlerootTown_EventScript_14DB6C - compare_var_to_imm 0x8008, 4 + compare 0x8008, 4 call_if 1, LittlerootTown_EventScript_14DB92 - compare_var_to_imm 0x8008, 5 + compare 0x8008, 5 call_if 1, LittlerootTown_EventScript_14DBB8 return LittlerootTown_EventScript_14DAED:: @ 814DAED - compare_var_to_imm 0x8008, 0 + compare 0x8008, 0 call_if 1, LittlerootTown_EventScript_14DB30 - compare_var_to_imm 0x8008, 1 + compare 0x8008, 1 call_if 1, LittlerootTown_EventScript_14DB3B - compare_var_to_imm 0x8008, 2 + compare 0x8008, 2 call_if 1, LittlerootTown_EventScript_14DBDE - compare_var_to_imm 0x8008, 3 + compare 0x8008, 3 call_if 1, LittlerootTown_EventScript_14DC04 - compare_var_to_imm 0x8008, 4 + compare 0x8008, 4 call_if 1, LittlerootTown_EventScript_14DC2A - compare_var_to_imm 0x8008, 5 + compare 0x8008, 5 call_if 1, LittlerootTown_EventScript_14DC50 return @@ -842,9 +842,9 @@ LittlerootTown_EventScript_14DCE2:: @ 814DCE2 lock faceplayer checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LittlerootTown_EventScript_14D926 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, LittlerootTown_EventScript_14D931 call LittlerootTown_EventScript_14DD38 applymovement 4, LittlerootTown_Movement_1A0841 diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc index 7f3f3f5cf..e878d7e2e 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc @@ -5,7 +5,7 @@ LittlerootTown_BrendansHouse_1F_MapScripts:: @ 815263B .byte 0 LittlerootTown_BrendansHouse_1F_MapScript1_15264B:: @ 815264B - compare_var_to_imm 0x4092, 6 + compare 0x4092, 6 call_if 0, LittlerootTown_BrendansHouse_1F_EventScript_152660 checkflag 274 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_152673 @@ -18,7 +18,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_152660:: @ 8152660 LittlerootTown_BrendansHouse_1F_EventScript_152673:: @ 8152673 checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_152680 return @@ -27,11 +27,11 @@ LittlerootTown_BrendansHouse_1F_EventScript_152680:: @ 8152680 return LittlerootTown_BrendansHouse_1F_MapScript1_15268A:: @ 815268A - compare_var_to_imm 0x4092, 3 + compare 0x4092, 3 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1526C4 - compare_var_to_imm 0x4092, 5 + compare 0x4092, 5 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1526AC - compare_var_to_imm 0x4092, 6 + compare 0x4092, 6 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1526B8 end diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc index 61b981995..3b39fe2ed 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc @@ -6,7 +6,7 @@ LittlerootTown_BrendansHouse_2F_MapScripts:: @ 81527A4 LittlerootTown_BrendansHouse_2F_MapScript1_1527AF:: @ 81527AF checkflag 130 call_if 0, LittlerootTown_BrendansHouse_2F_EventScript_1527CE - compare_var_to_imm 0x4092, 4 + compare 0x4092, 4 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1B6950 call LittlerootTown_BrendansHouse_2F_EventScript_1A2F3D setvar 0x4089, 0 @@ -23,16 +23,16 @@ LittlerootTown_BrendansHouse_2F_MapScript2_1527DA:: @ 81527DA LittlerootTown_BrendansHouse_2F_EventScript_1527E4:: @ 81527E4 checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1A2F68 end @ 81527F1 lockall checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_15280A - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152814 end @@ -51,9 +51,9 @@ gUnknown_0815281E:: @ 815281E LittlerootTown_BrendansHouse_2F_EventScript_15281E:: @ 815281E lockall checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152837 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_15285D end diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc index 022e98b2a..9b5a372fa 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc @@ -5,7 +5,7 @@ LittlerootTown_MaysHouse_1F_MapScripts:: @ 8152879 .byte 0 LittlerootTown_MaysHouse_1F_MapScript1_152889:: @ 8152889 - compare_var_to_imm 0x4092, 6 + compare 0x4092, 6 call_if 0, LittlerootTown_MaysHouse_1F_EventScript_15289E checkflag 274 call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1528B1 @@ -18,7 +18,7 @@ LittlerootTown_MaysHouse_1F_EventScript_15289E:: @ 815289E LittlerootTown_MaysHouse_1F_EventScript_1528B1:: @ 81528B1 checkgender - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LittlerootTown_MaysHouse_1F_EventScript_1528BE return @@ -27,11 +27,11 @@ LittlerootTown_MaysHouse_1F_EventScript_1528BE:: @ 81528BE return LittlerootTown_MaysHouse_1F_MapScript1_1528C8:: @ 81528C8 - compare_var_to_imm 0x4092, 3 + compare 0x4092, 3 call_if 1, LittlerootTown_MaysHouse_1F_EventScript_152902 - compare_var_to_imm 0x4092, 5 + compare 0x4092, 5 call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1528EA - compare_var_to_imm 0x4092, 6 + compare 0x4092, 6 call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1528F6 end @@ -117,9 +117,9 @@ LittlerootTown_MaysHouse_1F_Movement_1529C0:: @ 81529C0 @ 81529C7 lockall checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1529E1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1529E2 releaseall end @@ -139,7 +139,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1529EB:: @ 81529EB goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_152A21 checkflag 301 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_152A17 - compare_var_to_imm 0x408d, 3 + compare 0x408d, 3 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_152A2B special GetRivalSonDaughterString msgbox LittlerootTown_BrendansHouse_1F_Text_1731C6, 4 diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc index cf2033919..712bebf03 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc @@ -6,7 +6,7 @@ LittlerootTown_MaysHouse_2F_MapScripts:: @ 8152A50 LittlerootTown_MaysHouse_2F_MapScript1_152A5B:: @ 8152A5B checkflag 130 call_if 0, LittlerootTown_MaysHouse_2F_EventScript_152A7A - compare_var_to_imm 0x4092, 4 + compare 0x4092, 4 call_if 1, LittlerootTown_MaysHouse_2F_EventScript_1B6950 call LittlerootTown_MaysHouse_2F_EventScript_1A2F3D setvar 0x4089, 0 @@ -23,7 +23,7 @@ LittlerootTown_MaysHouse_2F_MapScript2_152A86:: @ 8152A86 LittlerootTown_MaysHouse_2F_EventScript_152A90:: @ 8152A90 checkgender - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_1A2F68 end @@ -33,9 +33,9 @@ LittlerootTown_MaysHouse_2F_EventScript_152A9D:: @ 8152A9D checkflag 292 goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152BB5 checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152AD4 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152B4A playse 9 disappear LAST_TALKED @@ -57,11 +57,11 @@ LittlerootTown_BrendansHouse_2F_EventScript_152AD4:: @ 8152AD4 waitmovement 0 msgbox LittlerootTown_BrendansHouse_2F_Text_1733AF, 4 closebutton - compare_var_to_imm FACING, 4 + compare FACING, 4 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152B29 - compare_var_to_imm FACING, 2 + compare FACING, 2 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152B34 - compare_var_to_imm FACING, 3 + compare FACING, 3 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152B3F return @@ -91,11 +91,11 @@ LittlerootTown_BrendansHouse_2F_EventScript_152B4A:: @ 8152B4A waitmovement 0 msgbox LittlerootTown_BrendansHouse_2F_Text_1735FC, 4 closebutton - compare_var_to_imm FACING, 4 + compare FACING, 4 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152B9F - compare_var_to_imm FACING, 2 + compare FACING, 2 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152B9F - compare_var_to_imm FACING, 3 + compare FACING, 3 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152BAA return @@ -113,9 +113,9 @@ LittlerootTown_BrendansHouse_2F_EventScript_152BB5:: @ 8152BB5 applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0839 waitmovement 0 checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152BDB - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152BED setflag 293 releaseall @@ -194,9 +194,9 @@ gUnknown_08152C39:: @ 8152C39 LittlerootTown_MaysHouse_2F_EventScript_152C39:: @ 8152C39 lockall checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_152C52 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_152C5C end diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc index d6576be92..834ae8521 100644 --- a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc +++ b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc @@ -30,9 +30,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152CBE:: @ 8152CBE playfanfare 370 waitfanfare msgbox LittlerootTown_ProfessorBirchsLab_Text_173EF8, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152CEA - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152CFA end @@ -44,9 +44,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152CEA:: @ 8152CEA LittlerootTown_ProfessorBirchsLab_EventScript_152CFA:: @ 8152CFA msgbox LittlerootTown_ProfessorBirchsLab_Text_173F3D, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152D19 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152D2B end @@ -59,9 +59,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152D19:: @ 8152D19 LittlerootTown_ProfessorBirchsLab_EventScript_152D2B:: @ 8152D2B msgbox LittlerootTown_ProfessorBirchsLab_Text_174075, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152D19 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152D2B end @@ -85,7 +85,7 @@ LittlerootTown_ProfessorBirchsLab_Movement_152D5B:: @ 8152D5B LittlerootTown_ProfessorBirchsLab_EventScript_152D63:: @ 8152D63 lock faceplayer - compare_var_to_imm 0x4084, 3 + compare 0x4084, 3 goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_152D90 checkflag 88 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152D86 @@ -109,7 +109,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152D9A:: @ 8152D9A faceplayer checkflag 896 goto_if 0, LittlerootTown_ProfessorBirchsLab_EventScript_1A037F - compare_var_to_imm 0x4084, 5 + compare 0x4084, 5 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152E7B msgbox LittlerootTown_ProfessorBirchsLab_Text_1740B4, 4 release @@ -124,9 +124,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152DBA:: @ 8152DBA applymovement 255, LittlerootTown_ProfessorBirchsLab_Movement_1A0843 waitmovement 0 checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152E13 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152E40 setvar 0x4084, 5 setflag 116 @@ -139,7 +139,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152DBA:: @ 8152DBA LittlerootTown_ProfessorBirchsLab_EventScript_152E13:: @ 8152E13 msgbox LittlerootTown_ProfessorBirchsLab_Text_1743D4, 4 giveitem ITEM_POKE_BALL, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152E85 msgbox LittlerootTown_ProfessorBirchsLab_Text_17443D, 4 setvar RESULT, 0 @@ -148,7 +148,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152E13:: @ 8152E13 LittlerootTown_ProfessorBirchsLab_EventScript_152E40:: @ 8152E40 msgbox LittlerootTown_ProfessorBirchsLab_Text_17453C, 4 giveitem ITEM_POKE_BALL, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152E8E msgbox LittlerootTown_ProfessorBirchsLab_Text_17458C, 4 setvar RESULT, 1 @@ -188,9 +188,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152EA3:: @ 8152EA3 lock faceplayer checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152EBE - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152EC7 release end diff --git a/data/scripts/maps/MauvilleCity.inc b/data/scripts/maps/MauvilleCity.inc index 6ebd36749..5dd9983f4 100644 --- a/data/scripts/maps/MauvilleCity.inc +++ b/data/scripts/maps/MauvilleCity.inc @@ -105,9 +105,9 @@ MauvilleCity_EventScript_14C0F9:: @ 814C0F9 end MauvilleCity_EventScript_14C154:: @ 814C154 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, MauvilleCity_EventScript_14C23C - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_EventScript_14C285 closebutton switch FACING @@ -286,7 +286,7 @@ MauvilleCity_EventScript_14C2F2:: @ 814C2F2 faceplayer checkflag 209 goto_if_eq MauvilleCity_EventScript_14C368 - compare_var_to_imm 0x40ba, 2 + compare 0x40ba, 2 goto_if_eq MauvilleCity_EventScript_14C33C checkflag 208 goto_if_eq MauvilleCity_EventScript_14C332 @@ -305,7 +305,7 @@ MauvilleCity_EventScript_14C332:: @ 814C332 MauvilleCity_EventScript_14C33C:: @ 814C33C msgbox MauvilleCity_Text_1663EB, 4 giveitem ITEM_TM24 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_EventScript_1A029B setflag 209 msgbox MauvilleCity_Text_166488, 4 diff --git a/data/scripts/maps/MauvilleCity_BikeShop.inc b/data/scripts/maps/MauvilleCity_BikeShop.inc index b418e8a79..0b577885e 100644 --- a/data/scripts/maps/MauvilleCity_BikeShop.inc +++ b/data/scripts/maps/MauvilleCity_BikeShop.inc @@ -10,17 +10,17 @@ MauvilleCity_BikeShop_EventScript_156796:: @ 8156796 goto_if_eq MauvilleCity_BikeShop_EventScript_1567D1 msgbox MauvilleCity_BikeShop_Text_180F9F, 4 msgbox MauvilleCity_BikeShop_Text_181016, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq MauvilleCity_BikeShop_EventScript_156824 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_BikeShop_EventScript_156817 end MauvilleCity_BikeShop_EventScript_1567D1:: @ 81567D1 msgbox MauvilleCity_BikeShop_Text_181016, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq MauvilleCity_BikeShop_EventScript_156824 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_BikeShop_EventScript_156817 end @@ -64,19 +64,19 @@ MauvilleCity_BikeShop_EventScript_156861:: @ 8156861 MauvilleCity_BikeShop_EventScript_15686E:: @ 815686E msgbox MauvilleCity_BikeShop_Text_1813A0, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq MauvilleCity_BikeShop_EventScript_15688D - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_BikeShop_EventScript_1568BF end MauvilleCity_BikeShop_EventScript_15688D:: @ 815688D msgbox MauvilleCity_BikeShop_Text_1813D4, 4 checkitem ITEM_ACRO_BIKE, 1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq MauvilleCity_BikeShop_EventScript_1568C9 checkitem ITEM_MACH_BIKE, 1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq MauvilleCity_BikeShop_EventScript_1568EA msgbox MauvilleCity_BikeShop_Text_181498, 4 release diff --git a/data/scripts/maps/MauvilleCity_GameCorner.inc b/data/scripts/maps/MauvilleCity_GameCorner.inc index bc49cd481..6e9b11947 100644 --- a/data/scripts/maps/MauvilleCity_GameCorner.inc +++ b/data/scripts/maps/MauvilleCity_GameCorner.inc @@ -6,7 +6,7 @@ MauvilleCity_GameCorner_EventScript_156A34:: @ 8156A34 faceplayer msgbox MauvilleCity_GameCorner_Text_181C35, 4 checkitem ITEM_COIN_CASE, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156B32 message MauvilleCity_GameCorner_Text_181CB4 waittext @@ -33,10 +33,10 @@ MauvilleCity_GameCorner_EventScript_156A60:: @ 8156A60 MauvilleCity_GameCorner_EventScript_156AAE:: @ 8156AAE checkcoins 16385 - compare_var_to_imm 0x4001, 9950 + compare 0x4001, 9950 goto_if 4, MauvilleCity_GameCorner_EventScript_156B5C checkmoney 0x3e8, 0 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156B3C givecoins 50 paymoney 0x3e8, 0 @@ -52,10 +52,10 @@ MauvilleCity_GameCorner_EventScript_156AAE:: @ 8156AAE MauvilleCity_GameCorner_EventScript_156AF0:: @ 8156AF0 checkcoins 16385 - compare_var_to_imm 0x4001, 9500 + compare 0x4001, 9500 goto_if 4, MauvilleCity_GameCorner_EventScript_156B5C checkmoney 0x2710, 0 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156B3C givecoins 500 paymoney 0x2710, 0 @@ -100,7 +100,7 @@ MauvilleCity_GameCorner_EventScript_156B6C:: @ 8156B6C faceplayer msgbox MauvilleCity_GameCorner_Text_181DE1, 4 checkitem ITEM_COIN_CASE, 1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq MauvilleCity_GameCorner_EventScript_156B88 release end @@ -144,7 +144,7 @@ MauvilleCity_GameCorner_EventScript_156BFE:: @ 8156BFE MauvilleCity_GameCorner_EventScript_156C0C:: @ 8156C0C msgbox MauvilleCity_GameCorner_Text_181E33, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156D0D switch 0x4001 case 1, MauvilleCity_GameCorner_EventScript_156C46 @@ -154,11 +154,11 @@ MauvilleCity_GameCorner_EventScript_156C0C:: @ 8156C0C MauvilleCity_GameCorner_EventScript_156C46:: @ 8156C46 checkcoins 16386 - compare_var_to_imm 0x4002, 1000 + compare 0x4002, 1000 goto_if 0, MauvilleCity_GameCorner_EventScript_156CF4 bufferdecor 1, 88 checkdecor 88 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156D02 removecoins 1000 adddecor 88 @@ -170,11 +170,11 @@ MauvilleCity_GameCorner_EventScript_156C46:: @ 8156C46 MauvilleCity_GameCorner_EventScript_156C80:: @ 8156C80 checkcoins 16386 - compare_var_to_imm 0x4002, 1000 + compare 0x4002, 1000 goto_if 0, MauvilleCity_GameCorner_EventScript_156CF4 bufferdecor 1, 89 checkdecor 89 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156D02 removecoins 1000 adddecor 89 @@ -186,11 +186,11 @@ MauvilleCity_GameCorner_EventScript_156C80:: @ 8156C80 MauvilleCity_GameCorner_EventScript_156CBA:: @ 8156CBA checkcoins 16386 - compare_var_to_imm 0x4002, 1000 + compare 0x4002, 1000 goto_if 0, MauvilleCity_GameCorner_EventScript_156CF4 bufferdecor 1, 90 checkdecor 90 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156D02 removecoins 1000 adddecor 90 @@ -221,7 +221,7 @@ MauvilleCity_GameCorner_EventScript_156D1A:: @ 8156D1A faceplayer msgbox MauvilleCity_GameCorner_Text_181DE1, 4 checkitem ITEM_COIN_CASE, 1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq MauvilleCity_GameCorner_EventScript_156D36 release end @@ -277,7 +277,7 @@ MauvilleCity_GameCorner_EventScript_156DDE:: @ 8156DDE MauvilleCity_GameCorner_EventScript_156DEC:: @ 8156DEC msgbox MauvilleCity_GameCorner_Text_181E33, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F77 switch 0x4001 case 1, MauvilleCity_GameCorner_EventScript_156E3C @@ -289,10 +289,10 @@ MauvilleCity_GameCorner_EventScript_156DEC:: @ 8156DEC MauvilleCity_GameCorner_EventScript_156E3C:: @ 8156E3C checkcoins 16386 - compare_var_to_imm 0x4002, 1500 + compare 0x4002, 1500 goto_if 0, MauvilleCity_GameCorner_EventScript_156F5E checkitemspace ITEM_TM32, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C removecoins 1500 additem ITEM_TM32, 1 @@ -304,10 +304,10 @@ MauvilleCity_GameCorner_EventScript_156E3C:: @ 8156E3C MauvilleCity_GameCorner_EventScript_156E76:: @ 8156E76 checkcoins 16386 - compare_var_to_imm 0x4002, 3500 + compare 0x4002, 3500 goto_if 0, MauvilleCity_GameCorner_EventScript_156F5E checkitemspace ITEM_TM29, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C removecoins 3500 additem ITEM_TM29, 1 @@ -319,10 +319,10 @@ MauvilleCity_GameCorner_EventScript_156E76:: @ 8156E76 MauvilleCity_GameCorner_EventScript_156EB0:: @ 8156EB0 checkcoins 16386 - compare_var_to_imm 0x4002, 4000 + compare 0x4002, 4000 goto_if 0, MauvilleCity_GameCorner_EventScript_156F5E checkitemspace ITEM_TM35, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C removecoins 4000 additem ITEM_TM35, 1 @@ -334,10 +334,10 @@ MauvilleCity_GameCorner_EventScript_156EB0:: @ 8156EB0 MauvilleCity_GameCorner_EventScript_156EEA:: @ 8156EEA checkcoins 16386 - compare_var_to_imm 0x4002, 4000 + compare 0x4002, 4000 goto_if 0, MauvilleCity_GameCorner_EventScript_156F5E checkitemspace ITEM_TM24, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C removecoins 4000 additem ITEM_TM24, 1 @@ -349,10 +349,10 @@ MauvilleCity_GameCorner_EventScript_156EEA:: @ 8156EEA MauvilleCity_GameCorner_EventScript_156F24:: @ 8156F24 checkcoins 16386 - compare_var_to_imm 0x4002, 4000 + compare 0x4002, 4000 goto_if 0, MauvilleCity_GameCorner_EventScript_156F5E checkitemspace ITEM_TM13, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C removecoins 4000 additem ITEM_TM13, 1 @@ -392,7 +392,7 @@ MauvilleCity_GameCorner_EventScript_156F96:: @ 8156F96 checkflag 226 goto_if_eq MauvilleCity_GameCorner_EventScript_157072 msgbox MauvilleCity_GameCorner_Text_181F3D, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_157068 switch 0x4023 case 0, MauvilleCity_GameCorner_EventScript_156FDB @@ -403,7 +403,7 @@ MauvilleCity_GameCorner_EventScript_156F96:: @ 8156F96 MauvilleCity_GameCorner_EventScript_156FDB:: @ 8156FDB bufferdecor 1, 88 checkdecor 88 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_157059 msgbox MauvilleCity_GameCorner_Text_181F89, 4 givedecoration 88 @@ -414,7 +414,7 @@ MauvilleCity_GameCorner_EventScript_156FDB:: @ 8156FDB MauvilleCity_GameCorner_EventScript_157005:: @ 8157005 bufferdecor 1, 89 checkdecor 89 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_157059 msgbox MauvilleCity_GameCorner_Text_181F89, 4 givedecoration 89 @@ -425,7 +425,7 @@ MauvilleCity_GameCorner_EventScript_157005:: @ 8157005 MauvilleCity_GameCorner_EventScript_15702F:: @ 815702F bufferdecor 1, 90 checkdecor 90 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_157059 msgbox MauvilleCity_GameCorner_Text_181F89, 4 givedecoration 90 @@ -453,7 +453,7 @@ MauvilleCity_GameCorner_EventScript_15707C:: @ 815707C lock faceplayer checkitem ITEM_COIN_CASE, 1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq MauvilleCity_GameCorner_EventScript_15709C msgbox MauvilleCity_GameCorner_Text_18201E, 4 goto MauvilleCity_GameCorner_EventScript_157108 @@ -463,7 +463,7 @@ MauvilleCity_GameCorner_EventScript_15709C:: @ 815709C checkflag 225 goto_if_eq MauvilleCity_GameCorner_EventScript_1570CA checkcoins 16385 - compare_var_to_imm 0x4001, 1 + compare 0x4001, 1 goto_if 4, MauvilleCity_GameCorner_EventScript_1570CA setflag 225 givecoins 20 @@ -522,7 +522,7 @@ MauvilleCity_GameCorner_EventScript_157125:: @ 8157125 MauvilleCity_GameCorner_EventScript_157135:: @ 8157135 lockall checkitem ITEM_COIN_CASE, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 0 specialvar RESULT, sub_810F424 @@ -533,7 +533,7 @@ MauvilleCity_GameCorner_EventScript_157135:: @ 8157135 MauvilleCity_GameCorner_EventScript_157155:: @ 8157155 lockall checkitem ITEM_COIN_CASE, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 1 specialvar RESULT, sub_810F424 @@ -544,7 +544,7 @@ MauvilleCity_GameCorner_EventScript_157155:: @ 8157155 MauvilleCity_GameCorner_EventScript_157175:: @ 8157175 lockall checkitem ITEM_COIN_CASE, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 2 specialvar RESULT, sub_810F424 @@ -555,7 +555,7 @@ MauvilleCity_GameCorner_EventScript_157175:: @ 8157175 MauvilleCity_GameCorner_EventScript_157195:: @ 8157195 lockall checkitem ITEM_COIN_CASE, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 3 specialvar RESULT, sub_810F424 @@ -566,7 +566,7 @@ MauvilleCity_GameCorner_EventScript_157195:: @ 8157195 MauvilleCity_GameCorner_EventScript_1571B5:: @ 81571B5 lockall checkitem ITEM_COIN_CASE, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 4 specialvar RESULT, sub_810F424 @@ -577,7 +577,7 @@ MauvilleCity_GameCorner_EventScript_1571B5:: @ 81571B5 MauvilleCity_GameCorner_EventScript_1571D5:: @ 81571D5 lockall checkitem ITEM_COIN_CASE, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 5 specialvar RESULT, sub_810F424 @@ -588,7 +588,7 @@ MauvilleCity_GameCorner_EventScript_1571D5:: @ 81571D5 MauvilleCity_GameCorner_EventScript_1571F5:: @ 81571F5 lockall checkitem ITEM_COIN_CASE, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 6 specialvar RESULT, sub_810F424 @@ -599,7 +599,7 @@ MauvilleCity_GameCorner_EventScript_1571F5:: @ 81571F5 MauvilleCity_GameCorner_EventScript_157215:: @ 8157215 lockall checkitem ITEM_COIN_CASE, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 7 specialvar RESULT, sub_810F424 @@ -610,7 +610,7 @@ MauvilleCity_GameCorner_EventScript_157215:: @ 8157215 MauvilleCity_GameCorner_EventScript_157235:: @ 8157235 lockall checkitem ITEM_COIN_CASE, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 8 specialvar RESULT, sub_810F424 @@ -621,7 +621,7 @@ MauvilleCity_GameCorner_EventScript_157235:: @ 8157235 MauvilleCity_GameCorner_EventScript_157255:: @ 8157255 lockall checkitem ITEM_COIN_CASE, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 9 specialvar RESULT, sub_810F424 @@ -632,7 +632,7 @@ MauvilleCity_GameCorner_EventScript_157255:: @ 8157255 MauvilleCity_GameCorner_EventScript_157275:: @ 8157275 lockall checkitem ITEM_COIN_CASE, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 10 specialvar RESULT, sub_810F424 @@ -643,7 +643,7 @@ MauvilleCity_GameCorner_EventScript_157275:: @ 8157275 MauvilleCity_GameCorner_EventScript_157295:: @ 8157295 lockall checkitem ITEM_COIN_CASE, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 11 specialvar RESULT, sub_810F424 diff --git a/data/scripts/maps/MauvilleCity_Gym.inc b/data/scripts/maps/MauvilleCity_Gym.inc index 1030d8f68..e5791d521 100644 --- a/data/scripts/maps/MauvilleCity_Gym.inc +++ b/data/scripts/maps/MauvilleCity_Gym.inc @@ -71,7 +71,7 @@ MauvilleCity_Gym_EventScript_1565AB:: @ 81565AB trainerbattle 1, OPPONENT_WATTSON, 0, MauvilleCity_Gym_Text_180C32, MauvilleCity_Gym_Text_180D64, MauvilleCity_Gym_EventScript_1565DB checkflag 167 goto_if 0, MauvilleCity_Gym_EventScript_15661D - compare_var_to_imm 0x40ba, 2 + compare 0x40ba, 2 goto_if_eq MauvilleCity_Gym_EventScript_156641 msgbox MauvilleCity_Gym_Text_180EDB, 4 release @@ -85,7 +85,7 @@ MauvilleCity_Gym_EventScript_1565DB:: @ 81565DB setflag 1208 setflag 2057 addvar 0x4085, 1 - compare_var_to_imm 0x4085, 6 + compare 0x4085, 6 call_if 1, MauvilleCity_Gym_EventScript_1A00FB setvar 0x8008, 3 call MauvilleCity_Gym_EventScript_1A01C0 @@ -97,7 +97,7 @@ MauvilleCity_Gym_EventScript_1565DB:: @ 81565DB MauvilleCity_Gym_EventScript_15661D:: @ 815661D giveitem ITEM_TM34 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_Gym_EventScript_1A029B msgbox MauvilleCity_Gym_Text_180E76, 4 setflag 167 @@ -113,7 +113,7 @@ MauvilleCity_Gym_EventScript_15664B:: @ 815664B lockall checkflag 1208 goto_if_eq MauvilleCity_Gym_EventScript_1566DA - compare_var_to_imm 0x4093, 1 + compare 0x4093, 1 goto_if_eq MauvilleCity_Gym_EventScript_1566DA setvar 0x4093, 1 setvar 0x8004, 0 @@ -124,7 +124,7 @@ MauvilleCity_Gym_EventScript_156670:: @ 8156670 lockall checkflag 1208 goto_if_eq MauvilleCity_Gym_EventScript_1566DA - compare_var_to_imm 0x4093, 2 + compare 0x4093, 2 goto_if_eq MauvilleCity_Gym_EventScript_1566DA setvar 0x4093, 2 setvar 0x8004, 1 @@ -135,7 +135,7 @@ MauvilleCity_Gym_EventScript_156695:: @ 8156695 lockall checkflag 1208 goto_if_eq MauvilleCity_Gym_EventScript_1566DA - compare_var_to_imm 0x4093, 3 + compare 0x4093, 3 goto_if_eq MauvilleCity_Gym_EventScript_1566DA setvar 0x4093, 3 setvar 0x8004, 2 diff --git a/data/scripts/maps/MauvilleCity_House2.inc b/data/scripts/maps/MauvilleCity_House2.inc index 3f9ba59f3..a500a246e 100644 --- a/data/scripts/maps/MauvilleCity_House2.inc +++ b/data/scripts/maps/MauvilleCity_House2.inc @@ -8,7 +8,7 @@ MauvilleCity_House2_EventScript_1572C0:: @ 81572C0 goto_if_eq MauvilleCity_House2_EventScript_15733D msgbox MauvilleCity_House2_Text_18244E, 4 checkitem ITEM_HARBOR_MAIL, 1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq MauvilleCity_House2_EventScript_1572E5 release end @@ -20,9 +20,9 @@ MauvilleCity_House2_EventScript_1572E5:: @ 81572E5 applymovement LAST_TALKED, MauvilleCity_House2_Movement_1A0835 waitmovement 0 msgbox MauvilleCity_House2_Text_1824D8, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq MauvilleCity_House2_EventScript_15731B - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_House2_EventScript_157347 end diff --git a/data/scripts/maps/MeteorFalls_1F_2R.inc b/data/scripts/maps/MeteorFalls_1F_2R.inc index a5c89055b..b3a0c51fe 100644 --- a/data/scripts/maps/MeteorFalls_1F_2R.inc +++ b/data/scripts/maps/MeteorFalls_1F_2R.inc @@ -4,7 +4,7 @@ MeteorFalls_1F_2R_MapScripts:: @ 815C678 MeteorFalls_1F_2R_EventScript_15C679:: @ 815C679 trainerbattle 0, OPPONENT_NICOLAS_1, 0, MeteorFalls_1F_2R_Text_1939C5, MeteorFalls_1F_2R_Text_193A35 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq MeteorFalls_1F_2R_EventScript_15C6A0 msgbox MeteorFalls_1F_2R_Text_193A60, 6 end @@ -17,7 +17,7 @@ MeteorFalls_1F_2R_EventScript_15C6A0:: @ 815C6A0 MeteorFalls_1F_2R_EventScript_15C6B7:: @ 815C6B7 trainerbattle 4, OPPONENT_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_193BB7, MeteorFalls_1F_2R_Text_193C10, MeteorFalls_1F_2R_Text_193C9F specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq MeteorFalls_1F_2R_EventScript_15C6E2 msgbox MeteorFalls_1F_2R_Text_193C35, 6 end @@ -30,7 +30,7 @@ MeteorFalls_1F_2R_EventScript_15C6E2:: @ 815C6E2 MeteorFalls_1F_2R_EventScript_15C6FD:: @ 815C6FD trainerbattle 4, OPPONENT_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_193D10, MeteorFalls_1F_2R_Text_193D6E, MeteorFalls_1F_2R_Text_193DFB specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq MeteorFalls_1F_2R_EventScript_15C728 msgbox MeteorFalls_1F_2R_Text_193D9A, 6 end diff --git a/data/scripts/maps/MossdeepCity.inc b/data/scripts/maps/MossdeepCity.inc index cd5d9840f..44deb9d63 100644 --- a/data/scripts/maps/MossdeepCity.inc +++ b/data/scripts/maps/MossdeepCity.inc @@ -71,11 +71,11 @@ MossdeepCity_EventScript_14D027:: @ 814D027 checkflag 276 goto_if_eq MossdeepCity_EventScript_14D069 msgbox MossdeepCity_Text_1690A9, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MossdeepCity_EventScript_14D073 msgbox MossdeepCity_Text_169117, 4 giveitem ITEM_KINGS_ROCK - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MossdeepCity_EventScript_1A029B setflag 276 release diff --git a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc index 8d889a7d6..7861d0c4d 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc @@ -6,7 +6,7 @@ MossdeepCity_GameCorner_1F_MapScripts:: @ 815AC52 MossdeepCity_GameCorner_1F_MapScript1_15AC62:: @ 815AC62 special sub_813601C - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AC71 end @@ -17,9 +17,9 @@ MossdeepCity_GameCorner_1F_EventScript_15AC71:: @ 815AC71 MossdeepCity_GameCorner_1F_MapScript1_15AC84:: @ 815AC84 special sub_813601C - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AC9E - compare_var_to_imm 0x40c0, 0 + compare 0x40c0, 0 call_if 5, MossdeepCity_GameCorner_1F_EventScript_15ACAF end @@ -49,11 +49,11 @@ MossdeepCity_GameCorner_1F_EventScript_15ACD5:: @ 815ACD5 moveoffscreen 1 applymovement 255, MossdeepCity_GameCorner_1F_Movement_1A0841 waitmovement 0 - compare_var_to_imm 0x40c0, 1 + compare 0x40c0, 1 call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AD22 - compare_var_to_imm 0x40c0, 2 + compare 0x40c0, 2 call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AD2B - compare_var_to_imm 0x40c0, 3 + compare 0x40c0, 3 call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AD34 special LoadPlayerParty setvar 0x40c0, 0 @@ -84,7 +84,7 @@ MossdeepCity_GameCorner_1F_Movement_15AD3F:: @ 815AD3F MossdeepCity_GameCorner_1F_EventScript_15AD42:: @ 815AD42 lock faceplayer - compare_var_to_imm 0x4001, 1 + compare 0x4001, 1 goto_if_eq MossdeepCity_GameCorner_1F_EventScript_15AD59 msgbox MossdeepCity_GameCorner_1F_Text_18E59A, 4 release @@ -94,28 +94,28 @@ MossdeepCity_GameCorner_1F_EventScript_15AD59:: @ 815AD59 special SavePlayerParty special sub_810F414 msgbox MossdeepCity_GameCorner_1F_Text_18E650, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MossdeepCity_GameCorner_1F_EventScript_15ADE8 call MossdeepCity_GameCorner_1F_EventScript_15ADF5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MossdeepCity_GameCorner_1F_EventScript_15ADE8 msgbox MossdeepCity_GameCorner_1F_Text_18E741, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, MossdeepCity_GameCorner_1F_EventScript_15ADE8 special LoadPlayerParty call S_DoSaveDialog - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MossdeepCity_GameCorner_1F_EventScript_15ADE8 hidebox 0, 0, 15, 10 special SavePlayerParty special ReducePlayerPartyToThree msgbox MossdeepCity_GameCorner_1F_Text_18E777, 4 closebutton - compare_var_to_imm FACING, 2 + compare FACING, 2 call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AE04 - compare_var_to_imm FACING, 4 + compare FACING, 4 call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AE16 - compare_var_to_imm FACING, 3 + compare FACING, 3 call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AE28 warp MossdeepCity_GameCorner_B1F, 255, 3, 1 waitstate diff --git a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc index 29400a80b..46b9dcfea 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc @@ -22,11 +22,11 @@ MossdeepCity_GameCorner_B1F_EventScript_15AE6E:: @ 815AE6E setvar 0x8005, 0 special sub_813556C waitstate - compare_var_to_imm RESULT, 3 + compare RESULT, 3 call_if 1, MossdeepCity_GameCorner_B1F_EventScript_15AED5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, MossdeepCity_GameCorner_B1F_EventScript_15AEE3 - compare_var_to_imm RESULT, 2 + compare RESULT, 2 call_if 1, MossdeepCity_GameCorner_B1F_EventScript_15AEEE closebutton special ScrSpecial_HealPlayerParty diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/scripts/maps/MossdeepCity_Gym.inc index 838b7fd14..4365ba74a 100644 --- a/data/scripts/maps/MossdeepCity_Gym.inc +++ b/data/scripts/maps/MossdeepCity_Gym.inc @@ -73,7 +73,7 @@ MossdeepCity_Gym_EventScript_15A594:: @ 815A594 MossdeepCity_Gym_EventScript_15A5C6:: @ 815A5C6 giveitem ITEM_TM04 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MossdeepCity_Gym_EventScript_1A029B msgbox MossdeepCity_Gym_Text_18D1CF, 4 setflag 171 diff --git a/data/scripts/maps/MossdeepCity_House1.inc b/data/scripts/maps/MossdeepCity_House1.inc index b6fe4fd6e..6098cc617 100644 --- a/data/scripts/maps/MossdeepCity_House1.inc +++ b/data/scripts/maps/MossdeepCity_House1.inc @@ -7,7 +7,7 @@ MossdeepCity_House1_EventScript_15A82F:: @ 815A82F bufferfirstpoke 0 msgbox MossdeepCity_House1_Text_18D465, 4 specialvar RESULT, GetPokeblockNameByMonNature - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MossdeepCity_House1_EventScript_15A855 msgbox MossdeepCity_House1_Text_18D475, 4 release diff --git a/data/scripts/maps/MossdeepCity_House2.inc b/data/scripts/maps/MossdeepCity_House2.inc index 660bc2c06..b8388376a 100644 --- a/data/scripts/maps/MossdeepCity_House2.inc +++ b/data/scripts/maps/MossdeepCity_House2.inc @@ -19,9 +19,9 @@ MossdeepCity_House2_EventScript_15A87B:: @ 815A87B closebutton setflag 224 clearflag 933 - compare_var_to_imm FACING, 2 + compare FACING, 2 call_if 1, MossdeepCity_House2_EventScript_15A8AE - compare_var_to_imm FACING, 3 + compare FACING, 3 call_if 1, MossdeepCity_House2_EventScript_15A8B9 disappear 3 release diff --git a/data/scripts/maps/MossdeepCity_House3.inc b/data/scripts/maps/MossdeepCity_House3.inc index b94e0ec19..8f9bf4dc5 100644 --- a/data/scripts/maps/MossdeepCity_House3.inc +++ b/data/scripts/maps/MossdeepCity_House3.inc @@ -7,7 +7,7 @@ MossdeepCity_House3_EventScript_15A972:: @ 815A972 checkflag 152 goto_if_eq MossdeepCity_House3_EventScript_15A9B1 msgbox MossdeepCity_House3_Text_18D909, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MossdeepCity_House3_EventScript_15A9BB msgbox MossdeepCity_House3_Text_18D9A9, 4 giveitem ITEM_SUPER_ROD diff --git a/data/scripts/maps/MossdeepCity_House4.inc b/data/scripts/maps/MossdeepCity_House4.inc index 9b1b17c69..205f10313 100644 --- a/data/scripts/maps/MossdeepCity_House4.inc +++ b/data/scripts/maps/MossdeepCity_House4.inc @@ -19,7 +19,7 @@ MossdeepCity_House4_EventScript_15AB50:: @ 815AB50 lock faceplayer special sub_80BB63C - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MossdeepCity_House4_EventScript_15AB6D special GetSecretBaseNearbyMapName msgbox MossdeepCity_House4_Text_18E17E, 4 diff --git a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc index b328a6784..a407bd5b9 100644 --- a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc +++ b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc @@ -7,9 +7,9 @@ MossdeepCity_SpaceCenter_1F_EventScript_15AB8B:: @ 815AB8B dodailyevents specialvar RESULT, GetWeekCount buffernum 0, RESULT - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, MossdeepCity_SpaceCenter_1F_EventScript_15ABBA - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 4, MossdeepCity_SpaceCenter_1F_EventScript_15ABC3 closebutton applymovement LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_1A083D @@ -36,7 +36,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_15ABD5:: @ 815ABD5 goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_15AC0C msgbox MossdeepCity_SpaceCenter_1F_Text_18E335, 4 giveitem ITEM_SUN_STONE - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_1A029B setflag 192 msgbox MossdeepCity_SpaceCenter_1F_Text_18E39B, 4 diff --git a/data/scripts/maps/MossdeepCity_StevensHouse.inc b/data/scripts/maps/MossdeepCity_StevensHouse.inc index 31a9efcea..aebb51c9c 100644 --- a/data/scripts/maps/MossdeepCity_StevensHouse.inc +++ b/data/scripts/maps/MossdeepCity_StevensHouse.inc @@ -14,7 +14,7 @@ MossdeepCity_StevensHouse_EventScript_15A9DF:: @ 815A9DF return MossdeepCity_StevensHouse_MapScript1_15A9E9:: @ 815A9E9 - compare_var_to_imm 0x40c6, 1 + compare 0x40c6, 1 call_if 1, MossdeepCity_StevensHouse_EventScript_15A9F5 end @@ -72,10 +72,10 @@ MossdeepCity_StevensHouse_Movement_15AA76:: @ 815AA76 MossdeepCity_StevensHouse_EventScript_15AA7C:: @ 815AA7C lockall msgbox MossdeepCity_StevensHouse_Text_18DD12, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MossdeepCity_StevensHouse_EventScript_15AAE6 countpokemon - compare_var_to_imm RESULT, 6 + compare RESULT, 6 goto_if_eq MossdeepCity_StevensHouse_EventScript_15AADC copyvar 0x8004, RESULT disappear 2 @@ -86,7 +86,7 @@ MossdeepCity_StevensHouse_EventScript_15AA7C:: @ 815AA7C givepokemon SPECIES_BELDUM, 5, ITEM_NONE, 0x0, 0x0, 0 bufferpoke 1, SPECIES_BELDUM msgbox MossdeepCity_StevensHouse_Text_1A1102, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, MossdeepCity_StevensHouse_EventScript_1A0678 setflag 968 setflag 298 diff --git a/data/scripts/maps/MtChimney.inc b/data/scripts/maps/MtChimney.inc index 578743995..d206f927e 100644 --- a/data/scripts/maps/MtChimney.inc +++ b/data/scripts/maps/MtChimney.inc @@ -18,17 +18,17 @@ MtChimney_EventScript_15CF95:: @ 815CF95 showmoney 0, 0 nop msgbox MtChimney_Text_195760, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MtChimney_EventScript_15D00B checkmoney 0xc8, 0 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MtChimney_EventScript_15D018 msgbox MtChimney_Text_1957A9, 4 checkitemspace ITEM_LAVA_COOKIE, 1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, MtChimney_EventScript_15D000 giveitem ITEM_LAVA_COOKIE - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MtChimney_EventScript_15CFF3 hidemoney 0, 0 release @@ -411,7 +411,7 @@ MtChimney_EventScript_15D17D:: @ 815D17D checkflag 115 goto_if_eq MtChimney_EventScript_15D1C6 msgbox MtChimney_Text_195870, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MtChimney_EventScript_15D1BC msgbox MtChimney_Text_1958C6, 4 giveitem ITEM_METEORITE @@ -441,7 +441,7 @@ MtChimney_EventScript_15D1DA:: @ 815D1DA MtChimney_EventScript_15D1E3:: @ 815D1E3 trainerbattle 0, OPPONENT_SHELBY_1, 0, MtChimney_Text_19597F, MtChimney_Text_1959D8 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq MtChimney_EventScript_15D20A msgbox MtChimney_Text_195A04, 6 end diff --git a/data/scripts/maps/MtChimney_CableCarStation.inc b/data/scripts/maps/MtChimney_CableCarStation.inc index 43dee22b4..8a66f75ee 100644 --- a/data/scripts/maps/MtChimney_CableCarStation.inc +++ b/data/scripts/maps/MtChimney_CableCarStation.inc @@ -4,7 +4,7 @@ MtChimney_CableCarStation_MapScripts:: @ 815C0FA .byte 0 MtChimney_CableCarStation_MapScript1_15C105:: @ 815C105 - compare_var_to_imm 0x40a3, 1 + compare 0x40a3, 1 call_if 1, MtChimney_CableCarStation_EventScript_15C111 end @@ -32,9 +32,9 @@ MtChimney_CableCarStation_EventScript_15C14B:: @ 815C14B lock faceplayer msgbox MtChimney_CableCarStation_Text_19256A, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq MtChimney_CableCarStation_EventScript_15C16C - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MtChimney_CableCarStation_EventScript_15C19B end diff --git a/data/scripts/maps/MtPyre_1F.inc b/data/scripts/maps/MtPyre_1F.inc index 3f012780d..026d54bfe 100644 --- a/data/scripts/maps/MtPyre_1F.inc +++ b/data/scripts/maps/MtPyre_1F.inc @@ -8,7 +8,7 @@ MtPyre_1F_EventScript_15D323:: @ 815D323 goto_if_eq MtPyre_1F_EventScript_15D352 msgbox MtPyre_1F_Text_196151, 4 giveitem ITEM_CLEANSE_TAG - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MtPyre_1F_EventScript_1A029B setflag 282 release diff --git a/data/scripts/maps/MtPyre_6F.inc b/data/scripts/maps/MtPyre_6F.inc index 5d650a8a6..433b533b3 100644 --- a/data/scripts/maps/MtPyre_6F.inc +++ b/data/scripts/maps/MtPyre_6F.inc @@ -4,7 +4,7 @@ MtPyre_6F_MapScripts:: @ 815D447 MtPyre_6F_EventScript_15D448:: @ 815D448 trainerbattle 0, OPPONENT_VALERIE_1, 0, MtPyre_6F_Text_1969FE, MtPyre_6F_Text_196A30 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq MtPyre_6F_EventScript_15D46F msgbox MtPyre_6F_Text_196A4C, 6 end diff --git a/data/scripts/maps/MtPyre_Exterior.inc b/data/scripts/maps/MtPyre_Exterior.inc index 787315320..550f74d9a 100644 --- a/data/scripts/maps/MtPyre_Exterior.inc +++ b/data/scripts/maps/MtPyre_Exterior.inc @@ -8,7 +8,7 @@ MtPyre_Exterior_MapScript1_15D48C:: @ 815D48C MtPyre_Exterior_EventScript_15D492:: @ 815D492 getplayerxy 0x4000, 0x4001 - compare_var_to_imm 0x4001, 12 + compare 0x4001, 12 goto_if 0, MtPyre_Exterior_EventScript_15D4A3 return diff --git a/data/scripts/maps/MtPyre_Summit.inc b/data/scripts/maps/MtPyre_Summit.inc index 44d0760df..e60c40cae 100644 --- a/data/scripts/maps/MtPyre_Summit.inc +++ b/data/scripts/maps/MtPyre_Summit.inc @@ -30,11 +30,11 @@ MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1 applymovement 2, MtPyre_Summit_Movement_1A0845 waitmovement 0 delay 50 - compare_var_to_imm 0x8008, 0 + compare 0x8008, 0 call_if 1, MtPyre_Summit_EventScript_15D593 - compare_var_to_imm 0x8008, 1 + compare 0x8008, 1 call_if 1, MtPyre_Summit_EventScript_15D59E - compare_var_to_imm 0x8008, 2 + compare 0x8008, 2 call_if 1, MtPyre_Summit_EventScript_15D59F .ifdef SAPPHIRE msgbox UnknownString_81B52B0, 4 @@ -52,11 +52,11 @@ MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1 fadescreen 0 delay 20 call MtPyre_Summit_EventScript_15D57A - compare_var_to_imm 0x8008, 0 + compare 0x8008, 0 call_if 1, MtPyre_Summit_EventScript_15D5AA - compare_var_to_imm 0x8008, 1 + compare 0x8008, 1 call_if 1, MtPyre_Summit_EventScript_15D5BF - compare_var_to_imm 0x8008, 2 + compare 0x8008, 2 call_if 1, MtPyre_Summit_EventScript_15D5CA .ifdef SAPPHIRE msgbox UnknownString_81B53AB, 4 @@ -143,9 +143,9 @@ MtPyre_Summit_EventScript_15D5EF:: @ 815D5EF .else msgbox MtPyre_Summit_Text_1B64B3, 5 .endif - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, MtPyre_Summit_EventScript_15D611 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, MtPyre_Summit_EventScript_15D61A release end @@ -189,9 +189,9 @@ MtPyre_Summit_EventScript_15D64A:: @ 815D64A .else msgbox MtPyre_Summit_Text_1B6283, 5 .endif - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq MtPyre_Summit_EventScript_15D669 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MtPyre_Summit_EventScript_15D69B end @@ -220,9 +220,9 @@ MtPyre_Summit_EventScript_15D69B:: @ 815D69B .else msgbox MtPyre_Summit_Text_1B62E7, 5 .endif - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq MtPyre_Summit_EventScript_15D669 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MtPyre_Summit_EventScript_15D69B end @@ -268,11 +268,11 @@ MtPyre_Summit_EventScript_15D6F2:: @ 815D6F2 applymovement 2, MtPyre_Summit_Movement_1A0845 waitmovement 0 delay 50 - compare_var_to_imm 0x8008, 0 + compare 0x8008, 0 call_if 1, MtPyre_Summit_EventScript_15D75E - compare_var_to_imm 0x8008, 1 + compare 0x8008, 1 call_if 1, MtPyre_Summit_EventScript_15D769 - compare_var_to_imm 0x8008, 2 + compare 0x8008, 2 call_if 1, MtPyre_Summit_EventScript_15D774 .ifdef SAPPHIRE msgbox UnknownString_81B5BFC, 4 @@ -280,11 +280,11 @@ MtPyre_Summit_EventScript_15D6F2:: @ 815D6F2 msgbox MtPyre_Summit_Text_1B6848, 4 .endif closebutton - compare_var_to_imm 0x8008, 0 + compare 0x8008, 0 call_if 1, MtPyre_Summit_EventScript_15D77F - compare_var_to_imm 0x8008, 1 + compare 0x8008, 1 call_if 1, MtPyre_Summit_EventScript_15D78A - compare_var_to_imm 0x8008, 2 + compare 0x8008, 2 call_if 1, MtPyre_Summit_EventScript_15D795 disappear 2 setvar 0x40b9, 3 diff --git a/data/scripts/maps/NewMauville_Entrance.inc b/data/scripts/maps/NewMauville_Entrance.inc index 7eb3769cc..6429ff2f9 100644 --- a/data/scripts/maps/NewMauville_Entrance.inc +++ b/data/scripts/maps/NewMauville_Entrance.inc @@ -4,7 +4,7 @@ NewMauville_Entrance_MapScripts:: @ 815E48A .byte 0 NewMauville_Entrance_MapScript1_15E495:: @ 815E495 - compare_var_to_imm 0x40ba, 0 + compare 0x40ba, 0 call_if 1, NewMauville_Entrance_EventScript_15E4A1 end @@ -27,10 +27,10 @@ NewMauville_Entrance_EventScript_15E4DC:: @ 815E4DC waitmovement 0 msgbox NewMauville_Entrance_Text_1982C0, 4 checkitem ITEM_BASEMENT_KEY, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq NewMauville_Entrance_EventScript_15E55D msgbox NewMauville_Entrance_Text_1982D4, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq NewMauville_Entrance_EventScript_15E55D msgbox NewMauville_Entrance_Text_1982EA, 4 setmaptile 3, 0, 707, 0 diff --git a/data/scripts/maps/NewMauville_Inside.inc b/data/scripts/maps/NewMauville_Inside.inc index 4fdf02d15..ef016f261 100644 --- a/data/scripts/maps/NewMauville_Inside.inc +++ b/data/scripts/maps/NewMauville_Inside.inc @@ -5,9 +5,9 @@ NewMauville_Inside_MapScripts:: @ 815E55F .byte 0 NewMauville_Inside_MapScript1_15E56F:: @ 815E56F - compare_var_to_imm 0x4001, 1 + compare 0x4001, 1 call_if 1, NewMauville_Inside_EventScript_15E5DA - compare_var_to_imm 0x4002, 1 + compare 0x4002, 1 call_if 1, NewMauville_Inside_EventScript_15E728 checkflag 2145 call_if 1, NewMauville_Inside_EventScript_15E58F @@ -23,7 +23,7 @@ NewMauville_Inside_MapScript1_15E593:: @ 815E593 end NewMauville_Inside_MapScript1_15E59E:: @ 815E59E - compare_var_to_imm 0x40ba, 2 + compare 0x40ba, 2 call_if 1, NewMauville_Inside_EventScript_15E88B end @@ -150,7 +150,7 @@ NewMauville_Inside_EventScript_15E88B:: @ 815E88B NewMauville_Inside_EventScript_15E8E0:: @ 815E8E0 lockall - compare_var_to_imm 0x40ba, 2 + compare 0x40ba, 2 goto_if_eq NewMauville_Inside_EventScript_15E8F6 msgbox NewMauville_Inside_Text_198315, 4 releaseall diff --git a/data/scripts/maps/OldaleTown.inc b/data/scripts/maps/OldaleTown.inc index 0afc63220..0ece240c6 100644 --- a/data/scripts/maps/OldaleTown.inc +++ b/data/scripts/maps/OldaleTown.inc @@ -76,7 +76,7 @@ OldaleTown_EventScript_14DE35:: @ 814DE35 OldaleTown_EventScript_14DE4C:: @ 814DE4C msgbox OldaleTown_Text_16AF2F, 4 giveitem ITEM_POTION - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq OldaleTown_EventScript_14DE83 msgbox OldaleTown_Text_16AFE1, 4 setflag 132 @@ -257,9 +257,9 @@ OldaleTown_EventScript_14DF77:: @ 814DF77 OldaleTown_EventScript_14DF92:: @ 814DF92 checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq OldaleTown_EventScript_14DFAA - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq OldaleTown_EventScript_14DFB8 end diff --git a/data/scripts/maps/PacifidlogTown_House2.inc b/data/scripts/maps/PacifidlogTown_House2.inc index e604a4f33..cef40ecd3 100644 --- a/data/scripts/maps/PacifidlogTown_House2.inc +++ b/data/scripts/maps/PacifidlogTown_House2.inc @@ -14,10 +14,10 @@ PacifidlogTown_House2_EventScript_154168:: @ 8154168 call_if 0, PacifidlogTown_House2_EventScript_1541D7 setflag 300 specialvar RESULT, GetLeadMonFriendshipScore - compare_var_to_imm RESULT, 4 + compare RESULT, 4 goto_if 4, PacifidlogTown_House2_EventScript_1541EC specialvar RESULT, GetLeadMonFriendshipScore - compare_var_to_imm RESULT, 2 + compare RESULT, 2 goto_if 4, PacifidlogTown_House2_EventScript_15421B goto PacifidlogTown_House2_EventScript_154225 end @@ -26,7 +26,7 @@ PacifidlogTown_House2_EventScript_1541B4:: @ 81541B4 checkflag 299 goto_if 0, PacifidlogTown_House2_EventScript_1A14DC specialvar RESULT, sub_810F908 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, PacifidlogTown_House2_EventScript_1541E8 return @@ -46,7 +46,7 @@ PacifidlogTown_House2_EventScript_1541E8:: @ 81541E8 PacifidlogTown_House2_EventScript_1541EC:: @ 81541EC msgbox PacifidlogTown_House2_Text_179169, 4 giveitem ITEM_TM27 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq PacifidlogTown_House2_EventScript_1A029B setflag 299 special sub_810F950 @@ -62,7 +62,7 @@ PacifidlogTown_House2_EventScript_15421B:: @ 815421B PacifidlogTown_House2_EventScript_154225:: @ 8154225 msgbox PacifidlogTown_House2_Text_17922D, 4 giveitem ITEM_TM21 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq PacifidlogTown_House2_EventScript_1A029B setflag 299 special sub_810F950 diff --git a/data/scripts/maps/PacifidlogTown_House3.inc b/data/scripts/maps/PacifidlogTown_House3.inc index e39db3921..1edd445fc 100644 --- a/data/scripts/maps/PacifidlogTown_House3.inc +++ b/data/scripts/maps/PacifidlogTown_House3.inc @@ -11,17 +11,17 @@ PacifidlogTown_House3_EventScript_15429E:: @ 815429E specialvar RESULT, sub_804D89C copyvar 0x8009, RESULT msgbox PacifidlogTown_House3_Text_17940E, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq PacifidlogTown_House3_EventScript_154320 special sub_80F9A0C waitstate copyvar 0x800a, 0x8004 - compare_var_to_imm 0x8004, 255 + compare 0x8004, 255 goto_if_eq PacifidlogTown_House3_EventScript_154320 copyvar 0x8005, 0x800a specialvar RESULT, sub_804DB2C copyvar 0x800b, RESULT - compare_var_to_var RESULT, 0x8009 + compare RESULT, 0x8009 goto_if 5, PacifidlogTown_House3_EventScript_15432A copyvar 0x8004, 0x8008 copyvar 0x8005, 0x800a diff --git a/data/scripts/maps/PacifidlogTown_House4.inc b/data/scripts/maps/PacifidlogTown_House4.inc index bba0ede14..b7a6c9f86 100644 --- a/data/scripts/maps/PacifidlogTown_House4.inc +++ b/data/scripts/maps/PacifidlogTown_House4.inc @@ -13,9 +13,9 @@ PacifidlogTown_House4_EventScript_15435E:: @ 815435E lock faceplayer msgbox PacifidlogTown_House4_Text_17963D, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq PacifidlogTown_House4_EventScript_15437F - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq PacifidlogTown_House4_EventScript_154389 end diff --git a/data/scripts/maps/PacifidlogTown_House5.inc b/data/scripts/maps/PacifidlogTown_House5.inc index abbf81dd8..46b1990df 100644 --- a/data/scripts/maps/PacifidlogTown_House5.inc +++ b/data/scripts/maps/PacifidlogTown_House5.inc @@ -5,7 +5,7 @@ PacifidlogTown_House5_EventScript_154394:: @ 8154394 lock faceplayer specialvar RESULT, IsMirageIslandPresent - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq PacifidlogTown_House5_EventScript_1543B0 msgbox PacifidlogTown_House5_Text_179718, 4 release diff --git a/data/scripts/maps/PetalburgCity.inc b/data/scripts/maps/PetalburgCity.inc index 4dca1fdb8..8b7d4f313 100644 --- a/data/scripts/maps/PetalburgCity.inc +++ b/data/scripts/maps/PetalburgCity.inc @@ -5,9 +5,9 @@ PetalburgCity_MapScripts:: @ 814B70C PetalburgCity_MapScript1_14B717:: @ 814B717 setflag 2070 - compare_var_to_imm 0x4057, 0 + compare 0x4057, 0 call_if 1, PetalburgCity_EventScript_14B731 - compare_var_to_imm 0x4057, 2 + compare 0x4057, 2 call_if 1, PetalburgCity_EventScript_14B739 end @@ -187,23 +187,23 @@ PetalburgCity_EventScript_14B866:: @ 814B866 waitmovement 0 applymovement 9, PetalburgCity_Movement_1A0835 waitmovement 0 - compare_var_to_imm 0x8008, 0 + compare 0x8008, 0 call_if 1, PetalburgCity_EventScript_14B91B - compare_var_to_imm 0x8008, 1 + compare 0x8008, 1 call_if 1, PetalburgCity_EventScript_14B930 - compare_var_to_imm 0x8008, 2 + compare 0x8008, 2 call_if 1, PetalburgCity_EventScript_14B93B - compare_var_to_imm 0x8008, 3 + compare 0x8008, 3 call_if 1, PetalburgCity_EventScript_14B950 msgbox PetalburgCity_Text_16438A, 4 closebutton - compare_var_to_imm 0x8008, 0 + compare 0x8008, 0 call_if 1, PetalburgCity_EventScript_14B965 - compare_var_to_imm 0x8008, 1 + compare 0x8008, 1 call_if 1, PetalburgCity_EventScript_14B977 - compare_var_to_imm 0x8008, 2 + compare 0x8008, 2 call_if 1, PetalburgCity_EventScript_14B989 - compare_var_to_imm 0x8008, 3 + compare 0x8008, 3 call_if 1, PetalburgCity_EventScript_14B99B msgbox PetalburgCity_Text_164426, 4 applymovement 9, PetalburgCity_Movement_1A0843 diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index f4598403f..1eff4d6c4 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -6,9 +6,9 @@ PetalburgCity_Gym_MapScripts:: @ 8154477 .byte 0 PetalburgCity_Gym_MapScript1_15448C:: @ 815448C - compare_var_to_imm 0x4085, 6 + compare 0x4085, 6 goto_if_eq PetalburgCity_Gym_EventScript_1544A3 - compare_var_to_imm 0x4085, 7 + compare 0x4085, 7 call_if 4, PetalburgCity_Gym_EventScript_1544ED end @@ -44,9 +44,9 @@ PetalburgCity_Gym_EventScript_1544ED:: @ 81544ED return PetalburgCity_Gym_MapScript1_15451B:: @ 815451B - compare_var_to_imm 0x4085, 1 + compare 0x4085, 1 call_if 1, PetalburgCity_Gym_EventScript_15453B - compare_var_to_imm 0x4085, 6 + compare 0x4085, 6 call_if 0, PetalburgCity_Gym_EventScript_154543 checkflag 2052 call_if 1, PetalburgCity_Gym_EventScript_15454B @@ -144,65 +144,65 @@ PetalburgCity_Gym_EventScript_15465E:: @ 815465E PetalburgCity_Gym_EventScript_154669:: @ 8154669 reappear 10 playse 8 - compare_var_to_imm 0x8008, 0 + compare 0x8008, 0 call_if 1, PetalburgCity_Gym_EventScript_1547EE - compare_var_to_imm 0x8008, 1 + compare 0x8008, 1 call_if 1, PetalburgCity_Gym_EventScript_154800 - compare_var_to_imm 0x8008, 2 + compare 0x8008, 2 call_if 1, PetalburgCity_Gym_EventScript_15481C - compare_var_to_imm 0x8008, 3 + compare 0x8008, 3 call_if 1, PetalburgCity_Gym_EventScript_15481C msgbox PetalburgCity_Gym_Text_179F07, 4 msgbox PetalburgCity_Gym_Text_179F37, 4 msgbox PetalburgCity_Gym_Text_179F70, 4 msgbox PetalburgCity_Gym_Text_17A03A, 4 - compare_var_to_imm 0x8008, 0 + compare 0x8008, 0 call_if 1, PetalburgCity_Gym_EventScript_154884 - compare_var_to_imm 0x8008, 1 + compare 0x8008, 1 call_if 1, PetalburgCity_Gym_EventScript_15488F - compare_var_to_imm 0x8008, 2 + compare 0x8008, 2 call_if 1, PetalburgCity_Gym_EventScript_1548A1 - compare_var_to_imm 0x8008, 3 + compare 0x8008, 3 call_if 1, PetalburgCity_Gym_EventScript_1548B3 msgbox PetalburgCity_Gym_Text_17A04A, 4 - compare_var_to_imm 0x8008, 0 + compare 0x8008, 0 call_if 1, PetalburgCity_Gym_EventScript_1548C5 - compare_var_to_imm 0x8008, 1 + compare 0x8008, 1 call_if 1, PetalburgCity_Gym_EventScript_1548D0 - compare_var_to_imm 0x8008, 2 + compare 0x8008, 2 call_if 1, PetalburgCity_Gym_EventScript_1548DB - compare_var_to_imm 0x8008, 3 + compare 0x8008, 3 call_if 1, PetalburgCity_Gym_EventScript_1548E6 msgbox PetalburgCity_Gym_Text_17A0A8, 4 msgbox PetalburgCity_Gym_Text_17A0EB, 4 msgbox PetalburgCity_Gym_Text_17A156, 4 - compare_var_to_imm 0x8008, 0 + compare 0x8008, 0 call_if 1, PetalburgCity_Gym_EventScript_15492F - compare_var_to_imm 0x8008, 1 + compare 0x8008, 1 call_if 1, PetalburgCity_Gym_EventScript_154930 - compare_var_to_imm 0x8008, 2 + compare 0x8008, 2 call_if 1, PetalburgCity_Gym_EventScript_15493B - compare_var_to_imm 0x8008, 3 + compare 0x8008, 3 call_if 1, PetalburgCity_Gym_EventScript_15493C - compare_var_to_imm 0x8008, 0 + compare 0x8008, 0 call_if 1, PetalburgCity_Gym_EventScript_1548F1 - compare_var_to_imm 0x8008, 1 + compare 0x8008, 1 call_if 1, PetalburgCity_Gym_EventScript_1548FC - compare_var_to_imm 0x8008, 2 + compare 0x8008, 2 call_if 1, PetalburgCity_Gym_EventScript_1548F1 - compare_var_to_imm 0x8008, 3 + compare 0x8008, 3 call_if 1, PetalburgCity_Gym_EventScript_1548F1 msgbox PetalburgCity_Gym_Text_17A171, 4 closebutton setflag 0x4001 playbgm 420, 0 - compare_var_to_imm 0x8008, 0 + compare 0x8008, 0 call_if 1, PetalburgCity_Gym_EventScript_154835 - compare_var_to_imm 0x8008, 1 + compare 0x8008, 1 call_if 1, PetalburgCity_Gym_EventScript_15484E - compare_var_to_imm 0x8008, 2 + compare 0x8008, 2 call_if 1, PetalburgCity_Gym_EventScript_154860 - compare_var_to_imm 0x8008, 3 + compare 0x8008, 3 call_if 1, PetalburgCity_Gym_EventScript_154872 disappear 10 setflag 728 @@ -352,7 +352,7 @@ PetalburgCity_Gym_EventScript_15493C:: @ 815493C PetalburgCity_Gym_EventScript_15493D:: @ 815493D call PetalburgCity_Gym_EventScript_154969 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_1549B8 checkflag 169 goto_if 0, PetalburgCity_Gym_EventScript_154A2C @@ -364,15 +364,15 @@ PetalburgCity_Gym_EventScript_15493D:: @ 815493D PetalburgCity_Gym_EventScript_154969:: @ 8154969 specialvar RESULT, IsEnigmaBerryValid - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_1549B2 checkitem ITEM_ENIGMA_BERRY, 1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_1549B2 checkpcitem ITEM_ENIGMA_BERRY, 1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_1549B2 - compare_var_to_imm 0x402d, 0 + compare 0x402d, 0 goto_if_eq PetalburgCity_Gym_EventScript_1549B2 msgbox PetalburgCity_Gym_Text_1C5570, 4 setvar RESULT, 1 @@ -384,7 +384,7 @@ PetalburgCity_Gym_EventScript_1549B2:: @ 81549B2 PetalburgCity_Gym_EventScript_1549B8:: @ 81549B8 giveitem ITEM_ENIGMA_BERRY - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_1A029B setvar 0x402d, 0 release @@ -413,28 +413,28 @@ PetalburgCity_Gym_EventScript_1549D6:: @ 81549D6 PetalburgCity_Gym_EventScript_154A2C:: @ 8154A2C giveitem ITEM_TM42 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_1A029B setflag 169 msgbox PetalburgCity_Gym_Text_17A8CF, 4 msgbox PetalburgCity_Gym_Text_17A976, 4 closebutton - compare_var_to_imm FACING, 2 + compare FACING, 2 call_if 1, PetalburgCity_Gym_EventScript_154ABC - compare_var_to_imm FACING, 1 + compare FACING, 1 call_if 1, PetalburgCity_Gym_EventScript_154AC7 - compare_var_to_imm FACING, 3 + compare FACING, 3 call_if 1, PetalburgCity_Gym_EventScript_154AD2 - compare_var_to_imm FACING, 4 + compare FACING, 4 call_if 1, PetalburgCity_Gym_EventScript_154ADD delay 70 - compare_var_to_imm FACING, 2 + compare FACING, 2 call_if 1, PetalburgCity_Gym_EventScript_154AE8 - compare_var_to_imm FACING, 1 + compare FACING, 1 call_if 1, PetalburgCity_Gym_EventScript_154AF3 - compare_var_to_imm FACING, 3 + compare FACING, 3 call_if 1, PetalburgCity_Gym_EventScript_154AFE - compare_var_to_imm FACING, 4 + compare FACING, 4 call_if 1, PetalburgCity_Gym_EventScript_154B09 msgbox PetalburgCity_Gym_Text_17A9F6, 4 release @@ -592,14 +592,14 @@ PetalburgCity_Gym_EventScript_154B69:: @ 8154B69 PetalburgCity_Gym_EventScript_154B73:: @ 8154B73 lockall - compare_var_to_imm 0x4085, 6 + compare 0x4085, 6 goto_if 0, PetalburgCity_Gym_EventScript_154BB9 setvar 0x8008, 7 setvar 0x8009, 85 msgbox PetalburgCity_Gym_Text_17B870, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -622,14 +622,14 @@ PetalburgCity_Gym_EventScript_154BB9:: @ 8154BB9 PetalburgCity_Gym_EventScript_154BC3:: @ 8154BC3 lockall - compare_var_to_imm 0x4085, 6 + compare 0x4085, 6 goto_if 0, PetalburgCity_Gym_EventScript_154BB9 setvar 0x8008, 1 setvar 0x8009, 98 msgbox PetalburgCity_Gym_Text_17B8D4, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -640,9 +640,9 @@ PetalburgCity_Gym_EventScript_154BF8:: @ 8154BF8 setvar 0x8008, 7 setvar 0x8009, 46 msgbox PetalburgCity_Gym_Text_17B90F, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -653,9 +653,9 @@ PetalburgCity_Gym_EventScript_154C2B:: @ 8154C2B setvar 0x8008, 1 setvar 0x8009, 59 msgbox PetalburgCity_Gym_Text_17B950, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -666,9 +666,9 @@ PetalburgCity_Gym_EventScript_154C5E:: @ 8154C5E setvar 0x8008, 7 setvar 0x8009, 59 msgbox PetalburgCity_Gym_Text_17B950, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -679,9 +679,9 @@ PetalburgCity_Gym_EventScript_154C91:: @ 8154C91 setvar 0x8008, 1 setvar 0x8009, 72 msgbox PetalburgCity_Gym_Text_17B98A, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -692,9 +692,9 @@ PetalburgCity_Gym_EventScript_154CC4:: @ 8154CC4 setvar 0x8008, 1 setvar 0x8009, 20 msgbox PetalburgCity_Gym_Text_17B9C5, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -705,9 +705,9 @@ PetalburgCity_Gym_EventScript_154CF7:: @ 8154CF7 setvar 0x8008, 7 setvar 0x8009, 20 msgbox PetalburgCity_Gym_Text_17B9C5, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -718,9 +718,9 @@ PetalburgCity_Gym_EventScript_154D2A:: @ 8154D2A setvar 0x8008, 1 setvar 0x8009, 33 msgbox PetalburgCity_Gym_Text_17BA00, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -731,9 +731,9 @@ PetalburgCity_Gym_EventScript_154D5D:: @ 8154D5D setvar 0x8008, 7 setvar 0x8009, 33 msgbox PetalburgCity_Gym_Text_17BA00, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -744,9 +744,9 @@ PetalburgCity_Gym_EventScript_154D90:: @ 8154D90 setvar 0x8008, 1 setvar 0x8009, 7 msgbox PetalburgCity_Gym_Text_17BA3D, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -757,9 +757,9 @@ PetalburgCity_Gym_EventScript_154DC3:: @ 8154DC3 setvar 0x8008, 7 setvar 0x8009, 7 msgbox PetalburgCity_Gym_Text_17BA3D, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -891,72 +891,72 @@ PetalburgCity_Gym_EventScript_154F91:: @ 8154F91 PetalburgCity_Gym_EventScript_154F9A:: @ 8154F9A setvar 0x8004, 1 - compare_var_to_imm 0x8005, 0 + compare 0x8005, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare_var_to_imm 0x8005, 1 + compare 0x8005, 1 call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_1550A2 return PetalburgCity_Gym_EventScript_154FBB:: @ 8154FBB setvar 0x8004, 2 - compare_var_to_imm 0x8005, 0 + compare 0x8005, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare_var_to_imm 0x8005, 1 + compare 0x8005, 1 call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_1550C7 return PetalburgCity_Gym_EventScript_154FDC:: @ 8154FDC setvar 0x8004, 3 - compare_var_to_imm 0x8005, 0 + compare 0x8005, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare_var_to_imm 0x8005, 1 + compare 0x8005, 1 call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_1550EC return PetalburgCity_Gym_EventScript_154FFD:: @ 8154FFD setvar 0x8004, 4 - compare_var_to_imm 0x8005, 0 + compare 0x8005, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare_var_to_imm 0x8005, 1 + compare 0x8005, 1 call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_155111 return PetalburgCity_Gym_EventScript_15501E:: @ 815501E setvar 0x8004, 5 - compare_var_to_imm 0x8005, 0 + compare 0x8005, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare_var_to_imm 0x8005, 1 + compare 0x8005, 1 call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_155124 return PetalburgCity_Gym_EventScript_15503F:: @ 815503F setvar 0x8004, 6 - compare_var_to_imm 0x8005, 0 + compare 0x8005, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare_var_to_imm 0x8005, 1 + compare 0x8005, 1 call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_155149 return PetalburgCity_Gym_EventScript_155060:: @ 8155060 setvar 0x8004, 7 - compare_var_to_imm 0x8005, 0 + compare 0x8005, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare_var_to_imm 0x8005, 1 + compare 0x8005, 1 call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_15515C return PetalburgCity_Gym_EventScript_155081:: @ 8155081 setvar 0x8004, 8 - compare_var_to_imm 0x8005, 0 + compare 0x8005, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare_var_to_imm 0x8005, 1 + compare 0x8005, 1 call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_15516F return diff --git a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc b/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc index 25783cf33..a70035fef 100644 --- a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc @@ -28,17 +28,17 @@ PetalburgCity_PokemonCenter_1F_EventScript_155233:: @ 8155233 faceplayer msgbox PetalburgCity_PokemonCenter_1F_Text_17BDC5, 4 specialvar RESULT, IsStarterInParty - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_15524F release end PetalburgCity_PokemonCenter_1F_EventScript_15524F:: @ 815524F - compare_var_to_imm 0x4023, 0 + compare 0x4023, 0 call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_155272 - compare_var_to_imm 0x4023, 1 + compare 0x4023, 1 call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_15527B - compare_var_to_imm 0x4023, 2 + compare 0x4023, 2 call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_155284 release end diff --git a/data/scripts/maps/PetalburgWoods.inc b/data/scripts/maps/PetalburgWoods.inc index 8f34eecc6..48eb53a50 100644 --- a/data/scripts/maps/PetalburgWoods.inc +++ b/data/scripts/maps/PetalburgWoods.inc @@ -91,7 +91,7 @@ PetalburgWoods_EventScript_15CDFA:: @ 815CDFA waitmovement 0 msgbox PetalburgWoods_Text_19507E, 4 giveitem ITEM_GREAT_BALL - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq PetalburgWoods_EventScript_15CE3F goto PetalburgWoods_EventScript_15CE4D end @@ -245,7 +245,7 @@ PetalburgWoods_EventScript_15CEDC:: @ 815CEDC goto_if_eq PetalburgWoods_EventScript_15CF0B msgbox PetalburgWoods_Text_19549E, 4 giveitem ITEM_MIRACLE_SEED - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq PetalburgWoods_EventScript_1A029B setflag 297 release @@ -272,7 +272,7 @@ PetalburgWoods_EventScript_15CF27:: @ 815CF27 PetalburgWoods_EventScript_15CF3E:: @ 815CF3E trainerbattle 0, OPPONENT_JAMES_1, 0, PetalburgWoods_Text_19526A, PetalburgWoods_Text_1952AE specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq PetalburgWoods_EventScript_15CF65 msgbox PetalburgWoods_Text_1952CC, 6 end diff --git a/data/scripts/maps/Route102.inc b/data/scripts/maps/Route102.inc index 70b750aef..95a0a4a1f 100644 --- a/data/scripts/maps/Route102.inc +++ b/data/scripts/maps/Route102.inc @@ -20,7 +20,7 @@ Route102_EventScript_14EAF5:: @ 814EAF5 Route102_EventScript_14EAFE:: @ 814EAFE trainerbattle 0, OPPONENT_CALVIN_1, 0, Route102_Text_1B79C3, Route102_Text_1B7A2C specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route102_EventScript_14EB25 msgbox Route102_Text_1B7A60, 6 end diff --git a/data/scripts/maps/Route103.inc b/data/scripts/maps/Route103.inc index 102d2aa0c..b46545050 100644 --- a/data/scripts/maps/Route103.inc +++ b/data/scripts/maps/Route103.inc @@ -10,9 +10,9 @@ Route103_MapScript1_14EB87:: @ 814EB87 Route103_EventScript_14EB92:: @ 814EB92 lockall checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route103_EventScript_14EBAB - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route103_EventScript_14EC04 end @@ -174,7 +174,7 @@ Route103_EventScript_14ED94:: @ 814ED94 Route103_EventScript_14EDAB:: @ 814EDAB trainerbattle 4, OPPONENT_AMY_AND_LIV_1, 0, Route103_Text_1B7DF7, Route103_Text_1B7E3B, Route103_Text_1B7EAC specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route103_EventScript_14EDD6 msgbox Route103_Text_1B7E50, 6 end @@ -187,7 +187,7 @@ Route103_EventScript_14EDD6:: @ 814EDD6 Route103_EventScript_14EDF1:: @ 814EDF1 trainerbattle 4, OPPONENT_AMY_AND_LIV_1, 0, Route103_Text_1B7EFB, Route103_Text_1B7F20, Route103_Text_1B7F8E specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route103_EventScript_14EE1C msgbox Route103_Text_1B7F40, 6 end @@ -205,7 +205,7 @@ Route103_EventScript_14EE37:: @ 814EE37 Route103_EventScript_14EE4E:: @ 814EE4E trainerbattle 0, OPPONENT_MIGUEL_1, 0, Route103_Text_1B82A9, Route103_Text_1B82EC specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route103_EventScript_14EE75 msgbox Route103_Text_1B830D, 6 end diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index d9f65a382..c954ac972 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -35,7 +35,7 @@ Route104_EventScript_14EEC8:: @ 814EEC8 goto_if_eq Route104_EventScript_14EEFF msgbox Route104_Text_1C55B9, 4 giveitem ITEM_CHESTO_BERRY - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route104_EventScript_1A029B setflag 246 msgbox Route104_Text_1C5665, 4 @@ -54,7 +54,7 @@ Route104_EventScript_14EF09:: @ 814EF09 goto_if_eq Route104_EventScript_14EF38 msgbox Route104_Text_16DD91, 4 giveitem ITEM_WHITE_HERB - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route104_EventScript_1A029B setflag 279 release @@ -108,7 +108,7 @@ Route104_EventScript_14EF93:: @ 814EF93 goto_if_eq Route104_EventScript_14EFC2 msgbox Route104_Text_16DC5F, 4 giveitem ITEM_TM09 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route104_EventScript_1A029B setflag 262 release @@ -410,7 +410,7 @@ Route104_EventScript_14F189:: @ 814F189 Route104_EventScript_14F1A0:: @ 814F1A0 trainerbattle 0, OPPONENT_HALEY_1, 0, Route104_Text_1B8770, Route104_Text_1B87A7 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route104_EventScript_14F1C7 msgbox Route104_Text_1B87C3, 6 end @@ -423,7 +423,7 @@ Route104_EventScript_14F1C7:: @ 814F1C7 Route104_EventScript_14F1DE:: @ 814F1DE trainerbattle 0, OPPONENT_WINSTON_1, 0, Route104_Text_1B88D4, Route104_Text_1B8911 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route104_EventScript_14F205 msgbox Route104_Text_1B8925, 6 end @@ -436,7 +436,7 @@ Route104_EventScript_14F205:: @ 814F205 Route104_EventScript_14F21C:: @ 814F21C trainerbattle 0, OPPONENT_CINDY_1, 0, Route104_Text_1B8A24, Route104_Text_1B8A61 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route104_EventScript_14F243 msgbox Route104_Text_1B8A69, 6 end diff --git a/data/scripts/maps/Route104_MrBrineysHouse.inc b/data/scripts/maps/Route104_MrBrineysHouse.inc index 6428e018b..cc3dad35a 100644 --- a/data/scripts/maps/Route104_MrBrineysHouse.inc +++ b/data/scripts/maps/Route104_MrBrineysHouse.inc @@ -4,7 +4,7 @@ Route104_MrBrineysHouse_MapScripts:: @ 815BCB2 Route104_MrBrineysHouse_MapScript1_15BCB8:: @ 815BCB8 setflag 2109 - compare_var_to_imm 0x4090, 1 + compare 0x4090, 1 call_if 1, Route104_MrBrineysHouse_EventScript_15BCD4 checkflag 188 call_if 1, Route104_MrBrineysHouse_EventScript_15BCD0 @@ -37,7 +37,7 @@ Route104_MrBrineysHouse_EventScript_15BD0E:: @ 815BD0E setflag 147 msgbox Route104_MrBrineysHouse_Text_191A82, 4 msgbox Route104_MrBrineysHouse_Text_191AAD, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route104_MrBrineysHouse_EventScript_15BD97 goto Route104_MrBrineysHouse_EventScript_15BDAB end @@ -54,14 +54,14 @@ Route104_MrBrineysHouse_EventScript_15BD32:: @ 815BD32 Route104_MrBrineysHouse_EventScript_15BD65:: @ 815BD65 msgbox Route104_MrBrineysHouse_Text_191CC3, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route104_MrBrineysHouse_EventScript_15BD97 goto Route104_MrBrineysHouse_EventScript_15BDAB end Route104_MrBrineysHouse_EventScript_15BD7E:: @ 815BD7E msgbox Route104_MrBrineysHouse_Text_191DA6, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route104_MrBrineysHouse_EventScript_15BD97 goto Route104_MrBrineysHouse_EventScript_15BDAB end diff --git a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc index 44fb9a082..876af8650 100644 --- a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc +++ b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc @@ -25,18 +25,18 @@ Route104_PrettyPetalFlowerShop_EventScript_15BE0B:: @ 815BE0B goto_if_eq Route104_PrettyPetalFlowerShop_EventScript_15BE4A setflag 127 msgbox Route104_PrettyPetalFlowerShop_Text_1C5F48, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, Route104_PrettyPetalFlowerShop_EventScript_15BE6A - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, Route104_PrettyPetalFlowerShop_EventScript_15BE73 release end Route104_PrettyPetalFlowerShop_EventScript_15BE4A:: @ 815BE4A msgbox Route104_PrettyPetalFlowerShop_Text_1C5F1B, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, Route104_PrettyPetalFlowerShop_EventScript_15BE6A - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, Route104_PrettyPetalFlowerShop_EventScript_15BE73 release end @@ -96,7 +96,7 @@ Route104_PrettyPetalFlowerShop_EventScript_15BEDA:: @ 815BEDA random 8 addvar RESULT, 133 giveitem RESULT - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route104_PrettyPetalFlowerShop_EventScript_1A029B setflag 2256 msgbox Route104_PrettyPetalFlowerShop_Text_1C6335, 4 diff --git a/data/scripts/maps/Route106.inc b/data/scripts/maps/Route106.inc index 6a0eea00f..2ec903363 100644 --- a/data/scripts/maps/Route106.inc +++ b/data/scripts/maps/Route106.inc @@ -18,7 +18,7 @@ Route106_EventScript_14F34F:: @ 814F34F Route106_EventScript_14F366:: @ 814F366 trainerbattle 0, OPPONENT_ELLIOT_1, 0, Route106_Text_1B8EF0, Route106_Text_1B8F25 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route106_EventScript_14F38D msgbox Route106_Text_1B8F55, 6 end diff --git a/data/scripts/maps/Route107.inc b/data/scripts/maps/Route107.inc index 907ac93a2..b6973407b 100644 --- a/data/scripts/maps/Route107.inc +++ b/data/scripts/maps/Route107.inc @@ -9,7 +9,7 @@ Route107_EventScript_14F3BC:: @ 814F3BC Route107_EventScript_14F3D3:: @ 814F3D3 trainerbattle 0, OPPONENT_TONY_1, 0, Route107_Text_1B933A, Route107_Text_1B9365 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route107_EventScript_14F3FA msgbox Route107_Text_1B938E, 6 end diff --git a/data/scripts/maps/Route109.inc b/data/scripts/maps/Route109.inc index bd5116a43..45ff1d3ed 100644 --- a/data/scripts/maps/Route109.inc +++ b/data/scripts/maps/Route109.inc @@ -279,7 +279,7 @@ Route109_EventScript_14F680:: @ 814F680 Route109_EventScript_14F691:: @ 814F691 message Route109_Text_16E0F9 msgbox Route109_Text_16E0F9, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route109_EventScript_14F6F1 goto Route109_EventScript_14F6E2 end @@ -332,7 +332,7 @@ Route109_EventScript_14F725:: @ 814F725 goto_if_eq Route109_EventScript_14F762 msgbox Route109_Text_16E433, 4 giveitem ITEM_SOFT_SAND - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route109_EventScript_1A029B closebutton applymovement LAST_TALKED, Route109_Movement_1A083D @@ -397,7 +397,7 @@ Route109_EventScript_14F7F2:: @ 814F7F2 Route109_EventScript_14F809:: @ 814F809 trainerbattle 0, OPPONENT_RICKY_1, 0, Route109_Text_1B9C23, Route109_Text_1B9C65 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route109_EventScript_14F830 msgbox Route109_Text_1B9C6E, 6 end @@ -410,7 +410,7 @@ Route109_EventScript_14F830:: @ 814F830 Route109_EventScript_14F847:: @ 814F847 trainerbattle 0, OPPONENT_LOLA_1, 0, Route109_Text_1B9D54, Route109_Text_1B9D87 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route109_EventScript_14F86E msgbox Route109_Text_1B9D8E, 6 end diff --git a/data/scripts/maps/Route109_SeashoreHouse.inc b/data/scripts/maps/Route109_SeashoreHouse.inc index 2a69242c2..789ee3e56 100644 --- a/data/scripts/maps/Route109_SeashoreHouse.inc +++ b/data/scripts/maps/Route109_SeashoreHouse.inc @@ -28,7 +28,7 @@ Route109_SeashoreHouse_EventScript_160DFE:: @ 8160DFE Route109_SeashoreHouse_EventScript_160E08:: @ 8160E08 msgbox Route109_SeashoreHouse_Text_19B609, 4 giveitem ITEM_SODA_POP, 6 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route109_SeashoreHouse_EventScript_160E2C setflag 140 release @@ -43,7 +43,7 @@ Route109_SeashoreHouse_EventScript_160E36:: @ 8160E36 showmoney 0, 0 nop msgbox Route109_SeashoreHouse_Text_19B702, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route109_SeashoreHouse_EventScript_160E5A msgbox Route109_SeashoreHouse_Text_19B773, 4 hidemoney 0, 0 @@ -52,10 +52,10 @@ Route109_SeashoreHouse_EventScript_160E36:: @ 8160E36 Route109_SeashoreHouse_EventScript_160E5A:: @ 8160E5A checkmoney 0x12c, 0 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route109_SeashoreHouse_EventScript_160E9E checkitemspace ITEM_SODA_POP, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route109_SeashoreHouse_EventScript_160EAB msgbox Route109_SeashoreHouse_Text_19B74C, 4 paymoney 0x12c, 0 diff --git a/data/scripts/maps/Route110.inc b/data/scripts/maps/Route110.inc index e4582e08e..56d4ff196 100644 --- a/data/scripts/maps/Route110.inc +++ b/data/scripts/maps/Route110.inc @@ -12,7 +12,7 @@ Route110_MapScript1_14F914:: @ 814F914 call Route110_EventScript_1A0196 call Route110_EventScript_1A014E call Route110_EventScript_1A0172 - compare_var_to_imm 0x40a9, 1 + compare 0x40a9, 1 call_if 1, Route110_EventScript_14F92F end @@ -132,7 +132,7 @@ Route110_EventScript_14FA25:: @ 814FA25 Route110_EventScript_14FA2E:: @ 814FA2E lockall specialvar RESULT, GetRecordedCyclingRoadResults - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route110_EventScript_14FA49 msgbox Route110_Text_16F53A, 4 releaseall @@ -147,9 +147,9 @@ Route110_EventScript_14FA53:: @ 814FA53 lock faceplayer specialvar RESULT, GetPlayerAvatarBike - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route110_EventScript_14FA84 - compare_var_to_imm 0x40a9, 0 + compare 0x40a9, 0 goto_if_eq Route110_EventScript_14FA7A msgbox Route110_Text_16F26A, 4 release @@ -178,7 +178,7 @@ Route110_EventScript_14FAA5:: @ 814FAA5 Route110_EventScript_14FABC:: @ 814FABC trainerbattle 0, OPPONENT_EDWIN_1, 0, Route110_Text_1BA7D2, Route110_Text_1BA803 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route110_EventScript_14FAE3 msgbox Route110_Text_1BA829, 6 end @@ -206,7 +206,7 @@ Route110_EventScript_14FB28:: @ 814FB28 Route110_EventScript_14FB3F:: @ 814FB3F trainerbattle 0, OPPONENT_BENJAMIN_1, 0, Route110_Text_1BA352, Route110_Text_1BA379 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route110_EventScript_14FB66 msgbox Route110_Text_1BA3A5, 6 end @@ -224,7 +224,7 @@ Route110_EventScript_14FB7D:: @ 814FB7D Route110_EventScript_14FB94:: @ 814FB94 trainerbattle 0, OPPONENT_ABIGAIL_1, 0, Route110_Text_1BA4A0, Route110_Text_1BA50F specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route110_EventScript_14FBBB msgbox Route110_Text_1BA52E, 6 end @@ -237,7 +237,7 @@ Route110_EventScript_14FBBB:: @ 814FBBB Route110_EventScript_14FBD2:: @ 814FBD2 trainerbattle 0, OPPONENT_ISABEL_1, 0, Route110_Text_1BA990, Route110_Text_1BA9D0 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route110_EventScript_14FBF9 msgbox Route110_Text_1BA9E9, 6 end @@ -326,9 +326,9 @@ Route110_EventScript_14FD29:: @ 814FD29 Route110_EventScript_14FD34:: @ 814FD34 lockall checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, Route110_EventScript_14FDA7 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, Route110_EventScript_14FDAC applymovement 28, Route110_Movement_1A0845 waitmovement 0 @@ -337,16 +337,16 @@ Route110_EventScript_14FD34:: @ 814FD34 applymovement 28, Route110_Movement_1A0835 waitmovement 0 delay 30 - compare_var_to_imm 0x8008, 1 + compare 0x8008, 1 call_if 1, Route110_EventScript_14FF14 - compare_var_to_imm 0x8008, 2 + compare 0x8008, 2 call_if 1, Route110_EventScript_14FF1F - compare_var_to_imm 0x8008, 3 + compare 0x8008, 3 call_if 1, Route110_EventScript_14FF2A checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route110_EventScript_14FDB1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route110_EventScript_14FE2B releaseall end @@ -425,22 +425,22 @@ Route110_EventScript_14FEA5:: @ 814FEA5 Route110_EventScript_14FEB2:: @ 814FEB2 closebutton - compare_var_to_imm 0x8008, 1 + compare 0x8008, 1 call_if 1, Route110_EventScript_14FF56 - compare_var_to_imm 0x8008, 2 + compare 0x8008, 2 call_if 1, Route110_EventScript_14FF5E - compare_var_to_imm 0x8008, 3 + compare 0x8008, 3 call_if 1, Route110_EventScript_14FF66 spritebehave 28, 10 spritebehave 29, 10 disappear 28 reappear 29 delay 45 - compare_var_to_imm 0x8008, 1 + compare 0x8008, 1 call_if 1, Route110_EventScript_14FF35 - compare_var_to_imm 0x8008, 2 + compare 0x8008, 2 call_if 1, Route110_EventScript_14FF40 - compare_var_to_imm 0x8008, 3 + compare 0x8008, 3 call_if 1, Route110_EventScript_14FF4B disappear 29 setvar 0x4069, 1 diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc index c2900de22..a7db7e0ee 100644 --- a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc +++ b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc @@ -3,9 +3,9 @@ Route110_SeasideCyclingRoadNorthEntrance_MapScripts:: @ 81634C8 .byte 0 Route110_SeasideCyclingRoadNorthEntrance_MapScript1_1634CE:: @ 81634CE - compare_var_to_imm 0x40a9, 3 + compare 0x40a9, 3 call_if 1, Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634E5 - compare_var_to_imm 0x40a9, 2 + compare 0x40a9, 2 call_if 1, Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634E5 end @@ -24,9 +24,9 @@ Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634F7:: @ 81634F7 @ Coord event directly in front of the gatesman heading left to right lockall specialvar RESULT, GetPlayerAvatarBike @ player state? - compare_var_to_imm RESULT, 2 + compare RESULT, 2 call_if 1, Route110_SeasideCyclingRoadNorthEntrance_EventScript_16351D - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route110_SeasideCyclingRoadNorthEntrance_EventScript_163523 setflag 2091 setvar 0x4001, 1 diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc b/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc index c385a7bc9..1cb046a99 100644 --- a/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc +++ b/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc @@ -11,7 +11,7 @@ Route110_SeasideCyclingRoadSouthEntrance_EventScript_16347F:: @ 816347F Route110_SeasideCyclingRoadSouthEntrance_EventScript_16348B:: @ 816348B lockall specialvar RESULT, GetPlayerAvatarBike - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route110_SeasideCyclingRoadSouthEntrance_EventScript_1634A6 setflag 2091 setvar 0x4001, 1 diff --git a/data/scripts/maps/Route110_TrickHouseEnd.inc b/data/scripts/maps/Route110_TrickHouseEnd.inc index 61c0e65a6..f99869648 100644 --- a/data/scripts/maps/Route110_TrickHouseEnd.inc +++ b/data/scripts/maps/Route110_TrickHouseEnd.inc @@ -6,7 +6,7 @@ Route110_TrickHouseEnd_MapScripts:: @ 8161936 .byte 0 Route110_TrickHouseEnd_MapScript1_16194B:: @ 816194B - compare_var_to_imm 0x4001, 1 + compare 0x4001, 1 call_if 1, Route110_TrickHouseEnd_EventScript_161994 end @@ -61,7 +61,7 @@ Route110_TrickHouseEnd_EventScript_161A0B:: @ 8161A0B msgbox Route110_TrickHouseEnd_Text_19C90B, 4 setvar 0x40c1, 0 giveitem ITEM_RARE_CANDY - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 closebutton @@ -74,7 +74,7 @@ Route110_TrickHouseEnd_EventScript_161A47:: @ 8161A47 msgbox Route110_TrickHouseEnd_Text_19C90B, 4 setvar 0x40c1, 0 giveitem ITEM_TIMER_BALL - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 closebutton @@ -87,7 +87,7 @@ Route110_TrickHouseEnd_EventScript_161A83:: @ 8161A83 msgbox Route110_TrickHouseEnd_Text_19C90B, 4 setvar 0x40c1, 0 giveitem ITEM_HARD_STONE - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 closebutton @@ -100,7 +100,7 @@ Route110_TrickHouseEnd_EventScript_161ABF:: @ 8161ABF msgbox Route110_TrickHouseEnd_Text_19C90B, 4 setvar 0x40c1, 0 giveitem ITEM_SMOKE_BALL - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 closebutton @@ -113,7 +113,7 @@ Route110_TrickHouseEnd_EventScript_161AFB:: @ 8161AFB msgbox Route110_TrickHouseEnd_Text_19C90B, 4 setvar 0x40c1, 0 giveitem ITEM_TM12 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 closebutton @@ -126,7 +126,7 @@ Route110_TrickHouseEnd_EventScript_161B37:: @ 8161B37 msgbox Route110_TrickHouseEnd_Text_19C90B, 4 setvar 0x40c1, 0 giveitem ITEM_MAGNET - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 closebutton @@ -139,7 +139,7 @@ Route110_TrickHouseEnd_EventScript_161B73:: @ 8161B73 msgbox Route110_TrickHouseEnd_Text_19C90B, 4 setvar 0x40c1, 0 giveitem ITEM_PP_MAX - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 closebutton @@ -150,13 +150,13 @@ Route110_TrickHouseEnd_EventScript_161B73:: @ 8161B73 Route110_TrickHouseEnd_EventScript_161BAF:: @ 8161BAF msgbox Route110_TrickHouseEnd_Text_19C5AF, 4 closebutton - compare_var_to_imm FACING, 1 + compare FACING, 1 call_if 1, Route110_TrickHouseEnd_EventScript_161C74 - compare_var_to_imm FACING, 2 + compare FACING, 2 call_if 1, Route110_TrickHouseEnd_EventScript_161C7F - compare_var_to_imm FACING, 3 + compare FACING, 3 call_if 1, Route110_TrickHouseEnd_EventScript_161C8A - compare_var_to_imm FACING, 4 + compare FACING, 4 call_if 1, Route110_TrickHouseEnd_EventScript_161C95 delay 30 msgbox Route110_TrickHouseEnd_Text_19C602, 4 @@ -171,7 +171,7 @@ Route110_TrickHouseEnd_EventScript_161BAF:: @ 8161BAF .else givedecoration 31 .endc - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C61 msgbox Route110_TrickHouseEnd_Text_19C85C, 4 call Route110_TrickHouseEnd_EventScript_161C2E diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.inc b/data/scripts/maps/Route110_TrickHouseEntrance.inc index 4e60c9fc1..129cc7d6a 100644 --- a/data/scripts/maps/Route110_TrickHouseEntrance.inc +++ b/data/scripts/maps/Route110_TrickHouseEntrance.inc @@ -6,17 +6,17 @@ Route110_TrickHouseEntrance_MapScripts:: @ 8160F2B Route110_TrickHouseEntrance_MapScript1_160F3B:: @ 8160F3B setflag 2114 - compare_var_to_imm 0x40b5, 1 + compare 0x40b5, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_160FCE - compare_var_to_imm 0x40c1, 1 + compare 0x40c1, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_160FB2 - compare_var_to_imm 0x40a6, 1 + compare 0x40a6, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_16108E - compare_var_to_imm 0x40a7, 5 + compare 0x40a7, 5 call_if 1, Route110_TrickHouseEntrance_EventScript_160FDE - compare_var_to_imm 0x40a7, 3 + compare 0x40a7, 3 call_if 1, Route110_TrickHouseEntrance_EventScript_160FDE - compare_var_to_imm 0x40a7, 0 + compare 0x40a7, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_160FDE switch 0x40a7 case 0, Route110_TrickHouseEntrance_EventScript_16109A @@ -27,7 +27,7 @@ Route110_TrickHouseEntrance_MapScript1_160F3B:: @ 8160F3B Route110_TrickHouseEntrance_EventScript_160FB2:: @ 8160FB2 setvar 0x40a5, 1 - compare_var_to_imm 0x4044, 8 + compare 0x4044, 8 goto_if_eq Route110_TrickHouseEntrance_EventScript_160FC8 setvar 0x40a7, 2 end @@ -44,21 +44,21 @@ Route110_TrickHouseEntrance_EventScript_160FCE:: @ 8160FCE Route110_TrickHouseEntrance_EventScript_160FDE:: @ 8160FDE setvar 0x40a7, 0 - compare_var_to_imm 0x4044, 1 + compare 0x4044, 1 call_if 1, Route110_TrickHouseEntrance_EventScript_16103C - compare_var_to_imm 0x4044, 2 + compare 0x4044, 2 call_if 1, Route110_TrickHouseEntrance_EventScript_161046 - compare_var_to_imm 0x4044, 3 + compare 0x4044, 3 call_if 1, Route110_TrickHouseEntrance_EventScript_161050 - compare_var_to_imm 0x4044, 4 + compare 0x4044, 4 call_if 1, Route110_TrickHouseEntrance_EventScript_16105A - compare_var_to_imm 0x4044, 5 + compare 0x4044, 5 call_if 1, Route110_TrickHouseEntrance_EventScript_161064 - compare_var_to_imm 0x4044, 6 + compare 0x4044, 6 call_if 1, Route110_TrickHouseEntrance_EventScript_16106E - compare_var_to_imm 0x4044, 7 + compare 0x4044, 7 call_if 1, Route110_TrickHouseEntrance_EventScript_161078 - compare_var_to_imm 0x4044, 8 + compare 0x4044, 8 call_if 1, Route110_TrickHouseEntrance_EventScript_161082 return @@ -213,7 +213,7 @@ Route110_TrickHouseEntrance_MapScript2_1611CD:: @ 81611CD Route110_TrickHouseEntrance_EventScript_1611D7:: @ 81611D7 lockall delay 20 - compare_var_to_imm 0x4044, 0 + compare 0x4044, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_161327 msgbox Route110_TrickHouseEntrance_Text_19BD82, 4 closebutton @@ -248,21 +248,21 @@ Route110_TrickHouseEntrance_EventScript_16124D:: @ 816124D waitmovement 0 applymovement 255, Route110_TrickHouseEntrance_Movement_1A0835 waitmovement 0 - compare_var_to_imm 0x4044, 0 + compare 0x4044, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_1612CD - compare_var_to_imm 0x4044, 1 + compare 0x4044, 1 call_if 1, Route110_TrickHouseEntrance_EventScript_1612D6 - compare_var_to_imm 0x4044, 2 + compare 0x4044, 2 call_if 1, Route110_TrickHouseEntrance_EventScript_1612DF - compare_var_to_imm 0x4044, 3 + compare 0x4044, 3 call_if 1, Route110_TrickHouseEntrance_EventScript_1612E8 - compare_var_to_imm 0x4044, 4 + compare 0x4044, 4 call_if 1, Route110_TrickHouseEntrance_EventScript_1612F1 - compare_var_to_imm 0x4044, 5 + compare 0x4044, 5 call_if 1, Route110_TrickHouseEntrance_EventScript_1612FA - compare_var_to_imm 0x4044, 6 + compare 0x4044, 6 call_if 1, Route110_TrickHouseEntrance_EventScript_161303 - compare_var_to_imm 0x4044, 7 + compare 0x4044, 7 call_if 1, Route110_TrickHouseEntrance_EventScript_16130C closebutton setvar 0x40a6, 1 @@ -351,27 +351,27 @@ Route110_TrickHouseEntrance_EventScript_16136E:: @ 816136E applymovement 1, Route110_TrickHouseEntrance_Movement_1A0839 waitmovement 0 msgbox Route110_TrickHouseEntrance_Text_19C07E, 4 - compare_var_to_imm 0x4044, 1 + compare 0x4044, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_1613CE - compare_var_to_imm 0x4044, 2 + compare 0x4044, 2 goto_if_eq Route110_TrickHouseEntrance_EventScript_1613FA - compare_var_to_imm 0x4044, 3 + compare 0x4044, 3 goto_if_eq Route110_TrickHouseEntrance_EventScript_161426 - compare_var_to_imm 0x4044, 4 + compare 0x4044, 4 goto_if_eq Route110_TrickHouseEntrance_EventScript_161452 - compare_var_to_imm 0x4044, 5 + compare 0x4044, 5 goto_if_eq Route110_TrickHouseEntrance_EventScript_16147E - compare_var_to_imm 0x4044, 6 + compare 0x4044, 6 goto_if_eq Route110_TrickHouseEntrance_EventScript_1614AA - compare_var_to_imm 0x4044, 7 + compare 0x4044, 7 goto_if_eq Route110_TrickHouseEntrance_EventScript_1614D6 end Route110_TrickHouseEntrance_EventScript_1613CE:: @ 81613CE giveitem ITEM_RARE_CANDY - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_1A02A5 msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4 releaseall @@ -379,9 +379,9 @@ Route110_TrickHouseEntrance_EventScript_1613CE:: @ 81613CE Route110_TrickHouseEntrance_EventScript_1613FA:: @ 81613FA giveitem ITEM_TIMER_BALL - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_1A02A5 msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4 releaseall @@ -389,9 +389,9 @@ Route110_TrickHouseEntrance_EventScript_1613FA:: @ 81613FA Route110_TrickHouseEntrance_EventScript_161426:: @ 8161426 giveitem ITEM_HARD_STONE - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_1A02A5 msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4 releaseall @@ -399,9 +399,9 @@ Route110_TrickHouseEntrance_EventScript_161426:: @ 8161426 Route110_TrickHouseEntrance_EventScript_161452:: @ 8161452 giveitem ITEM_SMOKE_BALL - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_1A02A5 msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4 releaseall @@ -409,9 +409,9 @@ Route110_TrickHouseEntrance_EventScript_161452:: @ 8161452 Route110_TrickHouseEntrance_EventScript_16147E:: @ 816147E giveitem ITEM_TM12 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_1A02A5 msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4 releaseall @@ -419,9 +419,9 @@ Route110_TrickHouseEntrance_EventScript_16147E:: @ 816147E Route110_TrickHouseEntrance_EventScript_1614AA:: @ 81614AA giveitem ITEM_MAGNET - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_1A02A5 msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4 releaseall @@ -429,9 +429,9 @@ Route110_TrickHouseEntrance_EventScript_1614AA:: @ 81614AA Route110_TrickHouseEntrance_EventScript_1614D6:: @ 81614D6 giveitem ITEM_PP_MAX - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_1A02A5 msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4 releaseall @@ -454,9 +454,9 @@ Route110_TrickHouseEntrance_EventScript_161518:: @ 8161518 .else givedecoration 31 .endif - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161551 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_1A02B8 msgbox Route110_TrickHouseEntrance_Text_19C18D, 4 releaseall @@ -495,7 +495,7 @@ Route110_TrickHouseEntrance_EventScript_1615BD:: @ 81615BD Route110_TrickHouseEntrance_EventScript_1615C7:: @ 81615C7 msgbox Route110_TrickHouseEntrance_Text_19BE7D, 5 closebutton - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_1615DD releaseall end @@ -577,7 +577,7 @@ Route110_TrickHouseEntrance_EventScript_1616B8:: @ 81616B8 end Route110_TrickHouseEntrance_EventScript_1616C2:: @ 81616C2 - compare_var_to_imm 0x4044, 8 + compare 0x4044, 8 goto_if_eq Route110_TrickHouseEntrance_EventScript_1616D7 msgbox Route110_TrickHouseEntrance_Text_19BE6E, 4 releaseall @@ -602,7 +602,7 @@ gUnknown_081616E1:: @ 81616E1 end Route110_TrickHouseEntrance_EventScript_161740:: @ 8161740 - compare_var_to_imm 0x40AB, 0 + compare 0x40AB, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819CAD1, 4 playse SE_PIN @@ -613,7 +613,7 @@ Route110_TrickHouseEntrance_EventScript_161740:: @ 8161740 end Route110_TrickHouseEntrance_EventScript_161769:: @ 8161769 - compare_var_to_imm 0x40AC, 0 + compare 0x40AC, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819CCCB, 4 playse SE_PIN @@ -624,7 +624,7 @@ Route110_TrickHouseEntrance_EventScript_161769:: @ 8161769 end Route110_TrickHouseEntrance_EventScript_161792:: @ 8161792 - compare_var_to_imm 0x40AD, 0 + compare 0x40AD, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819CEF9, 4 playse SE_PIN @@ -635,7 +635,7 @@ Route110_TrickHouseEntrance_EventScript_161792:: @ 8161792 end Route110_TrickHouseEntrance_EventScript_1617BB:: @ 81617BB - compare_var_to_imm 0x40AE, 0 + compare 0x40AE, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819D164, 4 playse SE_PIN @@ -646,7 +646,7 @@ Route110_TrickHouseEntrance_EventScript_1617BB:: @ 81617BB end Route110_TrickHouseEntrance_EventScript_1617E4:: @ 81617E4 - compare_var_to_imm 0x40AF, 0 + compare 0x40AF, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819D3A5, 4 playse SE_PIN @@ -657,7 +657,7 @@ Route110_TrickHouseEntrance_EventScript_1617E4:: @ 81617E4 end Route110_TrickHouseEntrance_EventScript_16180D:: @ 816180D - compare_var_to_imm 0x40B0, 0 + compare 0x40B0, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819DC0A, 4 playse SE_PIN @@ -668,7 +668,7 @@ Route110_TrickHouseEntrance_EventScript_16180D:: @ 816180D end Route110_TrickHouseEntrance_EventScript_161836:: @ 8161836 - compare_var_to_imm 0x40B1, 0 + compare 0x40B1, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819DE8D, 4 playse SE_PIN @@ -679,7 +679,7 @@ Route110_TrickHouseEntrance_EventScript_161836:: @ 8161836 end Route110_TrickHouseEntrance_EventScript_16185F:: @ 816185F - compare_var_to_imm 0x40B2, 0 + compare 0x40B2, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819E0FF, 4 playse SE_PIN @@ -726,11 +726,11 @@ Route110_TrickHouseEntrance_EventScript_1618B0:: @ 81618B0 lockall msgbox Route110_TrickHouseEntrance_Text_19BA56, 4 releaseall - compare_var_to_imm 0x4044, 0 + compare 0x4044, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_1618E1 - compare_var_to_imm 0x4044, 1 + compare 0x4044, 1 call_if 1, Route110_TrickHouseEntrance_EventScript_1618F6 - compare_var_to_imm 0x4044, 2 + compare 0x4044, 2 call_if 1, Route110_TrickHouseEntrance_EventScript_16190B setvar 0x40a5, 1 end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle1.inc b/data/scripts/maps/Route110_TrickHousePuzzle1.inc index d9536edde..3a89c2db1 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle1.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle1.inc @@ -3,7 +3,7 @@ Route110_TrickHousePuzzle1_MapScripts:: @ 8161CF8 .byte 0 Route110_TrickHousePuzzle1_MapScript1_161CFE:: @ 8161CFE - compare_var_to_imm 0x40ab, 2 + compare 0x40ab, 2 goto_if_eq Route110_TrickHousePuzzle1_EventScript_161D0A end @@ -13,7 +13,7 @@ Route110_TrickHousePuzzle1_EventScript_161D0A:: @ 8161D0A Route110_TrickHousePuzzle1_EventScript_161D14:: @ 8161D14 lockall - compare_var_to_imm 0x40ab, 0 + compare 0x40ab, 0 goto_if_eq Route110_TrickHousePuzzle1_EventScript_161D26 goto Route110_TrickHousePuzzle1_EventScript_161892 end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle2.inc b/data/scripts/maps/Route110_TrickHousePuzzle2.inc index 6252a96d6..f71a9611a 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle2.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle2.inc @@ -4,13 +4,13 @@ Route110_TrickHousePuzzle2_MapScripts:: @ 8161D76 .byte 0 Route110_TrickHousePuzzle2_MapScript1_161D81:: @ 8161D81 - compare_var_to_imm 0x4001, 1 + compare 0x4001, 1 call_if 1, Route110_TrickHousePuzzle2_EventScript_161E2C - compare_var_to_imm 0x4002, 1 + compare 0x4002, 1 call_if 1, Route110_TrickHousePuzzle2_EventScript_161E3F - compare_var_to_imm 0x4003, 1 + compare 0x4003, 1 call_if 1, Route110_TrickHousePuzzle2_EventScript_161E52 - compare_var_to_imm 0x4004, 1 + compare 0x4004, 1 call_if 1, Route110_TrickHousePuzzle2_EventScript_161E65 end @@ -23,7 +23,7 @@ Route110_TrickHousePuzzle2_MapScript1_161DAE:: @ 8161DAE Route110_TrickHousePuzzle2_EventScript_161DC3:: @ 8161DC3 lockall - compare_var_to_imm 0x40ac, 0 + compare 0x40ac, 0 goto_if_eq Route110_TrickHousePuzzle2_EventScript_161DD5 goto Route110_TrickHousePuzzle2_EventScript_161892 end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle3.inc b/data/scripts/maps/Route110_TrickHousePuzzle3.inc index 705f52455..a50ecd3ce 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle3.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle3.inc @@ -5,9 +5,9 @@ Route110_TrickHousePuzzle3_MapScripts:: @ 8161EBD Route110_TrickHousePuzzle3_MapScript1_161EC8:: @ 8161EC8 call Route110_TrickHousePuzzle3_EventScript_161F12 - compare_var_to_imm 0x4009, 0 + compare 0x4009, 0 call_if 1, Route110_TrickHousePuzzle3_EventScript_161FE5 - compare_var_to_imm 0x4009, 1 + compare 0x4009, 1 call_if 1, Route110_TrickHousePuzzle3_EventScript_1622C8 end @@ -31,19 +31,19 @@ Route110_TrickHousePuzzle3_EventScript_161F12:: @ 8161F12 setmaptile 13, 7, 600, 0 setmaptile 1, 3, 600, 0 setmaptile 10, 2, 600, 0 - compare_var_to_imm 0x4008, 1 + compare 0x4008, 1 call_if 1, Route110_TrickHousePuzzle3_EventScript_161F9F - compare_var_to_imm 0x4008, 2 + compare 0x4008, 2 call_if 1, Route110_TrickHousePuzzle3_EventScript_161FA9 - compare_var_to_imm 0x4008, 3 + compare 0x4008, 3 call_if 1, Route110_TrickHousePuzzle3_EventScript_161FB3 - compare_var_to_imm 0x4008, 4 + compare 0x4008, 4 call_if 1, Route110_TrickHousePuzzle3_EventScript_161FBD - compare_var_to_imm 0x4008, 5 + compare 0x4008, 5 call_if 1, Route110_TrickHousePuzzle3_EventScript_161FC7 - compare_var_to_imm 0x4008, 6 + compare 0x4008, 6 call_if 1, Route110_TrickHousePuzzle3_EventScript_161FD1 - compare_var_to_imm 0x4008, 7 + compare 0x4008, 7 call_if 1, Route110_TrickHousePuzzle3_EventScript_161FDB return @@ -302,19 +302,19 @@ Route110_TrickHousePuzzle3_EventScript_162612:: @ 8162612 setvar 0x4005, 0 setvar 0x4006, 0 setvar 0x4007, 0 - compare_var_to_imm 0x4008, 1 + compare 0x4008, 1 call_if 1, Route110_TrickHousePuzzle3_EventScript_162683 - compare_var_to_imm 0x4008, 2 + compare 0x4008, 2 call_if 1, Route110_TrickHousePuzzle3_EventScript_162689 - compare_var_to_imm 0x4008, 3 + compare 0x4008, 3 call_if 1, Route110_TrickHousePuzzle3_EventScript_16268F - compare_var_to_imm 0x4008, 4 + compare 0x4008, 4 call_if 1, Route110_TrickHousePuzzle3_EventScript_162695 - compare_var_to_imm 0x4008, 5 + compare 0x4008, 5 call_if 1, Route110_TrickHousePuzzle3_EventScript_16269B - compare_var_to_imm 0x4008, 6 + compare 0x4008, 6 call_if 1, Route110_TrickHousePuzzle3_EventScript_1626A1 - compare_var_to_imm 0x4008, 7 + compare 0x4008, 7 call_if 1, Route110_TrickHousePuzzle3_EventScript_1626A7 return @@ -347,14 +347,14 @@ Route110_TrickHousePuzzle3_EventScript_1626A7:: @ 81626A7 return Route110_TrickHousePuzzle3_EventScript_1626AD:: @ 81626AD - compare_var_to_imm 0x4009, 1 + compare 0x4009, 1 call_if 1, Route110_TrickHousePuzzle3_EventScript_161FE5 - compare_var_to_imm 0x4009, 0 + compare 0x4009, 0 call_if 1, Route110_TrickHousePuzzle3_EventScript_1622C8 special DrawWholeMapView - compare_var_to_imm 0x4009, 1 + compare 0x4009, 1 goto_if_eq Route110_TrickHousePuzzle3_EventScript_1626DD - compare_var_to_imm 0x4009, 0 + compare 0x4009, 0 goto_if_eq Route110_TrickHousePuzzle3_EventScript_1626E4 end @@ -370,7 +370,7 @@ Route110_TrickHousePuzzle3_EventScript_1626E4:: @ 81626E4 Route110_TrickHousePuzzle3_EventScript_1626EB:: @ 81626EB lockall - compare_var_to_imm 0x40ad, 0 + compare 0x40ad, 0 goto_if_eq Route110_TrickHousePuzzle3_EventScript_1626FD goto Route110_TrickHousePuzzle3_EventScript_161892 end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle4.inc b/data/scripts/maps/Route110_TrickHousePuzzle4.inc index 0bff3f526..0c9fc426f 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle4.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle4.inc @@ -3,7 +3,7 @@ Route110_TrickHousePuzzle4_MapScripts:: @ 816274D Route110_TrickHousePuzzle4_EventScript_16274E:: @ 816274E lockall - compare_var_to_imm 0x40ae, 0 + compare 0x40ae, 0 goto_if_eq Route110_TrickHousePuzzle4_EventScript_162760 goto Route110_TrickHousePuzzle4_EventScript_161892 end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle5.inc b/data/scripts/maps/Route110_TrickHousePuzzle5.inc index c99158dbd..dc3f9f725 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle5.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle5.inc @@ -13,7 +13,7 @@ Route110_TrickHousePuzzle5_MapScript1_1627B6:: @ 81627B6 Route110_TrickHousePuzzle5_EventScript_1627D5:: @ 81627D5 lockall - compare_var_to_imm 0x40af, 0 + compare 0x40af, 0 goto_if_eq Route110_TrickHousePuzzle5_EventScript_1627E7 goto Route110_TrickHousePuzzle5_EventScript_161892 end @@ -27,7 +27,7 @@ Route110_TrickHousePuzzle5_EventScript_1627F2:: @ 81627F2 lockall applymovement 1, Route110_TrickHousePuzzle5_Movement_1A0839 waitmovement 0 - compare_var_to_imm 0x4001, 1 + compare 0x4001, 1 goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9 setvar 0x4009, 0 goto Route110_TrickHousePuzzle5_EventScript_16293F @@ -37,7 +37,7 @@ Route110_TrickHousePuzzle5_EventScript_162813:: @ 8162813 lockall applymovement 2, Route110_TrickHousePuzzle5_Movement_1A0839 waitmovement 0 - compare_var_to_imm 0x4002, 1 + compare 0x4002, 1 goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9 setvar 0x4009, 0 goto Route110_TrickHousePuzzle5_EventScript_1629B3 @@ -47,7 +47,7 @@ Route110_TrickHousePuzzle5_EventScript_162834:: @ 8162834 lockall applymovement 3, Route110_TrickHousePuzzle5_Movement_1A0839 waitmovement 0 - compare_var_to_imm 0x4003, 1 + compare 0x4003, 1 goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9 setvar 0x4009, 0 goto Route110_TrickHousePuzzle5_EventScript_162A27 @@ -57,7 +57,7 @@ Route110_TrickHousePuzzle5_EventScript_162855:: @ 8162855 lockall applymovement 4, Route110_TrickHousePuzzle5_Movement_1A0839 waitmovement 0 - compare_var_to_imm 0x4004, 1 + compare 0x4004, 1 goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9 setvar 0x4009, 0 goto Route110_TrickHousePuzzle5_EventScript_162A9B @@ -67,7 +67,7 @@ Route110_TrickHousePuzzle5_EventScript_162876:: @ 8162876 lockall applymovement 5, Route110_TrickHousePuzzle5_Movement_1A0839 waitmovement 0 - compare_var_to_imm 0x4005, 1 + compare 0x4005, 1 goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9 setvar 0x4009, 0 goto Route110_TrickHousePuzzle5_EventScript_162B0F @@ -165,11 +165,11 @@ Route110_TrickHousePuzzle5_EventScript_16293F:: @ 816293F waitmovement 0 applymovement 1, Route110_TrickHousePuzzle5_Movement_1A0835 waitmovement 0 - compare_var_to_imm 0x4009, 1 + compare 0x4009, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162DF3 - compare_var_to_imm 0x4009, 2 + compare 0x4009, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_162E2B - compare_var_to_imm 0x4009, 3 + compare 0x4009, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_162E63 msgbox Route110_TrickHousePuzzle5_Text_19D423, 4 random 3 @@ -187,11 +187,11 @@ Route110_TrickHousePuzzle5_EventScript_1629B3:: @ 81629B3 waitmovement 0 applymovement 2, Route110_TrickHousePuzzle5_Movement_1A0835 waitmovement 0 - compare_var_to_imm 0x4009, 1 + compare 0x4009, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162E9B - compare_var_to_imm 0x4009, 2 + compare 0x4009, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_162ED3 - compare_var_to_imm 0x4009, 3 + compare 0x4009, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F0B msgbox Route110_TrickHousePuzzle5_Text_19D636, 4 random 3 @@ -209,11 +209,11 @@ Route110_TrickHousePuzzle5_EventScript_162A27:: @ 8162A27 waitmovement 0 applymovement 3, Route110_TrickHousePuzzle5_Movement_1A0835 waitmovement 0 - compare_var_to_imm 0x4009, 1 + compare 0x4009, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162DF3 - compare_var_to_imm 0x4009, 2 + compare 0x4009, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_162E2B - compare_var_to_imm 0x4009, 3 + compare 0x4009, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_162E63 msgbox Route110_TrickHousePuzzle5_Text_19D7D3, 4 random 3 @@ -231,11 +231,11 @@ Route110_TrickHousePuzzle5_EventScript_162A9B:: @ 8162A9B waitmovement 0 applymovement 4, Route110_TrickHousePuzzle5_Movement_1A0835 waitmovement 0 - compare_var_to_imm 0x4009, 1 + compare 0x4009, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162DF3 - compare_var_to_imm 0x4009, 2 + compare 0x4009, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_162E2B - compare_var_to_imm 0x4009, 3 + compare 0x4009, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_162E63 msgbox Route110_TrickHousePuzzle5_Text_19D93D, 4 random 3 @@ -253,11 +253,11 @@ Route110_TrickHousePuzzle5_EventScript_162B0F:: @ 8162B0F waitmovement 0 applymovement 5, Route110_TrickHousePuzzle5_Movement_1A0835 waitmovement 0 - compare_var_to_imm 0x4009, 1 + compare 0x4009, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162E9B - compare_var_to_imm 0x4009, 2 + compare 0x4009, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_162ED3 - compare_var_to_imm 0x4009, 3 + compare 0x4009, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F0B msgbox Route110_TrickHousePuzzle5_Text_19DA9A, 4 random 3 @@ -418,80 +418,80 @@ Route110_TrickHousePuzzle5_EventScript_162DE9:: @ 8162DE9 end Route110_TrickHousePuzzle5_EventScript_162DF3:: @ 8162DF3 - compare_var_to_imm 0x4008, 1 + compare 0x4008, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F43 - compare_var_to_imm 0x4008, 2 + compare 0x4008, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F4E - compare_var_to_imm 0x4008, 3 + compare 0x4008, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F59 - compare_var_to_imm 0x4008, 4 + compare 0x4008, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F64 - compare_var_to_imm 0x4008, 5 + compare 0x4008, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F6F return Route110_TrickHousePuzzle5_EventScript_162E2B:: @ 8162E2B - compare_var_to_imm 0x4008, 1 + compare 0x4008, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F7A - compare_var_to_imm 0x4008, 2 + compare 0x4008, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F85 - compare_var_to_imm 0x4008, 3 + compare 0x4008, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F90 - compare_var_to_imm 0x4008, 4 + compare 0x4008, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F9B - compare_var_to_imm 0x4008, 5 + compare 0x4008, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_162FA6 return Route110_TrickHousePuzzle5_EventScript_162E63:: @ 8162E63 - compare_var_to_imm 0x4008, 1 + compare 0x4008, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162FB1 - compare_var_to_imm 0x4008, 2 + compare 0x4008, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_162FBC - compare_var_to_imm 0x4008, 3 + compare 0x4008, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_162FC7 - compare_var_to_imm 0x4009, 4 + compare 0x4009, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_162FD2 - compare_var_to_imm 0x4009, 5 + compare 0x4009, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_162FDD return Route110_TrickHousePuzzle5_EventScript_162E9B:: @ 8162E9B - compare_var_to_imm 0x4008, 1 + compare 0x4008, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162FE8 - compare_var_to_imm 0x4008, 2 + compare 0x4008, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_162FF3 - compare_var_to_imm 0x4008, 3 + compare 0x4008, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_162FFE - compare_var_to_imm 0x4008, 4 + compare 0x4008, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_163009 - compare_var_to_imm 0x4008, 5 + compare 0x4008, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_163014 return Route110_TrickHousePuzzle5_EventScript_162ED3:: @ 8162ED3 - compare_var_to_imm 0x4008, 1 + compare 0x4008, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_16301F - compare_var_to_imm 0x4008, 2 + compare 0x4008, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_16302A - compare_var_to_imm 0x4008, 3 + compare 0x4008, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_163035 - compare_var_to_imm 0x4008, 4 + compare 0x4008, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_163040 - compare_var_to_imm 0x4008, 5 + compare 0x4008, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_16304B return Route110_TrickHousePuzzle5_EventScript_162F0B:: @ 8162F0B - compare_var_to_imm 0x4008, 1 + compare 0x4008, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_163056 - compare_var_to_imm 0x4008, 2 + compare 0x4008, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_163061 - compare_var_to_imm 0x4008, 3 + compare 0x4008, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_16306C - compare_var_to_imm 0x4008, 4 + compare 0x4008, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_163077 - compare_var_to_imm 0x4008, 5 + compare 0x4008, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_163082 return diff --git a/data/scripts/maps/Route110_TrickHousePuzzle6.inc b/data/scripts/maps/Route110_TrickHousePuzzle6.inc index e4ce617c9..ddf845142 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle6.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle6.inc @@ -17,7 +17,7 @@ Route110_TrickHousePuzzle6_EventScript_1630E6:: @ 81630E6 Route110_TrickHousePuzzle6_EventScript_1630EA:: @ 81630EA lockall - compare_var_to_imm 0x40b0, 0 + compare 0x40b0, 0 goto_if_eq Route110_TrickHousePuzzle6_EventScript_1630FC goto Route110_TrickHousePuzzle6_EventScript_161892 end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle7.inc b/data/scripts/maps/Route110_TrickHousePuzzle7.inc index ae55a4316..3361e3e9d 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle7.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle7.inc @@ -73,7 +73,7 @@ Route110_TrickHousePuzzle7_EventScript_163240:: @ 8163240 return Route110_TrickHousePuzzle7_MapScript1_163253:: @ 8163253 - compare_var_to_imm 0x40b6, 1 + compare 0x40b6, 1 goto_if_eq Route110_TrickHousePuzzle7_EventScript_16326E clearflag 194 clearflag 195 @@ -86,7 +86,7 @@ Route110_TrickHousePuzzle7_EventScript_16326E:: @ 816326E end Route110_TrickHousePuzzle7_MapScript1_16326F:: @ 816326F - compare_var_to_imm 0x40b6, 1 + compare 0x40b6, 1 call_if 1, Route110_TrickHousePuzzle7_EventScript_163167 end @@ -100,7 +100,7 @@ Route110_TrickHousePuzzle7_EventScript_163285:: @ 8163285 Route110_TrickHousePuzzle7_EventScript_16328B:: @ 816328B lockall - compare_var_to_imm 0x40b1, 0 + compare 0x40b1, 0 goto_if_eq Route110_TrickHousePuzzle7_EventScript_16329D goto Route110_TrickHousePuzzle7_EventScript_161892 end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle8.inc b/data/scripts/maps/Route110_TrickHousePuzzle8.inc index 1c6a9847f..5f0b00684 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle8.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle8.inc @@ -3,7 +3,7 @@ Route110_TrickHousePuzzle8_MapScripts:: @ 816341B Route110_TrickHousePuzzle8_EventScript_16341C:: @ 816341C lockall - compare_var_to_imm 0x40b2, 0 + compare 0x40b2, 0 goto_if_eq Route110_TrickHousePuzzle8_EventScript_16342E goto Route110_TrickHousePuzzle8_EventScript_161892 end diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index 35c60cf8f..617509938 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -22,15 +22,15 @@ Route111_MapScript1_14FFB9:: @ 814FFB9 Route111_EventScript_14FFCD:: @ 814FFCD getplayerxy 0x4000, 0x4001 - compare_var_to_imm 0x4001, 34 + compare 0x4001, 34 goto_if 0, Route111_EventScript_15000C - compare_var_to_imm 0x4001, 107 + compare 0x4001, 107 goto_if 2, Route111_EventScript_15000C - compare_var_to_imm 0x4001, 72 + compare 0x4001, 72 goto_if 2, Route111_EventScript_150009 - compare_var_to_imm 0x4000, 2000 + compare 0x4000, 2000 goto_if 2, Route111_EventScript_15000C - compare_var_to_imm 0x4000, 8 + compare 0x4000, 8 goto_if 0, Route111_EventScript_15000C Route111_EventScript_150009:: @ 8150009 @@ -52,7 +52,7 @@ Route111_EventScript_15000D:: @ 815000D Route111_EventScript_150023:: @ 8150023 lockall msgbox Route111_Text_16FA54, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route111_EventScript_15005F giveitem ITEM_ROOT_FOSSIL closebutton @@ -74,7 +74,7 @@ Route111_EventScript_15005F:: @ 815005F Route111_EventScript_150069:: @ 8150069 lockall msgbox Route111_Text_16FAED, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route111_EventScript_1500A5 giveitem ITEM_CLAW_FOSSIL closebutton @@ -125,7 +125,7 @@ Route111_EventScript_1500C5:: @ 81500C5 goto_if_eq Route111_EventScript_150100 msgbox Route111_Text_1C56F0, 4 giveitem ITEM_RAZZ_BERRY - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route111_EventScript_1A029B setflag 2252 special GetPlayerBigGuyGirlString @@ -164,7 +164,7 @@ Route111_EventScript_150122:: @ 8150122 Route111_EventScript_15013A:: @ 815013A checkitem ITEM_GO_GOGGLES, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route111_EventScript_150151 setvar 0x4003, 1 releaseall @@ -173,13 +173,13 @@ Route111_EventScript_15013A:: @ 815013A Route111_EventScript_150151:: @ 8150151 msgbox Route111_Text_1A0F93, 4 closebutton - compare_var_to_imm 0x8004, 0 + compare 0x8004, 0 call_if 1, Route111_EventScript_150188 - compare_var_to_imm 0x8004, 1 + compare 0x8004, 1 call_if 1, Route111_EventScript_150193 - compare_var_to_imm 0x8004, 2 + compare 0x8004, 2 call_if 1, Route111_EventScript_15019E - compare_var_to_imm 0x8004, 3 + compare 0x8004, 3 call_if 1, Route111_EventScript_1501A9 releaseall end @@ -238,7 +238,7 @@ Route111_EventScript_1501D1:: @ 81501D1 faceplayer setflag 2115 msgbox Route111_Text_16F705, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route111_EventScript_1501F3 msgbox Route111_Text_16F785, 4 release @@ -393,7 +393,7 @@ Route111_EventScript_1503EC:: @ 81503EC Route111_EventScript_150403:: @ 8150403 trainerbattle 0, OPPONENT_DUSTY_1, 0, Route111_Text_1BAEC9, Route111_Text_1BAF14 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route111_EventScript_15042A msgbox Route111_Text_1BAF5B, 6 end @@ -421,7 +421,7 @@ Route111_EventScript_15046F:: @ 815046F Route111_EventScript_150486:: @ 8150486 trainerbattle 0, OPPONENT_WILTON_1, 0, Route111_Text_1BB2E3, Route111_Text_1BB313 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route111_EventScript_1504AD msgbox Route111_Text_1BB33E, 6 end @@ -434,7 +434,7 @@ Route111_EventScript_1504AD:: @ 81504AD Route111_EventScript_1504C4:: @ 81504C4 trainerbattle 0, OPPONENT_BROOKE_1, 0, Route111_Text_1BB44F, Route111_Text_1BB49F specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route111_EventScript_1504EB msgbox Route111_Text_1BB4CE, 6 end diff --git a/data/scripts/maps/Route111_OldLadysRestStop.inc b/data/scripts/maps/Route111_OldLadysRestStop.inc index fdd0078ed..a33b436dc 100644 --- a/data/scripts/maps/Route111_OldLadysRestStop.inc +++ b/data/scripts/maps/Route111_OldLadysRestStop.inc @@ -10,9 +10,9 @@ Route111_OldLadysRestStop_EventScript_15BFDB:: @ 815BFDB lock faceplayer msgbox Route111_OldLadysRestStop_Text_1923AF, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route111_OldLadysRestStop_EventScript_15BFFC - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route111_OldLadysRestStop_EventScript_15C029 end @@ -21,9 +21,9 @@ Route111_OldLadysRestStop_EventScript_15BFFC:: @ 815BFFC closebutton call Route111_OldLadysRestStop_EventScript_1A02CA msgbox Route111_OldLadysRestStop_Text_19244D, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route111_OldLadysRestStop_EventScript_15BFFC - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route111_OldLadysRestStop_EventScript_15C029 end diff --git a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc b/data/scripts/maps/Route111_WinstrateFamilysHouse.inc index 7742d3507..ea70af41f 100644 --- a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc +++ b/data/scripts/maps/Route111_WinstrateFamilysHouse.inc @@ -17,7 +17,7 @@ Route111_WinstrateFamilysHouse_EventScript_15BF3A:: @ 815BF3A goto_if_eq Route111_WinstrateFamilysHouse_EventScript_15BF72 msgbox Route111_WinstrateFamilysHouse_Text_19208A, 4 giveitem ITEM_MACHO_BRACE - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route111_WinstrateFamilysHouse_EventScript_1A029B setflag 277 goto Route111_WinstrateFamilysHouse_EventScript_15BFC4 diff --git a/data/scripts/maps/Route112.inc b/data/scripts/maps/Route112.inc index 70a6a2869..d0d464207 100644 --- a/data/scripts/maps/Route112.inc +++ b/data/scripts/maps/Route112.inc @@ -39,7 +39,7 @@ Route112_EventScript_150549:: @ 8150549 Route112_EventScript_150560:: @ 8150560 trainerbattle 0, OPPONENT_TRENT_1, 0, Route112_Text_1BB6A0, Route112_Text_1BB707 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route112_EventScript_150587 msgbox Route112_Text_1BB721, 6 end diff --git a/data/scripts/maps/Route112_CableCarStation.inc b/data/scripts/maps/Route112_CableCarStation.inc index dfa1fecd6..5254b7beb 100644 --- a/data/scripts/maps/Route112_CableCarStation.inc +++ b/data/scripts/maps/Route112_CableCarStation.inc @@ -5,7 +5,7 @@ Route112_CableCarStation_MapScripts:: @ 815C033 Route112_CableCarStation_MapScript1_15C03E:: @ 815C03E warp6 Route112, 255, 28, 28 - compare_var_to_imm 0x40a3, 2 + compare 0x40a3, 2 call_if 1, Route112_CableCarStation_EventScript_15C052 end @@ -33,9 +33,9 @@ Route112_CableCarStation_EventScript_15C08C:: @ 815C08C lock faceplayer msgbox Route112_CableCarStation_Text_1924F5, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route112_CableCarStation_EventScript_15C0AD - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route112_CableCarStation_EventScript_15C0DC end diff --git a/data/scripts/maps/Route113.inc b/data/scripts/maps/Route113.inc index 06519867e..2eb34cdf3 100644 --- a/data/scripts/maps/Route113.inc +++ b/data/scripts/maps/Route113.inc @@ -14,9 +14,9 @@ Route113_MapScript1_1505DA:: @ 81505DA Route113_EventScript_1505E5:: @ 81505E5 getplayerxy 0x4000, 0x4001 - compare_var_to_imm 0x4000, 19 + compare 0x4000, 19 goto_if 0, Route113_EventScript_150604 - compare_var_to_imm 0x4000, 84 + compare 0x4000, 84 goto_if 2, Route113_EventScript_150604 setweather 7 return @@ -61,7 +61,7 @@ Route113_EventScript_150652:: @ 8150652 Route113_EventScript_150669:: @ 8150669 trainerbattle 0, OPPONENT_MADELINE_1, 0, Route113_Text_1BBB27, Route113_Text_1BBB7A specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route113_EventScript_150690 msgbox Route113_Text_1BBB9A, 6 end @@ -74,7 +74,7 @@ Route113_EventScript_150690:: @ 8150690 Route113_EventScript_1506A7:: @ 81506A7 trainerbattle 0, OPPONENT_LAO_1, 0, Route113_Text_1BBC59, Route113_Text_1BBC90 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route113_EventScript_1506CE msgbox Route113_Text_1BBCAB, 6 end diff --git a/data/scripts/maps/Route113_GlassWorkshop.inc b/data/scripts/maps/Route113_GlassWorkshop.inc index 9774a3a5f..48c2965fd 100644 --- a/data/scripts/maps/Route113_GlassWorkshop.inc +++ b/data/scripts/maps/Route113_GlassWorkshop.inc @@ -4,7 +4,7 @@ Route113_GlassWorkshop_MapScripts:: @ 816354A Route113_GlassWorkshop_MapScript1_163550:: @ 8163550 setflag 2116 - compare_var_to_imm 0x40be, 1 + compare 0x40be, 1 call_if 1, Route113_GlassWorkshop_EventScript_16355F end @@ -15,11 +15,11 @@ Route113_GlassWorkshop_EventScript_16355F:: @ 816355F Route113_GlassWorkshop_EventScript_163565:: @ 8163565 lock faceplayer - compare_var_to_imm 0x40be, 10 + compare 0x40be, 10 goto_if 4, Route113_GlassWorkshop_EventScript_1638D2 - compare_var_to_imm 0x40be, 2 + compare 0x40be, 2 goto_if_eq Route113_GlassWorkshop_EventScript_1635B5 - compare_var_to_imm 0x40be, 1 + compare 0x40be, 1 goto_if_eq Route113_GlassWorkshop_EventScript_1635AB msgbox Route113_GlassWorkshop_Text_19E4E6, 4 giveitem ITEM_SOOT_SACK @@ -35,10 +35,10 @@ Route113_GlassWorkshop_EventScript_1635AB:: @ 81635AB Route113_GlassWorkshop_EventScript_1635B5:: @ 81635B5 checkitem ITEM_SOOT_SACK, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_1635E4 msgbox Route113_GlassWorkshop_Text_19E65B, 4 - compare_var_to_imm 0x4048, 250 + compare 0x4048, 250 goto_if 0, Route113_GlassWorkshop_EventScript_163818 message Route113_GlassWorkshop_Text_19E757 waittext @@ -70,10 +70,10 @@ Route113_GlassWorkshop_EventScript_163660:: @ 8163660 setvar 0x8008, 39 bufferitem 0, 0x8008 setvar 0x800a, 250 - compare_var_to_imm 0x4048, 250 + compare 0x4048, 250 goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_163845 setvar 0x40be, 10 subvar 0x4048, 250 @@ -84,10 +84,10 @@ Route113_GlassWorkshop_EventScript_16369C:: @ 816369C setvar 0x8008, 40 bufferitem 0, 0x8008 setvar 0x800a, 500 - compare_var_to_imm 0x4048, 500 + compare 0x4048, 500 goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_163845 setvar 0x40be, 11 subvar 0x4048, 500 @@ -98,10 +98,10 @@ Route113_GlassWorkshop_EventScript_1636D8:: @ 81636D8 setvar 0x8008, 41 bufferitem 0, 0x8008 setvar 0x800a, 500 - compare_var_to_imm 0x4048, 500 + compare 0x4048, 500 goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_163845 setvar 0x40be, 12 subvar 0x4048, 500 @@ -112,10 +112,10 @@ Route113_GlassWorkshop_EventScript_163714:: @ 8163714 setvar 0x8008, 43 bufferitem 0, 0x8008 setvar 0x800a, 1000 - compare_var_to_imm 0x4048, 1000 + compare 0x4048, 1000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_163845 setvar 0x40be, 13 subvar 0x4048, 1000 @@ -126,10 +126,10 @@ Route113_GlassWorkshop_EventScript_163750:: @ 8163750 setvar 0x8008, 42 bufferitem 0, 0x8008 setvar 0x800a, 1000 - compare_var_to_imm 0x4048, 1000 + compare 0x4048, 1000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_163845 setvar 0x40be, 14 subvar 0x4048, 1000 @@ -141,10 +141,10 @@ Route113_GlassWorkshop_EventScript_16378C:: @ 816378C setvar 0x8008, 13 bufferdecor 0, 0x8008 setvar 0x800a, 6000 - compare_var_to_imm 0x4048, 6000 + compare 0x4048, 6000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_163845 setvar 0x40be, 15 subvar 0x4048, 6000 @@ -156,10 +156,10 @@ Route113_GlassWorkshop_EventScript_1637CD:: @ 81637CD setvar 0x8008, 6 bufferdecor 0, 0x8008 setvar 0x800a, 8000 - compare_var_to_imm 0x4048, 8000 + compare 0x4048, 8000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_163845 setvar 0x40be, 16 subvar 0x4048, 8000 @@ -201,9 +201,9 @@ Route113_GlassWorkshop_EventScript_163851:: @ 8163851 delay 30 fadescreen 0 msgbox Route113_GlassWorkshop_Text_19E9D7, 4 - compare_var_to_imm 0x8009, 0 + compare 0x8009, 0 call_if 1, Route113_GlassWorkshop_EventScript_163889 - compare_var_to_imm 0x8009, 1 + compare 0x8009, 1 call_if 1, Route113_GlassWorkshop_EventScript_1638A1 setvar 0x40be, 2 release @@ -211,13 +211,13 @@ Route113_GlassWorkshop_EventScript_163851:: @ 8163851 Route113_GlassWorkshop_EventScript_163889:: @ 8163889 giveitem 0x8008 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_1638B4 return Route113_GlassWorkshop_EventScript_1638A1:: @ 81638A1 givedecoration 0x8008 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_1638C3 return @@ -295,9 +295,9 @@ Route113_GlassWorkshop_EventScript_16399D:: @ 816399D Route113_GlassWorkshop_EventScript_1639B1:: @ 81639B1 msgbox Route113_GlassWorkshop_Text_19E9D7, 4 - compare_var_to_imm 0x8009, 0 + compare 0x8009, 0 call_if 1, Route113_GlassWorkshop_EventScript_163889 - compare_var_to_imm 0x8009, 1 + compare 0x8009, 1 call_if 1, Route113_GlassWorkshop_EventScript_1638A1 setvar 0x40be, 2 release diff --git a/data/scripts/maps/Route114.inc b/data/scripts/maps/Route114.inc index 799a115b7..95d321e0b 100644 --- a/data/scripts/maps/Route114.inc +++ b/data/scripts/maps/Route114.inc @@ -12,7 +12,7 @@ Route114_EventScript_150733:: @ 8150733 addvar RESULT, 15 addvar RESULT, 133 giveitem RESULT - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route114_EventScript_1A029B setflag 2251 msgbox Route114_Text_1C5861, 4 @@ -31,7 +31,7 @@ Route114_EventScript_150782:: @ 8150782 goto_if_eq Route114_EventScript_1507B9 msgbox Route114_Text_170154, 4 giveitem ITEM_TM05 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route114_EventScript_1A029B setflag 231 msgbox Route114_Text_1701C5, 4 @@ -88,7 +88,7 @@ Route114_EventScript_150836:: @ 8150836 Route114_EventScript_15084D:: @ 815084D trainerbattle 0, OPPONENT_STEVE_1, 0, Route114_Text_1BC2F5, Route114_Text_1BC327 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route114_EventScript_150874 msgbox Route114_Text_1BC337, 6 end @@ -101,7 +101,7 @@ Route114_EventScript_150874:: @ 8150874 Route114_EventScript_15088B:: @ 815088B trainerbattle 0, OPPONENT_BERNIE_1, 0, Route114_Text_1BC45A, Route114_Text_1BC499 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route114_EventScript_1508B2 msgbox Route114_Text_1BC4B5, 6 end diff --git a/data/scripts/maps/Route114_FossilManiacsHouse.inc b/data/scripts/maps/Route114_FossilManiacsHouse.inc index 3406a78f6..b217f24c4 100644 --- a/data/scripts/maps/Route114_FossilManiacsHouse.inc +++ b/data/scripts/maps/Route114_FossilManiacsHouse.inc @@ -13,7 +13,7 @@ Route114_FossilManiacsHouse_EventScript_15C1C3:: @ 815C1C3 goto_if_eq Route114_FossilManiacsHouse_EventScript_15C1F2 msgbox Route114_FossilManiacsHouse_Text_1925E1, 4 giveitem ITEM_TM28 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route114_FossilManiacsHouse_EventScript_1A029B setflag 261 release diff --git a/data/scripts/maps/Route114_FossilManiacsTunnel.inc b/data/scripts/maps/Route114_FossilManiacsTunnel.inc index 71c627728..13843f758 100644 --- a/data/scripts/maps/Route114_FossilManiacsTunnel.inc +++ b/data/scripts/maps/Route114_FossilManiacsTunnel.inc @@ -7,10 +7,10 @@ Route114_FossilManiacsTunnel_EventScript_15C20F:: @ 815C20F checkflag 267 goto_if_eq Route114_FossilManiacsTunnel_EventScript_15C24E checkitem ITEM_ROOT_FOSSIL, 1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route114_FossilManiacsTunnel_EventScript_15C244 checkitem ITEM_CLAW_FOSSIL, 1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route114_FossilManiacsTunnel_EventScript_15C244 msgbox Route114_FossilManiacsTunnel_Text_192795, 4 release diff --git a/data/scripts/maps/Route114_LanettesHouse.inc b/data/scripts/maps/Route114_LanettesHouse.inc index fbc4976ab..e4334647c 100644 --- a/data/scripts/maps/Route114_LanettesHouse.inc +++ b/data/scripts/maps/Route114_LanettesHouse.inc @@ -18,7 +18,7 @@ Route114_LanettesHouse_EventScript_15C262:: @ 815C262 .else givedecoration 100 .endif - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route114_LanettesHouse_EventScript_1A02AE setflag 131 release @@ -32,7 +32,7 @@ Route114_LanettesHouse_EventScript_15C28F:: @ 815C28F Route114_LanettesHouse_EventScript_15C299:: @ 815C299 lockall msgbox Route114_LanettesHouse_Text_192B4A, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route114_LanettesHouse_EventScript_15C2B7 msgbox Route114_LanettesHouse_Text_192DA9, 4 releaseall @@ -40,7 +40,7 @@ Route114_LanettesHouse_EventScript_15C299:: @ 815C299 Route114_LanettesHouse_EventScript_15C2B7:: @ 815C2B7 msgbox Route114_LanettesHouse_Text_192C01, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, Route114_LanettesHouse_EventScript_15C2CC releaseall end diff --git a/data/scripts/maps/Route115.inc b/data/scripts/maps/Route115.inc index 64b0a7497..8e0eb7855 100644 --- a/data/scripts/maps/Route115.inc +++ b/data/scripts/maps/Route115.inc @@ -16,7 +16,7 @@ Route115_EventScript_150940:: @ 8150940 Route115_EventScript_150949:: @ 8150949 trainerbattle 0, OPPONENT_TIMOTHY_1, 0, Route115_Text_1BC9AC, Route115_Text_1BC9E6 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route115_EventScript_150970 msgbox Route115_Text_1BCA0E, 6 end @@ -34,7 +34,7 @@ Route115_EventScript_150987:: @ 8150987 Route115_EventScript_15099E:: @ 815099E trainerbattle 0, OPPONENT_NOB_1, 0, Route115_Text_1BCB8A, Route115_Text_1BCBC1 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route115_EventScript_1509C5 msgbox Route115_Text_1BCBDE, 6 end @@ -47,7 +47,7 @@ Route115_EventScript_1509C5:: @ 81509C5 Route115_EventScript_1509DC:: @ 81509DC trainerbattle 0, OPPONENT_CYNDY_1, 0, Route115_Text_1BCCF4, Route115_Text_1BCD32 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route115_EventScript_150A03 msgbox Route115_Text_1BCD4C, 6 end diff --git a/data/scripts/maps/Route116.inc b/data/scripts/maps/Route116.inc index 61ccb6632..5a328f198 100644 --- a/data/scripts/maps/Route116.inc +++ b/data/scripts/maps/Route116.inc @@ -44,17 +44,17 @@ Route116_EventScript_150A7B:: @ 8150A7B Route116_EventScript_150A94:: @ 8150A94 setflag 287 giveitem ITEM_REPEAT_BALL - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route116_EventScript_150B12 msgbox Route116_Text_1707B8, 4 closebutton - compare_var_to_imm FACING, 2 + compare FACING, 2 call_if 1, Route116_EventScript_150AEE - compare_var_to_imm FACING, 1 + compare FACING, 1 call_if 1, Route116_EventScript_150AEE - compare_var_to_imm FACING, 3 + compare FACING, 3 call_if 1, Route116_EventScript_150AEE - compare_var_to_imm FACING, 4 + compare FACING, 4 call_if 1, Route116_EventScript_150AF9 disappear LAST_TALKED clearflag 949 @@ -148,10 +148,10 @@ Route116_EventScript_150B8F:: @ 8150B8F lock faceplayer checkitem ITEM_BLACK_GLASSES, 1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route116_EventScript_150BCA specialvar RESULT, sub_810F828 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route116_EventScript_150BBB msgbox Route116_Text_1708EE, 4 release @@ -167,7 +167,7 @@ Route116_EventScript_150BCA:: @ 8150BCA msgbox Route116_Text_1708EE, 4 msgbox Route116_Text_170921, 4 specialvar RESULT, sub_810F828 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route116_EventScript_150BF4 msgbox Route116_Text_170A03, 4 release @@ -181,13 +181,13 @@ Route116_EventScript_150BF4:: @ 8150BF4 Route116_EventScript_150C03:: @ 8150C03 delay 20 - compare_var_to_imm FACING, 2 + compare FACING, 2 call_if 1, Route116_EventScript_150C37 - compare_var_to_imm FACING, 1 + compare FACING, 1 call_if 1, Route116_EventScript_150C37 - compare_var_to_imm FACING, 3 + compare FACING, 3 call_if 1, Route116_EventScript_150C37 - compare_var_to_imm FACING, 4 + compare FACING, 4 call_if 1, Route116_EventScript_150C42 disappear LAST_TALKED release @@ -241,7 +241,7 @@ Route116_EventScript_150C79:: @ 8150C79 Route116_EventScript_150C90:: @ 8150C90 trainerbattle 0, OPPONENT_JERRY_1, 0, Route116_Text_1BD1C0, Route116_Text_1BD21A specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route116_EventScript_150CB7 msgbox Route116_Text_1BD248, 6 end @@ -264,7 +264,7 @@ Route116_EventScript_150CE5:: @ 8150CE5 Route116_EventScript_150CFC:: @ 8150CFC trainerbattle 0, OPPONENT_KAREN_1, 0, Route116_Text_1BD377, Route116_Text_1BD3AC specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route116_EventScript_150D23 msgbox Route116_Text_1BD3C3, 6 end diff --git a/data/scripts/maps/Route117.inc b/data/scripts/maps/Route117.inc index 6d538a872..6ba9519eb 100644 --- a/data/scripts/maps/Route117.inc +++ b/data/scripts/maps/Route117.inc @@ -41,7 +41,7 @@ Route117_EventScript_150D84:: @ 8150D84 Route117_EventScript_150D8D:: @ 8150D8D trainerbattle 0, OPPONENT_ISAAC_1, 0, Route117_Text_1BD49E, Route117_Text_1BD4D9 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route117_EventScript_150DB4 msgbox Route117_Text_1BD4F9, 6 end @@ -54,7 +54,7 @@ Route117_EventScript_150DB4:: @ 8150DB4 Route117_EventScript_150DCB:: @ 8150DCB trainerbattle 0, OPPONENT_LYDIA_1, 0, Route117_Text_1BD634, Route117_Text_1BD67B specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route117_EventScript_150DF2 msgbox Route117_Text_1BD69B, 6 end @@ -67,7 +67,7 @@ Route117_EventScript_150DF2:: @ 8150DF2 Route117_EventScript_150E09:: @ 8150E09 trainerbattle 0, OPPONENT_DYLAN_1, 0, Route117_Text_1BD79A, Route117_Text_1BD7E0 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route117_EventScript_150E30 msgbox Route117_Text_1BD7F5, 6 end @@ -80,7 +80,7 @@ Route117_EventScript_150E30:: @ 8150E30 Route117_EventScript_150E47:: @ 8150E47 trainerbattle 0, OPPONENT_MARIA_1, 0, Route117_Text_1BD914, Route117_Text_1BD965 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route117_EventScript_150E6E msgbox Route117_Text_1BD98F, 6 end @@ -98,7 +98,7 @@ Route117_EventScript_150E85:: @ 8150E85 Route117_EventScript_150E9C:: @ 8150E9C trainerbattle 4, OPPONENT_ANNA_AND_MEG_1, 0, Route117_Text_1BDBC3, Route117_Text_1BDC07, Route117_Text_1BDC96 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route117_EventScript_150EC7 msgbox Route117_Text_1BDC44, 6 end @@ -111,7 +111,7 @@ Route117_EventScript_150EC7:: @ 8150EC7 Route117_EventScript_150EE2:: @ 8150EE2 trainerbattle 4, OPPONENT_ANNA_AND_MEG_1, 0, Route117_Text_1BDCD2, Route117_Text_1BDD1E, Route117_Text_1BDD8B specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route117_EventScript_150F0D msgbox Route117_Text_1BDD4E, 6 end diff --git a/data/scripts/maps/Route118.inc b/data/scripts/maps/Route118.inc index 8c91e7da4..86e5f9045 100644 --- a/data/scripts/maps/Route118.inc +++ b/data/scripts/maps/Route118.inc @@ -12,9 +12,9 @@ Route118_EventScript_150F34:: @ 8150F34 checkflag 227 goto_if_eq Route118_EventScript_150F89 msgbox Route118_Text_170F12, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route118_EventScript_150F5E - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route118_EventScript_150F7F end @@ -83,11 +83,11 @@ Route118_EventScript_151004:: @ 8151004 delay 30 msgbox Route118_Text_170D66, 4 closebutton - compare_var_to_imm 0x8008, 0 + compare 0x8008, 0 call_if 1, Route118_EventScript_151048 - compare_var_to_imm 0x8008, 1 + compare 0x8008, 1 call_if 1, Route118_EventScript_151053 - compare_var_to_imm 0x8008, 2 + compare 0x8008, 2 call_if 1, Route118_EventScript_15105E setvar 0x4071, 1 disappear 19 @@ -162,7 +162,7 @@ Route118_Movement_151086:: @ 8151086 Route118_EventScript_15108F:: @ 815108F trainerbattle 0, OPPONENT_ROSE_1, 0, Route118_Text_1BDFF4, Route118_Text_1BE03C specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route118_EventScript_1510B6 msgbox Route118_Text_1BE05E, 6 end @@ -185,7 +185,7 @@ Route118_EventScript_1510E4:: @ 81510E4 Route118_EventScript_1510FB:: @ 81510FB trainerbattle 0, OPPONENT_DALTON_1, 0, Route118_Text_1BE3E8, Route118_Text_1BE406 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route118_EventScript_151122 msgbox Route118_Text_1BE413, 6 end diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc index 5b0f61387..fff294ca9 100644 --- a/data/scripts/maps/Route119.inc +++ b/data/scripts/maps/Route119.inc @@ -9,9 +9,9 @@ Route119_MapScript1_151172:: @ 8151172 end Route119_EventScript_15117C:: @ 815117C - compare_var_to_imm 0x8004, 6 + compare 0x8004, 6 call_if 1, Route119_EventScript_151193 - compare_var_to_imm 0x8004, 7 + compare 0x8004, 7 call_if 1, Route119_EventScript_151197 return @@ -27,7 +27,7 @@ Route119_MapScript1_15119B:: @ 815119B call Route119_EventScript_1A014E call Route119_EventScript_1A0172 call Route119_EventScript_1A0196 - compare_var_to_imm 0x40b3, 1 + compare 0x40b3, 1 call_if 1, Route119_EventScript_1511B9 special SetRoute119Weather end @@ -52,29 +52,29 @@ Route119_EventScript_1511DB:: @ 81511DB lockall reappear 25 checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, Route119_EventScript_151254 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, Route119_EventScript_151259 delay 65 - compare_var_to_imm 0x4001, 1 + compare 0x4001, 1 call_if 1, Route119_EventScript_1513A6 - compare_var_to_imm 0x4001, 2 + compare 0x4001, 2 call_if 1, Route119_EventScript_1513B1 applymovement 255, Route119_Movement_1A0845 waitmovement 0 delay 30 - compare_var_to_imm 0x4001, 1 + compare 0x4001, 1 call_if 1, Route119_EventScript_1513D2 - compare_var_to_imm 0x4001, 2 + compare 0x4001, 2 call_if 1, Route119_EventScript_1513E1 disappear 25 reappear 16 delay 30 checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route119_EventScript_15125E - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route119_EventScript_1512D8 releaseall end @@ -154,16 +154,16 @@ Route119_EventScript_151352:: @ 8151352 Route119_EventScript_151362:: @ 8151362 closebutton - compare_var_to_imm 0x4001, 1 + compare 0x4001, 1 call_if 1, Route119_EventScript_1513D2 - compare_var_to_imm 0x4001, 2 + compare 0x4001, 2 call_if 1, Route119_EventScript_1513E1 disappear 16 reappear 25 delay 30 - compare_var_to_imm 0x4001, 1 + compare 0x4001, 1 call_if 1, Route119_EventScript_1513BC - compare_var_to_imm 0x4001, 2 + compare 0x4001, 2 call_if 1, Route119_EventScript_1513C7 disappear 25 setvar 0x4072, 1 @@ -297,7 +297,7 @@ Route119_EventScript_1514A8:: @ 81514A8 Route119_EventScript_1514BF:: @ 81514BF trainerbattle 0, OPPONENT_JACKSON_1, 0, Route119_Text_1BE8BB, Route119_Text_1BE90E specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route119_EventScript_1514E6 msgbox Route119_Text_1BE937, 6 end @@ -310,7 +310,7 @@ Route119_EventScript_1514E6:: @ 81514E6 Route119_EventScript_1514FD:: @ 81514FD trainerbattle 0, OPPONENT_CATHERINE_1, 0, Route119_Text_1BEA3A, Route119_Text_1BEA88 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route119_EventScript_151524 msgbox Route119_Text_1BEAB3, 6 end diff --git a/data/scripts/maps/Route119_WeatherInstitute_1F.inc b/data/scripts/maps/Route119_WeatherInstitute_1F.inc index aa918bc34..762a6c299 100644 --- a/data/scripts/maps/Route119_WeatherInstitute_1F.inc +++ b/data/scripts/maps/Route119_WeatherInstitute_1F.inc @@ -4,7 +4,7 @@ Route119_WeatherInstitute_1F_MapScripts:: @ 8163C2A Route119_WeatherInstitute_1F_MapScript1_163C30:: @ 8163C30 call Route119_WeatherInstitute_1F_EventScript_1A0196 - compare_var_to_imm 0x40b3, 0 + compare 0x40b3, 0 call_if 1, Route119_WeatherInstitute_1F_EventScript_163C41 end @@ -17,7 +17,7 @@ Route119_WeatherInstitute_1F_EventScript_163C4D:: @ 8163C4D lock faceplayer special GetPlayerBigGuyGirlString - compare_var_to_imm 0x40b3, 0 + compare 0x40b3, 0 goto_if_eq Route119_WeatherInstitute_1F_EventScript_163C67 msgbox Route119_WeatherInstitute_1F_Text_19ED22, 4 release diff --git a/data/scripts/maps/Route119_WeatherInstitute_2F.inc b/data/scripts/maps/Route119_WeatherInstitute_2F.inc index b903d7063..5f9cf9888 100644 --- a/data/scripts/maps/Route119_WeatherInstitute_2F.inc +++ b/data/scripts/maps/Route119_WeatherInstitute_2F.inc @@ -4,9 +4,9 @@ Route119_WeatherInstitute_2F_MapScripts:: @ 8163CC2 Route119_WeatherInstitute_2F_MapScript1_163CC8:: @ 8163CC8 call Route119_WeatherInstitute_2F_EventScript_1A0196 - compare_var_to_imm 0x40b3, 0 + compare 0x40b3, 0 call_if 1, Route119_WeatherInstitute_2F_EventScript_163CE4 - compare_var_to_imm 0x40b3, 1 + compare 0x40b3, 1 call_if 1, Route119_WeatherInstitute_2F_EventScript_163CF0 end @@ -56,7 +56,7 @@ Route119_WeatherInstitute_2F_EventScript_163D45:: @ 8163D45 Route119_WeatherInstitute_2F_EventScript_163D7A:: @ 8163D7A msgbox Route119_WeatherInstitute_2F_Text_19F1CF, 4 countpokemon - compare_var_to_imm RESULT, 6 + compare RESULT, 6 goto_if_eq Route119_WeatherInstitute_2F_EventScript_163DB4 playfanfare 370 message Route119_WeatherInstitute_2F_Text_19F267 diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc index 7c1968aa5..cb8ebb2cc 100644 --- a/data/scripts/maps/Route120.inc +++ b/data/scripts/maps/Route120.inc @@ -10,17 +10,17 @@ Route120_MapScript1_15161E:: @ 815161E end Route120_EventScript_151628:: @ 8151628 - compare_var_to_imm 0x8004, 0 + compare 0x8004, 0 call_if 1, Route120_EventScript_15166B - compare_var_to_imm 0x8004, 1 + compare 0x8004, 1 call_if 1, Route120_EventScript_151672 - compare_var_to_imm 0x8004, 2 + compare 0x8004, 2 call_if 1, Route120_EventScript_151676 - compare_var_to_imm 0x8004, 3 + compare 0x8004, 3 call_if 1, Route120_EventScript_15167A - compare_var_to_imm 0x8004, 4 + compare 0x8004, 4 call_if 1, Route120_EventScript_15167E - compare_var_to_imm 0x8004, 5 + compare 0x8004, 5 call_if 1, Route120_EventScript_151682 return @@ -81,11 +81,11 @@ Route120_MapScript1_1516DF:: @ 81516DF Route120_EventScript_1516EA:: @ 81516EA getplayerxy 0x4000, 0x4001 - compare_var_to_imm 0x4001, 14 + compare 0x4001, 14 goto_if 3, Route120_EventScript_151715 - compare_var_to_imm 0x4001, 60 + compare 0x4001, 60 goto_if 3, Route120_EventScript_151719 - compare_var_to_imm 0x4001, 61 + compare 0x4001, 61 goto_if 4, Route120_EventScript_151711 return @@ -98,9 +98,9 @@ Route120_EventScript_151715:: @ 8151715 return Route120_EventScript_151719:: @ 8151719 - compare_var_to_imm 0x4000, 7 + compare 0x4000, 7 goto_if 3, Route120_EventScript_151735 - compare_var_to_imm 0x4000, 19 + compare 0x4000, 19 goto_if 3, Route120_EventScript_151715 goto Route120_EventScript_151735 end @@ -116,9 +116,9 @@ Route120_EventScript_151739:: @ 8151739 checkflag 2254 goto_if_eq Route120_EventScript_151837 msgbox Route120_Text_1C58F1, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, Route120_EventScript_151841 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, Route120_EventScript_15184A specialvar RESULT, GetPlayerTrainerIdOnesDigit switch RESULT @@ -161,7 +161,7 @@ Route120_EventScript_151808:: @ 8151808 Route120_EventScript_151813:: @ 8151813 giveitem 0x8004 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route120_EventScript_1A029B setflag 2254 msgbox Route120_Text_1C5A0B, 4 @@ -187,7 +187,7 @@ Route120_EventScript_151853:: @ 8151853 checkflag 290 goto_if_eq Route120_EventScript_151884 msgbox Route120_Text_171827, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route120_EventScript_151877 goto Route120_EventScript_15189D end @@ -200,7 +200,7 @@ Route120_EventScript_151877:: @ 8151877 Route120_EventScript_151884:: @ 8151884 msgbox Route120_Text_17196F, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route120_EventScript_151877 goto Route120_EventScript_15189D end @@ -208,9 +208,9 @@ Route120_EventScript_151884:: @ 8151884 Route120_EventScript_15189D:: @ 815189D msgbox Route120_Text_1719A0, 4 closebutton - compare_var_to_imm FACING, 2 + compare FACING, 2 call_if 1, Route120_EventScript_15197F - compare_var_to_imm FACING, 3 + compare FACING, 3 call_if 1, Route120_EventScript_15198A applymovement 31, Route120_Movement_1A083F waitmovement 0 @@ -293,7 +293,7 @@ Route120_EventScript_1519B3:: @ 81519B3 Route120_EventScript_1519CA:: @ 81519CA trainerbattle 0, OPPONENT_ROBERT_1, 0, Route120_Text_1BF07E, Route120_Text_1BF0A5 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route120_EventScript_1519F1 msgbox Route120_Text_1BF0C3, 6 end @@ -316,7 +316,7 @@ Route120_EventScript_151A1F:: @ 8151A1F Route120_EventScript_151A36:: @ 8151A36 trainerbattle 0, OPPONENT_BRANDON_1, 0, Route120_Text_1BF32B, Route120_Text_1BF36B specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route120_EventScript_151A5D msgbox Route120_Text_1BF38D, 6 end diff --git a/data/scripts/maps/Route121.inc b/data/scripts/maps/Route121.inc index 562f122e3..efaf251b1 100644 --- a/data/scripts/maps/Route121.inc +++ b/data/scripts/maps/Route121.inc @@ -74,7 +74,7 @@ Route121_EventScript_151B72:: @ 8151B72 Route121_EventScript_151B89:: @ 8151B89 trainerbattle 0, OPPONENT_WALTER_1, 0, Route121_Text_1BFA1B, Route121_Text_1BFA8C specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route121_EventScript_151BB0 msgbox Route121_Text_1BFA9D, 6 end @@ -102,7 +102,7 @@ Route121_EventScript_151BF9:: @ 8151BF9 Route121_EventScript_151C14:: @ 8151C14 trainerbattle 0, OPPONENT_JESSICA_1, 0, Route121_Text_1BFE51, Route121_Text_1BFE80 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route121_EventScript_151C3B msgbox Route121_Text_1BFEAE, 6 end diff --git a/data/scripts/maps/Route121_SafariZoneEntrance.inc b/data/scripts/maps/Route121_SafariZoneEntrance.inc index 52f0e5c44..5fdb749f3 100644 --- a/data/scripts/maps/Route121_SafariZoneEntrance.inc +++ b/data/scripts/maps/Route121_SafariZoneEntrance.inc @@ -34,7 +34,7 @@ Route121_SafariZoneEntrance_EventScript_15C35A:: @ 815C35A lock faceplayer msgbox Route121_SafariZoneEntrance_Text_1C3704, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route121_SafariZoneEntrance_EventScript_15C379 msgbox Route121_SafariZoneEntrance_Text_1C373C, 4 release @@ -52,7 +52,7 @@ Route121_SafariZoneEntrance_EventScript_15C383:: @ 815C383 showmoney 0, 0 nop msgbox Route121_SafariZoneEntrance_Text_1C3832, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route121_SafariZoneEntrance_EventScript_15C3B3 msgbox Route121_SafariZoneEntrance_Text_1C3895, 4 goto Route121_SafariZoneEntrance_EventScript_15C46C @@ -60,11 +60,11 @@ Route121_SafariZoneEntrance_EventScript_15C383:: @ 815C383 Route121_SafariZoneEntrance_EventScript_15C3B3:: @ 815C3B3 checkitem ITEM_POKEBLOCK_CASE, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route121_SafariZoneEntrance_EventScript_15C450 call Route121_SafariZoneEntrance_EventScript_15C425 checkmoney 0x1f4, 0 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route121_SafariZoneEntrance_EventScript_15C45E msgbox Route121_SafariZoneEntrance_Text_1C38D9, 4 paymoney 0x1f4, 0 @@ -88,10 +88,10 @@ Route121_SafariZoneEntrance_EventScript_15C3B3:: @ 815C3B3 Route121_SafariZoneEntrance_EventScript_15C425:: @ 815C425 countpokemon - compare_var_to_imm RESULT, 6 + compare RESULT, 6 goto_if 5, Route121_SafariZoneEntrance_EventScript_15C44F specialvar RESULT, CheckFreePokemonStorageSpace - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route121_SafariZoneEntrance_EventScript_15C44F msgbox Route121_SafariZoneEntrance_Text_1C39A3, 4 goto Route121_SafariZoneEntrance_EventScript_15C46C diff --git a/data/scripts/maps/Route123.inc b/data/scripts/maps/Route123.inc index 6e6cbd506..14c5a2dba 100644 --- a/data/scripts/maps/Route123.inc +++ b/data/scripts/maps/Route123.inc @@ -13,11 +13,11 @@ Route123_EventScript_151C5D:: @ 8151C5D goto_if_eq Route123_EventScript_151CAC msgbox Route123_Text_171D83, 4 special IsGrassTypeInParty - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route123_EventScript_151CAA msgbox Route123_Text_171DC2, 4 giveitem ITEM_TM19 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route123_EventScript_1A029B setflag 232 msgbox Route123_Text_171E34, 4 @@ -63,7 +63,7 @@ Route123_EventScript_151CFF:: @ 8151CFF Route123_EventScript_151D16:: @ 8151D16 trainerbattle 0, OPPONENT_CAMERON_1, 0, Route123_Text_1C013F, Route123_Text_1C01A3 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route123_EventScript_151D3D msgbox Route123_Text_1C01B1, 6 end @@ -76,7 +76,7 @@ Route123_EventScript_151D3D:: @ 8151D3D Route123_EventScript_151D54:: @ 8151D54 trainerbattle 0, OPPONENT_JACKI_1, 0, Route123_Text_1C028C, Route123_Text_1C0303 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route123_EventScript_151D7B msgbox Route123_Text_1C030F, 6 end diff --git a/data/scripts/maps/Route123_BerryMastersHouse.inc b/data/scripts/maps/Route123_BerryMastersHouse.inc index ee7bc80cf..64888759d 100644 --- a/data/scripts/maps/Route123_BerryMastersHouse.inc +++ b/data/scripts/maps/Route123_BerryMastersHouse.inc @@ -17,7 +17,7 @@ Route123_BerryMastersHouse_EventScript_1639E9:: @ 81639E9 addvar RESULT, 20 addvar RESULT, 133 giveitem RESULT - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B setflag 2253 msgbox Route123_BerryMastersHouse_Text_1C5C66, 4 @@ -25,7 +25,7 @@ Route123_BerryMastersHouse_EventScript_1639E9:: @ 81639E9 addvar RESULT, 20 addvar RESULT, 133 giveitem RESULT - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B msgbox Route123_BerryMastersHouse_Text_1C5C83, 4 release @@ -47,9 +47,9 @@ Route123_BerryMastersHouse_EventScript_163A64:: @ 8163A64 call Route123_BerryMastersHouse_EventScript_1A00F3 lock faceplayer - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route123_BerryMastersHouse_EventScript_163AAD - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_163A9B end @@ -60,17 +60,17 @@ Route123_BerryMastersHouse_EventScript_163A9B:: @ 8163A9B end Route123_BerryMastersHouse_EventScript_163AAD:: @ 8163AAD - compare_var_to_imm 0x8004, 0 + compare 0x8004, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 - compare_var_to_imm 0x8004, 1 + compare 0x8004, 1 goto_if_eq Route123_BerryMastersHouse_EventScript_163B1E - compare_var_to_imm 0x8004, 2 + compare 0x8004, 2 goto_if_eq Route123_BerryMastersHouse_EventScript_163B4F - compare_var_to_imm 0x8004, 3 + compare 0x8004, 3 goto_if_eq Route123_BerryMastersHouse_EventScript_163B80 - compare_var_to_imm 0x8004, 4 + compare 0x8004, 4 goto_if_eq Route123_BerryMastersHouse_EventScript_163BB1 - compare_var_to_imm 0x8004, 5 + compare 0x8004, 5 goto_if_eq Route123_BerryMastersHouse_EventScript_163BE2 end @@ -79,7 +79,7 @@ Route123_BerryMastersHouse_EventScript_163AF0:: @ 8163AF0 random 10 addvar RESULT, 133 giveitem RESULT - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B goto Route123_BerryMastersHouse_EventScript_163C1D release @@ -90,7 +90,7 @@ Route123_BerryMastersHouse_EventScript_163B1E:: @ 8163B1E goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 giveitem ITEM_SPELON_BERRY - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B setflag 248 goto Route123_BerryMastersHouse_EventScript_163C1D @@ -101,7 +101,7 @@ Route123_BerryMastersHouse_EventScript_163B4F:: @ 8163B4F goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 giveitem ITEM_PAMTRE_BERRY - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B setflag 249 goto Route123_BerryMastersHouse_EventScript_163C1D @@ -112,7 +112,7 @@ Route123_BerryMastersHouse_EventScript_163B80:: @ 8163B80 goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 giveitem ITEM_WATMEL_BERRY - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B setflag 250 goto Route123_BerryMastersHouse_EventScript_163C1D @@ -123,7 +123,7 @@ Route123_BerryMastersHouse_EventScript_163BB1:: @ 8163BB1 goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 giveitem ITEM_DURIN_BERRY - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B setflag 251 goto Route123_BerryMastersHouse_EventScript_163C1D @@ -134,7 +134,7 @@ Route123_BerryMastersHouse_EventScript_163BE2:: @ 8163BE2 goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 giveitem ITEM_BELUE_BERRY - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B setflag 252 goto Route123_BerryMastersHouse_EventScript_163C1D diff --git a/data/scripts/maps/Route124.inc b/data/scripts/maps/Route124.inc index 7d7d38ceb..ffe4cef97 100644 --- a/data/scripts/maps/Route124.inc +++ b/data/scripts/maps/Route124.inc @@ -24,7 +24,7 @@ Route124_EventScript_151E0F:: @ 8151E0F Route124_EventScript_151E26:: @ 8151E26 trainerbattle 0, OPPONENT_JENNY_1, 0, Route124_Text_1C07B4, Route124_Text_1C07F9 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route124_EventScript_151E4D msgbox Route124_Text_1C080E, 6 end @@ -47,7 +47,7 @@ Route124_EventScript_151E7B:: @ 8151E7B Route124_EventScript_151E92:: @ 8151E92 trainerbattle 4, OPPONENT_RITA_AND_SAM_1, 0, Route124_Text_1C0ABD, Route124_Text_1C0B36, Route124_Text_1C0BC8 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route124_EventScript_151EBD msgbox Route124_Text_1C0B72, 6 end @@ -60,7 +60,7 @@ Route124_EventScript_151EBD:: @ 8151EBD Route124_EventScript_151ED8:: @ 8151ED8 trainerbattle 4, OPPONENT_RITA_AND_SAM_1, 0, Route124_Text_1C0C0E, Route124_Text_1C0C4F, Route124_Text_1C0CE0 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route124_EventScript_151F03 msgbox Route124_Text_1C0C7F, 6 end diff --git a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc index 1deeb9e34..b3e91e43c 100644 --- a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc +++ b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc @@ -23,7 +23,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_163E20:: @ 8163E20 Route124_DivingTreasureHuntersHouse_EventScript_163E2E:: @ 8163E2E call Route124_DivingTreasureHuntersHouse_EventScript_163E44 - compare_var_to_imm 0x4001, 0 + compare 0x4001, 0 goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_164329 goto Route124_DivingTreasureHuntersHouse_EventScript_163EA2 end @@ -31,16 +31,16 @@ Route124_DivingTreasureHuntersHouse_EventScript_163E2E:: @ 8163E2E Route124_DivingTreasureHuntersHouse_EventScript_163E44:: @ 8163E44 setvar 0x4001, 0 checkitem ITEM_RED_SHARD, 1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, Route124_DivingTreasureHuntersHouse_EventScript_163E8A checkitem ITEM_YELLOW_SHARD, 1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, Route124_DivingTreasureHuntersHouse_EventScript_163E90 checkitem ITEM_BLUE_SHARD, 1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, Route124_DivingTreasureHuntersHouse_EventScript_163E96 checkitem ITEM_GREEN_SHARD, 1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, Route124_DivingTreasureHuntersHouse_EventScript_163E9C return @@ -247,13 +247,13 @@ Route124_DivingTreasureHuntersHouse_EventScript_164292:: @ 8164292 bufferitem 0, 0x8008 bufferitem 1, 0x8009 msgbox Route124_DivingTreasureHuntersHouse_Text_19F5E0, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_16431F checkitemspace 0x8009, 1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_1642D3 checkitem 0x8008, 2 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_1642D3 goto Route124_DivingTreasureHuntersHouse_EventScript_164315 end @@ -263,10 +263,10 @@ Route124_DivingTreasureHuntersHouse_EventScript_1642D3:: @ 81642D3 giveitem 0x8009 msgbox Route124_DivingTreasureHuntersHouse_Text_19F606, 4 call Route124_DivingTreasureHuntersHouse_EventScript_163E44 - compare_var_to_imm 0x4001, 0 + compare 0x4001, 0 goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_164333 msgbox Route124_DivingTreasureHuntersHouse_Text_19F629, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_163EB0 goto Route124_DivingTreasureHuntersHouse_EventScript_16431F end diff --git a/data/scripts/maps/Route125.inc b/data/scripts/maps/Route125.inc index c62d49117..489a7314b 100644 --- a/data/scripts/maps/Route125.inc +++ b/data/scripts/maps/Route125.inc @@ -30,7 +30,7 @@ Route125_EventScript_151F73:: @ 8151F73 Route125_EventScript_151F8A:: @ 8151F8A trainerbattle 0, OPPONENT_ERNEST_1, 0, Route125_Text_1C11AF, Route125_Text_1C11ED specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route125_EventScript_151FB1 msgbox Route125_Text_1C1208, 6 end diff --git a/data/scripts/maps/Route128.inc b/data/scripts/maps/Route128.inc index 0ce76670f..158313a1b 100644 --- a/data/scripts/maps/Route128.inc +++ b/data/scripts/maps/Route128.inc @@ -183,7 +183,7 @@ Route128_Movement_1522A1:: @ 81522A1 Route128_EventScript_1522A4:: @ 81522A4 trainerbattle 0, OPPONENT_ISAIAH_1, 0, Route128_Text_1C1C67, Route128_Text_1C1C95 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route128_EventScript_1522CB msgbox Route128_Text_1C1CC3, 6 end @@ -196,7 +196,7 @@ Route128_EventScript_1522CB:: @ 81522CB Route128_EventScript_1522E2:: @ 81522E2 trainerbattle 0, OPPONENT_KATELYN_1, 0, Route128_Text_1C1DB0, Route128_Text_1C1E25 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route128_EventScript_152309 msgbox Route128_Text_1C1E4A, 6 end diff --git a/data/scripts/maps/Route130.inc b/data/scripts/maps/Route130.inc index 3e234667a..7c3c575dc 100644 --- a/data/scripts/maps/Route130.inc +++ b/data/scripts/maps/Route130.inc @@ -4,7 +4,7 @@ Route130_MapScripts:: @ 81523C2 Route130_MapScript1_1523C8:: @ 81523C8 specialvar RESULT, IsMirageIslandPresent - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route130_EventScript_15240C setflag 17 setflag 18 diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index ddd58be1a..dcbb75886 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -363,13 +363,13 @@ RustboroCity_EventScript_14C644:: @ 814C644 end RustboroCity_EventScript_14C650:: @ 814C650 - compare_var_to_imm 0x4001, 0 + compare 0x4001, 0 call_if 1, RustboroCity_EventScript_14C691 - compare_var_to_imm 0x4001, 1 + compare 0x4001, 1 call_if 1, RustboroCity_EventScript_14C6BD - compare_var_to_imm 0x4001, 2 + compare 0x4001, 2 call_if 1, RustboroCity_EventScript_14C6E9 - compare_var_to_imm 0x4001, 3 + compare 0x4001, 3 call_if 1, RustboroCity_EventScript_14C715 setflag 159 setvar 0x405a, 3 @@ -457,19 +457,19 @@ RustboroCity_EventScript_14C771:: @ 814C771 end RustboroCity_EventScript_14C77D:: @ 814C77D - compare_var_to_imm 0x4001, 0 + compare 0x4001, 0 call_if 1, RustboroCity_EventScript_14C7FE - compare_var_to_imm 0x4001, 1 + compare 0x4001, 1 call_if 1, RustboroCity_EventScript_14C82A - compare_var_to_imm 0x4001, 2 + compare 0x4001, 2 call_if 1, RustboroCity_EventScript_14C856 - compare_var_to_imm 0x4001, 3 + compare 0x4001, 3 call_if 1, RustboroCity_EventScript_14C882 - compare_var_to_imm 0x4001, 4 + compare 0x4001, 4 call_if 1, RustboroCity_EventScript_14C8B8 msgbox RustboroCity_Text_166FB4, 4 giveitem ITEM_GREAT_BALL - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, RustboroCity_EventScript_14C7F5 msgbox RustboroCity_Text_16707F, 4 closebutton @@ -552,9 +552,9 @@ RustboroCity_EventScript_14C8DA:: @ 814C8DA checkflag 288 goto_if_eq RustboroCity_EventScript_14C917 checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq RustboroCity_EventScript_14C8FD - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq RustboroCity_EventScript_14C90A end @@ -572,9 +572,9 @@ RustboroCity_EventScript_14C90A:: @ 814C90A RustboroCity_EventScript_14C917:: @ 814C917 checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq RustboroCity_EventScript_14C92F - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq RustboroCity_EventScript_14C939 end diff --git a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc index d5b3b03c7..e7c966c08 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc @@ -3,7 +3,7 @@ RustboroCity_DevonCorp_2F_MapScripts:: @ 81574CA .byte 0 RustboroCity_DevonCorp_2F_MapScript1_1574D0:: @ 81574D0 - compare_var_to_imm 0x40c4, 1 + compare 0x40c4, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_1574DC end @@ -14,7 +14,7 @@ RustboroCity_DevonCorp_2F_EventScript_1574DC:: @ 81574DC RustboroCity_DevonCorp_2F_EventScript_1574E2:: @ 81574E2 lock faceplayer - compare_var_to_imm 0x40c4, 1 + compare 0x40c4, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_1574DC msgbox RustboroCity_DevonCorp_2F_Text_182B81, 4 release @@ -23,7 +23,7 @@ RustboroCity_DevonCorp_2F_EventScript_1574E2:: @ 81574E2 RustboroCity_DevonCorp_2F_EventScript_1574F9:: @ 81574F9 lock faceplayer - compare_var_to_imm 0x40c4, 1 + compare 0x40c4, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_1574DC checkflag 287 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157519 @@ -39,7 +39,7 @@ RustboroCity_DevonCorp_2F_EventScript_157519:: @ 8157519 RustboroCity_DevonCorp_2F_EventScript_157523:: @ 8157523 lock faceplayer - compare_var_to_imm 0x40c4, 1 + compare 0x40c4, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_1574DC checkflag 188 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157543 @@ -55,7 +55,7 @@ RustboroCity_DevonCorp_2F_EventScript_157543:: @ 8157543 RustboroCity_DevonCorp_2F_EventScript_15754D:: @ 815754D lock faceplayer - compare_var_to_imm 0x40c4, 1 + compare 0x40c4, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_1574DC msgbox RustboroCity_DevonCorp_2F_Text_182E6B, 4 release @@ -64,16 +64,16 @@ RustboroCity_DevonCorp_2F_EventScript_15754D:: @ 815754D RustboroCity_DevonCorp_2F_EventScript_157564:: @ 8157564 lock faceplayer - compare_var_to_imm 0x40c4, 2 + compare 0x40c4, 2 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_15764A - compare_var_to_imm 0x40c4, 1 + compare 0x40c4, 1 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157640 msgbox RustboroCity_DevonCorp_2F_Text_182ED5, 4 checkitem ITEM_ROOT_FOSSIL, 1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_1575A6 checkitem ITEM_CLAW_FOSSIL, 1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_1575EE release end @@ -86,7 +86,7 @@ RustboroCity_DevonCorp_2F_EventScript_1575A6:: @ 81575A6 applymovement 5, RustboroCity_DevonCorp_2F_Movement_1A0835 waitmovement 0 msgbox RustboroCity_DevonCorp_2F_Text_182F35, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157636 bufferitem 0, ITEM_ROOT_FOSSIL msgbox RustboroCity_DevonCorp_2F_Text_183023, 4 @@ -104,7 +104,7 @@ RustboroCity_DevonCorp_2F_EventScript_1575EE:: @ 81575EE applymovement 5, RustboroCity_DevonCorp_2F_Movement_1A0835 waitmovement 0 msgbox RustboroCity_DevonCorp_2F_Text_182F35, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157636 bufferitem 0, ITEM_CLAW_FOSSIL msgbox RustboroCity_DevonCorp_2F_Text_183023, 4 @@ -125,9 +125,9 @@ RustboroCity_DevonCorp_2F_EventScript_157640:: @ 8157640 end RustboroCity_DevonCorp_2F_EventScript_15764A:: @ 815764A - compare_var_to_imm 0x40c5, 1 + compare 0x40c5, 1 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157661 - compare_var_to_imm 0x40c5, 2 + compare 0x40c5, 2 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_1576B4 end @@ -135,7 +135,7 @@ RustboroCity_DevonCorp_2F_EventScript_157661:: @ 8157661 bufferpoke 1, SPECIES_LILEEP msgbox RustboroCity_DevonCorp_2F_Text_183124, 4 countpokemon - compare_var_to_imm RESULT, 6 + compare RESULT, 6 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157707 copyvar 0x8004, RESULT setvar 0x40c4, 0 @@ -146,7 +146,7 @@ RustboroCity_DevonCorp_2F_EventScript_157661:: @ 8157661 waittext givepokemon SPECIES_LILEEP, 20, ITEM_NONE, 0x0, 0x0, 0 msgbox RustboroCity_DevonCorp_2F_Text_1A1102, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_1A0678 release end @@ -155,7 +155,7 @@ RustboroCity_DevonCorp_2F_EventScript_1576B4:: @ 81576B4 bufferpoke 1, SPECIES_ANORITH msgbox RustboroCity_DevonCorp_2F_Text_183124, 4 countpokemon - compare_var_to_imm RESULT, 6 + compare RESULT, 6 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157707 copyvar 0x8004, RESULT setvar 0x40c4, 0 @@ -166,7 +166,7 @@ RustboroCity_DevonCorp_2F_EventScript_1576B4:: @ 81576B4 waittext givepokemon SPECIES_ANORITH, 20, ITEM_NONE, 0x0, 0x0, 0 msgbox RustboroCity_DevonCorp_2F_Text_1A1102, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_1A0678 release end diff --git a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc index 12cf2f6c8..88f1c377a 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc @@ -5,7 +5,7 @@ RustboroCity_DevonCorp_3F_MapScripts:: @ 8157711 .byte 0 RustboroCity_DevonCorp_3F_MapScript1_157721:: @ 8157721 - compare_var_to_imm 0x408f, 0 + compare 0x408f, 0 call_if 1, RustboroCity_DevonCorp_3F_EventScript_15772D end @@ -160,7 +160,7 @@ RustboroCity_DevonCorp_3F_EventScript_15783B:: @ 815783B RustboroCity_DevonCorp_3F_EventScript_157864:: @ 8157864 msgbox RustboroCity_DevonCorp_3F_Text_18353E, 4 giveitem ITEM_EXP_SHARE - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq RustboroCity_DevonCorp_3F_EventScript_1A029B setflag 272 msgbox RustboroCity_DevonCorp_3F_Text_1835B3, 4 diff --git a/data/scripts/maps/RustboroCity_Flat2_2F.inc b/data/scripts/maps/RustboroCity_Flat2_2F.inc index fefc67d0f..0dfec5cfa 100644 --- a/data/scripts/maps/RustboroCity_Flat2_2F.inc +++ b/data/scripts/maps/RustboroCity_Flat2_2F.inc @@ -12,7 +12,7 @@ RustboroCity_Flat2_2F_EventScript_157DA0:: @ 8157DA0 goto_if_eq RustboroCity_Flat2_2F_EventScript_157DCF msgbox RustboroCity_Flat2_2F_Text_185461, 4 giveitem ITEM_PREMIER_BALL - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq RustboroCity_Flat2_2F_EventScript_1A029B setflag 213 release diff --git a/data/scripts/maps/RustboroCity_Gym.inc b/data/scripts/maps/RustboroCity_Gym.inc index 353ac8fe3..6bb33b4dc 100644 --- a/data/scripts/maps/RustboroCity_Gym.inc +++ b/data/scripts/maps/RustboroCity_Gym.inc @@ -20,14 +20,14 @@ RustboroCity_Gym_EventScript_1578FE:: @ 81578FE addvar 0x4085, 1 setvar 0x8008, 1 call RustboroCity_Gym_EventScript_1A01C0 - compare_var_to_imm 0x4085, 6 + compare 0x4085, 6 call_if 1, RustboroCity_Gym_EventScript_1A00FB goto RustboroCity_Gym_EventScript_15793C end RustboroCity_Gym_EventScript_15793C:: @ 815793C giveitem ITEM_TM39 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq RustboroCity_Gym_EventScript_1A029B setflag 165 msgbox RustboroCity_Gym_Text_184170, 4 diff --git a/data/scripts/maps/RustboroCity_House1.inc b/data/scripts/maps/RustboroCity_House1.inc index 080fc7e18..a344738a8 100644 --- a/data/scripts/maps/RustboroCity_House1.inc +++ b/data/scripts/maps/RustboroCity_House1.inc @@ -11,17 +11,17 @@ RustboroCity_House1_EventScript_157C7D:: @ 8157C7D specialvar RESULT, sub_804D89C copyvar 0x8009, RESULT msgbox RustboroCity_House1_Text_184EBA, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq RustboroCity_House1_EventScript_157CFB special sub_80F9A0C waitstate copyvar 0x800a, 0x8004 - compare_var_to_imm 0x8004, 255 + compare 0x8004, 255 goto_if_eq RustboroCity_House1_EventScript_157CFB copyvar 0x8005, 0x800a specialvar RESULT, sub_804DB2C copyvar 0x800b, RESULT - compare_var_to_var RESULT, 0x8009 + compare RESULT, 0x8009 goto_if 5, RustboroCity_House1_EventScript_157D05 copyvar 0x8004, 0x8008 copyvar 0x8005, 0x800a diff --git a/data/scripts/maps/RustboroCity_PokemonSchool.inc b/data/scripts/maps/RustboroCity_PokemonSchool.inc index cd71e8bba..156b437a0 100644 --- a/data/scripts/maps/RustboroCity_PokemonSchool.inc +++ b/data/scripts/maps/RustboroCity_PokemonSchool.inc @@ -79,13 +79,13 @@ RustboroCity_PokemonSchool_EventScript_157ACE:: @ 8157ACE faceplayer checkflag 275 goto_if_eq RustboroCity_PokemonSchool_EventScript_157B34 - compare_var_to_imm FACING, 4 + compare FACING, 4 call_if 1, RustboroCity_PokemonSchool_EventScript_157B1E - compare_var_to_imm FACING, 3 + compare FACING, 3 call_if 1, RustboroCity_PokemonSchool_EventScript_157B29 msgbox RustboroCity_PokemonSchool_Text_1846A2, 4 giveitem ITEM_QUICK_CLAW - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq RustboroCity_PokemonSchool_EventScript_1A029B closebutton applymovement LAST_TALKED, RustboroCity_PokemonSchool_Movement_1A0845 diff --git a/data/scripts/maps/RusturfTunnel.inc b/data/scripts/maps/RusturfTunnel.inc index 922ad27e1..81bfcd27d 100644 --- a/data/scripts/maps/RusturfTunnel.inc +++ b/data/scripts/maps/RusturfTunnel.inc @@ -10,7 +10,7 @@ RusturfTunnel_MapScript2_15C750:: @ 815C750 RusturfTunnel_MapScript1_15C762:: @ 815C762 call RusturfTunnel_EventScript_1A0196 - compare_var_to_imm 0x409a, 2 + compare 0x409a, 2 call_if 1, RusturfTunnel_EventScript_15C773 end @@ -52,35 +52,35 @@ RusturfTunnel_EventScript_15C7BC:: @ 815C7BC RusturfTunnel_EventScript_15C7D1:: @ 815C7D1 lockall - compare_var_to_imm 0x4001, 1 + compare 0x4001, 1 call_if 1, RusturfTunnel_EventScript_15C8CA - compare_var_to_imm 0x4001, 2 + compare 0x4001, 2 call_if 1, RusturfTunnel_EventScript_15C8DF - compare_var_to_imm 0x4001, 3 + compare 0x4001, 3 call_if 1, RusturfTunnel_EventScript_15C8EA call RusturfTunnel_EventScript_15C92D msgbox RusturfTunnel_Text_19461D, 4 - compare_var_to_imm 0x4001, 2 + compare 0x4001, 2 call_if 1, RusturfTunnel_EventScript_15C8EB - compare_var_to_imm 0x4001, 3 + compare 0x4001, 3 call_if 1, RusturfTunnel_EventScript_15C8EB giveitem ITEM_HM04 setflag 106 msgbox RusturfTunnel_Text_194693, 4 closebutton - compare_var_to_imm 0x4001, 1 + compare 0x4001, 1 call_if 1, RusturfTunnel_EventScript_15C880 - compare_var_to_imm 0x4001, 2 + compare 0x4001, 2 call_if 1, RusturfTunnel_EventScript_15C892 - compare_var_to_imm 0x4001, 3 + compare 0x4001, 3 call_if 1, RusturfTunnel_EventScript_15C8AE msgbox RusturfTunnel_Text_194706, 4 closebutton - compare_var_to_imm 0x4001, 1 + compare 0x4001, 1 call_if 1, RusturfTunnel_EventScript_15C8F7 - compare_var_to_imm 0x4001, 2 + compare 0x4001, 2 call_if 1, RusturfTunnel_EventScript_15C909 - compare_var_to_imm 0x4001, 3 + compare 0x4001, 3 call_if 1, RusturfTunnel_EventScript_15C91B call RusturfTunnel_EventScript_1A0442 releaseall diff --git a/data/scripts/maps/SSTidalCorridor.inc b/data/scripts/maps/SSTidalCorridor.inc index 9f86473be..3edfdd7bb 100644 --- a/data/scripts/maps/SSTidalCorridor.inc +++ b/data/scripts/maps/SSTidalCorridor.inc @@ -41,9 +41,9 @@ SSTidalRooms_EventScript_15FCF9:: @ 815FCF9 return gUnknown_0815FD0D:: @ 815FD0D - compare_var_to_imm 0x40B4, 2 + compare 0x40B4, 2 goto_if_eq SSTidalCorridor_EventScript_15FD24 - compare_var_to_imm 0x40B4, 7 + compare 0x40B4, 7 goto_if_eq SSTidalCorridor_EventScript_15FD3A end @@ -113,9 +113,9 @@ SSTidalCorridor_EventScript_15FDCD:: @ 815FDCD SSTidalCorridor_EventScript_15FDD6:: @ 815FDD6 lock faceplayer - compare_var_to_imm 0x40b4, 4 + compare 0x40b4, 4 goto_if_eq SSTidalCorridor_EventScript_15FDF8 - compare_var_to_imm 0x40b4, 8 + compare 0x40b4, 8 goto_if_eq SSTidalCorridor_EventScript_15FE17 msgbox SSTidalCorridor_Text_19913B, 4 release @@ -147,9 +147,9 @@ SSTidalCorridor_EventScript_15FE36:: @ 815FE36 SSTidalCorridor_EventScript_15FE3A:: @ 815FE3A lockall - compare_var_to_imm 0x40b4, 2 + compare 0x40b4, 2 goto_if_eq SSTidalCorridor_EventScript_15FE5B - compare_var_to_imm 0x40b4, 7 + compare 0x40b4, 7 goto_if_eq SSTidalCorridor_EventScript_15FE5B msgbox SSTidalCorridor_Text_199268, 4 releaseall diff --git a/data/scripts/maps/SSTidalRooms.inc b/data/scripts/maps/SSTidalRooms.inc index f9e815d1f..aa84b6b48 100644 --- a/data/scripts/maps/SSTidalRooms.inc +++ b/data/scripts/maps/SSTidalRooms.inc @@ -8,7 +8,7 @@ SSTidalRooms_EventScript_15FF06:: @ 815FF06 goto_if_eq SSTidalRooms_EventScript_15FF3D msgbox SSTidalRooms_Text_199B65, 4 giveitem ITEM_TM49 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SSTidalRooms_EventScript_1A029B setflag 260 msgbox SSTidalRooms_Text_199C1A, 4 diff --git a/data/scripts/maps/SafariZone_Southeast.inc b/data/scripts/maps/SafariZone_Southeast.inc index b735a87b2..0632a2dda 100644 --- a/data/scripts/maps/SafariZone_Southeast.inc +++ b/data/scripts/maps/SafariZone_Southeast.inc @@ -20,7 +20,7 @@ SafariZone_Southeast_EventScript_16004B:: @ 816004B end SafariZone_Southeast_MapScript1_160073:: @ 8160073 - compare_var_to_imm 0x40a4, 2 + compare 0x40a4, 2 call_if 1, SafariZone_Southeast_EventScript_16007F end @@ -52,10 +52,10 @@ SafariZone_Southeast_EventScript_16009E:: @ 816009E SafariZone_Southeast_EventScript_1600A7:: @ 81600A7 lock faceplayer - compare_var_to_imm 0x4001, 0 + compare 0x4001, 0 goto_if_eq SafariZone_Southeast_EventScript_1600D1 msgbox SafariZone_Southeast_Text_1C3A56, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SafariZone_Southeast_EventScript_1600E0 msgbox SafariZone_Southeast_Text_1C3A9C, 4 release diff --git a/data/scripts/maps/SealedChamber_InnerRoom.inc b/data/scripts/maps/SealedChamber_InnerRoom.inc index 929b4d0ca..70821d183 100644 --- a/data/scripts/maps/SealedChamber_InnerRoom.inc +++ b/data/scripts/maps/SealedChamber_InnerRoom.inc @@ -9,7 +9,7 @@ SealedChamber_InnerRoom_EventScript_15F1E8:: @ 815F1E8 checkflag 228 goto_if_eq SealedChamber_InnerRoom_EventScript_15F247 specialvar RESULT, CheckRelicanthWailord - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SealedChamber_InnerRoom_EventScript_15F247 fadeoutbgm 0 playse 49 diff --git a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc index e51817e27..983ab69d9 100644 --- a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc @@ -23,24 +23,24 @@ ShoalCave_LowTideEntranceRoom_EventScript_15E076:: @ 815E076 checkflag 2143 call_if 1, ShoalCave_LowTideEntranceRoom_EventScript_15E176 checkitem ITEM_SHOAL_SALT, 4 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E138 checkitem ITEM_SHOAL_SHELL, 4 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E138 msgbox ShoalCave_LowTideEntranceRoom_Text_1C6793, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E16C checkitemspace ITEM_SHELL_BELL, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, ShoalCave_LowTideEntranceRoom_EventScript_15E106 - compare_var_to_imm RESULT, 2 + compare RESULT, 2 goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E12E msgbox ShoalCave_LowTideEntranceRoom_Text_1C6808, 4 removeitem ITEM_SHOAL_SALT, 4 removeitem ITEM_SHOAL_SHELL, 4 giveitem ITEM_SHELL_BELL - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_1A029B msgbox ShoalCave_LowTideEntranceRoom_Text_1C688E, 4 setflag 2 @@ -49,13 +49,13 @@ ShoalCave_LowTideEntranceRoom_EventScript_15E076:: @ 815E076 ShoalCave_LowTideEntranceRoom_EventScript_15E106:: @ 815E106 checkitem ITEM_SHOAL_SALT, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E117 return ShoalCave_LowTideEntranceRoom_EventScript_15E117:: @ 815E117 checkitem ITEM_SHOAL_SHELL, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E128 return @@ -70,10 +70,10 @@ ShoalCave_LowTideEntranceRoom_EventScript_15E12E:: @ 815E12E ShoalCave_LowTideEntranceRoom_EventScript_15E138:: @ 815E138 checkitem ITEM_SHOAL_SALT, 1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E162 checkitem ITEM_SHOAL_SHELL, 1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E162 msgbox ShoalCave_LowTideEntranceRoom_Text_1C6668, 4 release diff --git a/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc b/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc index 8dec3b212..05fc6a315 100644 --- a/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc @@ -73,7 +73,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E257:: @ 815E257 checkflag 956 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E289 giveitem ITEM_SHOAL_SHELL - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B setmaptile 41, 20, 859, 0 special DrawWholeMapView @@ -91,7 +91,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E293:: @ 815E293 checkflag 957 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E289 giveitem ITEM_SHOAL_SHELL - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B setmaptile 41, 10, 859, 0 special DrawWholeMapView @@ -104,7 +104,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E2C5:: @ 815E2C5 checkflag 958 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E289 giveitem ITEM_SHOAL_SHELL - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B setmaptile 6, 9, 859, 0 special DrawWholeMapView @@ -117,7 +117,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E2F7:: @ 815E2F7 checkflag 959 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E289 giveitem ITEM_SHOAL_SHELL - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B setmaptile 16, 13, 859, 0 special DrawWholeMapView @@ -130,7 +130,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E329:: @ 815E329 checkflag 952 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E35B giveitem ITEM_SHOAL_SALT - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B setmaptile 31, 8, 858, 0 special DrawWholeMapView @@ -148,7 +148,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E365:: @ 815E365 checkflag 953 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E35B giveitem ITEM_SHOAL_SALT - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B setmaptile 14, 26, 858, 0 special DrawWholeMapView diff --git a/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc b/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc index 01719a9cf..db5779efe 100644 --- a/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc @@ -20,7 +20,7 @@ ShoalCave_LowTideLowerRoom_EventScript_15E413:: @ 815E413 checkflag 955 goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_15E445 giveitem ITEM_SHOAL_SALT - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_1A029B setmaptile 18, 2, 858, 0 special DrawWholeMapView @@ -40,7 +40,7 @@ ShoalCave_LowTideLowerRoom_EventScript_15E44F:: @ 815E44F goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_15E47E msgbox ShoalCave_LowTideLowerRoom_Text_198200, 4 giveitem ITEM_FOCUS_BAND - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_1A029B setflag 283 release diff --git a/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc b/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc index 1c5cde842..bffb7bd49 100644 --- a/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc @@ -20,7 +20,7 @@ ShoalCave_LowTideStairsRoom_EventScript_15E3B7:: @ 815E3B7 checkflag 954 goto_if_eq ShoalCave_LowTideStairsRoom_EventScript_15E3E9 giveitem ITEM_SHOAL_SALT - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq ShoalCave_LowTideStairsRoom_EventScript_1A029B setmaptile 11, 11, 858, 0 special DrawWholeMapView diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc index 02ab6c28c..aba9ee235 100644 --- a/data/scripts/maps/SlateportCity.inc +++ b/data/scripts/maps/SlateportCity.inc @@ -12,7 +12,7 @@ SlateportCity_MapScript1_14BA3C:: @ 814BA3C .endif setvar 0x40aa, 0 call SlateportCity_EventScript_14BA5C - compare_var_to_imm 0x4058, 1 + compare 0x4058, 1 call_if 1, SlateportCity_EventScript_14BA68 end @@ -67,10 +67,10 @@ SlateportCity_EventScript_14BAE0:: @ 814BAE0 bufferfirstpoke 0 msgbox SlateportCity_Text_164682, 4 specialvar RESULT, LeadMonHasEffortRibbon - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, SlateportCity_EventScript_14BB35 specialvar RESULT, ScrSpecial_AreLeadMonEVsMaxedOut - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, SlateportCity_EventScript_14BB2B msgbox SlateportCity_Text_164691, 4 playfanfare 370 @@ -95,7 +95,7 @@ SlateportCity_EventScript_14BB35:: @ 814BB35 SlateportCity_EventScript_14BB3F:: @ 814BB3F lock faceplayer - compare_var_to_imm 0x4058, 1 + compare 0x4058, 1 call_if 1, SlateportCity_EventScript_14BB56 msgbox SlateportCity_Text_164814, 4 release @@ -109,7 +109,7 @@ SlateportCity_EventScript_14BB56:: @ 814BB56 SlateportCity_EventScript_14BB60:: @ 814BB60 lock faceplayer - compare_var_to_imm 0x4058, 1 + compare 0x4058, 1 call_if 1, SlateportCity_EventScript_14BB77 msgbox SlateportCity_Text_1648A0, 4 release @@ -123,7 +123,7 @@ SlateportCity_EventScript_14BB77:: @ 814BB77 SlateportCity_EventScript_14BB81:: @ 814BB81 lock faceplayer - compare_var_to_imm 0x4058, 1 + compare 0x4058, 1 call_if 1, SlateportCity_EventScript_14BBA1 checkflag 96 goto_if_eq SlateportCity_EventScript_14BBAB @@ -144,7 +144,7 @@ SlateportCity_EventScript_14BBAB:: @ 814BBAB SlateportCity_EventScript_14BBB5:: @ 814BBB5 lock faceplayer - compare_var_to_imm 0x4058, 1 + compare 0x4058, 1 call_if 1, SlateportCity_EventScript_14BBCC msgbox SlateportCity_Text_164A30, 4 release @@ -156,7 +156,7 @@ SlateportCity_EventScript_14BBCC:: @ 814BBCC end SlateportCity_EventScript_14BBD6:: @ 814BBD6 - compare_var_to_imm 0x4058, 1 + compare 0x4058, 1 goto_if_eq SlateportCity_EventScript_14BBEA msgbox SlateportCity_Text_164AA9, 2 end @@ -168,7 +168,7 @@ SlateportCity_EventScript_14BBEA:: @ 814BBEA SlateportCity_EventScript_14BBF3:: @ 814BBF3 lock faceplayer - compare_var_to_imm 0x4058, 1 + compare 0x4058, 1 call_if 1, SlateportCity_EventScript_14BC0A msgbox SlateportCity_Text_164B34, 4 release @@ -253,7 +253,7 @@ SlateportCity_EventScript_14BCAF:: @ 814BCAF SlateportCity_EventScript_14BCB8:: @ 814BCB8 lock faceplayer - compare_var_to_imm 0x4058, 1 + compare 0x4058, 1 call_if 1, SlateportCity_EventScript_14BCCF msgbox SlateportCity_Text_164F9E, 4 release @@ -288,9 +288,9 @@ SlateportCity_EventScript_14BD06:: @ 814BD06 lock faceplayer msgbox SlateportCity_Text_1650F1, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, SlateportCity_EventScript_14BD28 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, SlateportCity_EventScript_14BD31 release end diff --git a/data/scripts/maps/SlateportCity_ContestHall.inc b/data/scripts/maps/SlateportCity_ContestHall.inc index 74eaf27fe..f8070f1a1 100644 --- a/data/scripts/maps/SlateportCity_ContestHall.inc +++ b/data/scripts/maps/SlateportCity_ContestHall.inc @@ -16,7 +16,7 @@ SlateportCity_ContestHall_EventScript_15555E:: @ 815555E goto_if_eq SlateportCity_ContestHall_EventScript_155595 msgbox SlateportCity_ContestHall_Text_17CCE2, 4 giveitem ITEM_TM41 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SlateportCity_ContestHall_EventScript_1A029B setflag 265 msgbox SlateportCity_ContestHall_Text_17CE28, 4 diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc index 0e0b5da1f..184586d94 100644 --- a/data/scripts/maps/SlateportCity_Harbor.inc +++ b/data/scripts/maps/SlateportCity_Harbor.inc @@ -5,7 +5,7 @@ SlateportCity_Harbor_MapScripts:: @ 8155F5D SlateportCity_Harbor_MapScript1_155F63:: @ 8155F63 warp6 SlateportCity, 255, 28, 13 setvar 0x4001, 0 - compare_var_to_imm 0x40a0, 1 + compare 0x40a0, 1 call_if 1, SlateportCity_Harbor_EventScript_155F89 checkflag 2052 call_if 1, SlateportCity_Harbor_EventScript_155F85 @@ -63,13 +63,13 @@ SlateportCity_Harbor_EventScript_155FD5:: @ 8155FD5 disappear 7 disappear 8 setvar 0x40a0, 2 - compare_var_to_imm 0x8008, 0 + compare 0x8008, 0 call_if 1, SlateportCity_Harbor_EventScript_15605C - compare_var_to_imm 0x8008, 1 + compare 0x8008, 1 call_if 1, SlateportCity_Harbor_EventScript_156071 - compare_var_to_imm 0x8008, 2 + compare 0x8008, 2 call_if 1, SlateportCity_Harbor_EventScript_156086 - compare_var_to_imm 0x8008, 3 + compare 0x8008, 3 call_if 1, SlateportCity_Harbor_EventScript_156086 msgbox SlateportCity_Harbor_Text_17FE60, 4 closebutton @@ -168,7 +168,7 @@ SlateportCity_Harbor_EventScript_1560C4:: @ 81560C4 SlateportCity_Harbor_EventScript_1560D9:: @ 81560D9 msgbox SlateportCity_Harbor_Text_17FA73, 4 checkitem ITEM_SS_TICKET, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SlateportCity_Harbor_EventScript_156135 message SlateportCity_Harbor_Text_17FB0A waittext @@ -191,7 +191,7 @@ SlateportCity_Harbor_EventScript_156135:: @ 8156135 SlateportCity_Harbor_EventScript_15613F:: @ 815613F msgbox SlateportCity_Harbor_Text_17FB81, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SlateportCity_Harbor_EventScript_15618A setvar 0x40b4, 1 call SlateportCity_Harbor_EventScript_156196 @@ -202,7 +202,7 @@ SlateportCity_Harbor_EventScript_15613F:: @ 815613F SlateportCity_Harbor_EventScript_156167:: @ 8156167 msgbox SlateportCity_Harbor_Text_17FB9C, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SlateportCity_Harbor_EventScript_15618A call SlateportCity_Harbor_EventScript_156196 warp BattleTower_Outside, 255, 19, 23 @@ -223,9 +223,9 @@ SlateportCity_Harbor_EventScript_156196:: @ 8156196 waitmovement 0 delay 30 spriteinvisible LAST_TALKED, 9, 8 - compare_var_to_imm FACING, 2 + compare FACING, 2 call_if 1, SlateportCity_Harbor_EventScript_1561EF - compare_var_to_imm FACING, 4 + compare FACING, 4 call_if 1, SlateportCity_Harbor_EventScript_1561E4 delay 30 spriteinvisible 255, 0, 0 @@ -274,7 +274,7 @@ SlateportCity_Harbor_EventScript_156211:: @ 8156211 goto_if_eq SlateportCity_Harbor_EventScript_156265 checkflag 112 goto_if_eq SlateportCity_Harbor_EventScript_156258 - compare_var_to_imm 0x40a0, 2 + compare 0x40a0, 2 goto_if_eq SlateportCity_Harbor_EventScript_15624E msgbox SlateportCity_Harbor_Text_17FD1C, 4 closebutton @@ -300,10 +300,10 @@ SlateportCity_Harbor_EventScript_156265:: @ 8156265 end SlateportCity_Harbor_EventScript_15626F:: @ 815626F - compare_var_to_imm 0x4001, 1 + compare 0x4001, 1 goto_if_eq SlateportCity_Harbor_EventScript_156380 checkitem ITEM_SCANNER, 1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SlateportCity_Harbor_EventScript_1562A7 checkflag 2052 goto_if_eq SlateportCity_Harbor_EventScript_15629D @@ -333,10 +333,10 @@ SlateportCity_Harbor_EventScript_1562B3:: @ 81562B3 SlateportCity_Harbor_EventScript_1562EA:: @ 81562EA msgbox SlateportCity_Harbor_Text_1803DD, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SlateportCity_Harbor_EventScript_156374 giveitem ITEM_DEEP_SEA_TOOTH - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SlateportCity_Harbor_EventScript_1A029B removeitem ITEM_SCANNER, 1 msgbox SlateportCity_Harbor_Text_18046B, 4 @@ -346,10 +346,10 @@ SlateportCity_Harbor_EventScript_1562EA:: @ 81562EA SlateportCity_Harbor_EventScript_15632A:: @ 815632A msgbox SlateportCity_Harbor_Text_180412, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SlateportCity_Harbor_EventScript_156374 giveitem ITEM_DEEP_SEA_SCALE - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SlateportCity_Harbor_EventScript_1A029B removeitem ITEM_SCANNER, 1 msgbox SlateportCity_Harbor_Text_18046B, 4 diff --git a/data/scripts/maps/SlateportCity_House1.inc b/data/scripts/maps/SlateportCity_House1.inc index e932a58ab..c72aa229a 100644 --- a/data/scripts/maps/SlateportCity_House1.inc +++ b/data/scripts/maps/SlateportCity_House1.inc @@ -5,9 +5,9 @@ SlateportCity_House1_EventScript_15567B:: @ 815567B lock faceplayer msgbox SlateportCity_House1_Text_17D46A, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SlateportCity_House1_EventScript_15569C - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SlateportCity_House1_EventScript_1556BF end @@ -15,9 +15,9 @@ SlateportCity_House1_EventScript_15569C:: @ 815569C msgbox SlateportCity_House1_Text_17D4DB, 4 special sub_80F9A0C waitstate - compare_var_to_imm 0x8004, 255 + compare 0x8004, 255 goto_if 5, SlateportCity_House1_EventScript_1556C9 - compare_var_to_imm 0x8004, 255 + compare 0x8004, 255 goto_if_eq SlateportCity_House1_EventScript_1556BF end @@ -28,20 +28,20 @@ SlateportCity_House1_EventScript_1556BF:: @ 81556BF SlateportCity_House1_EventScript_1556C9:: @ 81556C9 specialvar RESULT, ScriptGetPartyMonSpecies - compare_var_to_imm RESULT, SPECIES_EGG + compare RESULT, SPECIES_EGG goto_if_eq SlateportCity_House1_EventScript_15571C special sub_80BFAE0 special sub_80BFB10 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SlateportCity_House1_EventScript_155726 specialvar RESULT, sub_810F96C special sub_80BFAE0 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SlateportCity_House1_EventScript_155726 msgbox SlateportCity_House1_Text_17D505, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SlateportCity_House1_EventScript_155730 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SlateportCity_House1_EventScript_1556BF end @@ -60,7 +60,7 @@ SlateportCity_House1_EventScript_155730:: @ 8155730 call SlateportCity_House1_EventScript_1A0678 specialvar RESULT, sub_80BF9B4 special sub_80BFAE0 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SlateportCity_House1_EventScript_15575A msgbox SlateportCity_House1_Text_17D63A, 4 release diff --git a/data/scripts/maps/SlateportCity_House2.inc b/data/scripts/maps/SlateportCity_House2.inc index 6f267d31f..934fae153 100644 --- a/data/scripts/maps/SlateportCity_House2.inc +++ b/data/scripts/maps/SlateportCity_House2.inc @@ -9,7 +9,7 @@ SlateportCity_House2_EventScript_156399:: @ 8156399 lock faceplayer checkitem ITEM_CONTEST_PASS, 1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SlateportCity_House2_EventScript_1563B5 msgbox SlateportCity_House2_Text_180567, 4 release diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc index 575538286..7fe5865a4 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc @@ -34,7 +34,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155B06:: @ 8155B06 showmoney 0, 0 nop msgbox SlateportCity_OceanicMuseum_1F_Text_17E18D, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155B2D closebutton hidemoney 0, 0 @@ -45,7 +45,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155B06:: @ 8155B06 SlateportCity_OceanicMuseum_1F_EventScript_155B2D:: @ 8155B2D checkmoney 0x32, 0 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155B5A paymoney 0x32, 0 updatemoney 0, 0 @@ -165,14 +165,14 @@ SlateportCity_OceanicMuseum_1F_EventScript_155C3A:: @ 8155C3A waitmovement 0 msgbox SlateportCity_OceanicMuseum_1F_Text_17E582, 4 giveitem ITEM_TM46 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155CC2 setflag 269 msgbox SlateportCity_OceanicMuseum_1F_Text_17E606, 4 closebutton - compare_var_to_imm FACING, 2 + compare FACING, 2 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155C98 - compare_var_to_imm FACING, 2 + compare FACING, 2 goto_if 5, SlateportCity_OceanicMuseum_1F_EventScript_155CAD end diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc index 1f6aa3c2d..c1398e579 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc @@ -21,21 +21,21 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_155EB8 applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_155EC5 waitmovement 0 - compare_var_to_imm FACING, 1 + compare FACING, 1 call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_155E62 - compare_var_to_imm FACING, 4 + compare FACING, 4 call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_155E62 msgbox SlateportCity_OceanicMuseum_2F_Text_17EDAE, 4 - compare_var_to_imm FACING, 4 + compare FACING, 4 call_if 5, SlateportCity_OceanicMuseum_2F_EventScript_155E6D msgbox SlateportCity_OceanicMuseum_2F_Text_17EDD7, 4 msgbox SlateportCity_OceanicMuseum_2F_Text_17EE01, 4 closebutton applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_155EB2 waitmovement 0 - compare_var_to_imm FACING, 1 + compare FACING, 1 call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_155E78 - compare_var_to_imm FACING, 3 + compare FACING, 3 call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_155E83 trainerbattle 3, OPPONENT_MUSEUM_2F_GRUNT_1, 0, SlateportCity_OceanicMuseum_2F_Text_17EE4E msgbox SlateportCity_OceanicMuseum_2F_Text_17EE66, 4 diff --git a/data/scripts/maps/SlateportCity_PokemonFanClub.inc b/data/scripts/maps/SlateportCity_PokemonFanClub.inc index 882e865ee..cd71d8d51 100644 --- a/data/scripts/maps/SlateportCity_PokemonFanClub.inc +++ b/data/scripts/maps/SlateportCity_PokemonFanClub.inc @@ -33,9 +33,9 @@ SlateportCity_PokemonFanClub_EventScript_1557A8:: @ 81557A8 call_if 1, SlateportCity_PokemonFanClub_EventScript_155893 checkflag 200 call_if 1, SlateportCity_PokemonFanClub_EventScript_155893 - compare_var_to_imm 0x4002, 5 + compare 0x4002, 5 call_if 1, SlateportCity_PokemonFanClub_EventScript_15588D - compare_var_to_imm 0x40b7, 2 + compare 0x40b7, 2 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1557FE msgbox SlateportCity_PokemonFanClub_Text_17DA14, 4 goto SlateportCity_PokemonFanClub_EventScript_155808 @@ -85,7 +85,7 @@ SlateportCity_PokemonFanClub_EventScript_155899:: @ 8155899 SlateportCity_PokemonFanClub_EventScript_1558A3:: @ 81558A3 checkitemspace ITEM_RED_SCARF, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998 msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4 setflag 200 @@ -96,7 +96,7 @@ SlateportCity_PokemonFanClub_EventScript_1558A3:: @ 81558A3 SlateportCity_PokemonFanClub_EventScript_1558D4:: @ 81558D4 checkitemspace ITEM_BLUE_SCARF, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998 msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4 setflag 201 @@ -107,7 +107,7 @@ SlateportCity_PokemonFanClub_EventScript_1558D4:: @ 81558D4 SlateportCity_PokemonFanClub_EventScript_155905:: @ 8155905 checkitemspace ITEM_PINK_SCARF, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998 msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4 setflag 202 @@ -118,7 +118,7 @@ SlateportCity_PokemonFanClub_EventScript_155905:: @ 8155905 SlateportCity_PokemonFanClub_EventScript_155936:: @ 8155936 checkitemspace ITEM_GREEN_SCARF, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998 msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4 setflag 203 @@ -129,7 +129,7 @@ SlateportCity_PokemonFanClub_EventScript_155936:: @ 8155936 SlateportCity_PokemonFanClub_EventScript_155967:: @ 8155967 checkitemspace ITEM_YELLOW_SCARF, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998 msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4 setflag 204 @@ -145,7 +145,7 @@ SlateportCity_PokemonFanClub_EventScript_155998:: @ 8155998 SlateportCity_PokemonFanClub_EventScript_1559A2:: @ 81559A2 specialvar RESULT, CheckLeadMonCool - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, SlateportCity_PokemonFanClub_EventScript_1559B3 return @@ -155,7 +155,7 @@ SlateportCity_PokemonFanClub_EventScript_1559B3:: @ 81559B3 SlateportCity_PokemonFanClub_EventScript_1559B9:: @ 81559B9 specialvar RESULT, CheckLeadMonBeauty - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, SlateportCity_PokemonFanClub_EventScript_1559CA return @@ -165,7 +165,7 @@ SlateportCity_PokemonFanClub_EventScript_1559CA:: @ 81559CA SlateportCity_PokemonFanClub_EventScript_1559D0:: @ 81559D0 specialvar RESULT, CheckLeadMonCute - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, SlateportCity_PokemonFanClub_EventScript_1559E1 return @@ -175,7 +175,7 @@ SlateportCity_PokemonFanClub_EventScript_1559E1:: @ 81559E1 SlateportCity_PokemonFanClub_EventScript_1559E7:: @ 81559E7 specialvar RESULT, CheckLeadMonSmart - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, SlateportCity_PokemonFanClub_EventScript_1559F8 return @@ -185,7 +185,7 @@ SlateportCity_PokemonFanClub_EventScript_1559F8:: @ 81559F8 SlateportCity_PokemonFanClub_EventScript_1559FE:: @ 81559FE specialvar RESULT, CheckLeadMonTough - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, SlateportCity_PokemonFanClub_EventScript_155A0F return @@ -200,7 +200,7 @@ SlateportCity_PokemonFanClub_EventScript_155A15:: @ 8155A15 goto_if_eq SlateportCity_PokemonFanClub_EventScript_155A75 msgbox SlateportCity_PokemonFanClub_Text_17DE6B, 4 specialvar RESULT, GetLeadMonFriendshipScore - compare_var_to_imm RESULT, 4 + compare RESULT, 4 goto_if 4, SlateportCity_PokemonFanClub_EventScript_155A3A release end @@ -213,7 +213,7 @@ SlateportCity_PokemonFanClub_EventScript_155A3A:: @ 8155A3A waitmovement 0 msgbox SlateportCity_PokemonFanClub_Text_17DF57, 4 giveitem ITEM_SOOTHE_BELL - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1A029B setflag 278 release diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc index 6006ac2ef..936b859e5 100644 --- a/data/scripts/maps/SootopolisCity.inc +++ b/data/scripts/maps/SootopolisCity.inc @@ -45,7 +45,7 @@ SootopolisCity_EventScript_14D123:: @ 814D123 call SootopolisCity_EventScript_1A02C1 movespriteperm 1, 29, 19 movespriteperm 2, 33, 19 - compare_var_to_imm 0x405e, 1 + compare 0x405e, 1 call_if 1, SootopolisCity_EventScript_14D142 return @@ -99,20 +99,20 @@ SootopolisCity_EventScript_14D19F:: @ 814D19F addvar RESULT, 20 addvar RESULT, 133 giveitem RESULT - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SootopolisCity_EventScript_1A029B setflag 2258 msgbox SootopolisCity_Text_1C64D0, 4 random 2 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SootopolisCity_EventScript_14D1FF - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SootopolisCity_EventScript_14D220 end SootopolisCity_EventScript_14D1FF:: @ 814D1FF giveitem ITEM_FIGY_BERRY - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SootopolisCity_EventScript_1A029B msgbox SootopolisCity_Text_1C650B, 4 release @@ -120,7 +120,7 @@ SootopolisCity_EventScript_14D1FF:: @ 814D1FF SootopolisCity_EventScript_14D220:: @ 814D220 giveitem ITEM_IAPAPA_BERRY - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SootopolisCity_EventScript_1A029B msgbox SootopolisCity_Text_1C650B, 4 release @@ -128,7 +128,7 @@ SootopolisCity_EventScript_14D220:: @ 814D220 SootopolisCity_EventScript_14D241:: @ 814D241 msgbox SootopolisCity_Text_1C6540, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SootopolisCity_EventScript_14D25E msgbox SootopolisCity_Text_1C6626, 4 release diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.inc b/data/scripts/maps/SootopolisCity_Gym_1F.inc index d6c7958b6..bd0af12be 100644 --- a/data/scripts/maps/SootopolisCity_Gym_1F.inc +++ b/data/scripts/maps/SootopolisCity_Gym_1F.inc @@ -19,11 +19,11 @@ SootopolisCity_Gym_1F_MapScript1_15AF25:: @ 815AF25 end SootopolisCity_Gym_1F_EventScript_15AF2E:: @ 815AF2E - compare_var_to_imm 0x4022, 8 + compare 0x4022, 8 goto_if 0, SootopolisCity_Gym_1F_EventScript_15AF85 - compare_var_to_imm 0x4022, 28 + compare 0x4022, 28 goto_if 0, SootopolisCity_Gym_1F_EventScript_15AF73 - compare_var_to_imm 0x4022, 69 + compare 0x4022, 69 goto_if 0, SootopolisCity_Gym_1F_EventScript_15AF61 setmaptile 8, 4, 519, 0 setmaptile 8, 5, 519, 0 @@ -109,7 +109,7 @@ SootopolisCity_Gym_1F_EventScript_15B02D:: @ 815B02D SootopolisCity_Gym_1F_EventScript_15B056:: @ 815B056 giveitem ITEM_TM03 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SootopolisCity_Gym_1F_EventScript_1A029B msgbox SootopolisCity_Gym_1F_Text_18F466, 4 setflag 172 diff --git a/data/scripts/maps/SootopolisCity_House2.inc b/data/scripts/maps/SootopolisCity_House2.inc index 6315cee85..011806291 100644 --- a/data/scripts/maps/SootopolisCity_House2.inc +++ b/data/scripts/maps/SootopolisCity_House2.inc @@ -5,9 +5,9 @@ SootopolisCity_House2_EventScript_15B2E5:: @ 815B2E5 lock faceplayer msgbox SootopolisCity_House2_Text_18FA66, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, SootopolisCity_House2_EventScript_15B307 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, SootopolisCity_House2_EventScript_15B310 release end diff --git a/data/scripts/maps/SootopolisCity_House3.inc b/data/scripts/maps/SootopolisCity_House3.inc index 156ee232d..f1bf0bf19 100644 --- a/data/scripts/maps/SootopolisCity_House3.inc +++ b/data/scripts/maps/SootopolisCity_House3.inc @@ -5,7 +5,7 @@ SootopolisCity_House3_EventScript_15B31A:: @ 815B31A lock faceplayer msgbox SootopolisCity_House3_Text_18FB36, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SootopolisCity_House3_EventScript_15B339 msgbox SootopolisCity_House3_Text_18FBC0, 4 release diff --git a/data/scripts/maps/SootopolisCity_House6.inc b/data/scripts/maps/SootopolisCity_House6.inc index 2d6add92d..1e1b53956 100644 --- a/data/scripts/maps/SootopolisCity_House6.inc +++ b/data/scripts/maps/SootopolisCity_House6.inc @@ -7,11 +7,11 @@ SootopolisCity_House6_EventScript_15B386:: @ 815B386 checkflag 245 goto_if_eq SootopolisCity_House6_EventScript_15B3CD msgbox SootopolisCity_House6_Text_18FEA1, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, SootopolisCity_House6_EventScript_15B3C3 msgbox SootopolisCity_House6_Text_18FF12, 4 givedecoration 117 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SootopolisCity_House6_EventScript_15B3D7 setflag 245 release diff --git a/data/scripts/maps/SootopolisCity_House8.inc b/data/scripts/maps/SootopolisCity_House8.inc index e7ddaa39d..662117741 100644 --- a/data/scripts/maps/SootopolisCity_House8.inc +++ b/data/scripts/maps/SootopolisCity_House8.inc @@ -9,14 +9,14 @@ SootopolisCity_House8_EventScript_15B401:: @ 815B401 special sub_80F9A0C waitstate copyvar RESULT, 0x8004 - compare_var_to_imm RESULT, 255 + compare RESULT, 255 goto_if_eq SootopolisCity_House8_EventScript_15B448 special CompareShroomishSize - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SootopolisCity_House8_EventScript_15B452 - compare_var_to_imm RESULT, 2 + compare RESULT, 2 goto_if_eq SootopolisCity_House8_EventScript_15B45C - compare_var_to_imm RESULT, 3 + compare RESULT, 3 goto_if_eq SootopolisCity_House8_EventScript_15B466 release end @@ -39,7 +39,7 @@ SootopolisCity_House8_EventScript_15B45C:: @ 815B45C SootopolisCity_House8_EventScript_15B466:: @ 815B466 msgbox SootopolisCity_House8_Text_19021D, 4 giveitem ITEM_ELIXIR - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SootopolisCity_House8_EventScript_15B488 closebutton release @@ -58,14 +58,14 @@ SootopolisCity_House8_EventScript_15B492:: @ 815B492 special sub_80F9A0C waitstate copyvar RESULT, 0x8004 - compare_var_to_imm RESULT, 255 + compare RESULT, 255 goto_if_eq SootopolisCity_House8_EventScript_15B4D9 special CompareBarboachSize - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SootopolisCity_House8_EventScript_15B4E3 - compare_var_to_imm RESULT, 2 + compare RESULT, 2 goto_if_eq SootopolisCity_House8_EventScript_15B4ED - compare_var_to_imm RESULT, 3 + compare RESULT, 3 goto_if_eq SootopolisCity_House8_EventScript_15B4F7 release end @@ -88,7 +88,7 @@ SootopolisCity_House8_EventScript_15B4ED:: @ 815B4ED SootopolisCity_House8_EventScript_15B4F7:: @ 815B4F7 msgbox SootopolisCity_House8_Text_190536, 4 giveitem ITEM_ELIXIR - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SootopolisCity_House8_EventScript_15B519 closebutton release diff --git a/data/scripts/maps/SouthernIsland_Exterior.inc b/data/scripts/maps/SouthernIsland_Exterior.inc index a45b0b556..358e2277c 100644 --- a/data/scripts/maps/SouthernIsland_Exterior.inc +++ b/data/scripts/maps/SouthernIsland_Exterior.inc @@ -10,7 +10,7 @@ SouthernIsland_Exterior_EventScript_160AE0:: @ 8160AE0 lock faceplayer msgbox SouthernIsland_Exterior_Text_1C5215, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SouthernIsland_Exterior_EventScript_160B25 msgbox SouthernIsland_Exterior_Text_1C5281, 4 closebutton diff --git a/data/scripts/maps/SouthernIsland_Interior.inc b/data/scripts/maps/SouthernIsland_Interior.inc index d30f8cee4..37af5e140 100644 --- a/data/scripts/maps/SouthernIsland_Interior.inc +++ b/data/scripts/maps/SouthernIsland_Interior.inc @@ -23,9 +23,9 @@ SouthernIsland_Interior_MapScript1_160B6C:: @ 8160B6C SouthernIsland_Interior_EventScript_160B77:: @ 8160B77 checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SouthernIsland_Interior_EventScript_160B8F - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SouthernIsland_Interior_EventScript_160B95 end diff --git a/data/scripts/maps/Underwater_SealedChamber.inc b/data/scripts/maps/Underwater_SealedChamber.inc index 6d263690d..5bbe8e3b6 100644 --- a/data/scripts/maps/Underwater_SealedChamber.inc +++ b/data/scripts/maps/Underwater_SealedChamber.inc @@ -4,9 +4,9 @@ Underwater_SealedChamber_MapScripts:: @ 815F080 Underwater_SealedChamber_MapScript1_15F086:: @ 815F086 getplayerxy 0x8004, 0x8005 - compare_var_to_imm 0x8004, 12 + compare 0x8004, 12 goto_if 5, Underwater_SealedChamber_EventScript_15F0A6 - compare_var_to_imm 0x8005, 44 + compare 0x8005, 44 goto_if 5, Underwater_SealedChamber_EventScript_15F0A6 goto Underwater_SealedChamber_EventScript_15F0AF diff --git a/data/scripts/maps/UnknownMap_25_34.inc b/data/scripts/maps/UnknownMap_25_34.inc index 0bf09e41e..994f37b63 100644 --- a/data/scripts/maps/UnknownMap_25_34.inc +++ b/data/scripts/maps/UnknownMap_25_34.inc @@ -13,15 +13,15 @@ LinkContestRoom1_MapScript1_15F595:: @ 815F595 LinkContestRoom1_EventScript_15F5A5:: @ 815F5A5 special ScriptGetMultiplayerId - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LinkContestRoom1_EventScript_15F5E0 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, LinkContestRoom1_EventScript_15F5E4 - compare_var_to_imm RESULT, 2 + compare RESULT, 2 call_if 1, LinkContestRoom1_EventScript_15F5E8 - compare_var_to_imm RESULT, 3 + compare RESULT, 3 call_if 1, LinkContestRoom1_EventScript_15F5EC - compare_var_to_imm RESULT, 4 + compare RESULT, 4 call_if 1, LinkContestRoom1_EventScript_15F5F0 return @@ -46,7 +46,7 @@ LinkContestRoom1_EventScript_15F5F0:: @ 815F5F0 return LinkContestRoom1_MapScript1_15F5F4:: @ 815F5F4 - compare_var_to_imm 0x4009, 1 + compare 0x4009, 1 call_if 1, LinkContestRoom1_EventScript_15F600 end @@ -75,7 +75,7 @@ LinkContestRoom1_EventScript_15F625:: @ 815F625 LinkContestRoom1_EventScript_15F630:: @ 815F630 call LinkContestRoom1_EventScript_15F6E6 call LinkContestRoom1_EventScript_15F646 - compare_var_to_imm 0x4000, 8 + compare 0x4000, 8 goto_if 0, LinkContestRoom1_EventScript_15F630 return @@ -414,9 +414,9 @@ LilycoveCity_ContestLobby_EventScript_15FBDB:: @ 815FBDB SlateportCity_ContestLobby_EventScript_15FBDB:: @ 815FBDB VerdanturfTown_ContestLobby_EventScript_15FBDB:: @ 815FBDB checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_15FBF3 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq FallarborTown_ContestLobby_EventScript_15FBF9 return diff --git a/data/scripts/maps/VerdanturfTown_ContestLobby.inc b/data/scripts/maps/VerdanturfTown_ContestLobby.inc index 52de0db78..5d7c6de18 100644 --- a/data/scripts/maps/VerdanturfTown_ContestLobby.inc +++ b/data/scripts/maps/VerdanturfTown_ContestLobby.inc @@ -105,7 +105,7 @@ VerdanturfTown_ContestLobby_EventScript_153E47:: @ 8153E47 goto_if_eq VerdanturfTown_ContestLobby_EventScript_153E76 msgbox VerdanturfTown_ContestLobby_Text_177DEC, 4 giveitem ITEM_TM45 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq VerdanturfTown_ContestLobby_EventScript_1A029B setflag 235 release diff --git a/data/scripts/maps/VictoryRoad_1F.inc b/data/scripts/maps/VictoryRoad_1F.inc index 7bbcf6a41..a0173e720 100644 --- a/data/scripts/maps/VictoryRoad_1F.inc +++ b/data/scripts/maps/VictoryRoad_1F.inc @@ -94,7 +94,7 @@ VictoryRoad_1F_EventScript_15DF28:: @ 815DF28 VictoryRoad_1F_EventScript_15DF31:: @ 815DF31 trainerbattle 0, OPPONENT_WALLY_3, 0, VictoryRoad_1F_Text_1979BA, VictoryRoad_1F_Text_197A23 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq VictoryRoad_1F_EventScript_15DF58 msgbox VictoryRoad_1F_Text_197A47, 6 end diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc index 1881bc242..215fb3948 100644 --- a/data/scripts/mauville_man.inc +++ b/data/scripts/mauville_man.inc @@ -26,9 +26,9 @@ SpeakToBard: lock faceplayer msgbox gTextBard_HiImTheBard, MSGBOX_YESNO - compare_var_to_imm RESULT, YES + compare RESULT, YES goto_if_eq yes_hear_song - compare_var_to_imm RESULT, NO + compare RESULT, NO goto_if_eq dont_hear_song end @@ -38,7 +38,7 @@ yes_hear_song: special ScrSpecial_PlayBardSong delay 60 special ScrSpecial_HasBardSongBeenChanged - compare_var_to_imm RESULT, FALSE + compare RESULT, FALSE @ Prompt new lyrics only if song hasn't been changed goto_if_eq prompt_write_lyrics msgbox gTextBard_OhWhatAMovingSong, 4 @@ -52,9 +52,9 @@ dont_hear_song: prompt_write_lyrics: msgbox gTextBard_SoHowDoYouLikeMySong, MSGBOX_YESNO - compare_var_to_imm RESULT, YES + compare RESULT, YES goto_if_eq write_lyrics - compare_var_to_imm RESULT, NO + compare RESULT, NO goto_if_eq dont_write_lyrics end @@ -63,7 +63,7 @@ write_lyrics: call MauvilleCity_PokemonCenter_1F_EventScript_1A00F3 lock faceplayer - compare_var_to_imm RESULT, NO + compare RESULT, NO goto_if_eq dont_write_lyrics msgbox gTextBard_ThankYouKindly, 4 setvar 0x8004, 1 @@ -71,7 +71,7 @@ write_lyrics: special ScrSpecial_PlayBardSong delay 60 msgbox gTextBard_WasThatHowYouWanted, MSGBOX_YESNO - compare_var_to_imm RESULT, NO + compare RESULT, NO goto_if_eq write_lyrics @ Keep looping until player responds YES special ScrSpecial_SaveBardSongLyrics msgbox gTextBard_OkayThatsIt, 4 @@ -94,7 +94,7 @@ SpeakToHipster: setflag 2054 msgbox gTextHipster_TheyCallMeTheHipster, 4 special ScrSpecial_GetHipsterSpokenFlag - compare_var_to_imm RESULT, FALSE + compare RESULT, FALSE goto_if_eq hipster_first_time msgbox gTextHipster_TaughtYouAlready, 4 release @@ -102,7 +102,7 @@ SpeakToHipster: hipster_first_time: special ScrSpecial_HipsterTeachWord - compare_var_to_imm RESULT, TRUE @ TRUE if player learned a new word + compare RESULT, TRUE @ TRUE if player learned a new word goto_if_eq teach_new_word msgbox gTextHipster_YouAlreadyKnowALot, 4 release @@ -125,10 +125,10 @@ SpeakToTrader: lock faceplayer msgbox gTextTrader_Introduction, MSGBOX_YESNO - compare_var_to_imm RESULT, NO + compare RESULT, NO goto_if_eq dont_want_to_trade special ScrSpecial_GetTraderTradedFlag - compare_var_to_imm RESULT, TRUE + compare RESULT, TRUE goto_if_eq already_traded message gTextTrader_MenuPrompt waittext @@ -146,15 +146,15 @@ already_traded: do_trader_menu_get: special ScrSpecial_TraderMenuGetDecoration waitstate - compare_var_to_imm 0x8004, 0 + compare 0x8004, 0 goto_if_eq cancelled_get_menu - compare_var_to_imm 0x8004, 65535 + compare 0x8004, 65535 goto_if_eq rare_item_cant_trade_away msgbox gTextTrader_ItemOnceBelongedTo, MSGBOX_YESNO - compare_var_to_imm RESULT, NO + compare RESULT, NO goto_if_eq dont_want_item special ScrSpecial_DoesPlayerHaveNoDecorations - compare_var_to_imm RESULT, TRUE + compare RESULT, TRUE goto_if_eq player_has_no_decorations goto do_trader_menu_give end @@ -183,15 +183,15 @@ do_trader_menu_give: msgbox gTextTrader_PickDecorationYoullTrade, 4 special ScrSpecial_TraderMenuGiveDecoration waitstate - compare_var_to_imm 0x8006, 0 + compare 0x8006, 0 goto_if_eq cancelled_give_menu - compare_var_to_imm 0x8006, 65535 + compare 0x8006, 65535 goto_if_eq decoration_is_in_use special ScrSpecial_IsDecorationFull - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq decorations_full msgbox gTextTrader_SoWellTrade, MSGBOX_YESNO - compare_var_to_imm RESULT, NO + compare RESULT, NO goto_if_eq do_trader_menu_give special ScrSpecial_TraderDoDecorationTrade msgbox gTextTrader_ThenWellTrade, 2 @@ -225,51 +225,51 @@ SpeakToStoryteller: lock faceplayer msgbox gTextStoryteller_Introduction, MSGBOX_YESNO - compare_var_to_imm RESULT, NO + compare RESULT, NO goto_if_eq dont_hear_story specialvar RESULT, ScrSpecial_StorytellerGetFreeStorySlot - compare_var_to_imm RESULT, 0 @ If slot is 0, then the list is empty + compare RESULT, 0 @ If slot is 0, then the list is empty goto_if_eq no_stories_recorded choose_story: message gTextStoryteller_WhichTale waittext special ScrSpecial_StorytellerStoryListMenu waitstate - compare_var_to_imm RESULT, FALSE + compare RESULT, FALSE goto_if_eq cancel_story_menu setvar 0x8008, 1 special ScrSpecial_StorytellerDisplayStory waittext waitbutton specialvar RESULT, ScrSpecial_StorytellerUpdateStat - compare_var_to_imm RESULT, FALSE + compare RESULT, FALSE goto_if_eq no_stat_update goto stat_update cancel_story_menu: - compare_var_to_imm 0x8008, 0 + compare 0x8008, 0 goto_if_eq dont_hear_story goto yes_hear_story no_stat_update: msgbox gTextStoryteller_CouldThereBeOtherTrainers, 4 msgbox gTextStoryteller_HearAnotherLegendaryTale, MSGBOX_YESNO - compare_var_to_imm RESULT, YES + compare RESULT, YES goto_if_eq choose_story yes_hear_story: specialvar RESULT, ScrSpecial_HasStorytellerAlreadyRecorded - compare_var_to_imm RESULT, TRUE + compare RESULT, TRUE goto_if_eq cant_record_story @ already recorded story specialvar RESULT, ScrSpecial_StorytellerGetFreeStorySlot - compare_var_to_imm RESULT, 4 + compare RESULT, 4 goto_if_eq cant_record_story @ story list is full goto prompt_record_story no_stories_recorded: msgbox gTextStoryteller_ButIKnowOfNoLegendaryTrainers, 4 prompt_record_story: msgbox gTextStoryteller_HaveYouAnyTales, MSGBOX_YESNO - compare_var_to_imm RESULT, NO + compare RESULT, NO goto_if_eq dont_hear_story specialvar RESULT, ScrSpecial_StorytellerInitializeRandomStat - compare_var_to_imm RESULT, TRUE + compare RESULT, TRUE goto_if_eq stat_update msgbox gTextStoryteller_ImNotSatisfied, 4 closebutton @@ -305,25 +305,25 @@ SpeakToGiddy: lock faceplayer msgbox gTextGiddy_Introduction, MSGBOX_YESNO - compare_var_to_imm RESULT, YES + compare RESULT, YES goto_if_eq yes_hear_giddy - compare_var_to_imm RESULT, NO + compare RESULT, NO goto_if_eq dont_hear_giddy end yes_hear_giddy: special ScrSpecial_GiddyShouldTellAnotherTale - compare_var_to_imm RESULT, TRUE + compare RESULT, TRUE goto_if_eq tell_giddy_tale - compare_var_to_imm RESULT, FALSE + compare RESULT, FALSE goto_if_eq bye_bye end tell_another_giddy_tale: special ScrSpecial_GiddyShouldTellAnotherTale - compare_var_to_imm RESULT, TRUE + compare RESULT, TRUE goto_if_eq also_i_was_thinking - compare_var_to_imm RESULT, FALSE + compare RESULT, FALSE goto_if_eq bye_bye end @@ -337,9 +337,9 @@ tell_giddy_tale: special ShowFieldMessageStringVar4 waittext yesnobox 20, 8 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq tell_another_giddy_tale - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq tell_another_giddy_tale end diff --git a/data/scripts/mystery_event_club.inc b/data/scripts/mystery_event_club.inc index ed21a1869..7f29be0d8 100644 --- a/data/scripts/mystery_event_club.inc +++ b/data/scripts/mystery_event_club.inc @@ -29,11 +29,11 @@ PetalburgCity_PokemonCenter_1F_EventScript_1B1B7A:: @ 81B1B7A call PetalburgCity_PokemonCenter_1F_EventScript_1A00F3 lock faceplayer - compare_var_to_imm 0x8004, 1 + compare 0x8004, 1 call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_1B1C77 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_1B1BB1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_1B1BBB end @@ -83,11 +83,11 @@ PetalburgCity_PokemonCenter_1F_EventScript_1B1C36:: @ 81B1C36 call PetalburgCity_PokemonCenter_1F_EventScript_1A00F3 lock faceplayer - compare_var_to_imm 0x8004, 1 + compare 0x8004, 1 call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_1B1C77 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_1B1BB1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_1B1BBB end diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index bb890ebcb..432ba8f65 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -8,9 +8,9 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6956:: @ 81B6956 msgbox LittlerootTown_BrendansHouse_1F_Text_172429, 4 applymovement 0x8004, LittlerootTown_BrendansHouse_1F_Movement_1A0839 waitmovement 0 - compare_var_to_imm 0x8005, 0 + compare 0x8005, 0 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B699F - compare_var_to_imm 0x8005, 1 + compare 0x8005, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B69AA msgbox LittlerootTown_BrendansHouse_1F_Text_172453, 4 closebutton @@ -69,9 +69,9 @@ LittlerootTown_MaysHouse_2F_EventScript_1B69EB:: @ 81B69EB setflag 754 setflag 755 checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1B6A31 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1B6A61 playse 9 disappear 0x8008 @@ -252,17 +252,17 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6BE9:: @ 81B6BE9 LittlerootTown_MaysHouse_1F_EventScript_1B6BE9:: @ 81B6BE9 lock faceplayer - compare_var_to_imm 0x4082, 4 + compare 0x4082, 4 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C33 - compare_var_to_imm 0x408c, 4 + compare 0x408c, 4 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C33 checkflag 2059 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C3D checkflag 82 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C72 - compare_var_to_imm 0x4001, 1 + compare 0x4001, 1 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C80 - compare_var_to_imm 0x4092, 7 + compare 0x4092, 7 goto_if 4, LittlerootTown_BrendansHouse_1F_EventScript_1B6C9C msgbox LittlerootTown_BrendansHouse_1F_Text_172429, 4 release @@ -278,7 +278,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6C3D:: @ 81B6C3D goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C72 msgbox LittlerootTown_BrendansHouse_1F_Text_172782, 4 giveitem ITEM_AMULET_COIN - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1A029B msgbox LittlerootTown_BrendansHouse_1F_Text_1727CD, 4 setflag 133 @@ -362,13 +362,13 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6CDE:: @ 81B6CDE LittlerootTown_MaysHouse_1F_EventScript_1B6CDE:: @ 81B6CDE lockall checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DAD - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DBD - compare_var_to_imm 0x8008, 0 + compare 0x8008, 0 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6E1D - compare_var_to_imm 0x8008, 1 + compare 0x8008, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6E28 applymovement 0x8009, LittlerootTown_BrendansHouse_1F_Movement_1A0839 waitmovement 0 @@ -378,23 +378,23 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6CDE:: @ 81B6CDE applymovement 0x8009, LittlerootTown_BrendansHouse_1F_Movement_1A0835 waitmovement 0 delay 20 - compare_var_to_imm 0x8008, 0 + compare 0x8008, 0 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DCD - compare_var_to_imm 0x8008, 1 + compare 0x8008, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DD8 msgbox LittlerootTown_BrendansHouse_1F_Text_17298B, 4 giveitem ITEM_SS_TICKET msgbox LittlerootTown_BrendansHouse_1F_Text_172A7D, 4 closebutton - compare_var_to_imm 0x8008, 0 + compare 0x8008, 0 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DE3 - compare_var_to_imm 0x8008, 1 + compare 0x8008, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DEE msgbox LittlerootTown_BrendansHouse_1F_Text_172B5E, 4 closebutton - compare_var_to_imm 0x8008, 0 + compare 0x8008, 0 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DF9 - compare_var_to_imm 0x8008, 1 + compare 0x8008, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6E0B playse 8 disappear 0x8009 diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index 5f185c8ff..dde0d0400 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -39,24 +39,24 @@ SlateportCity_ContestLobby_EventScript_1B7681:: @ 81B7681 VerdanturfTown_ContestLobby_EventScript_1B7681:: @ 81B7681 lockall msgbox FallarborTown_ContestLobby_Text_1B6E63, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq FallarborTown_ContestLobby_EventScript_1B76A1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1B76E5 end FallarborTown_ContestLobby_EventScript_1B76A1:: @ 81B76A1 checkitem ITEM_POKEBLOCK_CASE, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7780 specialvar RESULT, PlayerHasBerries - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1B770E msgbox FallarborTown_ContestLobby_Text_1B6E9D, 4 specialvar RESULT, sub_810CA00 - compare_var_to_imm RESULT, 65535 + compare RESULT, 65535 goto_if 5, FallarborTown_ContestLobby_EventScript_1B76EF - compare_var_to_imm RESULT, 65535 + compare RESULT, 65535 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7776 end @@ -67,9 +67,9 @@ FallarborTown_ContestLobby_EventScript_1B76E5:: @ 81B76E5 FallarborTown_ContestLobby_EventScript_1B76EF:: @ 81B76EF msgbox FallarborTown_ContestLobby_Text_1B6ED0, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7734 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7726 end @@ -149,9 +149,9 @@ VerdanturfTown_ContestLobby_EventScript_1B77B6:: @ 81B77B6 faceplayer msgbox FallarborTown_ContestLobby_Text_1B742F, 4 specialvar RESULT, PlayerHasBerries - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq FallarborTown_ContestLobby_EventScript_1B77DC - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1B77E6 end @@ -209,23 +209,23 @@ SlateportCity_ContestLobby_EventScript_1B783B:: @ 81B783B VerdanturfTown_ContestLobby_EventScript_1B783B:: @ 81B783B lockall specialvar RESULT, PlayerHasBerries - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7897 checkitem ITEM_POKEBLOCK_CASE, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7942 specialvar RESULT, sub_810CA00 - compare_var_to_imm RESULT, 65535 + compare RESULT, 65535 goto_if 5, FallarborTown_ContestLobby_EventScript_1B7878 - compare_var_to_imm RESULT, 65535 + compare RESULT, 65535 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7938 end FallarborTown_ContestLobby_EventScript_1B7878:: @ 81B7878 msgbox FallarborTown_ContestLobby_Text_1B727C, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq FallarborTown_ContestLobby_EventScript_1B78A1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7936 end @@ -236,21 +236,21 @@ FallarborTown_ContestLobby_EventScript_1B7897:: @ 81B7897 FallarborTown_ContestLobby_EventScript_1B78A1:: @ 81B78A1 call S_DoSaveDialog - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7936 message FallarborTown_ContestLobby_Text_1B7304 waittext special sub_8083614 waitstate - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7980 - compare_var_to_imm RESULT, 2 + compare RESULT, 2 goto_if_eq FallarborTown_ContestLobby_EventScript_1B794C - compare_var_to_imm RESULT, 3 + compare RESULT, 3 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7959 - compare_var_to_imm RESULT, 5 + compare RESULT, 5 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7966 - compare_var_to_imm RESULT, 6 + compare RESULT, 6 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7973 end diff --git a/data/scripts/safari_zone.inc b/data/scripts/safari_zone.inc index 01fdf3c03..b7c4d1a43 100644 --- a/data/scripts/safari_zone.inc +++ b/data/scripts/safari_zone.inc @@ -14,7 +14,7 @@ EventScript_1C341B: @ 81C341B gUnknown_081C342D:: @ 81C342D lockall msgbox UnknownString_81C34B2, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq EventScript_1C3443 releaseall end @@ -43,10 +43,10 @@ gUnknown_081C3459:: @ 81C3459 gUnknown_081C346A:: @ 81C346A lockall special SafariZoneGetPokeblockNameInFeeder - compare_var_to_imm RESULT, -1 + compare RESULT, 0xFFFF goto_if 5, EventScript_1C34A9 msgbox UnknownString_81C354E, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq EventScript_1C348E releaseall end @@ -55,7 +55,7 @@ EventScript_1C348E: fadescreen 1 special sub_810BAF4 waitstate - compare_var_to_imm RESULT, -1 + compare RESULT, 0xFFFF goto_if 5, EventScript_1C34A0 end diff --git a/data/scripts/secret_power_tm.inc b/data/scripts/secret_power_tm.inc index ac033506b..2c1524e5b 100644 --- a/data/scripts/secret_power_tm.inc +++ b/data/scripts/secret_power_tm.inc @@ -2,7 +2,7 @@ Route111_EventScript_1A3858:: @ 81A3858 lock faceplayer msgbox Route111_Text_1A3520, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route111_EventScript_1A3877 msgbox Route111_Text_1A37B5, 4 release @@ -10,17 +10,17 @@ Route111_EventScript_1A3858:: @ 81A3858 Route111_EventScript_1A3877:: @ 81A3877 giveitem ITEM_TM43 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route111_EventScript_1A38D9 msgbox Route111_Text_1A35C5, 4 closebutton setflag 96 clearflag 948 - compare_var_to_imm FACING, 3 + compare FACING, 3 call_if 1, Route111_EventScript_1A38C3 - compare_var_to_imm FACING, 4 + compare FACING, 4 call_if 1, Route111_EventScript_1A38C3 - compare_var_to_imm FACING, 2 + compare FACING, 2 call_if 1, Route111_EventScript_1A38CE disappear LAST_TALKED release diff --git a/data/scripts/tv.inc b/data/scripts/tv.inc index a2348315f..41e55929d 100644 --- a/data/scripts/tv.inc +++ b/data/scripts/tv.inc @@ -3,30 +3,30 @@ Event_TV:: @ 81A6E72 inccounter GAME_STAT_WATCHED_TV special sub_80C2014 specialvar RESULT, CheckForBigMovieOrEmergencyNewsOnTV - compare_var_to_imm RESULT, 2 + compare RESULT, 2 goto_if_eq EventScript_1A6F01 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq EventScript_1A6F0B checkflag 2098 goto_if 0, EventScript_1A6EF1 checkflag 2097 goto_if_eq EventScript_1A6EF1 specialvar RESULT, IsTVShowInSearchOfTrainersAiring - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq EventScript_1A6F66 goto EventScript_1A6F50 end EventScript_1A6EBB: specialvar 0x8004, special_0x44 - compare_var_to_imm 0x8004, 255 + compare 0x8004, 255 goto_if_eq EventScript_1A6F3F specialvar RESULT, special_0x4a - compare_var_to_imm RESULT, 255 + compare RESULT, 255 goto_if_eq EventScript_1A6F3F copyvar 0x8004, RESULT specialvar RESULT, sub_80BDA0C - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if 5, EventScript_1A6F21 end @@ -59,7 +59,7 @@ EventScript_1A6F21: special DoTVShow waittext waitbutton - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if 5, EventScript_1A6F21 goto EventScript_1A6F37 end @@ -78,7 +78,7 @@ EventScript_1A6F3F: EventScript_1A6F50: special sub_80BECE8 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq EventScript_1A6EBB waittext waitbutton @@ -89,7 +89,7 @@ EventScript_1A6F66: special DoTVShowInSearchOfTrainers waittext waitbutton - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq EventScript_1A6F66 goto EventScript_1A6F37 end |