diff options
166 files changed, 1167 insertions, 1165 deletions
diff --git a/asm/field_specials.s b/asm/field_specials.s index a4df8b6ea..3bcc47ce6 100644 --- a/asm/field_specials.s +++ b/asm/field_specials.s @@ -1081,8 +1081,8 @@ sub_80CADC4: @ 80CADC4 bx r0 thumb_func_end sub_80CADC4 - thumb_func_start sub_80CADEC -sub_80CADEC: @ 80CADEC + thumb_func_start Special_SetVermilionTrashCans +Special_SetVermilionTrashCans: @ 80CADEC push {r4,r5,lr} bl Random lsls r0, 16 @@ -1377,7 +1377,7 @@ _080CB04C: pop {r4,r5} pop {r0} bx r0 - thumb_func_end sub_80CADEC + thumb_func_end Special_SetVermilionTrashCans thumb_func_start sub_80CB054 sub_80CB054: @ 80CB054 diff --git a/data/event_scripts.s b/data/event_scripts.s index 4a817be03..ee7e3a134 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -16,6 +16,8 @@ #include "constants/fame_checker.h" .include "asm/macros.inc" .include "asm/macros/event.inc" + .set FALSE, 0 + .set TRUE, 1 .section script_data, "aw", %progbits @@ -887,7 +889,7 @@ gUnknown_81A4F21:: @ 81A4F21 special PlayTrainerEncounterMusic special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A501A + goto_if eq, EventScript_1A501A battlebegin ontrainerbattleend @@ -895,7 +897,7 @@ gUnknown_81A4F3E:: @ 81A4F3E call EventScript_1A4FBA specialvar VAR_RESULT, sub_810CEB4 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_1A4F72 + goto_if eq, EventScript_1A4F72 special PlayTrainerEncounterMusic special sub_8080398 special sub_80805D8 @@ -903,7 +905,7 @@ gUnknown_81A4F3E:: @ 81A4F3E waitbuttonpress special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A4FB8 + goto_if eq, EventScript_1A4FB8 special sub_80805B0 waitstate releaseall @@ -915,7 +917,7 @@ EventScript_1A4F72:: @ 81A4F72 gUnknown_81A4F73:: @ 81A4F73 specialvar VAR_RESULT, sub_810CEB4 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_1A4FB0 + goto_if eq, EventScript_1A4FB0 special CheckForAlivePartyMons compare_var_to_value VAR_RESULT, 0 goto_if ne, EventScript_1A4FB1 @@ -926,7 +928,7 @@ gUnknown_81A4F73:: @ 81A4F73 waitbuttonpress special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A4FB8 + goto_if eq, EventScript_1A4FB8 special sub_80805B0 waitstate releaseall @@ -961,19 +963,19 @@ EventScript_1A4FC7:: @ 81A4FC7 waitbuttonpress special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A501A + goto_if eq, EventScript_1A501A battlebegin specialvar VAR_RESULT, sub_80803CC compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_1A5017 + goto_if eq, EventScript_1A5017 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A5019 + goto_if eq, EventScript_1A5019 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_1A5019 + goto_if eq, EventScript_1A5019 compare_var_to_value VAR_RESULT, 6 - goto_if_eq EventScript_1A5019 + goto_if eq, EventScript_1A5019 compare_var_to_value VAR_RESULT, 8 - goto_if_eq EventScript_1A5019 + goto_if eq, EventScript_1A5019 EventScript_1A5017:: @ 81A5017 releaseall @@ -1584,7 +1586,7 @@ EventScript_1A6551:: @ 81A6551 EventScript_1A6578:: @ 81A6578 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 message Text_1A5483 waitmessage multichoice 19, 8, 0, 2 @@ -1616,13 +1618,13 @@ EventScript_1A65CE:: @ 81A65CE EventScript_1A65EC:: @ 81A65EC specialvar VAR_RESULT, sub_80CD074 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_1A661D + goto_if eq, EventScript_1A661D specialvar VAR_RESULT, sp182_move_string copyvar VAR_0x8008, VAR_RESULT compare_var_to_value VAR_0x8008, 0 - goto_if_eq EventScript_1A661D + goto_if eq, EventScript_1A661D compare_var_to_value VAR_0x8008, 1 - goto_if_eq EventScript_1A6636 + goto_if eq, EventScript_1A6636 end EventScript_1A661D:: @ 81A661D @@ -1635,7 +1637,7 @@ EventScript_1A661D:: @ 81A661D EventScript_1A6636:: @ 81A6636 checkflag 2114 - goto_if_eq EventScript_1A661D + goto_if TRUE, EventScript_1A661D msgbox Text_1A552B setflag 2114 message Text_1BCCCA @@ -1684,15 +1686,15 @@ EventScript_1A6697:: @ 81A6697 EventScript_1A66BC:: @ 81A66BC switch VAR_RESULT compare_var_to_value VAR_0x8000, 1 - goto_if_eq EventScript_1A66F9 + goto_if eq, EventScript_1A66F9 compare_var_to_value VAR_0x8000, 2 - goto_if_eq EventScript_1A6709 + goto_if eq, EventScript_1A6709 compare_var_to_value VAR_0x8000, 3 - goto_if_eq EventScript_1A6719 + goto_if eq, EventScript_1A6719 compare_var_to_value VAR_0x8000, 4 - goto_if_eq EventScript_1A6729 + goto_if eq, EventScript_1A6729 compare_var_to_value VAR_0x8000, 5 - goto_if_eq EventScript_1A6739 + goto_if eq, EventScript_1A6739 end EventScript_1A66F9:: @ 81A66F9 @@ -1823,12 +1825,12 @@ EventScript_PickUpHiddenItem:: @ 81A6843 textcolor 3 waitse compare_var_to_value VAR_0x8005, 0 - goto_if_eq EventScript_PickUpHiddenCoins + goto_if eq, EventScript_PickUpHiddenCoins call EventScript_GiveItem compare_var_to_value VAR_0x8007, 1 - goto_if_eq EventScript_ItemInPocketMessage + goto_if eq, EventScript_ItemInPocketMessage compare_var_to_value VAR_0x8007, 0 - goto_if_eq EventScript_BagIsFullMessage + goto_if eq, EventScript_BagIsFullMessage end EventScript_GiveItem:: @@ -1874,11 +1876,11 @@ EventScript_BagIsFullMessage:: EventScript_PickUpHiddenCoins:: checkflag FLAG_GOT_COIN_CASE - goto_if lt, EventScript_HiddenCoinsButNoCoinCase + goto_if FALSE, EventScript_HiddenCoinsButNoCoinCase checkcoins VAR_RESULT specialvar VAR_RESULT, Special_CheckAddCoins compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_HiddenCoinsButTheCoinCaseIsFull + goto_if eq, EventScript_HiddenCoinsButTheCoinCaseIsFull givecoins VAR_0x8006 getstdstring 1, 0x17 call EventScript_1A6764 @@ -1914,7 +1916,7 @@ gUnknown_81A6955:: @ 81A6955 goto_if eq, EventScript_1A7AE0 lockall checkflag FLAG_0x841 - goto_if eq, EventScript_1A698E + goto_if TRUE, EventScript_1A698E setvar VAR_0x8004, 27 special Special_SetSomeVariable setvar VAR_0x8004, 0 @@ -1958,9 +1960,9 @@ EventScript_1A69F0:: @ 81A69F0 EventScript_1A6A05:: @ 81A6A05 playse SE_PC_LOGIN checkflag FLAG_SYS_NOT_SOMEONES_PC - call_if lt, EventScript_1A6A34 + call_if FALSE, EventScript_1A6A34 checkflag FLAG_SYS_NOT_SOMEONES_PC - call_if eq, EventScript_1A6A3D + call_if TRUE, EventScript_1A6A3D msgbox Text_1A50BE special sub_808C6A8 waitstate @@ -1987,7 +1989,7 @@ EventScript_1A6A46:: @ 81A6A46 EventScript_1A6A56:: @ 81A6A56 checkflag FLAG_SYS_GAME_CLEAR - goto_if lt, EventScript_1A6A46 + goto_if FALSE, EventScript_1A6A46 playse SE_PC_LOGIN setvar VAR_0x8004, 31 special HelpSystem_BackupSomeVariable @@ -2000,7 +2002,7 @@ EventScript_1A6A56:: @ 81A6A56 EventScript_1A6A7A:: @ 81A6A7A checkflag FLAG_SYS_POKEDEX_GET - goto_if lt, EventScript_1A6A46 + goto_if FALSE, EventScript_1A6A46 playse SE_PC_LOGIN msgbox Text_1A5BC6 msgbox Text_1A5C03, 5 @@ -2299,9 +2301,9 @@ EventScript_1A737B:: @ 81A737B goto_if eq, EventScript_1A7AE0 special sub_8112364 checkflag FLAG_0x2F4 - call_if eq, EventScript_1A73A4 + call_if TRUE, EventScript_1A73A4 checkflag FLAG_0x2F4 - call_if lt, EventScript_1A73AD + call_if FALSE, EventScript_1A73AD call EventScript_1A73E0 return @@ -2346,7 +2348,7 @@ EventScript_1A73E0:: @ 81A73E0 getnumberstring 1, VAR_0x8009 msgbox Text_1A6CA3 checkflag FLAG_0x2FF - call_if lt, EventScript_1A746D + call_if FALSE, EventScript_1A746D call EventScript_1A73B6 compare_var_to_value VAR_0x800A, 0 goto_if eq, EventScript_1A748F @@ -2830,49 +2832,49 @@ EventScript_1A786C:: @ 81A786C EventScript_1A78D5:: @ 81A78D5 checkflag FLAG_BADGE01_GET - goto_if eq, EventScript_1A794D + goto_if TRUE, EventScript_1A794D goto EventScript_1A77C9 end EventScript_1A78E4:: @ 81A78E4 checkflag FLAG_BADGE02_GET - goto_if eq, EventScript_1A795F + goto_if TRUE, EventScript_1A795F goto EventScript_1A77DE end EventScript_1A78F3:: @ 81A78F3 checkflag FLAG_BADGE03_GET - goto_if eq, EventScript_1A795F + goto_if TRUE, EventScript_1A795F goto EventScript_1A77DE end EventScript_1A7902:: @ 81A7902 checkflag FLAG_BADGE04_GET - goto_if eq, EventScript_1A795F + goto_if TRUE, EventScript_1A795F goto EventScript_1A77DE end EventScript_1A7911:: @ 81A7911 checkflag FLAG_BADGE05_GET - goto_if eq, EventScript_1A795F + goto_if TRUE, EventScript_1A795F goto EventScript_1A77DE end EventScript_1A7920:: @ 81A7920 checkflag FLAG_BADGE06_GET - goto_if eq, EventScript_1A795F + goto_if TRUE, EventScript_1A795F goto EventScript_1A77DE end EventScript_1A792F:: @ 81A792F checkflag FLAG_BADGE07_GET - goto_if eq, EventScript_1A795F + goto_if TRUE, EventScript_1A795F goto EventScript_1A77DE end EventScript_1A793E:: @ 81A793E checkflag FLAG_BADGE08_GET - goto_if eq, EventScript_1A795F + goto_if TRUE, EventScript_1A795F goto EventScript_1A77DE end @@ -2909,49 +2911,49 @@ EventScript_1A796E:: @ 81A796E EventScript_1A79D8:: @ 81A79D8 checkflag FLAG_BADGE01_GET - goto_if eq, EventScript_1A7A96 + goto_if TRUE, EventScript_1A7A96 goto EventScript_1A7A50 end EventScript_1A79E7:: @ 81A79E7 checkflag FLAG_BADGE02_GET - goto_if eq, EventScript_1A7AA8 + goto_if TRUE, EventScript_1A7AA8 goto EventScript_1A7A77 end EventScript_1A79F6:: @ 81A79F6 checkflag FLAG_BADGE03_GET - goto_if eq, EventScript_1A7AA8 + goto_if TRUE, EventScript_1A7AA8 goto EventScript_1A7A77 end EventScript_1A7A05:: @ 81A7A05 checkflag FLAG_BADGE04_GET - goto_if eq, EventScript_1A7AA8 + goto_if TRUE, EventScript_1A7AA8 goto EventScript_1A7A77 end EventScript_1A7A14:: @ 81A7A14 checkflag FLAG_BADGE05_GET - goto_if eq, EventScript_1A7AA8 + goto_if TRUE, EventScript_1A7AA8 goto EventScript_1A7A77 end EventScript_1A7A23:: @ 81A7A23 checkflag FLAG_BADGE06_GET - goto_if eq, EventScript_1A7AA8 + goto_if TRUE, EventScript_1A7AA8 goto EventScript_1A7A77 end EventScript_1A7A32:: @ 81A7A32 checkflag FLAG_BADGE07_GET - goto_if eq, EventScript_1A7AA8 + goto_if TRUE, EventScript_1A7AA8 goto EventScript_1A7A77 end EventScript_1A7A41:: @ 81A7A41 checkflag FLAG_BADGE08_GET - goto_if eq, EventScript_1A7AA8 + goto_if TRUE, EventScript_1A7AA8 goto EventScript_1A7A77 end @@ -3032,9 +3034,9 @@ EventScript_1A7AE2:: @ 81A7AE2 compare_var_to_value VAR_RESULT, 0 goto_if eq, EventScript_1A7B70 msgbox Text_17747B - checkflag FLAG_0x26C - goto_if eq, EventScript_1A7B3B - setflag FLAG_0x26C + checkflag FLAG_POKEMON_MANSION_SWITCH_STATE + goto_if TRUE, EventScript_1A7B3B + setflag FLAG_POKEMON_MANSION_SWITCH_STATE switch VAR_0x8004 case 0, EventScript_1A7B7A case 1, EventScript_1A7D3E @@ -3043,7 +3045,7 @@ EventScript_1A7AE2:: @ 81A7AE2 end EventScript_1A7B3B:: @ 81A7B3B - clearflag FLAG_0x26C + clearflag FLAG_POKEMON_MANSION_SWITCH_STATE switch VAR_0x8004 case 0, EventScript_1A7C5C case 1, EventScript_1A7DD8 @@ -3606,7 +3608,7 @@ SilphCo_2F_EventScript_1A891B:: @ 81A891B setvar VAR_0x4001, 1 setvar VAR_0x8004, 634 checkflag FLAG_0x27A - goto_if eq, EventScript_1A813F + goto_if TRUE, EventScript_1A813F goto EventScript_1A8B23 end @@ -3615,7 +3617,7 @@ SilphCo_2F_EventScript_1A8935:: @ 81A8935 setvar VAR_0x4001, 2 setvar VAR_0x8004, 635 checkflag FLAG_0x27B - goto_if eq, EventScript_1A813F + goto_if TRUE, EventScript_1A813F goto EventScript_1A8B23 end @@ -3624,7 +3626,7 @@ SilphCo_3F_EventScript_1A894F:: @ 81A894F setvar VAR_0x4001, 3 setvar VAR_0x8004, 636 checkflag FLAG_0x27C - goto_if eq, EventScript_1A813F + goto_if TRUE, EventScript_1A813F goto EventScript_1A8B23 end @@ -3633,7 +3635,7 @@ SilphCo_3F_EventScript_1A8969:: @ 81A8969 setvar VAR_0x4001, 4 setvar VAR_0x8004, 637 checkflag FLAG_0x27D - goto_if eq, EventScript_1A813F + goto_if TRUE, EventScript_1A813F goto EventScript_1A8B23 end @@ -3642,7 +3644,7 @@ SilphCo_4F_EventScript_1A8983:: @ 81A8983 setvar VAR_0x4001, 5 setvar VAR_0x8004, 638 checkflag FLAG_0x27E - goto_if eq, EventScript_1A813F + goto_if TRUE, EventScript_1A813F goto EventScript_1A8B23 end @@ -3651,7 +3653,7 @@ SilphCo_4F_EventScript_1A899D:: @ 81A899D setvar VAR_0x4001, 6 setvar VAR_0x8004, 639 checkflag FLAG_0x27F - goto_if eq, EventScript_1A813F + goto_if TRUE, EventScript_1A813F goto EventScript_1A8B23 end @@ -3660,7 +3662,7 @@ SilphCo_5F_EventScript_1A89B7:: @ 81A89B7 setvar VAR_0x4001, 7 setvar VAR_0x8004, 640 checkflag FLAG_0x280 - goto_if eq, EventScript_1A813F + goto_if TRUE, EventScript_1A813F goto EventScript_1A8B23 end @@ -3669,7 +3671,7 @@ SilphCo_5F_EventScript_1A89D1:: @ 81A89D1 setvar VAR_0x4001, 8 setvar VAR_0x8004, 641 checkflag FLAG_0x281 - goto_if eq, EventScript_1A813F + goto_if TRUE, EventScript_1A813F goto EventScript_1A8B23 end @@ -3678,7 +3680,7 @@ SilphCo_5F_EventScript_1A89EB:: @ 81A89EB setvar VAR_0x4001, 9 setvar VAR_0x8004, 642 checkflag FLAG_0x282 - goto_if eq, EventScript_1A813F + goto_if TRUE, EventScript_1A813F goto EventScript_1A8B23 end @@ -3687,7 +3689,7 @@ SilphCo_6F_EventScript_1A8A05:: @ 81A8A05 setvar VAR_0x4001, 10 setvar VAR_0x8004, 643 checkflag FLAG_0x283 - goto_if eq, EventScript_1A813F + goto_if TRUE, EventScript_1A813F goto EventScript_1A8B23 end @@ -3696,7 +3698,7 @@ SilphCo_7F_EventScript_1A8A1F:: @ 81A8A1F setvar VAR_0x4001, 11 setvar VAR_0x8004, 644 checkflag FLAG_0x284 - goto_if eq, EventScript_1A813F + goto_if TRUE, EventScript_1A813F goto EventScript_1A8B23 end @@ -3705,7 +3707,7 @@ SilphCo_7F_EventScript_1A8A39:: @ 81A8A39 setvar VAR_0x4001, 12 setvar VAR_0x8004, 645 checkflag FLAG_0x285 - goto_if eq, EventScript_1A813F + goto_if TRUE, EventScript_1A813F goto EventScript_1A8B23 end @@ -3714,7 +3716,7 @@ SilphCo_7F_EventScript_1A8A53:: @ 81A8A53 setvar VAR_0x4001, 13 setvar VAR_0x8004, 646 checkflag FLAG_0x286 - goto_if eq, EventScript_1A813F + goto_if TRUE, EventScript_1A813F goto EventScript_1A8B23 end @@ -3723,7 +3725,7 @@ SilphCo_8F_EventScript_1A8A6D:: @ 81A8A6D setvar VAR_0x4001, 14 setvar VAR_0x8004, 647 checkflag FLAG_0x287 - goto_if eq, EventScript_1A813F + goto_if TRUE, EventScript_1A813F goto EventScript_1A8B23 end @@ -3732,7 +3734,7 @@ SilphCo_9F_EventScript_1A8A87:: @ 81A8A87 setvar VAR_0x4001, 15 setvar VAR_0x8004, 648 checkflag FLAG_0x288 - goto_if eq, EventScript_1A813F + goto_if TRUE, EventScript_1A813F goto EventScript_1A8B23 end @@ -3741,7 +3743,7 @@ SilphCo_9F_EventScript_1A8AA1:: @ 81A8AA1 setvar VAR_0x4001, 16 setvar VAR_0x8004, 649 checkflag FLAG_0x289 - goto_if eq, EventScript_1A813F + goto_if TRUE, EventScript_1A813F goto EventScript_1A8B23 end @@ -3750,7 +3752,7 @@ SilphCo_9F_EventScript_1A8ABB:: @ 81A8ABB setvar VAR_0x4001, 17 setvar VAR_0x8004, 650 checkflag FLAG_0x28A - goto_if eq, EventScript_1A813F + goto_if TRUE, EventScript_1A813F goto EventScript_1A8B23 end @@ -3759,7 +3761,7 @@ SilphCo_9F_EventScript_1A8AD5:: @ 81A8AD5 setvar VAR_0x4001, 18 setvar VAR_0x8004, 651 checkflag FLAG_0x28B - goto_if eq, EventScript_1A813F + goto_if TRUE, EventScript_1A813F goto EventScript_1A8B23 end @@ -3768,7 +3770,7 @@ SilphCo_10F_EventScript_1A8AEF:: @ 81A8AEF setvar VAR_0x4001, 19 setvar VAR_0x8004, 652 checkflag FLAG_0x28C - goto_if eq, EventScript_1A813F + goto_if TRUE, EventScript_1A813F goto EventScript_1A8B23 end @@ -3777,13 +3779,13 @@ SilphCo_11F_EventScript_1A8B09:: @ 81A8B09 setvar VAR_0x4001, 20 setvar VAR_0x8004, 653 checkflag FLAG_0x28D - goto_if eq, EventScript_1A813F + goto_if TRUE, EventScript_1A813F goto EventScript_1A8B23 end EventScript_1A8B23:: @ 81A8B23 checkflag FLAG_HIDE_SILPH_CO_5F_CARD_KEY - goto_if eq, EventScript_1A8B32 + goto_if TRUE, EventScript_1A8B32 goto EventScript_1A8135 end @@ -3857,9 +3859,9 @@ EventScript_1A8C3C:: @ 81A8C3C bufferboxname 0, 16439 getspeciesname 1, 16385 checkflag FLAG_SYS_NOT_SOMEONES_PC - call_if lt, EventScript_1A8C57 + call_if FALSE, EventScript_1A8C57 checkflag FLAG_SYS_NOT_SOMEONES_PC - call_if eq, EventScript_1A8C82 + call_if TRUE, EventScript_1A8C82 return EventScript_1A8C57:: @ 81A8C57 @@ -3998,7 +4000,7 @@ VermilionCity_PokemonCenter_1F_EventScript_1A8D08:: @ 81A8D08 lock faceplayer checkflag FLAG_0x292 - goto_if eq, EventScript_1A8D3F + goto_if TRUE, EventScript_1A8D3F msgbox Text_194234 setflag FLAG_0x292 giveitem 362 @@ -4019,9 +4021,9 @@ EventScript_ItemfinderDigUpUnderfootItem:: @ 81A8D49 waitse call EventScript_GiveItem compare_var_to_value VAR_0x8007, 1 - goto_if_eq EventScript_DigUpItemPutInPocket + goto_if eq, EventScript_DigUpItemPutInPocket compare_var_to_value VAR_0x8007, 0 - goto_if_eq EventScript_DigUpItemBagIsFull + goto_if eq, EventScript_DigUpItemBagIsFull end EventScript_DigUpItemPutInPocket:: @@ -4047,9 +4049,9 @@ gUnknown_81A8D97:: @ 81A8D97 msgbox Text_1A5E89 call EventScript_1A65CE checkflag FLAG_DEFEATED_BROCK - call_if lt, EventScript_1A8DC6 + call_if FALSE, EventScript_1A8DC6 checkflag FLAG_DEFEATED_BROCK - call_if eq, EventScript_1A8DCF + call_if TRUE, EventScript_1A8DCF applymovement VAR_LAST_TALKED, Movement_1A666C waitmovement 0 fadedefaultbgm @@ -4383,7 +4385,7 @@ EventScript_1A924B:: @ 81A924B EventScript_1A925E:: @ 81A925E checkflag FLAG_0x849 - goto_if eq, EventScript_1A77A9 + goto_if TRUE, EventScript_1A77A9 setweather 11 doweather return @@ -7940,9 +7942,9 @@ FourIsland_House2_EventScript_1B2938:: @ 81B2938 lock specialvar VAR_0x8008, sub_80CC3CC checkflag FLAG_0x290 - goto_if lt, EventScript_1B2951 + goto_if FALSE, EventScript_1B2951 checkflag FLAG_0x290 - goto_if eq, EventScript_1B2994 + goto_if TRUE, EventScript_1B2994 end EventScript_1B2951:: @ 81B2951 @@ -9177,7 +9179,7 @@ EventScript_1BBA04:: @ 81BBA04 lock faceplayer checkflag FLAG_SYS_POKEDEX_GET - goto_if lt, EventScript_1BB877 + goto_if FALSE, EventScript_1BB877 specialvar VAR_RESULT, sub_80CD034 compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1BB867 @@ -9278,7 +9280,7 @@ EventScript_1BBB6A:: @ 81BBB6A lock faceplayer checkflag FLAG_SYS_POKEDEX_GET - goto_if lt, EventScript_1BB877 + goto_if FALSE, EventScript_1BB877 msgbox gUnknown_81BDB85, 5 compare_var_to_value VAR_RESULT, 0 goto_if eq, EventScript_1BBB92 @@ -9299,7 +9301,7 @@ EventScript_1BBB9C:: @ 81BBB9C lock faceplayer checkflag FLAG_SYS_POKEDEX_GET - goto_if lt, EventScript_1BB877 + goto_if FALSE, EventScript_1BB877 specialvar VAR_RESULT, sub_80CD034 compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1BB867 @@ -9316,7 +9318,7 @@ EventScript_1BBBE6:: @ 81BBBE6 EventScript_1BBBE7:: @ 81BBBE7 checkflag FLAG_0x2BB - goto_if lt, EventScript_1BBC32 + goto_if FALSE, EventScript_1BBC32 multichoice 0, 0, 47, 0 switch VAR_RESULT case 0, EventScript_1BBC69 @@ -9580,7 +9582,7 @@ gUnknown_81BBFD8:: @ 81BBFD8 goto_if eq, EventScript_1A7AE0 lockall checkflag FLAG_SYS_POKEDEX_GET - goto_if lt, EventScript_1BB881 + goto_if FALSE, EventScript_1BB881 specialvar VAR_RESULT, IsWirelessAdapterConnected compare_var_to_value VAR_RESULT, 0 goto_if eq, EventScript_1BC016 @@ -10322,7 +10324,7 @@ ViridianCity_EventScript_1BDF13:: @ 81BDF13 goto_if eq, EventScript_1A7AE0 lockall checkflag FLAG_BADGE02_GET - goto_if lt, EventScript_1BDF87 + goto_if FALSE, EventScript_1BDF87 checkpartymove MOVE_CUT compare_var_to_value VAR_RESULT, 6 goto_if eq, EventScript_1BDF87 @@ -10400,7 +10402,7 @@ CeruleanCave_1F_EventScript_1BE00C:: @ 81BE00C goto_if eq, EventScript_1A7AE0 lockall checkflag FLAG_BADGE06_GET - goto_if lt, EventScript_1BE091 + goto_if FALSE, EventScript_1BE091 checkpartymove MOVE_ROCK_SMASH compare_var_to_value VAR_RESULT, 6 goto_if eq, EventScript_1BE091 @@ -10481,9 +10483,9 @@ VictoryRoad_2F_EventScript_1BE11D:: @ 81BE11D goto_if eq, EventScript_1A7AE0 lockall checkflag FLAG_BADGE04_GET - goto_if lt, EventScript_1BE185 + goto_if FALSE, EventScript_1BE185 checkflag FLAG_0x805 - goto_if eq, EventScript_1BE18E + goto_if TRUE, EventScript_1BE18E checkpartymove MOVE_STRENGTH compare_var_to_value VAR_RESULT, 6 goto_if eq, EventScript_1BE185 @@ -11334,7 +11336,7 @@ PewterCity_PokemonCenter_1F_EventScript_1BEE16:: @ 81BEE16 compare_var_to_value VAR_0x4001, 1 goto_if eq, EventScript_1BEE3A checkflag 2093 - goto_if eq, EventScript_1BEECD + goto_if TRUE, EventScript_1BEECD msgbox Text_1BEF88 goto EventScript_1BEE44 end @@ -13459,7 +13461,7 @@ VictoryRoad_2F_EventScript_1C47AE:: @ 81C47AE lock faceplayer checkflag FLAG_0x2C0 - goto_if eq, EventScript_1C480C + goto_if TRUE, EventScript_1C480C msgbox Text_1749F9, 5 compare_var_to_value VAR_RESULT, 0 goto_if eq, EventScript_1C4802 @@ -13489,7 +13491,7 @@ EventScript_1C4816:: @ 81C4816 lock faceplayer checkflag FLAG_0x2C1 - goto_if eq, EventScript_1C4874 + goto_if TRUE, EventScript_1C4874 msgbox Text_175711, 5 compare_var_to_value VAR_RESULT, 0 goto_if eq, EventScript_1C486A @@ -13519,7 +13521,7 @@ RockTunnel_B1F_EventScript_1C487E:: @ 81C487E lock faceplayer checkflag FLAG_0x2C2 - goto_if eq, EventScript_1C48DC + goto_if TRUE, EventScript_1C48DC msgbox Text_1799E0, 5 compare_var_to_value VAR_RESULT, 0 goto_if eq, EventScript_1C48D2 @@ -13549,7 +13551,7 @@ MtEmber_Exterior_EventScript_1C48E6:: @ 81C48E6 lock faceplayer checkflag FLAG_0x2C3 - goto_if eq, EventScript_1C4944 + goto_if TRUE, EventScript_1C4944 msgbox Text_17A642, 5 compare_var_to_value VAR_RESULT, 0 goto_if eq, EventScript_1C493A @@ -13579,7 +13581,7 @@ Route4_EventScript_1C494E:: @ 81C494E lock faceplayer checkflag FLAG_0x2C4 - goto_if eq, EventScript_1C49AC + goto_if TRUE, EventScript_1C49AC msgbox Text_1839D5, 5 compare_var_to_value VAR_RESULT, 0 goto_if eq, EventScript_1C49A2 @@ -13609,7 +13611,7 @@ Route4_EventScript_1C49B6:: @ 81C49B6 lock faceplayer checkflag FLAG_0x2C5 - goto_if eq, EventScript_1C4A14 + goto_if TRUE, EventScript_1C4A14 msgbox Text_183B74, 5 compare_var_to_value VAR_RESULT, 0 goto_if eq, EventScript_1C4A0A @@ -13639,7 +13641,7 @@ EventScript_1C4A1E:: @ 81C4A1E lock faceplayer checkflag FLAG_0x2C6 - goto_if eq, EventScript_1C4A7C + goto_if TRUE, EventScript_1C4A7C msgbox Text_17E316, 5 compare_var_to_value VAR_RESULT, 0 goto_if eq, EventScript_1C4A72 @@ -13669,7 +13671,7 @@ EventScript_1C4A86:: @ 81C4A86 lock faceplayer checkflag FLAG_0x2C7 - goto_if eq, EventScript_1C4AE4 + goto_if TRUE, EventScript_1C4AE4 msgbox Text_180388, 5 compare_var_to_value VAR_RESULT, 0 goto_if eq, EventScript_1C4ADA @@ -13699,7 +13701,7 @@ FuchsiaCity_EventScript_1C4AEE:: @ 81C4AEE lock faceplayer checkflag FLAG_0x2C8 - goto_if eq, EventScript_1C4B4C + goto_if TRUE, EventScript_1C4B4C msgbox Text_180948, 5 compare_var_to_value VAR_RESULT, 0 goto_if eq, EventScript_1C4B42 @@ -13729,7 +13731,7 @@ SevenIsland_EventScript_1C4B56:: @ 81C4B56 lock faceplayer checkflag FLAG_0x2C9 - goto_if eq, EventScript_1C4BB4 + goto_if TRUE, EventScript_1C4BB4 msgbox Text_182F01, 5 compare_var_to_value VAR_RESULT, 0 goto_if eq, EventScript_1C4BAA @@ -13759,7 +13761,7 @@ PewterCity_Museum_1F_EventScript_1C4BBE:: @ 81C4BBE lock faceplayer checkflag FLAG_0x2CA - goto_if eq, EventScript_1C4C1C + goto_if TRUE, EventScript_1C4C1C msgbox Text_1909A3, 5 compare_var_to_value VAR_RESULT, 0 goto_if eq, EventScript_1C4C12 @@ -13789,7 +13791,7 @@ EventScript_1C4C26:: @ 81C4C26 lock faceplayer checkflag FLAG_0x2CB - goto_if eq, EventScript_1C4C84 + goto_if TRUE, EventScript_1C4C84 msgbox Text_195928, 5 compare_var_to_value VAR_RESULT, 0 goto_if eq, EventScript_1C4C7A @@ -13819,7 +13821,7 @@ EventScript_1C4C8E:: @ 81C4C8E lock faceplayer checkflag FLAG_0x2CC - goto_if eq, EventScript_1C4CEC + goto_if TRUE, EventScript_1C4CEC msgbox Text_19A137, 5 compare_var_to_value VAR_RESULT, 0 goto_if eq, EventScript_1C4CE2 @@ -13847,7 +13849,7 @@ EventScript_1C4CEC:: @ 81C4CEC EventScript_1C4CF6:: @ 81C4CF6 checkflag FLAG_0x2CD - goto_if eq, EventScript_1C4D59 + goto_if TRUE, EventScript_1C4D59 msgbox Text_19AD85, 5 compare_var_to_value VAR_RESULT, 0 goto_if eq, EventScript_1C4D4F @@ -13892,7 +13894,7 @@ FourIsland_House1_EventScript_1C4D84:: @ 81C4D84 lock faceplayer checkflag FLAG_0x2CE - goto_if eq, EventScript_1C4DE2 + goto_if TRUE, EventScript_1C4DE2 msgbox Text_1A3505, 5 compare_var_to_value VAR_RESULT, 0 goto_if eq, EventScript_1C4DD8 @@ -13926,9 +13928,9 @@ TwoIsland_CapeBrink_House_EventScript_1C4DEC:: @ 81C4DEC lock faceplayer checkflag FLAG_0x2E1 - goto_if eq, EventScript_1C4EA1 + goto_if TRUE, EventScript_1C4EA1 checkflag FLAG_TEMP_2 - goto_if eq, EventScript_1C4E97 + goto_if TRUE, EventScript_1C4E97 getfirstpartymonname 0 msgbox Text_1A46C6 specialvar VAR_RESULT, sub_80CCB94 diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc index a6abc033b..fcf5f53b6 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 eq, EventScript_16523C + call_if TRUE, EventScript_16523C checkflag FLAG_0x2E4 - call_if lt, EventScript_165243 + call_if FALSE, EventScript_165243 end EventScript_16523C:: @ 816523C @@ -26,14 +26,14 @@ EventScript_16523C:: @ 816523C EventScript_165243:: @ 8165243 checkflag FLAG_0x2F7 - goto_if_eq EventScript_1A77A9 + goto_if TRUE, EventScript_1A77A9 clearflag FLAG_HIDE_BIRTH_ISLAND_METEORITE clearflag FLAG_0x848 return BirthIsland_Exterior_MapScript2_165253:: @ 8165253 - checkflag FLAG_0x807 - call_if eq, EventScript_16525D + checkflag FLAG_SYS_SPECIAL_WILD_BATTLE + call_if TRUE, EventScript_16525D end EventScript_16525D:: @ 816525D @@ -48,7 +48,7 @@ BirthIsland_Exterior_EventScript_165271:: @ 8165271 faceplayer special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 special sub_8112364 special sub_80CCDFC waitstate @@ -91,17 +91,17 @@ EventScript_1652C0:: @ 81652C0 setvar VAR_0x8005, 30 setvar VAR_0x8006, 0 special CreateObedientEnemyMon - setflag FLAG_0x807 + setflag FLAG_SYS_SPECIAL_WILD_BATTLE special sub_807F9D8 waitstate - clearflag FLAG_0x807 + clearflag FLAG_SYS_SPECIAL_WILD_BATTLE specialvar VAR_RESULT, sub_80CA74C compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16533A + goto_if eq, EventScript_16533A compare_var_to_value VAR_RESULT, 4 - goto_if_eq EventScript_165348 + goto_if eq, EventScript_165348 compare_var_to_value VAR_RESULT, 5 - goto_if_eq EventScript_165348 + goto_if eq, EventScript_165348 setflag FLAG_0x2E4 release end diff --git a/data/maps/CeladonCity_Condominiums_1F/scripts.inc b/data/maps/CeladonCity_Condominiums_1F/scripts.inc index dccd69945..7a9ef328d 100644 --- a/data/maps/CeladonCity_Condominiums_1F/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_1F/scripts.inc @@ -5,16 +5,16 @@ CeladonCity_Condominiums_1F_EventScript_16C321:: @ 816C321 lock faceplayer checkflag FLAG_0x2F8 - goto_if_eq EventScript_16C36A + goto_if TRUE, EventScript_16C36A checkflag FLAG_SYS_GAME_CLEAR - goto_if_eq EventScript_16C374 + goto_if TRUE, EventScript_16C374 checkflag FLAG_0x2A6 - goto_if_eq EventScript_16C36A + goto_if TRUE, EventScript_16C36A msgbox gUnknown_81960C9 setflag FLAG_0x2A6 giveitem ITEM_TEA compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_1A6BF9 + goto_if eq, EventScript_1A6BF9 msgbox gUnknown_8196109 release end diff --git a/data/maps/CeladonCity_Condominiums_3F/scripts.inc b/data/maps/CeladonCity_Condominiums_3F/scripts.inc index 990b7adb3..b69ad021a 100644 --- a/data/maps/CeladonCity_Condominiums_3F/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_3F/scripts.inc @@ -18,7 +18,7 @@ CeladonCity_Condominiums_3F_EventScript_16C3F6:: @ 816C3F6 faceplayer specialvar VAR_RESULT, HasAllKantoMons compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16C412 + goto_if eq, EventScript_16C412 msgbox gUnknown_8196356 release end @@ -33,7 +33,7 @@ EventScript_16C418:: @ 816C418 delay 60 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 special sub_80CA618 waitstate release diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc b/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc index 8e8bb2b6b..3ffdd24f6 100644 --- a/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc @@ -11,11 +11,11 @@ CeladonCity_Condominiums_RoofRoom_EventScript_16C46D:: @ 816C46D setvar VAR_0x4001, SPECIES_EEVEE givemon SPECIES_EEVEE, 25, ITEM_NONE, 0, 0, 0 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16C4A6 + goto_if eq, EventScript_16C4A6 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16C4DA + goto_if eq, EventScript_16C4DA compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A927C + goto_if eq, EventScript_1A927C release end @@ -28,7 +28,7 @@ EventScript_16C4A6:: @ 816C4A6 getspeciesname 0, SPECIES_EEVEE msgbox gUnknown_81A56A7, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16C514 + goto_if eq, EventScript_16C514 call EventScript_1A8C27 call EventScript_1A74EB goto EventScript_16C514 @@ -43,7 +43,7 @@ EventScript_16C4DA:: @ 816C4DA getspeciesname 0, SPECIES_EEVEE msgbox gUnknown_81A56A7, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16C509 + goto_if eq, EventScript_16C509 call EventScript_1A8C33 goto EventScript_16C509 end @@ -54,7 +54,7 @@ EventScript_16C509:: @ 816C509 end EventScript_16C514:: @ 816C514 - setflag FLAG_0x263 + setflag FLAG_GOT_EEVEE release end diff --git a/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc index 8d859502e..0627bf3a0 100644 --- a/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc @@ -16,7 +16,7 @@ CeladonCity_DepartmentStore_2F_EventScript_16BB07:: @ 816BB07 CeladonCity_DepartmentStore_2F_EventScript_16BB10:: @ 816BB10 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 lock faceplayer message Text_1A6211 @@ -44,7 +44,7 @@ Items_16BB38:: @ 816BB38 CeladonCity_DepartmentStore_2F_EventScript_16BB4E:: @ 816BB4E special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 lock faceplayer message Text_1A6211 diff --git a/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc index 2aad6e02b..84f290500 100644 --- a/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc @@ -16,7 +16,7 @@ CeladonCity_DepartmentStore_4F_EventScript_16BC01:: @ 816BC01 CeladonCity_DepartmentStore_4F_EventScript_16BC0A:: @ 816BC0A special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 lock faceplayer message Text_1A6211 diff --git a/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc index 05aff00cd..66bc95b26 100644 --- a/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc @@ -16,7 +16,7 @@ CeladonCity_DepartmentStore_5F_EventScript_16BC53:: @ 816BC53 CeladonCity_DepartmentStore_5F_EventScript_16BC5C:: @ 816BC5C special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 lock faceplayer message Text_1A6211 @@ -42,7 +42,7 @@ Items_16BC84:: @ 816BC84 CeladonCity_DepartmentStore_5F_EventScript_16BC96:: @ 816BC96 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 lock faceplayer message Text_1A6211 diff --git a/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc b/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc index 23df9bc9b..d2a28e9e2 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 lt, EventScript_1A7AB9 + call_if FALSE, EventScript_1A7AB9 copyvar VAR_0x8005, VAR_0x403A special sub_80CB580 message Text_1A535C @@ -62,7 +62,7 @@ EventScript_16C246:: @ 816C246 setvar VAR_0x8006, 4 setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_1F, 255, 6, 1 compare_var_to_value VAR_0x403A, 4 - goto_if_eq EventScript_16C30E + goto_if eq, EventScript_16C30E call EventScript_16C313 setvar VAR_0x403A, 4 goto EventScript_16C30E @@ -72,7 +72,7 @@ EventScript_16C26E:: @ 816C26E setvar VAR_0x8006, 5 setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_2F, 255, 6, 1 compare_var_to_value VAR_0x403A, 5 - goto_if_eq EventScript_16C30E + goto_if eq, EventScript_16C30E call EventScript_16C313 setvar VAR_0x403A, 5 goto EventScript_16C30E @@ -82,7 +82,7 @@ EventScript_16C296:: @ 816C296 setvar VAR_0x8006, 6 setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_3F, 255, 6, 1 compare_var_to_value VAR_0x403A, 6 - goto_if_eq EventScript_16C30E + goto_if eq, EventScript_16C30E call EventScript_16C313 setvar VAR_0x403A, 6 goto EventScript_16C30E @@ -92,7 +92,7 @@ EventScript_16C2BE:: @ 816C2BE setvar VAR_0x8006, 7 setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_4F, 255, 6, 1 compare_var_to_value VAR_0x403A, 7 - goto_if_eq EventScript_16C30E + goto_if eq, EventScript_16C30E call EventScript_16C313 setvar VAR_0x403A, 7 goto EventScript_16C30E @@ -102,7 +102,7 @@ EventScript_16C2E6:: @ 816C2E6 setvar VAR_0x8006, 8 setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_5F, 255, 6, 1 compare_var_to_value VAR_0x403A, 8 - goto_if_eq EventScript_16C30E + goto_if eq, EventScript_16C30E call EventScript_16C313 setvar VAR_0x403A, 8 goto EventScript_16C30E diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc index 3fc81021d..d4c066afe 100644 --- a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc @@ -4,13 +4,13 @@ CeladonCity_DepartmentStore_Roof_MapScripts:: @ 816BCCC CeladonCity_DepartmentStore_Roof_EventScript_16BCCD:: @ 816BCCD special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 special sub_8112364 lock faceplayer call EventScript_16BCF6 compare_var_to_value VAR_0x4001, 0 - goto_if_eq EventScript_16C00E + goto_if eq, EventScript_16C00E goto EventScript_16BD3E end @@ -42,7 +42,7 @@ EventScript_16BD38:: @ 816BD38 EventScript_16BD3E:: @ 816BD3E msgbox gUnknown_8195D22, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16C00C + goto_if eq, EventScript_16C00C textcolor 3 message Text_195D5F waitmessage @@ -122,7 +122,7 @@ EventScript_16BF19:: @ 816BF19 setvar VAR_0x8008, ITEM_FRESH_WATER setvar VAR_0x8009, ITEM_TM16 checkflag FLAG_0x296 - goto_if_eq EventScript_16C018 + goto_if TRUE, EventScript_16C018 msgbox gUnknown_8195D75 goto EventScript_16BF7C end @@ -131,7 +131,7 @@ EventScript_16BF3A:: @ 816BF3A setvar VAR_0x8008, ITEM_SODA_POP setvar VAR_0x8009, ITEM_TM20 checkflag FLAG_0x295 - goto_if_eq EventScript_16C018 + goto_if TRUE, EventScript_16C018 msgbox gUnknown_8195E33 goto EventScript_16BF7C end @@ -140,7 +140,7 @@ EventScript_16BF5B:: @ 816BF5B setvar VAR_0x8008, ITEM_LEMONADE setvar VAR_0x8009, ITEM_TM33 checkflag FLAG_0x294 - goto_if_eq EventScript_16C018 + goto_if TRUE, EventScript_16C018 msgbox gUnknown_8195EBF goto EventScript_16BF7C end @@ -151,7 +151,7 @@ EventScript_16BF7C:: @ 816BF7C removeitem VAR_0x8008, 1 checkitemspace VAR_0x8009, 1 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16C002 + goto_if eq, EventScript_16C002 additem VAR_0x8009, 1 textcolor 3 playfanfare MUS_FANFA1 @@ -262,10 +262,10 @@ EventScript_16C0C4:: @ 816C0C4 EventScript_16C0CB:: @ 816C0CB compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16C131 + goto_if eq, EventScript_16C131 checkitemspace VAR_0x4000, 1 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16C13F + goto_if eq, EventScript_16C13F compare_var_to_value VAR_0x4001, 0 call_if eq, EventScript_16C0B6 compare_var_to_value VAR_0x4001, 1 diff --git a/data/maps/CeladonCity_GameCorner/scripts.inc b/data/maps/CeladonCity_GameCorner/scripts.inc index 85df99071..7a95e7bf7 100644 --- a/data/maps/CeladonCity_GameCorner/scripts.inc +++ b/data/maps/CeladonCity_GameCorner/scripts.inc @@ -3,8 +3,8 @@ CeladonCity_GameCorner_MapScripts:: @ 816C646 .byte 0 CeladonCity_GameCorner_MapScript1_16C64C:: @ 816C64C - checkflag FLAG_0x26D - call_if lt, EventScript_16C656 + checkflag FLAG_OPENED_ROCKET_HIDEOUT + call_if FALSE, EventScript_16C656 end EventScript_16C656:: @ 816C656 @@ -22,7 +22,7 @@ CeladonCity_GameCorner_EventScript_16C684:: @ 816C684 CeladonCity_GameCorner_EventScript_16C68D:: @ 816C68D special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 lock faceplayer showmoneybox 0, 0, 0 @@ -40,11 +40,11 @@ CeladonCity_GameCorner_EventScript_16C68D:: @ 816C68D EventScript_16C6E6:: @ 816C6E6 checkflag FLAG_GOT_COIN_CASE - goto_if lt, EventScript_16C790 + goto_if FALSE, EventScript_16C790 compare_var_to_value VAR_0x8009, 0 - goto_if_eq EventScript_16C734 + goto_if eq, EventScript_16C734 compare_var_to_value VAR_0x8009, 1 - goto_if_eq EventScript_16C706 + goto_if eq, EventScript_16C706 end EventScript_16C706:: @ 816C706 @@ -53,7 +53,7 @@ EventScript_16C706:: @ 816C706 goto_if ge, EventScript_16C79E checkmoney 10000, 0 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16C7AC + goto_if eq, EventScript_16C7AC givecoins 500 takemoney 10000, 0 goto EventScript_16C762 @@ -65,7 +65,7 @@ EventScript_16C734:: @ 816C734 goto_if ge, EventScript_16C79E checkmoney 1000, 0 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16C7AC + goto_if eq, EventScript_16C7AC givecoins 50 takemoney 1000, 0 goto EventScript_16C762 @@ -131,11 +131,11 @@ CeladonCity_GameCorner_EventScript_16C7D7:: @ 816C7D7 CeladonCity_GameCorner_EventScript_16C7E7:: @ 816C7E7 lock faceplayer - checkflag FLAG_0x26E - goto_if_eq EventScript_16C849 + checkflag FLAG_GOT_10_COINS_FROM_GAMBLER + goto_if TRUE, EventScript_16C849 msgbox gUnknown_8196AF3 checkflag FLAG_GOT_COIN_CASE - goto_if lt, EventScript_16C839 + goto_if FALSE, EventScript_16C839 checkcoins VAR_0x4001 compare_var_to_value VAR_0x4001, 9990 goto_if ge, EventScript_16C82B @@ -144,7 +144,7 @@ CeladonCity_GameCorner_EventScript_16C7E7:: @ 816C7E7 msgbox gUnknown_8196B0D playse SE_SHOP waitse - setflag FLAG_0x26E + setflag FLAG_GOT_10_COINS_FROM_GAMBLER goto EventScript_16C7CA end @@ -168,7 +168,7 @@ CeladonCity_GameCorner_EventScript_16C857:: @ 816C857 lock faceplayer checkflag FLAG_DEFEATED_ERIKA - goto_if_eq EventScript_16C870 + goto_if TRUE, EventScript_16C870 msgbox gUnknown_8196BAD goto EventScript_16C7CA end @@ -195,11 +195,11 @@ CeladonCity_GameCorner_EventScript_16C88E:: @ 816C88E CeladonCity_GameCorner_EventScript_16C89E:: @ 816C89E lock faceplayer - checkflag FLAG_0x26F - goto_if_eq EventScript_16C8F0 + checkflag FLAG_GOT_20_COINS_FROM_GAMBLER + goto_if TRUE, EventScript_16C8F0 msgbox gUnknown_8196D2B checkflag FLAG_GOT_COIN_CASE - goto_if lt, EventScript_16C839 + goto_if FALSE, EventScript_16C839 checkcoins VAR_0x4001 compare_var_to_value VAR_0x4001, 9980 goto_if ge, EventScript_16C8E2 @@ -208,7 +208,7 @@ CeladonCity_GameCorner_EventScript_16C89E:: @ 816C89E msgbox gUnknown_8196D47 playse SE_SHOP waitse - setflag FLAG_0x26F + setflag FLAG_GOT_20_COINS_FROM_GAMBLER goto EventScript_16C7CA end @@ -225,11 +225,11 @@ EventScript_16C8F0:: @ 816C8F0 CeladonCity_GameCorner_EventScript_16C8FE:: @ 816C8FE lock faceplayer - checkflag FLAG_0x270 - goto_if_eq EventScript_16C950 + checkflag FLAG_GOT_20_COINS_FROM_GAMBLER_2 + goto_if TRUE, EventScript_16C950 msgbox gUnknown_8196DB7 checkflag FLAG_GOT_COIN_CASE - goto_if lt, EventScript_16C839 + goto_if FALSE, EventScript_16C839 checkcoins VAR_0x4001 compare_var_to_value VAR_0x4001, 9980 goto_if ge, EventScript_16C942 @@ -238,7 +238,7 @@ CeladonCity_GameCorner_EventScript_16C8FE:: @ 816C8FE msgbox gUnknown_8196DF8 playse SE_SHOP waitse - setflag FLAG_0x270 + setflag FLAG_GOT_20_COINS_FROM_GAMBLER_2 goto EventScript_16C7CA end @@ -264,10 +264,10 @@ EventScript_16C96A:: @ 816C96A EventScript_16C96C:: @ 816C96C checkflag FLAG_GOT_COIN_CASE - goto_if lt, EventScript_16CAA0 + goto_if FALSE, EventScript_16CAA0 msgbox gUnknown_8196F46, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16C96A + goto_if eq, EventScript_16C96A setfieldeffectarg 0, 255 setfieldeffectarg 1, 10 setfieldeffectarg 2, 14 @@ -412,8 +412,8 @@ EventScript_16CAA0:: @ 816CAA0 CeladonCity_GameCorner_EventScript_16CAAA:: @ 816CAAA lockall msgbox gUnknown_8196EDC - checkflag FLAG_0x26D - call_if lt, EventScript_16CABE + checkflag FLAG_OPENED_ROCKET_HIDEOUT + call_if FALSE, EventScript_16CABE releaseall end @@ -425,7 +425,7 @@ EventScript_16CABE:: @ 816CABE setmetatile 16, 3, 678, 1 setmetatile 17, 3, 679, 1 special DrawWholeMapView - setflag FLAG_0x26D + setflag FLAG_OPENED_ROCKET_HIDEOUT return CeladonCity_GameCorner_EventScript_16CAF5:: @ 816CAF5 diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc index 9eab86b9f..70d9121eb 100644 --- a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc +++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc @@ -13,10 +13,10 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_16CB88:: @ 816CB88 lock faceplayer checkflag FLAG_GOT_COIN_CASE - goto_if lt, EventScript_16CD99 + goto_if FALSE, EventScript_16CD99 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 showcoinsbox 0, 0 msgbox gUnknown_8197057 goto EventScript_16CBB2 @@ -75,7 +75,7 @@ EventScript_16CC65:: @ 816CC65 getspeciesname 0, VAR_0x4001 msgbox gUnknown_819709D, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16CC10 + goto_if eq, EventScript_16CC10 checkcoins VAR_RESULT compare_var_to_var VAR_RESULT, VAR_0x4002 goto_if lt, EventScript_16CDA5 @@ -121,11 +121,11 @@ EventScript_16CD3D:: @ 816CD3D EventScript_16CD52:: @ 816CD52 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16CDB3 + goto_if eq, EventScript_16CDB3 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16CDE0 + goto_if eq, EventScript_16CDE0 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_16CD74 + goto_if eq, EventScript_16CD74 end EventScript_16CD74:: @ 816CD74 @@ -164,7 +164,7 @@ EventScript_16CDB3:: @ 816CDB3 waitfanfare msgbox gUnknown_81A56A7, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16CD83 + goto_if eq, EventScript_16CD83 goto EventScript_16CC10 end @@ -178,7 +178,7 @@ EventScript_16CDE0:: @ 816CDE0 waitfanfare msgbox gUnknown_81A56A7, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16CE12 + goto_if eq, EventScript_16CE12 call EventScript_1A8C33 goto EventScript_16CE12 end @@ -192,10 +192,10 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_16CE1D:: @ 816CE1D lock faceplayer checkflag FLAG_GOT_COIN_CASE - goto_if lt, EventScript_16CD99 + goto_if FALSE, EventScript_16CD99 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 showcoinsbox 0, 0 msgbox gUnknown_8197057 goto EventScript_16CE47 @@ -253,7 +253,7 @@ EventScript_16CEF5:: @ 816CEF5 EventScript_16CF09:: @ 816CF09 msgbox gUnknown_81970B2, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16CC10 + goto_if eq, EventScript_16CC10 goto EventScript_16CF3F end @@ -261,7 +261,7 @@ EventScript_16CF22:: @ 816CF22 getitemname 0, VAR_0x4001 msgbox gUnknown_819709D, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16CC10 + goto_if eq, EventScript_16CC10 goto EventScript_16CF3F end @@ -272,7 +272,7 @@ EventScript_16CF3F:: @ 816CF3F goto_if lt, EventScript_16CDA5 checkitemspace VAR_0x4001, 1 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16CF79 + goto_if eq, EventScript_16CF79 takecoins VAR_0x4002 updatecoinsbox 0, 5 giveitem VAR_0x4001 @@ -290,10 +290,10 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_16CF88:: @ 816CF88 lock faceplayer checkflag FLAG_GOT_COIN_CASE - goto_if lt, EventScript_16CD99 + goto_if FALSE, EventScript_16CD99 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 showcoinsbox 0, 0 msgbox gUnknown_8197057 goto EventScript_16CFB2 diff --git a/data/maps/CeladonCity_Gym/scripts.inc b/data/maps/CeladonCity_Gym/scripts.inc index 48858a58b..8f85316d5 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 lt, EventScript_16D0C6 + goto_if FALSE, EventScript_16D0C6 famechecker FAMECHECKER_ERIKA, 4 msgbox gUnknown_81972B8 release @@ -24,7 +24,7 @@ EventScript_16D0C6:: @ 816D0C6 msgbox gUnknown_8197327 checkitemspace ITEM_TM19, 1 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16D107 + goto_if eq, EventScript_16D107 additem ITEM_TM19, 1 giveitemfanfaremsg gUnknown_81973BA, ITEM_TM19 setflag FLAG_0x293 @@ -77,7 +77,7 @@ CeladonCity_Gym_EventScript_16D1B5:: @ 816D1B5 CeladonCity_Gym_EventScript_16D1CC:: @ 816D1CC lockall checkflag FLAG_BADGE04_GET - goto_if_eq EventScript_16D1E0 + goto_if TRUE, EventScript_16D1E0 msgbox gUnknown_8197874 releaseall end diff --git a/data/maps/CeladonCity_Restaurant/scripts.inc b/data/maps/CeladonCity_Restaurant/scripts.inc index 379d07271..82ecb417e 100644 --- a/data/maps/CeladonCity_Restaurant/scripts.inc +++ b/data/maps/CeladonCity_Restaurant/scripts.inc @@ -13,11 +13,11 @@ CeladonCity_Restaurant_EventScript_16D1FD:: @ 816D1FD lock faceplayer checkflag FLAG_GOT_COIN_CASE - goto_if_eq EventScript_16D24B + goto_if TRUE, EventScript_16D24B msgbox gUnknown_81979C1 checkitemspace ITEM_COIN_CASE, 1 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16D241 + goto_if eq, EventScript_16D241 additem ITEM_COIN_CASE, 1 giveitemfanfaremsg gUnknown_8197A38, ITEM_COIN_CASE setflag FLAG_GOT_COIN_CASE diff --git a/data/maps/CeruleanCave_B1F/scripts.inc b/data/maps/CeruleanCave_B1F/scripts.inc index dfe553dba..380022ef9 100644 --- a/data/maps/CeruleanCave_B1F/scripts.inc +++ b/data/maps/CeruleanCave_B1F/scripts.inc @@ -4,8 +4,8 @@ CeruleanCave_B1F_MapScripts:: @ 81624BE .byte 0 CeruleanCave_B1F_MapScript1_1624C9:: @ 81624C9 - checkflag FLAG_0x807 - call_if eq, EventScript_1624D3 + checkflag FLAG_SYS_SPECIAL_WILD_BATTLE + call_if TRUE, EventScript_1624D3 end EventScript_1624D3:: @ 81624D3 @@ -17,7 +17,7 @@ EventScript_1624D3:: @ 81624D3 CeruleanCave_B1F_MapScript2_1624E7:: @ 81624E7 checkflag FLAG_0x2BC - call_if lt, EventScript_1624F1 + call_if FALSE, EventScript_1624F1 end EventScript_1624F1:: @ 81624F1 @@ -27,7 +27,7 @@ EventScript_1624F1:: @ 81624F1 CeruleanCave_B1F_EventScript_1624F5:: @ 81624F5 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 special sub_8112364 lock faceplayer @@ -40,17 +40,17 @@ CeruleanCave_B1F_EventScript_1624F5:: @ 81624F5 playbgm MUS_EXEYE, 0 waitbuttonpress setwildbattle SPECIES_MEWTWO, 70, ITEM_NONE - setflag FLAG_0x807 + setflag FLAG_SYS_SPECIAL_WILD_BATTLE special sub_807F9D8 waitstate - clearflag FLAG_0x807 + clearflag FLAG_SYS_SPECIAL_WILD_BATTLE specialvar VAR_RESULT, sub_80CA74C compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_162558 + goto_if eq, EventScript_162558 compare_var_to_value VAR_RESULT, 4 - goto_if_eq EventScript_162561 + goto_if eq, EventScript_162561 compare_var_to_value VAR_RESULT, 5 - goto_if_eq EventScript_162561 + goto_if eq, EventScript_162561 setflag FLAG_0x2BC release end diff --git a/data/maps/CeruleanCity/scripts.inc b/data/maps/CeruleanCity/scripts.inc index f8f47bbb2..6c486906f 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 lt, EventScript_166484 + call_if FALSE, EventScript_166484 end EventScript_166484:: @ 8166484 @@ -172,7 +172,7 @@ CeruleanCity_EventScript_166603:: @ 8166603 lock faceplayer checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_5 - goto_if_eq EventScript_16662E + goto_if eq, EventScript_16662E message Text_17EE0E waitmessage playbgm MUS_ROCKET, 0 @@ -186,7 +186,7 @@ EventScript_16662E:: @ 816662E msgbox gUnknown_817EE9C checkitemspace ITEM_TM28, 1 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_166677 + goto_if eq, EventScript_166677 additem ITEM_TM28, 1 giveitemfanfaremsg gUnknown_817EEBF, ITEM_TM28 msgbox gUnknown_817EEED @@ -247,7 +247,7 @@ CeruleanCity_EventScript_1666FE:: @ 81666FE lock faceplayer checkflag FLAG_GOT_SS_TICKET - goto_if_eq EventScript_166713 + goto_if TRUE, EventScript_166713 msgbox gUnknown_817F01D release end diff --git a/data/maps/CeruleanCity_BikeShop/scripts.inc b/data/maps/CeruleanCity_BikeShop/scripts.inc index b1c036bae..d25df2e87 100644 --- a/data/maps/CeruleanCity_BikeShop/scripts.inc +++ b/data/maps/CeruleanCity_BikeShop/scripts.inc @@ -5,9 +5,9 @@ CeruleanCity_BikeShop_EventScript_16ABBD:: @ 816ABBD lock faceplayer checkflag FLAG_0x271 - goto_if_eq EventScript_16AC58 + goto_if TRUE, EventScript_16AC58 checkflag FLAG_GOT_BIKE_VOUCHER - goto_if_eq EventScript_16AC22 + goto_if TRUE, EventScript_16AC22 showmoneybox 0, 0, 0 message Text_192755 waitmessage @@ -59,7 +59,7 @@ CeruleanCity_BikeShop_EventScript_16AC75:: @ 816AC75 lock faceplayer checkflag FLAG_0x271 - goto_if_eq EventScript_16AC8A + goto_if TRUE, EventScript_16AC8A msgbox gUnknown_8192937 release end diff --git a/data/maps/CeruleanCity_Gym/scripts.inc b/data/maps/CeruleanCity_Gym/scripts.inc index f049f3167..3f614ad86 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 lt, EventScript_16AAF9 + goto_if FALSE, EventScript_16AAF9 msgbox gUnknown_81922BF release end @@ -23,7 +23,7 @@ EventScript_16AAF9:: @ 816AAF9 msgbox gUnknown_81922F7 checkitemspace ITEM_TM03, 1 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16AB3A + goto_if eq, EventScript_16AB3A additem ITEM_TM03, 1 giveitemfanfaremsg gUnknown_81923F1, ITEM_TM03 setflag FLAG_0x297 @@ -51,7 +51,7 @@ CeruleanCity_Gym_EventScript_16AB7F:: @ 816AB7F lock faceplayer checkflag FLAG_DEFEATED_MISTY - goto_if_eq EventScript_16AB94 + goto_if TRUE, EventScript_16AB94 msgbox gUnknown_81925AC release end @@ -64,7 +64,7 @@ EventScript_16AB94:: @ 816AB94 CeruleanCity_Gym_EventScript_16AB9E:: @ 816AB9E lockall checkflag FLAG_BADGE02_GET - goto_if_eq EventScript_16ABB2 + goto_if TRUE, EventScript_16ABB2 msgbox gUnknown_81926E1 releaseall end diff --git a/data/maps/CeruleanCity_House2/scripts.inc b/data/maps/CeruleanCity_House2/scripts.inc index a7929c4e9..bdd52e3b0 100644 --- a/data/maps/CeruleanCity_House2/scripts.inc +++ b/data/maps/CeruleanCity_House2/scripts.inc @@ -5,7 +5,7 @@ CeruleanCity_House2_EventScript_16A976:: @ 816A976 lock faceplayer checkflag FLAG_GOT_TM28_FROM_ROCKET - goto_if_eq EventScript_16A98B + goto_if TRUE, EventScript_16A98B msgbox gUnknown_8191E13 release end diff --git a/data/maps/CeruleanCity_House3/scripts.inc b/data/maps/CeruleanCity_House3/scripts.inc index 40f1a8104..36ce99bdb 100644 --- a/data/maps/CeruleanCity_House3/scripts.inc +++ b/data/maps/CeruleanCity_House3/scripts.inc @@ -11,10 +11,10 @@ CeruleanCity_House3_EventScript_16A9B1:: @ 816A9B1 setvar VAR_0x8008, 1 call EventScript_1A8CAD checkflag FLAG_DID_ZYNX_TRADE - goto_if_eq EventScript_16AA23 + goto_if TRUE, EventScript_16AA23 msgbox gUnknown_81A59FE, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16AA0B + goto_if eq, EventScript_16AA0B call EventScript_1A8CBD compare_var_to_value VAR_0x8004, 6 goto_if ge, EventScript_16AA0B diff --git a/data/maps/CeruleanCity_House4/scripts.inc b/data/maps/CeruleanCity_House4/scripts.inc index bbc762b3f..9e4fc2749 100644 --- a/data/maps/CeruleanCity_House4/scripts.inc +++ b/data/maps/CeruleanCity_House4/scripts.inc @@ -4,25 +4,25 @@ CeruleanCity_House4_MapScripts:: @ 816ACEE CeruleanCity_House4_EventScript_16ACEF:: @ 816ACEF special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 special sub_8112364 lock specialvar VAR_0x8004, sub_8146CE8 copyvar VAR_0x8008, VAR_RESULT compare_var_to_value VAR_0x8004, 0 - goto_if_eq EventScript_16AD59 + goto_if eq, EventScript_16AD59 compare_var_to_value VAR_0x8004, 1 - goto_if_eq EventScript_16AD63 + goto_if eq, EventScript_16AD63 compare_var_to_value VAR_0x8004, 2 - goto_if_eq EventScript_16AD89 + goto_if eq, EventScript_16AD89 compare_var_to_value VAR_0x8004, 3 - goto_if_eq EventScript_16ADAF + goto_if eq, EventScript_16ADAF compare_var_to_value VAR_0x8004, 4 - goto_if_eq EventScript_16ADC3 + goto_if eq, EventScript_16ADC3 compare_var_to_value VAR_0x8004, 5 - goto_if_eq EventScript_16ADE9 + goto_if eq, EventScript_16ADE9 compare_var_to_value VAR_0x8004, 6 - goto_if_eq EventScript_16AE0F + goto_if eq, EventScript_16AE0F end EventScript_16AD59:: @ 816AD59 @@ -35,7 +35,7 @@ EventScript_16AD63:: @ 816AD63 msgbox gUnknown_8192B43 giveitem VAR_0x8008 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16AE45 + goto_if eq, EventScript_16AE45 release end @@ -44,7 +44,7 @@ EventScript_16AD89:: @ 816AD89 msgbox gUnknown_8192C07 giveitem VAR_0x8008, 4 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16AE45 + goto_if eq, EventScript_16AE45 release end @@ -60,7 +60,7 @@ EventScript_16ADC3:: @ 816ADC3 msgbox gUnknown_8192D4B giveitem VAR_0x8008 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16AE45 + goto_if eq, EventScript_16AE45 release end @@ -69,7 +69,7 @@ EventScript_16ADE9:: @ 816ADE9 msgbox gUnknown_8192DE3 giveitem VAR_0x8008, 4 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16AE45 + goto_if eq, EventScript_16AE45 release end diff --git a/data/maps/CeruleanCity_House5/scripts.inc b/data/maps/CeruleanCity_House5/scripts.inc index d929a38e6..0ee3d742d 100644 --- a/data/maps/CeruleanCity_House5/scripts.inc +++ b/data/maps/CeruleanCity_House5/scripts.inc @@ -5,17 +5,17 @@ CeruleanCity_House5_EventScript_16AE50:: @ 816AE50 lock faceplayer checkflag FLAG_0x2BB - goto_if_eq EventScript_16AEB7 + goto_if TRUE, EventScript_16AEB7 msgbox gUnknown_8192F67, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16AEAD + goto_if eq, EventScript_16AEAD checkflag FLAG_0x847 - goto_if lt, EventScript_16AEA3 + goto_if FALSE, EventScript_16AEA3 msgbox gUnknown_8193003 setflag FLAG_0x2BB giveitem ITEM_POWDER_JAR compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_1A6BF9 + goto_if eq, EventScript_1A6BF9 msgbox gUnknown_8193033 release end @@ -144,20 +144,20 @@ EventScript_16B048:: @ 816B048 EventScript_16B055:: @ 816B055 msgbox gUnknown_819331E, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16AEC8 + goto_if eq, EventScript_16AEC8 copyvar VAR_0x8004, VAR_0x8009 specialvar VAR_RESULT, sub_815EEB0 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16B0CC + goto_if eq, EventScript_16B0CC giveitem VAR_0x8008 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16B0BF + goto_if eq, EventScript_16B0BF copyvar VAR_0x8004, VAR_0x8009 special sub_815EF5C special sub_815F070 msgbox gUnknown_819337A, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16AEC8 + goto_if eq, EventScript_16AEC8 msgbox gUnknown_81933FB special sub_815F114 release @@ -178,7 +178,7 @@ CeruleanCity_House5_EventScript_16B0DA:: @ 816B0DA lockall special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 special sub_814EA7C waitstate releaseall diff --git a/data/maps/CeruleanCity_Mart/scripts.inc b/data/maps/CeruleanCity_Mart/scripts.inc index 6f05c3e80..c99795d35 100644 --- a/data/maps/CeruleanCity_Mart/scripts.inc +++ b/data/maps/CeruleanCity_Mart/scripts.inc @@ -12,7 +12,7 @@ CeruleanCity_Mart_EventScript_16ACA7:: @ 816ACA7 CeruleanCity_Mart_EventScript_16ACB0:: @ 816ACB0 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 lock faceplayer message Text_1A6211 diff --git a/data/maps/CinnabarIsland/scripts.inc b/data/maps/CinnabarIsland/scripts.inc index 8325073e3..504b79cae 100644 --- a/data/maps/CinnabarIsland/scripts.inc +++ b/data/maps/CinnabarIsland/scripts.inc @@ -43,7 +43,7 @@ EventScript_166F52:: @ 8166F52 EventScript_166F5E:: @ 8166F5E checkflag FLAG_HIDE_POKEMON_MANSION_B1F_SECRET_KEY - goto_if_eq EventScript_166F68 + goto_if TRUE, EventScript_166F68 return EventScript_166F68:: @ 8166F68 @@ -94,24 +94,24 @@ EventScript_166FCD:: @ 8166FCD lockall textcolor 0 checkflag FLAG_TEMP_2 - call_if lt, EventScript_167032 + call_if FALSE, EventScript_167032 checkflag FLAG_TEMP_2 - call_if eq, EventScript_16703D + call_if TRUE, EventScript_16703D playse SE_PIN applymovement 3, Movement_1A75DB waitmovement 0 applymovement 3, Movement_1A75DD waitmovement 0 checkflag FLAG_TEMP_2 - call_if lt, EventScript_167048 + call_if FALSE, EventScript_167048 checkflag FLAG_TEMP_2 - call_if eq, EventScript_167053 + call_if TRUE, EventScript_167053 msgbox gUnknown_8180C90 msgbox gUnknown_8180CAA, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_167068 + goto_if eq, EventScript_167068 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_167078 + goto_if eq, EventScript_167078 end EventScript_167032:: @ 8167032 @@ -147,9 +147,9 @@ EventScript_167078:: @ 8167078 msgbox gUnknown_8180DF8 closemessage checkflag FLAG_TEMP_2 - call_if lt, EventScript_1670A0 + call_if FALSE, EventScript_1670A0 checkflag FLAG_TEMP_2 - call_if eq, EventScript_1670B3 + call_if TRUE, 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 eq, EventScript_167142 + call_if TRUE, EventScript_167142 addobject 4 checkflag FLAG_TEMP_2 - call_if lt, EventScript_167154 + call_if FALSE, EventScript_167154 checkflag FLAG_TEMP_2 - call_if eq, EventScript_167166 + call_if TRUE, EventScript_167166 msgbox gUnknown_8180EAD closemessage checkflag FLAG_TEMP_2 - call_if lt, EventScript_167171 + call_if FALSE, EventScript_167171 checkflag FLAG_TEMP_2 - call_if eq, EventScript_167183 + call_if TRUE, 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 156e7f101..88df6972a 100644 --- a/data/maps/CinnabarIsland_Gym/scripts.inc +++ b/data/maps/CinnabarIsland_Gym/scripts.inc @@ -4,19 +4,19 @@ CinnabarIsland_Gym_MapScripts:: @ 816D94B CinnabarIsland_Gym_MapScript1_16D951:: @ 816D951 checkflag FLAG_DEFEATED_BLAINE - goto_if_eq EventScript_16D991 - checkflag FLAG_0x265 - call_if eq, EventScript_16D9B0 - checkflag FLAG_0x267 - call_if eq, EventScript_16D9B6 - checkflag FLAG_0x268 - call_if eq, EventScript_16D9BC - checkflag FLAG_0x269 - call_if eq, EventScript_16D9C2 - checkflag FLAG_0x26A - call_if eq, EventScript_16D9C8 - checkflag FLAG_0x26B - call_if eq, EventScript_16D9CE + goto_if TRUE, EventScript_16D991 + checkflag FLAG_CINNABAR_GYM_QUIZ_1 + call_if TRUE, EventScript_16D9B0 + checkflag FLAG_CINNABAR_GYM_QUIZ_2 + call_if TRUE, EventScript_16D9B6 + checkflag FLAG_CINNABAR_GYM_QUIZ_3 + call_if TRUE, EventScript_16D9BC + checkflag FLAG_CINNABAR_GYM_QUIZ_4 + call_if TRUE, EventScript_16D9C2 + checkflag FLAG_CINNABAR_GYM_QUIZ_5 + call_if TRUE, EventScript_16D9C8 + checkflag FLAG_CINNABAR_GYM_QUIZ_6 + call_if TRUE, 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 lt, EventScript_16DA34 + goto_if FALSE, EventScript_16DA34 msgbox gUnknown_819971D release end @@ -76,7 +76,7 @@ EventScript_16DA34:: @ 816DA34 msgbox gUnknown_819969E checkitemspace ITEM_TM38, 1 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16DA75 + goto_if eq, EventScript_16DA75 additem ITEM_TM38, 1 giveitemfanfaremsg gUnknown_81996FF, ITEM_TM38 setflag FLAG_GOT_TM38_FROM_BLAINE @@ -100,8 +100,8 @@ CinnabarIsland_Gym_EventScript_16DA96:: @ 816DA96 end EventScript_16DAB1:: @ 816DAB1 - checkflag FLAG_0x267 - call_if lt, EventScript_16DABC + checkflag FLAG_CINNABAR_GYM_QUIZ_2 + call_if FALSE, EventScript_16DABC release end @@ -116,8 +116,8 @@ CinnabarIsland_Gym_EventScript_16DAC2:: @ 816DAC2 end EventScript_16DAEA:: @ 816DAEA - checkflag FLAG_0x269 - call_if lt, EventScript_16DAF5 + checkflag FLAG_CINNABAR_GYM_QUIZ_4 + call_if FALSE, EventScript_16DAF5 release end @@ -131,8 +131,8 @@ CinnabarIsland_Gym_EventScript_16DAFB:: @ 816DAFB end EventScript_16DB16:: @ 816DB16 - checkflag FLAG_0x26B - call_if lt, EventScript_16DB21 + checkflag FLAG_CINNABAR_GYM_QUIZ_6 + call_if FALSE, EventScript_16DB21 release end @@ -146,8 +146,8 @@ CinnabarIsland_Gym_EventScript_16DB27:: @ 816DB27 end EventScript_16DB42:: @ 816DB42 - checkflag FLAG_0x265 - call_if lt, EventScript_16DB4D + checkflag FLAG_CINNABAR_GYM_QUIZ_1 + call_if FALSE, EventScript_16DB4D release end @@ -161,8 +161,8 @@ CinnabarIsland_Gym_EventScript_16DB53:: @ 816DB53 end EventScript_16DB6E:: @ 816DB6E - checkflag FLAG_0x268 - call_if lt, EventScript_16DB79 + checkflag FLAG_CINNABAR_GYM_QUIZ_3 + call_if FALSE, EventScript_16DB79 release end @@ -176,8 +176,8 @@ CinnabarIsland_Gym_EventScript_16DB7F:: @ 816DB7F end EventScript_16DB9A:: @ 816DB9A - checkflag FLAG_0x26A - call_if lt, EventScript_16DBA5 + checkflag FLAG_CINNABAR_GYM_QUIZ_5 + call_if FALSE, EventScript_16DBA5 release end @@ -189,7 +189,7 @@ CinnabarIsland_Gym_EventScript_16DBAB:: @ 816DBAB lock faceplayer checkflag FLAG_DEFEATED_BLAINE - goto_if_eq EventScript_16DBC0 + goto_if TRUE, EventScript_16DBC0 msgbox gUnknown_8199B81 release end @@ -202,7 +202,7 @@ EventScript_16DBC0:: @ 816DBC0 CinnabarIsland_Gym_EventScript_16DBCA:: @ 816DBCA lockall checkflag FLAG_BADGE07_GET - goto_if_eq EventScript_16DBDE + goto_if TRUE, EventScript_16DBDE msgbox gUnknown_8199C29 releaseall end @@ -228,9 +228,9 @@ EventScript_16DC00:: @ 816DC00 msgbox gUnknown_8199C9F msgbox gUnknown_8199D5A, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16DC43 + goto_if eq, EventScript_16DC43 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16DC6A + goto_if eq, EventScript_16DC6A end EventScript_16DC27:: @ 816DC27 @@ -249,8 +249,8 @@ EventScript_16DC34:: @ 816DC34 EventScript_16DC43:: @ 816DC43 call EventScript_16DC27 - checkflag FLAG_0x265 - goto_if_eq EventScript_16DC68 + checkflag FLAG_CINNABAR_GYM_QUIZ_1 + goto_if TRUE, EventScript_16DC68 call EventScript_16DC58 releaseall end @@ -260,7 +260,7 @@ EventScript_16DC58:: @ 816DC58 waitse call EventScript_16E117 special DrawWholeMapView - setflag FLAG_0x265 + setflag FLAG_CINNABAR_GYM_QUIZ_1 return EventScript_16DC68:: @ 816DC68 @@ -282,8 +282,8 @@ EventScript_16DC7A:: @ 816DC7A textcolor 0 msgbox gUnknown_819983F trainerbattle 3, TRAINER_BURGLAR_QUINN, 0, Text_199870 - checkflag FLAG_0x265 - goto_if_eq EventScript_16DC68 + checkflag FLAG_CINNABAR_GYM_QUIZ_1 + goto_if TRUE, EventScript_16DC68 call EventScript_16DC58 releaseall end @@ -325,15 +325,15 @@ EventScript_16DCF5:: @ 816DCF5 msgbox gUnknown_8199C9F msgbox gUnknown_8199D79, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16DD41 + goto_if eq, EventScript_16DD41 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16DD1C + goto_if eq, EventScript_16DD1C end EventScript_16DD1C:: @ 816DD1C call EventScript_16DC27 - checkflag FLAG_0x267 - goto_if_eq EventScript_16DC68 + checkflag FLAG_CINNABAR_GYM_QUIZ_2 + goto_if TRUE, EventScript_16DC68 call EventScript_16DD31 releaseall end @@ -343,7 +343,7 @@ EventScript_16DD31:: @ 816DD31 waitse call EventScript_16E157 special DrawWholeMapView - setflag FLAG_0x267 + setflag FLAG_CINNABAR_GYM_QUIZ_2 return EventScript_16DD41:: @ 816DD41 @@ -361,8 +361,8 @@ EventScript_16DD51:: @ 816DD51 textcolor 0 msgbox gUnknown_81998BD trainerbattle 3, TRAINER_SUPER_NERD_AVERY, 0, Text_1998ED - checkflag FLAG_0x267 - goto_if_eq EventScript_16DC68 + checkflag FLAG_CINNABAR_GYM_QUIZ_2 + goto_if TRUE, EventScript_16DC68 call EventScript_16DD31 releaseall end @@ -413,15 +413,15 @@ EventScript_16DDD3:: @ 816DDD3 msgbox gUnknown_8199C9F msgbox gUnknown_8199DA9, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16DE1F + goto_if eq, EventScript_16DE1F compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16DDFA + goto_if eq, EventScript_16DDFA end EventScript_16DDFA:: @ 816DDFA call EventScript_16DC27 - checkflag FLAG_0x268 - goto_if_eq EventScript_16DC68 + checkflag FLAG_CINNABAR_GYM_QUIZ_3 + goto_if TRUE, EventScript_16DC68 call EventScript_16DE0F releaseall end @@ -431,7 +431,7 @@ EventScript_16DE0F:: @ 816DE0F waitse call EventScript_16E197 special DrawWholeMapView - setflag FLAG_0x268 + setflag FLAG_CINNABAR_GYM_QUIZ_3 return EventScript_16DE1F:: @ 816DE1F @@ -449,8 +449,8 @@ EventScript_16DE2F:: @ 816DE2F textcolor 0 msgbox gUnknown_8199948 trainerbattle 3, TRAINER_BURGLAR_RAMON, 0, Text_199973 - checkflag FLAG_0x268 - goto_if_eq EventScript_16DC68 + checkflag FLAG_CINNABAR_GYM_QUIZ_3 + goto_if TRUE, EventScript_16DC68 call EventScript_16DE0F releaseall end @@ -492,15 +492,15 @@ EventScript_16DEAA:: @ 816DEAA msgbox gUnknown_8199C9F msgbox gUnknown_8199DC6, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16DEF6 + goto_if eq, EventScript_16DEF6 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16DED1 + goto_if eq, EventScript_16DED1 end EventScript_16DED1:: @ 816DED1 call EventScript_16DC27 - checkflag FLAG_0x269 - goto_if_eq EventScript_16DC68 + checkflag FLAG_CINNABAR_GYM_QUIZ_4 + goto_if TRUE, EventScript_16DC68 call EventScript_16DEE6 releaseall end @@ -510,7 +510,7 @@ EventScript_16DEE6:: @ 816DEE6 waitse call EventScript_16E1D7 special DrawWholeMapView - setflag FLAG_0x269 + setflag FLAG_CINNABAR_GYM_QUIZ_4 return EventScript_16DEF6:: @ 816DEF6 @@ -528,8 +528,8 @@ EventScript_16DF06:: @ 816DF06 textcolor 0 msgbox gUnknown_81999B7 trainerbattle 3, TRAINER_SUPER_NERD_DEREK, 0, Text_1999DB - checkflag FLAG_0x269 - goto_if_eq EventScript_16DC68 + checkflag FLAG_CINNABAR_GYM_QUIZ_4 + goto_if TRUE, EventScript_16DC68 call EventScript_16DEE6 releaseall end @@ -571,15 +571,15 @@ EventScript_16DF81:: @ 816DF81 msgbox gUnknown_8199C9F msgbox gUnknown_8199E00, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16DFA8 + goto_if eq, EventScript_16DFA8 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16DFCD + goto_if eq, EventScript_16DFCD end EventScript_16DFA8:: @ 816DFA8 call EventScript_16DC27 - checkflag FLAG_0x26A - goto_if_eq EventScript_16DC68 + checkflag FLAG_CINNABAR_GYM_QUIZ_5 + goto_if TRUE, EventScript_16DC68 call EventScript_16DFBD releaseall end @@ -589,7 +589,7 @@ EventScript_16DFBD:: @ 816DFBD waitse call EventScript_16E1F3 special DrawWholeMapView - setflag FLAG_0x26A + setflag FLAG_CINNABAR_GYM_QUIZ_5 return EventScript_16DFCD:: @ 816DFCD @@ -607,8 +607,8 @@ EventScript_16DFDD:: @ 816DFDD textcolor 0 msgbox gUnknown_8199A7F trainerbattle 3, TRAINER_BURGLAR_DUSTY, 0, Text_199AB9 - checkflag FLAG_0x26A - goto_if_eq EventScript_16DC68 + checkflag FLAG_CINNABAR_GYM_QUIZ_5 + goto_if TRUE, EventScript_16DC68 call EventScript_16DFBD releaseall end @@ -650,15 +650,15 @@ EventScript_16E058:: @ 816E058 msgbox gUnknown_8199C9F msgbox gUnknown_8199E36, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16E0A4 + goto_if eq, EventScript_16E0A4 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16E07F + goto_if eq, EventScript_16E07F end EventScript_16E07F:: @ 816E07F call EventScript_16DC27 - checkflag FLAG_0x26B - goto_if_eq EventScript_16DC68 + checkflag FLAG_CINNABAR_GYM_QUIZ_6 + goto_if TRUE, EventScript_16DC68 call EventScript_16E094 releaseall end @@ -668,7 +668,7 @@ EventScript_16E094:: @ 816E094 waitse call EventScript_16E233 special DrawWholeMapView - setflag FLAG_0x26B + setflag FLAG_CINNABAR_GYM_QUIZ_6 return EventScript_16E0A4:: @ 816E0A4 @@ -686,8 +686,8 @@ EventScript_16E0B4:: @ 816E0B4 textcolor 0 msgbox gUnknown_8199AFC trainerbattle 3, TRAINER_SUPER_NERD_ZAC, 0, Text_199B16 - checkflag FLAG_0x26B - goto_if_eq EventScript_16DC68 + checkflag FLAG_CINNABAR_GYM_QUIZ_6 + goto_if TRUE, EventScript_16DC68 call EventScript_16E094 releaseall end diff --git a/data/maps/CinnabarIsland_Mart/scripts.inc b/data/maps/CinnabarIsland_Mart/scripts.inc index c82034dd0..85ad79e4e 100644 --- a/data/maps/CinnabarIsland_Mart/scripts.inc +++ b/data/maps/CinnabarIsland_Mart/scripts.inc @@ -12,7 +12,7 @@ CinnabarIsland_Mart_EventScript_16EA19:: @ 816EA19 CinnabarIsland_Mart_EventScript_16EA22:: @ 816EA22 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 lock faceplayer message Text_1A6211 diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc index cac88d282..640446bf0 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc @@ -31,7 +31,7 @@ CinnabarIsland_PokemonCenter_1F_EventScript_16E90A:: @ 816E90A faceplayer msgbox gUnknown_819A725, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16E9A5 + goto_if eq, EventScript_16E9A5 msgbox gUnknown_819A785 closemessage playbgm MUS_ANNAI, 1 diff --git a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc index d04b27089..7c5a98a96 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc @@ -7,10 +7,10 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E401:: @ 816E401 setvar VAR_0x8008, 8 call EventScript_1A8CAD checkflag FLAG_0x276 - goto_if_eq EventScript_16E473 + goto_if TRUE, EventScript_16E473 msgbox gUnknown_81A597B, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16E45B + goto_if eq, EventScript_16E45B call EventScript_1A8CBD compare_var_to_value VAR_0x8004, 6 goto_if ge, EventScript_16E45B @@ -44,47 +44,47 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E47D:: @ 816E47D faceplayer setvar VAR_RESULT, 0 checkflag FLAG_REVIVED_AMBER - call_if eq, EventScript_16E8A1 + call_if TRUE, EventScript_16E8A1 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16E897 + goto_if eq, EventScript_16E897 compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 2 - goto_if_eq EventScript_16E736 + goto_if eq, EventScript_16E736 compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 1 - goto_if_eq EventScript_16E72C + goto_if eq, EventScript_16E72C call EventScript_16E4EC compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16E544 + goto_if eq, EventScript_16E544 call EventScript_16E504 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16E586 + goto_if eq, EventScript_16E586 call EventScript_16E51C compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16E5C8 + goto_if eq, EventScript_16E5C8 msgbox gUnknown_819A282 goto EventScript_16E53A end EventScript_16E4EC:: @ 816E4EC checkflag FLAG_0x273 - goto_if lt, EventScript_16E534 + goto_if FALSE, EventScript_16E534 checkflag FLAG_REVIVED_HELIX - goto_if_eq EventScript_16E534 + goto_if TRUE, EventScript_16E534 setvar VAR_RESULT, 1 return EventScript_16E504:: @ 816E504 checkflag FLAG_0x272 - goto_if lt, EventScript_16E534 + goto_if FALSE, EventScript_16E534 checkflag FLAG_REVIVED_DOME - goto_if_eq EventScript_16E534 + goto_if TRUE, EventScript_16E534 setvar VAR_RESULT, 1 return EventScript_16E51C:: @ 816E51C - checkflag FLAG_0x25E - goto_if lt, EventScript_16E534 + checkflag FLAG_GOT_OLD_AMBER + goto_if FALSE, EventScript_16E534 checkflag FLAG_REVIVED_AMBER - goto_if_eq EventScript_16E534 + goto_if TRUE, EventScript_16E534 setvar VAR_RESULT, 1 return @@ -102,7 +102,7 @@ EventScript_16E544:: @ 816E544 waitmessage call EventScript_16E51C compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16E5FA + goto_if eq, EventScript_16E5FA multichoice 0, 0, 21, 0 switch VAR_RESULT case 0, EventScript_16E668 @@ -115,7 +115,7 @@ EventScript_16E586:: @ 816E586 waitmessage call EventScript_16E51C compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16E631 + goto_if eq, EventScript_16E631 multichoice 0, 0, 22, 0 switch VAR_RESULT case 0, EventScript_16E6A6 @@ -156,7 +156,7 @@ EventScript_16E668:: @ 816E668 getitemname 1, ITEM_HELIX_FOSSIL msgbox gUnknown_819A3D4, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16E722 + goto_if eq, EventScript_16E722 msgbox gUnknown_819A45D textcolor 0 removeitem ITEM_HELIX_FOSSIL, 1 @@ -171,7 +171,7 @@ EventScript_16E6A6:: @ 816E6A6 getitemname 1, ITEM_DOME_FOSSIL msgbox gUnknown_819A3D4, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16E722 + goto_if eq, EventScript_16E722 msgbox gUnknown_819A45D textcolor 0 removeitem ITEM_DOME_FOSSIL, 1 @@ -186,7 +186,7 @@ EventScript_16E6E4:: @ 816E6E4 getitemname 1, ITEM_OLD_AMBER msgbox gUnknown_819A3D4, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16E722 + goto_if eq, EventScript_16E722 msgbox gUnknown_819A45D textcolor 0 removeitem ITEM_OLD_AMBER, 1 @@ -208,11 +208,11 @@ EventScript_16E72C:: @ 816E72C EventScript_16E736:: @ 816E736 compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, 1 - goto_if_eq EventScript_16E758 + goto_if eq, EventScript_16E758 compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, 2 - goto_if_eq EventScript_16E79D + goto_if eq, EventScript_16E79D compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, 3 - goto_if_eq EventScript_16E7E2 + goto_if eq, EventScript_16E7E2 end EventScript_16E758:: @ 816E758 @@ -221,12 +221,12 @@ EventScript_16E758:: @ 816E758 msgbox gUnknown_819A34F givemon SPECIES_OMANYTE, 5, ITEM_NONE, 0, 0, 0 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A927C + goto_if eq, EventScript_1A927C setflag FLAG_REVIVED_HELIX compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16E827 + goto_if eq, EventScript_16E827 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16E85B + goto_if eq, EventScript_16E85B end EventScript_16E79D:: @ 816E79D @@ -235,12 +235,12 @@ EventScript_16E79D:: @ 816E79D msgbox gUnknown_819A34F givemon SPECIES_KABUTO, 5, ITEM_NONE, 0, 0, 0 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A927C + goto_if eq, EventScript_1A927C setflag FLAG_REVIVED_DOME compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16E827 + goto_if eq, EventScript_16E827 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16E85B + goto_if eq, EventScript_16E85B end EventScript_16E7E2:: @ 816E7E2 @@ -249,12 +249,12 @@ EventScript_16E7E2:: @ 816E7E2 msgbox gUnknown_819A34F givemon SPECIES_AERODACTYL, 5, ITEM_NONE, 0, 0, 0 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A927C + goto_if eq, EventScript_1A927C setflag FLAG_REVIVED_AMBER compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16E827 + goto_if eq, EventScript_16E827 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16E85B + goto_if eq, EventScript_16E85B end EventScript_16E827:: @ 816E827 @@ -266,7 +266,7 @@ EventScript_16E827:: @ 816E827 setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 0 msgbox gUnknown_81A56A7, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16E895 + goto_if eq, EventScript_16E895 call EventScript_1A8C27 call EventScript_1A74EB goto EventScript_16E895 @@ -281,7 +281,7 @@ EventScript_16E85B:: @ 816E85B setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 0 msgbox gUnknown_81A56A7, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16E88A + goto_if eq, EventScript_16E88A call EventScript_1A8C33 goto EventScript_16E88A end @@ -302,20 +302,20 @@ EventScript_16E897:: @ 816E897 EventScript_16E8A1:: @ 816E8A1 checkflag FLAG_0x273 - goto_if_eq EventScript_16E8B9 + goto_if TRUE, EventScript_16E8B9 checkflag FLAG_0x272 - goto_if_eq EventScript_16E8C8 + goto_if TRUE, EventScript_16E8C8 goto EventScript_16E534 end EventScript_16E8B9:: @ 816E8B9 checkflag FLAG_REVIVED_HELIX - goto_if lt, EventScript_16E534 + goto_if FALSE, EventScript_16E534 setvar VAR_RESULT, 1 return EventScript_16E8C8:: @ 816E8C8 checkflag FLAG_REVIVED_DOME - goto_if lt, EventScript_16E534 + goto_if FALSE, 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 df5da6603..a64105c74 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc @@ -11,10 +11,10 @@ CinnabarIsland_PokemonLab_Lounge_EventScript_16E2C2:: @ 816E2C2 setvar VAR_0x8008, 6 call EventScript_1A8CAD checkflag FLAG_0x274 - goto_if_eq EventScript_16E334 + goto_if TRUE, EventScript_16E334 msgbox gUnknown_81A59FE, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16E31C + goto_if eq, EventScript_16E31C call EventScript_1A8CBD compare_var_to_value VAR_0x8004, 6 goto_if ge, EventScript_16E31C @@ -51,10 +51,10 @@ CinnabarIsland_PokemonLab_Lounge_EventScript_16E33E:: @ 816E33E specialvar VAR_RESULT, sub_8053A9C copyvar VAR_0x8009, VAR_RESULT checkflag FLAG_0x275 - goto_if_eq EventScript_16E3D4 + goto_if TRUE, EventScript_16E3D4 msgbox gUnknown_81A5AD6, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16E3BC + goto_if eq, EventScript_16E3BC special sub_80BF8FC waitstate copyvar VAR_0x800A, VAR_0x8004 diff --git a/data/maps/FiveIsland_LostCave_Room10/scripts.inc b/data/maps/FiveIsland_LostCave_Room10/scripts.inc index cd9123743..0829a0273 100644 --- a/data/maps/FiveIsland_LostCave_Room10/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Room10/scripts.inc @@ -27,7 +27,7 @@ EventScript_164C52:: @ 8164C52 msgbox gUnknown_817D062 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_164CB6 + goto_if eq, EventScript_164CB6 trainerbattle 3, TRAINER_LADY_SELPHY, 0, Text_17D086 msgbox gUnknown_817D0B2 closemessage diff --git a/data/maps/FiveIsland_Meadow/scripts.inc b/data/maps/FiveIsland_Meadow/scripts.inc index d2ee2e4cb..c6593d865 100644 --- a/data/maps/FiveIsland_Meadow/scripts.inc +++ b/data/maps/FiveIsland_Meadow/scripts.inc @@ -4,15 +4,15 @@ FiveIsland_Meadow_MapScripts:: @ 8168932 FiveIsland_Meadow_MapScript1_168938:: @ 8168938 checkflag FLAG_0x2D6 - call_if eq, EventScript_168983 + call_if TRUE, EventScript_168983 end FiveIsland_Meadow_EventScript_168942:: @ 8168942 lockall checkflag FLAG_0x2D6 - goto_if_eq EventScript_168979 + goto_if TRUE, EventScript_168979 checkflag FLAG_0x2D8 - goto_if_eq EventScript_16895F + goto_if TRUE, EventScript_16895F msgbox gUnknown_818AB8E releaseall end diff --git a/data/maps/FiveIsland_MemorialPillar/scripts.inc b/data/maps/FiveIsland_MemorialPillar/scripts.inc index 18e5e5017..a42974e1a 100644 --- a/data/maps/FiveIsland_MemorialPillar/scripts.inc +++ b/data/maps/FiveIsland_MemorialPillar/scripts.inc @@ -4,9 +4,9 @@ FiveIsland_MemorialPillar_MapScripts:: @ 81689D2 FiveIsland_MemorialPillar_EventScript_1689D3:: @ 81689D3 lock checkflag FLAG_GOT_TM42_AT_MEMORIAL_PILLAR - goto_if_eq EventScript_168A18 + goto_if TRUE, EventScript_168A18 checkflag FLAG_0x2D7 - goto_if_eq EventScript_168A22 + goto_if TRUE, EventScript_168A22 msgbox gUnknown_818B02E closemessage applymovement 1, Movement_1A75E1 @@ -28,7 +28,7 @@ EventScript_168A22:: @ 8168A22 msgbox gUnknown_818B282 giveitem ITEM_TM42 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_168AFE + goto_if eq, EventScript_168AFE call EventScript_168AE8 release end @@ -36,24 +36,24 @@ EventScript_168A22:: @ 8168A22 FiveIsland_MemorialPillar_EventScript_168A48:: @ 8168A48 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 special sub_8112364 lockall checkflag FLAG_GOT_TM42_AT_MEMORIAL_PILLAR - goto_if_eq EventScript_168B0B + goto_if TRUE, EventScript_168B0B checkflag FLAG_0x2D7 - goto_if_eq EventScript_168B0B + goto_if TRUE, EventScript_168B0B msgbox gUnknown_818B095 checkitem ITEM_LEMONADE, 1 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_168A86 + goto_if eq, EventScript_168A86 releaseall end EventScript_168A86:: @ 8168A86 msgbox gUnknown_818B105, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_168A9B + goto_if eq, EventScript_168A9B releaseall end @@ -70,7 +70,7 @@ EventScript_168A9B:: @ 8168A9B msgbox gUnknown_818B171 giveitem ITEM_TM42 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_168AFE + goto_if eq, EventScript_168AFE call EventScript_168AE8 releaseall end diff --git a/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc b/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc index 1b174b1cf..18a6d0b14 100644 --- a/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc +++ b/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc @@ -4,14 +4,14 @@ FiveIsland_ResortGorgeous_House_MapScripts:: @ 8171EBD FiveIsland_ResortGorgeous_House_EventScript_171EBE:: @ 8171EBE special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 special sub_8112364 lock faceplayer checkflag FLAG_TEMP_2 - goto_if_eq EventScript_172043 + goto_if TRUE, EventScript_172043 compare_var_to_value VAR_STORAGE_UNKNOWN, 65535 - goto_if_eq EventScript_171F0B + goto_if eq, EventScript_171F0B compare_var_to_value VAR_STORAGE_UNKNOWN, 0 goto_if ne, EventScript_171F19 msgbox gUnknown_81A42A0 @@ -33,7 +33,7 @@ EventScript_171F19:: @ 8171F19 copyvar VAR_0x8004, VAR_STORAGE_UNKNOWN specialvar VAR_RESULT, sub_80CC48C compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_171F34 + goto_if eq, EventScript_171F34 goto EventScript_171EFE end @@ -64,7 +64,7 @@ EventScript_171F34:: @ 8171F34 msgbox gUnknown_81A458E giveitem VAR_0x403B compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_172025 + goto_if eq, EventScript_172025 setflag FLAG_TEMP_2 setvar VAR_STORAGE_UNKNOWN, 0 release diff --git a/data/maps/FiveIsland_RocketWarehouse/scripts.inc b/data/maps/FiveIsland_RocketWarehouse/scripts.inc index 294b33cb1..f57096728 100644 --- a/data/maps/FiveIsland_RocketWarehouse/scripts.inc +++ b/data/maps/FiveIsland_RocketWarehouse/scripts.inc @@ -20,7 +20,7 @@ EventScript_163F47:: @ 8163F47 FiveIsland_RocketWarehouse_EventScript_163F5A:: @ 8163F5A lockall checkflag FLAG_0x2D5 - goto_if_eq EventScript_163F6E + goto_if TRUE, EventScript_163F6E msgbox gUnknown_817B4E3 releaseall end @@ -45,7 +45,7 @@ FiveIsland_RocketWarehouse_EventScript_163F81:: @ 8163F81 FiveIsland_RocketWarehouse_EventScript_163F93:: @ 8163F93 trainerbattle 2, TRAINER_SCIENTIST_GIDEON, 0, Text_17BBAF, Text_17BC55, EventScript_163FCD checkflag FLAG_0x844 - goto_if_eq EventScript_163FB7 + goto_if TRUE, EventScript_163FB7 msgbox gUnknown_817BCA3, 6 end @@ -142,7 +142,7 @@ EventScript_1640A2:: @ 81640A2 EventScript_16412E:: @ 816412E compare_var_to_value VAR_0x8004, 27 - goto_if_eq EventScript_1A77A9 + goto_if eq, EventScript_1A77A9 applymovement 255, Movement_1A75EB waitmovement 0 return diff --git a/data/maps/FiveIsland_WaterLabyrinth/scripts.inc b/data/maps/FiveIsland_WaterLabyrinth/scripts.inc index 79e133c7b..bca494e8a 100644 --- a/data/maps/FiveIsland_WaterLabyrinth/scripts.inc +++ b/data/maps/FiveIsland_WaterLabyrinth/scripts.inc @@ -4,18 +4,18 @@ FiveIsland_WaterLabyrinth_MapScripts:: @ 816884D FiveIsland_WaterLabyrinth_EventScript_16884E:: @ 816884E special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 special sub_8112364 lock faceplayer checkflag FLAG_0x2DA - goto_if_eq EventScript_1688E3 + goto_if TRUE, EventScript_1688E3 checkflag FLAG_0x2DB - goto_if_eq EventScript_16892C + goto_if TRUE, EventScript_16892C msgbox gUnknown_818A80D specialvar VAR_RESULT, sub_80CA76C compare_var_to_value VAR_RESULT, 6 - goto_if_eq EventScript_1688AC + goto_if eq, EventScript_1688AC msgbox gUnknown_818A88F release end @@ -34,7 +34,7 @@ EventScript_1688AC:: @ 81688AC EventScript_1688BA:: @ 81688BA countpokemon compare_var_to_value VAR_RESULT, 6 - goto_if_eq EventScript_16891F + goto_if eq, EventScript_16891F setflag FLAG_0x2DA giveegg SPECIES_TOGEPI textcolor 3 @@ -51,12 +51,12 @@ EventScript_1688E3:: @ 81688E3 setvar VAR_0x8004, 175 specialvar VAR_RESULT, sub_80CD0F4 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_168895 + goto_if eq, EventScript_168895 getspeciesname 1, SPECIES_TOGETIC setvar VAR_0x8004, 176 specialvar VAR_RESULT, sub_80CD0F4 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_168895 + goto_if eq, EventScript_168895 msgbox gUnknown_818A9C0 release end diff --git a/data/maps/FourIsland/scripts.inc b/data/maps/FourIsland/scripts.inc index 03a785e02..f67d963cb 100644 --- a/data/maps/FourIsland/scripts.inc +++ b/data/maps/FourIsland/scripts.inc @@ -16,7 +16,7 @@ EventScript_167CCD:: @ 8167CCD EventScript_167CD1:: @ 8167CD1 checkflag FLAG_PENDING_DAYCARE_EGG - goto_if lt, EventScript_167CE1 + goto_if FALSE, EventScript_167CE1 setobjectxyperm 1, 16, 14 EventScript_167CE1:: @ 8167CE1 @@ -73,18 +73,18 @@ Movement_167D52:: @ 8167D52 FourIsland_EventScript_167D55:: @ 8167D55 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 special sub_8112364 lock faceplayer special GetDaycareMonNicknames specialvar VAR_RESULT, GetDaycareState compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_167D9B + goto_if eq, EventScript_167D9B compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_167E0C + goto_if eq, EventScript_167E0C compare_var_to_value VAR_RESULT, 3 - goto_if_eq EventScript_167E19 + goto_if eq, EventScript_167E19 msgbox gUnknown_81BF555 release end @@ -92,10 +92,10 @@ FourIsland_EventScript_167D55:: @ 8167D55 EventScript_167D9B:: @ 8167D9B msgbox gUnknown_81BF5E3, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_167DD1 + goto_if eq, EventScript_167DD1 msgbox gUnknown_81BF7B6, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_167DD1 + goto_if eq, EventScript_167DD1 msgbox gUnknown_81BF6CF clearflag FLAG_PENDING_DAYCARE_EGG special RejectEggFromDayCare @@ -143,7 +143,7 @@ FourIsland_EventScript_167E2E:: @ 8167E2E lock faceplayer checkflag FLAG_0x844 - goto_if_eq EventScript_167E43 + goto_if TRUE, EventScript_167E43 msgbox gUnknown_8182A2B release end diff --git a/data/maps/FourIsland_LoreleisHouse/scripts.inc b/data/maps/FourIsland_LoreleisHouse/scripts.inc index ab7196c62..55aadb311 100644 --- a/data/maps/FourIsland_LoreleisHouse/scripts.inc +++ b/data/maps/FourIsland_LoreleisHouse/scripts.inc @@ -10,9 +10,9 @@ FourIsland_LoreleisHouse_EventScript_171C58:: @ 8171C58 lock faceplayer checkflag FLAG_0x2D4 - goto_if_eq EventScript_171C83 + goto_if TRUE, EventScript_171C83 checkflag FLAG_0x2D5 - goto_if_eq EventScript_171C76 + goto_if TRUE, EventScript_171C76 msgbox gUnknown_81A3826 release end diff --git a/data/maps/FourIsland_Mart/scripts.inc b/data/maps/FourIsland_Mart/scripts.inc index 026d172a9..c74ac396a 100644 --- a/data/maps/FourIsland_Mart/scripts.inc +++ b/data/maps/FourIsland_Mart/scripts.inc @@ -4,7 +4,7 @@ FourIsland_Mart_MapScripts:: @ 8171CAD FourIsland_Mart_EventScript_171CAE:: @ 8171CAE special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 lock faceplayer message Text_1A6211 diff --git a/data/maps/FourIsland_PokemonDayCare/scripts.inc b/data/maps/FourIsland_PokemonDayCare/scripts.inc index a272aa5b3..7ca07b4ba 100644 --- a/data/maps/FourIsland_PokemonDayCare/scripts.inc +++ b/data/maps/FourIsland_PokemonDayCare/scripts.inc @@ -4,19 +4,19 @@ FourIsland_PokemonDayCare_MapScripts:: @ 817193F FourIsland_PokemonDayCare_EventScript_171940:: @ 8171940 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 lock faceplayer specialvar VAR_RESULT, GetDaycareState compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_171A2E + goto_if eq, EventScript_171A2E compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_171A52 + goto_if eq, EventScript_171A52 compare_var_to_value VAR_RESULT, 3 - goto_if_eq EventScript_171B86 + goto_if eq, EventScript_171B86 msgbox gUnknown_81BF7E4, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_171993 + goto_if eq, EventScript_171993 msgbox gUnknown_81BF916 release end @@ -24,7 +24,7 @@ FourIsland_PokemonDayCare_EventScript_171940:: @ 8171940 EventScript_171993:: @ 8171993 specialvar VAR_RESULT, CountPartyNonEggMons compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_171A1A + goto_if eq, EventScript_171A1A msgbox gUnknown_81BF839 fadescreen 1 special ChooseSendDaycareMon @@ -33,7 +33,7 @@ EventScript_171993:: @ 8171993 goto_if ge, EventScript_1719F7 specialvar VAR_RESULT, CountPartyAliveNonEggMons_IgnoreVar0x8004Slot compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_171A24 + goto_if eq, EventScript_171A24 specialvar VAR_0x8005, GetSelectedMonNickAndSpecies waitse playmoncry VAR_0x8005, 0 @@ -43,7 +43,7 @@ EventScript_171993:: @ 8171993 incrementgamestat 47 specialvar VAR_RESULT, GetDaycareState compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_171A01 + goto_if eq, EventScript_171A01 release end @@ -55,7 +55,7 @@ EventScript_1719F7:: @ 81719F7 EventScript_171A01:: @ 8171A01 msgbox gUnknown_81BF89F, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_171993 + goto_if eq, EventScript_171993 goto EventScript_1719F7 end @@ -90,26 +90,26 @@ EventScript_171A52:: @ 8171A52 call EventScript_171A41 msgbox gUnknown_81BF89F, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_171993 + goto_if eq, EventScript_171993 msgbox gUnknown_81BFAE8, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_171A90 + goto_if eq, EventScript_171A90 goto EventScript_1719F7 end EventScript_171A90:: @ 8171A90 specialvar VAR_RESULT, CalculatePlayerPartyCount compare_var_to_value VAR_RESULT, 6 - goto_if_eq EventScript_171B67 + goto_if eq, EventScript_171B67 specialvar VAR_RESULT, GetDaycareState setvar VAR_0x8004, 0 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_171ACF + goto_if eq, EventScript_171ACF special ShowDaycareLevelMenu waitstate copyvar VAR_0x8004, VAR_RESULT compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1719F7 + goto_if eq, EventScript_1719F7 goto EventScript_171ACF end @@ -117,14 +117,14 @@ EventScript_171ACF:: @ 8171ACF special GetDaycareCost msgbox gUnknown_81BFA3B, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_171AEB + goto_if eq, EventScript_171AEB goto EventScript_1719F7 end EventScript_171AEB:: @ 8171AEB specialvar VAR_RESULT, IsEnoughForCostInVar0x8005 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_171B05 + goto_if eq, EventScript_171B05 msgbox gUnknown_81BF932 release end @@ -144,14 +144,14 @@ EventScript_171B05:: @ 8171B05 waitmoncry specialvar VAR_RESULT, GetDaycareState compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_171B4E + goto_if eq, EventScript_171B4E goto EventScript_1719F7 end EventScript_171B4E:: @ 8171B4E msgbox gUnknown_81BF94F, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_171A90 + goto_if eq, EventScript_171A90 goto EventScript_1719F7 end @@ -193,7 +193,7 @@ EventScript_171B86:: @ 8171B86 call EventScript_171A41 msgbox gUnknown_81BFAE8, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_171A90 + goto_if eq, EventScript_171A90 msgbox gUnknown_81BF976 release end @@ -202,7 +202,7 @@ EventScript_171BBF:: @ 8171BBF special ShowDaycareLevelMenu waitstate compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1719F7 + goto_if eq, EventScript_1719F7 copyvar VAR_0x8004, VAR_RESULT specialvar VAR_RESULT, TakePokemonFromDaycare msgbox gUnknown_81BFA67 diff --git a/data/maps/FuchsiaCity/scripts.inc b/data/maps/FuchsiaCity/scripts.inc index 0d4369de9..cfc60a4be 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 eq, EventScript_166D91 + call_if TRUE, EventScript_166D91 checkflag FLAG_0x272 - call_if lt, EventScript_166D97 + call_if FALSE, EventScript_166D97 end EventScript_166D91:: @ 8166D91 @@ -122,7 +122,7 @@ FuchsiaCity_EventScript_166E83:: @ 8166E83 FuchsiaCity_EventScript_166E9C:: @ 8166E9C lockall checkflag FLAG_0x272 - goto_if_eq EventScript_166EBE + goto_if TRUE, EventScript_166EBE setvar VAR_0x8004, SPECIES_KABUTO special sub_80CBDCC drawmonpic SPECIES_KABUTO, 10, 3 diff --git a/data/maps/FuchsiaCity_Building1/scripts.inc b/data/maps/FuchsiaCity_Building1/scripts.inc index 30405e80e..2a07b6bb0 100644 --- a/data/maps/FuchsiaCity_Building1/scripts.inc +++ b/data/maps/FuchsiaCity_Building1/scripts.inc @@ -5,9 +5,9 @@ FuchsiaCity_Building1_EventScript_16D74C:: @ 816D74C lock faceplayer checkflag FLAG_GOT_HM04 - goto_if_eq EventScript_16D7FA + goto_if TRUE, EventScript_16D7FA checkflag FLAG_HIDE_SAFARI_ZONE_WEST_GOLD_TEETH - goto_if_eq EventScript_16D780 + goto_if TRUE, EventScript_16D780 msgbox gUnknown_8198DF9, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 call_if eq, EventScript_16D7E8 diff --git a/data/maps/FuchsiaCity_Gym/scripts.inc b/data/maps/FuchsiaCity_Gym/scripts.inc index d3e2df509..57d866f6b 100644 --- a/data/maps/FuchsiaCity_Gym/scripts.inc +++ b/data/maps/FuchsiaCity_Gym/scripts.inc @@ -4,8 +4,8 @@ FuchsiaCity_Gym_MapScripts:: @ 816D54D 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 lt, EventScript_16D5A6 + checkflag FLAG_GOT_TM06_FROM_KOGA + goto_if FALSE, EventScript_16D5A6 msgbox gUnknown_8198481 release end @@ -23,10 +23,10 @@ EventScript_16D5A6:: @ 816D5A6 msgbox gUnknown_819850E checkitemspace ITEM_TM06, 1 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16D5E7 + goto_if eq, EventScript_16D5E7 additem ITEM_TM06, 1 giveitemfanfaremsg gUnknown_819858F, ITEM_TM06 - setflag FLAG_0x259 + setflag FLAG_GOT_TM06_FROM_KOGA msgbox gUnknown_81985AB release end @@ -71,7 +71,7 @@ FuchsiaCity_Gym_EventScript_16D688:: @ 816D688 lock faceplayer checkflag FLAG_DEFEATED_KOGA - goto_if_eq EventScript_16D69D + goto_if TRUE, EventScript_16D69D msgbox gUnknown_8198A5E release end @@ -84,7 +84,7 @@ EventScript_16D69D:: @ 816D69D FuchsiaCity_Gym_EventScript_16D6A7:: @ 816D6A7 lockall checkflag FLAG_BADGE05_GET - goto_if_eq EventScript_16D6BB + goto_if TRUE, EventScript_16D6BB msgbox gUnknown_8198B4B releaseall end diff --git a/data/maps/FuchsiaCity_House2/scripts.inc b/data/maps/FuchsiaCity_House2/scripts.inc index 857fadfd1..4470655ff 100644 --- a/data/maps/FuchsiaCity_House2/scripts.inc +++ b/data/maps/FuchsiaCity_House2/scripts.inc @@ -5,10 +5,10 @@ FuchsiaCity_House2_EventScript_16D817:: @ 816D817 lock faceplayer checkflag FLAG_GOT_GOOD_ROD - goto_if_eq EventScript_16D83F + goto_if TRUE, EventScript_16D83F msgbox gUnknown_819918E, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16D849 + goto_if eq, EventScript_16D849 msgbox gUnknown_8199337 release end @@ -22,7 +22,7 @@ EventScript_16D849:: @ 816D849 msgbox gUnknown_8199207 checkitemspace ITEM_GOOD_ROD, 1 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16D88A + goto_if eq, EventScript_16D88A additem ITEM_GOOD_ROD, 1 giveitemfanfaremsg gUnknown_819925E, ITEM_GOOD_ROD msgbox gUnknown_8199296 diff --git a/data/maps/FuchsiaCity_House3/scripts.inc b/data/maps/FuchsiaCity_House3/scripts.inc index 0cdb899b9..6d7e033d8 100644 --- a/data/maps/FuchsiaCity_House3/scripts.inc +++ b/data/maps/FuchsiaCity_House3/scripts.inc @@ -6,7 +6,7 @@ FuchsiaCity_House3_EventScript_16D895:: @ 816D895 faceplayer msgbox gUnknown_81993B9, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16D8B0 + goto_if eq, EventScript_16D8B0 goto EventScript_16D941 end @@ -18,20 +18,20 @@ EventScript_16D8B0:: @ 816D8B0 goto_if ge, EventScript_16D941 special sub_80BFC14 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16D937 + goto_if eq, EventScript_16D937 special ScrSpecial_CountPokemonMoves compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16D92A + goto_if eq, EventScript_16D92A msgbox gUnknown_8199445 fadescreen 1 special sub_80BF9BC fadescreen 0 compare_var_to_value VAR_0x8005, 4 - goto_if_eq EventScript_16D8B0 + goto_if eq, EventScript_16D8B0 special ScrSpecial_GetPokemonNicknameAndMoveName msgbox gUnknown_8199485, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16D919 + goto_if eq, EventScript_16D919 goto EventScript_16D941 end diff --git a/data/maps/FuchsiaCity_Mart/scripts.inc b/data/maps/FuchsiaCity_Mart/scripts.inc index fe95c748c..dea51b320 100644 --- a/data/maps/FuchsiaCity_Mart/scripts.inc +++ b/data/maps/FuchsiaCity_Mart/scripts.inc @@ -12,7 +12,7 @@ FuchsiaCity_Mart_EventScript_16D4EA:: @ 816D4EA FuchsiaCity_Mart_EventScript_16D4F3:: @ 816D4F3 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 lock faceplayer message Text_1A6211 diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc index 326dba64c..e1031e737 100644 --- a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc +++ b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc @@ -39,7 +39,7 @@ EventScript_16D312:: @ 816D312 textcolor 0 msgbox gUnknown_8197E1A, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16D345 + goto_if eq, EventScript_16D345 msgbox gUnknown_8197E48 closemessage applymovement 255, Movement_16D362 @@ -103,7 +103,7 @@ EventScript_16D391:: @ 816D391 showmoneybox 0, 0, 0 msgbox gUnknown_8197C87, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16D3CA + goto_if eq, EventScript_16D3CA msgbox gUnknown_8197DE9 goto EventScript_16D49A end @@ -112,7 +112,7 @@ EventScript_16D3CA:: @ 816D3CA call EventScript_16D462 checkmoney 500, 0 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16D48C + goto_if eq, EventScript_16D48C takemoney 500, 0 updatemoneybox 0, 0, 0 msgbox gUnknown_8197D07 @@ -159,7 +159,7 @@ EventScript_16D462:: @ 816D462 goto_if ne, EventScript_1A77A9 specialvar VAR_RESULT, sub_80CABD0 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_1A77A9 + goto_if eq, EventScript_1A77A9 msgbox gUnknown_81BFEAC goto EventScript_16D49A end @@ -205,7 +205,7 @@ FuchsiaCity_SafariZone_Entrance_EventScript_16D4B7:: @ 816D4B7 faceplayer msgbox gUnknown_8197EB0, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16D4D6 + goto_if eq, EventScript_16D4D6 msgbox gUnknown_819809E release end diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc b/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc index 387180de0..e37681fb1 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc +++ b/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc @@ -12,7 +12,7 @@ IndigoPlateau_PokemonCenter_1F_MapScript1_16EA65:: @ 816EA65 EventScript_16EA79:: @ 816EA79 checkflag FLAG_0x844 - goto_if_eq EventScript_1A77A9 + goto_if TRUE, EventScript_1A77A9 setobjectxyperm 4, 4, 2 return @@ -21,14 +21,14 @@ IndigoPlateau_PokemonCenter_1F_EventScript_16EA8A:: @ 816EA8A faceplayer specialvar VAR_RESULT, IsNationalPokedexEnabled compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16EAA6 + goto_if eq, EventScript_16EAA6 msgbox gUnknown_819A8D8 release end EventScript_16EAA6:: @ 816EAA6 checkflag FLAG_0x844 - goto_if_eq EventScript_16EAB9 + goto_if TRUE, EventScript_16EAB9 msgbox gUnknown_819A943 release end @@ -45,7 +45,7 @@ IndigoPlateau_PokemonCenter_1F_EventScript_16EAC3:: @ 816EAC3 IndigoPlateau_PokemonCenter_1F_EventScript_16EACC:: @ 816EACC special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 lock faceplayer message Text_1A6211 diff --git a/data/maps/LavenderTown/scripts.inc b/data/maps/LavenderTown/scripts.inc index ca7aa5a63..dfd6cb3d7 100644 --- a/data/maps/LavenderTown/scripts.inc +++ b/data/maps/LavenderTown/scripts.inc @@ -13,7 +13,7 @@ LavenderTown_EventScript_16687D:: @ 816687D faceplayer msgbox gUnknown_817F52E, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16689C + goto_if eq, EventScript_16689C msgbox gUnknown_817F568 release end diff --git a/data/maps/LavenderTown_House1/scripts.inc b/data/maps/LavenderTown_House1/scripts.inc index 7ccacb9dc..2469d4503 100644 --- a/data/maps/LavenderTown_House1/scripts.inc +++ b/data/maps/LavenderTown_House1/scripts.inc @@ -5,7 +5,7 @@ LavenderTown_House1_EventScript_16B233:: @ 816B233 lock faceplayer checkflag FLAG_RESCUED_MR_FUJI - goto_if_eq EventScript_16B248 + goto_if TRUE, EventScript_16B248 msgbox gUnknown_819397D release end diff --git a/data/maps/LavenderTown_House2/scripts.inc b/data/maps/LavenderTown_House2/scripts.inc index f8d668e83..6495e7102 100644 --- a/data/maps/LavenderTown_House2/scripts.inc +++ b/data/maps/LavenderTown_House2/scripts.inc @@ -6,9 +6,9 @@ LavenderTown_House2_EventScript_16B266:: @ 816B266 faceplayer msgbox gUnknown_8193A4B, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16B287 + goto_if eq, EventScript_16B287 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16B2AA + goto_if eq, EventScript_16B2AA end EventScript_16B287:: @ 816B287 @@ -29,20 +29,20 @@ EventScript_16B2AA:: @ 816B2AA EventScript_16B2B4:: @ 816B2B4 specialvar VAR_RESULT, sub_80CAD54 compare_var_to_value VAR_RESULT, SPECIES_EGG - goto_if_eq EventScript_16B307 + goto_if eq, EventScript_16B307 special TV_CopyNicknameToStringVar1AndEnsureTerminated special TV_CheckMonOTIDEqualsPlayerID compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16B311 + goto_if eq, EventScript_16B311 specialvar VAR_RESULT, sub_80CAD7C special TV_CopyNicknameToStringVar1AndEnsureTerminated compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16B311 + goto_if eq, EventScript_16B311 msgbox gUnknown_8193AD2, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16B31B + goto_if eq, EventScript_16B31B compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16B2AA + goto_if eq, EventScript_16B2AA end EventScript_16B307:: @ 816B307 @@ -61,7 +61,7 @@ EventScript_16B31B:: @ 816B31B specialvar VAR_RESULT, sub_80CBFA0 special TV_CopyNicknameToStringVar1AndEnsureTerminated compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16B345 + goto_if eq, EventScript_16B345 msgbox gUnknown_8193BF0 release end diff --git a/data/maps/LavenderTown_Mart/scripts.inc b/data/maps/LavenderTown_Mart/scripts.inc index 380af6e9d..47cef8633 100644 --- a/data/maps/LavenderTown_Mart/scripts.inc +++ b/data/maps/LavenderTown_Mart/scripts.inc @@ -16,7 +16,7 @@ LavenderTown_Mart_EventScript_16B362:: @ 816B362 LavenderTown_Mart_EventScript_16B36B:: @ 816B36B special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 lock faceplayer message Text_1A6211 diff --git a/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc b/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc index 1e6e675f3..d82308203 100644 --- a/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc +++ b/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc @@ -5,11 +5,11 @@ LavenderTown_VolunteerPokemonHouse_EventScript_16B14A:: @ 816B14A lock faceplayer checkflag FLAG_GOT_POKE_FLUTE - goto_if_eq EventScript_16B196 + goto_if TRUE, EventScript_16B196 msgbox gUnknown_81936FF checkitemspace ITEM_POKE_FLUTE, 1 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16B1A0 + goto_if eq, EventScript_16B1A0 setflag FLAG_GOT_POKE_FLUTE additem ITEM_POKE_FLUTE, 1 giveitemfanfaremsg gUnknown_81937BD, ITEM_POKE_FLUTE, 1, MUS_FAN5 @@ -43,7 +43,7 @@ LavenderTown_VolunteerPokemonHouse_EventScript_16B1CC:: @ 816B1CC lock faceplayer checkflag FLAG_RESCUED_MR_FUJI - goto_if_eq EventScript_16B1E1 + goto_if TRUE, EventScript_16B1E1 msgbox gUnknown_81935ED release end diff --git a/data/maps/MtEmber_Exterior/scripts.inc b/data/maps/MtEmber_Exterior/scripts.inc index 7c17eaa54..cea59adfc 100644 --- a/data/maps/MtEmber_Exterior/scripts.inc +++ b/data/maps/MtEmber_Exterior/scripts.inc @@ -26,9 +26,9 @@ EventScript_163975:: @ 8163975 MtEmber_Exterior_EventScript_16397F:: @ 816397F lock checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_43 - goto_if_eq EventScript_16399E + goto_if eq, EventScript_16399E compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4 - goto_if_eq EventScript_1639A8 + goto_if eq, EventScript_1639A8 msgbox gUnknown_817A82A release end @@ -46,7 +46,7 @@ EventScript_1639A8:: @ 81639A8 trainerbattle 3, TRAINER_TEAM_ROCKET_GRUNT_43, 0, Text_17AA34 msgbox gUnknown_817AA3F checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_44 - goto_if_eq EventScript_1639DB + goto_if eq, EventScript_1639DB release end @@ -64,9 +64,9 @@ MtEmber_Exterior_EventScript_1639F0:: @ 81639F0 lock faceplayer checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_44 - goto_if_eq EventScript_163A1B + goto_if eq, EventScript_163A1B compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4 - goto_if_eq EventScript_163A25 + goto_if eq, EventScript_163A25 msgbox gUnknown_817A88C closemessage applymovement 3, Movement_1A75E5 @@ -85,7 +85,7 @@ EventScript_163A25:: @ 8163A25 trainerbattle 3, TRAINER_TEAM_ROCKET_GRUNT_44, 0, Text_17AA8A msgbox gUnknown_817AA99 checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_43 - goto_if_eq EventScript_1639DB + goto_if eq, EventScript_1639DB release end diff --git a/data/maps/MtEmber_Summit/scripts.inc b/data/maps/MtEmber_Summit/scripts.inc index 90816ad4a..2efadb01f 100644 --- a/data/maps/MtEmber_Summit/scripts.inc +++ b/data/maps/MtEmber_Summit/scripts.inc @@ -4,8 +4,8 @@ MtEmber_Summit_MapScripts:: @ 8163AFC .byte 0 MtEmber_Summit_MapScript2_163B07:: @ 8163B07 - checkflag FLAG_0x807 - call_if eq, EventScript_163B11 + checkflag FLAG_SYS_SPECIAL_WILD_BATTLE + call_if TRUE, EventScript_163B11 end EventScript_163B11:: @ 8163B11 @@ -17,7 +17,7 @@ EventScript_163B11:: @ 8163B11 MtEmber_Summit_MapScript1_163B25:: @ 8163B25 checkflag FLAG_0x2BD - call_if lt, EventScript_163B2F + call_if FALSE, EventScript_163B2F end EventScript_163B2F:: @ 8163B2F @@ -27,7 +27,7 @@ EventScript_163B2F:: @ 8163B2F MtEmber_Summit_EventScript_163B33:: @ 8163B33 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 special sub_8112364 lock faceplayer @@ -40,17 +40,17 @@ MtEmber_Summit_EventScript_163B33:: @ 8163B33 delay 10 playbgm MUS_EXEYE, 0 waitbuttonpress - setflag FLAG_0x807 + setflag FLAG_SYS_SPECIAL_WILD_BATTLE special sub_807F9D8 waitstate - clearflag FLAG_0x807 + clearflag FLAG_SYS_SPECIAL_WILD_BATTLE specialvar VAR_RESULT, sub_80CA74C compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_163B96 + goto_if eq, EventScript_163B96 compare_var_to_value VAR_RESULT, 4 - goto_if_eq EventScript_163B9F + goto_if eq, EventScript_163B9F compare_var_to_value VAR_RESULT, 5 - goto_if_eq EventScript_163B9F + goto_if eq, EventScript_163B9F setflag FLAG_0x2BD release end diff --git a/data/maps/MtMoon_B2F/scripts.inc b/data/maps/MtMoon_B2F/scripts.inc index b8a4d1efb..d1c352d9a 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 lt, EventScript_1606A9 + call_if FALSE, EventScript_1606A9 end EventScript_1606A9:: @ 81606A9 @@ -24,9 +24,9 @@ MtMoon_B2F_EventScript_1606C2:: @ 81606C2 lock faceplayer checkflag FLAG_GOT_FOSSIL_FROM_MT_MOON - goto_if_eq EventScript_160707 + goto_if TRUE, EventScript_160707 checktrainerflag TRAINER_SUPER_NERD_MIGUEL - goto_if_eq EventScript_160711 + goto_if eq, EventScript_160711 call EventScript_1606DD release end @@ -58,7 +58,7 @@ MtMoon_B2F_EventScript_16071B:: @ 816071B faceplayer msgbox gUnknown_8172E77, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_1607DE + goto_if eq, EventScript_1607DE removeobject 1 additem ITEM_DOME_FOSSIL, 1 giveitemfanfaremsg gUnknown_8172ECD, ITEM_DOME_FOSSIL, 1, MUS_FAN5 @@ -91,7 +91,7 @@ MtMoon_B2F_EventScript_16077F:: @ 816077F faceplayer msgbox gUnknown_8172E94, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_1607DE + goto_if eq, EventScript_1607DE removeobject 2 additem ITEM_HELIX_FOSSIL, 1 giveitemfanfaremsg gUnknown_8172EB2, ITEM_HELIX_FOSSIL, 1, MUS_FAN5 diff --git a/data/maps/NavelRock_Base/scripts.inc b/data/maps/NavelRock_Base/scripts.inc index c36118bb4..de75b32f8 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 eq, EventScript_165105 + call_if TRUE, EventScript_165105 checkflag FLAG_0x2F2 - call_if lt, EventScript_165109 + call_if FALSE, EventScript_165109 end EventScript_165105:: @ 8165105 @@ -16,13 +16,13 @@ EventScript_165105:: @ 8165105 EventScript_165109:: @ 8165109 checkflag FLAG_0x2F5 - goto_if_eq EventScript_1A77A9 + goto_if TRUE, EventScript_1A77A9 clearflag FLAG_HIDE_LUGIA return NavelRock_Base_MapScript2_165116:: @ 8165116 - checkflag FLAG_0x807 - call_if eq, EventScript_165120 + checkflag FLAG_SYS_SPECIAL_WILD_BATTLE + call_if TRUE, EventScript_165120 end EventScript_165120:: @ 8165120 @@ -35,7 +35,7 @@ EventScript_165120:: @ 8165120 NavelRock_Base_EventScript_165134:: @ 8165134 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 special sub_8112364 lock faceplayer @@ -64,17 +64,17 @@ NavelRock_Base_EventScript_165134:: @ 8165134 setvar VAR_0x8005, 70 setvar VAR_0x8006, 0 special CreateObedientEnemyMon - setflag FLAG_0x807 + setflag FLAG_SYS_SPECIAL_WILD_BATTLE special sub_807F9D8 waitstate - clearflag FLAG_0x807 + clearflag FLAG_SYS_SPECIAL_WILD_BATTLE specialvar VAR_RESULT, sub_80CA74C compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_1651D9 + goto_if eq, EventScript_1651D9 compare_var_to_value VAR_RESULT, 4 - goto_if_eq EventScript_1651E7 + goto_if eq, EventScript_1651E7 compare_var_to_value VAR_RESULT, 5 - goto_if_eq EventScript_1651E7 + goto_if eq, EventScript_1651E7 setflag FLAG_0x2F2 release end diff --git a/data/maps/NavelRock_Summit/scripts.inc b/data/maps/NavelRock_Summit/scripts.inc index 250334b91..d86d5f2f1 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 eq, EventScript_164FBD + call_if TRUE, EventScript_164FBD checkflag FLAG_0x2F3 - call_if lt, EventScript_164FC6 + call_if FALSE, EventScript_164FC6 end EventScript_164FBD:: @ 8164FBD @@ -18,14 +18,14 @@ EventScript_164FBD:: @ 8164FBD EventScript_164FC6:: @ 8164FC6 setvar VAR_0x4001, 1 checkflag FLAG_0x2F6 - goto_if_eq EventScript_1A77A9 + goto_if TRUE, EventScript_1A77A9 setvar VAR_0x4001, 0 clearflag FLAG_HIDE_HO_OH return NavelRock_Summit_MapScript2_164FDD:: @ 8164FDD - checkflag FLAG_0x807 - call_if eq, EventScript_164FE7 + checkflag FLAG_SYS_SPECIAL_WILD_BATTLE + call_if TRUE, EventScript_164FE7 end EventScript_164FE7:: @ 8164FE7 @@ -38,7 +38,7 @@ EventScript_164FE7:: @ 8164FE7 NavelRock_Summit_EventScript_164FFB:: @ 8164FFB special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 special sub_8112364 lockall setvar VAR_0x4001, 1 @@ -68,18 +68,18 @@ NavelRock_Summit_EventScript_164FFB:: @ 8164FFB setvar VAR_0x8005, 70 setvar VAR_0x8006, 0 special CreateObedientEnemyMon - setflag FLAG_0x807 + setflag FLAG_SYS_SPECIAL_WILD_BATTLE special sub_807F9D8 waitstate - clearflag FLAG_0x807 + clearflag FLAG_SYS_SPECIAL_WILD_BATTLE setvar VAR_LAST_TALKED, 1 specialvar VAR_RESULT, sub_80CA74C compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_1650B4 + goto_if eq, EventScript_1650B4 compare_var_to_value VAR_RESULT, 4 - goto_if_eq EventScript_1650C2 + goto_if eq, EventScript_1650C2 compare_var_to_value VAR_RESULT, 5 - goto_if_eq EventScript_1650C2 + goto_if eq, EventScript_1650C2 setflag FLAG_0x2F3 releaseall end diff --git a/data/maps/OneIsland/scripts.inc b/data/maps/OneIsland/scripts.inc index 540980a3e..5e1dcb9ec 100644 --- a/data/maps/OneIsland/scripts.inc +++ b/data/maps/OneIsland/scripts.inc @@ -84,9 +84,9 @@ OneIsland_EventScript_167517:: @ 8167517 lock faceplayer checkflag FLAG_0x844 - goto_if_eq EventScript_16753F + goto_if TRUE, EventScript_16753F checkflag FLAG_0x2A1 - goto_if_eq EventScript_167535 + goto_if TRUE, EventScript_167535 msgbox gUnknown_818174E release end diff --git a/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc b/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc index 11020d99e..7237adfd3 100644 --- a/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc +++ b/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc @@ -29,7 +29,7 @@ OneIsland_KindleRoad_EmberSpa_EventScript_165399:: @ 8165399 lock faceplayer checkflag FLAG_0x2EF - goto_if_eq EventScript_1653C5 + goto_if TRUE, EventScript_1653C5 msgbox gUnknown_817D622 giveitem ITEM_HM06 setflag FLAG_0x2EF diff --git a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc index d325b9010..8e01f86e3 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc @@ -9,7 +9,7 @@ OneIsland_PokemonCenter_1F_MapScript3_170C0D:: @ 8170C0D compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 call_if ge, EventScript_170C22 checkflag FLAG_0x844 - call_if eq, EventScript_170C36 + call_if TRUE, EventScript_170C36 end EventScript_170C22:: @ 8170C22 @@ -85,9 +85,9 @@ EventScript_170CB1:: @ 8170CB1 applymovement 255, Movement_1A75EB waitmovement 0 checkflag FLAG_SYS_GAME_CLEAR - call_if eq, EventScript_170E34 + call_if TRUE, EventScript_170E34 checkflag FLAG_SYS_GAME_CLEAR - call_if lt, EventScript_170E3D + call_if FALSE, EventScript_170E3D applymovement 3, Movement_1A75ED waitmovement 0 msgbox gUnknown_81A0E17 @@ -193,7 +193,7 @@ OneIsland_PokemonCenter_1F_EventScript_170E94:: @ 8170E94 OneIsland_PokemonCenter_1F_EventScript_170E9D:: @ 8170E9D lock checkflag FLAG_0x2A1 - goto_if_eq EventScript_170EB1 + goto_if TRUE, EventScript_170EB1 msgbox gUnknown_81A1266 release end @@ -209,22 +209,22 @@ OneIsland_PokemonCenter_1F_EventScript_170EC5:: @ 8170EC5 lock faceplayer compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 7 - goto_if_eq EventScript_170F35 + goto_if eq, EventScript_170F35 compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 6 - goto_if_eq EventScript_170F9B + goto_if eq, EventScript_170F9B checkflag FLAG_0x2DC - goto_if_eq EventScript_170FA5 + goto_if TRUE, EventScript_170FA5 compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 - goto_if_eq EventScript_17103A + goto_if eq, EventScript_17103A checkflag FLAG_0x2DD - goto_if_eq EventScript_171044 + goto_if TRUE, EventScript_171044 compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4 - goto_if_eq EventScript_1710F2 + goto_if eq, EventScript_1710F2 specialvar VAR_RESULT, IsNationalPokedexEnabled compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_1710FC + goto_if eq, EventScript_1710FC compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 3 - goto_if_eq EventScript_171134 + goto_if eq, EventScript_171134 msgbox gUnknown_81A1321 closemessage applymovement 3, Movement_1A75E5 @@ -236,9 +236,9 @@ EventScript_170F35:: @ 8170F35 msgbox gUnknown_81A1EBD random 3 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_170F6D + goto_if eq, EventScript_170F6D compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_170F84 + goto_if eq, EventScript_170F84 famechecker FAMECHECKER_BILL, 5 msgbox gUnknown_81A2076 release @@ -325,14 +325,14 @@ EventScript_171044:: @ 8171044 waitmovement 0 msgbox gUnknown_81A19AA, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_171099 + goto_if eq, EventScript_171099 goto EventScript_1710B2 end EventScript_171099:: @ 8171099 msgbox gUnknown_81A1A08, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_171099 + goto_if eq, EventScript_171099 goto EventScript_1710B2 end @@ -405,7 +405,7 @@ OneIsland_PokemonCenter_1F_EventScript_17115A:: @ 817115A lock faceplayer checkflag FLAG_0x844 - goto_if_eq EventScript_17116F + goto_if TRUE, EventScript_17116F msgbox gUnknown_81A218D release end @@ -418,9 +418,9 @@ EventScript_17116F:: @ 817116F OneIsland_PokemonCenter_1F_EventScript_171179:: @ 8171179 lockall checkflag FLAG_0x844 - goto_if_eq EventScript_1711A0 + goto_if TRUE, EventScript_1711A0 checkflag FLAG_0x2A1 - goto_if_eq EventScript_171196 + goto_if TRUE, EventScript_171196 msgbox gUnknown_81A223F releaseall end diff --git a/data/maps/PalletTown/scripts.inc b/data/maps/PalletTown/scripts.inc index 860b6e508..e04a0aa59 100644 --- a/data/maps/PalletTown/scripts.inc +++ b/data/maps/PalletTown/scripts.inc @@ -6,7 +6,7 @@ PalletTown_MapScripts:: @ 816545A PalletTown_MapScript1_165465:: @ 8165465 setworldmapflag FLAG_WORLD_MAP_PALLET_TOWN checkflag FLAG_0x291 - call_if eq, EventScript_165488 + call_if TRUE, EventScript_165488 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 0 call_if eq, EventScript_1654A8 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1 @@ -15,7 +15,7 @@ PalletTown_MapScript1_165465:: @ 8165465 EventScript_165488:: @ 8165488 checkflag FLAG_PALLET_TOWN_LADY_MOVED_FROM_SIGN - goto_if lt, EventScript_1A77A9 + goto_if FALSE, EventScript_1A77A9 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1 goto_if ge, EventScript_1A77A9 setvar VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1 @@ -27,7 +27,7 @@ EventScript_1654A2:: @ 81654A2 EventScript_1654A8:: @ 81654A8 checkflag FLAG_0x291 - goto_if_eq EventScript_1654BD + goto_if TRUE, EventScript_1654BD setobjectxyperm 1, 5, 15 setobjectmovementtype 1, 7 return @@ -51,7 +51,7 @@ EventScript_1654D8:: @ 81654D8 applymovement 3, Movement_1655AF waitmovement 0 checkflag FLAG_WORLD_MAP_ONE_ISLAND - goto_if lt, EventScript_1655A1 + goto_if FALSE, EventScript_1655A1 msgbox gUnknown_817D8BF setvar VAR_0x8004, 0 specialvar VAR_RESULT, Special_GetPokedexCount @@ -375,13 +375,13 @@ Movement_165758:: @ 8165758 PalletTown_EventScript_16575C:: @ 816575C lock compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 2 - goto_if_eq EventScript_1657ED + goto_if eq, EventScript_1657ED compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1 - goto_if_eq EventScript_165815 + goto_if eq, EventScript_165815 compare_var_to_value VAR_0x4002, 1 - goto_if_eq EventScript_1658C2 + goto_if eq, EventScript_1658C2 checkflag FLAG_TEMP_2 - goto_if_eq EventScript_165801 + goto_if TRUE, EventScript_165801 msgbox gUnknown_81B1C8B applymovement 1, Movement_1A75E1 waitmovement 0 diff --git a/data/maps/PalletTown_GarysHouse/scripts.inc b/data/maps/PalletTown_GarysHouse/scripts.inc index e01aea334..9693bebf4 100644 --- a/data/maps/PalletTown_GarysHouse/scripts.inc +++ b/data/maps/PalletTown_GarysHouse/scripts.inc @@ -23,13 +23,13 @@ PalletTown_GarysHouse_EventScript_168D56:: @ 8168D56 faceplayer famechecker FAMECHECKER_DAISY, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 checkflag FLAG_SYS_GAME_CLEAR - goto_if_eq EventScript_168DB9 + goto_if TRUE, EventScript_168DB9 compare_var_to_value VAR_0x4001, 1 - goto_if_eq EventScript_168EEC + goto_if eq, EventScript_168EEC compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 - goto_if_eq EventScript_168F59 + goto_if eq, EventScript_168F59 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 1 - goto_if_eq EventScript_168EF6 + goto_if eq, EventScript_168EF6 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1 goto_if ge, EventScript_168DAF msgbox gUnknown_818D58C @@ -47,13 +47,13 @@ EventScript_168DAF:: @ 8168DAF EventScript_168DB9:: @ 8168DB9 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 special sub_8112364 compare_var_to_value VAR_0x4025, 500 goto_if lt, EventScript_168E46 msgbox gUnknown_818D7D3, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_168E3C + goto_if eq, EventScript_168E3C msgbox gUnknown_818D8B2 special sub_80BF8FC waitstate @@ -63,7 +63,7 @@ EventScript_168DB9:: @ 8168DB9 goto_if ge, EventScript_168E3C specialvar VAR_RESULT, sub_80CAD54 compare_var_to_value VAR_RESULT, SPECIES_EGG - goto_if_eq EventScript_168E32 + goto_if eq, EventScript_168E32 msgbox gUnknown_818D8CC closemessage fadescreen 1 @@ -144,7 +144,7 @@ EventScript_168EF6:: @ 8168EF6 closemessage checkitemspace ITEM_TOWN_MAP, 1 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_168F4F + goto_if eq, EventScript_168F4F applymovement 1, Movement_1A75EB waitmovement 0 removeobject 2 diff --git a/data/maps/PalletTown_PlayersHouse_1F/scripts.inc b/data/maps/PalletTown_PlayersHouse_1F/scripts.inc index e988c9c9c..7fb067cdf 100644 --- a/data/maps/PalletTown_PlayersHouse_1F/scripts.inc +++ b/data/maps/PalletTown_PlayersHouse_1F/scripts.inc @@ -4,8 +4,8 @@ PalletTown_PlayersHouse_1F_MapScripts:: @ 8168C08 PalletTown_PlayersHouse_1F_EventScript_168C09:: @ 8168C09 lock faceplayer - checkflag FLAG_0x258 - goto_if_eq EventScript_168C4A + checkflag FLAG_BEAT_RIVAL_IN_OAKS_LAB + goto_if TRUE, EventScript_168C4A checkplayergender compare_var_to_value VAR_RESULT, 0 call_if eq, EventScript_168C38 @@ -36,7 +36,7 @@ EventScript_168C4A:: @ 8168C4A PalletTown_PlayersHouse_1F_EventScript_168C62:: @ 8168C62 lockall compare_var_to_value VAR_FACING, 2 - goto_if_eq EventScript_168C78 + goto_if eq, EventScript_168C78 msgbox gUnknown_818D4F9 releaseall end diff --git a/data/maps/PalletTown_PlayersHouse_2F/scripts.inc b/data/maps/PalletTown_PlayersHouse_2F/scripts.inc index 3b7d6876f..80249e6c4 100644 --- a/data/maps/PalletTown_PlayersHouse_2F/scripts.inc +++ b/data/maps/PalletTown_PlayersHouse_2F/scripts.inc @@ -33,7 +33,7 @@ gUnknown_8168CE4:: @ 8168CE4 PalletTown_PlayersHouse_2F_EventScript_168CE4:: @ 8168CE4 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 lockall setvar VAR_0x8004, 32 special Special_SetSomeVariable diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc index 865b72335..2d35fa445 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc +++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc @@ -13,7 +13,7 @@ PalletTown_ProfessorOaksLab_MapScript1_168F8E:: @ 8168F8E compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 8 call_if eq, EventScript_168FC0 checkflag FLAG_GOT_POKEBALLS_FROM_OAK_AFTER_22_RIVAL - call_if eq, EventScript_168FBC + call_if TRUE, EventScript_168FBC end EventScript_168FBC:: @ 8168FBC @@ -312,20 +312,20 @@ EventScript_16930B:: @ 816930B applymovement 4, Movement_1A75F1 waitmovement 0 compare_var_to_value VAR_STARTER_MON, 0 - goto_if_eq EventScript_1693D2 + goto_if eq, EventScript_1693D2 compare_var_to_value VAR_STARTER_MON, 1 - goto_if_eq EventScript_16944D + goto_if eq, EventScript_16944D compare_var_to_value VAR_STARTER_MON, 2 - goto_if_eq EventScript_16935A + goto_if eq, EventScript_16935A end EventScript_16935A:: @ 816935A compare_var_to_value VAR_0x4002, 1 - goto_if_eq EventScript_16937C + goto_if eq, EventScript_16937C compare_var_to_value VAR_0x4002, 2 - goto_if_eq EventScript_16938C + goto_if eq, EventScript_16938C compare_var_to_value VAR_0x4002, 3 - goto_if_eq EventScript_16939C + goto_if eq, EventScript_16939C end EventScript_16937C:: @ 816937C @@ -377,11 +377,11 @@ Movement_1693CD:: @ 81693CD EventScript_1693D2:: @ 81693D2 compare_var_to_value VAR_0x4002, 1 - goto_if_eq EventScript_1693F4 + goto_if eq, EventScript_1693F4 compare_var_to_value VAR_0x4002, 2 - goto_if_eq EventScript_169404 + goto_if eq, EventScript_169404 compare_var_to_value VAR_0x4002, 3 - goto_if_eq EventScript_169414 + goto_if eq, EventScript_169414 end EventScript_1693F4:: @ 81693F4 @@ -436,11 +436,11 @@ Movement_169447:: @ 8169447 EventScript_16944D:: @ 816944D compare_var_to_value VAR_0x4002, 1 - goto_if_eq EventScript_16946F + goto_if eq, EventScript_16946F compare_var_to_value VAR_0x4002, 2 - goto_if_eq EventScript_16947F + goto_if eq, EventScript_16947F compare_var_to_value VAR_0x4002, 3 - goto_if_eq EventScript_16948F + goto_if eq, EventScript_16948F end EventScript_16946F:: @ 816946F @@ -502,7 +502,7 @@ EventScript_1694C2:: @ 81694C2 playse SE_KAIDAN fadedefaultbgm setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 4 - setflag FLAG_0x258 + setflag FLAG_BEAT_RIVAL_IN_OAKS_LAB releaseall end @@ -575,9 +575,9 @@ PalletTown_ProfessorOaksLab_EventScript_16955F:: @ 816955F lock faceplayer compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 - goto_if_eq EventScript_16958B + goto_if eq, EventScript_16958B compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2 - goto_if_eq EventScript_169581 + goto_if eq, EventScript_169581 msgbox gUnknown_818DC67 release end @@ -596,23 +596,23 @@ PalletTown_ProfessorOaksLab_EventScript_169595:: @ 8169595 lock faceplayer checkflag FLAG_TEMP_2 - goto_if_eq EventScript_169600 + goto_if TRUE, EventScript_169600 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 9 - goto_if_eq EventScript_169903 + goto_if eq, EventScript_169903 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 8 - goto_if_eq EventScript_169A6E + goto_if eq, EventScript_169A6E checkflag FLAG_SYS_GAME_CLEAR - goto_if_eq EventScript_1699CE + goto_if TRUE, EventScript_1699CE compare_var_to_value VAR_MAP_SCENE_CERULEAN_CITY_RIVAL, 1 - goto_if_eq EventScript_169903 + goto_if eq, EventScript_169903 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 6 - goto_if_eq EventScript_1698D6 + goto_if eq, EventScript_1698D6 compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 1 goto_if ge, EventScript_16961E compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 4 - goto_if_eq EventScript_169614 + goto_if eq, EventScript_169614 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 - goto_if_eq EventScript_16960A + goto_if eq, EventScript_16960A msgbox gUnknown_818E116 release end @@ -840,14 +840,14 @@ EventScript_1698D6:: @ 81698D6 getnumberstring 0, VAR_0x8008 getnumberstring 1, VAR_0x8009 compare_var_to_value VAR_0x8009, 1 - goto_if_eq EventScript_1699FB + goto_if eq, EventScript_1699FB goto EventScript_169903 end EventScript_169903:: @ 8169903 call EventScript_1A737B checkflag FLAG_0x2F4 - goto_if_eq EventScript_169913 + goto_if TRUE, EventScript_169913 release end @@ -973,7 +973,7 @@ EventScript_1699CE:: @ 81699CE compare_var_to_value VAR_0x8009, 60 goto_if lt, EventScript_1699F9 checkflag FLAG_WORLD_MAP_ONE_ISLAND - goto_if lt, EventScript_1699F9 + goto_if FALSE, EventScript_1699F9 delay 30 msgbox gUnknown_818EDF5 goto EventScript_169035 @@ -986,15 +986,15 @@ EventScript_1699F9:: @ 81699F9 EventScript_1699FB:: @ 81699FB special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 special sub_8112364 checkflag FLAG_OAK_SKIP_22_RIVAL_CHECK - goto_if_eq EventScript_169A6E + goto_if TRUE, EventScript_169A6E checkflag FLAG_GOT_POKEBALLS_FROM_OAK_AFTER_22_RIVAL - goto_if_eq EventScript_169A78 + goto_if TRUE, EventScript_169A78 checkitem ITEM_POKE_BALL, 1 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_169A34 + goto_if eq, EventScript_169A34 goto EventScript_169A6E end @@ -1156,7 +1156,7 @@ PalletTown_ProfessorOaksLab_EventScript_169BAB:: @ 8169BAB compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 goto_if ge, EventScript_169DE4 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2 - goto_if_eq EventScript_169BE1 + goto_if eq, EventScript_169BE1 msgbox gUnknown_818EA19 release end @@ -1167,35 +1167,35 @@ EventScript_169BE1:: @ 8169BE1 drawmonpic VAR_OAKSLAB_PLAYER_STARTER_SPECIES, 10, 3 textcolor 0 compare_var_to_value VAR_OAKSLAB_PLAYER_STARTER_NO, 0 - goto_if_eq EventScript_OakDescribesBulbasaur + goto_if eq, EventScript_OakDescribesBulbasaur compare_var_to_value VAR_OAKSLAB_PLAYER_STARTER_NO, 1 - goto_if_eq EventScript_OakDescribesCharmander + goto_if eq, EventScript_OakDescribesCharmander compare_var_to_value VAR_OAKSLAB_PLAYER_STARTER_NO, 2 - goto_if_eq EventScript_OakDescribesSquirtle + goto_if eq, EventScript_OakDescribesSquirtle end EventScript_OakDescribesBulbasaur:: @ 8169C14 msgbox gUnknown_818E272, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_ThisPokeIsRealyEnergetic + goto_if eq, EventScript_ThisPokeIsRealyEnergetic compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_DeclinedStarter + goto_if eq, EventScript_DeclinedStarter end EventScript_OakDescribesCharmander:: @ 8169C33 msgbox gUnknown_818E207, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_ThisPokeIsRealyEnergetic + goto_if eq, EventScript_ThisPokeIsRealyEnergetic compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_DeclinedStarter + goto_if eq, EventScript_DeclinedStarter end EventScript_OakDescribesSquirtle:: @ 8169C52 msgbox gUnknown_818E194, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_ThisPokeIsRealyEnergetic + goto_if eq, EventScript_ThisPokeIsRealyEnergetic compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_DeclinedStarter + goto_if eq, EventScript_DeclinedStarter end EventScript_DeclinedStarter:: @ 8169C71 @@ -1219,9 +1219,9 @@ EventScript_ThisPokeIsRealyEnergetic:: @ 8169C74 waitfanfare msgbox gUnknown_81A56A7, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_GiveNicknameToStarter + goto_if eq, EventScript_GiveNicknameToStarter compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_SkipGiveNicknameToStarter + goto_if eq, EventScript_SkipGiveNicknameToStarter end EventScript_GiveNicknameToStarter:: @ 8169CCC @@ -1233,11 +1233,11 @@ EventScript_GiveNicknameToStarter:: @ 8169CCC EventScript_SkipGiveNicknameToStarter:: @ 8169CDC closemessage compare_var_to_value VAR_OAKSLAB_PLAYER_STARTER_NO, 0 - goto_if_eq EventScript_RivalWalksToCharmander + goto_if eq, EventScript_RivalWalksToCharmander compare_var_to_value VAR_OAKSLAB_PLAYER_STARTER_NO, 1 - goto_if_eq EventScript_RivalWalksToSquirtle + goto_if eq, EventScript_RivalWalksToSquirtle compare_var_to_value VAR_OAKSLAB_PLAYER_STARTER_NO, 2 - goto_if_eq EventScript_RivalWalksToBulbasaur + goto_if eq, EventScript_RivalWalksToBulbasaur end EventScript_RivalWalksToCharmander:: @ 8169CFF @@ -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 eq, EventScript_169D5C + call_if TRUE, EventScript_169D5C release end @@ -1316,7 +1316,7 @@ PalletTown_ProfessorOaksLab_EventScript_169D78:: @ 8169D78 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 goto_if ge, EventScript_169DE4 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2 - goto_if_eq EventScript_169BE1 + goto_if eq, EventScript_169BE1 msgbox gUnknown_818EA19 release end @@ -1331,7 +1331,7 @@ PalletTown_ProfessorOaksLab_EventScript_169DAE:: @ 8169DAE compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 goto_if ge, EventScript_169DE4 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2 - goto_if_eq EventScript_169BE1 + goto_if eq, EventScript_169BE1 msgbox gUnknown_818EA19 release end @@ -1345,7 +1345,7 @@ PalletTown_ProfessorOaksLab_EventScript_169DEE:: @ 8169DEE lock faceplayer checkflag FLAG_SYS_GAME_CLEAR - goto_if_eq EventScript_169E03 + goto_if TRUE, EventScript_169E03 msgbox gUnknown_818EBE6 release end @@ -1360,7 +1360,7 @@ PalletTown_ProfessorOaksLab_EventScript_169E1A:: @ 8169E1A lock faceplayer checkflag FLAG_SYS_GAME_CLEAR - goto_if_eq EventScript_169E2F + goto_if TRUE, EventScript_169E2F msgbox gUnknown_818EBE6 release end diff --git a/data/maps/PewterCity/scripts.inc b/data/maps/PewterCity/scripts.inc index 6e50aefda..e54b01b96 100644 --- a/data/maps/PewterCity/scripts.inc +++ b/data/maps/PewterCity/scripts.inc @@ -1033,7 +1033,7 @@ PewterCity_EventScript_16607E:: @ 816607E faceplayer msgbox gUnknown_817E53E, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_166136 + goto_if eq, EventScript_166136 msgbox gUnknown_817E589 closemessage delay 10 @@ -1352,7 +1352,7 @@ PewterCity_EventScript_166244:: @ 8166244 faceplayer msgbox gUnknown_817E602, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_166263 + goto_if eq, EventScript_166263 msgbox gUnknown_817E644 release end diff --git a/data/maps/PewterCity_Gym/scripts.inc b/data/maps/PewterCity_Gym/scripts.inc index 96982e762..2fa16ed99 100644 --- a/data/maps/PewterCity_Gym/scripts.inc +++ b/data/maps/PewterCity_Gym/scripts.inc @@ -4,8 +4,8 @@ PewterCity_Gym_MapScripts:: @ 816A592 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 lt, EventScript_16A5F3 + checkflag FLAG_GOT_TM39_FROM_BROCK + goto_if FALSE, EventScript_16A5F3 msgbox gUnknown_819110F release end @@ -25,10 +25,10 @@ EventScript_16A5F3:: @ 816A5F3 msgbox gUnknown_8190FC1 checkitemspace ITEM_TM39, 1 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16A634 + goto_if eq, EventScript_16A634 additem ITEM_TM39, 1 giveitemfanfaremsg gUnknown_8190FDB, ITEM_TM39 - setflag FLAG_0x254 + setflag FLAG_GOT_TM39_FROM_BROCK msgbox gUnknown_8190FF8 release end @@ -47,12 +47,12 @@ PewterCity_Gym_EventScript_16A655:: @ 816A655 lock faceplayer checkflag FLAG_DEFEATED_BROCK - goto_if_eq EventScript_16A67F + goto_if TRUE, EventScript_16A67F msgbox gUnknown_8191298, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16A689 + goto_if eq, EventScript_16A689 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16A697 + goto_if eq, EventScript_16A697 end EventScript_16A67F:: @ 816A67F @@ -78,7 +78,7 @@ EventScript_16A6A5:: @ 816A6A5 PewterCity_Gym_EventScript_16A6AF:: @ 816A6AF lockall checkflag FLAG_BADGE01_GET - goto_if_eq EventScript_16A6C3 + goto_if TRUE, EventScript_16A6C3 msgbox gUnknown_819146E releaseall end diff --git a/data/maps/PewterCity_Mart/scripts.inc b/data/maps/PewterCity_Mart/scripts.inc index 9e6fc4375..e45959442 100644 --- a/data/maps/PewterCity_Mart/scripts.inc +++ b/data/maps/PewterCity_Mart/scripts.inc @@ -12,7 +12,7 @@ PewterCity_Mart_EventScript_16A6D7:: @ 816A6D7 PewterCity_Mart_EventScript_16A6E0:: @ 816A6E0 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 lock faceplayer message Text_1A6211 diff --git a/data/maps/PewterCity_Museum_1F/scripts.inc b/data/maps/PewterCity_Museum_1F/scripts.inc index 75bb76b8e..8a3bdd640 100644 --- a/data/maps/PewterCity_Museum_1F/scripts.inc +++ b/data/maps/PewterCity_Museum_1F/scripts.inc @@ -5,11 +5,11 @@ PewterCity_Museum_1F_EventScript_16A31B:: @ 816A31B lock faceplayer compare_var_to_value VAR_FACING, 3 - goto_if_eq EventScript_16A348 + goto_if eq, EventScript_16A348 compare_var_to_value VAR_FACING, 1 - goto_if_eq EventScript_16A348 + goto_if eq, EventScript_16A348 compare_var_to_value VAR_FACING, 2 - goto_if_eq EventScript_16A348 + goto_if eq, EventScript_16A348 msgbox gUnknown_8190539 release end @@ -17,9 +17,9 @@ PewterCity_Museum_1F_EventScript_16A31B:: @ 816A31B EventScript_16A348:: @ 816A348 msgbox gUnknown_8190550, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16A367 + goto_if eq, EventScript_16A367 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16A37B + goto_if eq, EventScript_16A37B end EventScript_16A367:: @ 816A367 @@ -65,7 +65,7 @@ EventScript_16A3D1:: @ 816A3D1 showmoneybox 0, 0, 0 msgbox gUnknown_81904B5, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16A402 + goto_if eq, EventScript_16A402 msgbox gUnknown_81904F9 closemessage hidemoneybox @@ -79,7 +79,7 @@ EventScript_16A3D1:: @ 816A3D1 EventScript_16A402:: @ 816A402 checkmoney 50, 0 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16A476 + goto_if eq, EventScript_16A476 closemessage compare_var_to_value VAR_0x4001, 0 call_if eq, EventScript_16A455 @@ -158,13 +158,13 @@ PewterCity_Museum_1F_EventScript_16A4A5:: @ 816A4A5 PewterCity_Museum_1F_EventScript_16A4AE:: @ 816A4AE lock faceplayer - checkflag FLAG_0x25E - goto_if_eq EventScript_16A4FF + checkflag FLAG_GOT_OLD_AMBER + goto_if TRUE, EventScript_16A4FF msgbox gUnknown_8190717 checkitemspace ITEM_OLD_AMBER, 1 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16A4F5 - setflag FLAG_0x25E + goto_if eq, EventScript_16A4F5 + setflag FLAG_GOT_OLD_AMBER removeobject 4 additem ITEM_OLD_AMBER, 1 giveitemfanfaremsg gUnknown_8190866, ITEM_OLD_AMBER, 1, MUS_FAN5 diff --git a/data/maps/PokemonLeague_AgathasRoom/scripts.inc b/data/maps/PokemonLeague_AgathasRoom/scripts.inc index f06e28e73..d1b64a632 100644 --- a/data/maps/PokemonLeague_AgathasRoom/scripts.inc +++ b/data/maps/PokemonLeague_AgathasRoom/scripts.inc @@ -12,7 +12,7 @@ PokemonLeague_AgathasRoom_MapScript1_162825:: @ 8162825 PokemonLeague_AgathasRoom_MapScript2_162830:: @ 8162830 checkflag FLAG_DEFEATED_AGATHA - call_if eq, EventScript_16284B + call_if TRUE, EventScript_16284B compare_var_to_value VAR_MAP_SCENE_POKEMON_LEAGUE, 3 call_if eq, EventScript_162845 end @@ -49,20 +49,20 @@ PokemonLeague_AgathasRoom_EventScript_162877:: @ 8162877 faceplayer famechecker FAMECHECKER_AGATHA, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 checkflag FLAG_DEFEATED_AGATHA - goto_if_eq EventScript_162911 + goto_if TRUE, EventScript_162911 famechecker FAMECHECKER_AGATHA, 0 famechecker FAMECHECKER_AGATHA, 4 famechecker FAMECHECKER_OAK, 4 checkflag FLAG_SYS_GAME_CLEAR - call_if lt, EventScript_1628E9 + call_if FALSE, EventScript_1628E9 checkflag FLAG_SYS_GAME_CLEAR - call_if eq, EventScript_1628F2 + call_if TRUE, EventScript_1628F2 setflag FLAG_TEMP_3 setflag FLAG_TEMP_5 checkflag FLAG_0x844 - call_if lt, EventScript_1628FB + call_if FALSE, EventScript_1628FB checkflag FLAG_0x844 - call_if eq, EventScript_162906 + call_if TRUE, 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 a6196699f..e3b080c14 100644 --- a/data/maps/PokemonLeague_BrunosRoom/scripts.inc +++ b/data/maps/PokemonLeague_BrunosRoom/scripts.inc @@ -12,7 +12,7 @@ PokemonLeague_BrunosRoom_MapScript1_16269A:: @ 816269A PokemonLeague_BrunosRoom_MapScript2_1626A5:: @ 81626A5 checkflag FLAG_DEFEATED_BRUNO - call_if eq, EventScript_1626C0 + call_if TRUE, EventScript_1626C0 compare_var_to_value VAR_MAP_SCENE_POKEMON_LEAGUE, 2 call_if eq, EventScript_1626BA end @@ -49,19 +49,19 @@ PokemonLeague_BrunosRoom_EventScript_1626EC:: @ 81626EC faceplayer famechecker FAMECHECKER_BRUNO, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 checkflag FLAG_DEFEATED_BRUNO - goto_if_eq EventScript_162779 + goto_if TRUE, EventScript_162779 famechecker FAMECHECKER_BRUNO, 0 famechecker FAMECHECKER_BRUNO, 1 checkflag FLAG_SYS_GAME_CLEAR - call_if lt, EventScript_162751 + call_if FALSE, EventScript_162751 checkflag FLAG_SYS_GAME_CLEAR - call_if eq, EventScript_16275A + call_if TRUE, EventScript_16275A setflag FLAG_TEMP_3 setflag FLAG_TEMP_5 checkflag FLAG_0x844 - call_if lt, EventScript_162763 + call_if FALSE, EventScript_162763 checkflag FLAG_0x844 - call_if eq, EventScript_16276E + call_if TRUE, EventScript_16276E clearflag FLAG_TEMP_5 goto EventScript_1627B0 diff --git a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc index 61e86d7c7..11d9cefb9 100644 --- a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc +++ b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc @@ -17,23 +17,23 @@ PokemonLeague_ChampionsRoom_MapScript2_162AF2:: @ 8162AF2 EventScript_162B1E:: @ 8162B1E checktrainerflag TRAINER_CHAMPION_TERRY - goto_if_eq EventScript_162B57 + goto_if eq, EventScript_162B57 checktrainerflag TRAINER_CHAMPION_TERRY_4 - goto_if_eq EventScript_162B57 + goto_if eq, EventScript_162B57 return EventScript_162B31:: @ 8162B31 checktrainerflag TRAINER_CHAMPION_TERRY_2 - goto_if_eq EventScript_162B57 + goto_if eq, EventScript_162B57 checktrainerflag TRAINER_CHAMPION_TERRY_5 - goto_if_eq EventScript_162B57 + goto_if eq, EventScript_162B57 return EventScript_162B44:: @ 8162B44 checktrainerflag TRAINER_CHAMPION_TERRY_3 - goto_if_eq EventScript_162B57 + goto_if eq, EventScript_162B57 checktrainerflag TRAINER_CHAMPION_TERRY_6 - goto_if_eq EventScript_162B57 + goto_if eq, EventScript_162B57 return EventScript_162B57:: @ 8162B57 @@ -60,19 +60,19 @@ EventScript_162B76:: @ 8162B76 waitmovement 0 delay 20 checkflag FLAG_SYS_GAME_CLEAR - call_if lt, EventScript_162CB3 + call_if FALSE, EventScript_162CB3 checkflag FLAG_SYS_GAME_CLEAR - call_if eq, EventScript_162CBC + call_if TRUE, EventScript_162CBC special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_162C68 + goto_if eq, EventScript_162C68 setflag FLAG_TEMP_3 setflag FLAG_TEMP_5 savebgm MUS_WIN_GYM checkflag FLAG_0x844 - call_if lt, EventScript_162C6F + call_if FALSE, EventScript_162C6F checkflag FLAG_0x844 - call_if eq, EventScript_162C91 + call_if TRUE, EventScript_162C91 setflag FLAG_TEMP_4 clearflag FLAG_TEMP_5 setflag FLAG_DEFEATED_CHAMP diff --git a/data/maps/PokemonLeague_LancesRoom/scripts.inc b/data/maps/PokemonLeague_LancesRoom/scripts.inc index 723445fb5..caec2e3bb 100644 --- a/data/maps/PokemonLeague_LancesRoom/scripts.inc +++ b/data/maps/PokemonLeague_LancesRoom/scripts.inc @@ -14,7 +14,7 @@ PokemonLeague_LancesRoom_MapScript2_16294D:: @ 816294D compare_var_to_value VAR_MAP_SCENE_POKEMON_LEAGUE, 4 call_if eq, EventScript_162962 checkflag FLAG_DEFEATED_LANCE - call_if eq, EventScript_162968 + call_if TRUE, EventScript_162968 end EventScript_162962:: @ 8162962 @@ -103,19 +103,19 @@ PokemonLeague_LancesRoom_EventScript_162A14:: @ 8162A14 faceplayer famechecker FAMECHECKER_LANCE, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 checkflag FLAG_DEFEATED_LANCE - goto_if_eq EventScript_162AA1 + goto_if TRUE, EventScript_162AA1 famechecker FAMECHECKER_LANCE, 0 famechecker FAMECHECKER_LANCE, 1 checkflag FLAG_SYS_GAME_CLEAR - call_if lt, EventScript_162A79 + call_if FALSE, EventScript_162A79 checkflag FLAG_SYS_GAME_CLEAR - call_if eq, EventScript_162A82 + call_if TRUE, EventScript_162A82 setflag FLAG_TEMP_3 setflag FLAG_TEMP_5 checkflag FLAG_0x844 - call_if lt, EventScript_162A8B + call_if FALSE, EventScript_162A8B checkflag FLAG_0x844 - call_if eq, EventScript_162A96 + call_if TRUE, 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 71f79b865..afc6f9330 100644 --- a/data/maps/PokemonLeague_LoreleisRoom/scripts.inc +++ b/data/maps/PokemonLeague_LoreleisRoom/scripts.inc @@ -13,7 +13,7 @@ PokemonLeague_LoreleisRoom_MapScript1_162586:: @ 8162586 PokemonLeague_LoreleisRoom_MapScript2_162591:: @ 8162591 checkflag FLAG_DEFEATED_LORELEI - call_if eq, EventScript_1625AC + call_if TRUE, EventScript_1625AC compare_var_to_value VAR_MAP_SCENE_POKEMON_LEAGUE, 1 call_if eq, EventScript_1625A6 end @@ -54,19 +54,19 @@ PokemonLeague_LoreleisRoom_EventScript_1625DC:: @ 81625DC faceplayer famechecker FAMECHECKER_LORELEI, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 checkflag FLAG_DEFEATED_LORELEI - goto_if_eq EventScript_162669 + goto_if TRUE, EventScript_162669 famechecker FAMECHECKER_LORELEI, 0 famechecker FAMECHECKER_LORELEI, 1 checkflag FLAG_0x844 - call_if lt, EventScript_162641 + call_if FALSE, EventScript_162641 checkflag FLAG_0x844 - call_if eq, EventScript_16264A + call_if TRUE, EventScript_16264A setflag FLAG_TEMP_3 setflag FLAG_TEMP_5 checkflag FLAG_0x844 - call_if lt, EventScript_162653 + call_if FALSE, EventScript_162653 checkflag FLAG_0x844 - call_if eq, EventScript_16265E + call_if TRUE, 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 0abae5e5c..7e934c833 100644 --- a/data/maps/PokemonMansion_1F/scripts.inc +++ b/data/maps/PokemonMansion_1F/scripts.inc @@ -4,8 +4,8 @@ PokemonMansion_1F_MapScripts:: @ 81621F9 .byte 0 PokemonMansion_1F_MapScript1_162204:: @ 8162204 - checkflag FLAG_0x26C - call_if eq, EventScript_1A7B7A + checkflag FLAG_POKEMON_MANSION_SWITCH_STATE + call_if TRUE, 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 96de39434..aaec8ebfd 100644 --- a/data/maps/PokemonMansion_2F/scripts.inc +++ b/data/maps/PokemonMansion_2F/scripts.inc @@ -3,8 +3,8 @@ PokemonMansion_2F_MapScripts:: @ 8162254 .byte 0 PokemonMansion_2F_MapScript1_16225A:: @ 816225A - checkflag FLAG_0x26C - call_if eq, EventScript_1A7D3E + checkflag FLAG_POKEMON_MANSION_SWITCH_STATE + call_if TRUE, 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 0d1aa8158..27da3d538 100644 --- a/data/maps/PokemonMansion_3F/scripts.inc +++ b/data/maps/PokemonMansion_3F/scripts.inc @@ -3,8 +3,8 @@ PokemonMansion_3F_MapScripts:: @ 81622A1 .byte 0 PokemonMansion_3F_MapScript1_1622A7:: @ 81622A7 - checkflag FLAG_0x26C - call_if eq, EventScript_1A7E72 + checkflag FLAG_POKEMON_MANSION_SWITCH_STATE + call_if TRUE, 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 c9d9123d8..12f8b79e0 100644 --- a/data/maps/PokemonMansion_B1F/scripts.inc +++ b/data/maps/PokemonMansion_B1F/scripts.inc @@ -3,8 +3,8 @@ PokemonMansion_B1F_MapScripts:: @ 81622FC .byte 0 PokemonMansion_B1F_MapScript1_162302:: @ 8162302 - checkflag FLAG_0x26C - call_if eq, EventScript_1A7F4C + checkflag FLAG_POKEMON_MANSION_SWITCH_STATE + call_if TRUE, EventScript_1A7F4C end PokemonMansion_B1F_EventScript_16230C:: @ 816230C diff --git a/data/maps/PokemonTower_1F/scripts.inc b/data/maps/PokemonTower_1F/scripts.inc index c86280b74..e98796864 100644 --- a/data/maps/PokemonTower_1F/scripts.inc +++ b/data/maps/PokemonTower_1F/scripts.inc @@ -23,7 +23,7 @@ PokemonTower_1F_EventScript_16325A:: @ 816325A faceplayer checkplayergender compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_163272 + goto_if eq, EventScript_163272 msgbox gUnknown_8179BFC release end diff --git a/data/maps/PokemonTower_6F/scripts.inc b/data/maps/PokemonTower_6F/scripts.inc index 8a221884a..ee40d071b 100644 --- a/data/maps/PokemonTower_6F/scripts.inc +++ b/data/maps/PokemonTower_6F/scripts.inc @@ -7,13 +7,13 @@ PokemonTower_6F_EventScript_1634B8:: @ 81634B8 msgbox gUnknown_817A2F8 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 setwildbattle SPECIES_MAROWAK, 30, ITEM_NONE special sub_807F904 waitstate special sub_8112364 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_1634F5 + goto_if eq, EventScript_1634F5 applymovement 255, Movement_163512 waitmovement 0 releaseall diff --git a/data/maps/PokemonTower_7F/scripts.inc b/data/maps/PokemonTower_7F/scripts.inc index 389c32751..20fd57e6f 100644 --- a/data/maps/PokemonTower_7F/scripts.inc +++ b/data/maps/PokemonTower_7F/scripts.inc @@ -25,11 +25,11 @@ EventScript_1635A1:: @ 81635A1 closemessage getplayerxy VAR_0x8004, VAR_0x8005 compare_var_to_value VAR_0x8004, 10 - goto_if_eq EventScript_1635E0 + goto_if eq, EventScript_1635E0 compare_var_to_value VAR_0x8004, 11 - goto_if_eq EventScript_1635F0 + goto_if eq, EventScript_1635F0 compare_var_to_value VAR_0x8004, 9 - goto_if_eq EventScript_163600 + goto_if eq, EventScript_163600 applymovement 2, Movement_16362C waitmovement 0 goto EventScript_163616 @@ -113,9 +113,9 @@ EventScript_163658:: @ 8163658 closemessage getplayerxy VAR_0x8004, VAR_0x8005 compare_var_to_value VAR_0x8004, 12 - goto_if_eq EventScript_163699 + goto_if eq, EventScript_163699 compare_var_to_value VAR_0x8004, 13 - goto_if_eq EventScript_1636A9 + goto_if eq, EventScript_1636A9 applymovement 3, Movement_1636C6 waitmovement 0 goto EventScript_1636B9 @@ -178,9 +178,9 @@ EventScript_1636F1:: @ 81636F1 closemessage getplayerxy VAR_0x8004, VAR_0x8005 compare_var_to_value VAR_0x8004, 10 - goto_if_eq EventScript_163725 + goto_if eq, EventScript_163725 compare_var_to_value VAR_0x8004, 9 - goto_if_eq EventScript_163735 + goto_if eq, EventScript_163735 applymovement 4, Movement_163754 waitmovement 0 goto EventScript_163745 diff --git a/data/maps/PowerPlant/scripts.inc b/data/maps/PowerPlant/scripts.inc index d4222d23a..4ef343d14 100644 --- a/data/maps/PowerPlant/scripts.inc +++ b/data/maps/PowerPlant/scripts.inc @@ -4,8 +4,8 @@ PowerPlant_MapScripts:: @ 8163764 .byte 0 PowerPlant_MapScript1_16376F:: @ 816376F - checkflag FLAG_0x807 - call_if eq, EventScript_163779 + checkflag FLAG_SYS_SPECIAL_WILD_BATTLE + call_if TRUE, EventScript_163779 end EventScript_163779:: @ 8163779 @@ -18,11 +18,11 @@ EventScript_163779:: @ 8163779 PowerPlant_MapScript2_16378D:: @ 816378D setworldmapflag FLAG_WORLD_MAP_POWER_PLANT checkflag FLAG_0x2BF - call_if lt, EventScript_1637AC + call_if FALSE, EventScript_1637AC checkflag FLAG_0x2D0 - call_if lt, EventScript_1637B0 + call_if FALSE, EventScript_1637B0 checkflag FLAG_0x2D1 - call_if lt, EventScript_1637B4 + call_if FALSE, EventScript_1637B4 end EventScript_1637AC:: @ 81637AC @@ -40,7 +40,7 @@ EventScript_1637B4:: @ 81637B4 PowerPlant_EventScript_1637B8:: @ 81637B8 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 special sub_8112364 lock faceplayer @@ -53,17 +53,17 @@ PowerPlant_EventScript_1637B8:: @ 81637B8 delay 10 playbgm MUS_EXEYE, 0 waitbuttonpress - setflag FLAG_0x807 + setflag FLAG_SYS_SPECIAL_WILD_BATTLE special sub_807F9D8 waitstate - clearflag FLAG_0x807 + clearflag FLAG_SYS_SPECIAL_WILD_BATTLE specialvar VAR_RESULT, sub_80CA74C compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16381B + goto_if eq, EventScript_16381B compare_var_to_value VAR_RESULT, 4 - goto_if_eq EventScript_163824 + goto_if eq, EventScript_163824 compare_var_to_value VAR_RESULT, 5 - goto_if_eq EventScript_163824 + goto_if eq, EventScript_163824 setflag FLAG_0x2BF release end @@ -81,7 +81,7 @@ EventScript_163824:: @ 8163824 PowerPlant_EventScript_16382F:: @ 816382F special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 lock faceplayer setwildbattle SPECIES_ELECTRODE, 34, ITEM_NONE @@ -89,17 +89,17 @@ PowerPlant_EventScript_16382F:: @ 816382F playmoncry SPECIES_ELECTRODE, 2 delay 40 waitmoncry - setflag FLAG_0x807 + setflag FLAG_SYS_SPECIAL_WILD_BATTLE dowildbattle - clearflag FLAG_0x807 + clearflag FLAG_SYS_SPECIAL_WILD_BATTLE special sub_8112364 specialvar VAR_RESULT, sub_80CA74C compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_163884 + goto_if eq, EventScript_163884 compare_var_to_value VAR_RESULT, 4 - goto_if_eq EventScript_163884 + goto_if eq, EventScript_163884 compare_var_to_value VAR_RESULT, 5 - goto_if_eq EventScript_163884 + goto_if eq, EventScript_163884 setflag FLAG_0x2D0 release end @@ -112,7 +112,7 @@ EventScript_163884:: @ 8163884 PowerPlant_EventScript_16388D:: @ 816388D special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 lock faceplayer setwildbattle SPECIES_ELECTRODE, 34, ITEM_NONE @@ -120,17 +120,17 @@ PowerPlant_EventScript_16388D:: @ 816388D playmoncry SPECIES_ELECTRODE, 2 delay 40 waitmoncry - setflag FLAG_0x807 + setflag FLAG_SYS_SPECIAL_WILD_BATTLE dowildbattle - clearflag FLAG_0x807 + clearflag FLAG_SYS_SPECIAL_WILD_BATTLE special sub_8112364 specialvar VAR_RESULT, sub_80CA74C compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_1638E2 + goto_if eq, EventScript_1638E2 compare_var_to_value VAR_RESULT, 4 - goto_if_eq EventScript_1638E2 + goto_if eq, EventScript_1638E2 compare_var_to_value VAR_RESULT, 5 - goto_if_eq EventScript_1638E2 + goto_if eq, EventScript_1638E2 setflag FLAG_0x2D1 release end diff --git a/data/maps/RocketHideout_B4F/scripts.inc b/data/maps/RocketHideout_B4F/scripts.inc index 1b8fb0a4d..4fa71c383 100644 --- a/data/maps/RocketHideout_B4F/scripts.inc +++ b/data/maps/RocketHideout_B4F/scripts.inc @@ -43,7 +43,7 @@ RocketHideout_B4F_EventScript_161363:: @ 8161363 removeobject 2 giveitem ITEM_SILPH_SCOPE compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_1A6BF9 + goto_if eq, EventScript_1A6BF9 release end @@ -67,7 +67,7 @@ RocketHideout_B4F_EventScript_1613AD:: @ 81613AD removeobject 4 giveitem ITEM_LIFT_KEY compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_1A6BF9 + goto_if eq, EventScript_1A6BF9 release end diff --git a/data/maps/RocketHideout_Elevator/scripts.inc b/data/maps/RocketHideout_Elevator/scripts.inc index f0ba02f22..040cf4a82 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 lt, EventScript_16161B + goto_if FALSE, EventScript_16161B setvar VAR_0x8004, 2 checkflag FLAG_TEMP_2 - call_if lt, EventScript_1A7AB9 + call_if FALSE, EventScript_1A7AB9 copyvar VAR_0x8005, VAR_0x403A special sub_80CB580 message Text_1A535C @@ -54,7 +54,7 @@ EventScript_161591:: @ 8161591 setvar VAR_0x8006, 3 setdynamicwarp MAP_ROCKET_HIDEOUT_B1F, 255, 24, 25 compare_var_to_value VAR_0x403A, 3 - goto_if_eq EventScript_161609 + goto_if eq, EventScript_161609 call EventScript_16160E setvar VAR_0x403A, 3 goto EventScript_161609 @@ -66,7 +66,7 @@ EventScript_1615B9:: @ 81615B9 setvar VAR_0x8006, 2 setdynamicwarp MAP_ROCKET_HIDEOUT_B2F, 255, 28, 16 compare_var_to_value VAR_0x403A, 2 - goto_if_eq EventScript_161609 + goto_if eq, EventScript_161609 call EventScript_16160E setvar VAR_0x403A, 2 goto EventScript_161609 @@ -78,7 +78,7 @@ EventScript_1615E1:: @ 81615E1 setvar VAR_0x8006, 0 setdynamicwarp MAP_ROCKET_HIDEOUT_B4F, 255, 20, 23 compare_var_to_value VAR_0x403A, 0 - goto_if_eq EventScript_161609 + goto_if eq, EventScript_161609 call EventScript_16160E setvar VAR_0x403A, 0 goto EventScript_161609 diff --git a/data/maps/Route1/scripts.inc b/data/maps/Route1/scripts.inc index 3bfcdf732..ef784e8ee 100644 --- a/data/maps/Route1/scripts.inc +++ b/data/maps/Route1/scripts.inc @@ -5,12 +5,12 @@ Route1_EventScript_167EFE:: @ 8167EFE lock faceplayer checkflag FLAG_GOT_POTION_ON_ROUTE_1 - goto_if_eq EventScript_167F48 + goto_if TRUE, EventScript_167F48 msgbox gUnknown_818329D textcolor 3 checkitemspace ITEM_POTION, 1 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_1A6BF9 + goto_if eq, EventScript_1A6BF9 getitemname 1, ITEM_POTION playfanfare MUS_FANFA1 message Text_1A51F6 diff --git a/data/maps/Route10_PokemonCenter_1F/scripts.inc b/data/maps/Route10_PokemonCenter_1F/scripts.inc index a6da22234..3a67595f8 100644 --- a/data/maps/Route10_PokemonCenter_1F/scripts.inc +++ b/data/maps/Route10_PokemonCenter_1F/scripts.inc @@ -32,10 +32,10 @@ Route10_PokemonCenter_1F_EventScript_16FC65:: @ 816FC65 faceplayer call EventScript_16FCF1 checkflag FLAG_0x2FA - goto_if_eq EventScript_16FCE7 + goto_if TRUE, EventScript_16FCE7 msgbox gUnknown_819E5FB, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_1A7AD1 + goto_if eq, EventScript_1A7AD1 setvar VAR_0x8004, 0 specialvar VAR_RESULT, Special_GetPokedexCount getnumberstring 2, VAR_0x8006 @@ -45,7 +45,7 @@ Route10_PokemonCenter_1F_EventScript_16FC65:: @ 816FC65 msgbox gUnknown_819E733 checkitemspace ITEM_EVERSTONE, 1 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_1A7AC7 + goto_if eq, EventScript_1A7AC7 additem ITEM_EVERSTONE, 1 giveitemfanfaremsg gUnknown_819E786, ITEM_EVERSTONE setflag FLAG_0x2FA diff --git a/data/maps/Route11_EastEntrance_2F/scripts.inc b/data/maps/Route11_EastEntrance_2F/scripts.inc index 5b18d37c9..0140d8de3 100644 --- a/data/maps/Route11_EastEntrance_2F/scripts.inc +++ b/data/maps/Route11_EastEntrance_2F/scripts.inc @@ -3,8 +3,8 @@ Route11_EastEntrance_2F_MapScripts:: @ 816FD34 Route11_EastEntrance_2F_EventScript_16FD35:: @ 816FD35 lockall - checkflag FLAG_0x253 - goto_if_eq EventScript_16FD49 + checkflag FLAG_WOKE_UP_ROUTE_12_SNORLAX + goto_if TRUE, EventScript_16FD49 msgbox gUnknown_819EC8A releaseall end @@ -23,11 +23,11 @@ Route11_EastEntrance_2F_EventScript_16FD5C:: @ 816FD5C faceplayer setvar VAR_0x8008, 4 call EventScript_1A8CAD - checkflag FLAG_0x251 - goto_if_eq EventScript_16FDCE + checkflag FLAG_DID_NINA_TRADE + goto_if TRUE, EventScript_16FDCE msgbox gUnknown_81A597B, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16FDB6 + goto_if eq, EventScript_16FDB6 call EventScript_1A8CBD compare_var_to_value VAR_0x8004, 6 goto_if ge, EventScript_16FDB6 @@ -36,7 +36,7 @@ Route11_EastEntrance_2F_EventScript_16FD5C:: @ 816FD5C goto_if ne, EventScript_16FDC0 call EventScript_1A8CD9 msgbox gUnknown_81A59DA - setflag FLAG_0x251 + setflag FLAG_DID_NINA_TRADE release end @@ -60,11 +60,11 @@ Route11_EastEntrance_2F_EventScript_16FDD8:: @ 816FDD8 lock faceplayer call EventScript_16FE64 - checkflag FLAG_0x252 - goto_if_eq EventScript_16FE5A + checkflag FLAG_GOT_ITEMFINDER + goto_if TRUE, EventScript_16FE5A msgbox gUnknown_819E9E5, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_1A7AD1 + goto_if eq, EventScript_1A7AD1 setvar VAR_0x8004, 0 specialvar VAR_RESULT, Special_GetPokedexCount getnumberstring 2, VAR_0x8006 @@ -74,10 +74,10 @@ Route11_EastEntrance_2F_EventScript_16FDD8:: @ 816FDD8 msgbox gUnknown_819EAE4 checkitemspace ITEM_ITEMFINDER, 1 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_1A7AC7 + goto_if eq, EventScript_1A7AC7 additem ITEM_ITEMFINDER, 1 giveitemfanfaremsg gUnknown_819EB37, ITEM_ITEMFINDER - setflag FLAG_0x252 + setflag FLAG_GOT_ITEMFINDER msgbox gUnknown_819EB59 release end diff --git a/data/maps/Route12/scripts.inc b/data/maps/Route12/scripts.inc index 2ba49dc11..61a42972b 100644 --- a/data/maps/Route12/scripts.inc +++ b/data/maps/Route12/scripts.inc @@ -3,8 +3,8 @@ Route12_MapScripts:: @ 8168000 .byte 0 Route12_MapScript1_168006:: @ 8168006 - checkflag FLAG_0x807 - call_if eq, EventScript_168010 + checkflag FLAG_SYS_SPECIAL_WILD_BATTLE + call_if TRUE, EventScript_168010 end EventScript_168010:: @ 8168010 @@ -15,14 +15,14 @@ Route12_EventScript_168014:: @ 8168014 lock faceplayer checkflag FLAG_GOT_POKE_FLUTE - goto_if lt, EventScript_168099 + goto_if FALSE, EventScript_168099 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 special sub_8112364 msgbox gUnknown_81853CC, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16808D + goto_if eq, EventScript_16808D call EventScript_1A924B setwildbattle SPECIES_SNORLAX, 30, ITEM_NONE waitse @@ -30,17 +30,17 @@ Route12_EventScript_168014:: @ 8168014 delay 40 waitmoncry setflag FLAG_HIDE_ROUTE_12_SNORLAX - setflag FLAG_0x807 - setflag FLAG_0x253 + setflag FLAG_SYS_SPECIAL_WILD_BATTLE + setflag FLAG_WOKE_UP_ROUTE_12_SNORLAX dowildbattle - clearflag FLAG_0x807 + clearflag FLAG_SYS_SPECIAL_WILD_BATTLE specialvar VAR_RESULT, sub_80CA74C compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16808F + goto_if eq, EventScript_16808F compare_var_to_value VAR_RESULT, 4 - goto_if_eq EventScript_16808F + goto_if eq, EventScript_16808F compare_var_to_value VAR_RESULT, 5 - goto_if_eq EventScript_16808F + goto_if eq, EventScript_16808F release end diff --git a/data/maps/Route12_FishingHouse/scripts.inc b/data/maps/Route12_FishingHouse/scripts.inc index 95efdf164..497a7302d 100644 --- a/data/maps/Route12_FishingHouse/scripts.inc +++ b/data/maps/Route12_FishingHouse/scripts.inc @@ -4,11 +4,11 @@ Route12_FishingHouse_MapScripts:: @ 816FF0B Route12_FishingHouse_EventScript_16FF0C:: @ 816FF0C lock faceplayer - checkflag FLAG_0x255 - goto_if_eq EventScript_16FF7F + checkflag FLAG_GOT_SUPER_ROD + goto_if TRUE, EventScript_16FF7F msgbox gUnknown_819EFE0, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16FF34 + goto_if eq, EventScript_16FF34 msgbox gUnknown_819F1FA release end @@ -16,11 +16,11 @@ Route12_FishingHouse_EventScript_16FF0C:: @ 816FF0C EventScript_16FF34:: @ 816FF34 checkitemspace ITEM_SUPER_ROD, 1 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16FF75 + goto_if eq, EventScript_16FF75 additem ITEM_SUPER_ROD, 1 msgbox gUnknown_819F05B giveitemfanfaremsg gUnknown_819F0B2, ITEM_SUPER_ROD - setflag FLAG_0x255 + setflag FLAG_GOT_SUPER_ROD msgbox gUnknown_819F0EB release end @@ -33,12 +33,12 @@ EventScript_16FF75:: @ 816FF75 EventScript_16FF7F:: @ 816FF7F special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 special sub_8112364 setvar VAR_0x8004, SPECIES_MAGIKARP specialvar VAR_RESULT, sub_80CC48C compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16FFF5 + goto_if eq, EventScript_16FFF5 special sub_80A096C msgbox gUnknown_819F2DB special sub_80BF8FC @@ -48,13 +48,13 @@ EventScript_16FF7F:: @ 816FF7F goto_if ge, EventScript_16FFFF special sub_80A0984 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_170001 + goto_if eq, EventScript_170001 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_17000B + goto_if eq, EventScript_17000B compare_var_to_value VAR_RESULT, 3 - goto_if_eq EventScript_170031 + goto_if eq, EventScript_170031 compare_var_to_value VAR_RESULT, 4 - goto_if_eq EventScript_17001E + goto_if eq, EventScript_17001E release end @@ -74,14 +74,14 @@ EventScript_170001:: @ 8170001 EventScript_17000B:: @ 817000B checkflag FLAG_0x29C - goto_if lt, EventScript_170031 + goto_if FALSE, EventScript_170031 msgbox gUnknown_819F40A release end EventScript_17001E:: @ 817001E checkflag FLAG_0x29C - goto_if lt, EventScript_170031 + goto_if FALSE, EventScript_170031 msgbox gUnknown_819F3CB release end @@ -91,7 +91,7 @@ EventScript_170031:: @ 8170031 msgbox gUnknown_819F31B giveitem ITEM_NET_BALL compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_17005D + goto_if eq, EventScript_17005D msgbox gUnknown_819F395 release end @@ -104,7 +104,7 @@ EventScript_17005D:: @ 817005D Route12_FishingHouse_EventScript_170067:: @ 8170067 lockall checkflag FLAG_0x29C - goto_if_eq EventScript_17007B + goto_if TRUE, EventScript_17007B msgbox gUnknown_819F50C releaseall end diff --git a/data/maps/Route12_NorthEntrance_2F/scripts.inc b/data/maps/Route12_NorthEntrance_2F/scripts.inc index 29f825824..fe288a6d1 100644 --- a/data/maps/Route12_NorthEntrance_2F/scripts.inc +++ b/data/maps/Route12_NorthEntrance_2F/scripts.inc @@ -12,8 +12,8 @@ Route12_NorthEntrance_2F_EventScript_16FE81:: @ 816FE81 Route12_NorthEntrance_2F_EventScript_16FE8A:: @ 816FE8A lock faceplayer - checkflag FLAG_0x25B - goto_if_eq EventScript_16FF01 + checkflag FLAG_GOT_TM27 + goto_if TRUE, EventScript_16FF01 checkplayergender compare_var_to_value VAR_RESULT, 0 call_if eq, EventScript_16FEE5 @@ -21,11 +21,11 @@ Route12_NorthEntrance_2F_EventScript_16FE8A:: @ 816FE8A call_if eq, EventScript_16FEEE checkitemspace ITEM_TM27, 1 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16FEF7 + goto_if eq, EventScript_16FEF7 additem ITEM_TM27, 1 giveitemfanfaremsg gUnknown_819EE9F, ITEM_TM27 msgbox gUnknown_819EEC6 - setflag FLAG_0x25B + setflag FLAG_GOT_TM27 release end diff --git a/data/maps/Route15_WestEntrance_2F/scripts.inc b/data/maps/Route15_WestEntrance_2F/scripts.inc index 122b8dcc9..7ec851931 100644 --- a/data/maps/Route15_WestEntrance_2F/scripts.inc +++ b/data/maps/Route15_WestEntrance_2F/scripts.inc @@ -21,11 +21,11 @@ Route15_WestEntrance_2F_EventScript_1700B9:: @ 81700B9 lock faceplayer call EventScript_170145 - checkflag FLAG_0x256 - goto_if_eq EventScript_17013B + checkflag FLAG_GOT_EXP_SHARE_FROM_OAKS_AIDE + goto_if TRUE, EventScript_17013B msgbox gUnknown_819F5AB, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_1A7AD1 + goto_if eq, EventScript_1A7AD1 setvar VAR_0x8004, 0 specialvar VAR_RESULT, Special_GetPokedexCount getnumberstring 2, VAR_0x8006 @@ -35,10 +35,10 @@ Route15_WestEntrance_2F_EventScript_1700B9:: @ 81700B9 msgbox gUnknown_819F6AA checkitemspace ITEM_EXP_SHARE, 1 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_1A7AC7 + goto_if eq, EventScript_1A7AC7 additem ITEM_EXP_SHARE, 1 giveitemfanfaremsg gUnknown_819F6FD, ITEM_EXP_SHARE - setflag FLAG_0x256 + setflag FLAG_GOT_EXP_SHARE_FROM_OAKS_AIDE msgbox gUnknown_819F71F release end diff --git a/data/maps/Route16/scripts.inc b/data/maps/Route16/scripts.inc index 00105aae8..af5daaf7d 100644 --- a/data/maps/Route16/scripts.inc +++ b/data/maps/Route16/scripts.inc @@ -5,8 +5,8 @@ Route16_MapScripts:: @ 81680E5 .byte 0 Route16_MapScript1_1680F5:: @ 81680F5 - checkflag FLAG_0x807 - call_if eq, EventScript_1680FF + checkflag FLAG_SYS_SPECIAL_WILD_BATTLE + call_if TRUE, EventScript_1680FF end EventScript_1680FF:: @ 81680FF @@ -34,14 +34,14 @@ Route16_EventScript_168121:: @ 8168121 lock faceplayer checkflag FLAG_GOT_POKE_FLUTE - goto_if lt, EventScript_1681A3 + goto_if FALSE, EventScript_1681A3 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 special sub_8112364 msgbox gUnknown_81853CC, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_168197 + goto_if eq, EventScript_168197 call EventScript_1A924B setwildbattle SPECIES_SNORLAX, 30, ITEM_NONE waitse @@ -49,16 +49,16 @@ Route16_EventScript_168121:: @ 8168121 delay 40 waitmoncry setflag FLAG_HIDE_ROUTE_16_SNORLAX - setflag FLAG_0x807 + setflag FLAG_SYS_SPECIAL_WILD_BATTLE dowildbattle - clearflag FLAG_0x807 + clearflag FLAG_SYS_SPECIAL_WILD_BATTLE specialvar VAR_RESULT, sub_80CA74C compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_168199 + goto_if eq, EventScript_168199 compare_var_to_value VAR_RESULT, 4 - goto_if_eq EventScript_168199 + goto_if eq, EventScript_168199 compare_var_to_value VAR_RESULT, 5 - goto_if_eq EventScript_168199 + goto_if eq, EventScript_168199 release end diff --git a/data/maps/Route16_House/scripts.inc b/data/maps/Route16_House/scripts.inc index 239c88340..6da2bb12a 100644 --- a/data/maps/Route16_House/scripts.inc +++ b/data/maps/Route16_House/scripts.inc @@ -5,11 +5,11 @@ Route16_House_EventScript_17014F:: @ 817014F lock faceplayer checkflag FLAG_GOT_HM02 - goto_if_eq EventScript_1701A5 + goto_if TRUE, EventScript_1701A5 msgbox gUnknown_819F851 checkitemspace ITEM_HM02, 1 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_17019B + goto_if eq, EventScript_17019B additem ITEM_HM02, 1 giveitemfanfaremsg gUnknown_819F8C0, ITEM_HM02 msgbox gUnknown_819F8E0 diff --git a/data/maps/Route16_NorthEntrance_1F/scripts.inc b/data/maps/Route16_NorthEntrance_1F/scripts.inc index ff05102c5..3eecb6f1d 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 eq, EventScript_1701D5 + call_if TRUE, EventScript_1701D5 end EventScript_1701D5:: @ 81701D5 diff --git a/data/maps/Route16_NorthEntrance_2F/scripts.inc b/data/maps/Route16_NorthEntrance_2F/scripts.inc index dfaf5455b..0a6dc0148 100644 --- a/data/maps/Route16_NorthEntrance_2F/scripts.inc +++ b/data/maps/Route16_NorthEntrance_2F/scripts.inc @@ -22,10 +22,10 @@ Route16_NorthEntrance_2F_EventScript_1702E3:: @ 81702E3 faceplayer call EventScript_17036F checkflag FLAG_0x2FD - goto_if_eq EventScript_170365 + goto_if TRUE, EventScript_170365 msgbox gUnknown_819FB0E, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_1A7AD1 + goto_if eq, EventScript_1A7AD1 setvar VAR_0x8004, 0 specialvar VAR_RESULT, Special_GetPokedexCount getnumberstring 2, VAR_0x8006 @@ -35,7 +35,7 @@ Route16_NorthEntrance_2F_EventScript_1702E3:: @ 81702E3 msgbox gUnknown_819FC15 checkitemspace ITEM_AMULET_COIN, 1 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_1A7AC7 + goto_if eq, EventScript_1A7AC7 additem ITEM_AMULET_COIN, 1 giveitemfanfaremsg gUnknown_819FC68, ITEM_AMULET_COIN setflag FLAG_0x2FD diff --git a/data/maps/Route18_EastEntrance_1F/scripts.inc b/data/maps/Route18_EastEntrance_1F/scripts.inc index b73ce6c07..411dfd216 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 eq, EventScript_17038B + call_if TRUE, EventScript_17038B end EventScript_17038B:: @ 817038B diff --git a/data/maps/Route18_EastEntrance_2F/scripts.inc b/data/maps/Route18_EastEntrance_2F/scripts.inc index 2515ae5ba..d262aad30 100644 --- a/data/maps/Route18_EastEntrance_2F/scripts.inc +++ b/data/maps/Route18_EastEntrance_2F/scripts.inc @@ -14,11 +14,11 @@ Route18_EastEntrance_2F_EventScript_17047E:: @ 817047E faceplayer setvar VAR_0x8008, 5 call EventScript_1A8CAD - checkflag FLAG_0x257 - goto_if_eq EventScript_1704F0 + checkflag FLAG_DID_MARC_TRADE + goto_if TRUE, EventScript_1704F0 msgbox gUnknown_81A597B, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_1704D8 + goto_if eq, EventScript_1704D8 call EventScript_1A8CBD compare_var_to_value VAR_0x8004, 6 goto_if ge, EventScript_1704D8 @@ -27,7 +27,7 @@ Route18_EastEntrance_2F_EventScript_17047E:: @ 817047E goto_if ne, EventScript_1704E2 call EventScript_1A8CD9 msgbox gUnknown_81A59DA - setflag FLAG_0x257 + setflag FLAG_DID_MARC_TRADE release end diff --git a/data/maps/Route20/scripts.inc b/data/maps/Route20/scripts.inc index a1a9f1982..a65764533 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 lt, EventScript_168254 + call_if FALSE, EventScript_168254 checkflag FLAG_0x2D3 - call_if lt, EventScript_16826D + call_if FALSE, EventScript_16826D end EventScript_168254:: @ 8168254 diff --git a/data/maps/Route24/scripts.inc b/data/maps/Route24/scripts.inc index bf51af987..175cc7210 100644 --- a/data/maps/Route24/scripts.inc +++ b/data/maps/Route24/scripts.inc @@ -5,11 +5,11 @@ Route24_EventScript_168620:: @ 8168620 lock faceplayer compare_var_to_value VAR_MAP_SCENE_ROUTE24, 1 - goto_if_eq EventScript_168656 + goto_if eq, EventScript_168656 msgbox gUnknown_8188C3C checkitemspace ITEM_NUGGET, 1 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16864C + goto_if eq, EventScript_16864C call EventScript_1686B9 release end @@ -47,7 +47,7 @@ EventScript_168678:: @ 8168678 msgbox gUnknown_8188C3C checkitemspace ITEM_NUGGET, 1 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_168713 + goto_if eq, EventScript_168713 call EventScript_1686B9 releaseall end diff --git a/data/maps/Route25_SeaCottage/scripts.inc b/data/maps/Route25_SeaCottage/scripts.inc index 5dca7b67a..254b3cbe6 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 lt, EventScript_17053C + call_if FALSE, EventScript_17053C checkflag FLAG_GOT_SS_TICKET - call_if eq, EventScript_170547 + call_if TRUE, EventScript_170547 end EventScript_17053C:: @ 817053C @@ -22,16 +22,16 @@ Route25_SeaCottage_EventScript_17054B:: @ 817054B lock faceplayer checkflag FLAG_TEMP_3 - goto_if_eq EventScript_1706C8 + goto_if TRUE, EventScript_1706C8 checkflag FLAG_GOT_SS_TICKET - goto_if_eq EventScript_170640 + goto_if TRUE, EventScript_170640 checkflag FLAG_HELPED_BILL_IN_SEA_COTTAGE - goto_if_eq EventScript_17064A + goto_if TRUE, EventScript_17064A checkplayergender compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_170580 + goto_if eq, EventScript_170580 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_17058E + goto_if eq, EventScript_17058E end EventScript_170580:: @ 8170580 @@ -110,7 +110,7 @@ EventScript_17064A:: @ 817064A call_if eq, EventScript_1706B5 checkitemspace ITEM_SS_TICKET, 1 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_1706BE + goto_if eq, EventScript_1706BE additem ITEM_SS_TICKET, 1 giveitemfanfaremsg gUnknown_81A028E, ITEM_SS_TICKET, 1, MUS_FAN5 setflag FLAG_GOT_SS_TICKET_DUP @@ -158,9 +158,9 @@ Movement_1706DB:: @ 81706DB Route25_SeaCottage_EventScript_1706DD:: @ 81706DD lockall checkflag FLAG_TEMP_3 - goto_if_eq EventScript_1707CA + goto_if TRUE, EventScript_1707CA checkflag FLAG_TEMP_2 - goto_if_eq EventScript_1706FA + goto_if TRUE, EventScript_1706FA msgbox gUnknown_81A0402 releaseall end diff --git a/data/maps/Route2_EastBuilding/scripts.inc b/data/maps/Route2_EastBuilding/scripts.inc index 77ec8ad08..de3889bf4 100644 --- a/data/maps/Route2_EastBuilding/scripts.inc +++ b/data/maps/Route2_EastBuilding/scripts.inc @@ -6,10 +6,10 @@ Route2_EastBuilding_EventScript_16F67F:: @ 816F67F faceplayer call EventScript_16F70B checkflag FLAG_GOT_HM05 - goto_if_eq EventScript_16F701 + goto_if TRUE, EventScript_16F701 msgbox gUnknown_819D64F, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_1A7AD1 + goto_if eq, EventScript_1A7AD1 setvar VAR_0x8004, 0 specialvar VAR_RESULT, Special_GetPokedexCount getnumberstring 2, VAR_0x8006 @@ -19,7 +19,7 @@ Route2_EastBuilding_EventScript_16F67F:: @ 816F67F msgbox gUnknown_819D74E checkitemspace ITEM_HM05, 1 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_1A7AC7 + goto_if eq, EventScript_1A7AC7 additem ITEM_HM05, 1 giveitemfanfaremsg gUnknown_819D7A1, ITEM_HM05 setflag FLAG_GOT_HM05 diff --git a/data/maps/Route2_House/scripts.inc b/data/maps/Route2_House/scripts.inc index f36bc7e83..62367586d 100644 --- a/data/maps/Route2_House/scripts.inc +++ b/data/maps/Route2_House/scripts.inc @@ -11,10 +11,10 @@ Route2_House_EventScript_16F602:: @ 816F602 setvar VAR_0x8008, 0 call EventScript_1A8CAD checkflag FLAG_DID_MIMIEN_TRADE - goto_if_eq EventScript_16F674 + goto_if TRUE, EventScript_16F674 msgbox gUnknown_81A597B, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16F65C + goto_if eq, EventScript_16F65C call EventScript_1A8CBD compare_var_to_value VAR_0x8004, 6 goto_if ge, EventScript_16F65C diff --git a/data/maps/Route4_PokemonCenter_1F/scripts.inc b/data/maps/Route4_PokemonCenter_1F/scripts.inc index 7cd5c0b99..e1a823cb5 100644 --- a/data/maps/Route4_PokemonCenter_1F/scripts.inc +++ b/data/maps/Route4_PokemonCenter_1F/scripts.inc @@ -22,13 +22,13 @@ Route4_PokemonCenter_1F_EventScript_16F75F:: @ 816F75F lock faceplayer checkflag FLAG_BOUGHT_MAGIKARP - goto_if_eq EventScript_16F8A2 + goto_if TRUE, EventScript_16F8A2 showmoneybox 0, 0, 0 checkplayergender compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16F786 + goto_if eq, EventScript_16F786 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16F794 + goto_if eq, EventScript_16F794 end EventScript_16F786:: @ 816F786 @@ -43,26 +43,26 @@ EventScript_16F794:: @ 816F794 EventScript_16F7A2:: @ 816F7A2 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16F888 + goto_if eq, EventScript_16F888 checkmoney 500, 0 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16F895 + goto_if eq, EventScript_16F895 textcolor 3 setvar VAR_0x4001, 129 givemon SPECIES_MAGIKARP, 5, ITEM_NONE, 0, 0, 0 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16F7F6 + goto_if eq, EventScript_16F7F6 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16F822 + goto_if eq, EventScript_16F822 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_16F8AC + goto_if eq, EventScript_16F8AC end EventScript_16F7F6:: @ 816F7F6 call EventScript_16F86F msgbox gUnknown_81A56A7, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16F861 + goto_if eq, EventScript_16F861 call EventScript_1A8C27 fadescreen 1 hidemoneybox @@ -77,7 +77,7 @@ EventScript_16F822:: @ 816F822 call EventScript_16F86F msgbox gUnknown_81A56A7, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16F84B + goto_if eq, EventScript_16F84B fadescreen 1 hidemoneybox .byte 0 diff --git a/data/maps/Route5_SouthEntrance/scripts.inc b/data/maps/Route5_SouthEntrance/scripts.inc index dd2c80612..eafff1c29 100644 --- a/data/maps/Route5_SouthEntrance/scripts.inc +++ b/data/maps/Route5_SouthEntrance/scripts.inc @@ -28,7 +28,7 @@ EventScript_16F92E:: @ 816F92E applymovement 255, Movement_1A75E7 waitmovement 0 checkflag FLAG_0x2A6 - goto_if_eq EventScript_16F958 + goto_if TRUE, EventScript_16F958 msgbox gUnknown_819E04B closemessage applymovement 255, Movement_16F9C4 diff --git a/data/maps/Route6_NorthEntrance/scripts.inc b/data/maps/Route6_NorthEntrance/scripts.inc index 3b8270ea6..c04a2d28f 100644 --- a/data/maps/Route6_NorthEntrance/scripts.inc +++ b/data/maps/Route6_NorthEntrance/scripts.inc @@ -28,7 +28,7 @@ EventScript_16F9F4:: @ 816F9F4 applymovement 255, Movement_1A75EB waitmovement 0 checkflag FLAG_0x2A6 - goto_if_eq EventScript_16FA1E + goto_if TRUE, EventScript_16FA1E msgbox gUnknown_819E181 closemessage applymovement 255, Movement_16FA8A diff --git a/data/maps/Route7_EastEntrance/scripts.inc b/data/maps/Route7_EastEntrance/scripts.inc index 1c06c9d24..fa9101aa4 100644 --- a/data/maps/Route7_EastEntrance/scripts.inc +++ b/data/maps/Route7_EastEntrance/scripts.inc @@ -28,7 +28,7 @@ EventScript_16FABB:: @ 816FABB applymovement 255, Movement_1A75E9 waitmovement 0 checkflag FLAG_0x2A6 - goto_if_eq EventScript_16FAE5 + goto_if TRUE, EventScript_16FAE5 msgbox gUnknown_819E2B7 closemessage applymovement 255, Movement_16FB51 diff --git a/data/maps/Route8_WestEntrance/scripts.inc b/data/maps/Route8_WestEntrance/scripts.inc index d12f6ddd1..391bc0c8b 100644 --- a/data/maps/Route8_WestEntrance/scripts.inc +++ b/data/maps/Route8_WestEntrance/scripts.inc @@ -28,7 +28,7 @@ EventScript_16FB81:: @ 816FB81 applymovement 255, Movement_1A75E9 waitmovement 0 checkflag FLAG_0x2A6 - goto_if_eq EventScript_16FBAB + goto_if TRUE, EventScript_16FBAB msgbox gUnknown_819E3ED closemessage applymovement 255, Movement_16FC2D diff --git a/data/maps/SSAnne_1F_Room4/scripts.inc b/data/maps/SSAnne_1F_Room4/scripts.inc index aa243949e..2bede7e12 100644 --- a/data/maps/SSAnne_1F_Room4/scripts.inc +++ b/data/maps/SSAnne_1F_Room4/scripts.inc @@ -6,7 +6,7 @@ SSAnne_1F_Room4_EventScript_160C44:: @ 8160C44 faceplayer checkplayergender compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_160C5C + goto_if eq, EventScript_160C5C msgbox gUnknown_8173BA4 release end diff --git a/data/maps/SSAnne_1F_Room6/scripts.inc b/data/maps/SSAnne_1F_Room6/scripts.inc index 1c6c0004c..37ed59374 100644 --- a/data/maps/SSAnne_1F_Room6/scripts.inc +++ b/data/maps/SSAnne_1F_Room6/scripts.inc @@ -6,7 +6,7 @@ SSAnne_1F_Room6_EventScript_160DF3:: @ 8160DF3 faceplayer msgbox gUnknown_817445B, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_160E18 + goto_if eq, EventScript_160E18 closemessage call EventScript_1A6C26 msgbox gUnknown_8174490 @@ -16,7 +16,7 @@ SSAnne_1F_Room6_EventScript_160DF3:: @ 8160DF3 EventScript_160E18:: @ 8160E18 checkplayergender compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_160E2E + goto_if eq, EventScript_160E2E msgbox gUnknown_8174515 release end diff --git a/data/maps/SSAnne_CaptainsOffice/scripts.inc b/data/maps/SSAnne_CaptainsOffice/scripts.inc index e15fd740c..114ba084a 100644 --- a/data/maps/SSAnne_CaptainsOffice/scripts.inc +++ b/data/maps/SSAnne_CaptainsOffice/scripts.inc @@ -4,7 +4,7 @@ SSAnne_CaptainsOffice_MapScripts:: @ 8160B39 SSAnne_CaptainsOffice_EventScript_160B3A:: @ 8160B3A lock checkflag FLAG_GOT_HM01 - goto_if_eq EventScript_160BB5 + goto_if TRUE, EventScript_160BB5 msgbox gUnknown_8173646 textcolor 3 message Text_173676 diff --git a/data/maps/SafariZone_SecretHouse/scripts.inc b/data/maps/SafariZone_SecretHouse/scripts.inc index 4ce9afe37..a4b3b1910 100644 --- a/data/maps/SafariZone_SecretHouse/scripts.inc +++ b/data/maps/SafariZone_SecretHouse/scripts.inc @@ -5,11 +5,11 @@ SafariZone_SecretHouse_EventScript_162453:: @ 8162453 lock faceplayer checkflag FLAG_GOT_HM03 - goto_if_eq EventScript_1624A9 + goto_if TRUE, EventScript_1624A9 msgbox gUnknown_8177DC1 checkitemspace ITEM_HM03, 1 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16249F + goto_if eq, EventScript_16249F additem ITEM_HM03, 1 giveitemfanfaremsg gUnknown_8177E92, ITEM_HM03 msgbox gUnknown_8177EB7 diff --git a/data/maps/SaffronCity/scripts.inc b/data/maps/SaffronCity/scripts.inc index a4036b837..498557ddb 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 lt, EventScript_167372 + call_if FALSE, EventScript_167372 end EventScript_167372:: @ 8167372 @@ -43,7 +43,7 @@ SaffronCity_EventScript_1673B0:: @ 81673B0 SaffronCity_EventScript_1673B9:: @ 81673B9 lock checkflag FLAG_RESCUED_MR_FUJI - goto_if_eq EventScript_1673D7 + goto_if TRUE, EventScript_1673D7 applymovement 6, Movement_1A75E1 waitmovement 0 msgbox gUnknown_81812CA diff --git a/data/maps/SaffronCity_Dojo/scripts.inc b/data/maps/SaffronCity_Dojo/scripts.inc index e35c5237a..e0991b9d5 100644 --- a/data/maps/SaffronCity_Dojo/scripts.inc +++ b/data/maps/SaffronCity_Dojo/scripts.inc @@ -21,7 +21,7 @@ SaffronCity_Dojo_EventScript_16EC00:: @ 816EC00 lock faceplayer checkflag FLAG_0x278 - goto_if_eq EventScript_16EC3C + goto_if TRUE, EventScript_16EC3C drawmonpic SPECIES_HITMONLEE, 10, 3 setvar VAR_0x4001, SPECIES_HITMONLEE applymovement 5, Movement_1A75E9 @@ -30,7 +30,7 @@ SaffronCity_Dojo_EventScript_16EC00:: @ 816EC00 msgbox gUnknown_819B44E, MSGBOX_YESNO call EventScript_1A6675 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16EC82 + goto_if eq, EventScript_16EC82 erasemonpic release end @@ -44,7 +44,7 @@ SaffronCity_Dojo_EventScript_16EC46:: @ 816EC46 lock faceplayer checkflag FLAG_0x278 - goto_if_eq EventScript_16EC3C + goto_if TRUE, EventScript_16EC3C drawmonpic SPECIES_HITMONCHAN, 10, 3 setvar VAR_0x4001, SPECIES_HITMONCHAN applymovement 5, Movement_1A75E9 @@ -53,7 +53,7 @@ SaffronCity_Dojo_EventScript_16EC46:: @ 816EC46 msgbox gUnknown_819B49E, MSGBOX_YESNO call EventScript_1A6675 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16EC82 + goto_if eq, EventScript_16EC82 erasemonpic release end @@ -62,11 +62,11 @@ EventScript_16EC82:: @ 816EC82 erasemonpic givemon VAR_0x4001, 25, ITEM_NONE, 0, 0, 0 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16ECB5 + goto_if eq, EventScript_16ECB5 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16ECEC + goto_if eq, EventScript_16ECEC compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A927C + goto_if eq, EventScript_1A927C release end @@ -80,7 +80,7 @@ EventScript_16ECB5:: @ 816ECB5 setflag FLAG_0x278 msgbox gUnknown_81A56A7, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16ED29 + goto_if eq, EventScript_16ED29 call EventScript_1A8C27 call EventScript_1A74EB goto EventScript_16ED29 @@ -96,7 +96,7 @@ EventScript_16ECEC:: @ 816ECEC setflag FLAG_0x278 msgbox gUnknown_81A56A7, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16ED1E + goto_if eq, EventScript_16ED1E call EventScript_1A8C33 goto EventScript_16ED1E end @@ -145,7 +145,7 @@ SaffronCity_Dojo_EventScript_16ED8B:: @ 816ED8B SaffronCity_Dojo_EventScript_16EDA2:: @ 816EDA2 trainerbattle 2, TRAINER_BLACK_BELT_KOICHI, 0, Text_19B12C, Text_19B193, EventScript_16EDD0 checkflag FLAG_0x278 - goto_if_eq EventScript_16EDC6 + goto_if TRUE, EventScript_16EDC6 msgbox gUnknown_819B1A7, 6 end diff --git a/data/maps/SaffronCity_Gym/scripts.inc b/data/maps/SaffronCity_Gym/scripts.inc index 5d085824d..1e0fcf882 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 lt, EventScript_16EE3D + goto_if FALSE, EventScript_16EE3D msgbox gUnknown_819B7F2 release end @@ -24,7 +24,7 @@ EventScript_16EE3D:: @ 816EE3D msgbox gUnknown_819B6FA checkitemspace ITEM_TM04, 1 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16EE7E + goto_if eq, EventScript_16EE7E additem ITEM_TM04, 1 giveitemfanfaremsg gUnknown_819B7D3, ITEM_TM04 setflag FLAG_0x29A @@ -77,7 +77,7 @@ SaffronCity_Gym_EventScript_16EF36:: @ 816EF36 lock faceplayer checkflag FLAG_DEFEATED_SABRINA - goto_if_eq EventScript_16EF4B + goto_if TRUE, EventScript_16EF4B msgbox gUnknown_819BCF6 release end @@ -90,7 +90,7 @@ EventScript_16EF4B:: @ 816EF4B SaffronCity_Gym_EventScript_16EF55:: @ 816EF55 lockall checkflag FLAG_BADGE06_GET - goto_if_eq EventScript_16EF69 + goto_if TRUE, EventScript_16EF69 msgbox gUnknown_819BDFE releaseall end diff --git a/data/maps/SaffronCity_House1_2F/scripts.inc b/data/maps/SaffronCity_House1_2F/scripts.inc index 116f68ec3..54b0a5a65 100644 --- a/data/maps/SaffronCity_House1_2F/scripts.inc +++ b/data/maps/SaffronCity_House1_2F/scripts.inc @@ -20,13 +20,13 @@ SaffronCity_House1_2F_EventScript_16EB70:: @ 816EB70 SaffronCity_House1_2F_EventScript_16EB7B:: @ 816EB7B special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 special sub_8112364 lock faceplayer checkitem ITEM_POKE_DOLL, 1 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_1C4CF6 + goto_if eq, EventScript_1C4CF6 checkplayergender compare_var_to_value VAR_RESULT, 0 call_if eq, EventScript_16EBB7 diff --git a/data/maps/SaffronCity_House3/scripts.inc b/data/maps/SaffronCity_House3/scripts.inc index 0f663ecdf..8a1ec97b5 100644 --- a/data/maps/SaffronCity_House3/scripts.inc +++ b/data/maps/SaffronCity_House3/scripts.inc @@ -5,11 +5,11 @@ SaffronCity_House3_EventScript_16F05F:: @ 816F05F lock faceplayer checkflag FLAG_GOT_TM29_FROM_MR_PSYCHIC - goto_if_eq EventScript_16F0B5 + goto_if TRUE, EventScript_16F0B5 msgbox gUnknown_819C142 checkitemspace ITEM_TM29, 1 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16F0AB + goto_if eq, EventScript_16F0AB additem ITEM_TM29, 1 giveitemfanfaremsg gUnknown_819C16C, ITEM_TM29 msgbox gUnknown_819C18F diff --git a/data/maps/SaffronCity_Mart/scripts.inc b/data/maps/SaffronCity_Mart/scripts.inc index 509fd37b6..5b77e5864 100644 --- a/data/maps/SaffronCity_Mart/scripts.inc +++ b/data/maps/SaffronCity_Mart/scripts.inc @@ -12,7 +12,7 @@ SaffronCity_Mart_EventScript_16EFAC:: @ 816EFAC SaffronCity_Mart_EventScript_16EFB5:: @ 816EFB5 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 lock faceplayer message Text_1A6211 diff --git a/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc b/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc index 8df5fce2b..0f2b92262 100644 --- a/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc @@ -26,7 +26,7 @@ SaffronCity_PokemonCenter_1F_EventScript_16F016:: @ 816F016 lock faceplayer compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if_eq EventScript_16F02D + goto_if eq, EventScript_16F02D msgbox gUnknown_819C0B4 release end diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc b/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc index c7667ce6a..30d528791 100644 --- a/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc +++ b/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc @@ -72,9 +72,9 @@ Movement_16F13E:: @ 816F13E SaffronCity_PokemonTrainerFanClub_MapScript2_16F144:: @ 816F144 compare_var_to_value VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 1 - goto_if_eq EventScript_16F267 + goto_if eq, EventScript_16F267 compare_var_to_value VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 2 - goto_if_eq EventScript_16F15B + goto_if eq, EventScript_16F15B end EventScript_16F15B:: @ 816F15B @@ -167,13 +167,13 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F281:: @ 816F281 setvar VAR_0x8004, 0 special sub_81133A4 compare_var_to_value VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0 - goto_if_eq EventScript_16F2EE + goto_if eq, EventScript_16F2EE specialvar VAR_RESULT, sub_8113364 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16F2C0 + goto_if eq, EventScript_16F2C0 specialvar VAR_RESULT, sub_8113288 compare_var_to_value VAR_RESULT, 7 - goto_if_eq EventScript_16F2E4 + goto_if eq, EventScript_16F2E4 msgbox gUnknown_819C420 release end @@ -181,7 +181,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F281:: @ 816F281 EventScript_16F2C0:: @ 816F2C0 specialvar VAR_RESULT, sub_8113288 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16F2DA + goto_if eq, EventScript_16F2DA msgbox gUnknown_819C390 release end @@ -207,13 +207,13 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F2F8:: @ 816F2F8 setvar VAR_0x8004, 3 special sub_81133A4 compare_var_to_value VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0 - goto_if_eq EventScript_16F365 + goto_if eq, EventScript_16F365 specialvar VAR_RESULT, sub_8113364 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16F337 + goto_if eq, EventScript_16F337 specialvar VAR_RESULT, sub_8113288 compare_var_to_value VAR_RESULT, 7 - goto_if_eq EventScript_16F35B + goto_if eq, EventScript_16F35B msgbox gUnknown_819CBD3 release end @@ -221,7 +221,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F2F8:: @ 816F2F8 EventScript_16F337:: @ 816F337 specialvar VAR_RESULT, sub_8113288 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16F351 + goto_if eq, EventScript_16F351 msgbox gUnknown_819CB32 release end @@ -247,13 +247,13 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F36F:: @ 816F36F setvar VAR_0x8004, 1 special sub_81133A4 compare_var_to_value VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0 - goto_if_eq EventScript_16F3DC + goto_if eq, EventScript_16F3DC specialvar VAR_RESULT, sub_8113364 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16F3AE + goto_if eq, EventScript_16F3AE specialvar VAR_RESULT, sub_8113288 compare_var_to_value VAR_RESULT, 7 - goto_if_eq EventScript_16F3D2 + goto_if eq, EventScript_16F3D2 msgbox gUnknown_819C6BA release end @@ -261,7 +261,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F36F:: @ 816F36F EventScript_16F3AE:: @ 816F3AE specialvar VAR_RESULT, sub_8113288 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16F3C8 + goto_if eq, EventScript_16F3C8 msgbox gUnknown_819C5A9 release end @@ -287,13 +287,13 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F3E6:: @ 816F3E6 setvar VAR_0x8004, 2 special sub_81133A4 compare_var_to_value VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0 - goto_if_eq EventScript_16F453 + goto_if eq, EventScript_16F453 specialvar VAR_RESULT, sub_8113364 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16F425 + goto_if eq, EventScript_16F425 specialvar VAR_RESULT, sub_8113288 compare_var_to_value VAR_RESULT, 7 - goto_if_eq EventScript_16F449 + goto_if eq, EventScript_16F449 msgbox gUnknown_819C986 release end @@ -301,7 +301,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F3E6:: @ 816F3E6 EventScript_16F425:: @ 816F425 specialvar VAR_RESULT, sub_8113288 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16F43F + goto_if eq, EventScript_16F43F msgbox gUnknown_819C81E release end @@ -328,10 +328,10 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F45D:: @ 816F45D special sub_81133A4 specialvar VAR_RESULT, sub_8113364 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16F491 + goto_if eq, EventScript_16F491 specialvar VAR_RESULT, sub_8113288 compare_var_to_value VAR_RESULT, 7 - goto_if_eq EventScript_16F4B5 + goto_if eq, EventScript_16F4B5 msgbox gUnknown_819D01F release end @@ -339,7 +339,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F45D:: @ 816F45D EventScript_16F491:: @ 816F491 specialvar VAR_RESULT, sub_8113288 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16F4AB + goto_if eq, EventScript_16F4AB msgbox gUnknown_819CEDF release end @@ -361,10 +361,10 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F4BF:: @ 816F4BF special sub_81133A4 specialvar VAR_RESULT, sub_8113364 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16F4F3 + goto_if eq, EventScript_16F4F3 specialvar VAR_RESULT, sub_8113288 compare_var_to_value VAR_RESULT, 7 - goto_if_eq EventScript_16F517 + goto_if eq, EventScript_16F517 msgbox gUnknown_819CDDA release end @@ -372,7 +372,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F4BF:: @ 816F4BF EventScript_16F4F3:: @ 816F4F3 specialvar VAR_RESULT, sub_8113288 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16F50D + goto_if eq, EventScript_16F50D msgbox gUnknown_819CCF3 release end @@ -394,10 +394,10 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F521:: @ 816F521 special sub_81133A4 specialvar VAR_RESULT, sub_8113364 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16F555 + goto_if eq, EventScript_16F555 specialvar VAR_RESULT, sub_8113288 compare_var_to_value VAR_RESULT, 7 - goto_if_eq EventScript_16F579 + goto_if eq, EventScript_16F579 msgbox gUnknown_819D1AE release end @@ -405,7 +405,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F521:: @ 816F521 EventScript_16F555:: @ 816F555 specialvar VAR_RESULT, sub_8113288 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16F56F + goto_if eq, EventScript_16F56F msgbox gUnknown_819D0E3 release end @@ -427,10 +427,10 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F583:: @ 816F583 special sub_81133A4 specialvar VAR_RESULT, sub_8113364 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16F5B7 + goto_if eq, EventScript_16F5B7 specialvar VAR_RESULT, sub_8113288 compare_var_to_value VAR_RESULT, 7 - goto_if_eq EventScript_16F5DB + goto_if eq, EventScript_16F5DB msgbox gUnknown_819D3D2 release end @@ -438,7 +438,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F583:: @ 816F583 EventScript_16F5B7:: @ 816F5B7 specialvar VAR_RESULT, sub_8113288 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16F5D1 + goto_if eq, EventScript_16F5D1 msgbox gUnknown_819D2B4 release end diff --git a/data/maps/SeafoamIslands_B3F/scripts.inc b/data/maps/SeafoamIslands_B3F/scripts.inc index 2bae9bea7..bcb862a1d 100644 --- a/data/maps/SeafoamIslands_B3F/scripts.inc +++ b/data/maps/SeafoamIslands_B3F/scripts.inc @@ -5,17 +5,17 @@ SeafoamIslands_B3F_MapScripts:: @ 8162F4F SeafoamIslands_B3F_MapScript1_162F5A:: @ 8162F5A checkflag FLAG_0x2D2 - call_if lt, EventScript_162F6D + call_if FALSE, EventScript_162F6D checkflag FLAG_0x2D2 - call_if eq, EventScript_162F94 + call_if TRUE, EventScript_162F94 end EventScript_162F6D:: @ 8162F6D setvar VAR_0x4002, 0 checkflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_1 - call_if lt, EventScript_162FF0 + call_if FALSE, EventScript_162FF0 checkflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_2 - call_if lt, EventScript_162FF0 + call_if FALSE, EventScript_162FF0 compare_var_to_value VAR_0x4002, 2 call_if eq, EventScript_162F90 return @@ -36,11 +36,11 @@ EventScript_162FA2:: @ 8162FA2 lockall setvar VAR_0x4002, 0 checkflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_1 - call_if lt, EventScript_162FF0 + call_if FALSE, EventScript_162FF0 checkflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_2 - call_if lt, EventScript_162FF0 + call_if FALSE, EventScript_162FF0 compare_var_to_value VAR_0x4002, 2 - goto_if_eq EventScript_16300C + goto_if eq, EventScript_16300C getplayerxy VAR_0x8008, VAR_0x8009 compare_var_to_value VAR_0x8008, 24 call_if lt, EventScript_162FF6 diff --git a/data/maps/SeafoamIslands_B4F/scripts.inc b/data/maps/SeafoamIslands_B4F/scripts.inc index 01fc354d3..24b2238b7 100644 --- a/data/maps/SeafoamIslands_B4F/scripts.inc +++ b/data/maps/SeafoamIslands_B4F/scripts.inc @@ -7,8 +7,8 @@ SeafoamIslands_B4F_MapScripts:: @ 816302E .byte 0 SeafoamIslands_B4F_MapScript2_163048:: @ 8163048 - checkflag FLAG_0x807 - call_if eq, EventScript_163052 + checkflag FLAG_SYS_SPECIAL_WILD_BATTLE + call_if TRUE, EventScript_163052 end EventScript_163052:: @ 8163052 @@ -20,19 +20,19 @@ EventScript_163052:: @ 8163052 SeafoamIslands_B4F_MapScript1_163066:: @ 8163066 checkflag FLAG_0x2BE - call_if lt, EventScript_1630AD + call_if FALSE, EventScript_1630AD checkflag FLAG_0x2D3 - call_if lt, EventScript_163082 + call_if FALSE, EventScript_163082 checkflag FLAG_0x2D3 - call_if eq, EventScript_1630A9 + call_if TRUE, EventScript_1630A9 end EventScript_163082:: @ 8163082 setvar VAR_0x4002, 0 checkflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_1 - call_if lt, EventScript_163169 + call_if FALSE, EventScript_163169 checkflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_2 - call_if lt, EventScript_163169 + call_if FALSE, EventScript_163169 compare_var_to_value VAR_0x4002, 2 call_if eq, EventScript_1630A5 return @@ -52,11 +52,11 @@ EventScript_1630AD:: @ 81630AD SeafoamIslands_B4F_MapScript3_1630B1:: @ 81630B1 setvar VAR_0x4002, 0 checkflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_1 - call_if lt, EventScript_163169 + call_if FALSE, EventScript_163169 checkflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_2 - call_if lt, EventScript_163169 + call_if FALSE, EventScript_163169 compare_var_to_value VAR_0x4002, 2 - goto_if_eq EventScript_1630D4 + goto_if eq, EventScript_1630D4 end EventScript_1630D4:: @ 81630D4 @@ -96,11 +96,11 @@ EventScript_163121:: @ 8163121 lockall setvar VAR_0x4002, 0 checkflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_1 - call_if lt, EventScript_163169 + call_if FALSE, EventScript_163169 checkflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_2 - call_if lt, EventScript_163169 + call_if FALSE, EventScript_163169 compare_var_to_value VAR_0x4002, 2 - goto_if_eq EventScript_163185 + goto_if eq, EventScript_163185 getplayerxy VAR_0x8008, VAR_0x8009 compare_var_to_value VAR_0x8008, 9 call_if lt, EventScript_16316F @@ -165,7 +165,7 @@ Movement_1631AA:: @ 81631AA SeafoamIslands_B4F_EventScript_1631AC:: @ 81631AC special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 special sub_8112364 lock faceplayer @@ -178,17 +178,17 @@ SeafoamIslands_B4F_EventScript_1631AC:: @ 81631AC delay 10 playbgm MUS_EXEYE, 0 waitbuttonpress - setflag FLAG_0x807 + setflag FLAG_SYS_SPECIAL_WILD_BATTLE special sub_807F9D8 waitstate - clearflag FLAG_0x807 + clearflag FLAG_SYS_SPECIAL_WILD_BATTLE specialvar VAR_RESULT, sub_80CA74C compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16320F + goto_if eq, EventScript_16320F compare_var_to_value VAR_RESULT, 4 - goto_if_eq EventScript_163218 + goto_if eq, EventScript_163218 compare_var_to_value VAR_RESULT, 5 - goto_if_eq EventScript_163218 + goto_if eq, EventScript_163218 setflag FLAG_0x2BE release end diff --git a/data/maps/SevenIsland_House_Room1/scripts.inc b/data/maps/SevenIsland_House_Room1/scripts.inc index 760416ed2..70813ddba 100644 --- a/data/maps/SevenIsland_House_Room1/scripts.inc +++ b/data/maps/SevenIsland_House_Room1/scripts.inc @@ -78,7 +78,7 @@ SevenIsland_House_Room1_EventScript_170958:: @ 8170958 compare_var_to_value VAR_RESULT, 1 call_if eq, EventScript_17097D compare_var_to_value VAR_0x4001, 1 - goto_if_eq EventScript_170987 + goto_if eq, EventScript_170987 msgbox gUnknown_81A049B release end @@ -93,17 +93,17 @@ EventScript_170987:: @ 8170987 special sub_80CAAAC msgbox gUnknown_81A0598, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_170A11 + goto_if eq, EventScript_170A11 call EventScript_170A1E compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_170A11 + goto_if eq, EventScript_170A11 msgbox gUnknown_81A0788, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_170A11 + goto_if eq, EventScript_170A11 special LoadPlayerParty call EventScript_1A4EAF compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_170A11 + goto_if eq, EventScript_170A11 special SavePlayerParty special sub_80A03D8 msgbox gUnknown_81A07C4 diff --git a/data/maps/SevenIsland_Mart/scripts.inc b/data/maps/SevenIsland_Mart/scripts.inc index ce9ad21ed..58312009f 100644 --- a/data/maps/SevenIsland_Mart/scripts.inc +++ b/data/maps/SevenIsland_Mart/scripts.inc @@ -4,7 +4,7 @@ SevenIsland_Mart_MapScripts:: @ 8170B30 SevenIsland_Mart_EventScript_170B31:: @ 8170B31 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 lock faceplayer message Text_1A6211 diff --git a/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/scripts.inc b/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/scripts.inc index b1e5689cc..1ee36076b 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 eq, EventScript_164E07 + call_if TRUE, EventScript_164E07 setvar VAR_0x4001, 0 setvar VAR_0x4002, 0 setvar VAR_0x4003, 0 @@ -29,77 +29,77 @@ EventScript_164E07:: @ 8164E07 SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164E39:: @ 8164E39 lockall compare_var_to_value VAR_0x4001, 100 - goto_if_eq EventScript_164F8A + goto_if eq, EventScript_164F8A call EventScript_164F2E setvar VAR_0x4001, 100 compare_var_to_value VAR_0x4008, 7 - goto_if_eq EventScript_164F8C + goto_if eq, EventScript_164F8C releaseall end SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164E5C:: @ 8164E5C lockall compare_var_to_value VAR_0x4002, 100 - goto_if_eq EventScript_164F8A + goto_if eq, EventScript_164F8A call EventScript_164F2E setvar VAR_0x4002, 100 compare_var_to_value VAR_0x4008, 7 - goto_if_eq EventScript_164F8C + goto_if eq, EventScript_164F8C releaseall end SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164E7F:: @ 8164E7F lockall compare_var_to_value VAR_0x4003, 100 - goto_if_eq EventScript_164F8A + goto_if eq, EventScript_164F8A call EventScript_164F2E setvar VAR_0x4003, 100 compare_var_to_value VAR_0x4008, 7 - goto_if_eq EventScript_164F8C + goto_if eq, EventScript_164F8C releaseall end SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164EA2:: @ 8164EA2 lockall compare_var_to_value VAR_0x4004, 100 - goto_if_eq EventScript_164F8A + goto_if eq, EventScript_164F8A call EventScript_164F2E setvar VAR_0x4004, 100 compare_var_to_value VAR_0x4008, 7 - goto_if_eq EventScript_164F8C + goto_if eq, EventScript_164F8C releaseall end SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164EC5:: @ 8164EC5 lockall compare_var_to_value VAR_0x4005, 100 - goto_if_eq EventScript_164F8A + goto_if eq, EventScript_164F8A call EventScript_164F2E setvar VAR_0x4005, 100 compare_var_to_value VAR_0x4008, 7 - goto_if_eq EventScript_164F8C + goto_if eq, EventScript_164F8C releaseall end SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164EE8:: @ 8164EE8 lockall compare_var_to_value VAR_0x4006, 100 - goto_if_eq EventScript_164F8A + goto_if eq, EventScript_164F8A call EventScript_164F2E setvar VAR_0x4006, 100 compare_var_to_value VAR_0x4008, 7 - goto_if_eq EventScript_164F8C + goto_if eq, EventScript_164F8C releaseall end SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164F0B:: @ 8164F0B lockall compare_var_to_value VAR_0x4007, 100 - goto_if_eq EventScript_164F8A + goto_if eq, EventScript_164F8A call EventScript_164F2E setvar VAR_0x4007, 100 compare_var_to_value VAR_0x4008, 7 - goto_if_eq EventScript_164F8C + goto_if eq, EventScript_164F8C releaseall end diff --git a/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc b/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc index 38e2c01e4..94fcdf92d 100644 --- a/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc +++ b/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc @@ -4,7 +4,7 @@ SevenIsland_SevaultCanyon_House_MapScripts:: @ 8172182 SevenIsland_SevaultCanyon_House_EventScript_172183:: @ 8172183 lock checkflag FLAG_TEMP_2 - goto_if_eq EventScript_172211 + goto_if TRUE, EventScript_172211 playbgm MUS_P_SCHOOL, 0 applymovement 1, Movement_172231 waitmovement 0 @@ -16,7 +16,7 @@ SevenIsland_SevaultCanyon_House_EventScript_172183:: @ 8172183 textcolor 3 msgbox gUnknown_81A4DAF, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_172225 + goto_if eq, EventScript_172225 msgbox gUnknown_81A4DD8 closemessage call EventScript_1A6675 diff --git a/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc b/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc index 6755ce61c..7623c5c59 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 lt, EventScript_1A7AB9 + call_if FALSE, EventScript_1A7AB9 copyvar VAR_0x8005, VAR_0x403A special sub_80CB580 message Text_1A535C @@ -41,7 +41,7 @@ EventScript_164B90:: @ 8164B90 setvar VAR_0x8006, 3 setdynamicwarp MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY, 255, 17, 8 compare_var_to_value VAR_0x403A, 3 - goto_if_eq EventScript_164BD3 + goto_if eq, EventScript_164BD3 call EventScript_164BD8 setvar VAR_0x403A, 3 special sub_80CB63C diff --git a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc b/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc index 9bbdef6bf..24f2fd622 100644 --- a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc @@ -13,7 +13,7 @@ SevenIsland_TrainerTower_Lobby_MapScript1_164853:: @ 8164853 setvar VAR_0x8004, 18 special sub_815D9E8 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_164886 + goto_if eq, EventScript_164886 setvar VAR_0x4000, 0 setobjectxy 255, 9, 7 applymovement 255, Movement_164AD4 @@ -112,7 +112,7 @@ SevenIsland_TrainerTower_Lobby_EventScript_164966:: @ 8164966 setvar VAR_0x8004, 20 special sub_815D9E8 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_164988 + goto_if eq, EventScript_164988 msgbox gUnknown_817C9A2 goto EventScript_164990 @@ -126,7 +126,7 @@ EventScript_164990:: @ 8164990 SevenIsland_TrainerTower_Lobby_EventScript_164992:: @ 8164992 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 lock faceplayer message Text_1A6211 @@ -159,7 +159,7 @@ SevenIsland_TrainerTower_Lobby_EventScript_1649CE:: @ 81649CE setvar VAR_0x8004, 17 special sub_815D9E8 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_164A00 + goto_if eq, EventScript_164A00 msgbox gUnknown_817C7D9 goto EventScript_164A08 diff --git a/data/maps/SilphCo_10F/scripts.inc b/data/maps/SilphCo_10F/scripts.inc index 3cee38763..f453463dd 100644 --- a/data/maps/SilphCo_10F/scripts.inc +++ b/data/maps/SilphCo_10F/scripts.inc @@ -4,7 +4,7 @@ SilphCo_10F_MapScripts:: @ 8161D86 SilphCo_10F_MapScript1_161D8C:: @ 8161D8C checkflag FLAG_0x28C - call_if lt, EventScript_1A84D6 + call_if FALSE, EventScript_1A84D6 end SilphCo_10F_EventScript_161D96:: @ 8161D96 diff --git a/data/maps/SilphCo_11F/scripts.inc b/data/maps/SilphCo_11F/scripts.inc index 5de78bb27..850cd3ce5 100644 --- a/data/maps/SilphCo_11F/scripts.inc +++ b/data/maps/SilphCo_11F/scripts.inc @@ -4,14 +4,14 @@ SilphCo_11F_MapScripts:: @ 8161DEE SilphCo_11F_MapScript1_161DF4:: @ 8161DF4 checkflag FLAG_0x28D - call_if lt, EventScript_1A8504 + call_if FALSE, EventScript_1A8504 end SilphCo_11F_EventScript_161DFE:: @ 8161DFE lock faceplayer - checkflag FLAG_0x250 - goto_if_eq EventScript_161E75 + checkflag FLAG_GOT_MASTER_BALL_FROM_SILPH + goto_if TRUE, EventScript_161E75 checkplayergender compare_var_to_value VAR_RESULT, 0 call_if eq, EventScript_161E59 @@ -19,11 +19,11 @@ SilphCo_11F_EventScript_161DFE:: @ 8161DFE call_if eq, EventScript_161E62 checkitemspace ITEM_MASTER_BALL, 1 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_161E6B + goto_if eq, EventScript_161E6B additem ITEM_MASTER_BALL, 1 giveitemfanfaremsg gUnknown_8176FBD, ITEM_MASTER_BALL, 1, MUS_FAN5 msgbox gUnknown_8176FEB - setflag FLAG_0x250 + setflag FLAG_GOT_MASTER_BALL_FROM_SILPH release end diff --git a/data/maps/SilphCo_2F/scripts.inc b/data/maps/SilphCo_2F/scripts.inc index 002d3291a..d2848d23d 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 lt, EventScript_1A8149 + call_if FALSE, EventScript_1A8149 checkflag FLAG_0x27B - call_if lt, EventScript_1A8177 + call_if FALSE, 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 52c1f847b..ee4a4288b 100644 --- a/data/maps/SilphCo_3F/scripts.inc +++ b/data/maps/SilphCo_3F/scripts.inc @@ -4,9 +4,9 @@ SilphCo_3F_MapScripts:: @ 81616C5 SilphCo_3F_MapScript1_1616CB:: @ 81616CB checkflag FLAG_0x27C - call_if lt, EventScript_1A81A5 + call_if FALSE, EventScript_1A81A5 checkflag FLAG_0x27D - call_if lt, EventScript_1A81DC + call_if FALSE, EventScript_1A81DC end SilphCo_3F_EventScript_1616DE:: @ 81616DE diff --git a/data/maps/SilphCo_4F/scripts.inc b/data/maps/SilphCo_4F/scripts.inc index be241084e..62f122892 100644 --- a/data/maps/SilphCo_4F/scripts.inc +++ b/data/maps/SilphCo_4F/scripts.inc @@ -4,9 +4,9 @@ SilphCo_4F_MapScripts:: @ 8161736 SilphCo_4F_MapScript1_16173C:: @ 816173C checkflag FLAG_0x27E - call_if lt, EventScript_1A8213 + call_if FALSE, EventScript_1A8213 checkflag FLAG_0x27F - call_if lt, EventScript_1A8241 + call_if FALSE, EventScript_1A8241 end SilphCo_4F_EventScript_16174F:: @ 816174F diff --git a/data/maps/SilphCo_5F/scripts.inc b/data/maps/SilphCo_5F/scripts.inc index 42164eb7e..d97f831a6 100644 --- a/data/maps/SilphCo_5F/scripts.inc +++ b/data/maps/SilphCo_5F/scripts.inc @@ -4,11 +4,11 @@ SilphCo_5F_MapScripts:: @ 81617BE SilphCo_5F_MapScript1_1617C4:: @ 81617C4 checkflag FLAG_0x280 - call_if lt, EventScript_1A826F + call_if FALSE, EventScript_1A826F checkflag FLAG_0x281 - call_if lt, EventScript_1A82A6 + call_if FALSE, EventScript_1A82A6 checkflag FLAG_0x282 - call_if lt, EventScript_1A82DD + call_if FALSE, EventScript_1A82DD end SilphCo_5F_EventScript_1617E0:: @ 81617E0 diff --git a/data/maps/SilphCo_6F/scripts.inc b/data/maps/SilphCo_6F/scripts.inc index 4caa7936c..2529bccd7 100644 --- a/data/maps/SilphCo_6F/scripts.inc +++ b/data/maps/SilphCo_6F/scripts.inc @@ -4,7 +4,7 @@ SilphCo_6F_MapScripts:: @ 8161881 SilphCo_6F_MapScript1_161887:: @ 8161887 checkflag FLAG_0x283 - call_if lt, EventScript_1A8314 + call_if FALSE, EventScript_1A8314 end SilphCo_6F_EventScript_161891:: @ 8161891 diff --git a/data/maps/SilphCo_7F/scripts.inc b/data/maps/SilphCo_7F/scripts.inc index 871f2fdd7..9d0137cc3 100644 --- a/data/maps/SilphCo_7F/scripts.inc +++ b/data/maps/SilphCo_7F/scripts.inc @@ -5,11 +5,11 @@ SilphCo_7F_MapScripts:: @ 8161984 SilphCo_7F_MapScript1_16198F:: @ 816198F checkflag FLAG_0x284 - call_if lt, EventScript_1A834B + call_if FALSE, EventScript_1A834B checkflag FLAG_0x285 - call_if lt, EventScript_1A8379 + call_if FALSE, EventScript_1A8379 checkflag FLAG_0x286 - call_if lt, EventScript_1A83A7 + call_if FALSE, EventScript_1A83A7 end SilphCo_7F_MapScript2_1619AB:: @ 81619AB @@ -131,16 +131,16 @@ SilphCo_7F_EventScript_161AC8:: @ 8161AC8 lock faceplayer checkflag FLAG_GOT_LAPRAS_FROM_SILPH - goto_if_eq EventScript_161B8D + goto_if TRUE, EventScript_161B8D msgbox gUnknown_8176266 setvar VAR_0x4001, SPECIES_LAPRAS givemon SPECIES_LAPRAS, 25, ITEM_NONE, 0, 0, 0 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_161B12 + goto_if eq, EventScript_161B12 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_161B45 + goto_if eq, EventScript_161B45 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A927C + goto_if eq, EventScript_1A927C release end @@ -153,7 +153,7 @@ EventScript_161B12:: @ 8161B12 getspeciesname 0, SPECIES_LAPRAS msgbox gUnknown_81A56A7, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_161B7E + goto_if eq, EventScript_161B7E call EventScript_1A8C27 call EventScript_1A74EB goto EventScript_161B7E @@ -170,7 +170,7 @@ EventScript_161B45:: @ 8161B45 getspeciesname 0, SPECIES_LAPRAS msgbox gUnknown_81A56A7, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_161B73 + goto_if eq, EventScript_161B73 call EventScript_1A8C33 goto EventScript_161B73 diff --git a/data/maps/SilphCo_8F/scripts.inc b/data/maps/SilphCo_8F/scripts.inc index 4654d0bc7..0bfacced0 100644 --- a/data/maps/SilphCo_8F/scripts.inc +++ b/data/maps/SilphCo_8F/scripts.inc @@ -4,7 +4,7 @@ SilphCo_8F_MapScripts:: @ 8161C5F SilphCo_8F_MapScript1_161C65:: @ 8161C65 checkflag FLAG_0x287 - call_if lt, EventScript_1A83D5 + call_if FALSE, EventScript_1A83D5 end SilphCo_8F_EventScript_161C6F:: @ 8161C6F diff --git a/data/maps/SilphCo_9F/scripts.inc b/data/maps/SilphCo_9F/scripts.inc index 72299d021..36d9be32c 100644 --- a/data/maps/SilphCo_9F/scripts.inc +++ b/data/maps/SilphCo_9F/scripts.inc @@ -4,13 +4,13 @@ SilphCo_9F_MapScripts:: @ 8161CDE SilphCo_9F_MapScript1_161CE4:: @ 8161CE4 checkflag FLAG_0x288 - call_if lt, EventScript_1A840C + call_if FALSE, EventScript_1A840C checkflag FLAG_0x289 - call_if lt, EventScript_1A8443 + call_if FALSE, EventScript_1A8443 checkflag FLAG_0x28A - call_if lt, EventScript_1A847A + call_if FALSE, EventScript_1A847A checkflag FLAG_0x28B - call_if lt, EventScript_1A84A8 + call_if FALSE, EventScript_1A84A8 end SilphCo_9F_EventScript_161D09:: @ 8161D09 diff --git a/data/maps/SilphCo_Elevator/scripts.inc b/data/maps/SilphCo_Elevator/scripts.inc index 826e83658..5883cf799 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 lt, EventScript_1A7AB9 + call_if FALSE, EventScript_1A7AB9 copyvar VAR_0x8005, VAR_0x403A special sub_80CB580 message Text_1A535C @@ -34,7 +34,7 @@ EventScript_16202F:: @ 816202F setvar VAR_0x8006, 4 setdynamicwarp MAP_SILPH_CO_1F, 255, 22, 3 compare_var_to_value VAR_0x403A, 4 - goto_if_eq EventScript_1621E7 + goto_if eq, EventScript_1621E7 call EventScript_1621EC setvar VAR_0x403A, 4 goto EventScript_1621E7 @@ -46,7 +46,7 @@ EventScript_162057:: @ 8162057 setvar VAR_0x8006, 5 setdynamicwarp MAP_SILPH_CO_2F, 255, 22, 3 compare_var_to_value VAR_0x403A, 5 - goto_if_eq EventScript_1621E7 + goto_if eq, EventScript_1621E7 call EventScript_1621EC setvar VAR_0x403A, 5 goto EventScript_1621E7 @@ -58,7 +58,7 @@ EventScript_16207F:: @ 816207F setvar VAR_0x8006, 6 setdynamicwarp MAP_SILPH_CO_3F, 255, 22, 3 compare_var_to_value VAR_0x403A, 6 - goto_if_eq EventScript_1621E7 + goto_if eq, EventScript_1621E7 call EventScript_1621EC setvar VAR_0x403A, 6 goto EventScript_1621E7 @@ -70,7 +70,7 @@ EventScript_1620A7:: @ 81620A7 setvar VAR_0x8006, 7 setdynamicwarp MAP_SILPH_CO_4F, 255, 22, 3 compare_var_to_value VAR_0x403A, 7 - goto_if_eq EventScript_1621E7 + goto_if eq, EventScript_1621E7 call EventScript_1621EC setvar VAR_0x403A, 7 goto EventScript_1621E7 @@ -82,7 +82,7 @@ EventScript_1620CF:: @ 81620CF setvar VAR_0x8006, 8 setdynamicwarp MAP_SILPH_CO_5F, 255, 22, 3 compare_var_to_value VAR_0x403A, 8 - goto_if_eq EventScript_1621E7 + goto_if eq, EventScript_1621E7 call EventScript_1621EC setvar VAR_0x403A, 8 goto EventScript_1621E7 @@ -94,7 +94,7 @@ EventScript_1620F7:: @ 81620F7 setvar VAR_0x8006, 9 setdynamicwarp MAP_SILPH_CO_6F, 255, 20, 3 compare_var_to_value VAR_0x403A, 9 - goto_if_eq EventScript_1621E7 + goto_if eq, EventScript_1621E7 call EventScript_1621EC setvar VAR_0x403A, 9 goto EventScript_1621E7 @@ -106,7 +106,7 @@ EventScript_16211F:: @ 816211F setvar VAR_0x8006, 10 setdynamicwarp MAP_SILPH_CO_7F, 255, 23, 3 compare_var_to_value VAR_0x403A, 10 - goto_if_eq EventScript_1621E7 + goto_if eq, EventScript_1621E7 call EventScript_1621EC setvar VAR_0x403A, 10 goto EventScript_1621E7 @@ -118,7 +118,7 @@ EventScript_162147:: @ 8162147 setvar VAR_0x8006, 11 setdynamicwarp MAP_SILPH_CO_8F, 255, 22, 3 compare_var_to_value VAR_0x403A, 11 - goto_if_eq EventScript_1621E7 + goto_if eq, EventScript_1621E7 call EventScript_1621EC setvar VAR_0x403A, 11 goto EventScript_1621E7 @@ -130,7 +130,7 @@ EventScript_16216F:: @ 816216F setvar VAR_0x8006, 12 setdynamicwarp MAP_SILPH_CO_9F, 255, 24, 3 compare_var_to_value VAR_0x403A, 12 - goto_if_eq EventScript_1621E7 + goto_if eq, EventScript_1621E7 call EventScript_1621EC setvar VAR_0x403A, 12 goto EventScript_1621E7 @@ -142,7 +142,7 @@ EventScript_162197:: @ 8162197 setvar VAR_0x8006, 13 setdynamicwarp MAP_SILPH_CO_10F, 255, 13, 3 compare_var_to_value VAR_0x403A, 13 - goto_if_eq EventScript_1621E7 + goto_if eq, EventScript_1621E7 call EventScript_1621EC setvar VAR_0x403A, 13 goto EventScript_1621E7 @@ -154,7 +154,7 @@ EventScript_1621BF:: @ 81621BF setvar VAR_0x8006, 14 setdynamicwarp MAP_SILPH_CO_11F, 255, 13, 3 compare_var_to_value VAR_0x403A, 14 - goto_if_eq EventScript_1621E7 + goto_if eq, EventScript_1621E7 call EventScript_1621EC setvar VAR_0x403A, 14 goto EventScript_1621E7 diff --git a/data/maps/SixIsland_Mart/scripts.inc b/data/maps/SixIsland_Mart/scripts.inc index 495a0a991..1bdf7756b 100644 --- a/data/maps/SixIsland_Mart/scripts.inc +++ b/data/maps/SixIsland_Mart/scripts.inc @@ -4,7 +4,7 @@ SixIsland_Mart_MapScripts:: @ 8171E65 SixIsland_Mart_EventScript_171E66:: @ 8171E66 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 lock faceplayer message Text_1A6211 diff --git a/data/maps/SixIsland_RuinValley/scripts.inc b/data/maps/SixIsland_RuinValley/scripts.inc index 250791d52..d4bb86841 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 eq, EventScript_168B63 + call_if TRUE, EventScript_168B63 end EventScript_168B63:: @ 8168B63 @@ -25,10 +25,10 @@ SixIsland_RuinValley_EventScript_168B6D:: @ 8168B6D SixIsland_RuinValley_EventScript_168B94:: @ 8168B94 lockall checkflag FLAG_0x2E3 - goto_if_eq EventScript_168BC1 + goto_if TRUE, EventScript_168BC1 msgbox gUnknown_818BDC0, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_168BCB + goto_if eq, EventScript_168BCB msgbox gUnknown_818BE11 braillemessage gUnknown_81A929B waitbuttonpress diff --git a/data/maps/SixIsland_WaterPath_House1/scripts.inc b/data/maps/SixIsland_WaterPath_House1/scripts.inc index e25a96044..b21d1da21 100644 --- a/data/maps/SixIsland_WaterPath_House1/scripts.inc +++ b/data/maps/SixIsland_WaterPath_House1/scripts.inc @@ -6,12 +6,12 @@ SixIsland_WaterPath_House1_EventScript_17206D:: @ 817206D faceplayer special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 special sub_8112364 setvar VAR_0x8004, SPECIES_HERACROSS specialvar VAR_RESULT, sub_80CC48C compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_1720E5 + goto_if eq, EventScript_1720E5 special sub_80A0918 msgbox gUnknown_81A4A3F special sub_80BF8FC @@ -21,13 +21,13 @@ SixIsland_WaterPath_House1_EventScript_17206D:: @ 817206D goto_if ge, EventScript_1720EF special sub_80A0930 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_1720F1 + goto_if eq, EventScript_1720F1 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1720FB + goto_if eq, EventScript_1720FB compare_var_to_value VAR_RESULT, 3 - goto_if_eq EventScript_172121 + goto_if eq, EventScript_172121 compare_var_to_value VAR_RESULT, 4 - goto_if_eq EventScript_17210E + goto_if eq, EventScript_17210E release end @@ -47,14 +47,14 @@ EventScript_1720F1:: @ 81720F1 EventScript_1720FB:: @ 81720FB checkflag FLAG_0x2D9 - goto_if lt, EventScript_172121 + goto_if FALSE, EventScript_172121 msgbox gUnknown_81A4B7A release end EventScript_17210E:: @ 817210E checkflag FLAG_0x2D9 - goto_if lt, EventScript_172121 + goto_if FALSE, EventScript_172121 msgbox gUnknown_81A4B39 release end @@ -64,7 +64,7 @@ EventScript_172121:: @ 8172121 msgbox gUnknown_81A4A88 giveitem ITEM_NEST_BALL compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_17214D + goto_if eq, EventScript_17214D msgbox gUnknown_81A4AD9 release end @@ -77,7 +77,7 @@ EventScript_17214D:: @ 817214D SixIsland_WaterPath_House1_EventScript_172157:: @ 8172157 lockall checkflag FLAG_0x2D9 - goto_if_eq EventScript_17216B + goto_if TRUE, EventScript_17216B msgbox gUnknown_81A4CB9 releaseall end diff --git a/data/maps/ThreeIsland/scripts.inc b/data/maps/ThreeIsland/scripts.inc index 8f671ef90..8d2bd1b6e 100644 --- a/data/maps/ThreeIsland/scripts.inc +++ b/data/maps/ThreeIsland/scripts.inc @@ -5,7 +5,7 @@ ThreeIsland_MapScripts:: @ 81677AD ThreeIsland_MapScript1_1677B3:: @ 81677B3 setworldmapflag FLAG_WORLD_MAP_THREE_ISLAND checkflag FLAG_0x2A3 - call_if eq, EventScript_1677CB + call_if TRUE, EventScript_1677CB compare_var_to_value VAR_MAP_SCENE_THREE_ISLAND, 4 call_if eq, EventScript_1677CF end @@ -29,9 +29,9 @@ ThreeIsland_EventScript_1677D8:: @ 81677D8 ThreeIsland_EventScript_1677E5:: @ 81677E5 lock checkflag FLAG_0x2FC - goto_if_eq EventScript_167806 + goto_if TRUE, EventScript_167806 compare_var_to_value VAR_MAP_SCENE_THREE_ISLAND, 4 - goto_if_eq EventScript_16781A + goto_if eq, EventScript_16781A setvar VAR_0x4001, 0 call EventScript_16786F release @@ -50,7 +50,7 @@ EventScript_16781A:: @ 816781A msgbox gUnknown_818275A checkitemspace ITEM_FULL_RESTORE, 1 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_167865 + goto_if eq, EventScript_167865 giveitemfanfaremsg gUnknown_81827BE, ITEM_FULL_RESTORE additem ITEM_FULL_RESTORE, 1 setflag FLAG_0x2FC @@ -137,7 +137,7 @@ EventScript_167973:: @ 8167973 ThreeIsland_EventScript_167989:: @ 8167989 lock compare_var_to_value VAR_MAP_SCENE_THREE_ISLAND, 4 - goto_if_eq EventScript_1679A1 + goto_if eq, EventScript_1679A1 setvar VAR_0x4001, 1 call EventScript_16786F release @@ -224,7 +224,7 @@ EventScript_167A59:: @ 8167A59 playbgm MUS_SHOUNEN, 0 msgbox gUnknown_81823ED, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_167C35 + goto_if eq, EventScript_167C35 msgbox gUnknown_818247D setvar VAR_LAST_TALKED, 5 trainerbattle 3, TRAINER_BIKER_GOON, 0, Text_1824B7 diff --git a/data/maps/ThreeIsland_BerryForest/scripts.inc b/data/maps/ThreeIsland_BerryForest/scripts.inc index 8a0fd3acf..d1ba3bb4d 100644 --- a/data/maps/ThreeIsland_BerryForest/scripts.inc +++ b/data/maps/ThreeIsland_BerryForest/scripts.inc @@ -19,7 +19,7 @@ ThreeIsland_BerryForest_EventScript_163C83:: @ 8163C83 msgbox gUnknown_817AE8E special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 waitse playmoncry SPECIES_HYPNO, 2 waitmoncry diff --git a/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc b/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc index 4bd0d675f..1dd91296c 100644 --- a/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc +++ b/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc @@ -25,10 +25,10 @@ ThreeIsland_DunsparceTunnel_EventScript_164D60:: @ 8164D60 lock faceplayer checkflag FLAG_0x2E2 - goto_if_eq EventScript_164DC2 + goto_if TRUE, EventScript_164DC2 specialvar VAR_RESULT, IsNationalPokedexEnabled compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_164D90 + goto_if eq, EventScript_164D90 msgbox gUnknown_817D13B closemessage applymovement 1, Movement_1A75E5 @@ -40,7 +40,7 @@ EventScript_164D90:: @ 8164D90 msgbox gUnknown_817D1C9 giveitem ITEM_NUGGET compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_164DB8 + goto_if eq, EventScript_164DB8 setflag FLAG_0x2E2 goto EventScript_164DC2 end diff --git a/data/maps/ThreeIsland_House5/scripts.inc b/data/maps/ThreeIsland_House5/scripts.inc index d93696c0a..1924fb74b 100644 --- a/data/maps/ThreeIsland_House5/scripts.inc +++ b/data/maps/ThreeIsland_House5/scripts.inc @@ -5,7 +5,7 @@ ThreeIsland_House5_EventScript_171920:: @ 8171920 lock faceplayer checkflag FLAG_0x2A3 - goto_if_eq EventScript_171935 + goto_if TRUE, EventScript_171935 msgbox gUnknown_81A3469 release end diff --git a/data/maps/ThreeIsland_Mart/scripts.inc b/data/maps/ThreeIsland_Mart/scripts.inc index 6986607e3..ec0caa100 100644 --- a/data/maps/ThreeIsland_Mart/scripts.inc +++ b/data/maps/ThreeIsland_Mart/scripts.inc @@ -4,7 +4,7 @@ ThreeIsland_Mart_MapScripts:: @ 817188C ThreeIsland_Mart_EventScript_17188D:: @ 817188D special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 lock faceplayer message Text_1A6211 diff --git a/data/maps/TwoIsland/scripts.inc b/data/maps/TwoIsland/scripts.inc index b09f1b0c0..409f477d6 100644 --- a/data/maps/TwoIsland/scripts.inc +++ b/data/maps/TwoIsland/scripts.inc @@ -10,37 +10,37 @@ TwoIsland_MapScript1_16756A:: @ 816756A EventScript_167576:: @ 8167576 checkflag FLAG_0x844 - goto_if_eq EventScript_167597 + goto_if TRUE, EventScript_167597 checkflag FLAG_SYS_GAME_CLEAR - goto_if_eq EventScript_1675B8 + goto_if TRUE, EventScript_1675B8 checkflag FLAG_0x2A3 - goto_if_eq EventScript_1675D9 + goto_if TRUE, EventScript_1675D9 goto EventScript_1675E8 end EventScript_167597:: @ 8167597 checkflag FLAG_0x29D - goto_if lt, EventScript_1675EE + goto_if FALSE, EventScript_1675EE checkflag FLAG_0x29E - goto_if lt, EventScript_1675F4 + goto_if FALSE, EventScript_1675F4 checkflag FLAG_0x29F - goto_if lt, EventScript_1675FD + goto_if FALSE, EventScript_1675FD goto EventScript_167606 end EventScript_1675B8:: @ 81675B8 checkflag FLAG_0x29D - goto_if lt, EventScript_1675EE + goto_if FALSE, EventScript_1675EE checkflag FLAG_0x2A3 - goto_if lt, EventScript_1675EE + goto_if FALSE, EventScript_1675EE checkflag FLAG_0x29E - goto_if lt, EventScript_1675F4 + goto_if FALSE, EventScript_1675F4 goto EventScript_1675FD end EventScript_1675D9:: @ 81675D9 checkflag FLAG_0x29D - goto_if lt, EventScript_1675EE + goto_if FALSE, EventScript_1675EE goto EventScript_1675F4 end @@ -70,21 +70,21 @@ EventScript_167606:: @ 8167606 TwoIsland_EventScript_16760F:: @ 816760F special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 lock faceplayer compare_var_to_value VAR_MAP_SCENE_TWO_ISLAND, 4 - goto_if_eq EventScript_167646 + goto_if eq, EventScript_167646 compare_var_to_value VAR_MAP_SCENE_TWO_ISLAND, 3 - goto_if_eq EventScript_16765E + goto_if eq, EventScript_16765E compare_var_to_value VAR_MAP_SCENE_TWO_ISLAND, 2 - goto_if_eq EventScript_167676 + goto_if eq, EventScript_167676 goto EventScript_16768E end EventScript_167646:: @ 8167646 checkflag FLAG_0x2A0 - goto_if_eq EventScript_1676A6 + goto_if TRUE, EventScript_1676A6 setflag FLAG_0x2A0 message Text_181CAE waitmessage @@ -93,7 +93,7 @@ EventScript_167646:: @ 8167646 EventScript_16765E:: @ 816765E checkflag FLAG_0x29F - goto_if_eq EventScript_1676A6 + goto_if TRUE, EventScript_1676A6 setflag FLAG_0x29F message Text_181C77 waitmessage @@ -102,7 +102,7 @@ EventScript_16765E:: @ 816765E EventScript_167676:: @ 8167676 checkflag FLAG_0x29E - goto_if_eq EventScript_1676A6 + goto_if TRUE, EventScript_1676A6 setflag FLAG_0x29E message Text_181B7C waitmessage @@ -111,7 +111,7 @@ EventScript_167676:: @ 8167676 EventScript_16768E:: @ 816768E checkflag FLAG_0x29D - goto_if_eq EventScript_1676A6 + goto_if TRUE, EventScript_1676A6 setflag FLAG_0x29D message Text_181AFE waitmessage @@ -122,11 +122,11 @@ EventScript_1676A6:: @ 81676A6 message Text_1A6211 waitmessage compare_var_to_value VAR_MAP_SCENE_TWO_ISLAND, 4 - goto_if_eq EventScript_167728 + goto_if eq, EventScript_167728 compare_var_to_value VAR_MAP_SCENE_TWO_ISLAND, 3 - goto_if_eq EventScript_167708 + goto_if eq, EventScript_167708 compare_var_to_value VAR_MAP_SCENE_TWO_ISLAND, 2 - goto_if_eq EventScript_1676EC + goto_if eq, EventScript_1676EC goto EventScript_1676D3 end diff --git a/data/maps/TwoIsland_House/scripts.inc b/data/maps/TwoIsland_House/scripts.inc index 2ad326b08..564ee8481 100644 --- a/data/maps/TwoIsland_House/scripts.inc +++ b/data/maps/TwoIsland_House/scripts.inc @@ -4,7 +4,7 @@ TwoIsland_House_MapScripts:: @ 8171618 TwoIsland_House_EventScript_171619:: @ 8171619 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 special sub_8112364 lock faceplayer @@ -12,7 +12,7 @@ TwoIsland_House_EventScript_171619:: @ 8171619 clearflag FLAG_TEMP_3 clearflag FLAG_TEMP_4 checkflag FLAG_TEMP_1 - goto_if_eq EventScript_17164F + goto_if TRUE, EventScript_17164F msgbox gUnknown_81A2B88 setflag FLAG_TEMP_1 goto EventScript_17164F @@ -26,28 +26,28 @@ EventScript_17164F:: @ 817164F compare_var_to_value VAR_RESULT, 1 call_if eq, EventScript_1717AC checkflag FLAG_TEMP_2 - goto_if_eq EventScript_171687 + goto_if TRUE, EventScript_171687 checkflag FLAG_TEMP_3 - goto_if_eq EventScript_171696 + goto_if TRUE, EventScript_171696 goto EventScript_17179E end EventScript_171687:: @ 8171687 checkflag FLAG_TEMP_3 - call_if eq, EventScript_1717B0 + call_if TRUE, EventScript_1717B0 goto EventScript_1716A5 end EventScript_171696:: @ 8171696 checkflag FLAG_TEMP_2 - call_if eq, EventScript_1717B0 + call_if TRUE, EventScript_1717B0 goto EventScript_1716A5 end EventScript_1716A5:: @ 81716A5 msgbox gUnknown_81A2C63, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_17179E + goto_if eq, EventScript_17179E goto EventScript_1716BE end @@ -59,9 +59,9 @@ EventScript_1716BE:: @ 81716BE goto_if ge, EventScript_17179E special sub_80BFC14 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_171790 + goto_if eq, EventScript_171790 compare_var_to_value VAR_0x8005, 0 - goto_if_eq EventScript_171782 + goto_if eq, EventScript_171782 goto EventScript_1716F4 end @@ -70,13 +70,13 @@ EventScript_1716F4:: @ 81716F4 special sub_80E4634 waitstate compare_var_to_value VAR_0x8004, 0 - goto_if_eq EventScript_1716BE + goto_if eq, EventScript_1716BE checkflag FLAG_TEMP_4 - goto_if_eq EventScript_17175B + goto_if TRUE, EventScript_17175B checkflag FLAG_TEMP_2 - goto_if_eq EventScript_171727 + goto_if TRUE, EventScript_171727 checkflag FLAG_TEMP_3 - goto_if_eq EventScript_171741 + goto_if TRUE, EventScript_171741 end EventScript_171727:: @ 8171727 diff --git a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc index add8fcace..747d6d6b7 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 eq, EventScript_1713EF + call_if TRUE, EventScript_1713EF end EventScript_1713EF:: @ 81713EF @@ -126,9 +126,9 @@ TwoIsland_JoyfulGameCorner_EventScript_171535:: @ 8171535 lock faceplayer compare_var_to_value VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 4 - goto_if_eq EventScript_1BC060 + goto_if eq, EventScript_1BC060 checkflag FLAG_0x2A3 - goto_if_eq EventScript_171555 + goto_if TRUE, EventScript_171555 msgbox gUnknown_81A285C release end @@ -142,18 +142,18 @@ TwoIsland_JoyfulGameCorner_EventScript_17155F:: @ 817155F lock faceplayer compare_var_to_value VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 4 - goto_if_eq EventScript_1BC0CE + goto_if eq, EventScript_1BC0CE checkflag FLAG_0x2FB - goto_if_eq EventScript_1715F5 + goto_if TRUE, EventScript_1715F5 compare_var_to_value VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 3 - goto_if_eq EventScript_17158A + goto_if eq, EventScript_17158A msgbox gUnknown_81A2743 release end EventScript_17158A:: @ 817158A checkflag FLAG_0x2FE - goto_if_eq EventScript_1715C4 + goto_if TRUE, EventScript_1715C4 msgbox gUnknown_81A296A setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 2 textcolor 3 @@ -170,7 +170,7 @@ EventScript_17158A:: @ 817158A EventScript_1715C4:: @ 81715C4 checkitemspace ITEM_MOON_STONE, 1 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_1715FF + goto_if eq, EventScript_1715FF additem ITEM_MOON_STONE, 1 setflag FLAG_0x2FB giveitemfanfaremsg gUnknown_81A2A9A, ITEM_MOON_STONE diff --git a/data/maps/UndergroundPath_NorthEntrance/scripts.inc b/data/maps/UndergroundPath_NorthEntrance/scripts.inc index f54e710e6..4d5a806e2 100644 --- a/data/maps/UndergroundPath_NorthEntrance/scripts.inc +++ b/data/maps/UndergroundPath_NorthEntrance/scripts.inc @@ -7,10 +7,10 @@ UndergroundPath_NorthEntrance_EventScript_160E39:: @ 8160E39 setvar VAR_0x8008, 2 call EventScript_1A8CAD checkflag FLAG_DID_MS_NIDO_TRADE - goto_if_eq EventScript_160EAB + goto_if TRUE, EventScript_160EAB msgbox gUnknown_81A5AD6, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_160E93 + goto_if eq, EventScript_160E93 call EventScript_1A8CBD compare_var_to_value VAR_0x8004, 6 goto_if ge, EventScript_160E93 diff --git a/data/maps/VermilionCity/scripts.inc b/data/maps/VermilionCity/scripts.inc index 4ec5c4ee2..cdc6bb80a 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 eq, EventScript_166913 + call_if TRUE, EventScript_166913 end EventScript_166913:: @ 8166913 @@ -38,7 +38,7 @@ VermilionCity_EventScript_166920:: @ 8166920 lock faceplayer compare_var_to_value VAR_MAP_SCENE_VERMILION_CITY, 3 - goto_if_eq EventScript_166937 + goto_if eq, EventScript_166937 msgbox gUnknown_817F776 release end @@ -52,26 +52,26 @@ VermilionCity_EventScript_166941:: @ 8166941 lock faceplayer compare_var_to_value VAR_MAP_SCENE_VERMILION_CITY, 3 - goto_if_eq EventScript_166996 + goto_if eq, EventScript_166996 msgbox gUnknown_817FA22 release end EventScript_166958:: @ 8166958 checkflag FLAG_0x84A - goto_if lt, EventScript_1A77B0 + goto_if FALSE, EventScript_1A77B0 checkitem ITEM_MYSTIC_TICKET, 1 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_1A77B0 + goto_if eq, EventScript_1A77B0 goto EventScript_1A77AA end EventScript_166977:: @ 8166977 checkflag FLAG_0x84B - goto_if lt, EventScript_1A77B0 + goto_if FALSE, EventScript_1A77B0 checkitem ITEM_AURORA_TICKET, 1 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_1A77B0 + goto_if eq, EventScript_1A77B0 goto EventScript_1A77AA end @@ -88,14 +88,14 @@ EventScript_166996:: @ 8166996 EventScript_1669BB:: @ 81669BB special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 special sub_8112364 call EventScript_166958 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_1669FD + goto_if eq, EventScript_1669FD call EventScript_166977 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_166A5F + goto_if eq, EventScript_166A5F setvar VAR_0x8004, 0 message Text_17FBB8 waitmessage @@ -105,9 +105,9 @@ EventScript_1669BB:: @ 81669BB EventScript_1669FD:: @ 81669FD call EventScript_166977 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_166AB1 + goto_if eq, EventScript_166AB1 checkflag FLAG_0x2F0 - call_if lt, EventScript_166A53 + call_if FALSE, 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 lt, EventScript_166AA5 + call_if FALSE, 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 lt, EventScript_166A53 + call_if FALSE, EventScript_166A53 checkflag FLAG_0x2F1 - call_if lt, EventScript_166AA5 + call_if FALSE, EventScript_166AA5 message Text_17FCC1 waitmessage multichoice 13, 5, 56, 0 @@ -210,10 +210,10 @@ EventScript_166BA0:: @ 8166BA0 applymovement 255, Movement_1A75EB waitmovement 0 compare_var_to_value VAR_MAP_SCENE_VERMILION_CITY, 3 - goto_if_eq EventScript_166BED + goto_if eq, EventScript_166BED msgbox gUnknown_817FA3C checkflag FLAG_GOT_SS_TICKET - goto_if lt, EventScript_166BDE + goto_if FALSE, EventScript_166BDE msgbox gUnknown_817FA77 setvar VAR_VERMILION_CITY_TICKET_CHECK_TRIGGER, 1 releaseall diff --git a/data/maps/VermilionCity_Gym/scripts.inc b/data/maps/VermilionCity_Gym/scripts.inc index 78b023c7b..48fa76fe0 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 eq, EventScript_16B6BC - checkflag FLAG_0x264 - call_if eq, EventScript_16B717 + call_if TRUE, EventScript_16B6BC + checkflag FLAG_FOUND_BOTH_VERMILION_GYM_SWITCHES + call_if TRUE, EventScript_16B717 end EventScript_16B6BC:: @ 816B6BC @@ -41,9 +41,9 @@ VermilionCity_Gym_MapScript2_16B772:: @ 816B772 end EventScript_16B778:: @ 816B778 - checkflag FLAG_0x264 - goto_if_eq EventScript_1A77A9 - special sub_80CADEC + checkflag FLAG_FOUND_BOTH_VERMILION_GYM_SWITCHES + goto_if TRUE, EventScript_1A77A9 + special Special_SetVermilionTrashCans copyvar VAR_0x4000, VAR_0x8004 copyvar VAR_0x4001, VAR_0x8005 return @@ -141,16 +141,16 @@ VermilionCity_Gym_EventScript_16B837:: @ 816B837 EventScript_16B843:: @ 816B843 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 special sub_8112364 copyvar VAR_0x8004, VAR_0x4000 copyvar VAR_0x8005, VAR_0x4001 - checkflag FLAG_0x264 - goto_if_eq EventScript_16B8E5 + checkflag FLAG_FOUND_BOTH_VERMILION_GYM_SWITCHES + goto_if TRUE, EventScript_16B8E5 checkflag FLAG_TEMP_1 - goto_if_eq EventScript_16B89E + goto_if TRUE, EventScript_16B89E compare_var_to_var VAR_0x8004, VAR_0x8008 - goto_if_eq EventScript_16B885 + goto_if eq, EventScript_16B885 msgbox gUnknown_8195289 releaseall end @@ -167,10 +167,10 @@ EventScript_16B885:: @ 816B885 EventScript_16B89E:: @ 816B89E compare_var_to_var VAR_0x8005, VAR_0x8008 - goto_if_eq EventScript_16B8CB + goto_if eq, EventScript_16B8CB msgbox gUnknown_819536C clearflag FLAG_TEMP_1 - special sub_80CADEC + special Special_SetVermilionTrashCans copyvar VAR_0x4000, VAR_0x8004 copyvar VAR_0x4001, VAR_0x8005 call EventScript_16B8EF @@ -185,7 +185,7 @@ EventScript_16B8CB:: @ 816B8CB special DrawWholeMapView playse SE_KI_GASYAN waitse - setflag FLAG_0x264 + setflag FLAG_FOUND_BOTH_VERMILION_GYM_SWITCHES releaseall end @@ -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 lt, EventScript_16B9AF + goto_if FALSE, 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 lt, EventScript_16B9AB + call_if FALSE, EventScript_16B9AB clearflag FLAG_HIDE_FAME_CHECKER_LT_SURGE_JOURNAL setflag FLAG_DEFEATED_LT_SURGE setflag FLAG_BADGE03_GET @@ -235,7 +235,7 @@ EventScript_16B9AF:: @ 816B9AF msgbox gUnknown_8194CFA checkitemspace ITEM_TM34, 1 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16B9F0 + goto_if eq, EventScript_16B9F0 additem ITEM_TM34, 1 giveitemfanfaremsg gUnknown_8194D87, ITEM_TM34 setflag FLAG_GOT_TM34_FROM_SURGE @@ -274,7 +274,7 @@ VermilionCity_Gym_EventScript_16BA6C:: @ 816BA6C lock faceplayer checkflag FLAG_DEFEATED_LT_SURGE - goto_if_eq EventScript_16BA81 + goto_if TRUE, EventScript_16BA81 msgbox gUnknown_81950B4 release end @@ -287,7 +287,7 @@ EventScript_16BA81:: @ 816BA81 VermilionCity_Gym_EventScript_16BA8B:: @ 816BA8B lockall checkflag FLAG_BADGE03_GET - goto_if_eq EventScript_16BA9F + goto_if TRUE, EventScript_16BA9F msgbox gUnknown_819520B releaseall end diff --git a/data/maps/VermilionCity_House1/scripts.inc b/data/maps/VermilionCity_House1/scripts.inc index a25143147..6020f9cb0 100644 --- a/data/maps/VermilionCity_House1/scripts.inc +++ b/data/maps/VermilionCity_House1/scripts.inc @@ -5,10 +5,10 @@ VermilionCity_House1_EventScript_16B3A7:: @ 816B3A7 lock faceplayer checkflag FLAG_GOT_OLD_ROD - goto_if_eq EventScript_16B3CF + goto_if TRUE, EventScript_16B3CF msgbox gUnknown_8193EC1, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16B3D9 + goto_if eq, EventScript_16B3D9 msgbox gUnknown_8194028 release end @@ -21,7 +21,7 @@ EventScript_16B3CF:: @ 816B3CF EventScript_16B3D9:: @ 816B3D9 checkitemspace ITEM_OLD_ROD, 1 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16B41A + goto_if eq, EventScript_16B41A additem ITEM_OLD_ROD, 1 msgbox gUnknown_8193F2A giveitemfanfaremsg gUnknown_8193F81, ITEM_OLD_ROD diff --git a/data/maps/VermilionCity_House2/scripts.inc b/data/maps/VermilionCity_House2/scripts.inc index 9b347c9bb..fa9fd6453 100644 --- a/data/maps/VermilionCity_House2/scripts.inc +++ b/data/maps/VermilionCity_House2/scripts.inc @@ -7,10 +7,10 @@ VermilionCity_House2_EventScript_16B5D7:: @ 816B5D7 setvar VAR_0x8008, 3 call EventScript_1A8CAD checkflag FLAG_DID_CH_DING_TRADE - goto_if_eq EventScript_16B649 + goto_if TRUE, EventScript_16B649 msgbox gUnknown_81949CB, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16B631 + goto_if eq, EventScript_16B631 call EventScript_1A8CBD compare_var_to_value VAR_0x8004, 6 goto_if ge, EventScript_16B631 diff --git a/data/maps/VermilionCity_Mart/scripts.inc b/data/maps/VermilionCity_Mart/scripts.inc index c83e239d9..d7beb6e7e 100644 --- a/data/maps/VermilionCity_Mart/scripts.inc +++ b/data/maps/VermilionCity_Mart/scripts.inc @@ -12,7 +12,7 @@ VermilionCity_Mart_EventScript_16B65D:: @ 816B65D VermilionCity_Mart_EventScript_16B666:: @ 816B666 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 lock faceplayer message Text_1A6211 diff --git a/data/maps/VermilionCity_PokemonFanClub/scripts.inc b/data/maps/VermilionCity_PokemonFanClub/scripts.inc index a164b04ca..397c174ea 100644 --- a/data/maps/VermilionCity_PokemonFanClub/scripts.inc +++ b/data/maps/VermilionCity_PokemonFanClub/scripts.inc @@ -5,10 +5,10 @@ VermilionCity_PokemonFanClub_EventScript_16B47F:: @ 816B47F lock faceplayer checkflag FLAG_GOT_BIKE_VOUCHER - goto_if_eq EventScript_16B4A7 + goto_if TRUE, EventScript_16B4A7 msgbox gUnknown_819457E, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16B4B1 + goto_if eq, EventScript_16B4B1 msgbox gUnknown_8194860 release end @@ -22,7 +22,7 @@ EventScript_16B4B1:: @ 816B4B1 msgbox gUnknown_8194628 checkitemspace ITEM_BIKE_VOUCHER, 1 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16B4F2 + goto_if eq, EventScript_16B4F2 setflag FLAG_GOT_BIKE_VOUCHER additem ITEM_BIKE_VOUCHER, 1 giveitemfanfaremsg gUnknown_819474E, ITEM_BIKE_VOUCHER, 1, MUS_FAN5 @@ -39,7 +39,7 @@ VermilionCity_PokemonFanClub_EventScript_16B4FC:: @ 816B4FC lock faceplayer checkflag FLAG_SYS_GAME_CLEAR - goto_if_eq EventScript_16B511 + goto_if TRUE, EventScript_16B511 msgbox gUnknown_81948E6 release end @@ -54,7 +54,7 @@ VermilionCity_PokemonFanClub_EventScript_16B528:: @ 816B528 lock faceplayer checkflag FLAG_TEMP_3 - goto_if_eq EventScript_16B54B + goto_if TRUE, EventScript_16B54B msgbox gUnknown_81944CC closemessage applymovement 5, Movement_1A75E5 @@ -76,7 +76,7 @@ VermilionCity_PokemonFanClub_EventScript_16B563:: @ 816B563 lock faceplayer checkflag FLAG_TEMP_2 - goto_if_eq EventScript_16B586 + goto_if TRUE, EventScript_16B586 msgbox gUnknown_819446F closemessage applymovement 6, Movement_1A75E5 diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc index 14b30547f..a5b2a201d 100644 --- a/data/maps/VictoryRoad_1F/scripts.inc +++ b/data/maps/VictoryRoad_1F/scripts.inc @@ -20,7 +20,7 @@ VictoryRoad_1F_MapScript2_160F2F:: @ 8160F2F VictoryRoad_1F_EventScript_160F33:: @ 8160F33 lockall compare_var_to_value VAR_MAP_SCENE_VICTORY_ROAD_1F, 100 - goto_if_eq EventScript_160F62 + goto_if eq, EventScript_160F62 setmetatile 12, 14, 721, 0 setmetatile 12, 15, 737, 0 playse SE_RU_GASYAN diff --git a/data/maps/VictoryRoad_2F/scripts.inc b/data/maps/VictoryRoad_2F/scripts.inc index f53e2fcd6..2118560fd 100644 --- a/data/maps/VictoryRoad_2F/scripts.inc +++ b/data/maps/VictoryRoad_2F/scripts.inc @@ -22,7 +22,7 @@ EventScript_160FC2:: @ 8160FC2 VictoryRoad_2F_EventScript_160FD5:: @ 8160FD5 lockall compare_var_to_value VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER1, 100 - goto_if_eq EventScript_161004 + goto_if eq, EventScript_161004 setmetatile 13, 10, 721, 0 setmetatile 13, 11, 737, 0 playse SE_RU_GASYAN @@ -40,7 +40,7 @@ EventScript_161004:: @ 8161004 VictoryRoad_2F_EventScript_161006:: @ 8161006 lockall compare_var_to_value VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER2, 100 - goto_if_eq EventScript_161035 + goto_if eq, EventScript_161035 setmetatile 33, 16, 721, 0 setmetatile 33, 17, 737, 0 playse SE_RU_GASYAN diff --git a/data/maps/VictoryRoad_3F/scripts.inc b/data/maps/VictoryRoad_3F/scripts.inc index 87e115235..75d60e4d3 100644 --- a/data/maps/VictoryRoad_3F/scripts.inc +++ b/data/maps/VictoryRoad_3F/scripts.inc @@ -15,7 +15,7 @@ EventScript_1610BC:: @ 81610BC VictoryRoad_3F_EventScript_1610CF:: @ 81610CF lockall compare_var_to_value VAR_MAP_SCENE_VICTORY_ROAD_3F, 100 - goto_if_eq EventScript_161101 + goto_if eq, EventScript_161101 setmetatile 12, 12, 721, 0 setmetatile 12, 13, 737, 0 playse SE_RU_GASYAN diff --git a/data/maps/ViridianCity/scripts.inc b/data/maps/ViridianCity/scripts.inc index 03a3db88d..5c5cebf82 100644 --- a/data/maps/ViridianCity/scripts.inc +++ b/data/maps/ViridianCity/scripts.inc @@ -32,17 +32,17 @@ EventScript_165920:: @ 8165920 EventScript_165931:: @ 8165931 checkflag FLAG_BADGE02_GET - goto_if lt, EventScript_1A77A9 + goto_if FALSE, EventScript_1A77A9 checkflag FLAG_BADGE03_GET - goto_if lt, EventScript_1A77A9 + goto_if FALSE, EventScript_1A77A9 checkflag FLAG_BADGE04_GET - goto_if lt, EventScript_1A77A9 + goto_if FALSE, EventScript_1A77A9 checkflag FLAG_BADGE05_GET - goto_if lt, EventScript_1A77A9 + goto_if FALSE, EventScript_1A77A9 checkflag FLAG_BADGE06_GET - goto_if lt, EventScript_1A77A9 + goto_if FALSE, EventScript_1A77A9 checkflag FLAG_BADGE07_GET - goto_if lt, EventScript_1A77A9 + goto_if FALSE, EventScript_1A77A9 setvar VAR_MAP_SCENE_VIRIDIAN_CITY_GYM_DOOR, 1 return @@ -91,7 +91,7 @@ ViridianCity_EventScript_1659CA:: @ 81659CA lock faceplayer compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_GYM_DOOR, 1 - goto_if_eq EventScript_1659EC + goto_if eq, EventScript_1659EC msgbox gUnknown_817DB39 closemessage applymovement 3, Movement_1A75E5 @@ -108,19 +108,19 @@ ViridianCity_EventScript_1659F6:: @ 81659F6 lock faceplayer checkflag FLAG_BADGE01_GET - goto_if_eq EventScript_165A23 + goto_if TRUE, EventScript_165A23 compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 2 goto_if ge, EventScript_165A4A compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 1 - goto_if_eq EventScript_165A54 + goto_if eq, EventScript_165A54 compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 0 - goto_if_eq EventScript_165A84 + goto_if eq, EventScript_165A84 end EventScript_165A23:: @ 8165A23 msgbox gUnknown_817E046, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_165A40 + goto_if eq, EventScript_165A40 msgbox gUnknown_817E0EA release end @@ -149,7 +149,7 @@ EventScript_165A65:: @ 8165A65 msgbox gUnknown_817DE9B special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 special sub_8112364 special sub_807F888 waitstate @@ -167,9 +167,9 @@ ViridianCity_EventScript_165A8F:: @ 8165A8F faceplayer msgbox gUnknown_817DB98, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_165AB0 + goto_if eq, EventScript_165AB0 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_165ABA + goto_if eq, EventScript_165ABA end EventScript_165AB0:: @ 8165AB0 @@ -186,7 +186,7 @@ ViridianCity_EventScript_165AC4:: @ 8165AC4 lock faceplayer compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 0 - goto_if_eq EventScript_165ADB + goto_if eq, EventScript_165ADB msgbox gUnknown_817DC99 release end @@ -244,7 +244,7 @@ EventScript_165B4C:: @ 8165B4C closemessage special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 special sub_8112364 special sub_807F888 waitstate diff --git a/data/maps/ViridianCity_Gym/scripts.inc b/data/maps/ViridianCity_Gym/scripts.inc index 8b470aa84..d759f39f9 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 lt, EventScript_169F2F + goto_if FALSE, EventScript_169F2F msgbox gUnknown_818F4A2 closemessage fadescreen 1 @@ -28,7 +28,7 @@ EventScript_169F2F:: @ 8169F2F msgbox gUnknown_818F586 checkitemspace ITEM_TM26, 1 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_169F70 + goto_if eq, EventScript_169F70 additem ITEM_TM26, 1 giveitemfanfaremsg gUnknown_818F675, ITEM_TM26 setflag FLAG_0x298 @@ -85,7 +85,7 @@ ViridianCity_Gym_EventScript_16A032:: @ 816A032 lock faceplayer checkflag FLAG_DEFEATED_LEADER_GIOVANNI - goto_if_eq EventScript_16A047 + goto_if TRUE, EventScript_16A047 msgbox gUnknown_818FA81 release end @@ -99,7 +99,7 @@ EventScript_16A047:: @ 816A047 ViridianCity_Gym_EventScript_16A05E:: @ 816A05E lockall checkflag FLAG_BADGE08_GET - goto_if_eq EventScript_16A072 + goto_if TRUE, EventScript_16A072 msgbox gUnknown_818FB8D releaseall end diff --git a/data/maps/ViridianCity_House2/scripts.inc b/data/maps/ViridianCity_House2/scripts.inc index c8388e2f7..a31719b55 100644 --- a/data/maps/ViridianCity_House2/scripts.inc +++ b/data/maps/ViridianCity_House2/scripts.inc @@ -26,15 +26,15 @@ ViridianCity_House2_EventScript_16A0AB:: @ 816A0AB msgbox gUnknown_818FC65 msgbox gUnknown_818FF19, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16A11B + goto_if eq, EventScript_16A11B msgbox gUnknown_818FD23 msgbox gUnknown_818FF19, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16A11B + goto_if eq, EventScript_16A11B msgbox gUnknown_818FDA8 msgbox gUnknown_818FF19, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16A11B + goto_if eq, EventScript_16A11B msgbox gUnknown_818FE5C applymovement 2, Movement_1A75E9 waitmovement 0 diff --git a/data/maps/ViridianCity_Mart/scripts.inc b/data/maps/ViridianCity_Mart/scripts.inc index 81e13fb1f..95c45ea7d 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 lt, EventScript_16A1E8 + goto_if FALSE, EventScript_16A1E8 end EventScript_16A1E8:: @ 816A1E8 @@ -55,10 +55,10 @@ ViridianCity_Mart_EventScript_16A268:: @ 816A268 lock faceplayer compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 1 - goto_if_eq EventScript_16A2A4 + goto_if eq, EventScript_16A2A4 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 message Text_1A6211 waitmessage pokemart Items_16A298 diff --git a/data/specials.inc b/data/specials.inc index b6d189c18..20c2fec71 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -356,7 +356,7 @@ gSpecials:: @ 815FD60 def_special sub_80CB7C4 def_special sub_80CBC5C def_special sub_80CADC4 - def_special sub_80CADEC + def_special Special_SetVermilionTrashCans def_special sub_805D1A8 def_special sub_80CB0A8 def_special Special_CheckAddCoins diff --git a/include/constants/flags.h b/include/constants/flags.h index 78f6cdce9..97e54086f 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -605,39 +605,39 @@ #define FLAG_DID_CH_DING_TRADE 0x24D #define FLAG_GOT_TM38_FROM_BLAINE 0x24E #define FLAG_OAK_SKIP_22_RIVAL_CHECK 0x24F -#define FLAG_0x250 0x250 -#define FLAG_0x251 0x251 -#define FLAG_0x252 0x252 -#define FLAG_0x253 0x253 -#define FLAG_0x254 0x254 -#define FLAG_0x255 0x255 -#define FLAG_0x256 0x256 -#define FLAG_0x257 0x257 -#define FLAG_0x258 0x258 -#define FLAG_0x259 0x259 -#define FLAG_0x25A 0x25A -#define FLAG_0x25B 0x25B -#define FLAG_0x25C 0x25C -#define FLAG_0x25D 0x25D -#define FLAG_0x25E 0x25E -#define FLAG_0x25F 0x25F -#define FLAG_0x260 0x260 -#define FLAG_0x261 0x261 -#define FLAG_0x262 0x262 -#define FLAG_0x263 0x263 -#define FLAG_0x264 0x264 -#define FLAG_0x265 0x265 -#define FLAG_PENDING_DAYCARE_EGG 0x266 -#define FLAG_0x267 0x267 -#define FLAG_0x268 0x268 -#define FLAG_0x269 0x269 -#define FLAG_0x26A 0x26A -#define FLAG_0x26B 0x26B -#define FLAG_0x26C 0x26C -#define FLAG_0x26D 0x26D -#define FLAG_0x26E 0x26E -#define FLAG_0x26F 0x26F -#define FLAG_0x270 0x270 +#define FLAG_GOT_MASTER_BALL_FROM_SILPH 0x250 +#define FLAG_DID_NINA_TRADE 0x251 +#define FLAG_GOT_ITEMFINDER 0x252 +#define FLAG_WOKE_UP_ROUTE_12_SNORLAX 0x253 +#define FLAG_GOT_TM39_FROM_BROCK 0x254 +#define FLAG_GOT_SUPER_ROD 0x255 +#define FLAG_GOT_EXP_SHARE_FROM_OAKS_AIDE 0x256 +#define FLAG_DID_MARC_TRADE 0x257 +#define FLAG_BEAT_RIVAL_IN_OAKS_LAB 0x258 +#define FLAG_GOT_TM06_FROM_KOGA 0x259 +#define FLAG_0x25A 0x25A +#define FLAG_GOT_TM27 0x25B +#define FLAG_0x25C 0x25C +#define FLAG_0x25D 0x25D +#define FLAG_GOT_OLD_AMBER 0x25E +#define FLAG_0x25F 0x25F +#define FLAG_0x260 0x260 +#define FLAG_0x261 0x261 +#define FLAG_0x262 0x262 +#define FLAG_GOT_EEVEE 0x263 +#define FLAG_FOUND_BOTH_VERMILION_GYM_SWITCHES 0x264 +#define FLAG_CINNABAR_GYM_QUIZ_1 0x265 +#define FLAG_PENDING_DAYCARE_EGG 0x266 +#define FLAG_CINNABAR_GYM_QUIZ_2 0x267 +#define FLAG_CINNABAR_GYM_QUIZ_3 0x268 +#define FLAG_CINNABAR_GYM_QUIZ_4 0x269 +#define FLAG_CINNABAR_GYM_QUIZ_5 0x26A +#define FLAG_CINNABAR_GYM_QUIZ_6 0x26B +#define FLAG_POKEMON_MANSION_SWITCH_STATE 0x26C +#define FLAG_OPENED_ROCKET_HIDEOUT 0x26D +#define FLAG_GOT_10_COINS_FROM_GAMBLER 0x26E +#define FLAG_GOT_20_COINS_FROM_GAMBLER 0x26F +#define FLAG_GOT_20_COINS_FROM_GAMBLER_2 0x270 #define FLAG_0x271 0x271 #define FLAG_0x272 0x272 #define FLAG_0x273 0x273 @@ -1323,7 +1323,7 @@ #define FLAG_BLACK_FLUTE_ACTIVE (SYS_FLAGS + 0x4) #define FLAG_0x805 (SYS_FLAGS + 0x5) #define FLAG_0x806 (SYS_FLAGS + 0x6) -#define FLAG_0x807 (SYS_FLAGS + 0x7) +#define FLAG_SYS_SPECIAL_WILD_BATTLE (SYS_FLAGS + 0x7) #define FLAG_BADGE01_GET (SYS_FLAGS + 0x20) #define FLAG_BADGE02_GET (SYS_FLAGS + 0x21) |