diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2019-10-20 20:38:23 -0400 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2019-10-20 20:38:23 -0400 |
| commit | 6b503e306d73c749794cf7b61126287e3941f12f (patch) | |
| tree | 9b171c8dec365e1805216aba593091039a248036 | |
| parent | 2aeefdc5de73c630a79b183e7bc2a66ad48ed424 (diff) | |
script switch/case; name script conditionals
132 files changed, 1559 insertions, 1789 deletions
diff --git a/asm/macros/event.inc b/asm/macros/event.inc index 0b5ab8915..21e3e65c0 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -1412,7 +1412,7 @@ @ Supplementary .macro goto_if_eq dest - goto_if 1, \dest + goto_if eq, \dest .endm .macro switch var diff --git a/data/event_scripts.s b/data/event_scripts.s index 9193aca8b..4a817be03 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -803,14 +803,14 @@ gStdScript_5:: @ 81A4E5C gStdScript_ItemMessageAndFanfare:: @ 81A4E66 textcolor 3 compare_var_to_value VAR_0x8002, MUS_FANFA1 - call_if 1, EventScript_1A4EA2 + call_if eq, EventScript_1A4EA2 compare_var_to_value VAR_0x8002, MUS_FAN5 - call_if 1, EventScript_1A4EA6 + call_if eq, EventScript_1A4EA6 message 0x0 waitmessage waitfanfare compare_var_to_value VAR_0x8002, MUS_FANFA1 - call_if 1, EventScript_1A4EAA + call_if eq, EventScript_1A4EAA giveitem VAR_0x8000, VAR_0x8001, 8 call EventScript_1A6675 return @@ -849,7 +849,7 @@ gUnknown_81A4EC1:: @ 81A4EC1 waitmovement 0 specialvar VAR_RESULT, ScrSpecial_HasTrainerBeenFought compare_var_to_value VAR_RESULT, 0 - goto_if 5, EventScript_1A4EE8 + goto_if ne, EventScript_1A4EE8 special PlayTrainerEncounterMusic special sub_8080398 goto EventScript_1A4FC7 @@ -863,10 +863,10 @@ gUnknown_81A4EE9:: @ 81A4EE9 call EventScript_1A4FBA specialvar VAR_RESULT, ScrSpecial_HasTrainerBeenFought compare_var_to_value VAR_RESULT, 0 - goto_if 5, EventScript_1A4F20 + goto_if ne, EventScript_1A4F20 special CheckForAlivePartyMons compare_var_to_value VAR_RESULT, 0 - goto_if 5, EventScript_1A4F19 + goto_if ne, EventScript_1A4F19 special PlayTrainerEncounterMusic special sub_8080398 goto EventScript_1A4FC7 @@ -918,7 +918,7 @@ gUnknown_81A4F73:: @ 81A4F73 goto_if_eq EventScript_1A4FB0 special CheckForAlivePartyMons compare_var_to_value VAR_RESULT, 0 - goto_if 5, EventScript_1A4FB1 + goto_if ne, EventScript_1A4FB1 special PlayTrainerEncounterMusic special sub_8080398 special sub_80805D8 @@ -1548,7 +1548,7 @@ EventScript_1A651A:: @ 81A651A special sub_81130A8 specialvar VAR_RESULT, IsNationalPokedexEnabled compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_1A653B + call_if eq, EventScript_1A653B call EventScript_1A6541 return @@ -1676,13 +1676,13 @@ EventScript_1A6697:: @ 81A6697 checkitemtype VAR_0x8000 call EventScript_1A66BC compare_var_to_value VAR_0x8007, 1 - call_if 1, EventScript_1A6749 + call_if eq, EventScript_1A6749 compare_var_to_value VAR_0x8007, 0 - call_if 1, EventScript_1A675E + call_if eq, EventScript_1A675E return EventScript_1A66BC:: @ 81A66BC - copyvar VAR_0x8000, VAR_RESULT + switch VAR_RESULT compare_var_to_value VAR_0x8000, 1 goto_if_eq EventScript_1A66F9 compare_var_to_value VAR_0x8000, 2 @@ -1698,31 +1698,31 @@ EventScript_1A66BC:: @ 81A66BC EventScript_1A66F9:: @ 81A66F9 getstdstring 2, 24 compare_var_to_value VAR_0x8007, 1 - call_if 1, EventScript_1A6764 + call_if eq, EventScript_1A6764 return EventScript_1A6709:: @ 81A6709 getstdstring 2, 25 compare_var_to_value VAR_0x8007, 1 - call_if 1, EventScript_1A6764 + call_if eq, EventScript_1A6764 return EventScript_1A6719:: @ 81A6719 getstdstring 2, 26 compare_var_to_value VAR_0x8007, 1 - call_if 1, EventScript_1A6764 + call_if eq, EventScript_1A6764 return EventScript_1A6729:: @ 81A6729 getstdstring 2, 27 compare_var_to_value VAR_0x8007, 1 - call_if 1, EventScript_1A6768 + call_if eq, EventScript_1A6768 return EventScript_1A6739:: @ 81A6739 getstdstring 2, 28 compare_var_to_value VAR_0x8007, 1 - call_if 1, EventScript_1A6764 + call_if eq, EventScript_1A6764 return EventScript_1A6749:: @ 81A6749 @@ -1754,9 +1754,9 @@ gStdScript_7:: @ 81A676C EventScript_1A677A:: @ 81A677A getdecorname 1, VAR_0x8000 compare_var_to_value VAR_0x8007, 1 - call_if 1, EventScript_1A6795 + call_if eq, EventScript_1A6795 compare_var_to_value VAR_0x8007, 0 - call_if 1, EventScript_1A67AD + call_if eq, EventScript_1A67AD return EventScript_1A6795:: @ 81A6795 @@ -1784,9 +1784,9 @@ gStdScript_1:: @ 81A67B3 checkitemtype VAR_0x8000 call EventScript_1A66BC compare_var_to_value VAR_0x8007, 1 - call_if 1, EventScript_1A67EE + call_if eq, EventScript_1A67EE compare_var_to_value VAR_0x8007, 0 - call_if 1, EventScript_1A682D + call_if eq, EventScript_1A682D release return @@ -1796,9 +1796,9 @@ EventScript_1A67EE:: @ 81A67EE specialvar VAR_RESULT, sub_80CC8CC copyvar VAR_0x8008, VAR_RESULT compare_var_to_value VAR_0x8008, 1 - call_if 1, EventScript_1A6821 + call_if eq, EventScript_1A6821 compare_var_to_value VAR_0x8008, 0 - call_if 1, EventScript_1A6827 + call_if eq, EventScript_1A6827 waitfanfare waitmessage msgbox gUnknown_81A5218 @@ -1841,9 +1841,9 @@ EventScript_GiveItem:: EventScript_ItemInPocketMessage:: compare_var_to_value VAR_0x8006, 1 - call_if 1, EventScript_FoundSingleItemMessage + call_if eq, EventScript_FoundSingleItemMessage compare_var_to_value VAR_0x8006, 1 - call_if 5, EventScript_FoundMultipleItemsMessage + call_if ne, EventScript_FoundMultipleItemsMessage waitfanfare waitmessage msgbox gUnknown_81A5218 @@ -1874,7 +1874,7 @@ EventScript_BagIsFullMessage:: EventScript_PickUpHiddenCoins:: checkflag FLAG_GOT_COIN_CASE - goto_if 0, EventScript_HiddenCoinsButNoCoinCase + goto_if lt, EventScript_HiddenCoinsButNoCoinCase checkcoins VAR_RESULT specialvar VAR_RESULT, Special_CheckAddCoins compare_var_to_value VAR_RESULT, 0 @@ -1911,10 +1911,10 @@ EventScript_HiddenCoinsButNoCoinCase:: gUnknown_81A6955:: @ 81A6955 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 lockall checkflag FLAG_0x841 - goto_if 1, EventScript_1A698E + goto_if eq, EventScript_1A698E setvar VAR_0x8004, 27 special Special_SetSomeVariable setvar VAR_0x8004, 0 @@ -1938,19 +1938,13 @@ EventScript_1A6998:: @ 81A6998 end EventScript_1A69A8:: @ 81A69A8 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1A6A05 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1A69F0 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1A6A7A - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_1A6A56 - compare_var_to_value VAR_0x8000, 4 - goto_if 1, EventScript_1A6A46 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_1A6A46 + switch VAR_RESULT + case 0, EventScript_1A6A05 + case 1, EventScript_1A69F0 + case 2, EventScript_1A6A7A + case 3, EventScript_1A6A56 + case 4, EventScript_1A6A46 + case 127, EventScript_1A6A46 end EventScript_1A69F0:: @ 81A69F0 @@ -1964,9 +1958,9 @@ EventScript_1A69F0:: @ 81A69F0 EventScript_1A6A05:: @ 81A6A05 playse SE_PC_LOGIN checkflag FLAG_SYS_NOT_SOMEONES_PC - call_if 0, EventScript_1A6A34 + call_if lt, EventScript_1A6A34 checkflag FLAG_SYS_NOT_SOMEONES_PC - call_if 1, EventScript_1A6A3D + call_if eq, EventScript_1A6A3D msgbox Text_1A50BE special sub_808C6A8 waitstate @@ -1993,7 +1987,7 @@ EventScript_1A6A46:: @ 81A6A46 EventScript_1A6A56:: @ 81A6A56 checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, EventScript_1A6A46 + goto_if lt, EventScript_1A6A46 playse SE_PC_LOGIN setvar VAR_0x8004, 31 special HelpSystem_BackupSomeVariable @@ -2006,12 +2000,12 @@ EventScript_1A6A56:: @ 81A6A56 EventScript_1A6A7A:: @ 81A6A7A checkflag FLAG_SYS_POKEDEX_GET - goto_if 0, EventScript_1A6A46 + goto_if lt, EventScript_1A6A46 playse SE_PC_LOGIN msgbox Text_1A5BC6 msgbox Text_1A5C03, 5 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1A6AB2 + goto_if eq, EventScript_1A6AB2 setflag FLAG_0x2FF call EventScript_1A73E0 clearflag FLAG_0x2FF @@ -2032,16 +2026,16 @@ EventScript_1A6AC0:: @ 81A6AC0 EventScript_1A6AC8:: @ 81A6AC8 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A6AC8_End + goto_if eq, EventScript_1A6AC8_End checkpartymove MOVE_SURF compare_var_to_value VAR_RESULT, 6 - goto_if 1, EventScript_1A6AC8_End + goto_if eq, EventScript_1A6AC8_End getpartymonname 0, VAR_RESULT setfieldeffectarg 0, VAR_RESULT lockall msgbox Text_1A556E, 5 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1A6AC8_Release + goto_if eq, EventScript_1A6AC8_Release msgbox Text_1A55A5 dofieldeffect FLDEFF_USE_SURF EventScript_1A6AC8_Release:@ 81A6B0B @@ -2056,23 +2050,15 @@ gUnknown_81A6B0D:: @ 81A6B0D end EventScript_1A6B18:: @ 81A6B18 - copyvar VAR_0x8000, VAR_0x8008 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1A6B76 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1A6B7A - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_1A6B81 - compare_var_to_value VAR_0x8000, 4 - goto_if 1, EventScript_1A6B8B - compare_var_to_value VAR_0x8000, 5 - goto_if 1, EventScript_1A6BA1 - compare_var_to_value VAR_0x8000, 6 - goto_if 1, EventScript_1A6BB4 - compare_var_to_value VAR_0x8000, 7 - goto_if 1, EventScript_1A6BCA - compare_var_to_value VAR_0x8000, 8 - goto_if 1, EventScript_1A6BE0 + switch VAR_0x8008 + case 1, EventScript_1A6B76 + case 2, EventScript_1A6B7A + case 3, EventScript_1A6B81 + case 4, EventScript_1A6B8B + case 5, EventScript_1A6BA1 + case 6, EventScript_1A6BB4 + case 7, EventScript_1A6BCA + case 8, EventScript_1A6BE0 end EventScript_1A6B76:: @ 81A6B76 @@ -2177,7 +2163,7 @@ gUnknown_81A6C32:: @ 81A6C32 msgbox Text_1C0DF1 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 fadescreen 1 special sub_80CA7EC waitstate @@ -2310,12 +2296,12 @@ Text_1A72F2:: @ 81A72F2 EventScript_1A737B:: @ 81A737B special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 special sub_8112364 checkflag FLAG_0x2F4 - call_if 1, EventScript_1A73A4 + call_if eq, EventScript_1A73A4 checkflag FLAG_0x2F4 - call_if 0, EventScript_1A73AD + call_if lt, EventScript_1A73AD call EventScript_1A73E0 return @@ -2332,9 +2318,9 @@ EventScript_1A73B6:: @ 81A73B6 special sub_80CA524 waitmessage compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_1A73D8 + call_if eq, EventScript_1A73D8 compare_var_to_value VAR_RESULT, 1 - call_if 1, EventScript_1A73DC + call_if eq, EventScript_1A73DC waitfanfare waitbuttonpress return @@ -2360,10 +2346,10 @@ EventScript_1A73E0:: @ 81A73E0 getnumberstring 1, VAR_0x8009 msgbox Text_1A6CA3 checkflag FLAG_0x2FF - call_if 0, EventScript_1A746D + call_if lt, EventScript_1A746D call EventScript_1A73B6 compare_var_to_value VAR_0x800A, 0 - goto_if 1, EventScript_1A748F + goto_if eq, EventScript_1A748F setvar VAR_0x8004, 1 specialvar VAR_RESULT, Special_GetPokedexCount copyvar VAR_0x8008, VAR_0x8005 @@ -2373,9 +2359,9 @@ EventScript_1A73E0:: @ 81A73E0 msgbox Text_1A71AA specialvar VAR_RESULT, HasAllMons compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1A7470 + goto_if eq, EventScript_1A7470 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A747E + goto_if eq, EventScript_1A747E end EventScript_1A746D:: @ 81A746D @@ -2709,7 +2695,7 @@ gUnknown_81A7702:: @ 81A7702 textcolor 3 msgbox Text_1A622C, 5 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1A778A + goto_if eq, EventScript_1A778A setvar VAR_0x8004, 14 call EventScript_1A6AC0 lock @@ -2717,11 +2703,11 @@ gUnknown_81A7702:: @ 81A7702 specialvar VAR_0x8008, sub_80CC4D4 textcolor 0 compare_var_to_value VAR_0x8004, 0 - goto_if 1, EventScript_1A774D + goto_if eq, EventScript_1A774D compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1A778A + goto_if eq, EventScript_1A778A compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A778C + goto_if eq, EventScript_1A778C end EventScript_1A774D:: @ 81A774D @@ -2816,93 +2802,77 @@ EventScript_1A77F9:: @ 81A77F9 EventScript_1A7803:: @ 81A7803 compare_var_to_var VAR_MAP_SCENE_ROUTE23, VAR_0x4001 - goto_if 4, EventScript_1A77EC - copyvar VAR_0x8000, VAR_0x4001 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1A78D5 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1A78E4 - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_1A78F3 - compare_var_to_value VAR_0x8000, 4 - goto_if 1, EventScript_1A7902 - compare_var_to_value VAR_0x8000, 5 - goto_if 1, EventScript_1A7911 - compare_var_to_value VAR_0x8000, 6 - goto_if 1, EventScript_1A7920 - compare_var_to_value VAR_0x8000, 7 - goto_if 1, EventScript_1A792F - compare_var_to_value VAR_0x8000, 8 - goto_if 1, EventScript_1A793E + goto_if ge, EventScript_1A77EC + switch VAR_0x4001 + case 1, EventScript_1A78D5 + case 2, EventScript_1A78E4 + case 3, EventScript_1A78F3 + case 4, EventScript_1A7902 + case 5, EventScript_1A7911 + case 6, EventScript_1A7920 + case 7, EventScript_1A792F + case 8, EventScript_1A793E end EventScript_1A786C:: @ 81A786C compare_var_to_var VAR_MAP_SCENE_ROUTE23, VAR_0x4001 - goto_if 4, EventScript_1A77F9 - copyvar VAR_0x8000, VAR_0x4001 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1A78D5 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1A78E4 - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_1A78F3 - compare_var_to_value VAR_0x8000, 4 - goto_if 1, EventScript_1A7902 - compare_var_to_value VAR_0x8000, 5 - goto_if 1, EventScript_1A7911 - compare_var_to_value VAR_0x8000, 6 - goto_if 1, EventScript_1A7920 - compare_var_to_value VAR_0x8000, 7 - goto_if 1, EventScript_1A792F - compare_var_to_value VAR_0x8000, 8 - goto_if 1, EventScript_1A793E + goto_if ge, EventScript_1A77F9 + switch VAR_0x4001 + case 1, EventScript_1A78D5 + case 2, EventScript_1A78E4 + case 3, EventScript_1A78F3 + case 4, EventScript_1A7902 + case 5, EventScript_1A7911 + case 6, EventScript_1A7920 + case 7, EventScript_1A792F + case 8, EventScript_1A793E end EventScript_1A78D5:: @ 81A78D5 checkflag FLAG_BADGE01_GET - goto_if 1, EventScript_1A794D + goto_if eq, EventScript_1A794D goto EventScript_1A77C9 end EventScript_1A78E4:: @ 81A78E4 checkflag FLAG_BADGE02_GET - goto_if 1, EventScript_1A795F + goto_if eq, EventScript_1A795F goto EventScript_1A77DE end EventScript_1A78F3:: @ 81A78F3 checkflag FLAG_BADGE03_GET - goto_if 1, EventScript_1A795F + goto_if eq, EventScript_1A795F goto EventScript_1A77DE end EventScript_1A7902:: @ 81A7902 checkflag FLAG_BADGE04_GET - goto_if 1, EventScript_1A795F + goto_if eq, EventScript_1A795F goto EventScript_1A77DE end EventScript_1A7911:: @ 81A7911 checkflag FLAG_BADGE05_GET - goto_if 1, EventScript_1A795F + goto_if eq, EventScript_1A795F goto EventScript_1A77DE end EventScript_1A7920:: @ 81A7920 checkflag FLAG_BADGE06_GET - goto_if 1, EventScript_1A795F + goto_if eq, EventScript_1A795F goto EventScript_1A77DE end EventScript_1A792F:: @ 81A792F checkflag FLAG_BADGE07_GET - goto_if 1, EventScript_1A795F + goto_if eq, EventScript_1A795F goto EventScript_1A77DE end EventScript_1A793E:: @ 81A793E checkflag FLAG_BADGE08_GET - goto_if 1, EventScript_1A795F + goto_if eq, EventScript_1A795F goto EventScript_1A77DE end @@ -2926,70 +2896,62 @@ EventScript_1A796E:: @ 81A796E textcolor 0 applymovement VAR_0x8009, Movement_1A75E7 waitmovement 0 - copyvar VAR_0x8000, VAR_0x4001 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1A79D8 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1A79E7 - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_1A79F6 - compare_var_to_value VAR_0x8000, 4 - goto_if 1, EventScript_1A7A05 - compare_var_to_value VAR_0x8000, 5 - goto_if 1, EventScript_1A7A14 - compare_var_to_value VAR_0x8000, 6 - goto_if 1, EventScript_1A7A23 - compare_var_to_value VAR_0x8000, 7 - goto_if 1, EventScript_1A7A32 - compare_var_to_value VAR_0x8000, 8 - goto_if 1, EventScript_1A7A41 + switch VAR_0x4001 + case 1, EventScript_1A79D8 + case 2, EventScript_1A79E7 + case 3, EventScript_1A79F6 + case 4, EventScript_1A7A05 + case 5, EventScript_1A7A14 + case 6, EventScript_1A7A23 + case 7, EventScript_1A7A32 + case 8, EventScript_1A7A41 end EventScript_1A79D8:: @ 81A79D8 checkflag FLAG_BADGE01_GET - goto_if 1, EventScript_1A7A96 + goto_if eq, EventScript_1A7A96 goto EventScript_1A7A50 end EventScript_1A79E7:: @ 81A79E7 checkflag FLAG_BADGE02_GET - goto_if 1, EventScript_1A7AA8 + goto_if eq, EventScript_1A7AA8 goto EventScript_1A7A77 end EventScript_1A79F6:: @ 81A79F6 checkflag FLAG_BADGE03_GET - goto_if 1, EventScript_1A7AA8 + goto_if eq, EventScript_1A7AA8 goto EventScript_1A7A77 end EventScript_1A7A05:: @ 81A7A05 checkflag FLAG_BADGE04_GET - goto_if 1, EventScript_1A7AA8 + goto_if eq, EventScript_1A7AA8 goto EventScript_1A7A77 end EventScript_1A7A14:: @ 81A7A14 checkflag FLAG_BADGE05_GET - goto_if 1, EventScript_1A7AA8 + goto_if eq, EventScript_1A7AA8 goto EventScript_1A7A77 end EventScript_1A7A23:: @ 81A7A23 checkflag FLAG_BADGE06_GET - goto_if 1, EventScript_1A7AA8 + goto_if eq, EventScript_1A7AA8 goto EventScript_1A7A77 end EventScript_1A7A32:: @ 81A7A32 checkflag FLAG_BADGE07_GET - goto_if 1, EventScript_1A7AA8 + goto_if eq, EventScript_1A7AA8 goto EventScript_1A7A77 end EventScript_1A7A41:: @ 81A7A41 checkflag FLAG_BADGE08_GET - goto_if 1, EventScript_1A7AA8 + goto_if eq, EventScript_1A7AA8 goto EventScript_1A7A77 end @@ -3068,33 +3030,25 @@ EventScript_1A7AE0:: @ 81A7AE0 EventScript_1A7AE2:: @ 81A7AE2 msgbox Text_177460, 5 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1A7B70 + goto_if eq, EventScript_1A7B70 msgbox Text_17747B checkflag FLAG_0x26C - goto_if 1, EventScript_1A7B3B + goto_if eq, EventScript_1A7B3B setflag FLAG_0x26C - copyvar VAR_0x8000, VAR_0x8004 - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1A7B7A - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1A7D3E - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1A7E72 - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_1A7F4C + switch VAR_0x8004 + case 0, EventScript_1A7B7A + case 1, EventScript_1A7D3E + case 2, EventScript_1A7E72 + case 3, EventScript_1A7F4C end EventScript_1A7B3B:: @ 81A7B3B clearflag FLAG_0x26C - copyvar VAR_0x8000, VAR_0x8004 - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1A7C5C - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1A7DD8 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1A7EDF - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_1A8025 + switch VAR_0x8004 + case 0, EventScript_1A7C5C + case 1, EventScript_1A7DD8 + case 2, EventScript_1A7EDF + case 3, EventScript_1A8025 end EventScript_1A7B70:: @ 81A7B70 @@ -3652,7 +3606,7 @@ SilphCo_2F_EventScript_1A891B:: @ 81A891B setvar VAR_0x4001, 1 setvar VAR_0x8004, 634 checkflag FLAG_0x27A - goto_if 1, EventScript_1A813F + goto_if eq, EventScript_1A813F goto EventScript_1A8B23 end @@ -3661,7 +3615,7 @@ SilphCo_2F_EventScript_1A8935:: @ 81A8935 setvar VAR_0x4001, 2 setvar VAR_0x8004, 635 checkflag FLAG_0x27B - goto_if 1, EventScript_1A813F + goto_if eq, EventScript_1A813F goto EventScript_1A8B23 end @@ -3670,7 +3624,7 @@ SilphCo_3F_EventScript_1A894F:: @ 81A894F setvar VAR_0x4001, 3 setvar VAR_0x8004, 636 checkflag FLAG_0x27C - goto_if 1, EventScript_1A813F + goto_if eq, EventScript_1A813F goto EventScript_1A8B23 end @@ -3679,7 +3633,7 @@ SilphCo_3F_EventScript_1A8969:: @ 81A8969 setvar VAR_0x4001, 4 setvar VAR_0x8004, 637 checkflag FLAG_0x27D - goto_if 1, EventScript_1A813F + goto_if eq, EventScript_1A813F goto EventScript_1A8B23 end @@ -3688,7 +3642,7 @@ SilphCo_4F_EventScript_1A8983:: @ 81A8983 setvar VAR_0x4001, 5 setvar VAR_0x8004, 638 checkflag FLAG_0x27E - goto_if 1, EventScript_1A813F + goto_if eq, EventScript_1A813F goto EventScript_1A8B23 end @@ -3697,7 +3651,7 @@ SilphCo_4F_EventScript_1A899D:: @ 81A899D setvar VAR_0x4001, 6 setvar VAR_0x8004, 639 checkflag FLAG_0x27F - goto_if 1, EventScript_1A813F + goto_if eq, EventScript_1A813F goto EventScript_1A8B23 end @@ -3706,7 +3660,7 @@ SilphCo_5F_EventScript_1A89B7:: @ 81A89B7 setvar VAR_0x4001, 7 setvar VAR_0x8004, 640 checkflag FLAG_0x280 - goto_if 1, EventScript_1A813F + goto_if eq, EventScript_1A813F goto EventScript_1A8B23 end @@ -3715,7 +3669,7 @@ SilphCo_5F_EventScript_1A89D1:: @ 81A89D1 setvar VAR_0x4001, 8 setvar VAR_0x8004, 641 checkflag FLAG_0x281 - goto_if 1, EventScript_1A813F + goto_if eq, EventScript_1A813F goto EventScript_1A8B23 end @@ -3724,7 +3678,7 @@ SilphCo_5F_EventScript_1A89EB:: @ 81A89EB setvar VAR_0x4001, 9 setvar VAR_0x8004, 642 checkflag FLAG_0x282 - goto_if 1, EventScript_1A813F + goto_if eq, EventScript_1A813F goto EventScript_1A8B23 end @@ -3733,7 +3687,7 @@ SilphCo_6F_EventScript_1A8A05:: @ 81A8A05 setvar VAR_0x4001, 10 setvar VAR_0x8004, 643 checkflag FLAG_0x283 - goto_if 1, EventScript_1A813F + goto_if eq, EventScript_1A813F goto EventScript_1A8B23 end @@ -3742,7 +3696,7 @@ SilphCo_7F_EventScript_1A8A1F:: @ 81A8A1F setvar VAR_0x4001, 11 setvar VAR_0x8004, 644 checkflag FLAG_0x284 - goto_if 1, EventScript_1A813F + goto_if eq, EventScript_1A813F goto EventScript_1A8B23 end @@ -3751,7 +3705,7 @@ SilphCo_7F_EventScript_1A8A39:: @ 81A8A39 setvar VAR_0x4001, 12 setvar VAR_0x8004, 645 checkflag FLAG_0x285 - goto_if 1, EventScript_1A813F + goto_if eq, EventScript_1A813F goto EventScript_1A8B23 end @@ -3760,7 +3714,7 @@ SilphCo_7F_EventScript_1A8A53:: @ 81A8A53 setvar VAR_0x4001, 13 setvar VAR_0x8004, 646 checkflag FLAG_0x286 - goto_if 1, EventScript_1A813F + goto_if eq, EventScript_1A813F goto EventScript_1A8B23 end @@ -3769,7 +3723,7 @@ SilphCo_8F_EventScript_1A8A6D:: @ 81A8A6D setvar VAR_0x4001, 14 setvar VAR_0x8004, 647 checkflag FLAG_0x287 - goto_if 1, EventScript_1A813F + goto_if eq, EventScript_1A813F goto EventScript_1A8B23 end @@ -3778,7 +3732,7 @@ SilphCo_9F_EventScript_1A8A87:: @ 81A8A87 setvar VAR_0x4001, 15 setvar VAR_0x8004, 648 checkflag FLAG_0x288 - goto_if 1, EventScript_1A813F + goto_if eq, EventScript_1A813F goto EventScript_1A8B23 end @@ -3787,7 +3741,7 @@ SilphCo_9F_EventScript_1A8AA1:: @ 81A8AA1 setvar VAR_0x4001, 16 setvar VAR_0x8004, 649 checkflag FLAG_0x289 - goto_if 1, EventScript_1A813F + goto_if eq, EventScript_1A813F goto EventScript_1A8B23 end @@ -3796,7 +3750,7 @@ SilphCo_9F_EventScript_1A8ABB:: @ 81A8ABB setvar VAR_0x4001, 17 setvar VAR_0x8004, 650 checkflag FLAG_0x28A - goto_if 1, EventScript_1A813F + goto_if eq, EventScript_1A813F goto EventScript_1A8B23 end @@ -3805,7 +3759,7 @@ SilphCo_9F_EventScript_1A8AD5:: @ 81A8AD5 setvar VAR_0x4001, 18 setvar VAR_0x8004, 651 checkflag FLAG_0x28B - goto_if 1, EventScript_1A813F + goto_if eq, EventScript_1A813F goto EventScript_1A8B23 end @@ -3814,7 +3768,7 @@ SilphCo_10F_EventScript_1A8AEF:: @ 81A8AEF setvar VAR_0x4001, 19 setvar VAR_0x8004, 652 checkflag FLAG_0x28C - goto_if 1, EventScript_1A813F + goto_if eq, EventScript_1A813F goto EventScript_1A8B23 end @@ -3823,13 +3777,13 @@ SilphCo_11F_EventScript_1A8B09:: @ 81A8B09 setvar VAR_0x4001, 20 setvar VAR_0x8004, 653 checkflag FLAG_0x28D - goto_if 1, EventScript_1A813F + goto_if eq, EventScript_1A813F goto EventScript_1A8B23 end EventScript_1A8B23:: @ 81A8B23 checkflag FLAG_HIDE_SILPH_CO_5F_CARD_KEY - goto_if 1, EventScript_1A8B32 + goto_if eq, EventScript_1A8B32 goto EventScript_1A8135 end @@ -3838,45 +3792,45 @@ EventScript_1A8B32:: @ 81A8B32 msgbox Text_1A5B88 waitfanfare compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_1A8532 + call_if eq, EventScript_1A8532 compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_1A8560 + call_if eq, EventScript_1A8560 compare_var_to_value VAR_0x4001, 3 - call_if 1, EventScript_1A858E + call_if eq, EventScript_1A858E compare_var_to_value VAR_0x4001, 4 - call_if 1, EventScript_1A85C5 + call_if eq, EventScript_1A85C5 compare_var_to_value VAR_0x4001, 5 - call_if 1, EventScript_1A85FC + call_if eq, EventScript_1A85FC compare_var_to_value VAR_0x4001, 6 - call_if 1, EventScript_1A862A + call_if eq, EventScript_1A862A compare_var_to_value VAR_0x4001, 7 - call_if 1, EventScript_1A8658 + call_if eq, EventScript_1A8658 compare_var_to_value VAR_0x4001, 8 - call_if 1, EventScript_1A868F + call_if eq, EventScript_1A868F compare_var_to_value VAR_0x4001, 9 - call_if 1, EventScript_1A86C6 + call_if eq, EventScript_1A86C6 compare_var_to_value VAR_0x4001, 10 - call_if 1, EventScript_1A86FD + call_if eq, EventScript_1A86FD compare_var_to_value VAR_0x4001, 11 - call_if 1, EventScript_1A8734 + call_if eq, EventScript_1A8734 compare_var_to_value VAR_0x4001, 12 - call_if 1, EventScript_1A8762 + call_if eq, EventScript_1A8762 compare_var_to_value VAR_0x4001, 13 - call_if 1, EventScript_1A8790 + call_if eq, EventScript_1A8790 compare_var_to_value VAR_0x4001, 14 - call_if 1, EventScript_1A87BE + call_if eq, EventScript_1A87BE compare_var_to_value VAR_0x4001, 15 - call_if 1, EventScript_1A87F5 + call_if eq, EventScript_1A87F5 compare_var_to_value VAR_0x4001, 16 - call_if 1, EventScript_1A882C + call_if eq, EventScript_1A882C compare_var_to_value VAR_0x4001, 17 - call_if 1, EventScript_1A8863 + call_if eq, EventScript_1A8863 compare_var_to_value VAR_0x4001, 18 - call_if 1, EventScript_1A8891 + call_if eq, EventScript_1A8891 compare_var_to_value VAR_0x4001, 19 - call_if 1, EventScript_1A88BF + call_if eq, EventScript_1A88BF compare_var_to_value VAR_0x4001, 20 - call_if 1, EventScript_1A88ED + call_if eq, EventScript_1A88ED waitse playse SE_KI_GASYAN special DrawWholeMapView @@ -3903,15 +3857,15 @@ EventScript_1A8C3C:: @ 81A8C3C bufferboxname 0, 16439 getspeciesname 1, 16385 checkflag FLAG_SYS_NOT_SOMEONES_PC - call_if 0, EventScript_1A8C57 + call_if lt, EventScript_1A8C57 checkflag FLAG_SYS_NOT_SOMEONES_PC - call_if 1, EventScript_1A8C82 + call_if eq, EventScript_1A8C82 return EventScript_1A8C57:: @ 81A8C57 specialvar VAR_RESULT, sub_80CC7B4 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A8C70 + goto_if eq, EventScript_1A8C70 msgbox Text_1A5CF1 return @@ -3924,7 +3878,7 @@ EventScript_1A8C70:: @ 81A8C70 EventScript_1A8C82:: @ 81A8C82 specialvar VAR_RESULT, sub_80CC7B4 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A8C9B + goto_if eq, EventScript_1A8C9B msgbox Text_1A5D31 return @@ -4044,12 +3998,12 @@ VermilionCity_PokemonCenter_1F_EventScript_1A8D08:: @ 81A8D08 lock faceplayer checkflag FLAG_0x292 - goto_if 1, EventScript_1A8D3F + goto_if eq, EventScript_1A8D3F msgbox Text_194234 setflag FLAG_0x292 giveitem 362 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1A6BF9 + goto_if eq, EventScript_1A6BF9 msgbox Text_19430F release end @@ -4093,9 +4047,9 @@ gUnknown_81A8D97:: @ 81A8D97 msgbox Text_1A5E89 call EventScript_1A65CE checkflag FLAG_DEFEATED_BROCK - call_if 0, EventScript_1A8DC6 + call_if lt, EventScript_1A8DC6 checkflag FLAG_DEFEATED_BROCK - call_if 1, EventScript_1A8DCF + call_if eq, EventScript_1A8DCF applymovement VAR_LAST_TALKED, Movement_1A666C waitmovement 0 fadedefaultbgm @@ -4128,16 +4082,16 @@ gUnknown_81A8DFD:: @ 81A8DFD special ExecuteWhiteOut waitstate compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A8E11 + goto_if eq, EventScript_1A8E11 releaseall end EventScript_1A8E11:: @ 81A8E11 checkmoney 1, 0 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1A8E2E + goto_if eq, EventScript_1A8E2E compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A8E3C + goto_if eq, EventScript_1A8E3C end EventScript_1A8E2E:: @ 81A8E2E @@ -4167,17 +4121,12 @@ gStdScript_8:: @ 81A8E58 return EventScript_1A8E6F:: @ 81A8E6F - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1A8EAC - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1A8EB1 - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_1A8EB6 - compare_var_to_value VAR_0x8000, 4 - goto_if 1, EventScript_1A8EBB - compare_var_to_value VAR_0x8000, 5 - goto_if 1, EventScript_1A8EC0 + switch VAR_RESULT + case 1, EventScript_1A8EAC + case 2, EventScript_1A8EB1 + case 3, EventScript_1A8EB6 + case 4, EventScript_1A8EBB + case 5, EventScript_1A8EC0 end EventScript_1A8EAC:: @ 81A8EAC @@ -4202,66 +4151,48 @@ EventScript_1A8EC0:: @ 81A8EC0 EventScript_1A8EC5:: @ 81A8EC5 compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 - goto_if 4, EventScript_1A911E + goto_if ge, EventScript_1A911E compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND, 4 - goto_if 4, EventScript_1A8F12 + goto_if ge, EventScript_1A8F12 multichoice 19, 6, 44, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1A8FF9 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1A9004 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1A90F6 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_1A90F6 + switch VAR_RESULT + case 0, EventScript_1A8FF9 + case 1, EventScript_1A9004 + case 2, EventScript_1A90F6 + case 127, EventScript_1A90F6 end EventScript_1A8F12:: @ 81A8F12 multichoice 19, 5, 58, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1A8FE3 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1A8FF9 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1A9004 - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_1A90F6 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_1A90F6 + switch VAR_RESULT + case 0, EventScript_1A8FE3 + case 1, EventScript_1A8FF9 + case 2, EventScript_1A9004 + case 3, EventScript_1A90F6 + case 127, EventScript_1A90F6 end EventScript_1A8F54:: @ 81A8F54 compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 - goto_if 4, EventScript_1A911E + goto_if ge, EventScript_1A911E compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND, 4 - goto_if 4, EventScript_1A8FA1 + goto_if ge, EventScript_1A8FA1 multichoice 19, 6, 45, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1A8FEE - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1A9004 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1A90F6 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_1A90F6 + switch VAR_RESULT + case 0, EventScript_1A8FEE + case 1, EventScript_1A9004 + case 2, EventScript_1A90F6 + case 127, EventScript_1A90F6 end EventScript_1A8FA1:: @ 81A8FA1 multichoice 19, 5, 59, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1A8FE3 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1A8FEE - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1A9004 - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_1A90F6 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_1A90F6 + switch VAR_RESULT + case 0, EventScript_1A8FE3 + case 1, EventScript_1A8FEE + case 2, EventScript_1A9004 + case 3, EventScript_1A90F6 + case 127, EventScript_1A90F6 end EventScript_1A8FE3:: @ 81A8FE3 @@ -4286,43 +4217,34 @@ EventScript_1A9004:: @ 81A9004 EventScript_1A900F:: @ 81A900F compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 - goto_if 4, EventScript_1A911E + goto_if ge, EventScript_1A911E compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND, 4 - goto_if 4, EventScript_1A905C + goto_if ge, EventScript_1A905C multichoice 19, 6, 46, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1A8FEE - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1A8FF9 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1A90F6 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_1A90F6 + switch VAR_RESULT + case 0, EventScript_1A8FEE + case 1, EventScript_1A8FF9 + case 2, EventScript_1A90F6 + case 127, EventScript_1A90F6 end EventScript_1A905C:: @ 81A905C multichoice 19, 5, 60, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1A8FE3 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1A8FEE - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1A8FF9 - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_1A90F6 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_1A90F6 + switch VAR_RESULT + case 0, EventScript_1A8FE3 + case 1, EventScript_1A8FEE + case 2, EventScript_1A8FF9 + case 3, EventScript_1A90F6 + case 127, EventScript_1A90F6 end EventScript_1A909E:: @ 81A909E specialvar VAR_RESULT, sub_8147500 getnumberstring 0, VAR_RESULT compare_var_to_value VAR_0x8004, 0 - goto_if 1, EventScript_1A90BE + goto_if eq, EventScript_1A90BE compare_var_to_value VAR_0x8004, 0 - goto_if 5, EventScript_1A90CC + goto_if ne, EventScript_1A90CC end EventScript_1A90BE:: @ 81A90BE @@ -4340,7 +4262,7 @@ EventScript_1A90DA:: @ 81A90DA delay 20 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 special sub_8112364 fadescreen 1 special ScrSpecial_SeaGallopFerry @@ -4350,7 +4272,7 @@ EventScript_1A90DA:: @ 81A90DA EventScript_1A90F6:: @ 81A90F6 specialvar VAR_RESULT, sub_8147594 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A9108 + goto_if eq, EventScript_1A9108 release end @@ -4371,21 +4293,14 @@ EventScript_1A911E:: @ 81A911E special sub_809D764 waitstate specialvar VAR_0x8006, sub_809D8C0 - copyvar VAR_0x8000, VAR_0x8006 - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1A91D5 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1A91E0 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1A91EB - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_1A91F6 - compare_var_to_value VAR_0x8000, 4 - goto_if 1, EventScript_1A9201 - compare_var_to_value VAR_0x8000, 254 - goto_if 1, EventScript_1A917F - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_1A90F6 + switch VAR_0x8006 + case 0, EventScript_1A91D5 + case 1, EventScript_1A91E0 + case 2, EventScript_1A91EB + case 3, EventScript_1A91F6 + case 4, EventScript_1A9201 + case 254, EventScript_1A917F + case 127, EventScript_1A90F6 end EventScript_1A917F:: @ 81A917F @@ -4393,19 +4308,13 @@ EventScript_1A917F:: @ 81A917F special sub_809D764 waitstate specialvar VAR_0x8006, sub_809D8C0 - copyvar VAR_0x8000, VAR_0x8006 - compare_var_to_value VAR_0x8000, 4 - goto_if 1, EventScript_1A9201 - compare_var_to_value VAR_0x8000, 5 - goto_if 1, EventScript_1A920C - compare_var_to_value VAR_0x8000, 6 - goto_if 1, EventScript_1A9217 - compare_var_to_value VAR_0x8000, 7 - goto_if 1, EventScript_1A9222 - compare_var_to_value VAR_0x8000, 254 - goto_if 1, EventScript_1A911E - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_1A90F6 + switch VAR_0x8006 + case 4, EventScript_1A9201 + case 5, EventScript_1A920C + case 6, EventScript_1A9217 + case 7, EventScript_1A9222 + case 254, EventScript_1A911E + case 127, EventScript_1A90F6 end EventScript_1A91D5:: @ 81A91D5 @@ -4474,7 +4383,7 @@ EventScript_1A924B:: @ 81A924B EventScript_1A925E:: @ 81A925E checkflag FLAG_0x849 - goto_if 1, EventScript_1A77A9 + goto_if eq, EventScript_1A77A9 setweather 11 doweather return @@ -4614,7 +4523,7 @@ Route3_EventScript_1A93C9:: @ 81A93C9 trainerbattle 0, TRAINER_YOUNGSTER_BEN, 0, Text_183560, Text_1835A0 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A93F0 + goto_if eq, EventScript_1A93F0 msgbox Text_1835B4, 6 end @@ -4627,7 +4536,7 @@ Route3_EventScript_1A9407:: @ 81A9407 trainerbattle 0, TRAINER_YOUNGSTER_CALVIN, 0, Text_183786, Text_1837BD specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A942E + goto_if eq, EventScript_1A942E msgbox Text_1837CF, 6 end @@ -4640,7 +4549,7 @@ Route3_EventScript_1A9445:: @ 81A9445 trainerbattle 0, TRAINER_BUG_CATCHER_COLTON, 0, Text_1834E6, Text_183509 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A946C + goto_if eq, EventScript_1A946C msgbox Text_18351C, 6 end @@ -4653,7 +4562,7 @@ Route3_EventScript_1A9483:: @ 81A9483 trainerbattle 0, TRAINER_BUG_CATCHER_GREG, 0, Text_183682, Text_1836B3 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A94AA + goto_if eq, EventScript_1A94AA msgbox Text_1836D9, 6 end @@ -4666,7 +4575,7 @@ Route3_EventScript_1A94C1:: @ 81A94C1 trainerbattle 0, TRAINER_BUG_CATCHER_JAMES, 0, Text_183807, Text_183837 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A94E8 + goto_if eq, EventScript_1A94E8 msgbox Text_183849, 6 end @@ -4679,7 +4588,7 @@ Route3_EventScript_1A94FF:: @ 81A94FF trainerbattle 0, TRAINER_LASS_JANICE, 0, Text_183616, Text_18363F specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A9526 + goto_if eq, EventScript_1A9526 msgbox Text_18364C, 6 end @@ -4692,7 +4601,7 @@ Route3_EventScript_1A953D:: @ 81A953D trainerbattle 0, TRAINER_LASS_SALLY, 0, Text_18371B, Text_183746 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A9564 + goto_if eq, EventScript_1A9564 msgbox Text_18374F, 6 end @@ -4705,7 +4614,7 @@ Route3_EventScript_1A957B:: @ 81A957B trainerbattle 0, TRAINER_LASS_ROBIN, 0, Text_18387A, Text_183891 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A95A2 + goto_if eq, EventScript_1A95A2 msgbox Text_18389C, 6 end @@ -4718,7 +4627,7 @@ Route4_EventScript_1A95B9:: @ 81A95B9 trainerbattle 0, TRAINER_LASS_CRISSY, 0, Text_183906, Text_183938 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A95E0 + goto_if eq, EventScript_1A95E0 msgbox Text_183957, 6 end @@ -4731,7 +4640,7 @@ Route24_EventScript_1A95F7:: @ 81A95F7 trainerbattle 0, TRAINER_YOUNGSTER_TIMMY, 0, Text_188F76, Text_188F95 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A961E + goto_if eq, EventScript_1A961E msgbox Text_188FA7, 6 end @@ -4744,7 +4653,7 @@ Route24_EventScript_1A9635:: @ 81A9635 trainerbattle 0, TRAINER_BUG_CATCHER_CALE, 0, Text_18901B, Text_18908C specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A965C + goto_if eq, EventScript_1A965C msgbox Text_18909E, 6 end @@ -4757,7 +4666,7 @@ Route24_EventScript_1A9673:: @ 81A9673 trainerbattle 0, TRAINER_LASS_RELI, 0, Text_188F2C, Text_188F46 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A969A + goto_if eq, EventScript_1A969A msgbox Text_188F53, 6 end @@ -4770,7 +4679,7 @@ Route24_EventScript_1A96B1:: @ 81A96B1 trainerbattle 0, TRAINER_LASS_ALI, 0, Text_188FC9, Text_188FE7 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A96D8 + goto_if eq, EventScript_1A96D8 msgbox Text_188FF9, 6 end @@ -4783,7 +4692,7 @@ Route24_EventScript_1A96EF:: @ 81A96EF trainerbattle 0, TRAINER_CAMPER_SHANE, 0, Text_188E74, Text_188E94 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A9716 + goto_if eq, EventScript_1A9716 msgbox Text_188EA3, 6 end @@ -4796,7 +4705,7 @@ Route24_EventScript_1A972D:: @ 81A972D trainerbattle 0, TRAINER_CAMPER_ETHAN, 0, Text_188ED9, Text_188EFA specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A9754 + goto_if eq, EventScript_1A9754 msgbox Text_188F0A, 6 end @@ -4809,7 +4718,7 @@ Route25_EventScript_1A976B:: @ 81A976B trainerbattle 0, TRAINER_YOUNGSTER_JOEY, 0, Text_1890C0, Text_1890E6 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A9792 + goto_if eq, EventScript_1A9792 msgbox Text_1890F5, 6 end @@ -4822,7 +4731,7 @@ Route25_EventScript_1A97A9:: @ 81A97A9 trainerbattle 0, TRAINER_YOUNGSTER_DAN, 0, Text_189165, Text_1891A6 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A97D0 + goto_if eq, EventScript_1A97D0 msgbox Text_1891B3, 6 end @@ -4835,7 +4744,7 @@ Route25_EventScript_1A97E7:: @ 81A97E7 trainerbattle 0, TRAINER_YOUNGSTER_CHAD, 0, Text_1892A9, Text_1892D9 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A980E + goto_if eq, EventScript_1A980E msgbox Text_1892EF, 6 end @@ -4848,7 +4757,7 @@ Route25_EventScript_1A9825:: @ 81A9825 trainerbattle 0, TRAINER_PICNICKER_KELSEY, 0, Text_189247, Text_189261 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A984C + goto_if eq, EventScript_1A984C msgbox Text_189281, 6 end @@ -4861,7 +4770,7 @@ Route25_EventScript_1A9863:: @ 81A9863 trainerbattle 0, TRAINER_LASS_HALEY, 0, Text_189333, Text_189364 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A988A + goto_if eq, EventScript_1A988A msgbox Text_189378, 6 end @@ -4874,7 +4783,7 @@ Route25_EventScript_1A98A1:: @ 81A98A1 trainerbattle 0, TRAINER_HIKER_FRANKLIN, 0, Text_1893A7, Text_1893EA specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A98C8 + goto_if eq, EventScript_1A98C8 msgbox Text_1893FB, 6 end @@ -4887,7 +4796,7 @@ Route25_EventScript_1A98DF:: @ 81A98DF trainerbattle 0, TRAINER_HIKER_NOB, 0, Text_189423, Text_189459 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A9906 + goto_if eq, EventScript_1A9906 msgbox Text_18947E, 6 end @@ -4900,7 +4809,7 @@ Route25_EventScript_1A991D:: @ 81A991D trainerbattle 0, TRAINER_HIKER_WAYNE, 0, Text_1894DE, Text_18950A specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A9944 + goto_if eq, EventScript_1A9944 msgbox Text_18951C, 6 end @@ -4913,7 +4822,7 @@ Route25_EventScript_1A995B:: @ 81A995B trainerbattle 0, TRAINER_CAMPER_FLINT, 0, Text_1891EB, Text_189212 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A9982 + goto_if eq, EventScript_1A9982 msgbox Text_18921D, 6 end @@ -4926,7 +4835,7 @@ Route6_EventScript_1A9999:: @ 81A9999 trainerbattle 0, TRAINER_BUG_CATCHER_KEIGO, 0, Text_183E9F, Text_183EC0 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A99C0 + goto_if eq, EventScript_1A99C0 msgbox Text_183ED4, 6 end @@ -4939,7 +4848,7 @@ Route6_EventScript_1A99D7:: @ 81A99D7 trainerbattle 0, TRAINER_BUG_CATCHER_ELIJAH, 0, Text_183FF0, Text_18401A specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A99FE + goto_if eq, EventScript_1A99FE msgbox Text_18402B, 6 end @@ -4952,7 +4861,7 @@ Route6_EventScript_1A9A15:: @ 81A9A15 trainerbattle 0, TRAINER_CAMPER_RICKY, 0, Text_183E04, Text_183E2A specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A9A3C + goto_if eq, EventScript_1A9A3C msgbox Text_183E3C, 6 end @@ -4965,7 +4874,7 @@ Route6_EventScript_1A9A53:: @ 81A9A53 trainerbattle 0, TRAINER_CAMPER_JEFF, 0, Text_183F07, Text_183F24 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A9A7A + goto_if eq, EventScript_1A9A7A msgbox Text_183F51, 6 end @@ -4978,7 +4887,7 @@ Route6_EventScript_1A9A91:: @ 81A9A91 trainerbattle 0, TRAINER_PICNICKER_NANCY, 0, Text_183E4E, Text_183E79 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A9AB8 + goto_if eq, EventScript_1A9AB8 msgbox Text_183E8D, 6 end @@ -4991,7 +4900,7 @@ Route6_EventScript_1A9ACF:: @ 81A9ACF trainerbattle 0, TRAINER_PICNICKER_ISABELLE, 0, Text_183F90, Text_183FAB specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A9AF6 + goto_if eq, EventScript_1A9AF6 msgbox Text_183FC4, 6 end @@ -5004,7 +4913,7 @@ Route11_EventScript_1A9B0D:: @ 81A9B0D trainerbattle 0, TRAINER_YOUNGSTER_EDDIE, 0, Text_184FBD, Text_184FD8 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A9B34 + goto_if eq, EventScript_1A9B34 msgbox Text_184FEF, 6 end @@ -5017,7 +4926,7 @@ Route11_EventScript_1A9B4B:: @ 81A9B4B trainerbattle 0, TRAINER_YOUNGSTER_DILLON, 0, Text_18506A, Text_18509B specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A9B72 + goto_if eq, EventScript_1A9B72 msgbox Text_1850CF, 6 end @@ -5030,7 +4939,7 @@ Route11_EventScript_1A9B89:: @ 81A9B89 trainerbattle 0, TRAINER_YOUNGSTER_YASU, 0, Text_18517B, Text_1851AC specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A9BB0 + goto_if eq, EventScript_1A9BB0 msgbox Text_1851D2, 6 end @@ -5043,7 +4952,7 @@ Route11_EventScript_1A9BC7:: @ 81A9BC7 trainerbattle 0, TRAINER_YOUNGSTER_DAVE, 0, Text_185285, Text_1852C1 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A9BEE + goto_if eq, EventScript_1A9BEE msgbox Text_1852E3, 6 end @@ -5056,7 +4965,7 @@ Route11_EventScript_1A9C05:: @ 81A9C05 trainerbattle 0, TRAINER_ENGINEER_BRAXTON, 0, Text_185011, Text_185037 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A9C2C + goto_if eq, EventScript_1A9C2C msgbox Text_18504A, 6 end @@ -5069,7 +4978,7 @@ Route11_EventScript_1A9C43:: @ 81A9C43 trainerbattle 0, TRAINER_ENGINEER_BERNIE, 0, Text_185236, Text_185250 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A9C6A + goto_if eq, EventScript_1A9C6A msgbox Text_185266, 6 end @@ -5082,7 +4991,7 @@ Route11_EventScript_1A9C81:: @ 81A9C81 trainerbattle 0, TRAINER_GAMER_HUGO, 0, Text_184F01, Text_184F15 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A9CA8 + goto_if eq, EventScript_1A9CA8 msgbox Text_184F2E, 6 end @@ -5095,7 +5004,7 @@ Route11_EventScript_1A9CBF:: @ 81A9CBF trainerbattle 0, TRAINER_GAMER_JASPER, 0, Text_184F5D, Text_184F7E specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A9CE6 + goto_if eq, EventScript_1A9CE6 msgbox Text_184F8E, 6 end @@ -5108,7 +5017,7 @@ Route11_EventScript_1A9CFD:: @ 81A9CFD trainerbattle 0, TRAINER_GAMER_DIRK, 0, Text_1850E9, Text_185105 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A9D24 + goto_if eq, EventScript_1A9D24 msgbox Text_185114, 6 end @@ -5121,7 +5030,7 @@ Route11_EventScript_1A9D3B:: @ 81A9D3B trainerbattle 0, TRAINER_GAMER_DARIAN, 0, Text_185135, Text_18514E specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A9D62 + goto_if eq, EventScript_1A9D62 msgbox Text_185161, 6 end @@ -5134,7 +5043,7 @@ Route9_EventScript_1A9D79:: @ 81A9D79 trainerbattle 0, TRAINER_BUG_CATCHER_BRENT, 0, Text_184A2F, Text_184A6A specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A9DA0 + goto_if eq, EventScript_1A9DA0 msgbox Text_184A8C, 6 end @@ -5147,7 +5056,7 @@ Route9_EventScript_1A9DB7:: @ 81A9DB7 trainerbattle 0, TRAINER_BUG_CATCHER_CONNER, 0, Text_184B18, Text_184B32 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A9DDE + goto_if eq, EventScript_1A9DDE msgbox Text_184B3B, 6 end @@ -5160,7 +5069,7 @@ Route9_EventScript_1A9DF5:: @ 81A9DF5 trainerbattle 0, TRAINER_CAMPER_CHRIS, 0, Text_184844, Text_18487E specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A9E1C + goto_if eq, EventScript_1A9E1C msgbox Text_184890, 6 end @@ -5173,7 +5082,7 @@ Route9_EventScript_1A9E33:: @ 81A9E33 trainerbattle 0, TRAINER_CAMPER_DREW, 0, Text_18489E, Text_1848CC specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A9E5A + goto_if eq, EventScript_1A9E5A msgbox Text_1848DE, 6 end @@ -5186,7 +5095,7 @@ Route9_EventScript_1A9E71:: @ 81A9E71 trainerbattle 0, TRAINER_PICNICKER_ALICIA, 0, Text_1847B7, Text_1847DF specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A9E98 + goto_if eq, EventScript_1A9E98 msgbox Text_1847F0, 6 end @@ -5199,7 +5108,7 @@ Route9_EventScript_1A9EAF:: @ 81A9EAF trainerbattle 0, TRAINER_PICNICKER_CAITLIN, 0, Text_1848FF, Text_18491C specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A9ED6 + goto_if eq, EventScript_1A9ED6 msgbox Text_184931, 6 end @@ -5212,7 +5121,7 @@ Route9_EventScript_1A9EED:: @ 81A9EED trainerbattle 0, TRAINER_HIKER_ALAN, 0, Text_184ABE, Text_184AD5 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A9F14 + goto_if eq, EventScript_1A9F14 msgbox Text_184AF1, 6 end @@ -5225,7 +5134,7 @@ Route9_EventScript_1A9F2B:: @ 81A9F2B trainerbattle 0, TRAINER_HIKER_BRICE, 0, Text_1849DF, Text_184A04 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A9F52 + goto_if eq, EventScript_1A9F52 msgbox Text_184A11, 6 end @@ -5238,7 +5147,7 @@ Route9_EventScript_1A9F69:: @ 81A9F69 trainerbattle 0, TRAINER_HIKER_JEREMY, 0, Text_18495E, Text_18497F specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A9F90 + goto_if eq, EventScript_1A9F90 msgbox Text_1849B0, 6 end @@ -5251,7 +5160,7 @@ Route10_EventScript_1A9FA7:: @ 81A9FA7 trainerbattle 0, TRAINER_PICNICKER_HEIDI, 0, Text_184CF1, Text_184D31 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A9FCE + goto_if eq, EventScript_1A9FCE msgbox Text_184D4D, 6 end @@ -5264,7 +5173,7 @@ Route10_EventScript_1A9FE5:: @ 81A9FE5 trainerbattle 0, TRAINER_PICNICKER_CAROL, 0, Text_184E04, Text_184E3B specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AA00C + goto_if eq, EventScript_1AA00C msgbox Text_184E5E, 6 end @@ -5277,7 +5186,7 @@ Route10_EventScript_1AA023:: @ 81AA023 trainerbattle 0, TRAINER_POKEMANIAC_MARK, 0, Text_184B8A, Text_184BE5 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AA04A + goto_if eq, EventScript_1AA04A msgbox Text_184BFB, 6 end @@ -5290,7 +5199,7 @@ Route10_EventScript_1AA061:: @ 81AA061 trainerbattle 0, TRAINER_POKEMANIAC_HERMAN, 0, Text_184C86, Text_184CA7 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AA088 + goto_if eq, EventScript_1AA088 msgbox Text_184CBB, 6 end @@ -5303,7 +5212,7 @@ Route10_EventScript_1AA09F:: @ 81AA09F trainerbattle 0, TRAINER_HIKER_CLARK, 0, Text_184C1D, Text_184C2D specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AA0C6 + goto_if eq, EventScript_1AA0C6 msgbox Text_184C60, 6 end @@ -5316,7 +5225,7 @@ Route10_EventScript_1AA0DD:: @ 81AA0DD trainerbattle 0, TRAINER_HIKER_TRENT, 0, Text_184DAA, Text_184DCE specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AA104 + goto_if eq, EventScript_1AA104 msgbox Text_184DE4, 6 end @@ -5329,7 +5238,7 @@ Route8_EventScript_1AA11B:: @ 81AA11B trainerbattle 0, TRAINER_LASS_PAIGE, 0, Text_1841ED, Text_184210 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AA142 + goto_if eq, EventScript_1AA142 msgbox Text_18421B, 6 end @@ -5342,7 +5251,7 @@ Route8_EventScript_1AA159:: @ 81AA159 trainerbattle 0, TRAINER_LASS_ANDREA, 0, Text_184321, Text_184346 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AA180 + goto_if eq, EventScript_1AA180 msgbox Text_184350, 6 end @@ -5355,7 +5264,7 @@ Route8_EventScript_1AA197:: @ 81AA197 trainerbattle 0, TRAINER_LASS_MEGAN, 0, Text_18437A, Text_1843A6 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AA1BE + goto_if eq, EventScript_1AA1BE msgbox Text_1843D2, 6 end @@ -5368,7 +5277,7 @@ Route8_EventScript_1AA1D5:: @ 81AA1D5 trainerbattle 0, TRAINER_LASS_JULIA, 0, Text_1844AC, Text_1844D6 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AA1FC + goto_if eq, EventScript_1AA1FC msgbox Text_1844FD, 6 end @@ -5381,7 +5290,7 @@ Route8_EventScript_1AA213:: @ 81AA213 trainerbattle 0, TRAINER_SUPER_NERD_AIDAN, 0, Text_1840C5, Text_184100 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AA23A + goto_if eq, EventScript_1AA23A msgbox Text_18410E, 6 end @@ -5394,7 +5303,7 @@ Route8_EventScript_1AA251:: @ 81AA251 trainerbattle 0, TRAINER_SUPER_NERD_GLENN, 0, Text_18417C, Text_1841B6 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AA278 + goto_if eq, EventScript_1AA278 msgbox Text_1841C8, 6 end @@ -5407,7 +5316,7 @@ Route8_EventScript_1AA28F:: @ 81AA28F trainerbattle 0, TRAINER_SUPER_NERD_LESLIE, 0, Text_184257, Text_18427A specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AA2B6 + goto_if eq, EventScript_1AA2B6 msgbox Text_1842B3, 6 end @@ -5420,7 +5329,7 @@ Route8_EventScript_1AA2CD:: @ 81AA2CD trainerbattle 0, TRAINER_GAMER_STAN, 0, Text_18412F, Text_18414D specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AA2F4 + goto_if eq, EventScript_1AA2F4 msgbox Text_184162, 6 end @@ -5433,7 +5342,7 @@ Route8_EventScript_1AA30B:: @ 81AA30B trainerbattle 0, TRAINER_GAMER_RICH, 0, Text_184432, Text_18444F specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AA332 + goto_if eq, EventScript_1AA332 msgbox Text_184466, 6 end @@ -5446,7 +5355,7 @@ Route8_EventScript_1AA349:: @ 81AA349 trainerbattle 4, TRAINER_TWINS_ELI_ANNE, 0, Text_1845A4, Text_1845D0, Text_184616 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AA374 + goto_if eq, EventScript_1AA374 msgbox Text_1845F2, 6 end @@ -5459,7 +5368,7 @@ Route8_EventScript_1AA38F:: @ 81AA38F trainerbattle 4, TRAINER_TWINS_ELI_ANNE, 0, Text_18464A, Text_184675, Text_1846AF specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AA3BA + goto_if eq, EventScript_1AA3BA msgbox Text_18468B, 6 end @@ -5472,7 +5381,7 @@ Route8_EventScript_1AA3D5:: @ 81AA3D5 trainerbattle 0, TRAINER_BIKER_RICARDO, 0, Text_1846E2, Text_1846FC specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AA3FC + goto_if eq, EventScript_1AA3FC msgbox Text_184719, 6 end @@ -5485,7 +5394,7 @@ Route8_EventScript_1AA413:: @ 81AA413 trainerbattle 0, TRAINER_BIKER_JAREN, 0, Text_184742, Text_184767 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AA43A + goto_if eq, EventScript_1AA43A msgbox Text_18477A, 6 end @@ -5498,7 +5407,7 @@ Route12_EventScript_1AA451:: @ 81AA451 trainerbattle 0, TRAINER_FISHERMAN_NED, 0, Text_185402, Text_18541B specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AA478 + goto_if eq, EventScript_1AA478 msgbox Text_185432, 6 end @@ -5511,7 +5420,7 @@ Route12_EventScript_1AA48F:: @ 81AA48F trainerbattle 0, TRAINER_FISHERMAN_CHIP, 0, Text_18544E, Text_185475 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AA4B6 + goto_if eq, EventScript_1AA4B6 msgbox Text_185488, 6 end @@ -5524,7 +5433,7 @@ Route12_EventScript_1AA4CD:: @ 81AA4CD trainerbattle 0, TRAINER_FISHERMAN_HANK, 0, Text_1855E1, Text_185606 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AA4F4 + goto_if eq, EventScript_1AA4F4 msgbox Text_185616, 6 end @@ -5537,7 +5446,7 @@ Route12_EventScript_1AA50B:: @ 81AA50B trainerbattle 0, TRAINER_FISHERMAN_ELLIOT, 0, Text_185682, Text_1856D0 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AA532 + goto_if eq, EventScript_1AA532 msgbox Text_1856DF, 6 end @@ -5550,7 +5459,7 @@ Route12_EventScript_1AA549:: @ 81AA549 trainerbattle 0, TRAINER_FISHERMAN_ANDREW, 0, Text_18570E, Text_185744 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AA570 + goto_if eq, EventScript_1AA570 msgbox Text_18574D, 6 end @@ -5563,7 +5472,7 @@ Route12_EventScript_1AA587:: @ 81AA587 trainerbattle 0, TRAINER_ROCKER_LUCA, 0, Text_185547, Text_18559B specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AA5AE + goto_if eq, EventScript_1AA5AE msgbox Text_1855A6, 6 end @@ -5576,7 +5485,7 @@ Route12_EventScript_1AA5C5:: @ 81AA5C5 trainerbattle 0, TRAINER_CAMPER_JUSTIN, 0, Text_1854B9, Text_1854ED specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AA5EC + goto_if eq, EventScript_1AA5EC msgbox Text_1854F2, 6 end @@ -5589,7 +5498,7 @@ Route12_EventScript_1AA603:: @ 81AA603 trainerbattle 4, TRAINER_YOUNG_COUPLE_GIA_JES, 0, Text_1857C5, Text_1857F1, Text_185842 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AA62E + goto_if eq, EventScript_1AA62E msgbox Text_18581F, 6 end @@ -5602,7 +5511,7 @@ Route12_EventScript_1AA649:: @ 81AA649 trainerbattle 4, TRAINER_YOUNG_COUPLE_GIA_JES, 0, Text_1858A6, Text_1858D0, Text_185908 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AA674 + goto_if eq, EventScript_1AA674 msgbox Text_1858E2, 6 end @@ -5615,7 +5524,7 @@ Route13_EventScript_1AA68F:: @ 81AA68F trainerbattle 0, TRAINER_BIKER_JARED, 0, Text_185D05, Text_185D1D specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AA6B6 + goto_if eq, EventScript_1AA6B6 msgbox Text_185D33, 6 end @@ -5628,7 +5537,7 @@ Route13_EventScript_1AA6CD:: @ 81AA6CD trainerbattle 0, TRAINER_BEAUTY_LOLA, 0, Text_185BFC, Text_185C1F specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AA6F4 + goto_if eq, EventScript_1AA6F4 msgbox Text_185C35, 6 end @@ -5641,7 +5550,7 @@ Route13_EventScript_1AA70B:: @ 81AA70B trainerbattle 0, TRAINER_BEAUTY_SHEILA, 0, Text_185C69, Text_185C95 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AA732 + goto_if eq, EventScript_1AA732 msgbox Text_185CA8, 6 end @@ -5654,7 +5563,7 @@ Route13_EventScript_1AA749:: @ 81AA749 trainerbattle 0, TRAINER_BIRD_KEEPER_SEBASTIAN, 0, Text_185955, Text_18597E specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AA770 + goto_if eq, EventScript_1AA770 msgbox Text_1859A2, 6 end @@ -5667,7 +5576,7 @@ Route13_EventScript_1AA787:: @ 81AA787 trainerbattle 0, TRAINER_BIRD_KEEPER_PERRY, 0, Text_185B8F, Text_185BCA specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AA7AE + goto_if eq, EventScript_1AA7AE msgbox Text_185BDB, 6 end @@ -5680,7 +5589,7 @@ Route13_EventScript_1AA7C5:: @ 81AA7C5 trainerbattle 0, TRAINER_BIRD_KEEPER_ROBERT, 0, Text_185D3D, Text_185D7B specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AA7EC + goto_if eq, EventScript_1AA7EC msgbox Text_185D89, 6 end @@ -5693,7 +5602,7 @@ Route13_EventScript_1AA803:: @ 81AA803 trainerbattle 0, TRAINER_PICNICKER_ALMA, 0, Text_185B12, Text_185B48 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AA82A + goto_if eq, EventScript_1AA82A msgbox Text_185B67, 6 end @@ -5706,7 +5615,7 @@ Route13_EventScript_1AA841:: @ 81AA841 trainerbattle 0, TRAINER_PICNICKER_SUSIE, 0, Text_1859CF, Text_1859EC specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AA868 + goto_if eq, EventScript_1AA868 msgbox Text_1859F9, 6 end @@ -5719,7 +5628,7 @@ Route13_EventScript_1AA87F:: @ 81AA87F trainerbattle 0, TRAINER_PICNICKER_VALERIE, 0, Text_185A37, Text_185A56 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AA8A6 + goto_if eq, EventScript_1AA8A6 msgbox Text_185A62, 6 end @@ -5732,7 +5641,7 @@ Route13_EventScript_1AA8BD:: @ 81AA8BD trainerbattle 0, TRAINER_PICNICKER_GWEN, 0, Text_185A91, Text_185AC1 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AA8E4 + goto_if eq, EventScript_1AA8E4 msgbox Text_185ADE, 6 end @@ -5745,7 +5654,7 @@ Route14_EventScript_1AA8FB:: @ 81AA8FB trainerbattle 0, TRAINER_BIKER_MALIK, 0, Text_186344, Text_186362 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AA922 + goto_if eq, EventScript_1AA922 msgbox Text_18636E, 6 end @@ -5758,7 +5667,7 @@ Route14_EventScript_1AA939:: @ 81AA939 trainerbattle 0, TRAINER_BIKER_LUKAS, 0, Text_1861F7, Text_186223 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AA960 + goto_if eq, EventScript_1AA960 msgbox Text_186239, 6 end @@ -5771,7 +5680,7 @@ Route14_EventScript_1AA977:: @ 81AA977 trainerbattle 0, TRAINER_BIKER_ISAAC, 0, Text_186263, Text_186291 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AA99E + goto_if eq, EventScript_1AA99E msgbox Text_18629D, 6 end @@ -5784,7 +5693,7 @@ Route14_EventScript_1AA9B5:: @ 81AA9B5 trainerbattle 0, TRAINER_BIKER_GERALD, 0, Text_1862BD, Text_1862EF specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AA9DC + goto_if eq, EventScript_1AA9DC msgbox Text_1862F8, 6 end @@ -5797,7 +5706,7 @@ Route14_EventScript_1AA9F3:: @ 81AA9F3 trainerbattle 0, TRAINER_BIRD_KEEPER_DONALD, 0, Text_1860D9, Text_18610A specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AAA1A + goto_if eq, EventScript_1AAA1A msgbox Text_18611D, 6 end @@ -5810,7 +5719,7 @@ Route14_EventScript_1AAA31:: @ 81AAA31 trainerbattle 0, TRAINER_BIRD_KEEPER_BENNY, 0, Text_18618E, Text_1861B3 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AAA58 + goto_if eq, EventScript_1AAA58 msgbox Text_1861BE, 6 end @@ -5823,7 +5732,7 @@ Route14_EventScript_1AAA6F:: @ 81AAA6F trainerbattle 0, TRAINER_BIRD_KEEPER_CARTER, 0, Text_185E4D, Text_185E81 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AAA96 + goto_if eq, EventScript_1AAA96 msgbox Text_185E9C, 6 end @@ -5836,7 +5745,7 @@ Route14_EventScript_1AAAAD:: @ 81AAAAD trainerbattle 0, TRAINER_BIRD_KEEPER_MITCH, 0, Text_185EDF, Text_185F0B specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AAAD4 + goto_if eq, EventScript_1AAAD4 msgbox Text_185F1A, 6 end @@ -5849,7 +5758,7 @@ Route14_EventScript_1AAAEB:: @ 81AAAEB trainerbattle 0, TRAINER_BIRD_KEEPER_BECK, 0, Text_185F46, Text_185FAE specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AAB12 + goto_if eq, EventScript_1AAB12 msgbox Text_185FBB, 6 end @@ -5862,7 +5771,7 @@ Route14_EventScript_1AAB29:: @ 81AAB29 trainerbattle 0, TRAINER_BIRD_KEEPER_MARLON, 0, Text_186021, Text_18607C specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AAB50 + goto_if eq, EventScript_1AAB50 msgbox Text_186091, 6 end @@ -5875,7 +5784,7 @@ Route14_EventScript_1AAB67:: @ 81AAB67 trainerbattle 4, TRAINER_TWINS_KIRI_JAN, 0, Text_1863B7, Text_1863EA, Text_18642E specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AAB92 + goto_if eq, EventScript_1AAB92 msgbox Text_18640D, 6 end @@ -5888,7 +5797,7 @@ Route14_EventScript_1AABAD:: @ 81AABAD trainerbattle 4, TRAINER_TWINS_KIRI_JAN, 0, Text_18645B, Text_186487, Text_1864D3 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AABD8 + goto_if eq, EventScript_1AABD8 msgbox Text_18649C, 6 end @@ -5901,7 +5810,7 @@ Route15_EventScript_1AABF3:: @ 81AABF3 trainerbattle 0, TRAINER_BIKER_ERNEST, 0, Text_1868B6, Text_1868E8 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AAC1A + goto_if eq, EventScript_1AAC1A msgbox Text_1868F1, 6 end @@ -5914,7 +5823,7 @@ Route15_EventScript_1AAC31:: @ 81AAC31 trainerbattle 0, TRAINER_BIKER_ALEX, 0, Text_186936, Text_186968 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AAC58 + goto_if eq, EventScript_1AAC58 msgbox Text_18697C, 6 end @@ -5927,7 +5836,7 @@ Route15_EventScript_1AAC6F:: @ 81AAC6F trainerbattle 0, TRAINER_BEAUTY_GRACE, 0, Text_18678B, Text_1867C1 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AAC96 + goto_if eq, EventScript_1AAC96 msgbox Text_1867DA, 6 end @@ -5940,7 +5849,7 @@ Route15_EventScript_1AACAD:: @ 81AACAD trainerbattle 0, TRAINER_BEAUTY_OLIVIA, 0, Text_18680C, Text_186841 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AACD4 + goto_if eq, EventScript_1AACD4 msgbox Text_18686F, 6 end @@ -5953,7 +5862,7 @@ Route15_EventScript_1AACEB:: @ 81AACEB trainerbattle 0, TRAINER_BIRD_KEEPER_EDWIN, 0, Text_18664F, Text_18667A specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AAD12 + goto_if eq, EventScript_1AAD12 msgbox Text_18668D, 6 end @@ -5966,7 +5875,7 @@ Route15_EventScript_1AAD29:: @ 81AAD29 trainerbattle 0, TRAINER_BIRD_KEEPER_CHESTER, 0, Text_1866D1, Text_186707 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AAD50 + goto_if eq, EventScript_1AAD50 msgbox Text_18671A, 6 end @@ -5979,7 +5888,7 @@ Route15_EventScript_1AAD67:: @ 81AAD67 trainerbattle 0, TRAINER_PICNICKER_YAZMIN, 0, Text_186A22, Text_186A40 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AAD8E + goto_if eq, EventScript_1AAD8E msgbox Text_186A55, 6 end @@ -5992,7 +5901,7 @@ Route15_EventScript_1AADA5:: @ 81AADA5 trainerbattle 0, TRAINER_PICNICKER_KINDRA, 0, Text_18650B, Text_186549 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AADCC + goto_if eq, EventScript_1AADCC msgbox Text_18655A, 6 end @@ -6005,7 +5914,7 @@ Route15_EventScript_1AADE3:: @ 81AADE3 trainerbattle 0, TRAINER_PICNICKER_BECKY, 0, Text_1865D3, Text_186612 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AAE0A + goto_if eq, EventScript_1AAE0A msgbox Text_18661D, 6 end @@ -6018,7 +5927,7 @@ Route15_EventScript_1AAE21:: @ 81AAE21 trainerbattle 0, TRAINER_PICNICKER_CELIA, 0, Text_1869BA, Text_1869E6 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AAE48 + goto_if eq, EventScript_1AAE48 msgbox Text_1869F4, 6 end @@ -6031,7 +5940,7 @@ Route15_EventScript_1AAE5F:: @ 81AAE5F trainerbattle 4, TRAINER_CRUSH_KIN_RON_MYA, 0, Text_186A95, Text_186ACB, Text_186B46 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AAE8A + goto_if eq, EventScript_1AAE8A msgbox Text_186B0A, 6 end @@ -6044,7 +5953,7 @@ Route15_EventScript_1AAEA5:: @ 81AAEA5 trainerbattle 4, TRAINER_CRUSH_KIN_RON_MYA, 0, Text_186B89, Text_186BB1, Text_186BFE specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AAED0 + goto_if eq, EventScript_1AAED0 msgbox Text_186BD2, 6 end @@ -6057,7 +5966,7 @@ Route16_EventScript_1AAEEB:: @ 81AAEEB trainerbattle 0, TRAINER_BIKER_LAO, 0, Text_186C4D, Text_186C5F specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AAF12 + goto_if eq, EventScript_1AAF12 msgbox Text_186C75, 6 end @@ -6070,7 +5979,7 @@ Route16_EventScript_1AAF29:: @ 81AAF29 trainerbattle 0, TRAINER_BIKER_HIDEO, 0, Text_186D39, Text_186D52 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AAF50 + goto_if eq, EventScript_1AAF50 msgbox Text_186D5A, 6 end @@ -6083,7 +5992,7 @@ Route16_EventScript_1AAF67:: @ 81AAF67 trainerbattle 0, TRAINER_BIKER_RUBEN, 0, Text_186E86, Text_186EB4 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AAF8E + goto_if eq, EventScript_1AAF8E msgbox Text_186EC7, 6 end @@ -6096,7 +6005,7 @@ Route16_EventScript_1AAFA5:: @ 81AAFA5 trainerbattle 0, TRAINER_CUE_BALL_KOJI, 0, Text_186CA2, Text_186CBB specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AAFCC + goto_if eq, EventScript_1AAFCC msgbox Text_186CC5, 6 end @@ -6109,7 +6018,7 @@ Route16_EventScript_1AAFE3:: @ 81AAFE3 trainerbattle 0, TRAINER_CUE_BALL_LUKE, 0, Text_186CE5, Text_186D06 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AB00A + goto_if eq, EventScript_1AB00A msgbox Text_186D16, 6 end @@ -6122,7 +6031,7 @@ Route16_EventScript_1AB021:: @ 81AB021 trainerbattle 0, TRAINER_CUE_BALL_CAMRON, 0, Text_186DD9, Text_186E0D specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AB048 + goto_if eq, EventScript_1AB048 msgbox Text_186E1C, 6 end @@ -6135,7 +6044,7 @@ Route16_EventScript_1AB05F:: @ 81AB05F trainerbattle 4, TRAINER_YOUNG_COUPLE_LEA_JED, 0, Text_186FBD, Text_186FFA, Text_187057 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AB08A + goto_if eq, EventScript_1AB08A msgbox Text_187027, 6 end @@ -6148,7 +6057,7 @@ Route16_EventScript_1AB0A5:: @ 81AB0A5 trainerbattle 4, TRAINER_YOUNG_COUPLE_LEA_JED, 0, Text_187097, Text_1870CC, Text_187120 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AB0D0 + goto_if eq, EventScript_1AB0D0 msgbox Text_1870F9, 6 end @@ -6161,7 +6070,7 @@ Route17_EventScript_1AB0EB:: @ 81AB0EB trainerbattle 0, TRAINER_BIKER_BILLY, 0, Text_1872BD, Text_1872E3 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AB112 + goto_if eq, EventScript_1AB112 msgbox Text_1872EB, 6 end @@ -6174,7 +6083,7 @@ Route17_EventScript_1AB129:: @ 81AB129 trainerbattle 0, TRAINER_BIKER_NIKOLAS, 0, Text_18730A, Text_187325 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AB150 + goto_if eq, EventScript_1AB150 msgbox Text_187333, 6 end @@ -6187,7 +6096,7 @@ Route17_EventScript_1AB167:: @ 81AB167 trainerbattle 0, TRAINER_BIKER_JAXON, 0, Text_187456, Text_187472 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AB18E + goto_if eq, EventScript_1AB18E msgbox Text_187479, 6 end @@ -6200,7 +6109,7 @@ Route17_EventScript_1AB1A5:: @ 81AB1A5 trainerbattle 0, TRAINER_BIKER_WILLIAM, 0, Text_18749B, Text_1874B6 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AB1CC + goto_if eq, EventScript_1AB1CC msgbox Text_1874C9, 6 end @@ -6213,7 +6122,7 @@ Route17_EventScript_1AB1E3:: @ 81AB1E3 trainerbattle 0, TRAINER_CUE_BALL_RAUL, 0, Text_18717E, Text_1871AE specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AB20A + goto_if eq, EventScript_1AB20A msgbox Text_1871BA, 6 end @@ -6226,7 +6135,7 @@ Route17_EventScript_1AB221:: @ 81AB221 trainerbattle 0, TRAINER_CUE_BALL_ISAIAH, 0, Text_187228, Text_187254 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AB248 + goto_if eq, EventScript_1AB248 msgbox Text_18725A, 6 end @@ -6239,7 +6148,7 @@ Route17_EventScript_1AB25F:: @ 81AB25F trainerbattle 0, TRAINER_CUE_BALL_ZEEK, 0, Text_187362, Text_187395 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AB286 + goto_if eq, EventScript_1AB286 msgbox Text_18739F, 6 end @@ -6252,7 +6161,7 @@ Route17_EventScript_1AB29D:: @ 81AB29D trainerbattle 0, TRAINER_CUE_BALL_JAMAL, 0, Text_1873D1, Text_1873EB specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AB2C4 + goto_if eq, EventScript_1AB2C4 msgbox Text_1873FF, 6 end @@ -6265,7 +6174,7 @@ Route17_EventScript_1AB2DB:: @ 81AB2DB trainerbattle 0, TRAINER_CUE_BALL_COREY, 0, Text_18741D, Text_187429 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AB302 + goto_if eq, EventScript_1AB302 msgbox Text_187432, 6 end @@ -6278,7 +6187,7 @@ Route17_EventScript_1AB319:: @ 81AB319 trainerbattle 0, TRAINER_BIKER_VIRGIL, 0, Text_18727D, Text_187295 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AB340 + goto_if eq, EventScript_1AB340 msgbox Text_1872A5, 6 end @@ -6291,7 +6200,7 @@ Route18_EventScript_1AB357:: @ 81AB357 trainerbattle 0, TRAINER_BIRD_KEEPER_WILTON, 0, Text_187640, Text_187672 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AB37E + goto_if eq, EventScript_1AB37E msgbox Text_187677, 6 end @@ -6304,7 +6213,7 @@ Route18_EventScript_1AB395:: @ 81AB395 trainerbattle 0, TRAINER_BIRD_KEEPER_RAMIRO, 0, Text_18768C, Text_1876B3 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AB3BC + goto_if eq, EventScript_1AB3BC msgbox Text_1876C5, 6 end @@ -6317,7 +6226,7 @@ Route18_EventScript_1AB3D3:: @ 81AB3D3 trainerbattle 0, TRAINER_BIRD_KEEPER_JACOB, 0, Text_187704, Text_187726 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AB3FA + goto_if eq, EventScript_1AB3FA msgbox Text_18772C, 6 end @@ -6330,7 +6239,7 @@ Route19_EventScript_1AB411:: @ 81AB411 trainerbattle 0, TRAINER_SWIMMER_MALE_RICHARD, 0, Text_1877A3, Text_1877DF specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AB438 + goto_if eq, EventScript_1AB438 msgbox Text_1877EE, 6 end @@ -6343,7 +6252,7 @@ Route19_EventScript_1AB44F:: @ 81AB44F trainerbattle 0, TRAINER_SWIMMER_MALE_REECE, 0, Text_187811, Text_18783E specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AB476 + goto_if eq, EventScript_1AB476 msgbox Text_187852, 6 end @@ -6356,7 +6265,7 @@ Route19_EventScript_1AB48D:: @ 81AB48D trainerbattle 0, TRAINER_SWIMMER_MALE_MATTHEW, 0, Text_187884, Text_1878A5 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AB4B4 + goto_if eq, EventScript_1AB4B4 msgbox Text_1878B1, 6 end @@ -6369,7 +6278,7 @@ Route19_EventScript_1AB4CB:: @ 81AB4CB trainerbattle 0, TRAINER_SWIMMER_MALE_DOUGLAS, 0, Text_1878DD, Text_1878F8 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AB4F2 + goto_if eq, EventScript_1AB4F2 msgbox Text_1878FE, 6 end @@ -6382,7 +6291,7 @@ Route19_EventScript_1AB509:: @ 81AB509 trainerbattle 0, TRAINER_SWIMMER_MALE_DAVID, 0, Text_187925, Text_187955 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AB530 + goto_if eq, EventScript_1AB530 msgbox Text_18795B, 6 end @@ -6395,7 +6304,7 @@ Route19_EventScript_1AB547:: @ 81AB547 trainerbattle 0, TRAINER_SWIMMER_MALE_TONY, 0, Text_187985, Text_1879C3 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AB56E + goto_if eq, EventScript_1AB56E msgbox Text_1879D3, 6 end @@ -6408,7 +6317,7 @@ Route19_EventScript_1AB585:: @ 81AB585 trainerbattle 0, TRAINER_SWIMMER_MALE_AXLE, 0, Text_187AFA, Text_187B25 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AB5AC + goto_if eq, EventScript_1AB5AC msgbox Text_187B35, 6 end @@ -6421,7 +6330,7 @@ Route19_EventScript_1AB5C3:: @ 81AB5C3 trainerbattle 0, TRAINER_SWIMMER_FEMALE_ANYA, 0, Text_187A11, Text_187A44 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AB5EA + goto_if eq, EventScript_1AB5EA msgbox Text_187A50, 6 end @@ -6434,7 +6343,7 @@ Route19_EventScript_1AB601:: @ 81AB601 trainerbattle 0, TRAINER_SWIMMER_FEMALE_ALICE, 0, Text_187A9E, Text_187AC1 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AB628 + goto_if eq, EventScript_1AB628 msgbox Text_187ACA, 6 end @@ -6447,7 +6356,7 @@ Route19_EventScript_1AB63F:: @ 81AB63F trainerbattle 0, TRAINER_SWIMMER_FEMALE_CONNIE, 0, Text_187B5D, Text_187B85 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AB666 + goto_if eq, EventScript_1AB666 msgbox Text_187B94, 6 end @@ -6460,7 +6369,7 @@ Route19_EventScript_1AB67D:: @ 81AB67D trainerbattle 4, TRAINER_SIS_AND_BRO_LIA_LUC, 0, Text_187C32, Text_187C6F, Text_187CF2 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AB6A8 + goto_if eq, EventScript_1AB6A8 msgbox Text_187C9E, 6 end @@ -6473,7 +6382,7 @@ Route19_EventScript_1AB6C3:: @ 81AB6C3 trainerbattle 4, TRAINER_SIS_AND_BRO_LIA_LUC, 0, Text_187D45, Text_187D7E, Text_187DE8 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AB6EE + goto_if eq, EventScript_1AB6EE msgbox Text_187DAD, 6 end @@ -6486,7 +6395,7 @@ Route20_EventScript_1AB709:: @ 81AB709 trainerbattle 0, TRAINER_SWIMMER_MALE_BARRY, 0, Text_187E40, Text_187E7B specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AB730 + goto_if eq, EventScript_1AB730 msgbox Text_187E83, 6 end @@ -6499,7 +6408,7 @@ Route20_EventScript_1AB747:: @ 81AB747 trainerbattle 0, TRAINER_SWIMMER_MALE_DEAN, 0, Text_187FDB, Text_187FF7 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AB76E + goto_if eq, EventScript_1AB76E msgbox Text_187FFE, 6 end @@ -6512,7 +6421,7 @@ Route20_EventScript_1AB785:: @ 81AB785 trainerbattle 0, TRAINER_SWIMMER_MALE_DARRIN, 0, Text_18802E, Text_18805C specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AB7AC + goto_if eq, EventScript_1AB7AC msgbox Text_18806D, 6 end @@ -6525,7 +6434,7 @@ Route20_EventScript_1AB7C3:: @ 81AB7C3 trainerbattle 0, TRAINER_SWIMMER_FEMALE_TIFFANY, 0, Text_187F24, Text_187F5A specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AB7EA + goto_if eq, EventScript_1AB7EA msgbox Text_187F61, 6 end @@ -6538,7 +6447,7 @@ Route20_EventScript_1AB801:: @ 81AB801 trainerbattle 0, TRAINER_SWIMMER_FEMALE_NORA, 0, Text_1880F8, Text_188119 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AB828 + goto_if eq, EventScript_1AB828 msgbox Text_188139, 6 end @@ -6551,7 +6460,7 @@ Route20_EventScript_1AB83F:: @ 81AB83F trainerbattle 0, TRAINER_SWIMMER_FEMALE_MELISSA, 0, Text_188218, Text_18825C specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AB866 + goto_if eq, EventScript_1AB866 msgbox Text_18827B, 6 end @@ -6564,7 +6473,7 @@ Route20_EventScript_1AB87D:: @ 81AB87D trainerbattle 0, TRAINER_SWIMMER_FEMALE_SHIRLEY, 0, Text_187EBB, Text_187EED specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AB8A4 + goto_if eq, EventScript_1AB8A4 msgbox Text_187EF6, 6 end @@ -6577,7 +6486,7 @@ Route20_EventScript_1AB8BB:: @ 81AB8BB trainerbattle 0, TRAINER_BIRD_KEEPER_ROGER, 0, Text_18808E, Text_1880AB specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AB8E2 + goto_if eq, EventScript_1AB8E2 msgbox Text_1880C8, 6 end @@ -6590,7 +6499,7 @@ Route20_EventScript_1AB8F9:: @ 81AB8F9 trainerbattle 0, TRAINER_PICNICKER_MISSY, 0, Text_188165, Text_1881A3 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AB920 + goto_if eq, EventScript_1AB920 msgbox Text_1881B8, 6 end @@ -6603,7 +6512,7 @@ Route20_EventScript_1AB937:: @ 81AB937 trainerbattle 0, TRAINER_PICNICKER_IRENE, 0, Text_187F78, Text_187F92 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AB95E + goto_if eq, EventScript_1AB95E msgbox Text_187FA3, 6 end @@ -6616,7 +6525,7 @@ Route21_North_EventScript_1AB975:: @ 81AB975 trainerbattle 0, TRAINER_FISHERMAN_RONALD, 0, Text_18835A, Text_188383 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AB99C + goto_if eq, EventScript_1AB99C msgbox Text_188389, 6 end @@ -6629,7 +6538,7 @@ Route21_South_EventScript_1AB9B3:: @ 81AB9B3 trainerbattle 0, TRAINER_FISHERMAN_CLAUDE, 0, Text_1885D8, Text_1885F8 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AB9DA + goto_if eq, EventScript_1AB9DA msgbox Text_188632, 6 end @@ -6642,7 +6551,7 @@ Route21_North_EventScript_1AB9F1:: @ 81AB9F1 trainerbattle 0, TRAINER_FISHERMAN_WADE, 0, Text_1883C6, Text_1883E9 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1ABA18 + goto_if eq, EventScript_1ABA18 msgbox Text_18841D, 6 end @@ -6655,7 +6564,7 @@ Route21_South_EventScript_1ABA2F:: @ 81ABA2F trainerbattle 0, TRAINER_FISHERMAN_NOLAN, 0, Text_18868C, Text_1886AE specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1ABA56 + goto_if eq, EventScript_1ABA56 msgbox Text_1886C5, 6 end @@ -6668,7 +6577,7 @@ Route21_North_EventScript_1ABA6D:: @ 81ABA6D trainerbattle 0, TRAINER_SWIMMER_MALE_SPENCER, 0, Text_18843C, Text_18845F specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1ABA94 + goto_if eq, EventScript_1ABA94 msgbox Text_188465, 6 end @@ -6681,7 +6590,7 @@ Route21_South_EventScript_1ABAAB:: @ 81ABAAB trainerbattle 0, TRAINER_SWIMMER_MALE_JACK, 0, Text_1884D4, Text_1884F0 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1ABAD2 + goto_if eq, EventScript_1ABAD2 msgbox Text_1884FF, 6 end @@ -6694,7 +6603,7 @@ Route21_South_EventScript_1ABAE9:: @ 81ABAE9 trainerbattle 0, TRAINER_SWIMMER_MALE_JEROME, 0, Text_18851F, Text_188543 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1ABB10 + goto_if eq, EventScript_1ABB10 msgbox Text_188555, 6 end @@ -6707,7 +6616,7 @@ Route21_South_EventScript_1ABB27:: @ 81ABB27 trainerbattle 0, TRAINER_SWIMMER_MALE_ROLAND, 0, Text_188592, Text_1885B2 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1ABB4E + goto_if eq, EventScript_1ABB4E msgbox Text_1885BF, 6 end @@ -6720,7 +6629,7 @@ Route21_North_EventScript_1ABB65:: @ 81ABB65 trainerbattle 4, TRAINER_SIS_AND_BRO_LIL_IAN, 0, Text_1886E2, Text_188712, Text_18875E specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1ABB90 + goto_if eq, EventScript_1ABB90 msgbox Text_188734, 6 end @@ -6733,7 +6642,7 @@ Route21_North_EventScript_1ABBAB:: @ 81ABBAB trainerbattle 4, TRAINER_SIS_AND_BRO_LIL_IAN, 0, Text_1887B4, Text_1887F1, Text_188850 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1ABBD6 + goto_if eq, EventScript_1ABBD6 msgbox Text_188812, 6 end @@ -6746,7 +6655,7 @@ OneIsland_KindleRoad_EventScript_1ABBF1:: @ 81ABBF1 trainerbattle 0, TRAINER_SWIMMER_FEMALE_MARIA, 0, Text_18961F, Text_18964D specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1ABC18 + goto_if eq, EventScript_1ABC18 msgbox Text_189657, 6 end @@ -6759,7 +6668,7 @@ OneIsland_KindleRoad_EventScript_1ABC2F:: @ 81ABC2F trainerbattle 0, TRAINER_SWIMMER_FEMALE_ABIGAIL, 0, Text_18968C, Text_1896AC specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1ABC56 + goto_if eq, EventScript_1ABC56 msgbox Text_1896C1, 6 end @@ -6772,7 +6681,7 @@ OneIsland_KindleRoad_EventScript_1ABC6D:: @ 81ABC6D trainerbattle 0, TRAINER_SWIMMER_MALE_FINN, 0, Text_1896F9, Text_189728 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1ABC94 + goto_if eq, EventScript_1ABC94 msgbox Text_189740, 6 end @@ -6785,7 +6694,7 @@ OneIsland_KindleRoad_EventScript_1ABCAB:: @ 81ABCAB trainerbattle 0, TRAINER_SWIMMER_MALE_GARRETT, 0, Text_189767, Text_1897A4 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1ABCD2 + goto_if eq, EventScript_1ABCD2 msgbox Text_1897C5, 6 end @@ -6798,7 +6707,7 @@ OneIsland_KindleRoad_EventScript_1ABCE9:: @ 81ABCE9 trainerbattle 0, TRAINER_FISHERMAN_TOMMY, 0, Text_1897FF, Text_189833 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1ABD10 + goto_if eq, EventScript_1ABD10 msgbox Text_18984B, 6 end @@ -6811,7 +6720,7 @@ OneIsland_KindleRoad_EventScript_1ABD27:: @ 81ABD27 trainerbattle 0, TRAINER_CRUSH_GIRL_SHARON, 0, Text_189883, Text_1898AB specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1ABD4E + goto_if eq, EventScript_1ABD4E msgbox Text_1898C4, 6 end @@ -6824,7 +6733,7 @@ OneIsland_KindleRoad_EventScript_1ABD65:: @ 81ABD65 trainerbattle 0, TRAINER_CRUSH_GIRL_TANYA, 0, Text_1898F0, Text_18991B specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1ABD8C + goto_if eq, EventScript_1ABD8C msgbox Text_18992C, 6 end @@ -6837,7 +6746,7 @@ OneIsland_KindleRoad_EventScript_1ABDA3:: @ 81ABDA3 trainerbattle 0, TRAINER_BLACK_BELT_SHEA, 0, Text_189950, Text_18998C specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1ABDCA + goto_if eq, EventScript_1ABDCA msgbox Text_189998, 6 end @@ -6850,7 +6759,7 @@ OneIsland_KindleRoad_EventScript_1ABDE1:: @ 81ABDE1 trainerbattle 0, TRAINER_BLACK_BELT_HUGH, 0, Text_1899CE, Text_189A0A specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1ABE08 + goto_if eq, EventScript_1ABE08 msgbox Text_189A13, 6 end @@ -6863,7 +6772,7 @@ OneIsland_KindleRoad_EventScript_1ABE1F:: @ 81ABE1F trainerbattle 0, TRAINER_CAMPER_BRYCE, 0, Text_189A53, Text_189A92 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1ABE46 + goto_if eq, EventScript_1ABE46 msgbox Text_189A9F, 6 end @@ -6876,7 +6785,7 @@ OneIsland_KindleRoad_EventScript_1ABE5D:: @ 81ABE5D trainerbattle 0, TRAINER_PICNICKER_CLAIRE, 0, Text_189ACB, Text_189B0B specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1ABE84 + goto_if eq, EventScript_1ABE84 msgbox Text_189B24, 6 end @@ -6889,7 +6798,7 @@ OneIsland_KindleRoad_EventScript_1ABE9B:: @ 81ABE9B trainerbattle 4, TRAINER_CRUSH_KIN_MIK_KIA, 0, Text_189B4D, Text_189B84, Text_189BDE specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1ABEC6 + goto_if eq, EventScript_1ABEC6 msgbox Text_189BA3, 6 end @@ -6902,7 +6811,7 @@ OneIsland_KindleRoad_EventScript_1ABEE1:: @ 81ABEE1 trainerbattle 4, TRAINER_CRUSH_KIN_MIK_KIA, 0, Text_189C33, Text_189C62, Text_189CAB specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1ABF0C + goto_if eq, EventScript_1ABF0C msgbox Text_189C7E, 6 end @@ -6915,7 +6824,7 @@ OneIsland_TreasureBeach_EventScript_1ABF27:: @ 81ABF27 trainerbattle 0, TRAINER_SWIMMER_FEMALE_AMARA, 0, Text_189D5A, Text_189D8B specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1ABF4E + goto_if eq, EventScript_1ABF4E msgbox Text_189DA3, 6 end @@ -6928,7 +6837,7 @@ ThreeIsland_BondBridge_EventScript_1ABF65:: @ 81ABF65 trainerbattle 0, TRAINER_AROMA_LADY_NIKKI, 0, Text_189E42, Text_189E72 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1ABF8C + goto_if eq, EventScript_1ABF8C msgbox Text_189E9E, 6 end @@ -6941,7 +6850,7 @@ ThreeIsland_BondBridge_EventScript_1ABFA3:: @ 81ABFA3 trainerbattle 0, TRAINER_AROMA_LADY_VIOLET, 0, Text_189ED4, Text_189EFA specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1ABFCA + goto_if eq, EventScript_1ABFCA msgbox Text_189F21, 6 end @@ -6954,7 +6863,7 @@ ThreeIsland_BondBridge_EventScript_1ABFE1:: @ 81ABFE1 trainerbattle 0, TRAINER_TUBER_AMIRA, 0, Text_189F63, Text_189F9A specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AC008 + goto_if eq, EventScript_1AC008 msgbox Text_189FA8, 6 end @@ -6967,7 +6876,7 @@ ThreeIsland_BondBridge_EventScript_1AC01F:: @ 81AC01F trainerbattle 0, TRAINER_TUBER_ALEXIS, 0, Text_189FDB, Text_189FEE specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AC046 + goto_if eq, EventScript_1AC046 msgbox Text_18A000, 6 end @@ -6980,7 +6889,7 @@ ThreeIsland_BondBridge_EventScript_1AC05D:: @ 81AC05D trainerbattle 0, TRAINER_SWIMMER_FEMALE_TISHA, 0, Text_18A01F, Text_18A053 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AC084 + goto_if eq, EventScript_1AC084 msgbox Text_18A082, 6 end @@ -6993,7 +6902,7 @@ ThreeIsland_BondBridge_EventScript_1AC09B:: @ 81AC09B trainerbattle 4, TRAINER_TWINS_JOY_MEG, 0, Text_18A0C4, Text_18A0F7, Text_18A138 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AC0C6 + goto_if eq, EventScript_1AC0C6 msgbox Text_18A106, 6 end @@ -7006,7 +6915,7 @@ ThreeIsland_BondBridge_EventScript_1AC0E1:: @ 81AC0E1 trainerbattle 4, TRAINER_TWINS_JOY_MEG, 0, Text_18A179, Text_18A1A3, Text_18A1CD specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AC10C + goto_if eq, EventScript_1AC10C msgbox Text_18A1B2, 6 end @@ -7019,7 +6928,7 @@ FiveIsland_ResortGorgeous_EventScript_1AC127:: @ 81AC127 trainerbattle 0, TRAINER_PAINTER_DAISY, 0, Text_18A3E2, Text_18A40E specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AC14E + goto_if eq, EventScript_1AC14E msgbox Text_18A430, 6 end @@ -7032,7 +6941,7 @@ FiveIsland_ResortGorgeous_EventScript_1AC165:: @ 81AC165 trainerbattle 0, TRAINER_PAINTER_CELINA, 0, Text_18A461, Text_18A49E specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AC18C + goto_if eq, EventScript_1AC18C msgbox Text_18A4C6, 6 end @@ -7045,7 +6954,7 @@ FiveIsland_ResortGorgeous_EventScript_1AC1A3:: @ 81AC1A3 trainerbattle 0, TRAINER_PAINTER_RAYNA, 0, Text_18A50E, Text_18A535 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AC1CA + goto_if eq, EventScript_1AC1CA msgbox Text_18A555, 6 end @@ -7058,7 +6967,7 @@ FiveIsland_ResortGorgeous_EventScript_1AC1E1:: @ 81AC1E1 trainerbattle 0, TRAINER_LADY_JACKI, 0, Text_18A5B9, Text_18A5EE specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AC208 + goto_if eq, EventScript_1AC208 msgbox Text_18A601, 6 end @@ -7071,7 +6980,7 @@ FiveIsland_ResortGorgeous_EventScript_1AC21F:: @ 81AC21F trainerbattle 0, TRAINER_LADY_GILLIAN, 0, Text_18A645, Text_18A67F specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AC246 + goto_if eq, EventScript_1AC246 msgbox Text_18A699, 6 end @@ -7084,7 +6993,7 @@ FiveIsland_ResortGorgeous_EventScript_1AC25D:: @ 81AC25D trainerbattle 0, TRAINER_YOUNGSTER_DESTIN, 0, Text_18A6DA, Text_18A6FE specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AC284 + goto_if eq, EventScript_1AC284 msgbox Text_18A715, 6 end @@ -7097,7 +7006,7 @@ FiveIsland_ResortGorgeous_EventScript_1AC29B:: @ 81AC29B trainerbattle 0, TRAINER_SWIMMER_MALE_TOBY, 0, Text_18A74A, Text_18A786 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AC2C2 + goto_if eq, EventScript_1AC2C2 msgbox Text_18A7AC, 6 end @@ -7110,7 +7019,7 @@ FiveIsland_WaterLabyrinth_EventScript_1AC2D9:: @ 81AC2D9 trainerbattle 0, TRAINER_PKMN_BREEDER_ALIZE, 0, Text_18AAD5, Text_18AB0B specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AC300 + goto_if eq, EventScript_1AC300 msgbox Text_18AB37, 6 end @@ -7123,7 +7032,7 @@ FiveIsland_MemorialPillar_EventScript_1AC317:: @ 81AC317 trainerbattle 0, TRAINER_BIRD_KEEPER_MILO, 0, Text_18AE50, Text_18AEA8 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AC33E + goto_if eq, EventScript_1AC33E msgbox Text_18AEB6, 6 end @@ -7136,7 +7045,7 @@ FiveIsland_MemorialPillar_EventScript_1AC355:: @ 81AC355 trainerbattle 0, TRAINER_BIRD_KEEPER_CHAZ, 0, Text_18AEDC, Text_18AF39 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AC37C + goto_if eq, EventScript_1AC37C msgbox Text_18AF45, 6 end @@ -7149,7 +7058,7 @@ FiveIsland_MemorialPillar_EventScript_1AC393:: @ 81AC393 trainerbattle 0, TRAINER_BIRD_KEEPER_HAROLD, 0, Text_18AF72, Text_18AFCC specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AC3BA + goto_if eq, EventScript_1AC3BA msgbox Text_18AFF2, 6 end @@ -7162,7 +7071,7 @@ SixIsland_OutcastIsland_EventScript_1AC3D1:: @ 81AC3D1 trainerbattle 0, TRAINER_FISHERMAN_TYLOR, 0, Text_18B400, Text_18B43B specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AC3F8 + goto_if eq, EventScript_1AC3F8 msgbox Text_18B451, 6 end @@ -7175,7 +7084,7 @@ SixIsland_OutcastIsland_EventScript_1AC40F:: @ 81AC40F trainerbattle 0, TRAINER_SWIMMER_MALE_MYMO, 0, Text_18B48F, Text_18B4C5 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AC436 + goto_if eq, EventScript_1AC436 msgbox Text_18B4D1, 6 end @@ -7188,7 +7097,7 @@ SixIsland_OutcastIsland_EventScript_1AC44D:: @ 81AC44D trainerbattle 0, TRAINER_SWIMMER_FEMALE_NICOLE, 0, Text_18B4FA, Text_18B539 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AC474 + goto_if eq, EventScript_1AC474 msgbox Text_18B573, 6 end @@ -7201,7 +7110,7 @@ SixIsland_OutcastIsland_EventScript_1AC48B:: @ 81AC48B trainerbattle 4, TRAINER_SIS_AND_BRO_AVA_GEB, 0, Text_18B5C8, Text_18B5F4, Text_18B660 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AC4B6 + goto_if eq, EventScript_1AC4B6 msgbox Text_18B62E, 6 end @@ -7214,7 +7123,7 @@ SixIsland_OutcastIsland_EventScript_1AC4D1:: @ 81AC4D1 trainerbattle 4, TRAINER_SIS_AND_BRO_AVA_GEB, 0, Text_18B6C1, Text_18B6EF, Text_18B762 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AC4FC + goto_if eq, EventScript_1AC4FC msgbox Text_18B720, 6 end @@ -7227,7 +7136,7 @@ SixIsland_GreenPath_EventScript_1AC517:: @ 81AC517 trainerbattle 0, TRAINER_PSYCHIC_JACLYN, 0, Text_18B7B0, Text_18B7F0 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AC53E + goto_if eq, EventScript_1AC53E msgbox Text_18B7FD, 6 end @@ -7240,7 +7149,7 @@ SixIsland_WaterPath_EventScript_1AC555:: @ 81AC555 trainerbattle 0, TRAINER_AROMA_LADY_ROSE, 0, Text_18B896, Text_18B8C8 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AC57C + goto_if eq, EventScript_1AC57C msgbox Text_18B8F7, 6 end @@ -7253,7 +7162,7 @@ SixIsland_WaterPath_EventScript_1AC593:: @ 81AC593 trainerbattle 0, TRAINER_JUGGLER_EDWARD, 0, Text_18B959, Text_18B988 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AC5BA + goto_if eq, EventScript_1AC5BA msgbox Text_18B9A5, 6 end @@ -7266,7 +7175,7 @@ SixIsland_WaterPath_EventScript_1AC5D1:: @ 81AC5D1 trainerbattle 0, TRAINER_SWIMMER_MALE_SAMIR, 0, Text_18B9EC, Text_18BA47 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AC5F8 + goto_if eq, EventScript_1AC5F8 msgbox Text_18BA57, 6 end @@ -7279,7 +7188,7 @@ SixIsland_WaterPath_EventScript_1AC60F:: @ 81AC60F trainerbattle 0, TRAINER_SWIMMER_FEMALE_DENISE, 0, Text_18BA86, Text_18BAC0 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AC636 + goto_if eq, EventScript_1AC636 msgbox Text_18BAE0, 6 end @@ -7292,7 +7201,7 @@ SixIsland_WaterPath_EventScript_1AC64D:: @ 81AC64D trainerbattle 4, TRAINER_TWINS_MIU_MIA, 0, Text_18BBBA, Text_18BBE2, Text_18BC24 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AC678 + goto_if eq, EventScript_1AC678 msgbox Text_18BBF6, 6 end @@ -7305,7 +7214,7 @@ SixIsland_WaterPath_EventScript_1AC693:: @ 81AC693 trainerbattle 4, TRAINER_TWINS_MIU_MIA, 0, Text_18BC5A, Text_18BC84, Text_18BCCF specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AC6BE + goto_if eq, EventScript_1AC6BE msgbox Text_18BCAE, 6 end @@ -7318,7 +7227,7 @@ SixIsland_WaterPath_EventScript_1AC6D9:: @ 81AC6D9 trainerbattle 0, TRAINER_HIKER_EARL, 0, Text_18BB2D, Text_18BB62 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AC700 + goto_if eq, EventScript_1AC700 msgbox Text_18BB8B, 6 end @@ -7331,7 +7240,7 @@ SixIsland_RuinValley_EventScript_1AC717:: @ 81AC717 trainerbattle 0, TRAINER_RUIN_MANIAC_STANLY, 0, Text_18BE5D, Text_18BE9B specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AC73E + goto_if eq, EventScript_1AC73E msgbox Text_18BEA0, 6 end @@ -7344,7 +7253,7 @@ SixIsland_RuinValley_EventScript_1AC755:: @ 81AC755 trainerbattle 0, TRAINER_RUIN_MANIAC_FOSTER, 0, Text_18BF05, Text_18BF33 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AC77C + goto_if eq, EventScript_1AC77C msgbox Text_18BF6C, 6 end @@ -7357,7 +7266,7 @@ SixIsland_RuinValley_EventScript_1AC793:: @ 81AC793 trainerbattle 0, TRAINER_RUIN_MANIAC_LARRY, 0, Text_18BFC5, Text_18C03B specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AC7BA + goto_if eq, EventScript_1AC7BA msgbox Text_18C04C, 6 end @@ -7370,7 +7279,7 @@ SixIsland_RuinValley_EventScript_1AC7D1:: @ 81AC7D1 trainerbattle 0, TRAINER_HIKER_DARYL, 0, Text_18C09C, Text_18C0BB specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AC7F8 + goto_if eq, EventScript_1AC7F8 msgbox Text_18C0EA, 6 end @@ -7383,7 +7292,7 @@ SixIsland_RuinValley_EventScript_1AC80F:: @ 81AC80F trainerbattle 0, TRAINER_POKEMANIAC_HECTOR, 0, Text_18C10A, Text_18C140 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AC836 + goto_if eq, EventScript_1AC836 msgbox Text_18C17A, 6 end @@ -7396,7 +7305,7 @@ SevenIsland_TrainerTower_EventScript_1AC84D:: @ 81AC84D trainerbattle 0, TRAINER_PSYCHIC_DARIO, 0, Text_18C1ED, Text_18C205 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AC874 + goto_if eq, EventScript_1AC874 msgbox Text_18C20E, 6 end @@ -7409,7 +7318,7 @@ SevenIsland_TrainerTower_EventScript_1AC88B:: @ 81AC88B trainerbattle 0, TRAINER_PSYCHIC_RODETTE, 0, Text_18C283, Text_18C2BC specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AC8B2 + goto_if eq, EventScript_1AC8B2 msgbox Text_18C2D5, 6 end @@ -7422,7 +7331,7 @@ SevenIsland_SevaultCanyon_Entrance_EventScript_1AC8C9:: @ 81AC8C9 trainerbattle 0, TRAINER_AROMA_LADY_MIAH, 0, Text_18C3BC, Text_18C3E7 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AC8F0 + goto_if eq, EventScript_1AC8F0 msgbox Text_18C3FF, 6 end @@ -7435,7 +7344,7 @@ SevenIsland_SevaultCanyon_Entrance_EventScript_1AC907:: @ 81AC907 trainerbattle 4, TRAINER_YOUNG_COUPLE_EVE_JON, 0, Text_18C632, Text_18C662, Text_18C6AB specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AC932 + goto_if eq, EventScript_1AC932 msgbox Text_18C683, 6 end @@ -7448,7 +7357,7 @@ SevenIsland_SevaultCanyon_Entrance_EventScript_1AC94D:: @ 81AC94D trainerbattle 4, TRAINER_YOUNG_COUPLE_EVE_JON, 0, Text_18C700, Text_18C73B, Text_18C7BD specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AC978 + goto_if eq, EventScript_1AC978 msgbox Text_18C773, 6 end @@ -7461,7 +7370,7 @@ SevenIsland_SevaultCanyon_Entrance_EventScript_1AC993:: @ 81AC993 trainerbattle 0, TRAINER_JUGGLER_MASON, 0, Text_18C44B, Text_18C473 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AC9BA + goto_if eq, EventScript_1AC9BA msgbox Text_18C4BA, 6 end @@ -7474,7 +7383,7 @@ SevenIsland_SevaultCanyon_Entrance_EventScript_1AC9D1:: @ 81AC9D1 trainerbattle 0, TRAINER_PKMN_RANGER_NICOLAS, 0, Text_18C500, Text_18C543 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AC9F8 + goto_if eq, EventScript_1AC9F8 msgbox Text_18C54B, 6 end @@ -7487,7 +7396,7 @@ SevenIsland_SevaultCanyon_Entrance_EventScript_1ACA0F:: @ 81ACA0F trainerbattle 0, TRAINER_PKMN_RANGER_MADELINE, 0, Text_18C5AA, Text_18C5CD specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1ACA36 + goto_if eq, EventScript_1ACA36 msgbox Text_18C5F5, 6 end @@ -7500,7 +7409,7 @@ SevenIsland_SevaultCanyon_EventScript_1ACA4D:: @ 81ACA4D trainerbattle 0, TRAINER_CRUSH_GIRL_CYNDY, 0, Text_18C887, Text_18C8A6 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1ACA74 + goto_if eq, EventScript_1ACA74 msgbox Text_18C8C2, 6 end @@ -7513,7 +7422,7 @@ SevenIsland_SevaultCanyon_EventScript_1ACA8B:: @ 81ACA8B trainerbattle 0, TRAINER_TAMER_EVAN, 0, Text_18C8FD, Text_18C980 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1ACAB2 + goto_if eq, EventScript_1ACAB2 msgbox Text_18C999, 6 end @@ -7526,7 +7435,7 @@ SevenIsland_SevaultCanyon_EventScript_1ACAC9:: @ 81ACAC9 trainerbattle 0, TRAINER_PKMN_RANGER_JACKSON, 0, Text_18CA2F, Text_18CA6F specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1ACAF0 + goto_if eq, EventScript_1ACAF0 msgbox Text_18CA9C, 6 end @@ -7539,7 +7448,7 @@ SevenIsland_SevaultCanyon_EventScript_1ACB07:: @ 81ACB07 trainerbattle 0, TRAINER_PKMN_RANGER_KATELYN, 0, Text_18CB16, Text_18CB3E specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1ACB2E + goto_if eq, EventScript_1ACB2E msgbox Text_18CB6C, 6 end @@ -7552,7 +7461,7 @@ SevenIsland_SevaultCanyon_EventScript_1ACB45:: @ 81ACB45 trainerbattle 0, TRAINER_COOLTRAINER_LEROY, 0, Text_18CBB4, Text_18CBE0 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1ACB6C + goto_if eq, EventScript_1ACB6C msgbox Text_18CC09, 6 end @@ -7565,7 +7474,7 @@ SevenIsland_SevaultCanyon_EventScript_1ACB83:: @ 81ACB83 trainerbattle 0, TRAINER_COOLTRAINER_MICHELLE, 0, Text_18CC4F, Text_18CCAE specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1ACBAA + goto_if eq, EventScript_1ACBAA msgbox Text_18CCEA, 6 end @@ -7578,7 +7487,7 @@ SevenIsland_SevaultCanyon_EventScript_1ACBC1:: @ 81ACBC1 trainerbattle 4, TRAINER_COOL_COUPLE_LEX_NYA, 0, Text_18CD49, Text_18CD75, Text_18CDE2 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1ACBEC + goto_if eq, EventScript_1ACBEC msgbox Text_18CD9C, 6 end @@ -7591,7 +7500,7 @@ SevenIsland_SevaultCanyon_EventScript_1ACC07:: @ 81ACC07 trainerbattle 4, TRAINER_COOL_COUPLE_LEX_NYA, 0, Text_18CE20, Text_18CE5A, Text_18CEF4 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1ACC32 + goto_if eq, EventScript_1ACC32 msgbox Text_18CE78, 6 end @@ -7604,7 +7513,7 @@ SevenIsland_TanobyRuins_EventScript_1ACC4D:: @ 81ACC4D trainerbattle 0, TRAINER_RUIN_MANIAC_BRANDON, 0, Text_18CFFB, Text_18D02A specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1ACC74 + goto_if eq, EventScript_1ACC74 msgbox Text_18D061, 6 end @@ -7617,7 +7526,7 @@ SevenIsland_TanobyRuins_EventScript_1ACC8B:: @ 81ACC8B trainerbattle 0, TRAINER_RUIN_MANIAC_BENJAMIN, 0, Text_18D0D9, Text_18D108 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1ACCB2 + goto_if eq, EventScript_1ACCB2 msgbox Text_18D125, 6 end @@ -7630,7 +7539,7 @@ SevenIsland_TanobyRuins_EventScript_1ACCC9:: @ 81ACCC9 trainerbattle 0, TRAINER_PAINTER_EDNA, 0, Text_18D18F, Text_18D1B5 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1ACCF0 + goto_if eq, EventScript_1ACCF0 msgbox Text_18D1E3, 6 end @@ -7643,7 +7552,7 @@ SevenIsland_TanobyRuins_EventScript_1ACD07:: @ 81ACD07 trainerbattle 0, TRAINER_GENTLEMAN_CLIFFORD, 0, Text_18D22F, Text_18D26D specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1ACD2E + goto_if eq, EventScript_1ACD2E msgbox Text_18D284, 6 end @@ -7952,10 +7861,10 @@ CeladonCity_GameCorner_EventScript_1B2867:: @ 81B2867 showmoneybox 0, 0, 0 msgbox gUnknown_81B1D7D, 5 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1B2926 + goto_if eq, EventScript_1B2926 checkmoney 50, 0 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1B292B + goto_if eq, EventScript_1B292B playse SE_SHOP takemoney 50, 0 updatemoneybox 0, 0, 0 @@ -7963,15 +7872,11 @@ CeladonCity_GameCorner_EventScript_1B2867:: @ 81B2867 message gUnknown_81B1E24 waitmessage multichoice 21, 0, 2, 1 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1B28DB - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1B28E6 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1B28F1 - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_1B28FC + switch VAR_RESULT + case 0, EventScript_1B28DB + case 1, EventScript_1B28E6 + case 2, EventScript_1B28F1 + case 3, EventScript_1B28FC end EventScript_1B28DB:: @ 81B28DB @@ -8035,9 +7940,9 @@ FourIsland_House2_EventScript_1B2938:: @ 81B2938 lock specialvar VAR_0x8008, sub_80CC3CC checkflag FLAG_0x290 - goto_if 0, EventScript_1B2951 + goto_if lt, EventScript_1B2951 checkflag FLAG_0x290 - goto_if 1, EventScript_1B2994 + goto_if eq, EventScript_1B2994 end EventScript_1B2951:: @ 81B2951 @@ -8051,7 +7956,7 @@ EventScript_1B2951:: @ 81B2951 applymovement 1, Movement_1A75DD waitmovement 0 compare_var_to_value VAR_0x8008, 0 - goto_if 1, EventScript_1B2B8E + goto_if eq, EventScript_1B2B8E message gUnknown_81B1EF8 waitmessage goto EventScript_1B29D0 @@ -8064,10 +7969,10 @@ EventScript_1B2994:: @ 81B2994 waitmovement 0 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 special sub_8112364 compare_var_to_value VAR_0x8008, 0 - goto_if 1, EventScript_1B29C6 + goto_if eq, EventScript_1B29C6 message gUnknown_81B2025 waitmessage goto EventScript_1B29D0 @@ -8081,108 +7986,75 @@ EventScript_1B29C6:: @ 81B29C6 end EventScript_1B29D0:: @ 81B29D0 - copyvar VAR_0x8000, VAR_0x8008 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1B2A23 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1B2A4F - compare_var_to_value VAR_0x8000, 4 - goto_if 1, EventScript_1B2A7B - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_1B2AA7 - compare_var_to_value VAR_0x8000, 5 - goto_if 1, EventScript_1B2ADE - compare_var_to_value VAR_0x8000, 6 - goto_if 1, EventScript_1B2B15 - compare_var_to_value VAR_0x8000, 7 - goto_if 1, EventScript_1B2B4C + switch VAR_0x8008 + case 1, EventScript_1B2A23 + case 2, EventScript_1B2A4F + case 4, EventScript_1B2A7B + case 3, EventScript_1B2AA7 + case 5, EventScript_1B2ADE + case 6, EventScript_1B2B15 + case 7, EventScript_1B2B4C end EventScript_1B2A23:: @ 81B2A23 multichoice 15, 8, 3, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1B2B98 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1B2DF6 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_1B2DF6 + switch VAR_RESULT + case 0, EventScript_1B2B98 + case 1, EventScript_1B2DF6 + case 127, EventScript_1B2DF6 end EventScript_1B2A4F:: @ 81B2A4F multichoice 16, 8, 4, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1B2C62 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1B2DF6 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_1B2DF6 + switch VAR_RESULT + case 0, EventScript_1B2C62 + case 1, EventScript_1B2DF6 + case 127, EventScript_1B2DF6 end EventScript_1B2A7B:: @ 81B2A7B multichoice 15, 8, 5, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1B2D2C - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1B2DF6 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_1B2DF6 + switch VAR_RESULT + case 0, EventScript_1B2D2C + case 1, EventScript_1B2DF6 + case 127, EventScript_1B2DF6 end EventScript_1B2AA7:: @ 81B2AA7 multichoice 15, 6, 6, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1B2B98 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1B2C62 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1B2DF6 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_1B2DF6 + switch VAR_RESULT + case 0, EventScript_1B2B98 + case 1, EventScript_1B2C62 + case 2, EventScript_1B2DF6 + case 127, EventScript_1B2DF6 end EventScript_1B2ADE:: @ 81B2ADE multichoice 15, 6, 7, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1B2B98 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1B2D2C - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1B2DF6 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_1B2DF6 + switch VAR_RESULT + case 0, EventScript_1B2B98 + case 1, EventScript_1B2D2C + case 2, EventScript_1B2DF6 + case 127, EventScript_1B2DF6 end EventScript_1B2B15:: @ 81B2B15 multichoice 15, 6, 8, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1B2C62 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1B2D2C - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1B2DF6 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_1B2DF6 + switch VAR_RESULT + case 0, EventScript_1B2C62 + case 1, EventScript_1B2D2C + case 2, EventScript_1B2DF6 + case 127, EventScript_1B2DF6 end EventScript_1B2B4C:: @ 81B2B4C multichoice 15, 5, 9, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1B2B98 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1B2C62 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1B2D2C - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_1B2DF6 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_1B2DF6 + switch VAR_RESULT + case 0, EventScript_1B2B98 + case 1, EventScript_1B2C62 + case 2, EventScript_1B2D2C + case 3, EventScript_1B2DF6 + case 127, EventScript_1B2DF6 end EventScript_1B2B8E:: @ 81B2B8E @@ -8192,18 +8064,18 @@ EventScript_1B2B8E:: @ 81B2B8E EventScript_1B2B98:: @ 81B2B98 compare_var_to_value VAR_0x8004, 39 - goto_if 3, EventScript_1B2BC5 + goto_if le, EventScript_1B2BC5 compare_var_to_value VAR_0x8004, 99 - goto_if 3, EventScript_1B2BE3 + goto_if le, EventScript_1B2BE3 compare_var_to_value VAR_0x8004, 199 - goto_if 3, EventScript_1B2C01 + goto_if le, EventScript_1B2C01 compare_var_to_value VAR_0x8004, 200 - goto_if 4, EventScript_1B2C1F + goto_if ge, EventScript_1B2C1F end EventScript_1B2BC5:: @ 81B2BC5 compare_var_to_value VAR_BIRCH_STATE, 1 - goto_if 1, EventScript_1B2C3D + goto_if eq, EventScript_1B2C3D setvar VAR_BIRCH_STATE, 1 msgbox gUnknown_81B206E goto EventScript_1B2C51 @@ -8213,7 +8085,7 @@ EventScript_1B2BE2:: @ 81B2BE2 EventScript_1B2BE3:: @ 81B2BE3 compare_var_to_value VAR_BIRCH_STATE, 2 - goto_if 1, EventScript_1B2C3D + goto_if eq, EventScript_1B2C3D setvar VAR_BIRCH_STATE, 2 msgbox gUnknown_81B20CF goto EventScript_1B2C51 @@ -8223,7 +8095,7 @@ EventScript_1B2C00:: @ 81B2C00 EventScript_1B2C01:: @ 81B2C01 compare_var_to_value VAR_BIRCH_STATE, 3 - goto_if 1, EventScript_1B2C3D + goto_if eq, EventScript_1B2C3D setvar VAR_BIRCH_STATE, 3 msgbox gUnknown_81B2133 goto EventScript_1B2C51 @@ -8233,7 +8105,7 @@ EventScript_1B2C1E:: @ 81B2C1E EventScript_1B2C1F:: @ 81B2C1F compare_var_to_value VAR_BIRCH_STATE, 4 - goto_if 1, EventScript_1B2C47 + goto_if eq, EventScript_1B2C47 setvar VAR_BIRCH_STATE, 4 msgbox gUnknown_81B21C4 goto EventScript_1B2C51 @@ -8263,18 +8135,18 @@ EventScript_1B2C51:: @ 81B2C51 EventScript_1B2C62:: @ 81B2C62 compare_var_to_value VAR_0x8005, 99 - goto_if 3, EventScript_1B2C8F + goto_if le, EventScript_1B2C8F compare_var_to_value VAR_0x8005, 199 - goto_if 3, EventScript_1B2CAD + goto_if le, EventScript_1B2CAD compare_var_to_value VAR_0x8005, 299 - goto_if 3, EventScript_1B2CCB + goto_if le, EventScript_1B2CCB compare_var_to_value VAR_0x8005, 300 - goto_if 4, EventScript_1B2CE9 + goto_if ge, EventScript_1B2CE9 end EventScript_1B2C8F:: @ 81B2C8F compare_var_to_value VAR_CRUISE_STEP_COUNT, 1 - goto_if 1, EventScript_1B2D07 + goto_if eq, EventScript_1B2D07 setvar VAR_CRUISE_STEP_COUNT, 1 msgbox gUnknown_81B2308 goto EventScript_1B2D1B @@ -8284,7 +8156,7 @@ EventScript_1B2CAC:: @ 81B2CAC EventScript_1B2CAD:: @ 81B2CAD compare_var_to_value VAR_CRUISE_STEP_COUNT, 2 - goto_if 1, EventScript_1B2D07 + goto_if eq, EventScript_1B2D07 setvar VAR_CRUISE_STEP_COUNT, 2 msgbox gUnknown_81B2372 goto EventScript_1B2D1B @@ -8294,7 +8166,7 @@ EventScript_1B2CCA:: @ 81B2CCA EventScript_1B2CCB:: @ 81B2CCB compare_var_to_value VAR_CRUISE_STEP_COUNT, 3 - goto_if 1, EventScript_1B2D07 + goto_if eq, EventScript_1B2D07 setvar VAR_CRUISE_STEP_COUNT, 3 msgbox gUnknown_81B23E0 goto EventScript_1B2D1B @@ -8304,7 +8176,7 @@ EventScript_1B2CE8:: @ 81B2CE8 EventScript_1B2CE9:: @ 81B2CE9 compare_var_to_value VAR_CRUISE_STEP_COUNT, 4 - goto_if 1, EventScript_1B2D11 + goto_if eq, EventScript_1B2D11 setvar VAR_CRUISE_STEP_COUNT, 4 msgbox gUnknown_81B2448 goto EventScript_1B2D1B @@ -8334,18 +8206,18 @@ EventScript_1B2D1B:: @ 81B2D1B EventScript_1B2D2C:: @ 81B2D2C compare_var_to_value VAR_0x8006, 19 - goto_if 3, EventScript_1B2D59 + goto_if le, EventScript_1B2D59 compare_var_to_value VAR_0x8006, 49 - goto_if 3, EventScript_1B2D77 + goto_if le, EventScript_1B2D77 compare_var_to_value VAR_0x8006, 99 - goto_if 3, EventScript_1B2D95 + goto_if le, EventScript_1B2D95 compare_var_to_value VAR_0x8006, 100 - goto_if 4, EventScript_1B2DB3 + goto_if ge, EventScript_1B2DB3 end EventScript_1B2D59:: @ 81B2D59 compare_var_to_value VAR_POKELOT_RND1, 1 - goto_if 1, EventScript_1B2DD1 + goto_if eq, EventScript_1B2DD1 setvar VAR_POKELOT_RND1, 1 msgbox gUnknown_81B25A7 goto EventScript_1B2DE5 @@ -8355,7 +8227,7 @@ EventScript_1B2D76:: @ 81B2D76 EventScript_1B2D77:: @ 81B2D77 compare_var_to_value VAR_POKELOT_RND1, 2 - goto_if 1, EventScript_1B2DD1 + goto_if eq, EventScript_1B2DD1 setvar VAR_POKELOT_RND1, 2 msgbox gUnknown_81B2609 goto EventScript_1B2DE5 @@ -8365,7 +8237,7 @@ EventScript_1B2D94:: @ 81B2D94 EventScript_1B2D95:: @ 81B2D95 compare_var_to_value VAR_POKELOT_RND1, 3 - goto_if 1, EventScript_1B2DD1 + goto_if eq, EventScript_1B2DD1 setvar VAR_POKELOT_RND1, 3 msgbox gUnknown_81B267B goto EventScript_1B2DE5 @@ -8375,7 +8247,7 @@ EventScript_1B2DB2:: @ 81B2DB2 EventScript_1B2DB3:: @ 81B2DB3 compare_var_to_value VAR_POKELOT_RND1, 4 - goto_if 1, EventScript_1B2DDB + goto_if eq, EventScript_1B2DDB setvar VAR_POKELOT_RND1, 4 msgbox gUnknown_81B26F6 goto EventScript_1B2DE5 @@ -8434,7 +8306,7 @@ ViridianCity_PokemonCenter_2F_MapScript4_1BB1B4:: @ 81BB1B4 EventScript_1BB1BA:: @ 81BB1BA specialvar VAR_RESULT, ValidateReceivedWonderCard compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1BB1CE + goto_if eq, EventScript_1BB1CE clearflag FLAG_HIDE_MG_DELIVERYMEN return @@ -8464,7 +8336,7 @@ LavenderTown_PokemonCenter_2F_EventScript_1BB1D2:: @ 81BB1D2 ViridianCity_PokemonCenter_2F_EventScript_1BB1D2:: @ 81BB1D2 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 special sub_8112364 execram @@ -8504,7 +8376,7 @@ ViridianCity_PokemonCenter_2F_MapScript2_1BB1ED:: @ 81BB1ED EventScript_1BB227:: @ 81BB227 compare_var_to_value VAR_0x8007, 0 - goto_if 1, EventScript_1BB236 + goto_if eq, EventScript_1BB236 turnobject VAR_0x8007, 3 EventScript_1BB236: end @@ -8530,19 +8402,19 @@ TwoIsland_PokemonCenter_2F_MapScript3_1BB237:: @ 81BB237 VermilionCity_PokemonCenter_2F_MapScript3_1BB237:: @ 81BB237 ViridianCity_PokemonCenter_2F_MapScript3_1BB237:: @ 81BB237 compare_var_to_value VAR_0x406F, 1 - goto_if 1, EventScript_1BB285 + goto_if eq, EventScript_1BB285 compare_var_to_value VAR_0x406F, 2 - goto_if 1, EventScript_1BB285 + goto_if eq, EventScript_1BB285 compare_var_to_value VAR_0x406F, 5 - goto_if 1, EventScript_1BB285 + goto_if eq, EventScript_1BB285 compare_var_to_value VAR_0x406F, 3 - goto_if 1, EventScript_1BB28B + goto_if eq, EventScript_1BB28B compare_var_to_value VAR_0x406F, 6 - goto_if 1, EventScript_1BB291 + goto_if eq, EventScript_1BB291 compare_var_to_value VAR_0x406F, 7 - goto_if 1, EventScript_1BB297 + goto_if eq, EventScript_1BB297 compare_var_to_value VAR_0x406F, 8 - goto_if 1, EventScript_1BB29D + goto_if eq, EventScript_1BB29D end EventScript_1BB285:: @ 81BB285 @@ -8621,7 +8493,7 @@ EventScript_1BB315:: @ 81BB315 setvar VAR_0x406F, 0 textcolor 1 compare_var_to_value VAR_0x8007, 0 - goto_if 1, EventScript_1BB40A + goto_if eq, EventScript_1BB40A applymovement VAR_0x8007, Movement_1BB88F waitmovement 0 applymovement 255, Movement_1BB891 @@ -8647,7 +8519,7 @@ EventScript_1BB367:: @ 81BB367 setvar VAR_0x406F, 0 textcolor 1 compare_var_to_value VAR_0x8007, 0 - goto_if 1, EventScript_1BB40A + goto_if eq, EventScript_1BB40A applymovement 255, Movement_1BB8A0 waitmovement 0 applymovement VAR_0x8007, Movement_1BB88F @@ -8671,7 +8543,7 @@ EventScript_1BB3B4:: @ 81BB3B4 setvar VAR_0x406F, 0 textcolor 1 compare_var_to_value VAR_0x8007, 0 - goto_if 1, EventScript_1BB40A + goto_if eq, EventScript_1BB40A applymovement 255, Movement_1BB8A0 waitmovement 0 applymovement VAR_0x8007, Movement_1BB88F @@ -8731,15 +8603,11 @@ EventScript_1BB459:: @ 81BB459 EventScript_1BB467:: @ 81BB467 setvar VAR_0x8004, 0 multichoice 0, 0, 39, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1BB6AB - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1BB4A3 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1BB82F - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_1BB82F + switch VAR_RESULT + case 0, EventScript_1BB6AB + case 1, EventScript_1BB4A3 + case 2, EventScript_1BB82F + case 127, EventScript_1BB82F end EventScript_1BB4A3:: @ 81BB4A3 @@ -8753,19 +8621,13 @@ EventScript_1BB4AE:: @ 81BB4AE message Text_1BD338 waitmessage multichoice 0, 0, 17, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1BB50F - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1BB51A - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1BB541 - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_1BB501 - compare_var_to_value VAR_0x8000, 4 - goto_if 1, EventScript_1BB82F - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_1BB82F + switch VAR_RESULT + case 0, EventScript_1BB50F + case 1, EventScript_1BB51A + case 2, EventScript_1BB541 + case 3, EventScript_1BB501 + case 4, EventScript_1BB82F + case 127, EventScript_1BB82F end EventScript_1BB501:: @ 81BB501 @@ -8785,7 +8647,7 @@ EventScript_1BB519:: @ 81BB519 EventScript_1BB51A:: @ 81BB51A special CheckForAlivePartyMons compare_var_to_value VAR_RESULT, 0 - goto_if 5, EventScript_1BB533 + goto_if ne, EventScript_1BB533 setvar VAR_0x8004, 2 goto EventScript_1BB54C @@ -8809,7 +8671,7 @@ EventScript_1BB54B:: @ 81BB54B EventScript_1BB54C:: @ 81BB54C call EventScript_1A4EAF compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1BB82F + goto_if eq, EventScript_1BB82F message gUnknown_81BC4AC waitmessage special HelpSystem_Disable @@ -8818,17 +8680,17 @@ EventScript_1BB54C:: @ 81BB54C waitstate call EventScript_1A6675 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1BB5B3 + goto_if eq, EventScript_1BB5B3 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1BB80F + goto_if eq, EventScript_1BB80F compare_var_to_value VAR_RESULT, 3 - goto_if 1, EventScript_1BB81F + goto_if eq, EventScript_1BB81F compare_var_to_value VAR_RESULT, 4 - goto_if 1, EventScript_1BB63C + goto_if eq, EventScript_1BB63C compare_var_to_value VAR_RESULT, 5 - goto_if 1, EventScript_1BB82F + goto_if eq, EventScript_1BB82F compare_var_to_value VAR_RESULT, 6 - goto_if 1, EventScript_1BB7FF + goto_if eq, EventScript_1BB7FF end EventScript_1BB5B3:: @ 81BB5B3 @@ -8856,7 +8718,7 @@ EventScript_1BB5B3:: @ 81BB5B3 waitdooranim release compare_var_to_value VAR_0x8004, 5 - goto_if 1, EventScript_1BB62C + goto_if eq, EventScript_1BB62C special SetCableClubWarp warp MAP_UNKNOWN_MAP_00_00, 255, 6, 8 special sub_807E654 @@ -8876,13 +8738,10 @@ EventScript_1BB62C:: @ 81BB62C end EventScript_1BB63C:: @ 81BB63C - copyvar VAR_0x8000, VAR_0x8004 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1BB68A - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1BB679 - compare_var_to_value VAR_0x8000, 5 - goto_if 1, EventScript_1BB668 + switch VAR_0x8004 + case 1, EventScript_1BB68A + case 2, EventScript_1BB679 + case 5, EventScript_1BB668 goto EventScript_1BB857 EventScript_1BB667:: @ 81BB667 @@ -8923,10 +8782,10 @@ EventScript_1BB6AB:: @ 81BB6AB copyvar VAR_0x8007, VAR_LAST_TALKED call EventScript_1BB79C compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1BB82F + goto_if eq, EventScript_1BB82F call EventScript_1A4EAF compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1BB82F + goto_if eq, EventScript_1BB82F message gUnknown_81BC4AC waitmessage special HelpSystem_Disable @@ -8935,21 +8794,21 @@ EventScript_1BB6AB:: @ 81BB6AB waitstate call EventScript_1A6675 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1BB73D + goto_if eq, EventScript_1BB73D compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1BB80F + goto_if eq, EventScript_1BB80F compare_var_to_value VAR_RESULT, 3 - goto_if 1, EventScript_1BB81F + goto_if eq, EventScript_1BB81F compare_var_to_value VAR_RESULT, 4 - goto_if 1, EventScript_1BB857 + goto_if eq, EventScript_1BB857 compare_var_to_value VAR_RESULT, 5 - goto_if 1, EventScript_1BB82F + goto_if eq, EventScript_1BB82F compare_var_to_value VAR_RESULT, 6 - goto_if 1, EventScript_1BB7FF + goto_if eq, EventScript_1BB7FF compare_var_to_value VAR_RESULT, 7 - goto_if 1, EventScript_1BB7DF + goto_if eq, EventScript_1BB7DF compare_var_to_value VAR_RESULT, 9 - goto_if 1, EventScript_1BB7EF + goto_if eq, EventScript_1BB7EF end EventScript_1BB73D:: @ 81BB73D @@ -8983,10 +8842,10 @@ EventScript_1BB73D:: @ 81BB73D EventScript_1BB79C:: @ 81BB79C specialvar VAR_RESULT, CalculatePlayerPartyCount compare_var_to_value VAR_RESULT, 2 - goto_if 0, EventScript_1BB7C2 + goto_if lt, EventScript_1BB7C2 specialvar VAR_RESULT, GetNameOfEnigmaBerryInPlayerParty compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1BB7D0 + goto_if eq, EventScript_1BB7D0 setvar VAR_RESULT, 1 return @@ -9133,7 +8992,7 @@ Movement_1BB8A2:: @ 81BB8A2 gUnknown_81BB8A7:: @ 81BB8A7 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 lockall fadescreen 1 setvar VAR_0x8004, 0 @@ -9164,7 +9023,7 @@ UnknownMap_00_03_EventScript_1BB8DB:: @ 81BB8DB special sub_80A0334 waitstate compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1BB94F + goto_if eq, EventScript_1BB94F setvar VAR_0x8005, 0 textcolor 3 special sub_80819C8 @@ -9177,7 +9036,7 @@ UnknownMap_00_03_EventScript_1BB8F8:: @ 81BB8F8 special sub_80A0334 waitstate compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1BB94F + goto_if eq, EventScript_1BB94F setvar VAR_0x8005, 1 textcolor 3 special sub_80819C8 @@ -9190,7 +9049,7 @@ UnknownMap_00_03_EventScript_1BB915:: @ 81BB915 special sub_80A0334 waitstate compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1BB94F + goto_if eq, EventScript_1BB94F setvar VAR_0x8005, 2 textcolor 3 special sub_80819C8 @@ -9203,7 +9062,7 @@ UnknownMap_00_03_EventScript_1BB932:: @ 81BB932 special sub_80A0334 waitstate compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1BB94F + goto_if eq, EventScript_1BB94F setvar VAR_0x8005, 3 textcolor 3 special sub_80819C8 @@ -9292,7 +9151,7 @@ gUnknown_81BB9D4:: @ 81BB9D4 textcolor 3 msgbox gUnknown_81BC7A1, 5 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1BB9F0 + goto_if eq, EventScript_1BB9F0 erasebox 0, 0, 29, 19 releaseall end @@ -9313,19 +9172,19 @@ gUnknown_81BB9FC:: @ 81BB9FC EventScript_1BBA04:: @ 81BBA04 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 special sub_8112364 lock faceplayer checkflag FLAG_SYS_POKEDEX_GET - goto_if 0, EventScript_1BB877 + goto_if lt, EventScript_1BB877 specialvar VAR_RESULT, sub_80CD034 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1BB867 + goto_if eq, EventScript_1BB867 copyvar VAR_0x8007, VAR_LAST_TALKED specialvar VAR_RESULT, IsWirelessAdapterConnected compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1BBB60 + goto_if eq, EventScript_1BBB60 message Text_1BD65B waitmessage goto EventScript_1BBA51 @@ -9335,15 +9194,11 @@ EventScript_1BBA50:: @ 81BBA50 EventScript_1BBA51:: @ 81BBA51 multichoice 18, 6, 16, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1BBA94 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1BB82F - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1BBA88 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_1BB82F + switch VAR_RESULT + case 0, EventScript_1BBA94 + case 1, EventScript_1BB82F + case 2, EventScript_1BBA88 + case 127, EventScript_1BB82F end EventScript_1BBA88:: @ 81BBA88 @@ -9357,10 +9212,10 @@ EventScript_1BBA93:: @ 81BBA93 EventScript_1BBA94:: @ 81BBA94 call EventScript_1BBB1E compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1BB82F + goto_if eq, EventScript_1BB82F call EventScript_1A4EAF compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1BB82F + goto_if eq, EventScript_1BB82F msgbox gUnknown_81BD86A closemessage special sp000_heal_pokemon @@ -9393,10 +9248,10 @@ EventScript_1BBA94:: @ 81BBA94 EventScript_1BBB1E:: @ 81BBB1E specialvar VAR_RESULT, CountPartyNonEggMons compare_var_to_value VAR_RESULT, 2 - goto_if 0, EventScript_1BBB44 + goto_if lt, EventScript_1BBB44 specialvar VAR_RESULT, GetNameOfEnigmaBerryInPlayerParty compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1BBB52 + goto_if eq, EventScript_1BBB52 setvar VAR_RESULT, 1 return @@ -9423,10 +9278,10 @@ EventScript_1BBB6A:: @ 81BBB6A lock faceplayer checkflag FLAG_SYS_POKEDEX_GET - goto_if 0, EventScript_1BB877 + goto_if lt, EventScript_1BB877 msgbox gUnknown_81BDB85, 5 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1BBB92 + goto_if eq, EventScript_1BBB92 msgbox gUnknown_81BDBF8 release return @@ -9439,18 +9294,18 @@ EventScript_1BBB92:: @ 81BBB92 EventScript_1BBB9C:: @ 81BBB9C special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 special sub_8112364 lock faceplayer checkflag FLAG_SYS_POKEDEX_GET - goto_if 0, EventScript_1BB877 + goto_if lt, EventScript_1BB877 specialvar VAR_RESULT, sub_80CD034 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1BB867 + goto_if eq, EventScript_1BB867 specialvar VAR_RESULT, IsWirelessAdapterConnected compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1BB44A + goto_if eq, EventScript_1BB44A message Text_1BD28D waitmessage delay 15 @@ -9461,41 +9316,32 @@ EventScript_1BBBE6:: @ 81BBBE6 EventScript_1BBBE7:: @ 81BBBE7 checkflag FLAG_0x2BB - goto_if 0, EventScript_1BBC32 + goto_if lt, EventScript_1BBC32 multichoice 0, 0, 47, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1BBC69 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1BBC97 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1BBD35 - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_1BB82F - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_1BB82F + switch VAR_RESULT + case 0, EventScript_1BBC69 + case 1, EventScript_1BBC97 + case 2, EventScript_1BBD35 + case 3, EventScript_1BB82F + case 127, EventScript_1BB82F end EventScript_1BBC32:: @ 81BBC32 multichoice 0, 0, 50, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1BBC69 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1BBC97 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1BB82F - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_1BB82F + switch VAR_RESULT + case 0, EventScript_1BBC69 + case 1, EventScript_1BBC97 + case 2, EventScript_1BB82F + case 127, EventScript_1BB82F end EventScript_1BBC69:: @ 81BBC69 msgbox gUnknown_81BD317, 5 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1BB82F + goto_if eq, EventScript_1BB82F call EventScript_1BB79C compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1BB82F + goto_if eq, EventScript_1BB82F setvar VAR_0x8004, 3 goto EventScript_1BBD6F @@ -9506,19 +9352,13 @@ EventScript_1BBC97:: @ 81BBC97 message Text_1BD338 waitmessage multichoice 0, 0, 17, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1BBCEA - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1BBCF5 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1BBD1C - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_1BBD27 - compare_var_to_value VAR_0x8000, 4 - goto_if 1, EventScript_1BB82F - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_1BB82F + switch VAR_RESULT + case 0, EventScript_1BBCEA + case 1, EventScript_1BBCF5 + case 2, EventScript_1BBD1C + case 3, EventScript_1BBD27 + case 4, EventScript_1BB82F + case 127, EventScript_1BB82F end EventScript_1BBCEA:: @ 81BBCEA @@ -9531,7 +9371,7 @@ EventScript_1BBCF4:: @ 81BBCF4 EventScript_1BBCF5:: @ 81BBCF5 special CheckForAlivePartyMons compare_var_to_value VAR_RESULT, 0 - goto_if 5, EventScript_1BBD0E + goto_if ne, EventScript_1BBD0E setvar VAR_0x8004, 1 goto EventScript_1BBD6F @@ -9562,10 +9402,10 @@ EventScript_1BBD34:: @ 81BBD34 EventScript_1BBD35:: @ 81BBD35 msgbox gUnknown_81BD362, 5 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1BB82F + goto_if eq, EventScript_1BB82F special CheckHasAtLeastOneBerry compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1BBD61 + goto_if eq, EventScript_1BBD61 setvar VAR_0x8004, 5 goto EventScript_1BBD6F @@ -9582,18 +9422,13 @@ EventScript_1BBD6E:: @ 81BBD6E EventScript_1BBD6F:: @ 81BBD6F call EventScript_1A4EAF compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1BB82F - copyvar VAR_0x8000, VAR_0x8004 - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_1BBDBC - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1BBDBC - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1BBDBC - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1BBE50 - compare_var_to_value VAR_0x8000, 5 - goto_if 1, EventScript_1BBEE4 + goto_if eq, EventScript_1BB82F + switch VAR_0x8004 + case 3, EventScript_1BBDBC + case 0, EventScript_1BBDBC + case 1, EventScript_1BBDBC + case 2, EventScript_1BBE50 + case 5, EventScript_1BBEE4 end EventScript_1BBDBC:: @ 81BBDBC @@ -9602,36 +9437,32 @@ EventScript_1BBDBC:: @ 81BBDBC waitmessage call EventScript_1A6675 multichoice 13, 6, 63, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1BBE28 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1BBE00 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1BB82F - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_1BB82F + switch VAR_RESULT + case 0, EventScript_1BBE28 + case 1, EventScript_1BBE00 + case 2, EventScript_1BB82F + case 127, EventScript_1BB82F end EventScript_1BBE00:: @ 81BBE00 call EventScript_1BBF78 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1BBF88 + goto_if eq, EventScript_1BBF88 compare_var_to_value VAR_RESULT, 5 - goto_if 1, EventScript_1BBDBC + goto_if eq, EventScript_1BBDBC compare_var_to_value VAR_RESULT, 8 - goto_if 1, EventScript_1BBE00 + goto_if eq, EventScript_1BBE00 release return EventScript_1BBE28:: @ 81BBE28 call EventScript_1BBF80 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1BBF88 + goto_if eq, EventScript_1BBF88 compare_var_to_value VAR_RESULT, 5 - goto_if 1, EventScript_1BBDBC + goto_if eq, EventScript_1BBDBC compare_var_to_value VAR_RESULT, 8 - goto_if 1, EventScript_1BBE28 + goto_if eq, EventScript_1BBE28 release return @@ -9641,36 +9472,32 @@ EventScript_1BBE50:: @ 81BBE50 waitmessage call EventScript_1A6675 multichoice 13, 6, 63, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1BBEBC - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1BBE94 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1BB82F - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_1BB82F + switch VAR_RESULT + case 0, EventScript_1BBEBC + case 1, EventScript_1BBE94 + case 2, EventScript_1BB82F + case 127, EventScript_1BB82F end EventScript_1BBE94:: @ 81BBE94 call EventScript_1BBF78 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1BBF88 + goto_if eq, EventScript_1BBF88 compare_var_to_value VAR_RESULT, 5 - goto_if 1, EventScript_1BBE50 + goto_if eq, EventScript_1BBE50 compare_var_to_value VAR_RESULT, 8 - goto_if 1, EventScript_1BBE94 + goto_if eq, EventScript_1BBE94 release return EventScript_1BBEBC:: @ 81BBEBC call EventScript_1BBF80 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1BBF88 + goto_if eq, EventScript_1BBF88 compare_var_to_value VAR_RESULT, 5 - goto_if 1, EventScript_1BBE50 + goto_if eq, EventScript_1BBE50 compare_var_to_value VAR_RESULT, 8 - goto_if 1, EventScript_1BBEBC + goto_if eq, EventScript_1BBEBC release return @@ -9680,36 +9507,32 @@ EventScript_1BBEE4:: @ 81BBEE4 waitmessage call EventScript_1A6675 multichoice 13, 6, 63, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1BBF50 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1BBF28 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1BB82F - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_1BB82F + switch VAR_RESULT + case 0, EventScript_1BBF50 + case 1, EventScript_1BBF28 + case 2, EventScript_1BB82F + case 127, EventScript_1BB82F end EventScript_1BBF28:: @ 81BBF28 call EventScript_1BBF78 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1BBF88 + goto_if eq, EventScript_1BBF88 compare_var_to_value VAR_RESULT, 5 - goto_if 1, EventScript_1BBEE4 + goto_if eq, EventScript_1BBEE4 compare_var_to_value VAR_RESULT, 8 - goto_if 1, EventScript_1BBF28 + goto_if eq, EventScript_1BBF28 release return EventScript_1BBF50:: @ 81BBF50 call EventScript_1BBF80 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1BBF88 + goto_if eq, EventScript_1BBF88 compare_var_to_value VAR_RESULT, 5 - goto_if 1, EventScript_1BBEE4 + goto_if eq, EventScript_1BBEE4 compare_var_to_value VAR_RESULT, 8 - goto_if 1, EventScript_1BBF50 + goto_if eq, EventScript_1BBF50 release return @@ -9754,13 +9577,13 @@ EventScript_1BBF88:: @ 81BBF88 gUnknown_81BBFD8:: @ 81BBFD8 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 lockall checkflag FLAG_SYS_POKEDEX_GET - goto_if 0, EventScript_1BB881 + goto_if lt, EventScript_1BB881 specialvar VAR_RESULT, IsWirelessAdapterConnected compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1BC016 + goto_if eq, EventScript_1BC016 special HelpSystem_Disable fadescreen 1 special sub_814F1D4 @@ -9824,22 +9647,18 @@ ViridianCity_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C EventScript_1BC060:: @ 81BC060 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 special sub_8112364 lock faceplayer message Text_1BCCFF waitmessage multichoice 0, 0, 49, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1BC0B0 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1BC0BA - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1BC0C4 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_1BC0C4 + switch VAR_RESULT + case 0, EventScript_1BC0B0 + case 1, EventScript_1BC0BA + case 2, EventScript_1BC0C4 + case 127, EventScript_1BC0C4 end EventScript_1BC0B0:: @ 81BC0B0 @@ -9860,7 +9679,7 @@ EventScript_1BC0C4:: @ 81BC0C4 EventScript_1BC0CE:: @ 81BC0CE special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 special sub_8112364 lock faceplayer @@ -9868,37 +9687,33 @@ EventScript_1BC0CE:: @ 81BC0CE waitmessage specialvar VAR_RESULT, IsWirelessAdapterConnected compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1BC29C + goto_if eq, EventScript_1BC29C delay 60 special HelpSystem_Disable message Text_1BD02D waitmessage multichoice 0, 0, 49, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1BC13A - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1BC184 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1BB83F - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_1BB83F + switch VAR_RESULT + case 0, EventScript_1BC13A + case 1, EventScript_1BC184 + case 2, EventScript_1BB83F + case 127, EventScript_1BB83F end EventScript_1BC13A:: @ 81BC13A setvar VAR_0x8005, 0 special sub_8149A18 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1BC2A6 + goto_if eq, EventScript_1BC2A6 msgbox gUnknown_81BD059 setvar VAR_0x8005, 0 special sub_8127888 waitstate compare_var_to_value VAR_0x8004, 6 - goto_if 4, EventScript_1BB83F + goto_if ge, EventScript_1BB83F call EventScript_1A4EAF compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1BB83F + goto_if eq, EventScript_1BB83F setvar VAR_0x8004, 4 goto EventScript_1BC1CE @@ -9909,16 +9724,16 @@ EventScript_1BC184:: @ 81BC184 setvar VAR_0x8005, 1 special sub_81537C0 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1BC2A6 + goto_if eq, EventScript_1BC2A6 msgbox gUnknown_81BD059 setvar VAR_0x8005, 1 special sub_8127888 waitstate compare_var_to_value VAR_0x8004, 6 - goto_if 4, EventScript_1BB83F + goto_if ge, EventScript_1BB83F call EventScript_1A4EAF compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1BB83F + goto_if eq, EventScript_1BB83F setvar VAR_0x8004, 6 goto EventScript_1BC1CE @@ -9931,36 +9746,32 @@ EventScript_1BC1CE:: @ 81BC1CE waitmessage call EventScript_1A6675 multichoice 13, 6, 63, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1BC23A - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1BC212 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1BB83F - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_1BB83F + switch VAR_RESULT + case 0, EventScript_1BC23A + case 1, EventScript_1BC212 + case 2, EventScript_1BB83F + case 127, EventScript_1BB83F end EventScript_1BC212:: @ 81BC212 call EventScript_1BBF78 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1BC262 + goto_if eq, EventScript_1BC262 compare_var_to_value VAR_RESULT, 5 - goto_if 1, EventScript_1BC1CE + goto_if eq, EventScript_1BC1CE compare_var_to_value VAR_RESULT, 8 - goto_if 1, EventScript_1BC212 + goto_if eq, EventScript_1BC212 release return EventScript_1BC23A:: @ 81BC23A call EventScript_1BBF80 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1BC262 + goto_if eq, EventScript_1BC262 compare_var_to_value VAR_RESULT, 5 - goto_if 1, EventScript_1BC1CE + goto_if eq, EventScript_1BC1CE compare_var_to_value VAR_RESULT, 8 - goto_if 1, EventScript_1BC23A + goto_if eq, EventScript_1BC23A release return @@ -9992,11 +9803,11 @@ EventScript_1BC29C:: @ 81BC29C EventScript_1BC2A6:: @ 81BC2A6 msgbox gUnknown_81BD0CF, 5 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1BB83F + goto_if eq, EventScript_1BB83F compare_var_to_value VAR_0x8005, 0 - call_if 1, EventScript_1BC2D5 + call_if eq, EventScript_1BC2D5 compare_var_to_value VAR_0x8005, 1 - call_if 1, EventScript_1BC2DE + call_if eq, EventScript_1BC2DE goto EventScript_1BB83F EventScript_1BC2D4:: @ 81BC2D4 @@ -10013,7 +9824,7 @@ EventScript_1BC2DE:: @ 81BC2DE TwoIsland_JoyfulGameCorner_EventScript_1BC2E7:: @ 81BC2E7 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 lockall special sub_814B504 waitstate @@ -10023,7 +9834,7 @@ TwoIsland_JoyfulGameCorner_EventScript_1BC2E7:: @ 81BC2E7 TwoIsland_JoyfulGameCorner_EventScript_1BC2FC:: @ 81BC2FC special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 lockall special sub_8153810 waitstate @@ -10508,19 +10319,19 @@ CeruleanCity_EventScript_1BDF13:: @ 81BDF13 ViridianCity_EventScript_1BDF13:: @ 81BDF13 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 lockall checkflag FLAG_BADGE02_GET - goto_if 0, EventScript_1BDF87 + goto_if lt, EventScript_1BDF87 checkpartymove MOVE_CUT compare_var_to_value VAR_RESULT, 6 - goto_if 1, EventScript_1BDF87 + goto_if eq, EventScript_1BDF87 setfieldeffectarg 0, VAR_RESULT getpartymonname 0, VAR_RESULT getmovename 1, MOVE_CUT msgbox gUnknown_81BDF94, 5 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1BDF91 + goto_if eq, EventScript_1BDF91 msgbox gUnknown_81BDFD7 closemessage dofieldeffect FLDEFF_USE_CUT_ON_TREE @@ -10586,19 +10397,19 @@ CeruleanCave_B1F_EventScript_1BE00C:: @ 81BE00C CeruleanCave_1F_EventScript_1BE00C:: @ 81BE00C special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 lockall checkflag FLAG_BADGE06_GET - goto_if 0, EventScript_1BE091 + goto_if lt, EventScript_1BE091 checkpartymove MOVE_ROCK_SMASH compare_var_to_value VAR_RESULT, 6 - goto_if 1, EventScript_1BE091 + goto_if eq, EventScript_1BE091 setfieldeffectarg 0, VAR_RESULT getpartymonname 0, VAR_RESULT getmovename 1, MOVE_ROCK_SMASH msgbox Text_1BE09D, 5 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1BE09A + goto_if eq, EventScript_1BE09A msgbox gUnknown_81BDFD7 closemessage dofieldeffect FLDEFF_USE_ROCK_SMASH @@ -10619,7 +10430,7 @@ EventScript_1BE06F:: @ 81BE06F removeobject VAR_LAST_TALKED special sub_8082E54 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1BE08D + goto_if eq, EventScript_1BE08D waitstate releaseall end @@ -10667,19 +10478,19 @@ SeafoamIslands_B1F_EventScript_1BE11D:: @ 81BE11D VictoryRoad_2F_EventScript_1BE11D:: @ 81BE11D special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 lockall checkflag FLAG_BADGE04_GET - goto_if 0, EventScript_1BE185 + goto_if lt, EventScript_1BE185 checkflag FLAG_0x805 - goto_if 1, EventScript_1BE18E + goto_if eq, EventScript_1BE18E checkpartymove MOVE_STRENGTH compare_var_to_value VAR_RESULT, 6 - goto_if 1, EventScript_1BE185 + goto_if eq, EventScript_1BE185 setfieldeffectarg 0, VAR_RESULT msgbox gUnknown_81BE19A, 5 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1BE197 + goto_if eq, EventScript_1BE197 closemessage dofieldeffect FLDEFF_USE_STRENGTH waitstate @@ -10732,16 +10543,16 @@ gUnknown_81BE284:: @ 81BE284 gUnknown_81BE2B7:: @ 81BE2B7 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 lockall checkpartymove MOVE_WATERFALL compare_var_to_value VAR_RESULT, 6 - goto_if 1, EventScript_1BE300 + goto_if eq, EventScript_1BE300 getpartymonname 0, VAR_RESULT setfieldeffectarg 0, VAR_RESULT msgbox gUnknown_81BE33F, 5 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1BE308 + goto_if eq, EventScript_1BE308 msgbox gUnknown_81BE378 dofieldeffect FLDEFF_USE_WATERFALL goto EventScript_1BE308 @@ -10769,13 +10580,13 @@ EventScript_1BE38B:: @ 81BE38B lockall checkpartymove MOVE_DIVE compare_var_to_value VAR_RESULT, 6 - goto_if 1, EventScript_1BE3CA + goto_if eq, EventScript_1BE3CA getpartymonname 0, VAR_RESULT setfieldeffectarg 0, VAR_RESULT setfieldeffectarg 1, 1 msgbox gUnknown_81BE469, 5 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1BE3D2 + goto_if eq, EventScript_1BE3D2 msgbox gUnknown_81BE49B dofieldeffect FLDEFF_USE_DIVE goto EventScript_1BE3D2 @@ -10792,13 +10603,13 @@ EventScript_1BE3D4:: @ 81BE3D4 lockall checkpartymove MOVE_DIVE compare_var_to_value VAR_RESULT, 6 - goto_if 1, EventScript_1BE412 + goto_if eq, EventScript_1BE412 getpartymonname 0, VAR_RESULT setfieldeffectarg 0, VAR_RESULT setfieldeffectarg 1, 1 msgbox gUnknown_81BE4EF, 5 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1BE429 + goto_if eq, EventScript_1BE429 msgbox gUnknown_81BE49B dofieldeffect FLDEFF_USE_DIVE goto EventScript_1BE429 @@ -11521,9 +11332,9 @@ PewterCity_PokemonCenter_1F_EventScript_1BEE16:: @ 81BEE16 lock faceplayer compare_var_to_value VAR_0x4001, 1 - goto_if 1, EventScript_1BEE3A + goto_if eq, EventScript_1BEE3A checkflag 2093 - goto_if 1, EventScript_1BEECD + goto_if eq, EventScript_1BEECD msgbox Text_1BEF88 goto EventScript_1BEE44 end @@ -11537,15 +11348,11 @@ EventScript_1BEE44:: @ 81BEE44 message Text_1BF017 waitmessage multichoice 18, 6, 18, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1BEE8F - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1BEEC3 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1BEE81 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_1BEEC3 + switch VAR_RESULT + case 0, EventScript_1BEE8F + case 1, EventScript_1BEEC3 + case 2, EventScript_1BEE81 + case 127, EventScript_1BEEC3 end EventScript_1BEE81:: @ 81BEE81 @@ -11588,15 +11395,11 @@ EventScript_1BEEDB:: @ 81BEEDB message Text_1BF1FB waitmessage multichoice 18, 6, 18, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1BEF26 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1BEF35 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1BEF18 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_1BEF35 + switch VAR_RESULT + case 0, EventScript_1BEF26 + case 1, EventScript_1BEF35 + case 2, EventScript_1BEF18 + case 127, EventScript_1BEF35 end EventScript_1BEF18:: @ 81BEF18 @@ -11631,11 +11434,11 @@ EventScript_1BEF5A:: @ 81BEF5A lock faceplayer compare_var_to_value VAR_0x8004, 0 - goto_if 1, EventScript_1BEF3F + goto_if eq, EventScript_1BEF3F compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1BEE9E + goto_if eq, EventScript_1BEE9E compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1BEEA8 + goto_if eq, EventScript_1BEEA8 end Text_1BEF88:: @ 81BEF88 @@ -11709,16 +11512,16 @@ gUnknown_81BF36A:: @ 81BF36A Route5_PokemonDayCare_EventScript_1BF398:: @ 81BF398 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 lock faceplayer showmoneybox 0, 0, 0 specialvar VAR_RESULT, IsThereMonInRoute5Daycare compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1BF46E + goto_if eq, EventScript_1BF46E msgbox Text_19DD66, 5 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1BF3DD + goto_if eq, EventScript_1BF3DD msgbox Text_19DDB2 goto EventScript_1BF541 end @@ -11726,7 +11529,7 @@ Route5_PokemonDayCare_EventScript_1BF398:: @ 81BF398 EventScript_1BF3DD:: @ 81BF3DD specialvar VAR_RESULT, CountPartyNonEggMons compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1BF452 + goto_if eq, EventScript_1BF452 msgbox Text_19DDBE fadescreen 1 hidemoneybox @@ -11736,10 +11539,10 @@ EventScript_1BF3DD:: @ 81BF3DD waitstate showmoneybox 0, 0, 0 compare_var_to_value VAR_0x8004, 6 - goto_if 4, EventScript_1BF444 + goto_if ge, EventScript_1BF444 specialvar VAR_RESULT, CountPartyAliveNonEggMons_IgnoreVar0x8004Slot compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1BF460 + goto_if eq, EventScript_1BF460 specialvar VAR_0x8005, GetSelectedMonNickAndSpecies msgbox Text_19DDF9 waitse @@ -11770,13 +11573,13 @@ EventScript_1BF46E:: @ 81BF46E setvar VAR_0x8004, 0 specialvar VAR_RESULT, GetNumLevelsGainedForRoute5DaycareMon compare_var_to_value VAR_RESULT, 0 - call_if 5, EventScript_1BF4AA + call_if ne, EventScript_1BF4AA compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_1BF4B3 + call_if eq, EventScript_1BF4B3 special GetCostToWithdrawRoute5DaycareMon msgbox Text_19DE80, 5 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1BF4BC + goto_if eq, EventScript_1BF4BC goto EventScript_1BF444 end @@ -11791,10 +11594,10 @@ EventScript_1BF4B3:: @ 81BF4B3 EventScript_1BF4BC:: @ 81BF4BC specialvar VAR_RESULT, CalculatePlayerPartyCount compare_var_to_value VAR_RESULT, 6 - goto_if 1, EventScript_1BF533 + goto_if eq, EventScript_1BF533 specialvar VAR_RESULT, IsEnoughForCostInVar0x8005 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1BF4EA + goto_if eq, EventScript_1BF4EA msgbox Text_19E001 goto EventScript_1BF541 end @@ -11997,7 +11800,7 @@ EventScript_SafariRetire:: @ 81BFBAA lockall msgbox Text_1BFBE9, 5 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1BFBC0 + goto_if eq, EventScript_1BFBC0 releaseall end @@ -13656,18 +13459,18 @@ VictoryRoad_2F_EventScript_1C47AE:: @ 81C47AE lock faceplayer checkflag FLAG_0x2C0 - goto_if 1, EventScript_1C480C + goto_if eq, EventScript_1C480C msgbox Text_1749F9, 5 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C4802 + goto_if eq, EventScript_1C4802 call EventScript_1C4F37 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C4802 + goto_if eq, EventScript_1C4802 msgbox Text_174AE2 setvar VAR_0x8005, 4 call EventScript_1C4F30 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C4802 + goto_if eq, EventScript_1C4802 setflag FLAG_0x2C0 goto EventScript_1C480C end @@ -13686,18 +13489,18 @@ EventScript_1C4816:: @ 81C4816 lock faceplayer checkflag FLAG_0x2C1 - goto_if 1, EventScript_1C4874 + goto_if eq, EventScript_1C4874 msgbox Text_175711, 5 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C486A + goto_if eq, EventScript_1C486A call EventScript_1C4F37 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C486A + goto_if eq, EventScript_1C486A msgbox Text_1757C1 setvar VAR_0x8005, 11 call EventScript_1C4F30 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C486A + goto_if eq, EventScript_1C486A setflag FLAG_0x2C1 goto EventScript_1C4874 end @@ -13716,18 +13519,18 @@ RockTunnel_B1F_EventScript_1C487E:: @ 81C487E lock faceplayer checkflag FLAG_0x2C2 - goto_if 1, EventScript_1C48DC + goto_if eq, EventScript_1C48DC msgbox Text_1799E0, 5 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C48D2 + goto_if eq, EventScript_1C48D2 call EventScript_1C4F37 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C48D2 + goto_if eq, EventScript_1C48D2 msgbox Text_179AE1 setvar VAR_0x8005, 13 call EventScript_1C4F30 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C48D2 + goto_if eq, EventScript_1C48D2 setflag FLAG_0x2C2 goto EventScript_1C48DC end @@ -13746,18 +13549,18 @@ MtEmber_Exterior_EventScript_1C48E6:: @ 81C48E6 lock faceplayer checkflag FLAG_0x2C3 - goto_if 1, EventScript_1C4944 + goto_if eq, EventScript_1C4944 msgbox Text_17A642, 5 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C493A + goto_if eq, EventScript_1C493A call EventScript_1C4F37 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C493A + goto_if eq, EventScript_1C493A msgbox Text_17A717 setvar VAR_0x8005, 12 call EventScript_1C4F30 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C493A + goto_if eq, EventScript_1C493A setflag FLAG_0x2C3 goto EventScript_1C4944 end @@ -13776,18 +13579,18 @@ Route4_EventScript_1C494E:: @ 81C494E lock faceplayer checkflag FLAG_0x2C4 - goto_if 1, EventScript_1C49AC + goto_if eq, EventScript_1C49AC msgbox Text_1839D5, 5 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C49A2 + goto_if eq, EventScript_1C49A2 call EventScript_1C4F37 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C49A2 + goto_if eq, EventScript_1C49A2 msgbox Text_183ABF setvar VAR_0x8005, 0 call EventScript_1C4F30 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C49A2 + goto_if eq, EventScript_1C49A2 setflag FLAG_0x2C4 goto EventScript_1C49AC end @@ -13806,18 +13609,18 @@ Route4_EventScript_1C49B6:: @ 81C49B6 lock faceplayer checkflag FLAG_0x2C5 - goto_if 1, EventScript_1C4A14 + goto_if eq, EventScript_1C4A14 msgbox Text_183B74, 5 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C4A0A + goto_if eq, EventScript_1C4A0A call EventScript_1C4F37 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C4A0A + goto_if eq, EventScript_1C4A0A msgbox Text_183C68 setvar VAR_0x8005, 2 call EventScript_1C4F30 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C4A0A + goto_if eq, EventScript_1C4A0A setflag FLAG_0x2C5 goto EventScript_1C4A14 end @@ -13836,18 +13639,18 @@ EventScript_1C4A1E:: @ 81C4A1E lock faceplayer checkflag FLAG_0x2C6 - goto_if 1, EventScript_1C4A7C + goto_if eq, EventScript_1C4A7C msgbox Text_17E316, 5 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C4A72 + goto_if eq, EventScript_1C4A72 call EventScript_1C4F37 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C4A72 + goto_if eq, EventScript_1C4A72 msgbox Text_17E3F1 setvar VAR_0x8005, 10 call EventScript_1C4F30 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C4A72 + goto_if eq, EventScript_1C4A72 setflag FLAG_0x2C6 goto EventScript_1C4A7C end @@ -13866,18 +13669,18 @@ EventScript_1C4A86:: @ 81C4A86 lock faceplayer checkflag FLAG_0x2C7 - goto_if 1, EventScript_1C4AE4 + goto_if eq, EventScript_1C4AE4 msgbox Text_180388, 5 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C4ADA + goto_if eq, EventScript_1C4ADA call EventScript_1C4F37 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C4ADA + goto_if eq, EventScript_1C4ADA msgbox Text_180484 setvar VAR_0x8005, 9 call EventScript_1C4F30 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C4ADA + goto_if eq, EventScript_1C4ADA setflag FLAG_0x2C7 goto EventScript_1C4AE4 end @@ -13896,18 +13699,18 @@ FuchsiaCity_EventScript_1C4AEE:: @ 81C4AEE lock faceplayer checkflag FLAG_0x2C8 - goto_if 1, EventScript_1C4B4C + goto_if eq, EventScript_1C4B4C msgbox Text_180948, 5 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C4B42 + goto_if eq, EventScript_1C4B42 call EventScript_1C4F37 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C4B42 + goto_if eq, EventScript_1C4B42 msgbox Text_180A57 setvar VAR_0x8005, 14 call EventScript_1C4F30 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C4B42 + goto_if eq, EventScript_1C4B42 setflag FLAG_0x2C8 goto EventScript_1C4B4C end @@ -13926,18 +13729,18 @@ SevenIsland_EventScript_1C4B56:: @ 81C4B56 lock faceplayer checkflag FLAG_0x2C9 - goto_if 1, EventScript_1C4BB4 + goto_if eq, EventScript_1C4BB4 msgbox Text_182F01, 5 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C4BAA + goto_if eq, EventScript_1C4BAA call EventScript_1C4F37 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C4BAA + goto_if eq, EventScript_1C4BAA msgbox Text_182FD9 setvar VAR_0x8005, 1 call EventScript_1C4F30 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C4BAA + goto_if eq, EventScript_1C4BAA setflag FLAG_0x2C9 goto EventScript_1C4BB4 end @@ -13956,18 +13759,18 @@ PewterCity_Museum_1F_EventScript_1C4BBE:: @ 81C4BBE lock faceplayer checkflag FLAG_0x2CA - goto_if 1, EventScript_1C4C1C + goto_if eq, EventScript_1C4C1C msgbox Text_1909A3, 5 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C4C12 + goto_if eq, EventScript_1C4C12 call EventScript_1C4F37 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C4C12 + goto_if eq, EventScript_1C4C12 msgbox Text_190AD5 setvar VAR_0x8005, 6 call EventScript_1C4F30 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C4C12 + goto_if eq, EventScript_1C4C12 setflag FLAG_0x2CA goto EventScript_1C4C1C end @@ -13986,18 +13789,18 @@ EventScript_1C4C26:: @ 81C4C26 lock faceplayer checkflag FLAG_0x2CB - goto_if 1, EventScript_1C4C84 + goto_if eq, EventScript_1C4C84 msgbox Text_195928, 5 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C4C7A + goto_if eq, EventScript_1C4C7A call EventScript_1C4F37 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C4C7A + goto_if eq, EventScript_1C4C7A msgbox Text_195A08 setvar VAR_0x8005, 5 call EventScript_1C4F30 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C4C7A + goto_if eq, EventScript_1C4C7A setflag FLAG_0x2CB goto EventScript_1C4C84 end @@ -14016,18 +13819,18 @@ EventScript_1C4C8E:: @ 81C4C8E lock faceplayer checkflag FLAG_0x2CC - goto_if 1, EventScript_1C4CEC + goto_if eq, EventScript_1C4CEC msgbox Text_19A137, 5 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C4CE2 + goto_if eq, EventScript_1C4CE2 call EventScript_1C4F37 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C4CE2 + goto_if eq, EventScript_1C4CE2 msgbox Text_19A1EA setvar VAR_0x8005, 8 call EventScript_1C4F30 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C4CE2 + goto_if eq, EventScript_1C4CE2 setflag FLAG_0x2CC goto EventScript_1C4CEC end @@ -14044,20 +13847,20 @@ EventScript_1C4CEC:: @ 81C4CEC EventScript_1C4CF6:: @ 81C4CF6 checkflag FLAG_0x2CD - goto_if 1, EventScript_1C4D59 + goto_if eq, EventScript_1C4D59 msgbox Text_19AD85, 5 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C4D4F + goto_if eq, EventScript_1C4D4F call EventScript_1C4F37 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C4D4F + goto_if eq, EventScript_1C4D4F msgbox Text_19ADEE setvar VAR_0x8005, 7 call EventScript_1C4F30 lock faceplayer compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C4D4F + goto_if eq, EventScript_1C4D4F removeitem ITEM_POKE_DOLL, 1 setflag FLAG_0x2CD goto EventScript_1C4D59 @@ -14071,9 +13874,9 @@ EventScript_1C4D4F:: @ 81C4D4F EventScript_1C4D59:: @ 81C4D59 checkplayergender compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_1C4D72 + call_if eq, EventScript_1C4D72 compare_var_to_value VAR_RESULT, 1 - call_if 1, EventScript_1C4D7B + call_if eq, EventScript_1C4D7B release end @@ -14089,18 +13892,18 @@ FourIsland_House1_EventScript_1C4D84:: @ 81C4D84 lock faceplayer checkflag FLAG_0x2CE - goto_if 1, EventScript_1C4DE2 + goto_if eq, EventScript_1C4DE2 msgbox Text_1A3505, 5 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C4DD8 + goto_if eq, EventScript_1C4DD8 call EventScript_1C4F37 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C4DD8 + goto_if eq, EventScript_1C4DD8 msgbox Text_1A35DA setvar VAR_0x8005, 3 call EventScript_1C4F30 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C4DD8 + goto_if eq, EventScript_1C4DD8 setflag FLAG_0x2CE goto EventScript_1C4DE2 end @@ -14118,34 +13921,34 @@ EventScript_1C4DE2:: @ 81C4DE2 TwoIsland_CapeBrink_House_EventScript_1C4DEC:: @ 81C4DEC special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 special sub_8112364 lock faceplayer checkflag FLAG_0x2E1 - goto_if 1, EventScript_1C4EA1 + goto_if eq, EventScript_1C4EA1 checkflag FLAG_TEMP_2 - goto_if 1, EventScript_1C4E97 + goto_if eq, EventScript_1C4E97 getfirstpartymonname 0 msgbox Text_1A46C6 specialvar VAR_RESULT, sub_80CCB94 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C4F26 + goto_if eq, EventScript_1C4F26 copyvar VAR_0x8009, VAR_0x8005 compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_1C4EF0 + call_if eq, EventScript_1C4EF0 compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_1C4EFB + call_if eq, EventScript_1C4EFB compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_1C4F06 + call_if eq, EventScript_1C4F06 compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_1C4F11 + call_if eq, EventScript_1C4F11 msgbox Text_1A4751, 5 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C4F1C + goto_if eq, EventScript_1C4F1C call EventScript_1C4F37 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C4F1C + goto_if eq, EventScript_1C4F1C msgbox Text_1A4814 closemessage fadescreen 1 @@ -14170,7 +13973,7 @@ EventScript_1C4EAB:: @ 81C4EAB copyvar VAR_0x8005, VAR_0x8009 specialvar VAR_RESULT, sub_80CCCF8 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1C4ECD + goto_if eq, EventScript_1C4ECD msgbox Text_1A4865 setflag FLAG_TEMP_2 release @@ -14185,7 +13988,7 @@ EventScript_1C4ECD:: @ 81C4ECD EventScript_1C4EDA:: @ 81C4EDA call EventScript_1C4F30 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C4F1C + goto_if eq, EventScript_1C4F1C goto EventScript_1C4EAB end @@ -14276,13 +14079,10 @@ SevenIsland_TrainerTower_7F_MapScript2_1C4F62:: @ 81C4F62 SevenIsland_TrainerTower_8F_MapScript2_1C4F62:: @ 81C4F62 setvar VAR_0x8004, 0 special sub_815D9E8 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1C4FA7 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1C4FC5 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1C5019 + switch VAR_RESULT + case 0, EventScript_1C4FA7 + case 1, EventScript_1C4FC5 + case 2, EventScript_1C5019 setflag FLAG_TEMP_2 setflag FLAG_TEMP_3 setflag FLAG_TEMP_4 @@ -14307,7 +14107,7 @@ EventScript_1C4FC5:: @ 81C4FC5 setvar VAR_0x8004, 5 special sub_815D9E8 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1C4FFE + goto_if eq, EventScript_1C4FFE setobjectxyperm 2, 10, 12 setobjectmovementtype 2, 9 setobjectxyperm 5, 10, 13 @@ -14352,14 +14152,14 @@ EventScript_1C5050:: @ 81C5050 setvar VAR_0x8004, 5 special sub_815D9E8 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C5072 + goto_if eq, EventScript_1C5072 setvar VAR_0x400E, 1 setvar VAR_0x400F, 1 EventScript_1C5072: setvar VAR_0x8004, 18 special sub_815D9E8 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1C5086 + goto_if eq, EventScript_1C5086 end EventScript_1C5086:: @ 81C5086 @@ -14369,13 +14169,10 @@ EventScript_1C508F:: setvar VAR_0x8004, 3 setvar VAR_0x8005, 0 special sub_815D9E8 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1C50C2 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1C510D - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1C515C + switch VAR_RESULT + case 0, EventScript_1C50C2 + case 1, EventScript_1C510D + case 2, EventScript_1C515C EventScript_1C50C2: setvar VAR_0x8004, 19 special sub_815D9E8 @@ -14404,7 +14201,7 @@ EventScript_1C510D:: @ 81C510D setvar VAR_0x8005, 2 addvar VAR_0x4003, 1 compare_var_to_value VAR_0x4003, 1 - goto_if 1, EventScript_1C5146 + goto_if eq, EventScript_1C5146 setvar VAR_0x4003, 0 EventScript_1C5146: copyvar VAR_0x8006, VAR_0x4003 @@ -14414,13 +14211,10 @@ EventScript_1C5146: goto EventScript_1C5219 EventScript_1C515C:: @ 81C515C - copyvar VAR_0x8000, VAR_0x4001 - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1C5182 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1C51AD - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1C51D8 + switch VAR_0x4001 + case 0, EventScript_1C5182 + case 1, EventScript_1C51AD + case 2, EventScript_1C51D8 EventScript_1C5182: setvar VAR_0x8004, 19 special sub_815D9E8 @@ -14464,32 +14258,23 @@ EventScript_1C5219: setvar VAR_0x8005, 0 special sub_815D9E8 waitstate - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1C524D - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1C52E0 - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_1C52E0 + switch VAR_RESULT + case 1, EventScript_1C524D + case 2, EventScript_1C52E0 + case 3, EventScript_1C52E0 EventScript_1C524D: setvar VAR_0x8004, 3 setvar VAR_0x8005, 0 special sub_815D9E8 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1C52D7 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1C52BA - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1C5280 + switch VAR_RESULT + case 0, EventScript_1C52D7 + case 1, EventScript_1C52BA + case 2, EventScript_1C5280 EventScript_1C5280: - copyvar VAR_0x8000, VAR_0x4001 - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1C52A6 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1C52B0 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1C52D0 + switch VAR_0x4001 + case 0, EventScript_1C52A6 + case 1, EventScript_1C52B0 + case 2, EventScript_1C52D0 EventScript_1C52A6: addvar VAR_0x4001, 1 goto EventScript_1C515C @@ -14522,13 +14307,10 @@ EventScript_1C52F4:: @ 81C52F4 setvar VAR_0x8004, 3 setvar VAR_0x8005, 0 special sub_815D9E8 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1C5327 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1C5327 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1C5331 + switch VAR_RESULT + case 0, EventScript_1C5327 + case 1, EventScript_1C5327 + case 2, EventScript_1C5331 EventScript_1C5327: setvar VAR_0x8006, 0 goto EventScript_1C5391 @@ -14541,13 +14323,10 @@ EventScript_1C533B:: @ 81C533B setvar VAR_0x8004, 3 setvar VAR_0x8005, 0 special sub_815D9E8 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1C536E - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1C536E - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1C5378 + switch VAR_RESULT + case 0, EventScript_1C536E + case 1, EventScript_1C536E + case 2, EventScript_1C5378 EventScript_1C536E: setvar VAR_0x8006, 0 goto EventScript_1C5391 @@ -14577,25 +14356,19 @@ EventScript_1C53AA:: @ 81C53AA faceplayer setvar VAR_0x8004, 7 special sub_815D9E8 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1C53DA - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1C53E2 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1C5492 + switch VAR_RESULT + case 0, EventScript_1C53DA + case 1, EventScript_1C53E2 + case 2, EventScript_1C5492 EventScript_1C53DA: msgbox Text_17CA5A EventScript_1C53E2: setvar VAR_0x8004, 8 special sub_815D9E8 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1C5410 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1C543A - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1C544F + switch VAR_RESULT + case 0, EventScript_1C5410 + case 1, EventScript_1C543A + case 2, EventScript_1C544F EventScript_1C5410: msgbox Text_17CB09 textcolor 3 @@ -14616,13 +14389,10 @@ EventScript_1C543A:: @ 81C543A EventScript_1C544F:: @ 81C544F setvar VAR_0x8004, 9 special sub_815D9E8 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1C547D - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1C548A - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1C5492 + switch VAR_RESULT + case 0, EventScript_1C547D + case 1, EventScript_1C548A + case 2, EventScript_1C5492 EventScript_1C547D: msgbox Text_17CB1A goto EventScript_1C5492 @@ -14664,7 +14434,7 @@ SevenIsland_TrainerTower_1F_EventScript_1C54B4:: @ 81C54B4 setvar VAR_0x8004, 16 special sub_815D9E8 compare_var_to_value VAR_RESULT, 0 - goto_if 5, EventScript_1C5528 + goto_if ne, EventScript_1C5528 setvar VAR_0x8004, 19 special sub_815D9E8 applymovement 2, Movement_1A75DB @@ -14684,7 +14454,7 @@ SevenIsland_TrainerTower_1F_EventScript_1C54EA:: @ 81C54EA setvar VAR_0x8004, 16 special sub_815D9E8 compare_var_to_value VAR_RESULT, 0 - goto_if 5, EventScript_1C5528 + goto_if ne, EventScript_1C5528 setvar VAR_0x8004, 19 special sub_815D9E8 applymovement 5, Movement_1A75DB diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc index 99ab46150..a6abc033b 100644 --- a/data/maps/BirthIsland_Exterior/scripts.inc +++ b/data/maps/BirthIsland_Exterior/scripts.inc @@ -14,9 +14,9 @@ BirthIsland_Exterior_MapScript1_165217:: @ 8165217 setvar VAR_0x4026, 0 setvar VAR_0x403E, 0 checkflag FLAG_0x2E4 - call_if 1, EventScript_16523C + call_if eq, EventScript_16523C checkflag FLAG_0x2E4 - call_if 0, EventScript_165243 + call_if lt, EventScript_165243 end EventScript_16523C:: @ 816523C @@ -33,13 +33,13 @@ EventScript_165243:: @ 8165243 BirthIsland_Exterior_MapScript2_165253:: @ 8165253 checkflag FLAG_0x807 - call_if 1, EventScript_16525D + call_if eq, EventScript_16525D end EventScript_16525D:: @ 816525D specialvar VAR_RESULT, sub_80CA74C compare_var_to_value VAR_RESULT, 7 - goto_if 5, EventScript_1A77A9 + goto_if ne, EventScript_1A77A9 removeobject 2 return diff --git a/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc b/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc index 3f92e7018..23df9bc9b 100644 --- a/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc @@ -5,7 +5,7 @@ CeladonCity_DepartmentStore_Elevator_EventScript_16C153:: @ 816C153 lockall setvar VAR_0x8004, 3 checkflag FLAG_TEMP_2 - call_if 0, EventScript_1A7AB9 + call_if lt, EventScript_1A7AB9 copyvar VAR_0x8005, VAR_0x403A special sub_80CB580 message Text_1A535C diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc index 9bdd93dee..3fc81021d 100644 --- a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc @@ -18,13 +18,13 @@ EventScript_16BCF6:: @ 816BCF6 setvar VAR_0x4001, 0 checkitem ITEM_FRESH_WATER, 1 compare_var_to_value VAR_RESULT, 1 - call_if 1, EventScript_16BD2C + call_if eq, EventScript_16BD2C checkitem ITEM_SODA_POP, 1 compare_var_to_value VAR_RESULT, 1 - call_if 1, EventScript_16BD32 + call_if eq, EventScript_16BD32 checkitem ITEM_LEMONADE, 1 compare_var_to_value VAR_RESULT, 1 - call_if 1, EventScript_16BD38 + call_if eq, EventScript_16BD38 return EventScript_16BD2C:: @ 816BD2C @@ -161,11 +161,11 @@ EventScript_16BF7C:: @ 816BF7C giveitem VAR_0x8009, 1, 8 call EventScript_1A6675 compare_var_to_value VAR_0x8008, ITEM_FRESH_WATER - call_if 1, EventScript_16BFDE + call_if eq, EventScript_16BFDE compare_var_to_value VAR_0x8008, ITEM_SODA_POP - call_if 1, EventScript_16BFEA + call_if eq, EventScript_16BFEA compare_var_to_value VAR_0x8008, ITEM_LEMONADE - call_if 1, EventScript_16BFF6 + call_if eq, EventScript_16BFF6 release end @@ -267,11 +267,11 @@ EventScript_16C0CB:: @ 816C0CB compare_var_to_value VAR_RESULT, 0 goto_if_eq EventScript_16C13F compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_16C0B6 + call_if eq, EventScript_16C0B6 compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_16C0BD + call_if eq, EventScript_16C0BD compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_16C0C4 + call_if eq, EventScript_16C0C4 updatemoneybox 0, 0, 0 getitemname 0, VAR_0x4000 playse SE_JIHANKI diff --git a/data/maps/CeladonCity_GameCorner/scripts.inc b/data/maps/CeladonCity_GameCorner/scripts.inc index 3fa97339a..85df99071 100644 --- a/data/maps/CeladonCity_GameCorner/scripts.inc +++ b/data/maps/CeladonCity_GameCorner/scripts.inc @@ -4,7 +4,7 @@ CeladonCity_GameCorner_MapScripts:: @ 816C646 CeladonCity_GameCorner_MapScript1_16C64C:: @ 816C64C checkflag FLAG_0x26D - call_if 0, EventScript_16C656 + call_if lt, EventScript_16C656 end EventScript_16C656:: @ 816C656 @@ -40,7 +40,7 @@ CeladonCity_GameCorner_EventScript_16C68D:: @ 816C68D EventScript_16C6E6:: @ 816C6E6 checkflag FLAG_GOT_COIN_CASE - goto_if 0, EventScript_16C790 + goto_if lt, EventScript_16C790 compare_var_to_value VAR_0x8009, 0 goto_if_eq EventScript_16C734 compare_var_to_value VAR_0x8009, 1 @@ -50,7 +50,7 @@ EventScript_16C6E6:: @ 816C6E6 EventScript_16C706:: @ 816C706 checkcoins VAR_0x4001 compare_var_to_value VAR_0x4001, 9500 - goto_if 4, EventScript_16C79E + goto_if ge, EventScript_16C79E checkmoney 10000, 0 compare_var_to_value VAR_RESULT, 0 goto_if_eq EventScript_16C7AC @@ -62,7 +62,7 @@ EventScript_16C706:: @ 816C706 EventScript_16C734:: @ 816C734 checkcoins VAR_0x4001 compare_var_to_value VAR_0x4001, 9950 - goto_if 4, EventScript_16C79E + goto_if ge, EventScript_16C79E checkmoney 1000, 0 compare_var_to_value VAR_RESULT, 0 goto_if_eq EventScript_16C7AC @@ -135,10 +135,10 @@ CeladonCity_GameCorner_EventScript_16C7E7:: @ 816C7E7 goto_if_eq EventScript_16C849 msgbox gUnknown_8196AF3 checkflag FLAG_GOT_COIN_CASE - goto_if 0, EventScript_16C839 + goto_if lt, EventScript_16C839 checkcoins VAR_0x4001 compare_var_to_value VAR_0x4001, 9990 - goto_if 4, EventScript_16C82B + goto_if ge, EventScript_16C82B givecoins 10 textcolor 3 msgbox gUnknown_8196B0D @@ -199,10 +199,10 @@ CeladonCity_GameCorner_EventScript_16C89E:: @ 816C89E goto_if_eq EventScript_16C8F0 msgbox gUnknown_8196D2B checkflag FLAG_GOT_COIN_CASE - goto_if 0, EventScript_16C839 + goto_if lt, EventScript_16C839 checkcoins VAR_0x4001 compare_var_to_value VAR_0x4001, 9980 - goto_if 4, EventScript_16C8E2 + goto_if ge, EventScript_16C8E2 givecoins 20 textcolor 3 msgbox gUnknown_8196D47 @@ -229,10 +229,10 @@ CeladonCity_GameCorner_EventScript_16C8FE:: @ 816C8FE goto_if_eq EventScript_16C950 msgbox gUnknown_8196DB7 checkflag FLAG_GOT_COIN_CASE - goto_if 0, EventScript_16C839 + goto_if lt, EventScript_16C839 checkcoins VAR_0x4001 compare_var_to_value VAR_0x4001, 9980 - goto_if 4, EventScript_16C942 + goto_if ge, EventScript_16C942 givecoins 20 textcolor 3 msgbox gUnknown_8196DF8 @@ -264,7 +264,7 @@ EventScript_16C96A:: @ 816C96A EventScript_16C96C:: @ 816C96C checkflag FLAG_GOT_COIN_CASE - goto_if 0, EventScript_16CAA0 + goto_if lt, EventScript_16CAA0 msgbox gUnknown_8196F46, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 goto_if_eq EventScript_16C96A @@ -413,7 +413,7 @@ CeladonCity_GameCorner_EventScript_16CAAA:: @ 816CAAA lockall msgbox gUnknown_8196EDC checkflag FLAG_0x26D - call_if 0, EventScript_16CABE + call_if lt, EventScript_16CABE releaseall end @@ -437,9 +437,9 @@ EventScript_16CB10:: @ 816CB10 msgbox gUnknown_8196E9B closemessage compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_16CB34 + call_if eq, EventScript_16CB34 compare_var_to_value VAR_FACING, 3 - call_if 5, EventScript_16CB3F + call_if ne, EventScript_16CB3F removeobject 11 release end diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc index 4a60c9814..9eab86b9f 100644 --- a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc +++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc @@ -13,7 +13,7 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_16CB88:: @ 816CB88 lock faceplayer checkflag FLAG_GOT_COIN_CASE - goto_if 0, EventScript_16CD99 + goto_if lt, EventScript_16CD99 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 goto_if_eq EventScript_1A7AE0 @@ -78,7 +78,7 @@ EventScript_16CC65:: @ 816CC65 goto_if_eq EventScript_16CC10 checkcoins VAR_RESULT compare_var_to_var VAR_RESULT, VAR_0x4002 - goto_if 0, EventScript_16CDA5 + goto_if lt, EventScript_16CDA5 textcolor 3 switch VAR_0x4001 case SPECIES_ABRA, EventScript_16CCD4 @@ -192,7 +192,7 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_16CE1D:: @ 816CE1D lock faceplayer checkflag FLAG_GOT_COIN_CASE - goto_if 0, EventScript_16CD99 + goto_if lt, EventScript_16CD99 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 goto_if_eq EventScript_1A7AE0 @@ -269,7 +269,7 @@ EventScript_16CF3F:: @ 816CF3F getitemname 0, VAR_0x4001 checkcoins VAR_RESULT compare_var_to_var VAR_RESULT, VAR_0x4002 - goto_if 0, EventScript_16CDA5 + goto_if lt, EventScript_16CDA5 checkitemspace VAR_0x4001, 1 compare_var_to_value VAR_RESULT, 0 goto_if_eq EventScript_16CF79 @@ -290,7 +290,7 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_16CF88:: @ 816CF88 lock faceplayer checkflag FLAG_GOT_COIN_CASE - goto_if 0, EventScript_16CD99 + goto_if lt, EventScript_16CD99 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 goto_if_eq EventScript_1A7AE0 diff --git a/data/maps/CeladonCity_Gym/scripts.inc b/data/maps/CeladonCity_Gym/scripts.inc index c99525178..48858a58b 100644 --- a/data/maps/CeladonCity_Gym/scripts.inc +++ b/data/maps/CeladonCity_Gym/scripts.inc @@ -5,7 +5,7 @@ CeladonCity_Gym_EventScript_16D061:: @ 816D061 famechecker FAMECHECKER_ERIKA, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 trainerbattle 1, TRAINER_LEADER_ERIKA, 0, Text_197114, Text_197260, EventScript_16D0A0 checkflag FLAG_0x293 - goto_if 0, EventScript_16D0C6 + goto_if lt, EventScript_16D0C6 famechecker FAMECHECKER_ERIKA, 4 msgbox gUnknown_81972B8 release diff --git a/data/maps/CeruleanCave_B1F/scripts.inc b/data/maps/CeruleanCave_B1F/scripts.inc index a9e13651c..dfe553dba 100644 --- a/data/maps/CeruleanCave_B1F/scripts.inc +++ b/data/maps/CeruleanCave_B1F/scripts.inc @@ -5,19 +5,19 @@ CeruleanCave_B1F_MapScripts:: @ 81624BE CeruleanCave_B1F_MapScript1_1624C9:: @ 81624C9 checkflag FLAG_0x807 - call_if 1, EventScript_1624D3 + call_if eq, EventScript_1624D3 end EventScript_1624D3:: @ 81624D3 specialvar VAR_RESULT, sub_80CA74C compare_var_to_value VAR_RESULT, 7 - goto_if 5, EventScript_1A77A9 + goto_if ne, EventScript_1A77A9 removeobject VAR_LAST_TALKED return CeruleanCave_B1F_MapScript2_1624E7:: @ 81624E7 checkflag FLAG_0x2BC - call_if 0, EventScript_1624F1 + call_if lt, EventScript_1624F1 end EventScript_1624F1:: @ 81624F1 diff --git a/data/maps/CeruleanCity/scripts.inc b/data/maps/CeruleanCity/scripts.inc index f863a5178..f8f47bbb2 100644 --- a/data/maps/CeruleanCity/scripts.inc +++ b/data/maps/CeruleanCity/scripts.inc @@ -5,7 +5,7 @@ CeruleanCity_MapScripts:: @ 8166471 CeruleanCity_MapScript1_166477:: @ 8166477 setworldmapflag FLAG_WORLD_MAP_CERULEAN_CITY checkflag FLAG_GOT_SS_TICKET - call_if 0, EventScript_166484 + call_if lt, EventScript_166484 end EventScript_166484:: @ 8166484 @@ -44,21 +44,21 @@ EventScript_1664CC:: @ 81664CC msgbox gUnknown_817EAD7 setvar VAR_LAST_TALKED, 8 compare_var_to_value VAR_STARTER_MON, 2 - call_if 1, EventScript_166582 + call_if eq, EventScript_166582 compare_var_to_value VAR_STARTER_MON, 1 - call_if 1, EventScript_16658D + call_if eq, EventScript_16658D compare_var_to_value VAR_STARTER_MON, 0 - call_if 1, EventScript_166598 + call_if eq, EventScript_166598 famechecker FAMECHECKER_BILL, 0 msgbox gUnknown_817EB95 closemessage playbgm MUS_RIVAL2, 0 compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_1665A3 + call_if eq, EventScript_1665A3 compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_1665A3 + call_if eq, EventScript_1665A3 compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_1665B5 + call_if eq, EventScript_1665B5 msgbox gUnknown_817ECD4 setvar VAR_MAP_SCENE_CERULEAN_CITY_RIVAL, 1 setflag FLAG_0x29B @@ -284,11 +284,11 @@ CeruleanCity_EventScript_16674F:: @ 816674F random 3 copyvar VAR_0x8008, VAR_RESULT compare_var_to_value VAR_0x8008, 0 - call_if 1, EventScript_1667B0 + call_if eq, EventScript_1667B0 compare_var_to_value VAR_0x8008, 1 - call_if 1, EventScript_1667B6 + call_if eq, EventScript_1667B6 compare_var_to_value VAR_0x8008, 2 - call_if 1, EventScript_1667BC + call_if eq, EventScript_1667BC waitmessage delay 40 playse SE_PIN @@ -296,11 +296,11 @@ CeruleanCity_EventScript_16674F:: @ 816674F waitmovement 0 delay 30 compare_var_to_value VAR_0x8008, 0 - call_if 1, EventScript_1667C2 + call_if eq, EventScript_1667C2 compare_var_to_value VAR_0x8008, 1 - call_if 1, EventScript_1667CB + call_if eq, EventScript_1667CB compare_var_to_value VAR_0x8008, 2 - call_if 1, EventScript_1667D4 + call_if eq, EventScript_1667D4 release end @@ -333,13 +333,13 @@ CeruleanCity_EventScript_1667DD:: @ 81667DD random 4 copyvar VAR_0x8008, VAR_RESULT compare_var_to_value VAR_0x8008, 0 - call_if 1, EventScript_166814 + call_if eq, EventScript_166814 compare_var_to_value VAR_0x8008, 1 - call_if 1, EventScript_16681D + call_if eq, EventScript_16681D compare_var_to_value VAR_0x8008, 2 - call_if 1, EventScript_166826 + call_if eq, EventScript_166826 compare_var_to_value VAR_0x8008, 3 - call_if 1, EventScript_16682F + call_if eq, EventScript_16682F release end diff --git a/data/maps/CeruleanCity_Gym/scripts.inc b/data/maps/CeruleanCity_Gym/scripts.inc index c535e9850..f049f3167 100644 --- a/data/maps/CeruleanCity_Gym/scripts.inc +++ b/data/maps/CeruleanCity_Gym/scripts.inc @@ -5,7 +5,7 @@ CeruleanCity_Gym_EventScript_16AAA1:: @ 816AAA1 famechecker FAMECHECKER_MISTY, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 trainerbattle 1, TRAINER_LEADER_MISTY, 0, Text_1921EF, Text_19242D, EventScript_16AAD3 checkflag FLAG_0x297 - goto_if 0, EventScript_16AAF9 + goto_if lt, EventScript_16AAF9 msgbox gUnknown_81922BF release end diff --git a/data/maps/CeruleanCity_House3/scripts.inc b/data/maps/CeruleanCity_House3/scripts.inc index 1d7af5b1a..40f1a8104 100644 --- a/data/maps/CeruleanCity_House3/scripts.inc +++ b/data/maps/CeruleanCity_House3/scripts.inc @@ -17,10 +17,10 @@ CeruleanCity_House3_EventScript_16A9B1:: @ 816A9B1 goto_if_eq EventScript_16AA0B call EventScript_1A8CBD compare_var_to_value VAR_0x8004, 6 - goto_if 4, EventScript_16AA0B + goto_if ge, EventScript_16AA0B call EventScript_1A8CC9 compare_var_to_var VAR_RESULT, VAR_0x8009 - goto_if 5, EventScript_16AA15 + goto_if ne, EventScript_16AA15 call EventScript_1A8CD9 msgbox gUnknown_81A5A9D setflag FLAG_DID_ZYNX_TRADE diff --git a/data/maps/CeruleanCity_House5/scripts.inc b/data/maps/CeruleanCity_House5/scripts.inc index d7d3e0222..d929a38e6 100644 --- a/data/maps/CeruleanCity_House5/scripts.inc +++ b/data/maps/CeruleanCity_House5/scripts.inc @@ -10,7 +10,7 @@ CeruleanCity_House5_EventScript_16AE50:: @ 816AE50 compare_var_to_value VAR_RESULT, 0 goto_if_eq EventScript_16AEAD checkflag FLAG_0x847 - goto_if 0, EventScript_16AEA3 + goto_if lt, EventScript_16AEA3 msgbox gUnknown_8193003 setflag FLAG_0x2BB giveitem ITEM_POWDER_JAR diff --git a/data/maps/CinnabarIsland/scripts.inc b/data/maps/CinnabarIsland/scripts.inc index b2e7e48ae..8325073e3 100644 --- a/data/maps/CinnabarIsland/scripts.inc +++ b/data/maps/CinnabarIsland/scripts.inc @@ -7,11 +7,11 @@ CinnabarIsland_MapScript1_166EE1:: @ 8166EE1 setworldmapflag FLAG_WORLD_MAP_CINNABAR_ISLAND call EventScript_166F5E compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND, 1 - call_if 1, EventScript_166F24 + call_if eq, EventScript_166F24 compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND, 3 - call_if 1, EventScript_166F52 + call_if eq, EventScript_166F52 compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND_2, 1 - call_if 1, EventScript_166F0B + call_if eq, EventScript_166F0B end EventScript_166F0B:: @ 8166F0B @@ -25,7 +25,7 @@ EventScript_166F0B:: @ 8166F0B EventScript_166F24:: @ 8166F24 getplayerxy VAR_0x8004, VAR_0x8005 compare_var_to_value VAR_0x8004, 18 - goto_if 4, EventScript_166F4A + goto_if ge, EventScript_166F4A setflag FLAG_TEMP_2 setobjectxyperm 3, 18, 12 setobjectmovementtype 3, 7 @@ -94,18 +94,18 @@ EventScript_166FCD:: @ 8166FCD lockall textcolor 0 checkflag FLAG_TEMP_2 - call_if 0, EventScript_167032 + call_if lt, EventScript_167032 checkflag FLAG_TEMP_2 - call_if 1, EventScript_16703D + call_if eq, EventScript_16703D playse SE_PIN applymovement 3, Movement_1A75DB waitmovement 0 applymovement 3, Movement_1A75DD waitmovement 0 checkflag FLAG_TEMP_2 - call_if 0, EventScript_167048 + call_if lt, EventScript_167048 checkflag FLAG_TEMP_2 - call_if 1, EventScript_167053 + call_if eq, EventScript_167053 msgbox gUnknown_8180C90 msgbox gUnknown_8180CAA, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 @@ -147,9 +147,9 @@ EventScript_167078:: @ 8167078 msgbox gUnknown_8180DF8 closemessage checkflag FLAG_TEMP_2 - call_if 0, EventScript_1670A0 + call_if lt, EventScript_1670A0 checkflag FLAG_TEMP_2 - call_if 1, EventScript_1670B3 + call_if eq, EventScript_1670B3 removeobject 3 setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 2 clearflag FLAG_HIDE_CINNABAR_POKECENTER_BILL @@ -202,18 +202,18 @@ Movement_1670E2:: @ 81670E2 EventScript_1670E6:: @ 81670E6 checkflag FLAG_TEMP_2 - call_if 1, EventScript_167142 + call_if eq, EventScript_167142 addobject 4 checkflag FLAG_TEMP_2 - call_if 0, EventScript_167154 + call_if lt, EventScript_167154 checkflag FLAG_TEMP_2 - call_if 1, EventScript_167166 + call_if eq, EventScript_167166 msgbox gUnknown_8180EAD closemessage checkflag FLAG_TEMP_2 - call_if 0, EventScript_167171 + call_if lt, EventScript_167171 checkflag FLAG_TEMP_2 - call_if 1, EventScript_167183 + call_if eq, EventScript_167183 setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 2 removeobject 3 delay 40 diff --git a/data/maps/CinnabarIsland_Gym/scripts.inc b/data/maps/CinnabarIsland_Gym/scripts.inc index 9a60aaf42..156e7f101 100644 --- a/data/maps/CinnabarIsland_Gym/scripts.inc +++ b/data/maps/CinnabarIsland_Gym/scripts.inc @@ -6,17 +6,17 @@ CinnabarIsland_Gym_MapScript1_16D951:: @ 816D951 checkflag FLAG_DEFEATED_BLAINE goto_if_eq EventScript_16D991 checkflag FLAG_0x265 - call_if 1, EventScript_16D9B0 + call_if eq, EventScript_16D9B0 checkflag FLAG_0x267 - call_if 1, EventScript_16D9B6 + call_if eq, EventScript_16D9B6 checkflag FLAG_0x268 - call_if 1, EventScript_16D9BC + call_if eq, EventScript_16D9BC checkflag FLAG_0x269 - call_if 1, EventScript_16D9C2 + call_if eq, EventScript_16D9C2 checkflag FLAG_0x26A - call_if 1, EventScript_16D9C8 + call_if eq, EventScript_16D9C8 checkflag FLAG_0x26B - call_if 1, EventScript_16D9CE + call_if eq, EventScript_16D9CE end EventScript_16D991:: @ 816D991 @@ -56,7 +56,7 @@ CinnabarIsland_Gym_EventScript_16D9D4:: @ 816D9D4 famechecker FAMECHECKER_BLAINE, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 trainerbattle 1, TRAINER_LEADER_BLAINE, 0, Text_199543, Text_1995FA, EventScript_16DA06 checkflag FLAG_GOT_TM38_FROM_BLAINE - goto_if 0, EventScript_16DA34 + goto_if lt, EventScript_16DA34 msgbox gUnknown_819971D release end @@ -101,7 +101,7 @@ CinnabarIsland_Gym_EventScript_16DA96:: @ 816DA96 EventScript_16DAB1:: @ 816DAB1 checkflag FLAG_0x267 - call_if 0, EventScript_16DABC + call_if lt, EventScript_16DABC release end @@ -117,7 +117,7 @@ CinnabarIsland_Gym_EventScript_16DAC2:: @ 816DAC2 EventScript_16DAEA:: @ 816DAEA checkflag FLAG_0x269 - call_if 0, EventScript_16DAF5 + call_if lt, EventScript_16DAF5 release end @@ -132,7 +132,7 @@ CinnabarIsland_Gym_EventScript_16DAFB:: @ 816DAFB EventScript_16DB16:: @ 816DB16 checkflag FLAG_0x26B - call_if 0, EventScript_16DB21 + call_if lt, EventScript_16DB21 release end @@ -147,7 +147,7 @@ CinnabarIsland_Gym_EventScript_16DB27:: @ 816DB27 EventScript_16DB42:: @ 816DB42 checkflag FLAG_0x265 - call_if 0, EventScript_16DB4D + call_if lt, EventScript_16DB4D release end @@ -162,7 +162,7 @@ CinnabarIsland_Gym_EventScript_16DB53:: @ 816DB53 EventScript_16DB6E:: @ 816DB6E checkflag FLAG_0x268 - call_if 0, EventScript_16DB79 + call_if lt, EventScript_16DB79 release end @@ -177,7 +177,7 @@ CinnabarIsland_Gym_EventScript_16DB7F:: @ 816DB7F EventScript_16DB9A:: @ 816DB9A checkflag FLAG_0x26A - call_if 0, EventScript_16DBA5 + call_if lt, EventScript_16DBA5 release end @@ -270,15 +270,15 @@ EventScript_16DC68:: @ 816DC68 EventScript_16DC6A:: @ 816DC6A call EventScript_16DC34 checktrainerflag TRAINER_BURGLAR_QUINN - goto_if 0, EventScript_16DC7A + goto_if lt, EventScript_16DC7A releaseall end EventScript_16DC7A:: @ 816DC7A compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_16DCB4 + call_if eq, EventScript_16DCB4 compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_16DCC6 + call_if eq, EventScript_16DCC6 textcolor 0 msgbox gUnknown_819983F trainerbattle 3, TRAINER_BURGLAR_QUINN, 0, Text_199870 @@ -349,15 +349,15 @@ EventScript_16DD31:: @ 816DD31 EventScript_16DD41:: @ 816DD41 call EventScript_16DC34 checktrainerflag TRAINER_SUPER_NERD_AVERY - goto_if 0, EventScript_16DD51 + goto_if lt, EventScript_16DD51 releaseall end EventScript_16DD51:: @ 816DD51 compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_16DD8B + call_if eq, EventScript_16DD8B compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_16DD9D + call_if eq, EventScript_16DD9D textcolor 0 msgbox gUnknown_81998BD trainerbattle 3, TRAINER_SUPER_NERD_AVERY, 0, Text_1998ED @@ -437,15 +437,15 @@ EventScript_16DE0F:: @ 816DE0F EventScript_16DE1F:: @ 816DE1F call EventScript_16DC34 checktrainerflag TRAINER_BURGLAR_RAMON - goto_if 0, EventScript_16DE2F + goto_if lt, EventScript_16DE2F releaseall end EventScript_16DE2F:: @ 816DE2F compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_16DE69 + call_if eq, EventScript_16DE69 compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_16DE7B + call_if eq, EventScript_16DE7B textcolor 0 msgbox gUnknown_8199948 trainerbattle 3, TRAINER_BURGLAR_RAMON, 0, Text_199973 @@ -516,15 +516,15 @@ EventScript_16DEE6:: @ 816DEE6 EventScript_16DEF6:: @ 816DEF6 call EventScript_16DC34 checktrainerflag TRAINER_SUPER_NERD_DEREK - goto_if 0, EventScript_16DF06 + goto_if lt, EventScript_16DF06 releaseall end EventScript_16DF06:: @ 816DF06 compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_16DF40 + call_if eq, EventScript_16DF40 compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_16DF52 + call_if eq, EventScript_16DF52 textcolor 0 msgbox gUnknown_81999B7 trainerbattle 3, TRAINER_SUPER_NERD_DEREK, 0, Text_1999DB @@ -595,15 +595,15 @@ EventScript_16DFBD:: @ 816DFBD EventScript_16DFCD:: @ 816DFCD call EventScript_16DC34 checktrainerflag TRAINER_BURGLAR_DUSTY - goto_if 0, EventScript_16DFDD + goto_if lt, EventScript_16DFDD releaseall end EventScript_16DFDD:: @ 816DFDD compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_16E017 + call_if eq, EventScript_16E017 compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_16E029 + call_if eq, EventScript_16E029 textcolor 0 msgbox gUnknown_8199A7F trainerbattle 3, TRAINER_BURGLAR_DUSTY, 0, Text_199AB9 @@ -674,15 +674,15 @@ EventScript_16E094:: @ 816E094 EventScript_16E0A4:: @ 816E0A4 call EventScript_16DC34 checktrainerflag TRAINER_SUPER_NERD_ZAC - goto_if 0, EventScript_16E0B4 + goto_if lt, EventScript_16E0B4 releaseall end EventScript_16E0B4:: @ 816E0B4 compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_16E0EE + call_if eq, EventScript_16E0EE compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_16E100 + call_if eq, EventScript_16E100 textcolor 0 msgbox gUnknown_8199AFC trainerbattle 3, TRAINER_SUPER_NERD_ZAC, 0, Text_199B16 diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc index ae4c986bf..cac88d282 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc @@ -40,11 +40,11 @@ CinnabarIsland_PokemonCenter_1F_EventScript_16E90A:: @ 816E90A setflag FLAG_HIDE_CINNABAR_POKECENTER_BILL delay 20 compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_16E96F + call_if eq, EventScript_16E96F compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_16E981 + call_if eq, EventScript_16E981 compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_16E993 + call_if eq, EventScript_16E993 removeobject 7 setvar VAR_MAP_SCENE_CINNABAR_ISLAND_2, 1 clearflag FLAG_HIDE_CINNABAR_BILL diff --git a/data/maps/CinnabarIsland_PokemonLab_Entrance/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_Entrance/scripts.inc index f8f4bcbc6..780103629 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Entrance/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonLab_Entrance/scripts.inc @@ -4,7 +4,7 @@ CinnabarIsland_PokemonLab_Entrance_MapScripts:: @ 816E273 CinnabarIsland_PokemonLab_Entrance_MapScript1_16E279:: @ 816E279 compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 1 - call_if 1, EventScript_16E285 + call_if eq, EventScript_16E285 end EventScript_16E285:: @ 816E285 diff --git a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc index 18f18f6d2..d04b27089 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc @@ -13,10 +13,10 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E401:: @ 816E401 goto_if_eq EventScript_16E45B call EventScript_1A8CBD compare_var_to_value VAR_0x8004, 6 - goto_if 4, EventScript_16E45B + goto_if ge, EventScript_16E45B call EventScript_1A8CC9 compare_var_to_var VAR_RESULT, VAR_0x8009 - goto_if 5, EventScript_16E465 + goto_if ne, EventScript_16E465 call EventScript_1A8CD9 msgbox gUnknown_81A59DA setflag FLAG_0x276 @@ -44,7 +44,7 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E47D:: @ 816E47D faceplayer setvar VAR_RESULT, 0 checkflag FLAG_REVIVED_AMBER - call_if 1, EventScript_16E8A1 + call_if eq, EventScript_16E8A1 compare_var_to_value VAR_RESULT, 1 goto_if_eq EventScript_16E897 compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 2 @@ -66,7 +66,7 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E47D:: @ 816E47D EventScript_16E4EC:: @ 816E4EC checkflag FLAG_0x273 - goto_if 0, EventScript_16E534 + goto_if lt, EventScript_16E534 checkflag FLAG_REVIVED_HELIX goto_if_eq EventScript_16E534 setvar VAR_RESULT, 1 @@ -74,7 +74,7 @@ EventScript_16E4EC:: @ 816E4EC EventScript_16E504:: @ 816E504 checkflag FLAG_0x272 - goto_if 0, EventScript_16E534 + goto_if lt, EventScript_16E534 checkflag FLAG_REVIVED_DOME goto_if_eq EventScript_16E534 setvar VAR_RESULT, 1 @@ -82,7 +82,7 @@ EventScript_16E504:: @ 816E504 EventScript_16E51C:: @ 816E51C checkflag FLAG_0x25E - goto_if 0, EventScript_16E534 + goto_if lt, EventScript_16E534 checkflag FLAG_REVIVED_AMBER goto_if_eq EventScript_16E534 setvar VAR_RESULT, 1 @@ -310,12 +310,12 @@ EventScript_16E8A1:: @ 816E8A1 EventScript_16E8B9:: @ 816E8B9 checkflag FLAG_REVIVED_HELIX - goto_if 0, EventScript_16E534 + goto_if lt, EventScript_16E534 setvar VAR_RESULT, 1 return EventScript_16E8C8:: @ 816E8C8 checkflag FLAG_REVIVED_DOME - goto_if 0, EventScript_16E534 + goto_if lt, EventScript_16E534 setvar VAR_RESULT, 1 return diff --git a/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc index 651fe0c76..df5da6603 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc @@ -17,10 +17,10 @@ CinnabarIsland_PokemonLab_Lounge_EventScript_16E2C2:: @ 816E2C2 goto_if_eq EventScript_16E31C call EventScript_1A8CBD compare_var_to_value VAR_0x8004, 6 - goto_if 4, EventScript_16E31C + goto_if ge, EventScript_16E31C call EventScript_1A8CC9 compare_var_to_var VAR_RESULT, VAR_0x8009 - goto_if 5, EventScript_16E326 + goto_if ne, EventScript_16E326 call EventScript_1A8CD9 msgbox gUnknown_81A5A9D setflag FLAG_0x274 @@ -59,12 +59,12 @@ CinnabarIsland_PokemonLab_Lounge_EventScript_16E33E:: @ 816E33E waitstate copyvar VAR_0x800A, VAR_0x8004 compare_var_to_value VAR_0x8004, 6 - goto_if 4, EventScript_16E3BC + goto_if ge, EventScript_16E3BC copyvar VAR_0x8005, VAR_0x800A specialvar VAR_RESULT, sub_8053D2C copyvar VAR_0x800B, VAR_RESULT compare_var_to_var VAR_RESULT, VAR_0x8009 - goto_if 5, EventScript_16E3C6 + goto_if ne, EventScript_16E3C6 copyvar VAR_0x8004, VAR_0x8008 copyvar VAR_0x8005, VAR_0x800A special sub_8053D68 diff --git a/data/maps/FiveIsland_LostCave_Room10/scripts.inc b/data/maps/FiveIsland_LostCave_Room10/scripts.inc index 212740c6b..cd9123743 100644 --- a/data/maps/FiveIsland_LostCave_Room10/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Room10/scripts.inc @@ -5,7 +5,7 @@ FiveIsland_LostCave_Room10_MapScripts:: @ 8164C2D FiveIsland_LostCave_Room10_MapScript1_164C38:: @ 8164C38 checktrainerflag TRAINER_LADY_SELPHY - call_if 1, EventScript_164C42 + call_if eq, EventScript_164C42 end EventScript_164C42:: @ 8164C42 diff --git a/data/maps/FiveIsland_Meadow/scripts.inc b/data/maps/FiveIsland_Meadow/scripts.inc index 0caa8bcfe..d2ee2e4cb 100644 --- a/data/maps/FiveIsland_Meadow/scripts.inc +++ b/data/maps/FiveIsland_Meadow/scripts.inc @@ -4,7 +4,7 @@ FiveIsland_Meadow_MapScripts:: @ 8168932 FiveIsland_Meadow_MapScript1_168938:: @ 8168938 checkflag FLAG_0x2D6 - call_if 1, EventScript_168983 + call_if eq, EventScript_168983 end FiveIsland_Meadow_EventScript_168942:: @ 8168942 diff --git a/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc b/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc index 4f9abcadd..1b174b1cf 100644 --- a/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc +++ b/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc @@ -13,7 +13,7 @@ FiveIsland_ResortGorgeous_House_EventScript_171EBE:: @ 8171EBE compare_var_to_value VAR_STORAGE_UNKNOWN, 65535 goto_if_eq EventScript_171F0B compare_var_to_value VAR_STORAGE_UNKNOWN, 0 - goto_if 5, EventScript_171F19 + goto_if ne, EventScript_171F19 msgbox gUnknown_81A42A0 goto EventScript_171EFE end @@ -53,13 +53,13 @@ EventScript_171F34:: @ 8171F34 msgbox gUnknown_81A4566 closemessage compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_171FCD + call_if eq, EventScript_171FCD compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_171FE9 + call_if eq, EventScript_171FE9 compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_171FFE + call_if eq, EventScript_171FFE compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_17201A + call_if eq, EventScript_17201A moveobjectoffscreen 2 msgbox gUnknown_81A458E giveitem VAR_0x403B diff --git a/data/maps/FiveIsland_RocketWarehouse/scripts.inc b/data/maps/FiveIsland_RocketWarehouse/scripts.inc index d7bc829a7..294b33cb1 100644 --- a/data/maps/FiveIsland_RocketWarehouse/scripts.inc +++ b/data/maps/FiveIsland_RocketWarehouse/scripts.inc @@ -9,7 +9,7 @@ FiveIsland_RocketWarehouse_MapScript2_163F39:: @ 8163F39 FiveIsland_RocketWarehouse_MapScript1_163F3D:: @ 8163F3D checktrainerflag TRAINER_TEAM_ROCKET_ADMIN - call_if 1, EventScript_163F47 + call_if eq, EventScript_163F47 end EventScript_163F47:: @ 8163F47 @@ -79,7 +79,7 @@ FiveIsland_RocketWarehouse_EventScript_164014:: @ 8164014 EventScript_16402F:: @ 816402F getplayerxy VAR_0x8004, VAR_0x8005 compare_var_to_value VAR_0x8004, 24 - call_if 3, EventScript_164065 + call_if le, EventScript_164065 msgbox gUnknown_817BA64 closemessage fadescreen 1 @@ -113,29 +113,29 @@ EventScript_1640A2:: @ 81640A2 getplayerxy VAR_0x8004, VAR_0x8005 specialvar VAR_RESULT, GetPlayerFacingDirection compare_var_to_value VAR_RESULT, 2 - call_if 1, EventScript_16412E + call_if eq, EventScript_16412E msgbox gUnknown_817B7AE closemessage compare_var_to_value VAR_0x8004, 24 - call_if 3, EventScript_164144 + call_if le, EventScript_164144 compare_var_to_value VAR_0x8004, 25 - call_if 1, EventScript_16414F + call_if eq, EventScript_16414F compare_var_to_value VAR_0x8004, 26 - call_if 1, EventScript_16415A + call_if eq, EventScript_16415A compare_var_to_value VAR_0x8004, 27 - call_if 1, EventScript_16415A + call_if eq, EventScript_16415A playse SE_PIN call EventScript_163F47 special DrawWholeMapView waitse compare_var_to_value VAR_0x8004, 24 - call_if 3, EventScript_164165 + call_if le, EventScript_164165 compare_var_to_value VAR_0x8004, 25 - call_if 1, EventScript_164165 + call_if eq, EventScript_164165 compare_var_to_value VAR_0x8004, 26 - call_if 1, EventScript_164165 + call_if eq, EventScript_164165 compare_var_to_value VAR_0x8004, 27 - call_if 1, EventScript_164170 + call_if eq, EventScript_164170 msgbox gUnknown_817B7FA release end diff --git a/data/maps/FourIsland/scripts.inc b/data/maps/FourIsland/scripts.inc index 8256c4765..03a785e02 100644 --- a/data/maps/FourIsland/scripts.inc +++ b/data/maps/FourIsland/scripts.inc @@ -6,7 +6,7 @@ FourIsland_MapScripts:: @ 8167CAE FourIsland_MapScript1_167CB9:: @ 8167CB9 setworldmapflag FLAG_WORLD_MAP_FOUR_ISLAND compare_var_to_value VAR_MAP_SCENE_FOUR_ISLAND, 0 - call_if 1, EventScript_167CCD + call_if eq, EventScript_167CCD call EventScript_167CD1 end @@ -16,7 +16,7 @@ EventScript_167CCD:: @ 8167CCD EventScript_167CD1:: @ 8167CD1 checkflag FLAG_PENDING_DAYCARE_EGG - goto_if 0, EventScript_167CE1 + goto_if lt, EventScript_167CE1 setobjectxyperm 1, 16, 14 EventScript_167CE1:: @ 8167CE1 @@ -105,7 +105,7 @@ EventScript_167D9B:: @ 8167D9B EventScript_167DD1:: @ 8167DD1 specialvar VAR_RESULT, CalculatePlayerPartyCount compare_var_to_value VAR_RESULT, 6 - goto_if 5, EventScript_167DEB + goto_if ne, EventScript_167DEB msgbox gUnknown_81BF6F0 release end diff --git a/data/maps/FourIsland_IcefallCave_Back/scripts.inc b/data/maps/FourIsland_IcefallCave_Back/scripts.inc index d67ab3124..eadc1f469 100644 --- a/data/maps/FourIsland_IcefallCave_Back/scripts.inc +++ b/data/maps/FourIsland_IcefallCave_Back/scripts.inc @@ -4,7 +4,7 @@ FourIsland_IcefallCave_Back_MapScripts:: @ 8163D82 FourIsland_IcefallCave_Back_MapScript1_163D88:: @ 8163D88 compare_var_to_value VAR_MAP_SCENE_ICEFALL_CAVE_BACK, 1 - call_if 1, EventScript_163D94 + call_if eq, EventScript_163D94 end EventScript_163D94:: @ 8163D94 diff --git a/data/maps/FourIsland_PokemonDayCare/scripts.inc b/data/maps/FourIsland_PokemonDayCare/scripts.inc index 394b29334..a272aa5b3 100644 --- a/data/maps/FourIsland_PokemonDayCare/scripts.inc +++ b/data/maps/FourIsland_PokemonDayCare/scripts.inc @@ -30,7 +30,7 @@ EventScript_171993:: @ 8171993 special ChooseSendDaycareMon waitstate compare_var_to_value VAR_0x8004, 6 - goto_if 4, EventScript_1719F7 + goto_if ge, EventScript_1719F7 specialvar VAR_RESULT, CountPartyAliveNonEggMons_IgnoreVar0x8004Slot compare_var_to_value VAR_RESULT, 0 goto_if_eq EventScript_171A24 @@ -81,7 +81,7 @@ EventScript_171A38:: @ 8171A38 EventScript_171A41:: @ 8171A41 specialvar VAR_RESULT, GetNumLevelsGainedFromDaycare compare_var_to_value VAR_RESULT, 0 - call_if 5, EventScript_171A38 + call_if ne, EventScript_171A38 return EventScript_171A52:: @ 8171A52 diff --git a/data/maps/FuchsiaCity/scripts.inc b/data/maps/FuchsiaCity/scripts.inc index 78ed21f61..0d4369de9 100644 --- a/data/maps/FuchsiaCity/scripts.inc +++ b/data/maps/FuchsiaCity/scripts.inc @@ -5,9 +5,9 @@ FuchsiaCity_MapScripts:: @ 8166D75 FuchsiaCity_MapScript1_166D7B:: @ 8166D7B setworldmapflag FLAG_WORLD_MAP_FUCHSIA_CITY checkflag FLAG_0x272 - call_if 1, EventScript_166D91 + call_if eq, EventScript_166D91 checkflag FLAG_0x272 - call_if 0, EventScript_166D97 + call_if lt, EventScript_166D97 end EventScript_166D91:: @ 8166D91 diff --git a/data/maps/FuchsiaCity_Building1/scripts.inc b/data/maps/FuchsiaCity_Building1/scripts.inc index ec6548214..30405e80e 100644 --- a/data/maps/FuchsiaCity_Building1/scripts.inc +++ b/data/maps/FuchsiaCity_Building1/scripts.inc @@ -10,9 +10,9 @@ FuchsiaCity_Building1_EventScript_16D74C:: @ 816D74C goto_if_eq EventScript_16D780 msgbox gUnknown_8198DF9, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - call_if 1, EventScript_16D7E8 + call_if eq, EventScript_16D7E8 compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_16D7F1 + call_if eq, EventScript_16D7F1 release end @@ -26,9 +26,9 @@ EventScript_16D780:: @ 816D780 call EventScript_1A6675 checkplayergender compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_16D7D6 + call_if eq, EventScript_16D7D6 compare_var_to_value VAR_RESULT, 1 - call_if 1, EventScript_16D7DF + call_if eq, EventScript_16D7DF additem ITEM_HM04, 1 giveitemfanfaremsg gUnknown_8199068, ITEM_HM04 setflag FLAG_GOT_HM04 diff --git a/data/maps/FuchsiaCity_Gym/scripts.inc b/data/maps/FuchsiaCity_Gym/scripts.inc index e387effbb..d3e2df509 100644 --- a/data/maps/FuchsiaCity_Gym/scripts.inc +++ b/data/maps/FuchsiaCity_Gym/scripts.inc @@ -5,7 +5,7 @@ FuchsiaCity_Gym_EventScript_16D54E:: @ 816D54E famechecker FAMECHECKER_KOGA, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 trainerbattle 1, TRAINER_LEADER_KOGA, 0, Text_19832E, Text_198444, EventScript_16D580 checkflag FLAG_0x259 - goto_if 0, EventScript_16D5A6 + goto_if lt, EventScript_16D5A6 msgbox gUnknown_8198481 release end diff --git a/data/maps/FuchsiaCity_House3/scripts.inc b/data/maps/FuchsiaCity_House3/scripts.inc index e295ad46d..0cdb899b9 100644 --- a/data/maps/FuchsiaCity_House3/scripts.inc +++ b/data/maps/FuchsiaCity_House3/scripts.inc @@ -15,7 +15,7 @@ EventScript_16D8B0:: @ 816D8B0 special sub_80BF8FC waitstate compare_var_to_value VAR_0x8004, 6 - goto_if 4, EventScript_16D941 + goto_if ge, EventScript_16D941 special sub_80BFC14 compare_var_to_value VAR_RESULT, 1 goto_if_eq EventScript_16D937 diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc index d9bcea13d..326dba64c 100644 --- a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc +++ b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc @@ -127,11 +127,11 @@ EventScript_16D3CA:: @ 816D3CA .byte 0 .byte 0 compare_var_to_value VAR_0x4002, 0 - call_if 1, EventScript_16D44C + call_if eq, EventScript_16D44C compare_var_to_value VAR_0x4002, 1 - call_if 1, EventScript_16D441 + call_if eq, EventScript_16D441 compare_var_to_value VAR_0x4002, 2 - call_if 1, EventScript_16D457 + call_if eq, EventScript_16D457 special EnterSafariMode setvar VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 2 warp MAP_SAFARI_ZONE_CENTER, 255, 26, 30 @@ -156,7 +156,7 @@ EventScript_16D457:: @ 816D457 EventScript_16D462:: @ 816D462 countpokemon compare_var_to_value VAR_RESULT, 6 - goto_if 5, EventScript_1A77A9 + goto_if ne, EventScript_1A77A9 specialvar VAR_RESULT, sub_80CABD0 compare_var_to_value VAR_RESULT, 1 goto_if_eq EventScript_1A77A9 diff --git a/data/maps/IndigoPlateau_Exterior/scripts.inc b/data/maps/IndigoPlateau_Exterior/scripts.inc index a3112a2cf..aaeb0436f 100644 --- a/data/maps/IndigoPlateau_Exterior/scripts.inc +++ b/data/maps/IndigoPlateau_Exterior/scripts.inc @@ -6,7 +6,7 @@ IndigoPlateau_Exterior_MapScripts:: @ 816723B IndigoPlateau_Exterior_MapScript1_167246:: @ 8167246 setworldmapflag FLAG_WORLD_MAP_INDIGO_PLATEAU_EXTERIOR compare_var_to_value VAR_MAP_SCENE_INDIGO_PLATEAU_EXTERIOR, 1 - call_if 1, EventScript_167255 + call_if eq, EventScript_167255 end EventScript_167255:: @ 8167255 diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc b/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc index 048ca96d6..387180de0 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc +++ b/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc @@ -7,7 +7,7 @@ IndigoPlateau_PokemonCenter_1F_MapScript1_16EA65:: @ 816EA65 setrespawn SPAWN_INDIGO_PLATEAU specialvar VAR_RESULT, IsNationalPokedexEnabled compare_var_to_value VAR_RESULT, 1 - call_if 1, EventScript_16EA79 + call_if eq, EventScript_16EA79 end EventScript_16EA79:: @ 816EA79 diff --git a/data/maps/LavenderTown_House2/scripts.inc b/data/maps/LavenderTown_House2/scripts.inc index 0a5c708ab..f8d668e83 100644 --- a/data/maps/LavenderTown_House2/scripts.inc +++ b/data/maps/LavenderTown_House2/scripts.inc @@ -16,9 +16,9 @@ EventScript_16B287:: @ 816B287 special sub_80BF8FC waitstate compare_var_to_value VAR_0x8004, 6 - goto_if 0, EventScript_16B2B4 + goto_if lt, EventScript_16B2B4 compare_var_to_value VAR_0x8004, 6 - goto_if 4, EventScript_16B2AA + goto_if ge, EventScript_16B2AA end EventScript_16B2AA:: @ 816B2AA diff --git a/data/maps/MtEmber_Exterior/scripts.inc b/data/maps/MtEmber_Exterior/scripts.inc index 9aa791184..7c17eaa54 100644 --- a/data/maps/MtEmber_Exterior/scripts.inc +++ b/data/maps/MtEmber_Exterior/scripts.inc @@ -6,7 +6,7 @@ MtEmber_Exterior_MapScripts:: @ 8163946 MtEmber_Exterior_MapScript1_163951:: @ 8163951 setworldmapflag FLAG_WORLD_MAP_MT_EMBER_EXTERIOR compare_var_to_value VAR_MAP_SCENE_MT_EMBER_EXTERIOR, 2 - call_if 1, EventScript_163960 + call_if eq, EventScript_163960 end EventScript_163960:: @ 8163960 @@ -16,7 +16,7 @@ EventScript_163960:: @ 8163960 MtEmber_Exterior_MapScript2_163969:: @ 8163969 compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4 - call_if 4, EventScript_163975 + call_if ge, EventScript_163975 end EventScript_163975:: @ 8163975 diff --git a/data/maps/MtEmber_Summit/scripts.inc b/data/maps/MtEmber_Summit/scripts.inc index d1330d5ce..90816ad4a 100644 --- a/data/maps/MtEmber_Summit/scripts.inc +++ b/data/maps/MtEmber_Summit/scripts.inc @@ -5,19 +5,19 @@ MtEmber_Summit_MapScripts:: @ 8163AFC MtEmber_Summit_MapScript2_163B07:: @ 8163B07 checkflag FLAG_0x807 - call_if 1, EventScript_163B11 + call_if eq, EventScript_163B11 end EventScript_163B11:: @ 8163B11 specialvar VAR_RESULT, sub_80CA74C compare_var_to_value VAR_RESULT, 7 - goto_if 5, EventScript_1A77A9 + goto_if ne, EventScript_1A77A9 removeobject VAR_LAST_TALKED return MtEmber_Summit_MapScript1_163B25:: @ 8163B25 checkflag FLAG_0x2BD - call_if 0, EventScript_163B2F + call_if lt, EventScript_163B2F end EventScript_163B2F:: @ 8163B2F diff --git a/data/maps/MtMoon_B2F/scripts.inc b/data/maps/MtMoon_B2F/scripts.inc index 5792deb38..b8a4d1efb 100644 --- a/data/maps/MtMoon_B2F/scripts.inc +++ b/data/maps/MtMoon_B2F/scripts.inc @@ -4,7 +4,7 @@ MtMoon_B2F_MapScripts:: @ 8160699 MtMoon_B2F_MapScript1_16069F:: @ 816069F checkflag FLAG_GOT_FOSSIL_FROM_MT_MOON - call_if 0, EventScript_1606A9 + call_if lt, EventScript_1606A9 end EventScript_1606A9:: @ 81606A9 diff --git a/data/maps/NavelRock_Base/scripts.inc b/data/maps/NavelRock_Base/scripts.inc index 9d8d892f2..c36118bb4 100644 --- a/data/maps/NavelRock_Base/scripts.inc +++ b/data/maps/NavelRock_Base/scripts.inc @@ -5,9 +5,9 @@ NavelRock_Base_MapScripts:: @ 81650E7 NavelRock_Base_MapScript1_1650F2:: @ 81650F2 checkflag FLAG_0x2F2 - call_if 1, EventScript_165105 + call_if eq, EventScript_165105 checkflag FLAG_0x2F2 - call_if 0, EventScript_165109 + call_if lt, EventScript_165109 end EventScript_165105:: @ 8165105 @@ -22,13 +22,13 @@ EventScript_165109:: @ 8165109 NavelRock_Base_MapScript2_165116:: @ 8165116 checkflag FLAG_0x807 - call_if 1, EventScript_165120 + call_if eq, EventScript_165120 end EventScript_165120:: @ 8165120 specialvar VAR_RESULT, sub_80CA74C compare_var_to_value VAR_RESULT, 7 - goto_if 5, EventScript_1A77A9 + goto_if ne, EventScript_1A77A9 removeobject 1 return diff --git a/data/maps/NavelRock_Summit/scripts.inc b/data/maps/NavelRock_Summit/scripts.inc index ad89031bb..250334b91 100644 --- a/data/maps/NavelRock_Summit/scripts.inc +++ b/data/maps/NavelRock_Summit/scripts.inc @@ -5,9 +5,9 @@ NavelRock_Summit_MapScripts:: @ 8164F9F NavelRock_Summit_MapScript1_164FAA:: @ 8164FAA checkflag FLAG_0x2F3 - call_if 1, EventScript_164FBD + call_if eq, EventScript_164FBD checkflag FLAG_0x2F3 - call_if 0, EventScript_164FC6 + call_if lt, EventScript_164FC6 end EventScript_164FBD:: @ 8164FBD @@ -25,13 +25,13 @@ EventScript_164FC6:: @ 8164FC6 NavelRock_Summit_MapScript2_164FDD:: @ 8164FDD checkflag FLAG_0x807 - call_if 1, EventScript_164FE7 + call_if eq, EventScript_164FE7 end EventScript_164FE7:: @ 8164FE7 specialvar VAR_RESULT, sub_80CA74C compare_var_to_value VAR_RESULT, 7 - goto_if 5, EventScript_1A77A9 + goto_if ne, EventScript_1A77A9 removeobject 1 return diff --git a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc index 32f26b119..d325b9010 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc @@ -7,9 +7,9 @@ OneIsland_PokemonCenter_1F_MapScripts:: @ 8170BF8 OneIsland_PokemonCenter_1F_MapScript3_170C0D:: @ 8170C0D compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 - call_if 4, EventScript_170C22 + call_if ge, EventScript_170C22 checkflag FLAG_0x844 - call_if 1, EventScript_170C36 + call_if eq, EventScript_170C36 end EventScript_170C22:: @ 8170C22 @@ -29,11 +29,11 @@ EventScript_170C36:: @ 8170C36 OneIsland_PokemonCenter_1F_MapScript1_170C4E:: @ 8170C4E setrespawn SPAWN_ONE_ISLAND compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 6 - call_if 1, EventScript_170C73 + call_if eq, EventScript_170C73 compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 0 - call_if 1, EventScript_170C79 + call_if eq, EventScript_170C79 compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 2 - call_if 1, EventScript_170C90 + call_if eq, EventScript_170C90 end EventScript_170C73:: @ 8170C73 @@ -85,9 +85,9 @@ EventScript_170CB1:: @ 8170CB1 applymovement 255, Movement_1A75EB waitmovement 0 checkflag FLAG_SYS_GAME_CLEAR - call_if 1, EventScript_170E34 + call_if eq, EventScript_170E34 checkflag FLAG_SYS_GAME_CLEAR - call_if 0, EventScript_170E3D + call_if lt, EventScript_170E3D applymovement 3, Movement_1A75ED waitmovement 0 msgbox gUnknown_81A0E17 @@ -113,9 +113,9 @@ EventScript_170CB1:: @ 8170CB1 giveitemfanfaremsg gUnknown_81A231B, ITEM_TRI_PASS, 1, MUS_FAN5 msgbox gUnknown_81A1150 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 - call_if 4, EventScript_170E46 + call_if ge, EventScript_170E46 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 - call_if 0, EventScript_170E58 + call_if lt, EventScript_170E58 setflag FLAG_0x845 msgbox gUnknown_81A1230 closemessage @@ -467,13 +467,13 @@ EventScript_1711DA:: @ 81711DA msgbox gUnknown_81A13B8 closemessage compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_1712E4 + call_if eq, EventScript_1712E4 compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_1712EF + call_if eq, EventScript_1712EF compare_var_to_value VAR_0x4001, 3 - call_if 1, EventScript_1712FA + call_if eq, EventScript_1712FA compare_var_to_value VAR_0x4001, 4 - call_if 1, EventScript_171305 + call_if eq, EventScript_171305 delay 10 msgbox gUnknown_81A13CB applymovement 255, Movement_1A75ED diff --git a/data/maps/PalletTown/scripts.inc b/data/maps/PalletTown/scripts.inc index a93511b60..860b6e508 100644 --- a/data/maps/PalletTown/scripts.inc +++ b/data/maps/PalletTown/scripts.inc @@ -6,18 +6,18 @@ PalletTown_MapScripts:: @ 816545A PalletTown_MapScript1_165465:: @ 8165465 setworldmapflag FLAG_WORLD_MAP_PALLET_TOWN checkflag FLAG_0x291 - call_if 1, EventScript_165488 + call_if eq, EventScript_165488 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 0 - call_if 1, EventScript_1654A8 + call_if eq, EventScript_1654A8 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1 - call_if 1, EventScript_1654A2 + call_if eq, EventScript_1654A2 end EventScript_165488:: @ 8165488 checkflag FLAG_PALLET_TOWN_LADY_MOVED_FROM_SIGN - goto_if 0, EventScript_1A77A9 + goto_if lt, EventScript_1A77A9 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1 - goto_if 4, EventScript_1A77A9 + goto_if ge, EventScript_1A77A9 setvar VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1 return @@ -51,7 +51,7 @@ EventScript_1654D8:: @ 81654D8 applymovement 3, Movement_1655AF waitmovement 0 checkflag FLAG_WORLD_MAP_ONE_ISLAND - goto_if 0, EventScript_1655A1 + goto_if lt, EventScript_1655A1 msgbox gUnknown_817D8BF setvar VAR_0x8004, 0 specialvar VAR_RESULT, Special_GetPokedexCount @@ -60,7 +60,7 @@ EventScript_1654D8:: @ 81654D8 getnumberstring 0, VAR_0x8008 getnumberstring 1, VAR_0x8009 compare_var_to_value VAR_0x8009, 60 - goto_if 0, EventScript_165593 + goto_if lt, EventScript_165593 msgbox gUnknown_817D9AA closemessage playbgm MUS_ANNAI, 0 @@ -200,17 +200,17 @@ EventScript_165605:: @ 8165605 delay 30 addobject 3 compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_1656B8 + call_if eq, EventScript_1656B8 compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_1656C3 + call_if eq, EventScript_1656C3 delay 30 msgbox gUnknown_817D74A closemessage delay 30 compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_1656CE + call_if eq, EventScript_1656CE compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_1656E0 + call_if eq, EventScript_1656E0 opendoor 16, 13 waitdooranim applymovement 3, Movement_16572E @@ -393,9 +393,9 @@ PalletTown_EventScript_16575C:: @ 816575C msgbox gUnknown_81B1C9F closemessage compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_1657D7 + call_if eq, EventScript_1657D7 compare_var_to_value VAR_FACING, 4 - call_if 5, EventScript_1657E2 + call_if ne, EventScript_1657E2 moveobjectoffscreen 1 setflag FLAG_TEMP_2 release diff --git a/data/maps/PalletTown_GarysHouse/scripts.inc b/data/maps/PalletTown_GarysHouse/scripts.inc index 1298689f5..e01aea334 100644 --- a/data/maps/PalletTown_GarysHouse/scripts.inc +++ b/data/maps/PalletTown_GarysHouse/scripts.inc @@ -4,9 +4,9 @@ PalletTown_GarysHouse_MapScripts:: @ 8168D27 PalletTown_GarysHouse_MapScript1_168D2D:: @ 8168D2D compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 - call_if 0, EventScript_168D44 + call_if lt, EventScript_168D44 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 - call_if 4, EventScript_168D50 + call_if ge, EventScript_168D50 end EventScript_168D44:: @ 8168D44 @@ -31,7 +31,7 @@ PalletTown_GarysHouse_EventScript_168D56:: @ 8168D56 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 1 goto_if_eq EventScript_168EF6 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1 - goto_if 4, EventScript_168DAF + goto_if ge, EventScript_168DAF msgbox gUnknown_818D58C closemessage applymovement 1, Movement_1A75E5 @@ -50,7 +50,7 @@ EventScript_168DB9:: @ 8168DB9 goto_if_eq EventScript_1A7AE0 special sub_8112364 compare_var_to_value VAR_0x4025, 500 - goto_if 0, EventScript_168E46 + goto_if lt, EventScript_168E46 msgbox gUnknown_818D7D3, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 goto_if_eq EventScript_168E3C @@ -60,7 +60,7 @@ EventScript_168DB9:: @ 8168DB9 lock faceplayer compare_var_to_value VAR_0x8004, 6 - goto_if 4, EventScript_168E3C + goto_if ge, EventScript_168E3C specialvar VAR_RESULT, sub_80CAD54 compare_var_to_value VAR_RESULT, SPECIES_EGG goto_if_eq EventScript_168E32 diff --git a/data/maps/PalletTown_PlayersHouse_1F/scripts.inc b/data/maps/PalletTown_PlayersHouse_1F/scripts.inc index 89eabeea1..e988c9c9c 100644 --- a/data/maps/PalletTown_PlayersHouse_1F/scripts.inc +++ b/data/maps/PalletTown_PlayersHouse_1F/scripts.inc @@ -8,9 +8,9 @@ PalletTown_PlayersHouse_1F_EventScript_168C09:: @ 8168C09 goto_if_eq EventScript_168C4A checkplayergender compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_168C38 + call_if eq, EventScript_168C38 compare_var_to_value VAR_RESULT, 1 - call_if 1, EventScript_168C41 + call_if eq, EventScript_168C41 closemessage applymovement 1, Movement_1A75E5 waitmovement 0 @@ -44,9 +44,9 @@ PalletTown_PlayersHouse_1F_EventScript_168C62:: @ 8168C62 EventScript_168C78:: @ 8168C78 checkplayergender compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_168C91 + call_if eq, EventScript_168C91 compare_var_to_value VAR_RESULT, 1 - call_if 1, EventScript_168C9A + call_if eq, EventScript_168C9A releaseall end diff --git a/data/maps/PalletTown_PlayersHouse_2F/scripts.inc b/data/maps/PalletTown_PlayersHouse_2F/scripts.inc index 51865301c..3b7d6876f 100644 --- a/data/maps/PalletTown_PlayersHouse_2F/scripts.inc +++ b/data/maps/PalletTown_PlayersHouse_2F/scripts.inc @@ -5,7 +5,7 @@ PalletTown_PlayersHouse_2F_MapScripts:: @ 8168CA3 PalletTown_PlayersHouse_2F_MapScript1_168CAE:: @ 8168CAE compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PLAYERS_HOUSE_2F, 0 - call_if 1, EventScript_168CBA + call_if eq, EventScript_168CBA end EventScript_168CBA:: @ 8168CBA diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc index ba871583c..865b72335 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc +++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc @@ -7,13 +7,13 @@ PalletTown_ProfessorOaksLab_MapScripts:: @ 8168F7E PalletTown_ProfessorOaksLab_MapScript1_168F8E:: @ 8168F8E setflag FLAG_0x2CF compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1 - call_if 1, EventScript_168FC6 + call_if eq, EventScript_168FC6 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 7 - call_if 1, EventScript_168FD5 + call_if eq, EventScript_168FD5 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 8 - call_if 1, EventScript_168FC0 + call_if eq, EventScript_168FC0 checkflag FLAG_GOT_POKEBALLS_FROM_OAK_AFTER_22_RIVAL - call_if 1, EventScript_168FBC + call_if eq, EventScript_168FBC end EventScript_168FBC:: @ 8168FBC @@ -67,32 +67,32 @@ EventScript_169035:: @ 8169035 msgbox gUnknown_818EE60 closemessage compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_169174 + call_if eq, EventScript_169174 compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_1691BB + call_if eq, EventScript_1691BB compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_169194 + call_if eq, EventScript_169194 compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_169194 + call_if eq, EventScript_169194 msgbox gUnknown_818EF59 fadedefaultbgm msgbox gUnknown_818F004 compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_1691DB + call_if eq, EventScript_1691DB compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_1691E6 + call_if eq, EventScript_1691E6 textcolor 3 msgbox gUnknown_818F062 closemessage call EventScript_1A6675 compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_1691F1 + call_if eq, EventScript_1691F1 compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_1691FC + call_if eq, EventScript_1691FC compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_169215 + call_if eq, EventScript_169215 compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_169227 + call_if eq, EventScript_169227 addobject 9 addobject 10 delay 30 @@ -102,13 +102,13 @@ EventScript_169035:: @ 8169035 removeobject 10 delay 30 compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_169845 + call_if eq, EventScript_169845 compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_169850 + call_if eq, EventScript_169850 compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_16985B + call_if eq, EventScript_16985B compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_16986D + call_if eq, EventScript_16986D textcolor 3 playfanfare MUS_FAN5 message Text_18F0E8 @@ -121,13 +121,13 @@ EventScript_169035:: @ 8169035 closemessage playbgm MUS_RIVAL2, 0 compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_169B69 + call_if eq, EventScript_169B69 compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_169B7B + call_if eq, EventScript_169B7B compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_169B7B + call_if eq, EventScript_169B7B compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_169B7B + call_if eq, EventScript_169B7B removeobject 8 fadedefaultbgm setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 8 @@ -493,11 +493,11 @@ EventScript_1694C2:: @ 81694C2 closemessage playbgm MUS_RIVAL2, 0 compare_var_to_value VAR_0x4002, 1 - call_if 1, EventScript_169504 + call_if eq, EventScript_169504 compare_var_to_value VAR_0x4002, 2 - call_if 1, EventScript_169516 + call_if eq, EventScript_169516 compare_var_to_value VAR_0x4002, 3 - call_if 1, EventScript_169528 + call_if eq, EventScript_169528 removeobject 8 playse SE_KAIDAN fadedefaultbgm @@ -608,7 +608,7 @@ PalletTown_ProfessorOaksLab_EventScript_169595:: @ 8169595 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 6 goto_if_eq EventScript_1698D6 compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 1 - goto_if 4, EventScript_16961E + goto_if ge, EventScript_16961E compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 4 goto_if_eq EventScript_169614 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 @@ -646,13 +646,13 @@ EventScript_16961E:: @ 816961E msgbox gUnknown_818DE8D closemessage compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_169A82 + call_if eq, EventScript_169A82 compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_169AC1 + call_if eq, EventScript_169AC1 compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_169A9E + call_if eq, EventScript_169A9E compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_169A9E + call_if eq, EventScript_169A9E fadedefaultbgm msgbox gUnknown_818DE99 closemessage @@ -663,23 +663,23 @@ EventScript_16961E:: @ 816961E applymovement 4, Movement_1A75DD waitmovement 0 compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_169ADD + call_if eq, EventScript_169ADD compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_169B14 + call_if eq, EventScript_169B14 compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_169AF5 + call_if eq, EventScript_169AF5 compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_169B86 + call_if eq, EventScript_169B86 msgbox gUnknown_818E508 closemessage compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_169882 + call_if eq, EventScript_169882 compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_16988D + call_if eq, EventScript_16988D compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_1698A6 + call_if eq, EventScript_1698A6 compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_1698B8 + call_if eq, EventScript_1698B8 msgbox gUnknown_818E536 closemessage delay 40 @@ -692,13 +692,13 @@ EventScript_16961E:: @ 816961E removeobject 10 delay 25 compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_169845 + call_if eq, EventScript_169845 compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_169850 + call_if eq, EventScript_169850 compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_16985B + call_if eq, EventScript_16985B compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_16986D + call_if eq, EventScript_16986D delay 10 textcolor 3 playfanfare MUS_FAN5 @@ -717,24 +717,24 @@ EventScript_16961E:: @ 816961E msgbox gUnknown_818E784 msgbox gUnknown_818DEC8 compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_169B33 + call_if eq, EventScript_169B33 compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_169B45 + call_if eq, EventScript_169B45 compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_169B57 + call_if eq, EventScript_169B57 compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_169B57 + call_if eq, EventScript_169B57 msgbox gUnknown_818DEF3 closemessage playbgm MUS_RIVAL2, 0 compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_169B69 + call_if eq, EventScript_169B69 compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_169B7B + call_if eq, EventScript_169B7B compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_169B7B + call_if eq, EventScript_169B7B compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_169B7B + call_if eq, EventScript_169B7B removeobject 8 fadedefaultbgm setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 6 @@ -857,13 +857,13 @@ EventScript_169913:: @ 8169913 message Text_1A7291 waitmessage compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_169964 + call_if eq, EventScript_169964 compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_16996F + call_if eq, EventScript_16996F compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_16997A + call_if eq, EventScript_16997A compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_169985 + call_if eq, EventScript_169985 applymovement 4, Movement_1A75E1 waitmovement 0 closemessage @@ -971,9 +971,9 @@ EventScript_1699CE:: @ 81699CE call EventScript_1A737B closemessage compare_var_to_value VAR_0x8009, 60 - goto_if 0, EventScript_1699F9 + goto_if lt, EventScript_1699F9 checkflag FLAG_WORLD_MAP_ONE_ISLAND - goto_if 0, EventScript_1699F9 + goto_if lt, EventScript_1699F9 delay 30 msgbox gUnknown_818EDF5 goto EventScript_169035 @@ -1000,7 +1000,7 @@ EventScript_1699FB:: @ 81699FB EventScript_169A34:: @ 8169A34 compare_var_to_value VAR_MAP_SCENE_ROUTE22, 2 - goto_if 4, EventScript_169A45 + goto_if ge, EventScript_169A45 goto EventScript_169A6E end @@ -1154,7 +1154,7 @@ PalletTown_ProfessorOaksLab_EventScript_169BAB:: @ 8169BAB setvar VAR_OAKSLAB_RIVAL_STARTER_SPECIES, SPECIES_CHARMANDER setvar VAR_OAKSLAB_RIVAL_STARTER_OBJID, 7 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 - goto_if 4, EventScript_169DE4 + goto_if ge, EventScript_169DE4 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2 goto_if_eq EventScript_169BE1 msgbox gUnknown_818EA19 @@ -1270,7 +1270,7 @@ Movement_RivalTakesHisStarter:: @ 8169D2F waitfanfare setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 checkflag FLAG_PALLET_TOWN_LADY_MOVED_FROM_SIGN - call_if 1, EventScript_169D5C + call_if eq, EventScript_169D5C release end @@ -1314,7 +1314,7 @@ PalletTown_ProfessorOaksLab_EventScript_169D78:: @ 8169D78 setvar VAR_OAKSLAB_RIVAL_STARTER_SPECIES, SPECIES_BULBASAUR setvar VAR_OAKSLAB_RIVAL_STARTER_OBJID, 5 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 - goto_if 4, EventScript_169DE4 + goto_if ge, EventScript_169DE4 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2 goto_if_eq EventScript_169BE1 msgbox gUnknown_818EA19 @@ -1329,7 +1329,7 @@ PalletTown_ProfessorOaksLab_EventScript_169DAE:: @ 8169DAE setvar VAR_OAKSLAB_RIVAL_STARTER_SPECIES, SPECIES_SQUIRTLE setvar VAR_OAKSLAB_RIVAL_STARTER_OBJID, 6 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 - goto_if 4, EventScript_169DE4 + goto_if ge, EventScript_169DE4 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2 goto_if_eq EventScript_169BE1 msgbox gUnknown_818EA19 @@ -1394,7 +1394,7 @@ PalletTown_ProfessorOaksLab_EventScript_169E71:: @ 8169E71 PalletTown_ProfessorOaksLab_EventScript_169E7A:: @ 8169E7A lockall compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 6 - goto_if 4, EventScript_169E90 + goto_if ge, EventScript_169E90 msgbox gUnknown_818EA84 releaseall end diff --git a/data/maps/PewterCity/scripts.inc b/data/maps/PewterCity/scripts.inc index 6d61fd0a1..6e50aefda 100644 --- a/data/maps/PewterCity/scripts.inc +++ b/data/maps/PewterCity/scripts.inc @@ -14,7 +14,7 @@ PewterCity_EventScript_165B9D:: @ 8165B9D closemessage playbgm MUS_ANNAI, 0 compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_165BD3 + call_if eq, EventScript_165BD3 msgbox gUnknown_817E6C7 closemessage applymovement 5, Movement_165D83 @@ -446,11 +446,11 @@ EventScript_165DBE:: @ 8165DBE closemessage playbgm MUS_ANNAI, 0 compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_165E0A + call_if eq, EventScript_165E0A compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_165E26 + call_if eq, EventScript_165E26 compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_165E42 + call_if eq, EventScript_165E42 msgbox gUnknown_817E6C7 closemessage applymovement 5, Movement_165D83 @@ -1039,13 +1039,13 @@ PewterCity_EventScript_16607E:: @ 816607E delay 10 playbgm MUS_ANNAI, 0 compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_1660EE + call_if eq, EventScript_1660EE compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_166100 + call_if eq, EventScript_166100 compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_166112 + call_if eq, EventScript_166112 compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_166124 + call_if eq, EventScript_166124 msgbox gUnknown_817E5AC closemessage delay 10 @@ -1417,11 +1417,11 @@ PewterCity_EventScript_1662D1:: @ 81662D1 EventScript_1662DE:: @ 81662DE textcolor 0 compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_1663CA + call_if eq, EventScript_1663CA compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_1663CA + call_if eq, EventScript_1663CA compare_var_to_value VAR_0x4001, 3 - call_if 1, EventScript_1663CA + call_if eq, EventScript_1663CA waitse playse SE_PIN applymovement 7, Movement_1A75DB @@ -1430,13 +1430,13 @@ EventScript_1662DE:: @ 81662DE waitmovement 0 msgbox gUnknown_817E902 compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_1663D5 + call_if eq, EventScript_1663D5 compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_1663DA + call_if eq, EventScript_1663DA compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_1663E6 + call_if eq, EventScript_1663E6 compare_var_to_value VAR_0x4001, 3 - call_if 1, EventScript_1663FC + call_if eq, EventScript_1663FC msgbox gUnknown_817E90C textcolor 3 playfanfare MUS_FAN5 @@ -1452,13 +1452,13 @@ EventScript_1662DE:: @ 81662DE msgbox gUnknown_817EA06 closemessage compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_166412 + call_if eq, EventScript_166412 compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_16641D + call_if eq, EventScript_16641D compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_166428 + call_if eq, EventScript_166428 compare_var_to_value VAR_0x4001, 3 - call_if 1, EventScript_166433 + call_if eq, EventScript_166433 delay 30 textcolor 3 msgbox gUnknown_817EA36 diff --git a/data/maps/PewterCity_Gym/scripts.inc b/data/maps/PewterCity_Gym/scripts.inc index f3b88fc00..96982e762 100644 --- a/data/maps/PewterCity_Gym/scripts.inc +++ b/data/maps/PewterCity_Gym/scripts.inc @@ -5,7 +5,7 @@ PewterCity_Gym_EventScript_16A593:: @ 816A593 famechecker FAMECHECKER_BROCK, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 trainerbattle 1, TRAINER_LEADER_BROCK, 0, Text_190CD4, Text_190E4F, EventScript_16A5C5 checkflag FLAG_0x254 - goto_if 0, EventScript_16A5F3 + goto_if lt, EventScript_16A5F3 msgbox gUnknown_819110F release end diff --git a/data/maps/PewterCity_Museum_1F/scripts.inc b/data/maps/PewterCity_Museum_1F/scripts.inc index 3b83cbf3a..75bb76b8e 100644 --- a/data/maps/PewterCity_Museum_1F/scripts.inc +++ b/data/maps/PewterCity_Museum_1F/scripts.inc @@ -82,11 +82,11 @@ EventScript_16A402:: @ 816A402 goto_if_eq EventScript_16A476 closemessage compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_16A455 + call_if eq, EventScript_16A455 compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_16A460 + call_if eq, EventScript_16A460 compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_16A46B + call_if eq, EventScript_16A46B playse SE_SHOP takemoney 50, 0 updatemoneybox 0, 0, 0 diff --git a/data/maps/PokemonLeague_AgathasRoom/scripts.inc b/data/maps/PokemonLeague_AgathasRoom/scripts.inc index 3e7a3b9cc..f06e28e73 100644 --- a/data/maps/PokemonLeague_AgathasRoom/scripts.inc +++ b/data/maps/PokemonLeague_AgathasRoom/scripts.inc @@ -12,9 +12,9 @@ PokemonLeague_AgathasRoom_MapScript1_162825:: @ 8162825 PokemonLeague_AgathasRoom_MapScript2_162830:: @ 8162830 checkflag FLAG_DEFEATED_AGATHA - call_if 1, EventScript_16284B + call_if eq, EventScript_16284B compare_var_to_value VAR_MAP_SCENE_POKEMON_LEAGUE, 3 - call_if 1, EventScript_162845 + call_if eq, EventScript_162845 end EventScript_162845:: @ 8162845 @@ -54,15 +54,15 @@ PokemonLeague_AgathasRoom_EventScript_162877:: @ 8162877 famechecker FAMECHECKER_AGATHA, 4 famechecker FAMECHECKER_OAK, 4 checkflag FLAG_SYS_GAME_CLEAR - call_if 0, EventScript_1628E9 + call_if lt, EventScript_1628E9 checkflag FLAG_SYS_GAME_CLEAR - call_if 1, EventScript_1628F2 + call_if eq, EventScript_1628F2 setflag FLAG_TEMP_3 setflag FLAG_TEMP_5 checkflag FLAG_0x844 - call_if 0, EventScript_1628FB + call_if lt, EventScript_1628FB checkflag FLAG_0x844 - call_if 1, EventScript_162906 + call_if eq, EventScript_162906 clearflag FLAG_TEMP_5 goto EventScript_16291B diff --git a/data/maps/PokemonLeague_BrunosRoom/scripts.inc b/data/maps/PokemonLeague_BrunosRoom/scripts.inc index 3e007f7e0..a6196699f 100644 --- a/data/maps/PokemonLeague_BrunosRoom/scripts.inc +++ b/data/maps/PokemonLeague_BrunosRoom/scripts.inc @@ -12,9 +12,9 @@ PokemonLeague_BrunosRoom_MapScript1_16269A:: @ 816269A PokemonLeague_BrunosRoom_MapScript2_1626A5:: @ 81626A5 checkflag FLAG_DEFEATED_BRUNO - call_if 1, EventScript_1626C0 + call_if eq, EventScript_1626C0 compare_var_to_value VAR_MAP_SCENE_POKEMON_LEAGUE, 2 - call_if 1, EventScript_1626BA + call_if eq, EventScript_1626BA end EventScript_1626BA:: @ 81626BA @@ -53,15 +53,15 @@ PokemonLeague_BrunosRoom_EventScript_1626EC:: @ 81626EC famechecker FAMECHECKER_BRUNO, 0 famechecker FAMECHECKER_BRUNO, 1 checkflag FLAG_SYS_GAME_CLEAR - call_if 0, EventScript_162751 + call_if lt, EventScript_162751 checkflag FLAG_SYS_GAME_CLEAR - call_if 1, EventScript_16275A + call_if eq, EventScript_16275A setflag FLAG_TEMP_3 setflag FLAG_TEMP_5 checkflag FLAG_0x844 - call_if 0, EventScript_162763 + call_if lt, EventScript_162763 checkflag FLAG_0x844 - call_if 1, EventScript_16276E + call_if eq, EventScript_16276E clearflag FLAG_TEMP_5 goto EventScript_1627B0 @@ -88,13 +88,13 @@ EventScript_162779:: @ 8162779 msgbox gUnknown_8178420 closemessage compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_1627FA + call_if eq, EventScript_1627FA compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_1627EF + call_if eq, EventScript_1627EF compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_162805 + call_if eq, EventScript_162805 compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_162805 + call_if eq, EventScript_162805 release end @@ -104,13 +104,13 @@ EventScript_1627B0:: @ 81627B0 msgbox gUnknown_8178420 closemessage compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_1627FA + call_if eq, EventScript_1627FA compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_1627EF + call_if eq, EventScript_1627EF compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_162805 + call_if eq, EventScript_162805 compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_162805 + call_if eq, EventScript_162805 release end diff --git a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc index f3835ed30..61e86d7c7 100644 --- a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc +++ b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc @@ -8,11 +8,11 @@ PokemonLeague_ChampionsRoom_MapScript2_162AF2:: @ 8162AF2 setvar VAR_0x8004, 4 call EventScript_1A75D5 compare_var_to_value VAR_STARTER_MON, 2 - call_if 1, EventScript_162B1E + call_if eq, EventScript_162B1E compare_var_to_value VAR_STARTER_MON, 1 - call_if 1, EventScript_162B31 + call_if eq, EventScript_162B31 compare_var_to_value VAR_STARTER_MON, 0 - call_if 1, EventScript_162B44 + call_if eq, EventScript_162B44 end EventScript_162B1E:: @ 8162B1E @@ -60,9 +60,9 @@ EventScript_162B76:: @ 8162B76 waitmovement 0 delay 20 checkflag FLAG_SYS_GAME_CLEAR - call_if 0, EventScript_162CB3 + call_if lt, EventScript_162CB3 checkflag FLAG_SYS_GAME_CLEAR - call_if 1, EventScript_162CBC + call_if eq, EventScript_162CBC special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 goto_if_eq EventScript_162C68 @@ -70,9 +70,9 @@ EventScript_162B76:: @ 8162B76 setflag FLAG_TEMP_5 savebgm MUS_WIN_GYM checkflag FLAG_0x844 - call_if 0, EventScript_162C6F + call_if lt, EventScript_162C6F checkflag FLAG_0x844 - call_if 1, EventScript_162C91 + call_if eq, EventScript_162C91 setflag FLAG_TEMP_4 clearflag FLAG_TEMP_5 setflag FLAG_DEFEATED_CHAMP @@ -117,20 +117,20 @@ EventScript_162C68:: @ 8162C68 EventScript_162C6F:: @ 8162C6F compare_var_to_value VAR_STARTER_MON, 2 - call_if 1, EventScript_162CC5 + call_if eq, EventScript_162CC5 compare_var_to_value VAR_STARTER_MON, 1 - call_if 1, EventScript_162CD0 + call_if eq, EventScript_162CD0 compare_var_to_value VAR_STARTER_MON, 0 - call_if 1, EventScript_162CDB + call_if eq, EventScript_162CDB return EventScript_162C91:: @ 8162C91 compare_var_to_value VAR_STARTER_MON, 2 - call_if 1, EventScript_162CE6 + call_if eq, EventScript_162CE6 compare_var_to_value VAR_STARTER_MON, 1 - call_if 1, EventScript_162CF1 + call_if eq, EventScript_162CF1 compare_var_to_value VAR_STARTER_MON, 0 - call_if 1, EventScript_162CFC + call_if eq, EventScript_162CFC return EventScript_162CB3:: @ 8162CB3 diff --git a/data/maps/PokemonLeague_LancesRoom/scripts.inc b/data/maps/PokemonLeague_LancesRoom/scripts.inc index a4c04a9ad..723445fb5 100644 --- a/data/maps/PokemonLeague_LancesRoom/scripts.inc +++ b/data/maps/PokemonLeague_LancesRoom/scripts.inc @@ -12,9 +12,9 @@ PokemonLeague_LancesRoom_MapScript1_162942:: @ 8162942 PokemonLeague_LancesRoom_MapScript2_16294D:: @ 816294D compare_var_to_value VAR_MAP_SCENE_POKEMON_LEAGUE, 4 - call_if 1, EventScript_162962 + call_if eq, EventScript_162962 checkflag FLAG_DEFEATED_LANCE - call_if 1, EventScript_162968 + call_if eq, EventScript_162968 end EventScript_162962:: @ 8162962 @@ -107,15 +107,15 @@ PokemonLeague_LancesRoom_EventScript_162A14:: @ 8162A14 famechecker FAMECHECKER_LANCE, 0 famechecker FAMECHECKER_LANCE, 1 checkflag FLAG_SYS_GAME_CLEAR - call_if 0, EventScript_162A79 + call_if lt, EventScript_162A79 checkflag FLAG_SYS_GAME_CLEAR - call_if 1, EventScript_162A82 + call_if eq, EventScript_162A82 setflag FLAG_TEMP_3 setflag FLAG_TEMP_5 checkflag FLAG_0x844 - call_if 0, EventScript_162A8B + call_if lt, EventScript_162A8B checkflag FLAG_0x844 - call_if 1, EventScript_162A96 + call_if eq, EventScript_162A96 clearflag FLAG_TEMP_5 goto EventScript_162AAB diff --git a/data/maps/PokemonLeague_LoreleisRoom/scripts.inc b/data/maps/PokemonLeague_LoreleisRoom/scripts.inc index fab311386..71f79b865 100644 --- a/data/maps/PokemonLeague_LoreleisRoom/scripts.inc +++ b/data/maps/PokemonLeague_LoreleisRoom/scripts.inc @@ -13,9 +13,9 @@ PokemonLeague_LoreleisRoom_MapScript1_162586:: @ 8162586 PokemonLeague_LoreleisRoom_MapScript2_162591:: @ 8162591 checkflag FLAG_DEFEATED_LORELEI - call_if 1, EventScript_1625AC + call_if eq, EventScript_1625AC compare_var_to_value VAR_MAP_SCENE_POKEMON_LEAGUE, 1 - call_if 1, EventScript_1625A6 + call_if eq, EventScript_1625A6 end EventScript_1625A6:: @ 81625A6 @@ -58,15 +58,15 @@ PokemonLeague_LoreleisRoom_EventScript_1625DC:: @ 81625DC famechecker FAMECHECKER_LORELEI, 0 famechecker FAMECHECKER_LORELEI, 1 checkflag FLAG_0x844 - call_if 0, EventScript_162641 + call_if lt, EventScript_162641 checkflag FLAG_0x844 - call_if 1, EventScript_16264A + call_if eq, EventScript_16264A setflag FLAG_TEMP_3 setflag FLAG_TEMP_5 checkflag FLAG_0x844 - call_if 0, EventScript_162653 + call_if lt, EventScript_162653 checkflag FLAG_0x844 - call_if 1, EventScript_16265E + call_if eq, EventScript_16265E clearflag FLAG_TEMP_5 goto EventScript_162673 diff --git a/data/maps/PokemonMansion_1F/scripts.inc b/data/maps/PokemonMansion_1F/scripts.inc index 73a502e68..0abae5e5c 100644 --- a/data/maps/PokemonMansion_1F/scripts.inc +++ b/data/maps/PokemonMansion_1F/scripts.inc @@ -5,7 +5,7 @@ PokemonMansion_1F_MapScripts:: @ 81621F9 PokemonMansion_1F_MapScript1_162204:: @ 8162204 checkflag FLAG_0x26C - call_if 1, EventScript_1A7B7A + call_if eq, EventScript_1A7B7A end PokemonMansion_1F_MapScript2_16220E:: @ 816220E diff --git a/data/maps/PokemonMansion_2F/scripts.inc b/data/maps/PokemonMansion_2F/scripts.inc index ca69db5c1..96de39434 100644 --- a/data/maps/PokemonMansion_2F/scripts.inc +++ b/data/maps/PokemonMansion_2F/scripts.inc @@ -4,7 +4,7 @@ PokemonMansion_2F_MapScripts:: @ 8162254 PokemonMansion_2F_MapScript1_16225A:: @ 816225A checkflag FLAG_0x26C - call_if 1, EventScript_1A7D3E + call_if eq, EventScript_1A7D3E end PokemonMansion_2F_EventScript_162264:: @ 8162264 diff --git a/data/maps/PokemonMansion_3F/scripts.inc b/data/maps/PokemonMansion_3F/scripts.inc index 6aaa14918..0d1aa8158 100644 --- a/data/maps/PokemonMansion_3F/scripts.inc +++ b/data/maps/PokemonMansion_3F/scripts.inc @@ -4,7 +4,7 @@ PokemonMansion_3F_MapScripts:: @ 81622A1 PokemonMansion_3F_MapScript1_1622A7:: @ 81622A7 checkflag FLAG_0x26C - call_if 1, EventScript_1A7E72 + call_if eq, EventScript_1A7E72 end PokemonMansion_3F_EventScript_1622B1:: @ 81622B1 diff --git a/data/maps/PokemonMansion_B1F/scripts.inc b/data/maps/PokemonMansion_B1F/scripts.inc index 923fac42d..c9d9123d8 100644 --- a/data/maps/PokemonMansion_B1F/scripts.inc +++ b/data/maps/PokemonMansion_B1F/scripts.inc @@ -4,7 +4,7 @@ PokemonMansion_B1F_MapScripts:: @ 81622FC PokemonMansion_B1F_MapScript1_162302:: @ 8162302 checkflag FLAG_0x26C - call_if 1, EventScript_1A7F4C + call_if eq, EventScript_1A7F4C end PokemonMansion_B1F_EventScript_16230C:: @ 816230C diff --git a/data/maps/PokemonTower_2F/scripts.inc b/data/maps/PokemonTower_2F/scripts.inc index 13de9b5a4..bed73386b 100644 --- a/data/maps/PokemonTower_2F/scripts.inc +++ b/data/maps/PokemonTower_2F/scripts.inc @@ -21,9 +21,9 @@ EventScript_1632A7:: @ 81632A7 textcolor 0 playbgm MUS_RIVAL1, 0 compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_163339 + call_if eq, EventScript_163339 compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_16334B + call_if eq, EventScript_16334B applymovement 1, Movement_1A75DB waitmovement 0 applymovement 1, Movement_1A75DD @@ -31,18 +31,18 @@ EventScript_1632A7:: @ 81632A7 msgbox gUnknown_8179CFF setvar VAR_LAST_TALKED, 1 compare_var_to_value VAR_STARTER_MON, 2 - call_if 1, EventScript_16335D + call_if eq, EventScript_16335D compare_var_to_value VAR_STARTER_MON, 1 - call_if 1, EventScript_163368 + call_if eq, EventScript_163368 compare_var_to_value VAR_STARTER_MON, 0 - call_if 1, EventScript_163373 + call_if eq, EventScript_163373 msgbox gUnknown_8179DD4 closemessage playbgm MUS_RIVAL2, 0 compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_16337E + call_if eq, EventScript_16337E compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_163389 + call_if eq, EventScript_163389 playse SE_KAIDAN delay 25 fadedefaultbgm diff --git a/data/maps/PowerPlant/scripts.inc b/data/maps/PowerPlant/scripts.inc index c749b4227..d4222d23a 100644 --- a/data/maps/PowerPlant/scripts.inc +++ b/data/maps/PowerPlant/scripts.inc @@ -5,24 +5,24 @@ PowerPlant_MapScripts:: @ 8163764 PowerPlant_MapScript1_16376F:: @ 816376F checkflag FLAG_0x807 - call_if 1, EventScript_163779 + call_if eq, EventScript_163779 end EventScript_163779:: @ 8163779 specialvar VAR_RESULT, sub_80CA74C compare_var_to_value VAR_RESULT, 7 - goto_if 5, EventScript_1A77A9 + goto_if ne, EventScript_1A77A9 removeobject VAR_LAST_TALKED return PowerPlant_MapScript2_16378D:: @ 816378D setworldmapflag FLAG_WORLD_MAP_POWER_PLANT checkflag FLAG_0x2BF - call_if 0, EventScript_1637AC + call_if lt, EventScript_1637AC checkflag FLAG_0x2D0 - call_if 0, EventScript_1637B0 + call_if lt, EventScript_1637B0 checkflag FLAG_0x2D1 - call_if 0, EventScript_1637B4 + call_if lt, EventScript_1637B4 end EventScript_1637AC:: @ 81637AC diff --git a/data/maps/RocketHideout_B1F/scripts.inc b/data/maps/RocketHideout_B1F/scripts.inc index d3aa5a382..1e8f1b9d2 100644 --- a/data/maps/RocketHideout_B1F/scripts.inc +++ b/data/maps/RocketHideout_B1F/scripts.inc @@ -5,7 +5,7 @@ RocketHideout_B1F_MapScripts:: @ 8161195 RocketHideout_B1F_MapScript1_1611A0:: @ 81611A0 checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_12 - call_if 0, EventScript_161233 + call_if lt, EventScript_161233 end RocketHideout_B1F_MapScript2_1611AA:: @ 81611AA diff --git a/data/maps/RocketHideout_B4F/scripts.inc b/data/maps/RocketHideout_B4F/scripts.inc index 78b0225f7..1b8fb0a4d 100644 --- a/data/maps/RocketHideout_B4F/scripts.inc +++ b/data/maps/RocketHideout_B4F/scripts.inc @@ -5,11 +5,11 @@ RocketHideout_B4F_MapScripts:: @ 81612E8 RocketHideout_B4F_MapScript1_1612EE:: @ 81612EE setvar VAR_0x4001, 0 checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_16 - call_if 1, EventScript_161311 + call_if eq, EventScript_161311 checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_17 - call_if 1, EventScript_161311 + call_if eq, EventScript_161311 compare_var_to_value VAR_0x4001, 2 - call_if 5, EventScript_16146A + call_if ne, EventScript_16146A end EventScript_161311:: @ 8161311 @@ -79,13 +79,13 @@ RocketHideout_B4F_EventScript_1613CE:: @ 81613CE EventScript_1613E9:: @ 81613E9 setvar VAR_0x4001, 0 checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_16 - call_if 1, EventScript_161311 + call_if eq, EventScript_161311 checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_17 - call_if 1, EventScript_161311 + call_if eq, EventScript_161311 compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_1614A1 + call_if eq, EventScript_1614A1 compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_161462 + call_if eq, EventScript_161462 release end @@ -97,13 +97,13 @@ RocketHideout_B4F_EventScript_161418:: @ 8161418 EventScript_161433:: @ 8161433 setvar VAR_0x4001, 0 checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_16 - call_if 1, EventScript_161311 + call_if eq, EventScript_161311 checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_17 - call_if 1, EventScript_161311 + call_if eq, EventScript_161311 compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_1614A1 + call_if eq, EventScript_1614A1 compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_161462 + call_if eq, EventScript_161462 release end diff --git a/data/maps/RocketHideout_Elevator/scripts.inc b/data/maps/RocketHideout_Elevator/scripts.inc index 0cf3b5b0b..f0ba02f22 100644 --- a/data/maps/RocketHideout_Elevator/scripts.inc +++ b/data/maps/RocketHideout_Elevator/scripts.inc @@ -4,10 +4,10 @@ RocketHideout_Elevator_MapScripts:: @ 81614D8 RocketHideout_Elevator_EventScript_1614D9:: @ 81614D9 lockall checkflag FLAG_0x2A5 - goto_if 0, EventScript_16161B + goto_if lt, EventScript_16161B setvar VAR_0x8004, 2 checkflag FLAG_TEMP_2 - call_if 0, EventScript_1A7AB9 + call_if lt, EventScript_1A7AB9 copyvar VAR_0x8005, VAR_0x403A special sub_80CB580 message Text_1A535C diff --git a/data/maps/Route10_PokemonCenter_1F/scripts.inc b/data/maps/Route10_PokemonCenter_1F/scripts.inc index 7d47d07df..a6da22234 100644 --- a/data/maps/Route10_PokemonCenter_1F/scripts.inc +++ b/data/maps/Route10_PokemonCenter_1F/scripts.inc @@ -41,7 +41,7 @@ Route10_PokemonCenter_1F_EventScript_16FC65:: @ 816FC65 getnumberstring 2, VAR_0x8006 call EventScript_16FCF1 compare_var_to_value VAR_0x8006, 20 - goto_if 0, EventScript_1A7ABD + goto_if lt, EventScript_1A7ABD msgbox gUnknown_819E733 checkitemspace ITEM_EVERSTONE, 1 compare_var_to_value VAR_RESULT, 0 diff --git a/data/maps/Route11_EastEntrance_2F/scripts.inc b/data/maps/Route11_EastEntrance_2F/scripts.inc index 334e71ec4..5b18d37c9 100644 --- a/data/maps/Route11_EastEntrance_2F/scripts.inc +++ b/data/maps/Route11_EastEntrance_2F/scripts.inc @@ -30,10 +30,10 @@ Route11_EastEntrance_2F_EventScript_16FD5C:: @ 816FD5C goto_if_eq EventScript_16FDB6 call EventScript_1A8CBD compare_var_to_value VAR_0x8004, 6 - goto_if 4, EventScript_16FDB6 + goto_if ge, EventScript_16FDB6 call EventScript_1A8CC9 compare_var_to_var VAR_RESULT, VAR_0x8009 - goto_if 5, EventScript_16FDC0 + goto_if ne, EventScript_16FDC0 call EventScript_1A8CD9 msgbox gUnknown_81A59DA setflag FLAG_0x251 @@ -70,7 +70,7 @@ Route11_EastEntrance_2F_EventScript_16FDD8:: @ 816FDD8 getnumberstring 2, VAR_0x8006 call EventScript_16FE64 compare_var_to_value VAR_0x8006, 30 - goto_if 0, EventScript_1A7ABD + goto_if lt, EventScript_1A7ABD msgbox gUnknown_819EAE4 checkitemspace ITEM_ITEMFINDER, 1 compare_var_to_value VAR_RESULT, 0 diff --git a/data/maps/Route12/scripts.inc b/data/maps/Route12/scripts.inc index d1640fd70..2ba49dc11 100644 --- a/data/maps/Route12/scripts.inc +++ b/data/maps/Route12/scripts.inc @@ -4,7 +4,7 @@ Route12_MapScripts:: @ 8168000 Route12_MapScript1_168006:: @ 8168006 checkflag FLAG_0x807 - call_if 1, EventScript_168010 + call_if eq, EventScript_168010 end EventScript_168010:: @ 8168010 @@ -15,7 +15,7 @@ Route12_EventScript_168014:: @ 8168014 lock faceplayer checkflag FLAG_GOT_POKE_FLUTE - goto_if 0, EventScript_168099 + goto_if lt, EventScript_168099 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 goto_if_eq EventScript_1A7AE0 diff --git a/data/maps/Route12_FishingHouse/scripts.inc b/data/maps/Route12_FishingHouse/scripts.inc index d4472473f..95efdf164 100644 --- a/data/maps/Route12_FishingHouse/scripts.inc +++ b/data/maps/Route12_FishingHouse/scripts.inc @@ -45,7 +45,7 @@ EventScript_16FF7F:: @ 816FF7F waitstate copyvar VAR_RESULT, VAR_0x8004 compare_var_to_value VAR_RESULT, 6 - goto_if 4, EventScript_16FFFF + goto_if ge, EventScript_16FFFF special sub_80A0984 compare_var_to_value VAR_RESULT, 1 goto_if_eq EventScript_170001 @@ -74,14 +74,14 @@ EventScript_170001:: @ 8170001 EventScript_17000B:: @ 817000B checkflag FLAG_0x29C - goto_if 0, EventScript_170031 + goto_if lt, EventScript_170031 msgbox gUnknown_819F40A release end EventScript_17001E:: @ 817001E checkflag FLAG_0x29C - goto_if 0, EventScript_170031 + goto_if lt, EventScript_170031 msgbox gUnknown_819F3CB release end diff --git a/data/maps/Route12_NorthEntrance_2F/scripts.inc b/data/maps/Route12_NorthEntrance_2F/scripts.inc index 3c8727208..29f825824 100644 --- a/data/maps/Route12_NorthEntrance_2F/scripts.inc +++ b/data/maps/Route12_NorthEntrance_2F/scripts.inc @@ -16,9 +16,9 @@ Route12_NorthEntrance_2F_EventScript_16FE8A:: @ 816FE8A goto_if_eq EventScript_16FF01 checkplayergender compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_16FEE5 + call_if eq, EventScript_16FEE5 compare_var_to_value VAR_RESULT, 1 - call_if 1, EventScript_16FEEE + call_if eq, EventScript_16FEEE checkitemspace ITEM_TM27, 1 compare_var_to_value VAR_RESULT, 0 goto_if_eq EventScript_16FEF7 diff --git a/data/maps/Route15_WestEntrance_2F/scripts.inc b/data/maps/Route15_WestEntrance_2F/scripts.inc index 1e06c0394..122b8dcc9 100644 --- a/data/maps/Route15_WestEntrance_2F/scripts.inc +++ b/data/maps/Route15_WestEntrance_2F/scripts.inc @@ -31,7 +31,7 @@ Route15_WestEntrance_2F_EventScript_1700B9:: @ 81700B9 getnumberstring 2, VAR_0x8006 call EventScript_170145 compare_var_to_value VAR_0x8006, 50 - goto_if 0, EventScript_1A7ABD + goto_if lt, EventScript_1A7ABD msgbox gUnknown_819F6AA checkitemspace ITEM_EXP_SHARE, 1 compare_var_to_value VAR_RESULT, 0 diff --git a/data/maps/Route16/scripts.inc b/data/maps/Route16/scripts.inc index 5ac1f9184..00105aae8 100644 --- a/data/maps/Route16/scripts.inc +++ b/data/maps/Route16/scripts.inc @@ -6,7 +6,7 @@ Route16_MapScripts:: @ 81680E5 Route16_MapScript1_1680F5:: @ 81680F5 checkflag FLAG_0x807 - call_if 1, EventScript_1680FF + call_if eq, EventScript_1680FF end EventScript_1680FF:: @ 81680FF @@ -15,7 +15,7 @@ EventScript_1680FF:: @ 81680FF Route16_MapScript2_168103:: @ 8168103 compare_var_to_value VAR_MAP_SCENE_ROUTE16, 1 - call_if 1, EventScript_16810F + call_if eq, EventScript_16810F end EventScript_16810F:: @ 816810F @@ -34,7 +34,7 @@ Route16_EventScript_168121:: @ 8168121 lock faceplayer checkflag FLAG_GOT_POKE_FLUTE - goto_if 0, EventScript_1681A3 + goto_if lt, EventScript_1681A3 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 goto_if_eq EventScript_1A7AE0 diff --git a/data/maps/Route16_NorthEntrance_1F/scripts.inc b/data/maps/Route16_NorthEntrance_1F/scripts.inc index c30f309fd..ff05102c5 100644 --- a/data/maps/Route16_NorthEntrance_1F/scripts.inc +++ b/data/maps/Route16_NorthEntrance_1F/scripts.inc @@ -5,7 +5,7 @@ Route16_NorthEntrance_1F_MapScripts:: @ 81701C2 Route16_NorthEntrance_1F_MapScript1_1701C8:: @ 81701C8 clearflag FLAG_0x830 checkflag FLAG_0x271 - call_if 1, EventScript_1701D5 + call_if eq, EventScript_1701D5 end EventScript_1701D5:: @ 81701D5 @@ -54,13 +54,13 @@ EventScript_170220:: @ 8170220 waitmovement 0 delay 20 compare_var_to_value VAR_0x8008, 1 - call_if 1, EventScript_170279 + call_if eq, EventScript_170279 compare_var_to_value VAR_0x8008, 2 - call_if 1, EventScript_170284 + call_if eq, EventScript_170284 compare_var_to_value VAR_0x8008, 3 - call_if 1, EventScript_17028F + call_if eq, EventScript_17028F compare_var_to_value VAR_0x8008, 4 - call_if 1, EventScript_17029A + call_if eq, EventScript_17029A msgbox gUnknown_819F95F closemessage applymovement 255, Movement_1702B3 diff --git a/data/maps/Route16_NorthEntrance_2F/scripts.inc b/data/maps/Route16_NorthEntrance_2F/scripts.inc index 6fa870c27..dfaf5455b 100644 --- a/data/maps/Route16_NorthEntrance_2F/scripts.inc +++ b/data/maps/Route16_NorthEntrance_2F/scripts.inc @@ -31,7 +31,7 @@ Route16_NorthEntrance_2F_EventScript_1702E3:: @ 81702E3 getnumberstring 2, VAR_0x8006 call EventScript_17036F compare_var_to_value VAR_0x8006, 40 - goto_if 0, EventScript_1A7ABD + goto_if lt, EventScript_1A7ABD msgbox gUnknown_819FC15 checkitemspace ITEM_AMULET_COIN, 1 compare_var_to_value VAR_RESULT, 0 diff --git a/data/maps/Route18/scripts.inc b/data/maps/Route18/scripts.inc index 548fdeeb6..6467cb6c3 100644 --- a/data/maps/Route18/scripts.inc +++ b/data/maps/Route18/scripts.inc @@ -5,7 +5,7 @@ Route18_MapScripts:: @ 81681F6 Route18_MapScript1_168201:: @ 8168201 compare_var_to_value VAR_MAP_SCENE_ROUTE16, 1 - call_if 1, EventScript_16820D + call_if eq, EventScript_16820D end EventScript_16820D:: @ 816820D diff --git a/data/maps/Route18_EastEntrance_1F/scripts.inc b/data/maps/Route18_EastEntrance_1F/scripts.inc index 70a8d196b..b73ce6c07 100644 --- a/data/maps/Route18_EastEntrance_1F/scripts.inc +++ b/data/maps/Route18_EastEntrance_1F/scripts.inc @@ -5,7 +5,7 @@ Route18_EastEntrance_1F_MapScripts:: @ 8170378 Route18_EastEntrance_1F_MapScript1_17037E:: @ 817037E clearflag FLAG_0x830 checkflag FLAG_0x271 - call_if 1, EventScript_17038B + call_if eq, EventScript_17038B end EventScript_17038B:: @ 817038B @@ -54,13 +54,13 @@ EventScript_1703D6:: @ 81703D6 waitmovement 0 delay 20 compare_var_to_value VAR_0x8008, 1 - call_if 1, EventScript_17042F + call_if eq, EventScript_17042F compare_var_to_value VAR_0x8008, 2 - call_if 1, EventScript_17043A + call_if eq, EventScript_17043A compare_var_to_value VAR_0x8008, 3 - call_if 1, EventScript_170445 + call_if eq, EventScript_170445 compare_var_to_value VAR_0x8008, 4 - call_if 1, EventScript_170450 + call_if eq, EventScript_170450 msgbox gUnknown_819FD0C closemessage applymovement 255, Movement_170469 diff --git a/data/maps/Route18_EastEntrance_2F/scripts.inc b/data/maps/Route18_EastEntrance_2F/scripts.inc index 204a0f879..2515ae5ba 100644 --- a/data/maps/Route18_EastEntrance_2F/scripts.inc +++ b/data/maps/Route18_EastEntrance_2F/scripts.inc @@ -21,10 +21,10 @@ Route18_EastEntrance_2F_EventScript_17047E:: @ 817047E goto_if_eq EventScript_1704D8 call EventScript_1A8CBD compare_var_to_value VAR_0x8004, 6 - goto_if 4, EventScript_1704D8 + goto_if ge, EventScript_1704D8 call EventScript_1A8CC9 compare_var_to_var VAR_RESULT, VAR_0x8009 - goto_if 5, EventScript_1704E2 + goto_if ne, EventScript_1704E2 call EventScript_1A8CD9 msgbox gUnknown_81A59DA setflag FLAG_0x257 diff --git a/data/maps/Route20/scripts.inc b/data/maps/Route20/scripts.inc index f0f304435..a1a9f1982 100644 --- a/data/maps/Route20/scripts.inc +++ b/data/maps/Route20/scripts.inc @@ -4,9 +4,9 @@ Route20_MapScripts:: @ 816823B Route20_MapScript1_168241:: @ 8168241 checkflag FLAG_0x2D2 - call_if 0, EventScript_168254 + call_if lt, EventScript_168254 checkflag FLAG_0x2D3 - call_if 0, EventScript_16826D + call_if lt, EventScript_16826D end EventScript_168254:: @ 8168254 diff --git a/data/maps/Route22/scripts.inc b/data/maps/Route22/scripts.inc index 930665e21..37a9f5393 100644 --- a/data/maps/Route22/scripts.inc +++ b/data/maps/Route22/scripts.inc @@ -32,29 +32,29 @@ EventScript_1682BE:: @ 81682BE playbgm MUS_RIVAL1, 0 addobject 1 compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_168350 + call_if eq, EventScript_168350 compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_168350 + call_if eq, EventScript_168350 compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_16835B + call_if eq, EventScript_16835B delay 6 msgbox gUnknown_8188890 compare_var_to_value VAR_STARTER_MON, 2 - call_if 1, EventScript_16836D + call_if eq, EventScript_16836D compare_var_to_value VAR_STARTER_MON, 1 - call_if 1, EventScript_16837C + call_if eq, EventScript_16837C compare_var_to_value VAR_STARTER_MON, 0 - call_if 1, EventScript_16838B + call_if eq, EventScript_16838B msgbox gUnknown_8188974 closemessage delay 10 playbgm MUS_RIVAL2, 0 compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_16839A + call_if eq, EventScript_16839A compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_16839A + call_if eq, EventScript_16839A compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_1683A5 + call_if eq, EventScript_1683A5 fadedefaultbgm removeobject 1 setvar VAR_MAP_SCENE_ROUTE22, 2 @@ -198,19 +198,19 @@ EventScript_16841F:: @ 816841F playbgm MUS_RIVAL1, 0 addobject 1 compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_16849C + call_if eq, EventScript_16849C compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_16849C + call_if eq, EventScript_16849C compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_1684A7 + call_if eq, EventScript_1684A7 msgbox gUnknown_8188A3C setvar VAR_LAST_TALKED, 1 compare_var_to_value VAR_STARTER_MON, 2 - call_if 1, EventScript_1684B9 + call_if eq, EventScript_1684B9 compare_var_to_value VAR_STARTER_MON, 1 - call_if 1, EventScript_1684C4 + call_if eq, EventScript_1684C4 compare_var_to_value VAR_STARTER_MON, 0 - call_if 1, EventScript_1684CF + call_if eq, EventScript_1684CF msgbox gUnknown_8188B29 closemessage delay 10 diff --git a/data/maps/Route24/scripts.inc b/data/maps/Route24/scripts.inc index aee471392..bf51af987 100644 --- a/data/maps/Route24/scripts.inc +++ b/data/maps/Route24/scripts.inc @@ -39,9 +39,9 @@ Route24_EventScript_16866C:: @ 816866C EventScript_168678:: @ 8168678 textcolor 0 compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_1686FD + call_if eq, EventScript_1686FD compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_168708 + call_if eq, EventScript_168708 applymovement 255, Movement_1A75EB waitmovement 0 msgbox gUnknown_8188C3C @@ -81,7 +81,7 @@ EventScript_168713:: @ 8168713 applymovement 255, Movement_168743 waitmovement 0 compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_168733 + call_if eq, EventScript_168733 release end diff --git a/data/maps/Route25_SeaCottage/scripts.inc b/data/maps/Route25_SeaCottage/scripts.inc index 3ec7fc1c4..5dca7b67a 100644 --- a/data/maps/Route25_SeaCottage/scripts.inc +++ b/data/maps/Route25_SeaCottage/scripts.inc @@ -4,9 +4,9 @@ Route25_SeaCottage_MapScripts:: @ 8170523 Route25_SeaCottage_MapScript1_170529:: @ 8170529 checkflag FLAG_HELPED_BILL_IN_SEA_COTTAGE - call_if 0, EventScript_17053C + call_if lt, EventScript_17053C checkflag FLAG_GOT_SS_TICKET - call_if 1, EventScript_170547 + call_if eq, EventScript_170547 end EventScript_17053C:: @ 817053C @@ -46,18 +46,18 @@ EventScript_17058E:: @ 817058E EventScript_17059C:: @ 817059C compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_170600 + call_if eq, EventScript_170600 msgbox gUnknown_819FFD3 closemessage delay 10 compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_17062A + call_if eq, EventScript_17062A compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_170635 + call_if eq, EventScript_170635 compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_170635 + call_if eq, EventScript_170635 compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_170635 + call_if eq, EventScript_170635 opendoor 10, 3 waitdooranim applymovement 2, Movement_1706DB @@ -73,9 +73,9 @@ EventScript_17059C:: @ 817059C EventScript_170600:: @ 8170600 checkplayergender compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_170618 + call_if eq, EventScript_170618 compare_var_to_value VAR_RESULT, 1 - call_if 1, EventScript_170621 + call_if eq, EventScript_170621 return EventScript_170618:: @ 8170618 @@ -105,9 +105,9 @@ EventScript_17064A:: @ 817064A famechecker FAMECHECKER_BILL, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 checkplayergender compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_1706AC + call_if eq, EventScript_1706AC compare_var_to_value VAR_RESULT, 1 - call_if 1, EventScript_1706B5 + call_if eq, EventScript_1706B5 checkitemspace ITEM_SS_TICKET, 1 compare_var_to_value VAR_RESULT, 0 goto_if_eq EventScript_1706BE diff --git a/data/maps/Route2_EastBuilding/scripts.inc b/data/maps/Route2_EastBuilding/scripts.inc index ae08ce8bc..77ec8ad08 100644 --- a/data/maps/Route2_EastBuilding/scripts.inc +++ b/data/maps/Route2_EastBuilding/scripts.inc @@ -15,7 +15,7 @@ Route2_EastBuilding_EventScript_16F67F:: @ 816F67F getnumberstring 2, VAR_0x8006 call EventScript_16F70B compare_var_to_value VAR_0x8006, 10 - goto_if 0, EventScript_1A7ABD + goto_if lt, EventScript_1A7ABD msgbox gUnknown_819D74E checkitemspace ITEM_HM05, 1 compare_var_to_value VAR_RESULT, 0 diff --git a/data/maps/Route2_House/scripts.inc b/data/maps/Route2_House/scripts.inc index e1ee8cd71..f36bc7e83 100644 --- a/data/maps/Route2_House/scripts.inc +++ b/data/maps/Route2_House/scripts.inc @@ -17,10 +17,10 @@ Route2_House_EventScript_16F602:: @ 816F602 goto_if_eq EventScript_16F65C call EventScript_1A8CBD compare_var_to_value VAR_0x8004, 6 - goto_if 4, EventScript_16F65C + goto_if ge, EventScript_16F65C call EventScript_1A8CC9 compare_var_to_var VAR_RESULT, VAR_0x8009 - goto_if 5, EventScript_16F666 + goto_if ne, EventScript_16F666 call EventScript_1A8CD9 msgbox gUnknown_81A59DA setflag FLAG_DID_MIMIEN_TRADE diff --git a/data/maps/Route5_SouthEntrance/scripts.inc b/data/maps/Route5_SouthEntrance/scripts.inc index a065877db..dd2c80612 100644 --- a/data/maps/Route5_SouthEntrance/scripts.inc +++ b/data/maps/Route5_SouthEntrance/scripts.inc @@ -45,11 +45,11 @@ EventScript_16F963:: @ 816F963 msgbox gUnknown_819E09B closemessage compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_16F99C + call_if eq, EventScript_16F99C compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_16F9A7 + call_if eq, EventScript_16F9A7 compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_16F9B2 + call_if eq, EventScript_16F9B2 msgbox gUnknown_819E0C1 setvar VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES, 1 releaseall diff --git a/data/maps/Route6_NorthEntrance/scripts.inc b/data/maps/Route6_NorthEntrance/scripts.inc index 88aca79a9..3b8270ea6 100644 --- a/data/maps/Route6_NorthEntrance/scripts.inc +++ b/data/maps/Route6_NorthEntrance/scripts.inc @@ -45,11 +45,11 @@ EventScript_16FA29:: @ 816FA29 msgbox gUnknown_819E1D1 closemessage compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_16FA62 + call_if eq, EventScript_16FA62 compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_16FA6D + call_if eq, EventScript_16FA6D compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_16FA78 + call_if eq, EventScript_16FA78 msgbox gUnknown_819E1F7 setvar VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES, 1 releaseall diff --git a/data/maps/Route7_EastEntrance/scripts.inc b/data/maps/Route7_EastEntrance/scripts.inc index a07ed8e8a..1c06c9d24 100644 --- a/data/maps/Route7_EastEntrance/scripts.inc +++ b/data/maps/Route7_EastEntrance/scripts.inc @@ -45,11 +45,11 @@ EventScript_16FAF0:: @ 816FAF0 msgbox gUnknown_819E307 closemessage compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_16FB29 + call_if eq, EventScript_16FB29 compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_16FB34 + call_if eq, EventScript_16FB34 compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_16FB3F + call_if eq, EventScript_16FB3F msgbox gUnknown_819E32D setvar VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES, 1 releaseall diff --git a/data/maps/Route8_WestEntrance/scripts.inc b/data/maps/Route8_WestEntrance/scripts.inc index 60f525e79..d12f6ddd1 100644 --- a/data/maps/Route8_WestEntrance/scripts.inc +++ b/data/maps/Route8_WestEntrance/scripts.inc @@ -55,11 +55,11 @@ EventScript_16FBCC:: @ 816FBCC msgbox gUnknown_819E43D closemessage compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_16FC05 + call_if eq, EventScript_16FC05 compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_16FC10 + call_if eq, EventScript_16FC10 compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_16FC1B + call_if eq, EventScript_16FC1B msgbox gUnknown_819E463 setvar VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES, 1 releaseall diff --git a/data/maps/SSAnne_2F_Corridor/scripts.inc b/data/maps/SSAnne_2F_Corridor/scripts.inc index 652501f5b..c5ce60d07 100644 --- a/data/maps/SSAnne_2F_Corridor/scripts.inc +++ b/data/maps/SSAnne_2F_Corridor/scripts.inc @@ -36,29 +36,29 @@ EventScript_160903:: @ 8160903 waitmovement 0 delay 20 compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_1609AD + call_if eq, EventScript_1609AD compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_1609B8 + call_if eq, EventScript_1609B8 compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_1609CA + call_if eq, EventScript_1609CA msgbox gUnknown_8173035 setvar VAR_LAST_TALKED, 1 compare_var_to_value VAR_STARTER_MON, 2 - call_if 1, EventScript_1609DC + call_if eq, EventScript_1609DC compare_var_to_value VAR_STARTER_MON, 1 - call_if 1, EventScript_1609E7 + call_if eq, EventScript_1609E7 compare_var_to_value VAR_STARTER_MON, 0 - call_if 1, EventScript_1609F2 + call_if eq, EventScript_1609F2 msgbox gUnknown_8173164 closemessage delay 10 playbgm MUS_RIVAL2, 0 compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_1609FD + call_if eq, EventScript_1609FD compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_160A08 + call_if eq, EventScript_160A08 compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_160A13 + call_if eq, EventScript_160A13 fadedefaultbgm removeobject 1 setvar VAR_MAP_SCENE_S_S_ANNE_2F_CORRIDOR, 1 diff --git a/data/maps/SSAnne_Exterior/scripts.inc b/data/maps/SSAnne_Exterior/scripts.inc index 8b622c54a..15cc43b1f 100644 --- a/data/maps/SSAnne_Exterior/scripts.inc +++ b/data/maps/SSAnne_Exterior/scripts.inc @@ -15,9 +15,9 @@ SSAnne_Exterior_160859:: @ 8160859 lockall getplayerxy VAR_0x8004, VAR_0x8005 compare_var_to_value VAR_0x8005, 6 - call_if 3, EventScript_1608A1 + call_if le, EventScript_1608A1 compare_var_to_value VAR_0x8005, 7 - call_if 4, EventScript_1608AC + call_if ge, EventScript_1608AC fadenewbgm MUS_NAMINORI delay 50 special Special_SSAnneDepartureCutscene diff --git a/data/maps/SSAnne_Kitchen/scripts.inc b/data/maps/SSAnne_Kitchen/scripts.inc index b1b60056d..8ab022028 100644 --- a/data/maps/SSAnne_Kitchen/scripts.inc +++ b/data/maps/SSAnne_Kitchen/scripts.inc @@ -20,11 +20,11 @@ SSAnne_Kitchen_EventScript_160ACE:: @ 8160ACE random 3 copyvar VAR_0x8008, VAR_RESULT compare_var_to_value VAR_0x8008, 0 - call_if 1, EventScript_160B03 + call_if eq, EventScript_160B03 compare_var_to_value VAR_0x8008, 1 - call_if 1, EventScript_160B0C + call_if eq, EventScript_160B0C compare_var_to_value VAR_0x8008, 2 - call_if 1, EventScript_160B15 + call_if eq, EventScript_160B15 release end diff --git a/data/maps/SaffronCity/scripts.inc b/data/maps/SaffronCity/scripts.inc index 3be402afb..a4036b837 100644 --- a/data/maps/SaffronCity/scripts.inc +++ b/data/maps/SaffronCity/scripts.inc @@ -5,7 +5,7 @@ SaffronCity_MapScripts:: @ 816735F SaffronCity_MapScript1_167365:: @ 8167365 setworldmapflag FLAG_WORLD_MAP_SAFFRON_CITY checkflag FLAG_RESCUED_MR_FUJI - call_if 0, EventScript_167372 + call_if lt, EventScript_167372 end EventScript_167372:: @ 8167372 diff --git a/data/maps/SaffronCity_Gym/scripts.inc b/data/maps/SaffronCity_Gym/scripts.inc index 48b98f533..5d085824d 100644 --- a/data/maps/SaffronCity_Gym/scripts.inc +++ b/data/maps/SaffronCity_Gym/scripts.inc @@ -5,7 +5,7 @@ SaffronCity_Gym_EventScript_16EDD8:: @ 816EDD8 famechecker FAMECHECKER_SABRINA, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 trainerbattle 1, TRAINER_LEADER_SABRINA, 0, Text_19B53C, Text_19B602, EventScript_16EE0A checkflag FLAG_0x29A - goto_if 0, EventScript_16EE3D + goto_if lt, EventScript_16EE3D msgbox gUnknown_819B7F2 release end diff --git a/data/maps/SaffronCity_House1_2F/scripts.inc b/data/maps/SaffronCity_House1_2F/scripts.inc index 8a6227b38..116f68ec3 100644 --- a/data/maps/SaffronCity_House1_2F/scripts.inc +++ b/data/maps/SaffronCity_House1_2F/scripts.inc @@ -29,9 +29,9 @@ SaffronCity_House1_2F_EventScript_16EB7B:: @ 816EB7B goto_if_eq EventScript_1C4CF6 checkplayergender compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_16EBB7 + call_if eq, EventScript_16EBB7 compare_var_to_value VAR_RESULT, 1 - call_if 1, EventScript_16EBC0 + call_if eq, EventScript_16EBC0 release end diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc b/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc index dce3faa1b..c7667ce6a 100644 --- a/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc +++ b/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc @@ -82,35 +82,35 @@ EventScript_16F15B:: @ 816F15B setvar VAR_0x8004, 0 specialvar VAR_RESULT, sub_8113364 compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_16F207 + call_if eq, EventScript_16F207 setvar VAR_0x8004, 1 specialvar VAR_RESULT, sub_8113364 compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_16F213 + call_if eq, EventScript_16F213 setvar VAR_0x8004, 2 specialvar VAR_RESULT, sub_8113364 compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_16F21F + call_if eq, EventScript_16F21F setvar VAR_0x8004, 3 specialvar VAR_RESULT, sub_8113364 compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_16F22B + call_if eq, EventScript_16F22B setvar VAR_0x8004, 4 specialvar VAR_RESULT, sub_8113364 compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_16F237 + call_if eq, EventScript_16F237 setvar VAR_0x8004, 5 specialvar VAR_RESULT, sub_8113364 compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_16F243 + call_if eq, EventScript_16F243 setvar VAR_0x8004, 6 specialvar VAR_RESULT, sub_8113364 compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_16F24F + call_if eq, EventScript_16F24F setvar VAR_0x8004, 7 specialvar VAR_RESULT, sub_8113364 compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_16F25B + call_if eq, EventScript_16F25B end EventScript_16F207:: @ 816F207 diff --git a/data/maps/SeafoamIslands_B3F/scripts.inc b/data/maps/SeafoamIslands_B3F/scripts.inc index bc906077b..2bae9bea7 100644 --- a/data/maps/SeafoamIslands_B3F/scripts.inc +++ b/data/maps/SeafoamIslands_B3F/scripts.inc @@ -5,19 +5,19 @@ SeafoamIslands_B3F_MapScripts:: @ 8162F4F SeafoamIslands_B3F_MapScript1_162F5A:: @ 8162F5A checkflag FLAG_0x2D2 - call_if 0, EventScript_162F6D + call_if lt, EventScript_162F6D checkflag FLAG_0x2D2 - call_if 1, EventScript_162F94 + call_if eq, EventScript_162F94 end EventScript_162F6D:: @ 8162F6D setvar VAR_0x4002, 0 checkflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_1 - call_if 0, EventScript_162FF0 + call_if lt, EventScript_162FF0 checkflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_2 - call_if 0, EventScript_162FF0 + call_if lt, EventScript_162FF0 compare_var_to_value VAR_0x4002, 2 - call_if 1, EventScript_162F90 + call_if eq, EventScript_162F90 return EventScript_162F90:: @ 8162F90 @@ -36,16 +36,16 @@ EventScript_162FA2:: @ 8162FA2 lockall setvar VAR_0x4002, 0 checkflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_1 - call_if 0, EventScript_162FF0 + call_if lt, EventScript_162FF0 checkflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_2 - call_if 0, EventScript_162FF0 + call_if lt, EventScript_162FF0 compare_var_to_value VAR_0x4002, 2 goto_if_eq EventScript_16300C getplayerxy VAR_0x8008, VAR_0x8009 compare_var_to_value VAR_0x8008, 24 - call_if 0, EventScript_162FF6 + call_if lt, EventScript_162FF6 compare_var_to_value VAR_0x8008, 24 - call_if 4, EventScript_163001 + call_if ge, EventScript_163001 setvar VAR_MAP_SCENE_SEAFOAM_ISLANDS_B4F, 1 warp MAP_SEAFOAM_ISLANDS_B4F, 255, 27, 21 waitstate diff --git a/data/maps/SeafoamIslands_B4F/scripts.inc b/data/maps/SeafoamIslands_B4F/scripts.inc index 2d597e6a0..01fc354d3 100644 --- a/data/maps/SeafoamIslands_B4F/scripts.inc +++ b/data/maps/SeafoamIslands_B4F/scripts.inc @@ -8,33 +8,33 @@ SeafoamIslands_B4F_MapScripts:: @ 816302E SeafoamIslands_B4F_MapScript2_163048:: @ 8163048 checkflag FLAG_0x807 - call_if 1, EventScript_163052 + call_if eq, EventScript_163052 end EventScript_163052:: @ 8163052 specialvar VAR_RESULT, sub_80CA74C compare_var_to_value VAR_RESULT, 7 - goto_if 5, EventScript_1A77A9 + goto_if ne, EventScript_1A77A9 removeobject VAR_LAST_TALKED return SeafoamIslands_B4F_MapScript1_163066:: @ 8163066 checkflag FLAG_0x2BE - call_if 0, EventScript_1630AD + call_if lt, EventScript_1630AD checkflag FLAG_0x2D3 - call_if 0, EventScript_163082 + call_if lt, EventScript_163082 checkflag FLAG_0x2D3 - call_if 1, EventScript_1630A9 + call_if eq, EventScript_1630A9 end EventScript_163082:: @ 8163082 setvar VAR_0x4002, 0 checkflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_1 - call_if 0, EventScript_163169 + call_if lt, EventScript_163169 checkflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_2 - call_if 0, EventScript_163169 + call_if lt, EventScript_163169 compare_var_to_value VAR_0x4002, 2 - call_if 1, EventScript_1630A5 + call_if eq, EventScript_1630A5 return EventScript_1630A5:: @ 81630A5 @@ -52,9 +52,9 @@ EventScript_1630AD:: @ 81630AD SeafoamIslands_B4F_MapScript3_1630B1:: @ 81630B1 setvar VAR_0x4002, 0 checkflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_1 - call_if 0, EventScript_163169 + call_if lt, EventScript_163169 checkflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_2 - call_if 0, EventScript_163169 + call_if lt, EventScript_163169 compare_var_to_value VAR_0x4002, 2 goto_if_eq EventScript_1630D4 end @@ -96,16 +96,16 @@ EventScript_163121:: @ 8163121 lockall setvar VAR_0x4002, 0 checkflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_1 - call_if 0, EventScript_163169 + call_if lt, EventScript_163169 checkflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_2 - call_if 0, EventScript_163169 + call_if lt, EventScript_163169 compare_var_to_value VAR_0x4002, 2 goto_if_eq EventScript_163185 getplayerxy VAR_0x8008, VAR_0x8009 compare_var_to_value VAR_0x8008, 9 - call_if 0, EventScript_16316F + call_if lt, EventScript_16316F compare_var_to_value VAR_0x8008, 9 - call_if 4, EventScript_16317A + call_if ge, EventScript_16317A special sub_805D1A8 setvar VAR_0x4001, 0 releaseall diff --git a/data/maps/SevenIsland_House_Room1/scripts.inc b/data/maps/SevenIsland_House_Room1/scripts.inc index 107b91ad7..760416ed2 100644 --- a/data/maps/SevenIsland_House_Room1/scripts.inc +++ b/data/maps/SevenIsland_House_Room1/scripts.inc @@ -6,9 +6,9 @@ SevenIsland_House_Room1_MapScripts:: @ 817088A SevenIsland_House_Room1_MapScript1_170895:: @ 8170895 special ValidateEReaderTrainer compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_1708AF + call_if eq, EventScript_1708AF compare_var_to_value VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 0 - call_if 5, EventScript_1708C3 + call_if ne, EventScript_1708C3 end EventScript_1708AF:: @ 81708AF @@ -40,11 +40,11 @@ EventScript_1708E9:: @ 1708E9 applymovement 255, Movement_1A75E9 waitmovement 0 compare_var_to_value VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 1 - call_if 1, EventScript_170938 + call_if eq, EventScript_170938 compare_var_to_value VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 2 - call_if 1, EventScript_170941 + call_if eq, EventScript_170941 compare_var_to_value VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 3 - call_if 1, EventScript_17094A + call_if eq, EventScript_17094A special LoadPlayerParty setvar VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 0 releaseall @@ -76,7 +76,7 @@ SevenIsland_House_Room1_EventScript_170958:: @ 8170958 faceplayer special ValidateEReaderTrainer compare_var_to_value VAR_RESULT, 1 - call_if 1, EventScript_17097D + call_if eq, EventScript_17097D compare_var_to_value VAR_0x4001, 1 goto_if_eq EventScript_170987 msgbox gUnknown_81A049B @@ -109,11 +109,11 @@ EventScript_170987:: @ 8170987 msgbox gUnknown_81A07C4 closemessage compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_170A2D + call_if eq, EventScript_170A2D compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_170A3F + call_if eq, EventScript_170A3F compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_170A51 + call_if eq, EventScript_170A51 warp MAP_SEVEN_ISLAND_HOUSE_ROOM2, 255, 3, 1 waitstate release diff --git a/data/maps/SevenIsland_House_Room2/scripts.inc b/data/maps/SevenIsland_House_Room2/scripts.inc index 236c95be3..d77eda077 100644 --- a/data/maps/SevenIsland_House_Room2/scripts.inc +++ b/data/maps/SevenIsland_House_Room2/scripts.inc @@ -23,11 +23,11 @@ EventScript_170A97:: @ 8170A97 special sub_80E6900 waitstate compare_var_to_value VAR_RESULT, 3 - call_if 1, EventScript_170AFE + call_if eq, EventScript_170AFE compare_var_to_value VAR_RESULT, 1 - call_if 1, EventScript_170B0C + call_if eq, EventScript_170B0C compare_var_to_value VAR_RESULT, 2 - call_if 1, EventScript_170B17 + call_if eq, EventScript_170B17 closemessage special sp000_heal_pokemon applymovement 255, Movement_170B28 diff --git a/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/scripts.inc b/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/scripts.inc index b1cf1bc89..b1e5689cc 100644 --- a/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/scripts.inc +++ b/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/scripts.inc @@ -5,7 +5,7 @@ SevenIsland_SeavaultCanyon_TanobyKey_MapScripts:: @ 8164DCC SevenIsland_SeavaultCanyon_TanobyKey_MapScript1_164DD2:: @ 8164DD2 setworldmapflag FLAG_WORLD_MAP_SEVEN_ISLAND_SEAVAULT_CANYON_TANOBY_KEY checkflag FLAG_0x849 - call_if 1, EventScript_164E07 + call_if eq, EventScript_164E07 setvar VAR_0x4001, 0 setvar VAR_0x4002, 0 setvar VAR_0x4003, 0 diff --git a/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc b/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc index 82bdfc411..38e2c01e4 100644 --- a/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc +++ b/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc @@ -21,7 +21,7 @@ SevenIsland_SevaultCanyon_House_EventScript_172183:: @ 8172183 closemessage call EventScript_1A6675 compare_var_to_value VAR_FACING, 1 - call_if 5, EventScript_172206 + call_if ne, EventScript_172206 delay 30 playbgm MUS_P_SCHOOL, 0 applymovement 255, Movement_172231 diff --git a/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc b/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc index 0a82a7f24..6755ce61c 100644 --- a/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc @@ -7,7 +7,7 @@ SevenIsland_TrainerTower_Elevator_EventScript_164B03:: @ 8164B03 lockall setvar VAR_0x8004, 6 checkflag FLAG_TEMP_2 - call_if 0, EventScript_1A7AB9 + call_if lt, EventScript_1A7AB9 copyvar VAR_0x8005, VAR_0x403A special sub_80CB580 message Text_1A535C diff --git a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc b/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc index 858ff3c97..9bbdef6bf 100644 --- a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc @@ -31,7 +31,7 @@ SevenIsland_TrainerTower_Lobby_MapScript2_164887:: @ 8164887 SevenIsland_TrainerTower_Lobby_MapScript4_164897:: @ 8164897 compare_var_to_value VAR_0x400D, 17 - call_if 1, EventScript_1648A3 + call_if eq, EventScript_1648A3 end EventScript_1648A3:: @ 81648A3 diff --git a/data/maps/SilphCo_10F/scripts.inc b/data/maps/SilphCo_10F/scripts.inc index 255acde62..3cee38763 100644 --- a/data/maps/SilphCo_10F/scripts.inc +++ b/data/maps/SilphCo_10F/scripts.inc @@ -4,14 +4,14 @@ SilphCo_10F_MapScripts:: @ 8161D86 SilphCo_10F_MapScript1_161D8C:: @ 8161D8C checkflag FLAG_0x28C - call_if 0, EventScript_1A84D6 + call_if lt, EventScript_1A84D6 end SilphCo_10F_EventScript_161D96:: @ 8161D96 lock faceplayer compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if 4, EventScript_161DAD + goto_if ge, EventScript_161DAD msgbox gUnknown_8176DBA release end diff --git a/data/maps/SilphCo_11F/scripts.inc b/data/maps/SilphCo_11F/scripts.inc index f29d06787..5de78bb27 100644 --- a/data/maps/SilphCo_11F/scripts.inc +++ b/data/maps/SilphCo_11F/scripts.inc @@ -4,7 +4,7 @@ SilphCo_11F_MapScripts:: @ 8161DEE SilphCo_11F_MapScript1_161DF4:: @ 8161DF4 checkflag FLAG_0x28D - call_if 0, EventScript_1A8504 + call_if lt, EventScript_1A8504 end SilphCo_11F_EventScript_161DFE:: @ 8161DFE @@ -14,9 +14,9 @@ SilphCo_11F_EventScript_161DFE:: @ 8161DFE goto_if_eq EventScript_161E75 checkplayergender compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_161E59 + call_if eq, EventScript_161E59 compare_var_to_value VAR_RESULT, 1 - call_if 1, EventScript_161E62 + call_if eq, EventScript_161E62 checkitemspace ITEM_MASTER_BALL, 1 compare_var_to_value VAR_RESULT, 0 goto_if_eq EventScript_161E6B @@ -73,9 +73,9 @@ EventScript_161EA0:: @ 8161EA0 msgbox gUnknown_8177108 closemessage compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_161F00 + call_if eq, EventScript_161F00 compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_161F12 + call_if eq, EventScript_161F12 setvar VAR_LAST_TALKED, 3 trainerbattle 3, TRAINER_BOSS_GIOVANNI_2, 0, Text_1771AB msgbox gUnknown_81771C2 diff --git a/data/maps/SilphCo_2F/scripts.inc b/data/maps/SilphCo_2F/scripts.inc index c969b91c3..002d3291a 100644 --- a/data/maps/SilphCo_2F/scripts.inc +++ b/data/maps/SilphCo_2F/scripts.inc @@ -4,9 +4,9 @@ SilphCo_2F_MapScripts:: @ 8161641 SilphCo_2F_MapScript1_161647:: @ 8161647 checkflag FLAG_0x27A - call_if 0, EventScript_1A8149 + call_if lt, EventScript_1A8149 checkflag FLAG_0x27B - call_if 0, EventScript_1A8177 + call_if lt, EventScript_1A8177 end SilphCo_2F_EventScript_16165A:: @ 816165A diff --git a/data/maps/SilphCo_3F/scripts.inc b/data/maps/SilphCo_3F/scripts.inc index b5cdacdff..52c1f847b 100644 --- a/data/maps/SilphCo_3F/scripts.inc +++ b/data/maps/SilphCo_3F/scripts.inc @@ -4,16 +4,16 @@ SilphCo_3F_MapScripts:: @ 81616C5 SilphCo_3F_MapScript1_1616CB:: @ 81616CB checkflag FLAG_0x27C - call_if 0, EventScript_1A81A5 + call_if lt, EventScript_1A81A5 checkflag FLAG_0x27D - call_if 0, EventScript_1A81DC + call_if lt, EventScript_1A81DC end SilphCo_3F_EventScript_1616DE:: @ 81616DE lock faceplayer compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if 4, EventScript_1616F5 + goto_if ge, EventScript_1616F5 msgbox gUnknown_81758AD release end diff --git a/data/maps/SilphCo_4F/scripts.inc b/data/maps/SilphCo_4F/scripts.inc index efa92d1f8..be241084e 100644 --- a/data/maps/SilphCo_4F/scripts.inc +++ b/data/maps/SilphCo_4F/scripts.inc @@ -4,16 +4,16 @@ SilphCo_4F_MapScripts:: @ 8161736 SilphCo_4F_MapScript1_16173C:: @ 816173C checkflag FLAG_0x27E - call_if 0, EventScript_1A8213 + call_if lt, EventScript_1A8213 checkflag FLAG_0x27F - call_if 0, EventScript_1A8241 + call_if lt, EventScript_1A8241 end SilphCo_4F_EventScript_16174F:: @ 816174F lock faceplayer compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if 4, EventScript_161766 + goto_if ge, EventScript_161766 msgbox gUnknown_81759F5 release end diff --git a/data/maps/SilphCo_5F/scripts.inc b/data/maps/SilphCo_5F/scripts.inc index 4a040e83e..42164eb7e 100644 --- a/data/maps/SilphCo_5F/scripts.inc +++ b/data/maps/SilphCo_5F/scripts.inc @@ -4,18 +4,18 @@ SilphCo_5F_MapScripts:: @ 81617BE SilphCo_5F_MapScript1_1617C4:: @ 81617C4 checkflag FLAG_0x280 - call_if 0, EventScript_1A826F + call_if lt, EventScript_1A826F checkflag FLAG_0x281 - call_if 0, EventScript_1A82A6 + call_if lt, EventScript_1A82A6 checkflag FLAG_0x282 - call_if 0, EventScript_1A82DD + call_if lt, EventScript_1A82DD end SilphCo_5F_EventScript_1617E0:: @ 81617E0 lock faceplayer compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if 4, EventScript_1617F7 + goto_if ge, EventScript_1617F7 msgbox gUnknown_8175B70 release end diff --git a/data/maps/SilphCo_6F/scripts.inc b/data/maps/SilphCo_6F/scripts.inc index 139781594..4caa7936c 100644 --- a/data/maps/SilphCo_6F/scripts.inc +++ b/data/maps/SilphCo_6F/scripts.inc @@ -4,14 +4,14 @@ SilphCo_6F_MapScripts:: @ 8161881 SilphCo_6F_MapScript1_161887:: @ 8161887 checkflag FLAG_0x283 - call_if 0, EventScript_1A8314 + call_if lt, EventScript_1A8314 end SilphCo_6F_EventScript_161891:: @ 8161891 lock faceplayer compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if 4, EventScript_1618A8 + goto_if ge, EventScript_1618A8 msgbox gUnknown_817607E release end @@ -25,7 +25,7 @@ SilphCo_6F_EventScript_1618B2:: @ 81618B2 lock faceplayer compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if 4, EventScript_1618C9 + goto_if ge, EventScript_1618C9 msgbox gUnknown_8175F24 release end @@ -39,7 +39,7 @@ SilphCo_6F_EventScript_1618D3:: @ 81618D3 lock faceplayer compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if 4, EventScript_1618EA + goto_if ge, EventScript_1618EA msgbox gUnknown_8175F70 release end @@ -53,7 +53,7 @@ SilphCo_6F_EventScript_1618F4:: @ 81618F4 lock faceplayer compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if 4, EventScript_16190B + goto_if ge, EventScript_16190B msgbox gUnknown_8175FAA release end @@ -67,7 +67,7 @@ SilphCo_6F_EventScript_161915:: @ 8161915 lock faceplayer compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if 4, EventScript_16192C + goto_if ge, EventScript_16192C msgbox gUnknown_8176012 release end diff --git a/data/maps/SilphCo_7F/scripts.inc b/data/maps/SilphCo_7F/scripts.inc index 180495d09..871f2fdd7 100644 --- a/data/maps/SilphCo_7F/scripts.inc +++ b/data/maps/SilphCo_7F/scripts.inc @@ -5,16 +5,16 @@ SilphCo_7F_MapScripts:: @ 8161984 SilphCo_7F_MapScript1_16198F:: @ 816198F checkflag FLAG_0x284 - call_if 0, EventScript_1A834B + call_if lt, EventScript_1A834B checkflag FLAG_0x285 - call_if 0, EventScript_1A8379 + call_if lt, EventScript_1A8379 checkflag FLAG_0x286 - call_if 0, EventScript_1A83A7 + call_if lt, EventScript_1A83A7 end SilphCo_7F_MapScript2_1619AB:: @ 81619AB compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 - call_if 4, EventScript_1619B7 + call_if ge, EventScript_1619B7 end EventScript_1619B7:: @ 81619B7 @@ -47,24 +47,24 @@ EventScript_1619D4:: @ 81619D4 waitmovement 0 msgbox gUnknown_8176710 compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_161A73 + call_if eq, EventScript_161A73 compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_161A7F + call_if eq, EventScript_161A7F msgbox gUnknown_8176727 setvar VAR_LAST_TALKED, 1 compare_var_to_value VAR_STARTER_MON, 2 - call_if 1, EventScript_161A80 + call_if eq, EventScript_161A80 compare_var_to_value VAR_STARTER_MON, 1 - call_if 1, EventScript_161A8B + call_if eq, EventScript_161A8B compare_var_to_value VAR_STARTER_MON, 0 - call_if 1, EventScript_161A96 + call_if eq, EventScript_161A96 msgbox gUnknown_8176827 closemessage playbgm MUS_RIVAL2, 0 compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_161AA1 + call_if eq, EventScript_161AA1 compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_161AAC + call_if eq, EventScript_161AAC playse SE_TK_WARPIN fadedefaultbgm removeobject 1 @@ -200,7 +200,7 @@ SilphCo_7F_EventScript_161B97:: @ 8161B97 lock faceplayer compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if 4, EventScript_161BAE + goto_if ge, EventScript_161BAE msgbox gUnknown_8176444 release end @@ -214,7 +214,7 @@ SilphCo_7F_EventScript_161BB8:: @ 8161BB8 lock faceplayer compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if 4, EventScript_161BCF + goto_if ge, EventScript_161BCF msgbox gUnknown_81764C2 release end @@ -228,7 +228,7 @@ SilphCo_7F_EventScript_161BD9:: @ 8161BD9 lock faceplayer compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if 4, EventScript_161BF0 + goto_if ge, EventScript_161BF0 msgbox gUnknown_8176532 release end diff --git a/data/maps/SilphCo_8F/scripts.inc b/data/maps/SilphCo_8F/scripts.inc index a089a5583..4654d0bc7 100644 --- a/data/maps/SilphCo_8F/scripts.inc +++ b/data/maps/SilphCo_8F/scripts.inc @@ -4,14 +4,14 @@ SilphCo_8F_MapScripts:: @ 8161C5F SilphCo_8F_MapScript1_161C65:: @ 8161C65 checkflag FLAG_0x287 - call_if 0, EventScript_1A83D5 + call_if lt, EventScript_1A83D5 end SilphCo_8F_EventScript_161C6F:: @ 8161C6F lock faceplayer compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if 4, EventScript_161C86 + goto_if ge, EventScript_161C86 msgbox gUnknown_817696D release end diff --git a/data/maps/SilphCo_9F/scripts.inc b/data/maps/SilphCo_9F/scripts.inc index 689102cef..72299d021 100644 --- a/data/maps/SilphCo_9F/scripts.inc +++ b/data/maps/SilphCo_9F/scripts.inc @@ -4,20 +4,20 @@ SilphCo_9F_MapScripts:: @ 8161CDE SilphCo_9F_MapScript1_161CE4:: @ 8161CE4 checkflag FLAG_0x288 - call_if 0, EventScript_1A840C + call_if lt, EventScript_1A840C checkflag FLAG_0x289 - call_if 0, EventScript_1A8443 + call_if lt, EventScript_1A8443 checkflag FLAG_0x28A - call_if 0, EventScript_1A847A + call_if lt, EventScript_1A847A checkflag FLAG_0x28B - call_if 0, EventScript_1A84A8 + call_if lt, EventScript_1A84A8 end SilphCo_9F_EventScript_161D09:: @ 8161D09 lock faceplayer compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if 4, EventScript_161D2E + goto_if ge, EventScript_161D2E msgbox gUnknown_8176B54 closemessage call EventScript_1A6C26 diff --git a/data/maps/SilphCo_Elevator/scripts.inc b/data/maps/SilphCo_Elevator/scripts.inc index f20ffa8c0..826e83658 100644 --- a/data/maps/SilphCo_Elevator/scripts.inc +++ b/data/maps/SilphCo_Elevator/scripts.inc @@ -5,7 +5,7 @@ SilphCo_Elevator_EventScript_161F6F:: @ 8161F6F lockall setvar VAR_0x8004, 1 checkflag FLAG_TEMP_2 - call_if 0, EventScript_1A7AB9 + call_if lt, EventScript_1A7AB9 copyvar VAR_0x8005, VAR_0x403A special sub_80CB580 message Text_1A535C diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc b/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc index 618a5dd4c..85a3d01d6 100644 --- a/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc +++ b/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc @@ -17,13 +17,13 @@ SixIsland_DottedHole_SapphireRoom_EventScript_1641B5:: @ 81641B5 waitmovement 0 playse SE_W070 compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_16430F + call_if eq, EventScript_16430F compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_16430F + call_if eq, EventScript_16430F compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_16431A + call_if eq, EventScript_16431A compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_16431A + call_if eq, EventScript_16431A setvar VAR_0x8004, 3 setvar VAR_0x8005, 0 setvar VAR_0x8006, 12 @@ -31,43 +31,43 @@ SixIsland_DottedHole_SapphireRoom_EventScript_1641B5:: @ 81641B5 special sub_80CAC28 delay 60 compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_164325 + call_if eq, EventScript_164325 compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_164330 + call_if eq, EventScript_164330 compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_16433B + call_if eq, EventScript_16433B compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_164346 + call_if eq, EventScript_164346 textcolor 0 msgbox gUnknown_817BD97 closemessage compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_164351 + call_if eq, EventScript_164351 compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_164366 + call_if eq, EventScript_164366 compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_16437B + call_if eq, EventScript_16437B compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_164390 + call_if eq, EventScript_164390 removeobject 1 compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_1642F9 + call_if eq, EventScript_1642F9 compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_1642F9 + call_if eq, EventScript_1642F9 compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_164304 + call_if eq, EventScript_164304 compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_164304 + call_if eq, EventScript_164304 msgbox gUnknown_817BDD4 closemessage compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_1643A5 + call_if eq, EventScript_1643A5 compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_1643B7 + call_if eq, EventScript_1643B7 compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_1643C9 + call_if eq, EventScript_1643C9 compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_1643DB + call_if eq, EventScript_1643DB playse SE_KAIDAN delay 35 removeobject 2 diff --git a/data/maps/SixIsland_PatternBush/scripts.inc b/data/maps/SixIsland_PatternBush/scripts.inc index 4655002aa..fb1ee80ad 100644 --- a/data/maps/SixIsland_PatternBush/scripts.inc +++ b/data/maps/SixIsland_PatternBush/scripts.inc @@ -6,9 +6,9 @@ SixIsland_PatternBush_MapScript1_16455F:: @ 816455F setworldmapflag FLAG_WORLD_MAP_SIX_ISLAND_PATTERN_BUSH getplayerxy VAR_0x4001, VAR_0x4002 compare_var_to_value VAR_0x4001, 50 - call_if 4, EventScript_16457E + call_if ge, EventScript_16457E compare_var_to_value VAR_0x4001, 49 - call_if 3, EventScript_164587 + call_if le, EventScript_164587 end EventScript_16457E:: @ 816457E diff --git a/data/maps/SixIsland_PokemonCenter_1F/scripts.inc b/data/maps/SixIsland_PokemonCenter_1F/scripts.inc index dd1293f79..1ad4df1ed 100644 --- a/data/maps/SixIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/SixIsland_PokemonCenter_1F/scripts.inc @@ -7,7 +7,7 @@ SixIsland_PokemonCenter_1F_MapScripts:: @ 8171D6A SixIsland_PokemonCenter_1F_MapScript1_171D7A:: @ 8171D7A setrespawn SPAWN_SIX_ISLAND compare_var_to_value VAR_MAP_SCENE_SIX_ISLAND_POKEMON_CENTER_1F, 0 - call_if 1, EventScript_171D89 + call_if eq, EventScript_171D89 end EventScript_171D89:: @ 8171D89 diff --git a/data/maps/SixIsland_RuinValley/scripts.inc b/data/maps/SixIsland_RuinValley/scripts.inc index 11c1b730f..250791d52 100644 --- a/data/maps/SixIsland_RuinValley/scripts.inc +++ b/data/maps/SixIsland_RuinValley/scripts.inc @@ -4,7 +4,7 @@ SixIsland_RuinValley_MapScripts:: @ 8168B53 SixIsland_RuinValley_MapScript1_168B59:: @ 8168B59 checkflag FLAG_0x2E3 - call_if 1, EventScript_168B63 + call_if eq, EventScript_168B63 end EventScript_168B63:: @ 8168B63 diff --git a/data/maps/SixIsland_WaterPath_House1/scripts.inc b/data/maps/SixIsland_WaterPath_House1/scripts.inc index f9df42396..e25a96044 100644 --- a/data/maps/SixIsland_WaterPath_House1/scripts.inc +++ b/data/maps/SixIsland_WaterPath_House1/scripts.inc @@ -18,7 +18,7 @@ SixIsland_WaterPath_House1_EventScript_17206D:: @ 817206D waitstate copyvar VAR_RESULT, VAR_0x8004 compare_var_to_value VAR_RESULT, 6 - goto_if 4, EventScript_1720EF + goto_if ge, EventScript_1720EF special sub_80A0930 compare_var_to_value VAR_RESULT, 1 goto_if_eq EventScript_1720F1 @@ -47,14 +47,14 @@ EventScript_1720F1:: @ 81720F1 EventScript_1720FB:: @ 81720FB checkflag FLAG_0x2D9 - goto_if 0, EventScript_172121 + goto_if lt, EventScript_172121 msgbox gUnknown_81A4B7A release end EventScript_17210E:: @ 817210E checkflag FLAG_0x2D9 - goto_if 0, EventScript_172121 + goto_if lt, EventScript_172121 msgbox gUnknown_81A4B39 release end diff --git a/data/maps/ThreeIsland/scripts.inc b/data/maps/ThreeIsland/scripts.inc index eaa84fb15..8f671ef90 100644 --- a/data/maps/ThreeIsland/scripts.inc +++ b/data/maps/ThreeIsland/scripts.inc @@ -5,9 +5,9 @@ ThreeIsland_MapScripts:: @ 81677AD ThreeIsland_MapScript1_1677B3:: @ 81677B3 setworldmapflag FLAG_WORLD_MAP_THREE_ISLAND checkflag FLAG_0x2A3 - call_if 1, EventScript_1677CB + call_if eq, EventScript_1677CB compare_var_to_value VAR_MAP_SCENE_THREE_ISLAND, 4 - call_if 1, EventScript_1677CF + call_if eq, EventScript_1677CF end EventScript_1677CB:: @ 81677CB @@ -65,36 +65,36 @@ EventScript_167865:: @ 8167865 EventScript_16786F:: @ 816786F compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_167947 + call_if eq, EventScript_167947 compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_167947 + call_if eq, EventScript_167947 applymovement 1, Movement_167A1B waitmovement 0 msgbox gUnknown_81820C0 compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_167952 + call_if eq, EventScript_167952 compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_167952 + call_if eq, EventScript_167952 compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_16795D + call_if eq, EventScript_16795D applymovement 5, Movement_167A19 waitmovement 0 msgbox gUnknown_8182125 compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_167931 + call_if eq, EventScript_167931 compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_167931 + call_if eq, EventScript_167931 compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_167973 + call_if eq, EventScript_167973 applymovement 2, Movement_167A1B waitmovement 0 msgbox gUnknown_81821A9 compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_167952 + call_if eq, EventScript_167952 compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_167952 + call_if eq, EventScript_167952 compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_16795D + call_if eq, EventScript_16795D applymovement 4, Movement_167A19 waitmovement 0 msgbox gUnknown_81821DC @@ -123,14 +123,14 @@ EventScript_167952:: @ 8167952 EventScript_16795D:: @ 816795D getplayerxy VAR_0x8004, VAR_0x8005 compare_var_to_value VAR_0x8004, 9 - goto_if 4, EventScript_167931 + goto_if ge, EventScript_167931 goto EventScript_167952 end EventScript_167973:: @ 8167973 getplayerxy VAR_0x8004, VAR_0x8005 compare_var_to_value VAR_0x8004, 9 - goto_if 4, EventScript_167947 + goto_if ge, EventScript_167947 goto EventScript_167931 end @@ -257,15 +257,15 @@ EventScript_167A59:: @ 8167A59 closemessage delay 45 compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_167BC6 + call_if eq, EventScript_167BC6 compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_167BD8 + call_if eq, EventScript_167BD8 compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_167BEA + call_if eq, EventScript_167BEA compare_var_to_value VAR_0x4001, 3 - call_if 1, EventScript_167C03 + call_if eq, EventScript_167C03 compare_var_to_value VAR_0x4001, 4 - call_if 1, EventScript_167C1C + call_if eq, EventScript_167C1C playbgm MUS_SHOUNEN, 0 msgbox gUnknown_8182623 setvar VAR_LAST_TALKED, 3 diff --git a/data/maps/ThreeIsland_BerryForest/scripts.inc b/data/maps/ThreeIsland_BerryForest/scripts.inc index b57c94f1d..8a0fd3acf 100644 --- a/data/maps/ThreeIsland_BerryForest/scripts.inc +++ b/data/maps/ThreeIsland_BerryForest/scripts.inc @@ -31,7 +31,7 @@ ThreeIsland_BerryForest_EventScript_163C83:: @ 8163C83 msgbox gUnknown_817AEE1 giveitem ITEM_IAPAPA_BERRY compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_163D19 + call_if eq, EventScript_163D19 special sub_80CA6DC msgbox gUnknown_817AF3B closemessage diff --git a/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc b/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc index 7cdedc60c..4bd0d675f 100644 --- a/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc +++ b/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc @@ -7,9 +7,9 @@ ThreeIsland_DunsparceTunnel_MapScript1_164D2C:: @ 8164D2C specialvar VAR_RESULT, IsNationalPokedexEnabled copyvar VAR_0x8008, VAR_RESULT compare_var_to_value VAR_0x8008, 1 - call_if 1, EventScript_164D50 + call_if eq, EventScript_164D50 compare_var_to_value VAR_0x8008, 0 - call_if 1, EventScript_164D54 + call_if eq, EventScript_164D54 end EventScript_164D50:: @ 8164D50 diff --git a/data/maps/ThreeIsland_Port/scripts.inc b/data/maps/ThreeIsland_Port/scripts.inc index 17851408b..b101c5ead 100644 --- a/data/maps/ThreeIsland_Port/scripts.inc +++ b/data/maps/ThreeIsland_Port/scripts.inc @@ -11,9 +11,9 @@ ThreeIsland_Port_EventScript_168796:: @ 8168796 lock faceplayer compare_var_to_value VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 2 - goto_if 4, EventScript_1687B8 + goto_if ge, EventScript_1687B8 compare_var_to_value VAR_MAP_SCENE_THREE_ISLAND, 4 - goto_if 4, EventScript_1687C2 + goto_if ge, EventScript_1687C2 msgbox gUnknown_818A307 release end diff --git a/data/maps/TwoIsland/scripts.inc b/data/maps/TwoIsland/scripts.inc index dffb46302..b09f1b0c0 100644 --- a/data/maps/TwoIsland/scripts.inc +++ b/data/maps/TwoIsland/scripts.inc @@ -20,27 +20,27 @@ EventScript_167576:: @ 8167576 EventScript_167597:: @ 8167597 checkflag FLAG_0x29D - goto_if 0, EventScript_1675EE + goto_if lt, EventScript_1675EE checkflag FLAG_0x29E - goto_if 0, EventScript_1675F4 + goto_if lt, EventScript_1675F4 checkflag FLAG_0x29F - goto_if 0, EventScript_1675FD + goto_if lt, EventScript_1675FD goto EventScript_167606 end EventScript_1675B8:: @ 81675B8 checkflag FLAG_0x29D - goto_if 0, EventScript_1675EE + goto_if lt, EventScript_1675EE checkflag FLAG_0x2A3 - goto_if 0, EventScript_1675EE + goto_if lt, EventScript_1675EE checkflag FLAG_0x29E - goto_if 0, EventScript_1675F4 + goto_if lt, EventScript_1675F4 goto EventScript_1675FD end EventScript_1675D9:: @ 81675D9 checkflag FLAG_0x29D - goto_if 0, EventScript_1675EE + goto_if lt, EventScript_1675EE goto EventScript_1675F4 end diff --git a/data/maps/TwoIsland_House/scripts.inc b/data/maps/TwoIsland_House/scripts.inc index 87c9a8583..2ad326b08 100644 --- a/data/maps/TwoIsland_House/scripts.inc +++ b/data/maps/TwoIsland_House/scripts.inc @@ -21,10 +21,10 @@ TwoIsland_House_EventScript_171619:: @ 8171619 EventScript_17164F:: @ 817164F checkitem ITEM_BIG_MUSHROOM, 1 compare_var_to_value VAR_RESULT, 1 - call_if 1, EventScript_1717A8 + call_if eq, EventScript_1717A8 checkitem ITEM_TINY_MUSHROOM, 2 compare_var_to_value VAR_RESULT, 1 - call_if 1, EventScript_1717AC + call_if eq, EventScript_1717AC checkflag FLAG_TEMP_2 goto_if_eq EventScript_171687 checkflag FLAG_TEMP_3 @@ -34,13 +34,13 @@ EventScript_17164F:: @ 817164F EventScript_171687:: @ 8171687 checkflag FLAG_TEMP_3 - call_if 1, EventScript_1717B0 + call_if eq, EventScript_1717B0 goto EventScript_1716A5 end EventScript_171696:: @ 8171696 checkflag FLAG_TEMP_2 - call_if 1, EventScript_1717B0 + call_if eq, EventScript_1717B0 goto EventScript_1716A5 end @@ -56,7 +56,7 @@ EventScript_1716BE:: @ 81716BE special sub_80BF93C waitstate compare_var_to_value VAR_0x8004, 6 - goto_if 4, EventScript_17179E + goto_if ge, EventScript_17179E special sub_80BFC14 compare_var_to_value VAR_RESULT, 1 goto_if_eq EventScript_171790 diff --git a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc index e4ed31f53..add8fcace 100644 --- a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc +++ b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc @@ -7,7 +7,7 @@ TwoIsland_JoyfulGameCorner_MapScripts:: @ 81713D0 TwoIsland_JoyfulGameCorner_MapScript1_1713E5:: @ 81713E5 checkflag FLAG_0x2FB - call_if 1, EventScript_1713EF + call_if eq, EventScript_1713EF end EventScript_1713EF:: @ 81713EF diff --git a/data/maps/UndergroundPath_NorthEntrance/scripts.inc b/data/maps/UndergroundPath_NorthEntrance/scripts.inc index 3090d4141..f54e710e6 100644 --- a/data/maps/UndergroundPath_NorthEntrance/scripts.inc +++ b/data/maps/UndergroundPath_NorthEntrance/scripts.inc @@ -13,10 +13,10 @@ UndergroundPath_NorthEntrance_EventScript_160E39:: @ 8160E39 goto_if_eq EventScript_160E93 call EventScript_1A8CBD compare_var_to_value VAR_0x8004, 6 - goto_if 4, EventScript_160E93 + goto_if ge, EventScript_160E93 call EventScript_1A8CC9 compare_var_to_var VAR_RESULT, VAR_0x8009 - goto_if 5, EventScript_160E9D + goto_if ne, EventScript_160E9D call EventScript_1A8CD9 msgbox gUnknown_81A5B4A setflag FLAG_DID_MS_NIDO_TRADE diff --git a/data/maps/VermilionCity/scripts.inc b/data/maps/VermilionCity/scripts.inc index 2cae8b884..4ec5c4ee2 100644 --- a/data/maps/VermilionCity/scripts.inc +++ b/data/maps/VermilionCity/scripts.inc @@ -23,7 +23,7 @@ Movement_166903:: @ 8166903 VermilionCity_MapScript1_166906:: @ 8166906 setworldmapflag FLAG_WORLD_MAP_VERMILION_CITY checkflag FLAG_0x2F9 - call_if 1, EventScript_166913 + call_if eq, EventScript_166913 end EventScript_166913:: @ 8166913 @@ -59,7 +59,7 @@ VermilionCity_EventScript_166941:: @ 8166941 EventScript_166958:: @ 8166958 checkflag FLAG_0x84A - goto_if 0, EventScript_1A77B0 + goto_if lt, EventScript_1A77B0 checkitem ITEM_MYSTIC_TICKET, 1 compare_var_to_value VAR_RESULT, 0 goto_if_eq EventScript_1A77B0 @@ -68,7 +68,7 @@ EventScript_166958:: @ 8166958 EventScript_166977:: @ 8166977 checkflag FLAG_0x84B - goto_if 0, EventScript_1A77B0 + goto_if lt, EventScript_1A77B0 checkitem ITEM_AURORA_TICKET, 1 compare_var_to_value VAR_RESULT, 0 goto_if_eq EventScript_1A77B0 @@ -78,9 +78,9 @@ EventScript_166977:: @ 8166977 EventScript_166996:: @ 8166996 setvar VAR_0x8004, 0 compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 - goto_if 4, EventScript_1669BB + goto_if ge, EventScript_1669BB compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 1 - goto_if 4, EventScript_166B3B + goto_if ge, EventScript_166B3B msgbox gUnknown_817FB10 release end @@ -107,7 +107,7 @@ EventScript_1669FD:: @ 81669FD compare_var_to_value VAR_RESULT, 1 goto_if_eq EventScript_166AB1 checkflag FLAG_0x2F0 - call_if 0, EventScript_166A53 + call_if lt, EventScript_166A53 message Text_17FCC1 waitmessage multichoice 17, 6, 54, 0 @@ -125,7 +125,7 @@ EventScript_166A53:: @ 8166A53 EventScript_166A5F:: @ 8166A5F checkflag FLAG_0x2F1 - call_if 0, EventScript_166AA5 + call_if lt, EventScript_166AA5 message Text_17FCC1 waitmessage multichoice 13, 6, 55, 0 @@ -143,9 +143,9 @@ EventScript_166AA5:: @ 8166AA5 EventScript_166AB1:: @ 8166AB1 checkflag FLAG_0x2F0 - call_if 0, EventScript_166A53 + call_if lt, EventScript_166A53 checkflag FLAG_0x2F1 - call_if 0, EventScript_166AA5 + call_if lt, EventScript_166AA5 message Text_17FCC1 waitmessage multichoice 13, 5, 56, 0 @@ -213,7 +213,7 @@ EventScript_166BA0:: @ 8166BA0 goto_if_eq EventScript_166BED msgbox gUnknown_817FA3C checkflag FLAG_GOT_SS_TICKET - goto_if 0, EventScript_166BDE + goto_if lt, EventScript_166BDE msgbox gUnknown_817FA77 setvar VAR_VERMILION_CITY_TICKET_CHECK_TRIGGER, 1 releaseall @@ -228,9 +228,9 @@ EventScript_166BDE:: @ 8166BDE EventScript_166BED:: @ 8166BED setvar VAR_0x8004, 0 compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 - goto_if 4, EventScript_1669BB + goto_if ge, EventScript_1669BB compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 1 - goto_if 4, EventScript_166B3B + goto_if ge, EventScript_166B3B msgbox gUnknown_817FB10 closemessage goto EventScript_1A9108 diff --git a/data/maps/VermilionCity_Gym/scripts.inc b/data/maps/VermilionCity_Gym/scripts.inc index 10f9c6d85..78b023c7b 100644 --- a/data/maps/VermilionCity_Gym/scripts.inc +++ b/data/maps/VermilionCity_Gym/scripts.inc @@ -5,9 +5,9 @@ VermilionCity_Gym_MapScripts:: @ 816B69E VermilionCity_Gym_MapScript1_16B6A9:: @ 816B6A9 checkflag FLAG_TEMP_1 - call_if 1, EventScript_16B6BC + call_if eq, EventScript_16B6BC checkflag FLAG_0x264 - call_if 1, EventScript_16B717 + call_if eq, EventScript_16B717 end EventScript_16B6BC:: @ 816B6BC @@ -211,7 +211,7 @@ VermilionCity_Gym_EventScript_16B94A:: @ 816B94A famechecker FAMECHECKER_LTSURGE, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 trainerbattle 1, TRAINER_LEADER_LT_SURGE, 0, Text_194BA4, Text_194E03, EventScript_16B97C checkflag FLAG_GOT_TM34_FROM_SURGE - goto_if 0, EventScript_16B9AF + goto_if lt, EventScript_16B9AF msgbox gUnknown_8194C8E release end @@ -219,7 +219,7 @@ VermilionCity_Gym_EventScript_16B94A:: @ 816B94A EventScript_16B97C:: @ 816B97C famechecker FAMECHECKER_LTSURGE, 1 checkflag FLAG_GOT_HM05 - call_if 0, EventScript_16B9AB + call_if lt, EventScript_16B9AB clearflag FLAG_HIDE_FAME_CHECKER_LT_SURGE_JOURNAL setflag FLAG_DEFEATED_LT_SURGE setflag FLAG_BADGE03_GET diff --git a/data/maps/VermilionCity_House2/scripts.inc b/data/maps/VermilionCity_House2/scripts.inc index 30e5496d5..9b347c9bb 100644 --- a/data/maps/VermilionCity_House2/scripts.inc +++ b/data/maps/VermilionCity_House2/scripts.inc @@ -13,10 +13,10 @@ VermilionCity_House2_EventScript_16B5D7:: @ 816B5D7 goto_if_eq EventScript_16B631 call EventScript_1A8CBD compare_var_to_value VAR_0x8004, 6 - goto_if 4, EventScript_16B631 + goto_if ge, EventScript_16B631 call EventScript_1A8CC9 compare_var_to_var VAR_RESULT, VAR_0x8009 - goto_if 5, EventScript_16B63B + goto_if ne, EventScript_16B63B call EventScript_1A8CD9 msgbox gUnknown_8194A44 setflag FLAG_DID_CH_DING_TRADE diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc index 67cf54017..14b30547f 100644 --- a/data/maps/VictoryRoad_1F/scripts.inc +++ b/data/maps/VictoryRoad_1F/scripts.inc @@ -5,7 +5,7 @@ VictoryRoad_1F_MapScripts:: @ 8160F05 VictoryRoad_1F_MapScript1_160F10:: @ 8160F10 compare_var_to_value VAR_MAP_SCENE_VICTORY_ROAD_1F, 100 - call_if 5, EventScript_160F1C + call_if ne, EventScript_160F1C end EventScript_160F1C:: @ 8160F1C diff --git a/data/maps/VictoryRoad_2F/scripts.inc b/data/maps/VictoryRoad_2F/scripts.inc index 7831e662f..f53e2fcd6 100644 --- a/data/maps/VictoryRoad_2F/scripts.inc +++ b/data/maps/VictoryRoad_2F/scripts.inc @@ -4,9 +4,9 @@ VictoryRoad_2F_MapScripts:: @ 8160F92 VictoryRoad_2F_MapScript1_160F98:: @ 8160F98 compare_var_to_value VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER1, 100 - call_if 5, EventScript_160FAF + call_if ne, EventScript_160FAF compare_var_to_value VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER2, 100 - call_if 5, EventScript_160FC2 + call_if ne, EventScript_160FC2 end EventScript_160FAF:: @ 8160FAF diff --git a/data/maps/VictoryRoad_3F/scripts.inc b/data/maps/VictoryRoad_3F/scripts.inc index 6710153dc..87e115235 100644 --- a/data/maps/VictoryRoad_3F/scripts.inc +++ b/data/maps/VictoryRoad_3F/scripts.inc @@ -4,7 +4,7 @@ VictoryRoad_3F_MapScripts:: @ 81610AA VictoryRoad_3F_MapScript1_1610B0:: @ 81610B0 compare_var_to_value VAR_MAP_SCENE_VICTORY_ROAD_3F, 100 - call_if 5, EventScript_1610BC + call_if ne, EventScript_1610BC end EventScript_1610BC:: @ 81610BC diff --git a/data/maps/ViridianCity/scripts.inc b/data/maps/ViridianCity/scripts.inc index 60301d9e4..03a3db88d 100644 --- a/data/maps/ViridianCity/scripts.inc +++ b/data/maps/ViridianCity/scripts.inc @@ -5,13 +5,13 @@ ViridianCity_MapScripts:: @ 81658D3 ViridianCity_MapScript1_1658D9:: @ 81658D9 setworldmapflag FLAG_WORLD_MAP_VIRIDIAN_CITY compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 0 - call_if 1, EventScript_165920 + call_if eq, EventScript_165920 compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 1 - call_if 1, EventScript_16590F + call_if eq, EventScript_16590F compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 2 - call_if 4, EventScript_165909 + call_if ge, EventScript_165909 compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_GYM_DOOR, 0 - call_if 1, EventScript_165931 + call_if eq, EventScript_165931 end EventScript_165909:: @ 8165909 @@ -32,17 +32,17 @@ EventScript_165920:: @ 8165920 EventScript_165931:: @ 8165931 checkflag FLAG_BADGE02_GET - goto_if 0, EventScript_1A77A9 + goto_if lt, EventScript_1A77A9 checkflag FLAG_BADGE03_GET - goto_if 0, EventScript_1A77A9 + goto_if lt, EventScript_1A77A9 checkflag FLAG_BADGE04_GET - goto_if 0, EventScript_1A77A9 + goto_if lt, EventScript_1A77A9 checkflag FLAG_BADGE05_GET - goto_if 0, EventScript_1A77A9 + goto_if lt, EventScript_1A77A9 checkflag FLAG_BADGE06_GET - goto_if 0, EventScript_1A77A9 + goto_if lt, EventScript_1A77A9 checkflag FLAG_BADGE07_GET - goto_if 0, EventScript_1A77A9 + goto_if lt, EventScript_1A77A9 setvar VAR_MAP_SCENE_VIRIDIAN_CITY_GYM_DOOR, 1 return @@ -110,7 +110,7 @@ ViridianCity_EventScript_1659F6:: @ 81659F6 checkflag FLAG_BADGE01_GET goto_if_eq EventScript_165A23 compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 2 - goto_if 4, EventScript_165A4A + goto_if ge, EventScript_165A4A compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 1 goto_if_eq EventScript_165A54 compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 0 diff --git a/data/maps/ViridianCity_Gym/scripts.inc b/data/maps/ViridianCity_Gym/scripts.inc index 47e4c00b2..8b470aa84 100644 --- a/data/maps/ViridianCity_Gym/scripts.inc +++ b/data/maps/ViridianCity_Gym/scripts.inc @@ -5,7 +5,7 @@ ViridianCity_Gym_EventScript_169ECA:: @ 8169ECA famechecker FAMECHECKER_GIOVANNI, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 trainerbattle 1, TRAINER_LEADER_GIOVANNI, 0, Text_18F352, Text_18F43F, EventScript_169F04 checkflag FLAG_0x298 - goto_if 0, EventScript_169F2F + goto_if lt, EventScript_169F2F msgbox gUnknown_818F4A2 closemessage fadescreen 1 diff --git a/data/maps/ViridianCity_Mart/scripts.inc b/data/maps/ViridianCity_Mart/scripts.inc index 07c280442..81e13fb1f 100644 --- a/data/maps/ViridianCity_Mart/scripts.inc +++ b/data/maps/ViridianCity_Mart/scripts.inc @@ -5,7 +5,7 @@ ViridianCity_Mart_MapScripts:: @ 816A1D3 ViridianCity_Mart_MapScript1_16A1DE:: @ 816A1DE checkflag FLAG_SYS_POKEDEX_GET - goto_if 0, EventScript_16A1E8 + goto_if lt, EventScript_16A1E8 end EventScript_16A1E8:: @ 816A1E8 |