diff options
150 files changed, 999 insertions, 1231 deletions
diff --git a/berry_fix/payload/asm/macros/event.inc b/berry_fix/payload/asm/macros/event.inc index d805aecb5..fd2181663 100644 --- a/berry_fix/payload/asm/macros/event.inc +++ b/berry_fix/payload/asm/macros/event.inc @@ -1402,8 +1402,8 @@ @ Supplementary - .macro goto_if_eq dest - goto_if 1, \dest + .macrogoto_if_eq dest + goto_if_eq \dest .endm .macro switch var diff --git a/data/map_event_scripts.inc b/data/map_event_scripts.inc index 96d096695..897c7ca7a 100644 --- a/data/map_event_scripts.inc +++ b/data/map_event_scripts.inc @@ -7324,15 +7324,15 @@ EventScript_1A6697:: @ 81A6697 EventScript_1A66BC:: @ 81A66BC copyvar VAR_0x8000, VAR_RESULT compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1A66F9 + goto_if_eq EventScript_1A66F9 compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1A6709 + goto_if_eq EventScript_1A6709 compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_1A6719 + goto_if_eq EventScript_1A6719 compare_var_to_value VAR_0x8000, 4 - goto_if 1, EventScript_1A6729 + goto_if_eq EventScript_1A6729 compare_var_to_value VAR_0x8000, 5 - goto_if 1, EventScript_1A6739 + goto_if_eq EventScript_1A6739 end EventScript_1A66F9:: @ 81A66F9 diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc index df3327bf0..1d3fc4db6 100644 --- a/data/maps/BirthIsland_Exterior/scripts.inc +++ b/data/maps/BirthIsland_Exterior/scripts.inc @@ -26,7 +26,7 @@ EventScript_16523C:: @ 816523C EventScript_165243:: @ 8165243 checkflag FLAG_0x2F7 - goto_if 1, EventScript_1A77A9 + goto_if_eq EventScript_1A77A9 clearflag FLAG_0x09A clearflag FLAG_0x848 return @@ -48,19 +48,15 @@ BirthIsland_Exterior_EventScript_165271:: @ 8165271 faceplayer special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 special sub_80CCDFC waitstate - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1652BA - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1652BC - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1652C0 - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_1652BE + switch VAR_RESULT + case 0, EventScript_1652BA + case 1, EventScript_1652BC + case 2, EventScript_1652C0 + case 3, EventScript_1652BE end EventScript_1652BA:: @ 81652BA @@ -101,11 +97,11 @@ EventScript_1652C0:: @ 81652C0 clearflag FLAG_0x807 specialvar VAR_RESULT, sub_80CA74C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16533A + goto_if_eq EventScript_16533A compare_var_to_value VAR_RESULT, 4 - goto_if 1, EventScript_165348 + goto_if_eq EventScript_165348 compare_var_to_value VAR_RESULT, 5 - goto_if 1, EventScript_165348 + goto_if_eq EventScript_165348 setflag FLAG_0x2E4 release end diff --git a/data/maps/BirthIsland_Harbor/scripts.inc b/data/maps/BirthIsland_Harbor/scripts.inc index 70b91e3d9..487cae2f1 100644 --- a/data/maps/BirthIsland_Harbor/scripts.inc +++ b/data/maps/BirthIsland_Harbor/scripts.inc @@ -8,13 +8,10 @@ BirthIsland_Harbor_EventScript_1653E7:: @ 81653E7 waitmessage setvar VAR_0x8004, 10 multichoice 20, 8, 61, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1A91D5 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1A90F6 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_1A90F6 + switch VAR_RESULT + case 0, EventScript_1A91D5 + case 1, EventScript_1A90F6 + case 127, EventScript_1A90F6 end NavelRock_Harbor_MapScripts:: @ 8165420 @@ -27,11 +24,8 @@ NavelRock_Harbor_EventScript_165421:: @ 8165421 waitmessage setvar VAR_0x8004, 9 multichoice 20, 8, 61, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1A91D5 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1A90F6 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_1A90F6 + switch VAR_RESULT + case 0, EventScript_1A91D5 + case 1, EventScript_1A90F6 + case 127, EventScript_1A90F6 end diff --git a/data/maps/CeladonCity_Condominiums_1F/scripts.inc b/data/maps/CeladonCity_Condominiums_1F/scripts.inc index 88dd869b9..c9f358f44 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 1, EventScript_16C36A + goto_if_eq EventScript_16C36A checkflag FLAG_0x82C - goto_if 1, EventScript_16C374 + goto_if_eq EventScript_16C374 checkflag FLAG_0x2A6 - goto_if 1, EventScript_16C36A + goto_if_eq EventScript_16C36A msgbox gUnknown_81960C9 setflag FLAG_0x2A6 giveitem ITEM_TEA compare_var_to_value VAR_RESULT, 0 - goto_if 1, 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 46c5548dc..350bc76d0 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, sub_8088F58 compare_var_to_value VAR_RESULT, 1 - goto_if 1, 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 1, 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 70828062d..8e8bb2b6b 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 1, EventScript_16C4A6 + goto_if_eq EventScript_16C4A6 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16C4DA + goto_if_eq EventScript_16C4DA compare_var_to_value VAR_RESULT, 2 - goto_if 1, 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 1, 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 1, EventScript_16C509 + goto_if_eq EventScript_16C509 call EventScript_1A8C33 goto EventScript_16C509 end @@ -69,34 +69,24 @@ CeladonCity_Condominiums_RoofRoom_EventScript_16C522:: @ 816C522 waitmessage setvar VAR_0x8004, 4 multichoice 0, 0, 43, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_16C5C0 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_16C5CE - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_16C5DC - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_16C5EA - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_16C5EA + switch VAR_RESULT + case 0, EventScript_16C5C0 + case 1, EventScript_16C5CE + case 2, EventScript_16C5DC + case 3, EventScript_16C5EA + case 127, EventScript_16C5EA end EventScript_16C578:: @ 816C578 message Text_1965F4 waitmessage multichoice 0, 0, 43, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_16C5C0 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_16C5CE - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_16C5DC - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_16C5EA - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_16C5EA + switch VAR_RESULT + case 0, EventScript_16C5C0 + case 1, EventScript_16C5CE + case 2, EventScript_16C5DC + case 3, EventScript_16C5EA + case 127, EventScript_16C5EA end EventScript_16C5C0:: @ 816C5C0 diff --git a/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc index 2f8f41777..8d859502e 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 1, 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 1, 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 f90728d50..2aad6e02b 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 1, 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 59b5a7d9b..05aff00cd 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 1, 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 1, 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 2252f511c..6f104041e 100644 --- a/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc @@ -12,17 +12,12 @@ CeladonCity_DepartmentStore_Elevator_EventScript_16C153:: @ 816C153 waitmessage setvar VAR_0x8004, 3 specialvar VAR_RESULT, sub_80CB328 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_16C1B7 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_16C1C3 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_16C1CF - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_16C1DB - compare_var_to_value VAR_0x8000, 4 - goto_if 1, EventScript_16C1E7 + switch VAR_RESULT + case 0, EventScript_16C1B7 + case 1, EventScript_16C1C3 + case 2, EventScript_16C1CF + case 3, EventScript_16C1DB + case 4, EventScript_16C1E7 end EventScript_16C1B7:: @ 816C1B7 @@ -53,28 +48,21 @@ EventScript_16C1E7:: @ 816C1E7 end EventScript_16C1F3:: @ 816C1F3 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_16C2E6 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_16C2BE - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_16C296 - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_16C26E - compare_var_to_value VAR_0x8000, 4 - goto_if 1, EventScript_16C246 - compare_var_to_value VAR_0x8000, 5 - goto_if 1, EventScript_16C30E - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_16C30E + switch VAR_RESULT + case 0, EventScript_16C2E6 + case 1, EventScript_16C2BE + case 2, EventScript_16C296 + case 3, EventScript_16C26E + case 4, EventScript_16C246 + case 5, EventScript_16C30E + case 127, EventScript_16C30E end 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 1, EventScript_16C30E + goto_if_eq EventScript_16C30E call EventScript_16C313 setvar VAR_0x403A, 4 goto EventScript_16C30E @@ -84,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 1, EventScript_16C30E + goto_if_eq EventScript_16C30E call EventScript_16C313 setvar VAR_0x403A, 5 goto EventScript_16C30E @@ -94,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 1, EventScript_16C30E + goto_if_eq EventScript_16C30E call EventScript_16C313 setvar VAR_0x403A, 6 goto EventScript_16C30E @@ -104,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 1, EventScript_16C30E + goto_if_eq EventScript_16C30E call EventScript_16C313 setvar VAR_0x403A, 7 goto EventScript_16C30E @@ -114,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 1, 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 e1fd2ab23..1c7ee50df 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 1, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 lock faceplayer call EventScript_16BCF6 compare_var_to_value VAR_0x4001, 0 - goto_if 1, EventScript_16C00E + goto_if_eq EventScript_16C00E goto EventScript_16BD3E end @@ -42,120 +42,87 @@ EventScript_16BD38:: @ 816BD38 EventScript_16BD3E:: @ 816BD3E msgbox gUnknown_8195D22, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16C00C + goto_if_eq EventScript_16C00C textcolor 3 message Text_195D5F waitmessage textcolor 1 - copyvar VAR_0x8000, VAR_0x4001 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_16BDAE - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_16BDDA - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_16BE06 - compare_var_to_value VAR_0x8000, 4 - goto_if 1, EventScript_16BE3D - compare_var_to_value VAR_0x8000, 5 - goto_if 1, EventScript_16BE69 - compare_var_to_value VAR_0x8000, 6 - goto_if 1, EventScript_16BEA0 - compare_var_to_value VAR_0x8000, 7 - goto_if 1, EventScript_16BED7 + switch VAR_0x4001 + case 1, EventScript_16BDAE + case 2, EventScript_16BDDA + case 3, EventScript_16BE06 + case 4, EventScript_16BE3D + case 5, EventScript_16BE69 + case 6, EventScript_16BEA0 + case 7, EventScript_16BED7 end EventScript_16BDAE:: @ 816BDAE multichoice 0, 0, 32, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_16BF19 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_16C00C - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_16C00C + switch VAR_RESULT + case 0, EventScript_16BF19 + case 1, EventScript_16C00C + case 127, EventScript_16C00C end EventScript_16BDDA:: @ 816BDDA multichoice 0, 0, 33, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_16BF3A - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_16C00C - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_16C00C + switch VAR_RESULT + case 0, EventScript_16BF3A + case 1, EventScript_16C00C + case 127, EventScript_16C00C end EventScript_16BE06:: @ 816BE06 multichoice 0, 0, 34, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_16BF19 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_16BF3A - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_16C00C - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_16C00C + switch VAR_RESULT + case 0, EventScript_16BF19 + case 1, EventScript_16BF3A + case 2, EventScript_16C00C + case 127, EventScript_16C00C end EventScript_16BE3D:: @ 816BE3D multichoice 0, 0, 35, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_16BF5B - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_16C00C - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_16C00C + switch VAR_RESULT + case 0, EventScript_16BF5B + case 1, EventScript_16C00C + case 127, EventScript_16C00C end EventScript_16BE69:: @ 816BE69 multichoice 0, 0, 36, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_16BF19 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_16BF5B - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_16C00C - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_16C00C + switch VAR_RESULT + case 0, EventScript_16BF19 + case 1, EventScript_16BF5B + case 2, EventScript_16C00C + case 127, EventScript_16C00C end EventScript_16BEA0:: @ 816BEA0 multichoice 0, 0, 37, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_16BF3A - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_16BF5B - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_16C00C - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_16C00C + switch VAR_RESULT + case 0, EventScript_16BF3A + case 1, EventScript_16BF5B + case 2, EventScript_16C00C + case 127, EventScript_16C00C end EventScript_16BED7:: @ 816BED7 multichoice 0, 0, 38, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_16BF19 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_16BF3A - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_16BF5B - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_16C00C - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_16C00C + switch VAR_RESULT + case 0, EventScript_16BF19 + case 1, EventScript_16BF3A + case 2, EventScript_16BF5B + case 3, EventScript_16C00C + case 127, EventScript_16C00C end EventScript_16BF19:: @ 816BF19 setvar VAR_0x8008, ITEM_FRESH_WATER setvar VAR_0x8009, ITEM_TM16 checkflag FLAG_0x296 - goto_if 1, EventScript_16C018 + goto_if_eq EventScript_16C018 msgbox gUnknown_8195D75 goto EventScript_16BF7C end @@ -164,7 +131,7 @@ EventScript_16BF3A:: @ 816BF3A setvar VAR_0x8008, ITEM_SODA_POP setvar VAR_0x8009, ITEM_TM20 checkflag FLAG_0x295 - goto_if 1, EventScript_16C018 + goto_if_eq EventScript_16C018 msgbox gUnknown_8195E33 goto EventScript_16BF7C end @@ -173,7 +140,7 @@ EventScript_16BF5B:: @ 816BF5B setvar VAR_0x8008, ITEM_LEMONADE setvar VAR_0x8009, ITEM_TM33 checkflag FLAG_0x294 - goto_if 1, EventScript_16C018 + goto_if_eq EventScript_16C018 msgbox gUnknown_8195EBF goto EventScript_16BF7C end @@ -184,7 +151,7 @@ EventScript_16BF7C:: @ 816BF7C removeitem VAR_0x8008, 1 checkitemspace VAR_0x8009, 1 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16C002 + goto_if_eq EventScript_16C002 additem VAR_0x8009, 1 textcolor 3 playfanfare MUS_FANFA1 @@ -255,13 +222,10 @@ CeladonCity_DepartmentStore_Roof_EventScript_16C034:: @ 816C034 EventScript_16C045:: @ 816C045 multichoice 12, 0, 26, 0 copyvar VAR_0x4001, VAR_RESULT - copyvar VAR_0x8000, VAR_0x4001 - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_16C083 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_16C094 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_16C0A5 + switch VAR_0x4001 + case 0, EventScript_16C083 + case 1, EventScript_16C094 + case 2, EventScript_16C0A5 msgbox gUnknown_81960AE goto EventScript_16C14D end @@ -298,10 +262,10 @@ EventScript_16C0C4:: @ 816C0C4 EventScript_16C0CB:: @ 816C0CB compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16C131 + goto_if_eq EventScript_16C131 checkitemspace VAR_0x4000, 1 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16C13F + goto_if_eq EventScript_16C13F compare_var_to_value VAR_0x4001, 0 call_if 1, 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 b54ea1152..dca647299 100644 --- a/data/maps/CeladonCity_GameCorner/scripts.inc +++ b/data/maps/CeladonCity_GameCorner/scripts.inc @@ -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 1, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lock faceplayer showmoneybox 0, 0, 0 @@ -31,24 +31,20 @@ CeladonCity_GameCorner_EventScript_16C68D:: @ 816C68D waitmessage multichoice 13, 0, 27, 0 copyvar VAR_0x8009, VAR_RESULT - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_16C6E6 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_16C6E6 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_16C782 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_16C782 + switch VAR_RESULT + case 0, EventScript_16C6E6 + case 1, EventScript_16C6E6 + case 2, EventScript_16C782 + case 127, EventScript_16C782 end EventScript_16C6E6:: @ 816C6E6 checkflag FLAG_0x243 goto_if 0, EventScript_16C790 compare_var_to_value VAR_0x8009, 0 - goto_if 1, EventScript_16C734 + goto_if_eq EventScript_16C734 compare_var_to_value VAR_0x8009, 1 - goto_if 1, EventScript_16C706 + goto_if_eq EventScript_16C706 end EventScript_16C706:: @ 816C706 @@ -57,7 +53,7 @@ EventScript_16C706:: @ 816C706 goto_if 4, EventScript_16C79E checkmoney 10000, 0 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16C7AC + goto_if_eq EventScript_16C7AC givecoins 500 takemoney 10000, 0 goto EventScript_16C762 @@ -69,7 +65,7 @@ EventScript_16C734:: @ 816C734 goto_if 4, EventScript_16C79E checkmoney 1000, 0 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16C7AC + goto_if_eq EventScript_16C7AC givecoins 50 takemoney 1000, 0 goto EventScript_16C762 @@ -136,7 +132,7 @@ CeladonCity_GameCorner_EventScript_16C7E7:: @ 816C7E7 lock faceplayer checkflag FLAG_0x26E - goto_if 1, EventScript_16C849 + goto_if_eq EventScript_16C849 msgbox gUnknown_8196AF3 checkflag FLAG_0x243 goto_if 0, EventScript_16C839 @@ -172,7 +168,7 @@ CeladonCity_GameCorner_EventScript_16C857:: @ 816C857 lock faceplayer checkflag FLAG_0x4B3 - goto_if 1, EventScript_16C870 + goto_if_eq EventScript_16C870 msgbox gUnknown_8196BAD goto EventScript_16C7CA end @@ -200,7 +196,7 @@ CeladonCity_GameCorner_EventScript_16C89E:: @ 816C89E lock faceplayer checkflag FLAG_0x26F - goto_if 1, EventScript_16C8F0 + goto_if_eq EventScript_16C8F0 msgbox gUnknown_8196D2B checkflag FLAG_0x243 goto_if 0, EventScript_16C839 @@ -230,7 +226,7 @@ CeladonCity_GameCorner_EventScript_16C8FE:: @ 816C8FE lock faceplayer checkflag FLAG_0x270 - goto_if 1, EventScript_16C950 + goto_if_eq EventScript_16C950 msgbox gUnknown_8196DB7 checkflag FLAG_0x243 goto_if 0, EventScript_16C839 @@ -271,7 +267,7 @@ EventScript_16C96C:: @ 816C96C goto_if 0, EventScript_16CAA0 msgbox gUnknown_8196F46, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16C96A + goto_if_eq EventScript_16C96A setfieldeffectarg 0, 255 setfieldeffectarg 1, 10 setfieldeffectarg 2, 14 diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc index a6de8a7e3..911847541 100644 --- a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc +++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc @@ -16,7 +16,7 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_16CB88:: @ 816CB88 goto_if 0, EventScript_16CD99 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 showcoinsbox 0, 0 msgbox gUnknown_8197057 goto EventScript_16CBB2 @@ -26,21 +26,14 @@ EventScript_16CBB2:: @ 816CBB2 message Text_19707A waitmessage multichoice 11, 0, 14, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_16CC15 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_16CC25 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_16CC35 - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_16CC45 - compare_var_to_value VAR_0x8000, 4 - goto_if 1, EventScript_16CC55 - compare_var_to_value VAR_0x8000, 5 - goto_if 1, EventScript_16CC10 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_16CC10 + switch VAR_RESULT + case 0, EventScript_16CC15 + case 1, EventScript_16CC25 + case 2, EventScript_16CC35 + case 3, EventScript_16CC45 + case 4, EventScript_16CC55 + case 5, EventScript_16CC10 + case 127, EventScript_16CC10 end EventScript_16CC10:: @ 816CC10 @@ -82,24 +75,18 @@ EventScript_16CC65:: @ 816CC65 getspeciesname 0, VAR_0x4001 msgbox gUnknown_819709D, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16CC10 + goto_if_eq EventScript_16CC10 checkcoins VAR_RESULT compare_var_to_var VAR_RESULT, VAR_0x4002 goto_if 0, EventScript_16CDA5 textcolor 3 - copyvar VAR_0x8000, VAR_0x4001 - compare_var_to_value VAR_0x8000, SPECIES_ABRA - goto_if 1, EventScript_16CCD4 - compare_var_to_value VAR_0x8000, SPECIES_CLEFAIRY - goto_if 1, EventScript_16CCE9 - compare_var_to_value VAR_0x8000, SPECIES_DRATINI - goto_if 1, EventScript_16CCFE - compare_var_to_value VAR_0x8000, SPECIES_SCYTHER - goto_if 1, EventScript_16CD13 - compare_var_to_value VAR_0x8000, SPECIES_PORYGON - goto_if 1, EventScript_16CD28 - compare_var_to_value VAR_0x8000, SPECIES_PINSIR - goto_if 1, EventScript_16CD3D + switch VAR_0x4001 + case SPECIES_ABRA, EventScript_16CCD4 + case SPECIES_CLEFAIRY, EventScript_16CCE9 + case SPECIES_DRATINI, EventScript_16CCFE + case SPECIES_SCYTHER, EventScript_16CD13 + case SPECIES_PORYGON, EventScript_16CD28 + case SPECIES_PINSIR, EventScript_16CD3D end EventScript_16CCD4:: @ 816CCD4 @@ -134,11 +121,11 @@ EventScript_16CD3D:: @ 816CD3D EventScript_16CD52:: @ 816CD52 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16CDB3 + goto_if_eq EventScript_16CDB3 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16CDE0 + goto_if_eq EventScript_16CDE0 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_16CD74 + goto_if_eq EventScript_16CD74 end EventScript_16CD74:: @ 816CD74 @@ -177,7 +164,7 @@ EventScript_16CDB3:: @ 816CDB3 waitfanfare msgbox gUnknown_81A56A7, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16CD83 + goto_if_eq EventScript_16CD83 goto EventScript_16CC10 end @@ -191,7 +178,7 @@ EventScript_16CDE0:: @ 816CDE0 waitfanfare msgbox gUnknown_81A56A7, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16CE12 + goto_if_eq EventScript_16CE12 call EventScript_1A8C33 goto EventScript_16CE12 end @@ -208,7 +195,7 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_16CE1D:: @ 816CE1D goto_if 0, EventScript_16CD99 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 showcoinsbox 0, 0 msgbox gUnknown_8197057 goto EventScript_16CE47 @@ -218,21 +205,14 @@ EventScript_16CE47:: @ 816CE47 message Text_19707A waitmessage multichoice 11, 0, 30, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_16CEA5 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_16CEB9 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_16CECD - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_16CEE1 - compare_var_to_value VAR_0x8000, 4 - goto_if 1, EventScript_16CEF5 - compare_var_to_value VAR_0x8000, 5 - goto_if 1, EventScript_16CC10 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_16CC10 + switch VAR_RESULT + case 0, EventScript_16CEA5 + case 1, EventScript_16CEB9 + case 2, EventScript_16CECD + case 3, EventScript_16CEE1 + case 4, EventScript_16CEF5 + case 5, EventScript_16CC10 + case 127, EventScript_16CC10 end EventScript_16CEA5:: @ 816CEA5 @@ -273,7 +253,7 @@ EventScript_16CEF5:: @ 816CEF5 EventScript_16CF09:: @ 816CF09 msgbox gUnknown_81970B2, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16CC10 + goto_if_eq EventScript_16CC10 goto EventScript_16CF3F end @@ -281,7 +261,7 @@ EventScript_16CF22:: @ 816CF22 getitemname 0, VAR_0x4001 msgbox gUnknown_819709D, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16CC10 + goto_if_eq EventScript_16CC10 goto EventScript_16CF3F end @@ -292,7 +272,7 @@ EventScript_16CF3F:: @ 816CF3F goto_if 0, EventScript_16CDA5 checkitemspace VAR_0x4001, 1 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16CF79 + goto_if_eq EventScript_16CF79 takecoins VAR_0x4002 updatecoinsbox 0, 5 giveitem VAR_0x4001 @@ -313,7 +293,7 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_16CF88:: @ 816CF88 goto_if 0, EventScript_16CD99 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 showcoinsbox 0, 0 msgbox gUnknown_8197057 goto EventScript_16CFB2 @@ -323,21 +303,14 @@ EventScript_16CFB2:: @ 816CFB2 message Text_19707A waitmessage multichoice 10, 0, 41, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_16D010 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_16D020 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_16D030 - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_16D040 - compare_var_to_value VAR_0x8000, 4 - goto_if 1, EventScript_16D050 - compare_var_to_value VAR_0x8000, 5 - goto_if 1, EventScript_16CC10 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_16CC10 + switch VAR_RESULT + case 0, EventScript_16D010 + case 1, EventScript_16D020 + case 2, EventScript_16D030 + case 3, EventScript_16D040 + case 4, EventScript_16D050 + case 5, EventScript_16CC10 + case 127, EventScript_16CC10 end EventScript_16D010:: @ 816D010 diff --git a/data/maps/CeladonCity_Gym/scripts.inc b/data/maps/CeladonCity_Gym/scripts.inc index f700d25c9..9131602c2 100644 --- a/data/maps/CeladonCity_Gym/scripts.inc +++ b/data/maps/CeladonCity_Gym/scripts.inc @@ -31,7 +31,7 @@ EventScript_16D0C6:: @ 816D0C6 msgbox gUnknown_8197327 checkitemspace ITEM_TM19, 1 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16D107 + goto_if_eq EventScript_16D107 additem ITEM_TM19, 1 loadword 0, gUnknown_81973BA setorcopyvar VAR_0x8000, ITEM_TM19 @@ -92,7 +92,7 @@ CeladonCity_Gym_EventScript_16D1B5:: @ 816D1B5 CeladonCity_Gym_EventScript_16D1CC:: @ 816D1CC lockall checkflag FLAG_0x823 - goto_if 1, EventScript_16D1E0 + goto_if_eq EventScript_16D1E0 msgbox gUnknown_8197874 releaseall end diff --git a/data/maps/CeladonCity_Restaurant/scripts.inc b/data/maps/CeladonCity_Restaurant/scripts.inc index bf6bba315..e52d88636 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_0x243 - goto_if 1, EventScript_16D24B + goto_if_eq EventScript_16D24B msgbox gUnknown_81979C1 checkitemspace ITEM_COIN_CASE, 1 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16D241 + goto_if_eq EventScript_16D241 additem ITEM_COIN_CASE, 1 giveitemfanfaremsg gUnknown_8197A38, ITEM_COIN_CASE setflag FLAG_0x243 diff --git a/data/maps/CeruleanCave_B1F/scripts.inc b/data/maps/CeruleanCave_B1F/scripts.inc index c1dfa35ad..f2ac16317 100644 --- a/data/maps/CeruleanCave_B1F/scripts.inc +++ b/data/maps/CeruleanCave_B1F/scripts.inc @@ -27,7 +27,7 @@ EventScript_1624F1:: @ 81624F1 CeruleanCave_B1F_EventScript_1624F5:: @ 81624F5 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 lock faceplayer @@ -46,11 +46,11 @@ CeruleanCave_B1F_EventScript_1624F5:: @ 81624F5 clearflag FLAG_0x807 specialvar VAR_RESULT, sub_80CA74C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_162558 + goto_if_eq EventScript_162558 compare_var_to_value VAR_RESULT, 4 - goto_if 1, EventScript_162561 + goto_if_eq EventScript_162561 compare_var_to_value VAR_RESULT, 5 - goto_if 1, 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 5d593cd60..480a40ad0 100644 --- a/data/maps/CeruleanCity/scripts.inc +++ b/data/maps/CeruleanCity/scripts.inc @@ -174,7 +174,7 @@ CeruleanCity_EventScript_166603:: @ 8166603 lock faceplayer checktrainerflag FLAG_0x163 - goto_if 1, EventScript_16662E + goto_if_eq EventScript_16662E message Text_17EE0E waitmessage playbgm BGM_FRLG_SUSPICIOUS_EYE, 0 @@ -188,7 +188,7 @@ EventScript_16662E:: @ 816662E msgbox gUnknown_817EE9C checkitemspace ITEM_TM28, 1 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_166677 + goto_if_eq EventScript_166677 additem ITEM_TM28, 1 giveitemfanfaremsg gUnknown_817EEBF, ITEM_TM28 msgbox gUnknown_817EEED @@ -249,7 +249,7 @@ CeruleanCity_EventScript_1666FE:: @ 81666FE lock faceplayer checkflag FLAG_0x234 - goto_if 1, EventScript_166713 + goto_if_eq EventScript_166713 msgbox gUnknown_817F01D release end diff --git a/data/maps/CeruleanCity_BikeShop/scripts.inc b/data/maps/CeruleanCity_BikeShop/scripts.inc index 1ecfa9d96..51b7ba5bd 100644 --- a/data/maps/CeruleanCity_BikeShop/scripts.inc +++ b/data/maps/CeruleanCity_BikeShop/scripts.inc @@ -5,20 +5,17 @@ CeruleanCity_BikeShop_EventScript_16ABBD:: @ 816ABBD lock faceplayer checkflag FLAG_0x271 - goto_if 1, EventScript_16AC58 + goto_if_eq EventScript_16AC58 checkflag FLAG_0x241 - goto_if 1, EventScript_16AC22 + goto_if_eq EventScript_16AC22 showmoneybox 0, 0, 0 message Text_192755 waitmessage multichoice 11, 0, 13, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_16AC07 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_16AC15 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_16AC15 + switch VAR_RESULT + case 0, EventScript_16AC07 + case 1, EventScript_16AC15 + case 127, EventScript_16AC15 end EventScript_16AC07:: @ 816AC07 @@ -62,7 +59,7 @@ CeruleanCity_BikeShop_EventScript_16AC75:: @ 816AC75 lock faceplayer checkflag FLAG_0x271 - goto_if 1, EventScript_16AC8A + goto_if_eq EventScript_16AC8A msgbox gUnknown_8192937 release end diff --git a/data/maps/CeruleanCity_Gym/scripts.inc b/data/maps/CeruleanCity_Gym/scripts.inc index 1398b9ebe..b21b6af7a 100644 --- a/data/maps/CeruleanCity_Gym/scripts.inc +++ b/data/maps/CeruleanCity_Gym/scripts.inc @@ -28,7 +28,7 @@ EventScript_16AAF9:: @ 816AAF9 msgbox gUnknown_81922F7 checkitemspace ITEM_TM03, 1 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16AB3A + goto_if_eq EventScript_16AB3A additem ITEM_TM03, 1 giveitemfanfaremsg gUnknown_81923F1, ITEM_TM03 setflag FLAG_0x297 @@ -58,7 +58,7 @@ CeruleanCity_Gym_EventScript_16AB7F:: @ 816AB7F lock faceplayer checkflag FLAG_0x4B1 - goto_if 1, EventScript_16AB94 + goto_if_eq EventScript_16AB94 msgbox gUnknown_81925AC release end @@ -71,7 +71,7 @@ EventScript_16AB94:: @ 816AB94 CeruleanCity_Gym_EventScript_16AB9E:: @ 816AB9E lockall checkflag FLAG_0x821 - goto_if 1, EventScript_16ABB2 + goto_if_eq EventScript_16ABB2 msgbox gUnknown_81926E1 releaseall end diff --git a/data/maps/CeruleanCity_House1/scripts.inc b/data/maps/CeruleanCity_House1/scripts.inc index f1f9503c1..18bc90fb6 100644 --- a/data/maps/CeruleanCity_House1/scripts.inc +++ b/data/maps/CeruleanCity_House1/scripts.inc @@ -10,27 +10,17 @@ CeruleanCity_House1_EventScript_16A7F0:: @ 816A7F0 setvar VAR_0x8004, 0 special sub_80CB7C4 waitstate - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_16A8FB - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_16A909 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_16A917 - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_16A925 - compare_var_to_value VAR_0x8000, 4 - goto_if 1, EventScript_16A933 - compare_var_to_value VAR_0x8000, 5 - goto_if 1, EventScript_16A941 - compare_var_to_value VAR_0x8000, 6 - goto_if 1, EventScript_16A94F - compare_var_to_value VAR_0x8000, 7 - goto_if 1, EventScript_16A95D - compare_var_to_value VAR_0x8000, 8 - goto_if 1, EventScript_16A96B - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_16A96B + switch VAR_RESULT + case 0, EventScript_16A8FB + case 1, EventScript_16A909 + case 2, EventScript_16A917 + case 3, EventScript_16A925 + case 4, EventScript_16A933 + case 5, EventScript_16A941 + case 6, EventScript_16A94F + case 7, EventScript_16A95D + case 8, EventScript_16A96B + case 127, EventScript_16A96B end EventScript_16A87D:: @ 816A87D @@ -38,27 +28,17 @@ EventScript_16A87D:: @ 816A87D waitmessage special sub_80CBC5C waitstate - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_16A8FB - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_16A909 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_16A917 - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_16A925 - compare_var_to_value VAR_0x8000, 4 - goto_if 1, EventScript_16A933 - compare_var_to_value VAR_0x8000, 5 - goto_if 1, EventScript_16A941 - compare_var_to_value VAR_0x8000, 6 - goto_if 1, EventScript_16A94F - compare_var_to_value VAR_0x8000, 7 - goto_if 1, EventScript_16A95D - compare_var_to_value VAR_0x8000, 8 - goto_if 1, EventScript_16A96B - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_16A96B + switch VAR_RESULT + case 0, EventScript_16A8FB + case 1, EventScript_16A909 + case 2, EventScript_16A917 + case 3, EventScript_16A925 + case 4, EventScript_16A933 + case 5, EventScript_16A941 + case 6, EventScript_16A94F + case 7, EventScript_16A95D + case 8, EventScript_16A96B + case 127, EventScript_16A96B end EventScript_16A8FB:: @ 816A8FB diff --git a/data/maps/CeruleanCity_House2/scripts.inc b/data/maps/CeruleanCity_House2/scripts.inc index 424080126..092e7d1a6 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_0x23F - goto_if 1, EventScript_16A98B + goto_if_eq EventScript_16A98B msgbox gUnknown_8191E13 release end diff --git a/data/maps/CeruleanCity_House3/scripts.inc b/data/maps/CeruleanCity_House3/scripts.inc index db63cb3de..5bcdb0bea 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_0x24A - goto_if 1, EventScript_16AA23 + goto_if_eq EventScript_16AA23 msgbox gUnknown_81A59FE, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16AA0B + goto_if_eq EventScript_16AA0B call EventScript_1A8CBD compare_var_to_value VAR_0x8004, 6 goto_if 4, EventScript_16AA0B diff --git a/data/maps/CeruleanCity_House4/scripts.inc b/data/maps/CeruleanCity_House4/scripts.inc index a4c0b74e3..bbc762b3f 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 1, 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 1, EventScript_16AD59 + goto_if_eq EventScript_16AD59 compare_var_to_value VAR_0x8004, 1 - goto_if 1, EventScript_16AD63 + goto_if_eq EventScript_16AD63 compare_var_to_value VAR_0x8004, 2 - goto_if 1, EventScript_16AD89 + goto_if_eq EventScript_16AD89 compare_var_to_value VAR_0x8004, 3 - goto_if 1, EventScript_16ADAF + goto_if_eq EventScript_16ADAF compare_var_to_value VAR_0x8004, 4 - goto_if 1, EventScript_16ADC3 + goto_if_eq EventScript_16ADC3 compare_var_to_value VAR_0x8004, 5 - goto_if 1, EventScript_16ADE9 + goto_if_eq EventScript_16ADE9 compare_var_to_value VAR_0x8004, 6 - goto_if 1, 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 1, 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 1, 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 1, 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 1, 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 3118924fb..d7d3e0222 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 1, EventScript_16AEB7 + goto_if_eq EventScript_16AEB7 msgbox gUnknown_8192F67, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16AEAD + goto_if_eq EventScript_16AEAD checkflag FLAG_0x847 goto_if 0, EventScript_16AEA3 msgbox gUnknown_8193003 setflag FLAG_0x2BB giveitem ITEM_POWDER_JAR compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1A6BF9 + goto_if_eq EventScript_1A6BF9 msgbox gUnknown_8193033 release end @@ -42,33 +42,20 @@ EventScript_16AEC8:: @ 816AEC8 setvar VAR_0x8004, 5 special sub_80CB7C4 waitstate - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_16AF6C - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_16AF80 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_16AF94 - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_16AFA8 - compare_var_to_value VAR_0x8000, 4 - goto_if 1, EventScript_16AFBC - compare_var_to_value VAR_0x8000, 5 - goto_if 1, EventScript_16AFD0 - compare_var_to_value VAR_0x8000, 6 - goto_if 1, EventScript_16AFE4 - compare_var_to_value VAR_0x8000, 7 - goto_if 1, EventScript_16AFF8 - compare_var_to_value VAR_0x8000, 8 - goto_if 1, EventScript_16B00C - compare_var_to_value VAR_0x8000, 9 - goto_if 1, EventScript_16B020 - compare_var_to_value VAR_0x8000, 10 - goto_if 1, EventScript_16B034 - compare_var_to_value VAR_0x8000, 11 - goto_if 1, EventScript_16B048 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_16B048 + switch VAR_RESULT + case 0, EventScript_16AF6C + case 1, EventScript_16AF80 + case 2, EventScript_16AF94 + case 3, EventScript_16AFA8 + case 4, EventScript_16AFBC + case 5, EventScript_16AFD0 + case 6, EventScript_16AFE4 + case 7, EventScript_16AFF8 + case 8, EventScript_16B00C + case 9, EventScript_16B020 + case 10, EventScript_16B034 + case 11, EventScript_16B048 + case 127, EventScript_16B048 end EventScript_16AF6C:: @ 816AF6C @@ -157,20 +144,20 @@ EventScript_16B048:: @ 816B048 EventScript_16B055:: @ 816B055 msgbox gUnknown_819331E, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, 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 1, EventScript_16B0CC + goto_if_eq EventScript_16B0CC giveitem VAR_0x8008 compare_var_to_value VAR_RESULT, 0 - goto_if 1, 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 1, EventScript_16AEC8 + goto_if_eq EventScript_16AEC8 msgbox gUnknown_81933FB special sub_815F114 release @@ -191,7 +178,7 @@ CeruleanCity_House5_EventScript_16B0DA:: @ 816B0DA lockall special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, 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 56558f175..6f05c3e80 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 1, 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 328a34bcb..90d564eff 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_0x1A8 - goto_if 1, EventScript_166F68 + goto_if_eq EventScript_166F68 return EventScript_166F68:: @ 8166F68 @@ -109,9 +109,9 @@ EventScript_166FCD:: @ 8166FCD msgbox gUnknown_8180C90 msgbox gUnknown_8180CAA, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_167068 + goto_if_eq EventScript_167068 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_167078 + goto_if_eq EventScript_167078 end EventScript_167032:: @ 8167032 diff --git a/data/maps/CinnabarIsland_Gym/scripts.inc b/data/maps/CinnabarIsland_Gym/scripts.inc index 6e4431f87..ab4967fe5 100644 --- a/data/maps/CinnabarIsland_Gym/scripts.inc +++ b/data/maps/CinnabarIsland_Gym/scripts.inc @@ -4,7 +4,7 @@ CinnabarIsland_Gym_MapScripts:: @ 816D94B CinnabarIsland_Gym_MapScript1_16D951:: @ 816D951 checkflag FLAG_0x4B6 - goto_if 1, EventScript_16D991 + goto_if_eq EventScript_16D991 checkflag FLAG_0x265 call_if 1, EventScript_16D9B0 checkflag FLAG_0x267 @@ -81,7 +81,7 @@ EventScript_16DA34:: @ 816DA34 msgbox gUnknown_819969E checkitemspace ITEM_TM38, 1 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16DA75 + goto_if_eq EventScript_16DA75 additem ITEM_TM38, 1 giveitemfanfaremsg gUnknown_81996FF, ITEM_TM38 setflag FLAG_0x24E @@ -196,7 +196,7 @@ CinnabarIsland_Gym_EventScript_16DBAB:: @ 816DBAB lock faceplayer checkflag FLAG_0x4B6 - goto_if 1, EventScript_16DBC0 + goto_if_eq EventScript_16DBC0 msgbox gUnknown_8199B81 release end @@ -209,7 +209,7 @@ EventScript_16DBC0:: @ 816DBC0 CinnabarIsland_Gym_EventScript_16DBCA:: @ 816DBCA lockall checkflag FLAG_UNK826 - goto_if 1, EventScript_16DBDE + goto_if_eq EventScript_16DBDE msgbox gUnknown_8199C29 releaseall end @@ -235,9 +235,9 @@ EventScript_16DC00:: @ 816DC00 msgbox gUnknown_8199C9F msgbox gUnknown_8199D5A, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16DC43 + goto_if_eq EventScript_16DC43 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16DC6A + goto_if_eq EventScript_16DC6A end EventScript_16DC27:: @ 816DC27 @@ -257,7 +257,7 @@ EventScript_16DC34:: @ 816DC34 EventScript_16DC43:: @ 816DC43 call EventScript_16DC27 checkflag FLAG_0x265 - goto_if 1, EventScript_16DC68 + goto_if_eq EventScript_16DC68 call EventScript_16DC58 releaseall end @@ -290,7 +290,7 @@ EventScript_16DC7A:: @ 816DC7A msgbox gUnknown_819983F trainerbattle 3, 213, 0, Text_199870 checkflag FLAG_0x265 - goto_if 1, EventScript_16DC68 + goto_if_eq EventScript_16DC68 call EventScript_16DC58 releaseall end @@ -332,15 +332,15 @@ EventScript_16DCF5:: @ 816DCF5 msgbox gUnknown_8199C9F msgbox gUnknown_8199D79, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16DD41 + goto_if_eq EventScript_16DD41 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16DD1C + goto_if_eq EventScript_16DD1C end EventScript_16DD1C:: @ 816DD1C call EventScript_16DC27 checkflag FLAG_0x267 - goto_if 1, EventScript_16DC68 + goto_if_eq EventScript_16DC68 call EventScript_16DD31 releaseall end @@ -369,7 +369,7 @@ EventScript_16DD51:: @ 816DD51 msgbox gUnknown_81998BD trainerbattle 3, 178, 0, Text_1998ED checkflag FLAG_0x267 - goto_if 1, EventScript_16DC68 + goto_if_eq EventScript_16DC68 call EventScript_16DD31 releaseall end @@ -420,15 +420,15 @@ EventScript_16DDD3:: @ 816DDD3 msgbox gUnknown_8199C9F msgbox gUnknown_8199DA9, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16DE1F + goto_if_eq EventScript_16DE1F compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16DDFA + goto_if_eq EventScript_16DDFA end EventScript_16DDFA:: @ 816DDFA call EventScript_16DC27 checkflag FLAG_0x268 - goto_if 1, EventScript_16DC68 + goto_if_eq EventScript_16DC68 call EventScript_16DE0F releaseall end @@ -457,7 +457,7 @@ EventScript_16DE2F:: @ 816DE2F msgbox gUnknown_8199948 trainerbattle 3, 214, 0, Text_199973 checkflag FLAG_0x268 - goto_if 1, EventScript_16DC68 + goto_if_eq EventScript_16DC68 call EventScript_16DE0F releaseall end @@ -499,15 +499,15 @@ EventScript_16DEAA:: @ 816DEAA msgbox gUnknown_8199C9F msgbox gUnknown_8199DC6, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16DEF6 + goto_if_eq EventScript_16DEF6 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16DED1 + goto_if_eq EventScript_16DED1 end EventScript_16DED1:: @ 816DED1 call EventScript_16DC27 checkflag FLAG_0x269 - goto_if 1, EventScript_16DC68 + goto_if_eq EventScript_16DC68 call EventScript_16DEE6 releaseall end @@ -536,7 +536,7 @@ EventScript_16DF06:: @ 816DF06 msgbox gUnknown_81999B7 trainerbattle 3, 179, 0, Text_1999DB checkflag FLAG_0x269 - goto_if 1, EventScript_16DC68 + goto_if_eq EventScript_16DC68 call EventScript_16DEE6 releaseall end @@ -578,15 +578,15 @@ EventScript_16DF81:: @ 816DF81 msgbox gUnknown_8199C9F msgbox gUnknown_8199E00, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16DFA8 + goto_if_eq EventScript_16DFA8 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16DFCD + goto_if_eq EventScript_16DFCD end EventScript_16DFA8:: @ 816DFA8 call EventScript_16DC27 checkflag FLAG_0x26A - goto_if 1, EventScript_16DC68 + goto_if_eq EventScript_16DC68 call EventScript_16DFBD releaseall end @@ -615,7 +615,7 @@ EventScript_16DFDD:: @ 816DFDD msgbox gUnknown_8199A7F trainerbattle 3, 215, 0, Text_199AB9 checkflag FLAG_0x26A - goto_if 1, EventScript_16DC68 + goto_if_eq EventScript_16DC68 call EventScript_16DFBD releaseall end @@ -657,15 +657,15 @@ EventScript_16E058:: @ 816E058 msgbox gUnknown_8199C9F msgbox gUnknown_8199E36, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16E0A4 + goto_if_eq EventScript_16E0A4 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16E07F + goto_if_eq EventScript_16E07F end EventScript_16E07F:: @ 816E07F call EventScript_16DC27 checkflag FLAG_0x26B - goto_if 1, EventScript_16DC68 + goto_if_eq EventScript_16DC68 call EventScript_16E094 releaseall end @@ -694,7 +694,7 @@ EventScript_16E0B4:: @ 816E0B4 msgbox gUnknown_8199AFC trainerbattle 3, 180, 0, Text_199B16 checkflag FLAG_0x26B - goto_if 1, EventScript_16DC68 + goto_if_eq EventScript_16DC68 call EventScript_16E094 releaseall end diff --git a/data/maps/CinnabarIsland_Mart/scripts.inc b/data/maps/CinnabarIsland_Mart/scripts.inc index be01ab1fc..c82034dd0 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 1, 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 0323e4fe4..f356f6106 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 1, EventScript_16E9A5 + goto_if_eq EventScript_16E9A5 msgbox gUnknown_819A785 closemessage playbgm BGM_FRLG_FOLLOW_ME, 1 diff --git a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc index c9a2c5103..3b415bfab 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 1, EventScript_16E473 + goto_if_eq EventScript_16E473 msgbox gUnknown_81A597B, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16E45B + goto_if_eq EventScript_16E45B call EventScript_1A8CBD compare_var_to_value VAR_0x8004, 6 goto_if 4, EventScript_16E45B @@ -46,20 +46,20 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E47D:: @ 816E47D checkflag FLAG_0x2EE call_if 1, EventScript_16E8A1 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16E897 + goto_if_eq EventScript_16E897 compare_var_to_value VAR_0x406A, 2 - goto_if 1, EventScript_16E736 + goto_if_eq EventScript_16E736 compare_var_to_value VAR_0x406A, 1 - goto_if 1, EventScript_16E72C + goto_if_eq EventScript_16E72C call EventScript_16E4EC compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16E544 + goto_if_eq EventScript_16E544 call EventScript_16E504 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16E586 + goto_if_eq EventScript_16E586 call EventScript_16E51C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16E5C8 + goto_if_eq EventScript_16E5C8 msgbox gUnknown_819A282 goto EventScript_16E53A end @@ -68,7 +68,7 @@ EventScript_16E4EC:: @ 816E4EC checkflag FLAG_0x273 goto_if 0, EventScript_16E534 checkflag FLAG_0x2ED - goto_if 1, EventScript_16E534 + goto_if_eq EventScript_16E534 setvar VAR_RESULT, 1 return @@ -76,7 +76,7 @@ EventScript_16E504:: @ 816E504 checkflag FLAG_0x272 goto_if 0, EventScript_16E534 checkflag FLAG_0x2EC - goto_if 1, EventScript_16E534 + goto_if_eq EventScript_16E534 setvar VAR_RESULT, 1 return @@ -84,7 +84,7 @@ EventScript_16E51C:: @ 816E51C checkflag FLAG_0x25E goto_if 0, EventScript_16E534 checkflag FLAG_0x2EE - goto_if 1, EventScript_16E534 + goto_if_eq EventScript_16E534 setvar VAR_RESULT, 1 return @@ -102,15 +102,12 @@ EventScript_16E544:: @ 816E544 waitmessage call EventScript_16E51C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16E5FA + goto_if_eq EventScript_16E5FA multichoice 0, 0, 21, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_16E668 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_16E53A - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_16E53A + switch VAR_RESULT + case 0, EventScript_16E668 + case 1, EventScript_16E53A + case 127, EventScript_16E53A end EventScript_16E586:: @ 816E586 @@ -118,54 +115,40 @@ EventScript_16E586:: @ 816E586 waitmessage call EventScript_16E51C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16E631 + goto_if_eq EventScript_16E631 multichoice 0, 0, 22, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_16E6A6 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_16E53A - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_16E53A + switch VAR_RESULT + case 0, EventScript_16E6A6 + case 1, EventScript_16E53A + case 127, EventScript_16E53A end EventScript_16E5C8:: @ 816E5C8 message Text_19A282 waitmessage multichoice 0, 0, 23, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_16E6E4 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_16E53A - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_16E53A + switch VAR_RESULT + case 0, EventScript_16E6E4 + case 1, EventScript_16E53A + case 127, EventScript_16E53A end EventScript_16E5FA:: @ 816E5FA multichoice 0, 0, 24, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_16E668 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_16E6E4 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_16E53A - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_16E53A + switch VAR_RESULT + case 0, EventScript_16E668 + case 1, EventScript_16E6E4 + case 2, EventScript_16E53A + case 127, EventScript_16E53A end EventScript_16E631:: @ 816E631 multichoice 0, 0, 25, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_16E6A6 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_16E6E4 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_16E53A - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_16E53A + switch VAR_RESULT + case 0, EventScript_16E6A6 + case 1, EventScript_16E6E4 + case 2, EventScript_16E53A + case 127, EventScript_16E53A end EventScript_16E668:: @ 816E668 @@ -173,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 1, EventScript_16E722 + goto_if_eq EventScript_16E722 msgbox gUnknown_819A45D textcolor 0 removeitem ITEM_HELIX_FOSSIL, 1 @@ -188,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 1, EventScript_16E722 + goto_if_eq EventScript_16E722 msgbox gUnknown_819A45D textcolor 0 removeitem ITEM_DOME_FOSSIL, 1 @@ -203,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 1, EventScript_16E722 + goto_if_eq EventScript_16E722 msgbox gUnknown_819A45D textcolor 0 removeitem ITEM_OLD_AMBER, 1 @@ -225,11 +208,11 @@ EventScript_16E72C:: @ 816E72C EventScript_16E736:: @ 816E736 compare_var_to_value VAR_0x4069, 1 - goto_if 1, EventScript_16E758 + goto_if_eq EventScript_16E758 compare_var_to_value VAR_0x4069, 2 - goto_if 1, EventScript_16E79D + goto_if_eq EventScript_16E79D compare_var_to_value VAR_0x4069, 3 - goto_if 1, EventScript_16E7E2 + goto_if_eq EventScript_16E7E2 end EventScript_16E758:: @ 816E758 @@ -238,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 1, EventScript_1A927C + goto_if_eq EventScript_1A927C setflag FLAG_0x2ED compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16E827 + goto_if_eq EventScript_16E827 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16E85B + goto_if_eq EventScript_16E85B end EventScript_16E79D:: @ 816E79D @@ -252,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 1, EventScript_1A927C + goto_if_eq EventScript_1A927C setflag FLAG_0x2EC compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16E827 + goto_if_eq EventScript_16E827 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16E85B + goto_if_eq EventScript_16E85B end EventScript_16E7E2:: @ 816E7E2 @@ -266,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 1, EventScript_1A927C + goto_if_eq EventScript_1A927C setflag FLAG_0x2EE compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16E827 + goto_if_eq EventScript_16E827 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16E85B + goto_if_eq EventScript_16E85B end EventScript_16E827:: @ 816E827 @@ -283,7 +266,7 @@ EventScript_16E827:: @ 816E827 setvar VAR_0x406A, 0 msgbox gUnknown_81A56A7, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16E895 + goto_if_eq EventScript_16E895 call EventScript_1A8C27 call EventScript_1A74EB goto EventScript_16E895 @@ -298,7 +281,7 @@ EventScript_16E85B:: @ 816E85B setvar VAR_0x406A, 0 msgbox gUnknown_81A56A7, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16E88A + goto_if_eq EventScript_16E88A call EventScript_1A8C33 goto EventScript_16E88A end @@ -319,9 +302,9 @@ EventScript_16E897:: @ 816E897 EventScript_16E8A1:: @ 816E8A1 checkflag FLAG_0x273 - goto_if 1, EventScript_16E8B9 + goto_if_eq EventScript_16E8B9 checkflag FLAG_0x272 - goto_if 1, EventScript_16E8C8 + goto_if_eq EventScript_16E8C8 goto EventScript_16E534 end diff --git a/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc index 7959c6c4c..651fe0c76 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 1, EventScript_16E334 + goto_if_eq EventScript_16E334 msgbox gUnknown_81A59FE, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16E31C + goto_if_eq EventScript_16E31C call EventScript_1A8CBD compare_var_to_value VAR_0x8004, 6 goto_if 4, 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 1, EventScript_16E3D4 + goto_if_eq EventScript_16E3D4 msgbox gUnknown_81A5AD6, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, 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 d5b03e7ff..cd21dbcbd 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 1, EventScript_164CB6 + goto_if_eq EventScript_164CB6 trainerbattle 3, 606, 0, Text_17D086 msgbox gUnknown_817D0B2 closemessage diff --git a/data/maps/FiveIsland_Meadow/scripts.inc b/data/maps/FiveIsland_Meadow/scripts.inc index 2f272b58a..4b3b4d895 100644 --- a/data/maps/FiveIsland_Meadow/scripts.inc +++ b/data/maps/FiveIsland_Meadow/scripts.inc @@ -10,9 +10,9 @@ FiveIsland_Meadow_MapScript1_168938:: @ 8168938 FiveIsland_Meadow_EventScript_168942:: @ 8168942 lockall checkflag FLAG_0x2D6 - goto_if 1, EventScript_168979 + goto_if_eq EventScript_168979 checkflag FLAG_0x2D8 - goto_if 1, EventScript_16895F + goto_if_eq EventScript_16895F msgbox gUnknown_818AB8E releaseall end diff --git a/data/maps/FiveIsland_MemorialPillar/scripts.inc b/data/maps/FiveIsland_MemorialPillar/scripts.inc index ef3ff4ef5..23b3527f7 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_0x236 - goto_if 1, EventScript_168A18 + goto_if_eq EventScript_168A18 checkflag FLAG_0x2D7 - goto_if 1, EventScript_168A22 + goto_if_eq 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 1, 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 1, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 lockall checkflag FLAG_0x236 - goto_if 1, EventScript_168B0B + goto_if_eq EventScript_168B0B checkflag FLAG_0x2D7 - goto_if 1, EventScript_168B0B + goto_if_eq EventScript_168B0B msgbox gUnknown_818B095 checkitem ITEM_LEMONADE, 1 compare_var_to_value VAR_RESULT, 1 - goto_if 1, 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 1, 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 1, 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 ccdc69d54..a4dc96f91 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 1, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 lock faceplayer checkflag FLAG_0x002 - goto_if 1, EventScript_172043 + goto_if_eq EventScript_172043 compare_var_to_value VAR_STORAGE_UNKNOWN, 65535 - goto_if 1, EventScript_171F0B + goto_if_eq EventScript_171F0B compare_var_to_value VAR_STORAGE_UNKNOWN, 0 goto_if 5, 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 1, 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 1, EventScript_172025 + goto_if_eq EventScript_172025 setflag FLAG_0x002 setvar VAR_STORAGE_UNKNOWN, 0 release diff --git a/data/maps/FiveIsland_RocketWarehouse/scripts.inc b/data/maps/FiveIsland_RocketWarehouse/scripts.inc index f59cc2838..bac115e76 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 1, EventScript_163F6E + goto_if_eq EventScript_163F6E msgbox gUnknown_817B4E3 releaseall end @@ -45,7 +45,7 @@ FiveIsland_RocketWarehouse_EventScript_163F81:: @ 8163F81 FiveIsland_RocketWarehouse_EventScript_163F93:: @ 8163F93 trainerbattle 2, 545, 0, Text_17BBAF, Text_17BC55, EventScript_163FCD checkflag FLAG_0x844 - goto_if 1, EventScript_163FB7 + goto_if_eq EventScript_163FB7 msgbox gUnknown_817BCA3, 6 end @@ -144,7 +144,7 @@ EventScript_1640A2:: @ 81640A2 EventScript_16412E:: @ 816412E compare_var_to_value VAR_0x8004, 27 - goto_if 1, 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 99b0d18c0..b3b6243ab 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 1, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 lock faceplayer checkflag FLAG_0x2DA - goto_if 1, EventScript_1688E3 + goto_if_eq EventScript_1688E3 checkflag FLAG_0x2DB - goto_if 1, EventScript_16892C + goto_if_eq EventScript_16892C msgbox gUnknown_818A80D specialvar VAR_RESULT, sub_80CA76C compare_var_to_value VAR_RESULT, 6 - goto_if 1, EventScript_1688AC + goto_if_eq EventScript_1688AC msgbox gUnknown_818A88F release end @@ -36,7 +36,7 @@ EventScript_1688AC:: @ 81688AC EventScript_1688BA:: @ 81688BA countpokemon compare_var_to_value VAR_RESULT, 6 - goto_if 1, EventScript_16891F + goto_if_eq EventScript_16891F setflag FLAG_0x2DA giveegg SPECIES_TOGEPI textcolor 3 @@ -53,12 +53,12 @@ EventScript_1688E3:: @ 81688E3 setvar VAR_0x8004, 175 specialvar VAR_RESULT, sub_80CD0F4 compare_var_to_value VAR_RESULT, 1 - goto_if 1, 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 1, 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 4c54e61a4..3e4348e7b 100644 --- a/data/maps/FourIsland/scripts.inc +++ b/data/maps/FourIsland/scripts.inc @@ -73,18 +73,18 @@ Movement_167D52:: @ 8167D52 FourIsland_EventScript_167D55:: @ 8167D55 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 lock faceplayer special GetDaycareMonNicknames specialvar VAR_RESULT, GetDaycareState compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_167D9B + goto_if_eq EventScript_167D9B compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_167E0C + goto_if_eq EventScript_167E0C compare_var_to_value VAR_RESULT, 3 - goto_if 1, 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 1, EventScript_167DD1 + goto_if_eq EventScript_167DD1 msgbox gUnknown_81BF7B6, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if 1, 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 1, EventScript_167E43 + goto_if_eq EventScript_167E43 msgbox gUnknown_8182A2B release end diff --git a/data/maps/FourIsland_LoreleisHouse/scripts.inc b/data/maps/FourIsland_LoreleisHouse/scripts.inc index d8dc716e3..ab7196c62 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 1, EventScript_171C83 + goto_if_eq EventScript_171C83 checkflag FLAG_0x2D5 - goto_if 1, EventScript_171C76 + goto_if_eq EventScript_171C76 msgbox gUnknown_81A3826 release end diff --git a/data/maps/FourIsland_Mart/scripts.inc b/data/maps/FourIsland_Mart/scripts.inc index 6e563b6dd..026d172a9 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 1, 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 6048c1502..050e17c06 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 1, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lock faceplayer specialvar VAR_RESULT, GetDaycareState compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_171A2E + goto_if_eq EventScript_171A2E compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_171A52 + goto_if_eq EventScript_171A52 compare_var_to_value VAR_RESULT, 3 - goto_if 1, EventScript_171B86 + goto_if_eq EventScript_171B86 msgbox gUnknown_81BF7E4, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if 1, 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 1, EventScript_171A1A + goto_if_eq EventScript_171A1A msgbox gUnknown_81BF839 fadescreen 1 special ChooseSendDaycareMon @@ -33,7 +33,7 @@ EventScript_171993:: @ 8171993 goto_if 4, EventScript_1719F7 specialvar VAR_RESULT, CountPartyAliveNonEggMons_IgnoreVar0x8004Slot compare_var_to_value VAR_RESULT, 0 - goto_if 1, 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 1, 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 1, 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 1, EventScript_171993 + goto_if_eq EventScript_171993 msgbox gUnknown_81BFAE8, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if 1, 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 1, EventScript_171B67 + goto_if_eq EventScript_171B67 specialvar VAR_RESULT, GetDaycareState setvar VAR_0x8004, 0 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_171ACF + goto_if_eq EventScript_171ACF special ShowDaycareLevelMenu waitstate copyvar VAR_0x8004, VAR_RESULT compare_var_to_value VAR_RESULT, 2 - goto_if 1, 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 1, 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 1, 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 1, 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 1, 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 1, 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 1, 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 8eaebe8e0..9fefb3d86 100644 --- a/data/maps/FuchsiaCity/scripts.inc +++ b/data/maps/FuchsiaCity/scripts.inc @@ -126,7 +126,7 @@ FuchsiaCity_EventScript_166E83:: @ 8166E83 FuchsiaCity_EventScript_166E9C:: @ 8166E9C lockall checkflag FLAG_0x272 - goto_if 1, EventScript_166EBE + goto_if_eq 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 6092301c9..58cacf92e 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_0x23A - goto_if 1, EventScript_16D7FA + goto_if_eq EventScript_16D7FA checkflag FLAG_0x189 - goto_if 1, EventScript_16D780 + goto_if_eq EventScript_16D780 msgbox gUnknown_8198DF9, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 call_if 1, EventScript_16D7E8 diff --git a/data/maps/FuchsiaCity_Gym/scripts.inc b/data/maps/FuchsiaCity_Gym/scripts.inc index 0d9f6b583..6b57f6377 100644 --- a/data/maps/FuchsiaCity_Gym/scripts.inc +++ b/data/maps/FuchsiaCity_Gym/scripts.inc @@ -28,7 +28,7 @@ EventScript_16D5A6:: @ 816D5A6 msgbox gUnknown_819850E checkitemspace ITEM_TM06, 1 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16D5E7 + goto_if_eq EventScript_16D5E7 additem ITEM_TM06, 1 giveitemfanfaremsg gUnknown_819858F, ITEM_TM06 setflag FLAG_0x259 @@ -78,7 +78,7 @@ FuchsiaCity_Gym_EventScript_16D688:: @ 816D688 lock faceplayer checkflag FLAG_0x4B4 - goto_if 1, EventScript_16D69D + goto_if_eq EventScript_16D69D msgbox gUnknown_8198A5E release end @@ -91,7 +91,7 @@ EventScript_16D69D:: @ 816D69D FuchsiaCity_Gym_EventScript_16D6A7:: @ 816D6A7 lockall checkflag FLAG_UNK824 - goto_if 1, EventScript_16D6BB + goto_if_eq EventScript_16D6BB msgbox gUnknown_8198B4B releaseall end diff --git a/data/maps/FuchsiaCity_House2/scripts.inc b/data/maps/FuchsiaCity_House2/scripts.inc index ac6e74297..0568d4e4f 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_0x244 - goto_if 1, EventScript_16D83F + goto_if_eq EventScript_16D83F msgbox gUnknown_819918E, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if 1, 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 1, 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 500a45ac8..e295ad46d 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 1, EventScript_16D8B0 + goto_if_eq EventScript_16D8B0 goto EventScript_16D941 end @@ -18,20 +18,20 @@ EventScript_16D8B0:: @ 816D8B0 goto_if 4, EventScript_16D941 special sub_80BFC14 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16D937 + goto_if_eq EventScript_16D937 special ScrSpecial_CountPokemonMoves compare_var_to_value VAR_RESULT, 1 - goto_if 1, 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 1, EventScript_16D8B0 + goto_if_eq EventScript_16D8B0 special ScrSpecial_GetPokemonNicknameAndMoveName msgbox gUnknown_8199485, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if 1, 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 da90ac8d0..fe95c748c 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 1, 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 08267468a..a2ee86113 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 1, 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 1, 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 1, 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 5, EventScript_1A77A9 specialvar VAR_RESULT, sub_80CABD0 compare_var_to_value VAR_RESULT, 1 - goto_if 1, 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 1, 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 a8aac2447..56a3cdcb3 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 1, EventScript_1A77A9 + goto_if_eq EventScript_1A77A9 setobjectxyperm 4, 4, 2 return @@ -21,14 +21,14 @@ IndigoPlateau_PokemonCenter_1F_EventScript_16EA8A:: @ 816EA8A faceplayer specialvar VAR_RESULT, sub_806E25C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16EAA6 + goto_if_eq EventScript_16EAA6 msgbox gUnknown_819A8D8 release end EventScript_16EAA6:: @ 816EAA6 checkflag FLAG_0x844 - goto_if 1, EventScript_16EAB9 + goto_if_eq 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 1, 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 1329fe26b..999662e6e 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 1, 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 406ada7ae..8f7ba9d44 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_0x23C - goto_if 1, EventScript_16B248 + goto_if_eq EventScript_16B248 msgbox gUnknown_819397D release end diff --git a/data/maps/LavenderTown_House2/scripts.inc b/data/maps/LavenderTown_House2/scripts.inc index bbced623f..0a5c708ab 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 1, EventScript_16B287 + goto_if_eq EventScript_16B287 compare_var_to_value VAR_RESULT, 0 - goto_if 1, 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 1, EventScript_16B307 + goto_if_eq EventScript_16B307 special TV_CopyNicknameToStringVar1AndEnsureTerminated special TV_CheckMonOTIDEqualsPlayerID compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16B311 + goto_if_eq EventScript_16B311 specialvar VAR_RESULT, sub_80CAD7C special TV_CopyNicknameToStringVar1AndEnsureTerminated compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16B311 + goto_if_eq EventScript_16B311 msgbox gUnknown_8193AD2, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16B31B + goto_if_eq EventScript_16B31B compare_var_to_value VAR_RESULT, 0 - goto_if 1, 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 1, 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 ca3307efb..380af6e9d 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 1, 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 4ee7efbdf..f1a079cde 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_0x23D - goto_if 1, EventScript_16B196 + goto_if_eq EventScript_16B196 msgbox gUnknown_81936FF checkitemspace ITEM_POKE_FLUTE, 1 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16B1A0 + goto_if_eq EventScript_16B1A0 setflag FLAG_0x23D additem ITEM_POKE_FLUTE, 1 giveitemfanfaremsg gUnknown_81937BD, ITEM_POKE_FLUTE, 1, BGM_FRLG_ME_KEYITEM @@ -45,7 +45,7 @@ LavenderTown_VolunteerPokemonHouse_EventScript_16B1CC:: @ 816B1CC lock faceplayer checkflag FLAG_0x23C - goto_if 1, EventScript_16B1E1 + goto_if_eq EventScript_16B1E1 msgbox gUnknown_81935ED release end diff --git a/data/maps/MtEmber_Exterior/scripts.inc b/data/maps/MtEmber_Exterior/scripts.inc index 4c7079c07..4ff35116d 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 FLAG_0x219 - goto_if 1, EventScript_16399E + goto_if_eq EventScript_16399E compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4 - goto_if 1, EventScript_1639A8 + goto_if_eq EventScript_1639A8 msgbox gUnknown_817A82A release end @@ -46,7 +46,7 @@ EventScript_1639A8:: @ 81639A8 trainerbattle 3, 537, 0, Text_17AA34 msgbox gUnknown_817AA3F checktrainerflag FLAG_0x21A - goto_if 1, EventScript_1639DB + goto_if_eq EventScript_1639DB release end @@ -64,9 +64,9 @@ MtEmber_Exterior_EventScript_1639F0:: @ 81639F0 lock faceplayer checktrainerflag FLAG_0x21A - goto_if 1, EventScript_163A1B + goto_if_eq EventScript_163A1B compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4 - goto_if 1, EventScript_163A25 + goto_if_eq EventScript_163A25 msgbox gUnknown_817A88C closemessage applymovement 3, Movement_1A75E5 @@ -85,7 +85,7 @@ EventScript_163A25:: @ 8163A25 trainerbattle 3, 538, 0, Text_17AA8A msgbox gUnknown_817AA99 checktrainerflag FLAG_0x219 - goto_if 1, 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 f877e3b9b..3de162df2 100644 --- a/data/maps/MtEmber_Summit/scripts.inc +++ b/data/maps/MtEmber_Summit/scripts.inc @@ -27,7 +27,7 @@ EventScript_163B2F:: @ 8163B2F MtEmber_Summit_EventScript_163B33:: @ 8163B33 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 lock faceplayer @@ -46,11 +46,11 @@ MtEmber_Summit_EventScript_163B33:: @ 8163B33 clearflag FLAG_0x807 specialvar VAR_RESULT, sub_80CA74C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_163B96 + goto_if_eq EventScript_163B96 compare_var_to_value VAR_RESULT, 4 - goto_if 1, EventScript_163B9F + goto_if_eq EventScript_163B9F compare_var_to_value VAR_RESULT, 5 - goto_if 1, 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 71c14d647..1947a3eb2 100644 --- a/data/maps/MtMoon_B2F/scripts.inc +++ b/data/maps/MtMoon_B2F/scripts.inc @@ -24,9 +24,9 @@ MtMoon_B2F_EventScript_1606C2:: @ 81606C2 lock faceplayer checkflag FLAG_0x232 - goto_if 1, EventScript_160707 + goto_if_eq EventScript_160707 checktrainerflag FLAG_0x0AA - goto_if 1, 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 1, EventScript_1607DE + goto_if_eq EventScript_1607DE removeobject 1 additem ITEM_DOME_FOSSIL, 1 giveitemfanfaremsg gUnknown_8172ECD, ITEM_DOME_FOSSIL, 1, BGM_FRLG_ME_KEYITEM @@ -91,7 +91,7 @@ MtMoon_B2F_EventScript_16077F:: @ 816077F faceplayer msgbox gUnknown_8172E94, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1607DE + goto_if_eq EventScript_1607DE removeobject 2 additem ITEM_HELIX_FOSSIL, 1 giveitemfanfaremsg gUnknown_8172EB2, ITEM_HELIX_FOSSIL, 1, BGM_FRLG_ME_KEYITEM diff --git a/data/maps/NavelRock_Base/scripts.inc b/data/maps/NavelRock_Base/scripts.inc index d2126b0e9..34cca4e9b 100644 --- a/data/maps/NavelRock_Base/scripts.inc +++ b/data/maps/NavelRock_Base/scripts.inc @@ -16,7 +16,7 @@ EventScript_165105:: @ 8165105 EventScript_165109:: @ 8165109 checkflag FLAG_0x2F5 - goto_if 1, EventScript_1A77A9 + goto_if_eq EventScript_1A77A9 clearflag FLAG_0x09B return @@ -35,7 +35,7 @@ EventScript_165120:: @ 8165120 NavelRock_Base_EventScript_165134:: @ 8165134 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 lock faceplayer @@ -70,11 +70,11 @@ NavelRock_Base_EventScript_165134:: @ 8165134 clearflag FLAG_0x807 specialvar VAR_RESULT, sub_80CA74C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1651D9 + goto_if_eq EventScript_1651D9 compare_var_to_value VAR_RESULT, 4 - goto_if 1, EventScript_1651E7 + goto_if_eq EventScript_1651E7 compare_var_to_value VAR_RESULT, 5 - goto_if 1, 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 f77fbf86d..cb82149e8 100644 --- a/data/maps/NavelRock_Summit/scripts.inc +++ b/data/maps/NavelRock_Summit/scripts.inc @@ -18,7 +18,7 @@ EventScript_164FBD:: @ 8164FBD EventScript_164FC6:: @ 8164FC6 setvar VAR_0x4001, 1 checkflag FLAG_0x2F6 - goto_if 1, EventScript_1A77A9 + goto_if_eq EventScript_1A77A9 setvar VAR_0x4001, 0 clearflag FLAG_0x09C return @@ -38,7 +38,7 @@ EventScript_164FE7:: @ 8164FE7 NavelRock_Summit_EventScript_164FFB:: @ 8164FFB special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 lockall setvar VAR_0x4001, 1 @@ -75,11 +75,11 @@ NavelRock_Summit_EventScript_164FFB:: @ 8164FFB setvar VAR_LAST_TALKED, 1 specialvar VAR_RESULT, sub_80CA74C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1650B4 + goto_if_eq EventScript_1650B4 compare_var_to_value VAR_RESULT, 4 - goto_if 1, EventScript_1650C2 + goto_if_eq EventScript_1650C2 compare_var_to_value VAR_RESULT, 5 - goto_if 1, 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 a456b217a..540980a3e 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 1, EventScript_16753F + goto_if_eq EventScript_16753F checkflag FLAG_0x2A1 - goto_if 1, EventScript_167535 + goto_if_eq 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 cf597a732..fbb4fb622 100644 --- a/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc +++ b/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc @@ -31,7 +31,7 @@ OneIsland_KindleRoad_EmberSpa_EventScript_165399:: @ 8165399 lock faceplayer checkflag FLAG_0x2EF - goto_if 1, EventScript_1653C5 + goto_if_eq 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 15bfb7e4d..61efea315 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc @@ -193,7 +193,7 @@ OneIsland_PokemonCenter_1F_EventScript_170E94:: @ 8170E94 OneIsland_PokemonCenter_1F_EventScript_170E9D:: @ 8170E9D lock checkflag FLAG_0x2A1 - goto_if 1, EventScript_170EB1 + goto_if_eq 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 1, EventScript_170F35 + goto_if_eq EventScript_170F35 compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 6 - goto_if 1, EventScript_170F9B + goto_if_eq EventScript_170F9B checkflag FLAG_0x2DC - goto_if 1, EventScript_170FA5 + goto_if_eq EventScript_170FA5 compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 - goto_if 1, EventScript_17103A + goto_if_eq EventScript_17103A checkflag FLAG_0x2DD - goto_if 1, EventScript_171044 + goto_if_eq EventScript_171044 compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4 - goto_if 1, EventScript_1710F2 + goto_if_eq EventScript_1710F2 specialvar VAR_RESULT, sub_806E25C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1710FC + goto_if_eq EventScript_1710FC compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 3 - goto_if 1, 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 1, EventScript_170F6D + goto_if_eq EventScript_170F6D compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_170F84 + goto_if_eq EventScript_170F84 setvar VAR_0x8004, 13 setvar VAR_0x8005, 5 special SetFlavorTextFlagFromSpecialVars @@ -331,14 +331,14 @@ EventScript_171044:: @ 8171044 waitmovement 0 msgbox gUnknown_81A19AA, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, 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 1, EventScript_171099 + goto_if_eq EventScript_171099 goto EventScript_1710B2 end @@ -411,7 +411,7 @@ OneIsland_PokemonCenter_1F_EventScript_17115A:: @ 817115A lock faceplayer checkflag FLAG_0x844 - goto_if 1, EventScript_17116F + goto_if_eq EventScript_17116F msgbox gUnknown_81A218D release end @@ -424,9 +424,9 @@ EventScript_17116F:: @ 817116F OneIsland_PokemonCenter_1F_EventScript_171179:: @ 8171179 lockall checkflag FLAG_0x844 - goto_if 1, EventScript_1711A0 + goto_if_eq EventScript_1711A0 checkflag FLAG_0x2A1 - goto_if 1, EventScript_171196 + goto_if_eq EventScript_171196 msgbox gUnknown_81A223F releaseall end diff --git a/data/maps/PalletTown/scripts.inc b/data/maps/PalletTown/scripts.inc index b8e54e837..ed9d01395 100644 --- a/data/maps/PalletTown/scripts.inc +++ b/data/maps/PalletTown/scripts.inc @@ -27,7 +27,7 @@ EventScript_1654A2:: @ 81654A2 EventScript_1654A8:: @ 81654A8 checkflag FLAG_0x291 - goto_if 1, EventScript_1654BD + goto_if_eq EventScript_1654BD setobjectxyperm 1, 5, 15 setobjectmovementtype 1, 7 return @@ -377,13 +377,13 @@ Movement_165758:: @ 8165758 PalletTown_EventScript_16575C:: @ 816575C lock compare_var_to_value VAR_0x4070, 2 - goto_if 1, EventScript_1657ED + goto_if_eq EventScript_1657ED compare_var_to_value VAR_0x4070, 1 - goto_if 1, EventScript_165815 + goto_if_eq EventScript_165815 compare_var_to_value VAR_0x4002, 1 - goto_if 1, EventScript_1658C2 + goto_if_eq EventScript_1658C2 checkflag FLAG_0x002 - goto_if 1, EventScript_165801 + goto_if_eq 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 57f0d4e14..dd3f05aa9 100644 --- a/data/maps/PalletTown_GarysHouse/scripts.inc +++ b/data/maps/PalletTown_GarysHouse/scripts.inc @@ -25,13 +25,13 @@ PalletTown_GarysHouse_EventScript_168D56:: @ 8168D56 setvar VAR_0x8005, 2 special UpdatePickStateFromSpecialVar8005 checkflag FLAG_0x82C - goto_if 1, EventScript_168DB9 + goto_if_eq EventScript_168DB9 compare_var_to_value VAR_0x4001, 1 - goto_if 1, EventScript_168EEC + goto_if_eq EventScript_168EEC compare_var_to_value VAR_0x4058, 2 - goto_if 1, EventScript_168F59 + goto_if_eq EventScript_168F59 compare_var_to_value VAR_0x4058, 1 - goto_if 1, EventScript_168EF6 + goto_if_eq EventScript_168EF6 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1 goto_if 4, EventScript_168DAF msgbox gUnknown_818D58C @@ -49,13 +49,13 @@ EventScript_168DAF:: @ 8168DAF EventScript_168DB9:: @ 8168DB9 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 compare_var_to_value VAR_MIRAGE_RND_L, 500 goto_if 0, EventScript_168E46 msgbox gUnknown_818D7D3, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_168E3C + goto_if_eq EventScript_168E3C msgbox gUnknown_818D8B2 special sub_80BF8FC waitstate @@ -65,7 +65,7 @@ EventScript_168DB9:: @ 8168DB9 goto_if 4, EventScript_168E3C specialvar VAR_RESULT, sub_80CAD54 compare_var_to_value VAR_RESULT, SPECIES_EGG - goto_if 1, EventScript_168E32 + goto_if_eq EventScript_168E32 msgbox gUnknown_818D8CC closemessage fadescreen 1 @@ -91,21 +91,14 @@ EventScript_168E3C:: @ 8168E3C EventScript_168E46:: @ 8168E46 msgbox gUnknown_818D9A5 specialvar VAR_RESULT, sub_80CA76C - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_168EA6 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_168EB0 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_168EBA - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_168EC4 - compare_var_to_value VAR_0x8000, 4 - goto_if 1, EventScript_168ECE - compare_var_to_value VAR_0x8000, 5 - goto_if 1, EventScript_168ED8 - compare_var_to_value VAR_0x8000, 6 - goto_if 1, EventScript_168EE2 + switch VAR_RESULT + case 0, EventScript_168EA6 + case 1, EventScript_168EB0 + case 2, EventScript_168EBA + case 3, EventScript_168EC4 + case 4, EventScript_168ECE + case 5, EventScript_168ED8 + case 6, EventScript_168EE2 end EventScript_168EA6:: @ 8168EA6 @@ -153,7 +146,7 @@ EventScript_168EF6:: @ 8168EF6 closemessage checkitemspace ITEM_TOWN_MAP, 1 compare_var_to_value VAR_RESULT, 0 - goto_if 1, 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 c54acad65..89eabeea1 100644 --- a/data/maps/PalletTown_PlayersHouse_1F/scripts.inc +++ b/data/maps/PalletTown_PlayersHouse_1F/scripts.inc @@ -5,7 +5,7 @@ PalletTown_PlayersHouse_1F_EventScript_168C09:: @ 8168C09 lock faceplayer checkflag FLAG_0x258 - goto_if 1, EventScript_168C4A + goto_if_eq EventScript_168C4A checkplayergender compare_var_to_value VAR_RESULT, 0 call_if 1, 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 1, 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 1d0db7f52..ec105ea63 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 1, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lockall setvar VAR_0x8004, 32 special sub_812B220 diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc index 9f0aba04c..44f6bbc5a 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc +++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc @@ -312,20 +312,20 @@ EventScript_16930B:: @ 816930B applymovement 4, Movement_1A75F1 waitmovement 0 compare_var_to_value VAR_STARTER_MON, 0 - goto_if 1, EventScript_1693D2 + goto_if_eq EventScript_1693D2 compare_var_to_value VAR_STARTER_MON, 1 - goto_if 1, EventScript_16944D + goto_if_eq EventScript_16944D compare_var_to_value VAR_STARTER_MON, 2 - goto_if 1, EventScript_16935A + goto_if_eq EventScript_16935A end EventScript_16935A:: @ 816935A compare_var_to_value VAR_0x4002, 1 - goto_if 1, EventScript_16937C + goto_if_eq EventScript_16937C compare_var_to_value VAR_0x4002, 2 - goto_if 1, EventScript_16938C + goto_if_eq EventScript_16938C compare_var_to_value VAR_0x4002, 3 - goto_if 1, 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 1, EventScript_1693F4 + goto_if_eq EventScript_1693F4 compare_var_to_value VAR_0x4002, 2 - goto_if 1, EventScript_169404 + goto_if_eq EventScript_169404 compare_var_to_value VAR_0x4002, 3 - goto_if 1, 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 1, EventScript_16946F + goto_if_eq EventScript_16946F compare_var_to_value VAR_0x4002, 2 - goto_if 1, EventScript_16947F + goto_if_eq EventScript_16947F compare_var_to_value VAR_0x4002, 3 - goto_if 1, EventScript_16948F + goto_if_eq EventScript_16948F end EventScript_16946F:: @ 816946F @@ -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 1, EventScript_16958B + goto_if_eq EventScript_16958B compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2 - goto_if 1, 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_0x002 - goto_if 1, EventScript_169600 + goto_if_eq EventScript_169600 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 9 - goto_if 1, EventScript_169903 + goto_if_eq EventScript_169903 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 8 - goto_if 1, EventScript_169A6E + goto_if_eq EventScript_169A6E checkflag FLAG_0x82C - goto_if 1, EventScript_1699CE + goto_if_eq EventScript_1699CE compare_var_to_value VAR_0x4052, 1 - goto_if 1, EventScript_169903 + goto_if_eq EventScript_169903 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 6 - goto_if 1, EventScript_1698D6 + goto_if_eq EventScript_1698D6 compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 1 goto_if 4, EventScript_16961E compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 4 - goto_if 1, EventScript_169614 + goto_if_eq EventScript_169614 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 - goto_if 1, EventScript_16960A + goto_if_eq EventScript_16960A msgbox gUnknown_818E116 release end @@ -842,14 +842,14 @@ EventScript_1698D6:: @ 81698D6 getnumberstring 0, VAR_0x8008 getnumberstring 1, VAR_0x8009 compare_var_to_value VAR_0x8009, 1 - goto_if 1, EventScript_1699FB + goto_if_eq EventScript_1699FB goto EventScript_169903 end EventScript_169903:: @ 8169903 call EventScript_1A737B checkflag FLAG_0x2F4 - goto_if 1, EventScript_169913 + goto_if_eq EventScript_169913 release end @@ -988,15 +988,15 @@ EventScript_1699F9:: @ 81699F9 EventScript_1699FB:: @ 81699FB special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 checkflag FLAG_0x24F - goto_if 1, EventScript_169A6E + goto_if_eq EventScript_169A6E checkflag FLAG_0x247 - goto_if 1, EventScript_169A78 + goto_if_eq EventScript_169A78 checkitem ITEM_POKE_BALL, 1 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_169A34 + goto_if_eq EventScript_169A34 goto EventScript_169A6E end @@ -1153,7 +1153,7 @@ PalletTown_ProfessorOaksLab_EventScript_169BAB:: @ 8169BAB compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 goto_if 4, EventScript_169DE4 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2 - goto_if 1, EventScript_169BE1 + goto_if_eq EventScript_169BE1 msgbox gUnknown_818EA19 release end @@ -1164,35 +1164,35 @@ EventScript_169BE1:: @ 8169BE1 drawmonpic VAR_0x4002, 10, 3 textcolor 0 compare_var_to_value VAR_0x4001, 0 - goto_if 1, EventScript_169C14 + goto_if_eq EventScript_169C14 compare_var_to_value VAR_0x4001, 1 - goto_if 1, EventScript_169C33 + goto_if_eq EventScript_169C33 compare_var_to_value VAR_0x4001, 2 - goto_if 1, EventScript_169C52 + goto_if_eq EventScript_169C52 end EventScript_169C14:: @ 8169C14 msgbox gUnknown_818E272, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_169C74 + goto_if_eq EventScript_169C74 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_169C71 + goto_if_eq EventScript_169C71 end EventScript_169C33:: @ 8169C33 msgbox gUnknown_818E207, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_169C74 + goto_if_eq EventScript_169C74 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_169C71 + goto_if_eq EventScript_169C71 end EventScript_169C52:: @ 8169C52 msgbox gUnknown_818E194, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_169C74 + goto_if_eq EventScript_169C74 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_169C71 + goto_if_eq EventScript_169C71 end EventScript_169C71:: @ 8169C71 @@ -1216,9 +1216,9 @@ EventScript_169C74:: @ 8169C74 waitfanfare msgbox gUnknown_81A56A7, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_169CCC + goto_if_eq EventScript_169CCC compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_169CDC + goto_if_eq EventScript_169CDC end EventScript_169CCC:: @ 8169CCC @@ -1230,11 +1230,11 @@ EventScript_169CCC:: @ 8169CCC EventScript_169CDC:: @ 8169CDC closemessage compare_var_to_value VAR_0x4001, 0 - goto_if 1, EventScript_169CFF + goto_if_eq EventScript_169CFF compare_var_to_value VAR_0x4001, 1 - goto_if 1, EventScript_169D1F + goto_if_eq EventScript_169D1F compare_var_to_value VAR_0x4001, 2 - goto_if 1, EventScript_169D0F + goto_if_eq EventScript_169D0F end EventScript_169CFF:: @ 8169CFF @@ -1313,7 +1313,7 @@ PalletTown_ProfessorOaksLab_EventScript_169D78:: @ 8169D78 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 goto_if 4, EventScript_169DE4 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2 - goto_if 1, EventScript_169BE1 + goto_if_eq EventScript_169BE1 msgbox gUnknown_818EA19 release end @@ -1328,7 +1328,7 @@ PalletTown_ProfessorOaksLab_EventScript_169DAE:: @ 8169DAE compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 goto_if 4, EventScript_169DE4 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2 - goto_if 1, EventScript_169BE1 + goto_if_eq EventScript_169BE1 msgbox gUnknown_818EA19 release end @@ -1342,7 +1342,7 @@ PalletTown_ProfessorOaksLab_EventScript_169DEE:: @ 8169DEE lock faceplayer checkflag FLAG_0x82C - goto_if 1, EventScript_169E03 + goto_if_eq EventScript_169E03 msgbox gUnknown_818EBE6 release end @@ -1359,7 +1359,7 @@ PalletTown_ProfessorOaksLab_EventScript_169E1A:: @ 8169E1A lock faceplayer checkflag FLAG_0x82C - goto_if 1, EventScript_169E2F + goto_if_eq EventScript_169E2F msgbox gUnknown_818EBE6 release end diff --git a/data/maps/PewterCity/scripts.inc b/data/maps/PewterCity/scripts.inc index 9c8e7bb8e..465f47f76 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 1, EventScript_166136 + goto_if_eq EventScript_166136 msgbox gUnknown_817E589 closemessage delay 10 @@ -1354,7 +1354,7 @@ PewterCity_EventScript_166244:: @ 8166244 faceplayer msgbox gUnknown_817E602, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if 1, 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 af2f707b3..5990bf1e3 100644 --- a/data/maps/PewterCity_Gym/scripts.inc +++ b/data/maps/PewterCity_Gym/scripts.inc @@ -30,7 +30,7 @@ EventScript_16A5F3:: @ 816A5F3 msgbox gUnknown_8190FC1 checkitemspace ITEM_TM39, 1 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16A634 + goto_if_eq EventScript_16A634 additem ITEM_TM39, 1 giveitemfanfaremsg gUnknown_8190FDB, ITEM_TM39 setflag FLAG_0x254 @@ -52,12 +52,12 @@ PewterCity_Gym_EventScript_16A655:: @ 816A655 lock faceplayer checkflag FLAG_0x4B0 - goto_if 1, EventScript_16A67F + goto_if_eq EventScript_16A67F msgbox gUnknown_8191298, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16A689 + goto_if_eq EventScript_16A689 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16A697 + goto_if_eq EventScript_16A697 end EventScript_16A67F:: @ 816A67F @@ -83,7 +83,7 @@ EventScript_16A6A5:: @ 816A6A5 PewterCity_Gym_EventScript_16A6AF:: @ 816A6AF lockall checkflag FLAG_UNK820 - goto_if 1, EventScript_16A6C3 + goto_if_eq EventScript_16A6C3 msgbox gUnknown_819146E releaseall end diff --git a/data/maps/PewterCity_Mart/scripts.inc b/data/maps/PewterCity_Mart/scripts.inc index 374a99048..9e6fc4375 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 1, 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 e2d6a7d5c..7540e74d5 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 1, EventScript_16A348 + goto_if_eq EventScript_16A348 compare_var_to_value VAR_FACING, 1 - goto_if 1, EventScript_16A348 + goto_if_eq EventScript_16A348 compare_var_to_value VAR_FACING, 2 - goto_if 1, 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 1, EventScript_16A367 + goto_if_eq EventScript_16A367 compare_var_to_value VAR_RESULT, 0 - goto_if 1, 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 1, 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 1, EventScript_16A476 + goto_if_eq EventScript_16A476 closemessage compare_var_to_value VAR_0x4001, 0 call_if 1, EventScript_16A455 @@ -159,11 +159,11 @@ PewterCity_Museum_1F_EventScript_16A4AE:: @ 816A4AE lock faceplayer checkflag FLAG_0x25E - goto_if 1, EventScript_16A4FF + goto_if_eq EventScript_16A4FF msgbox gUnknown_8190717 checkitemspace ITEM_OLD_AMBER, 1 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16A4F5 + goto_if_eq EventScript_16A4F5 setflag FLAG_0x25E removeobject 4 additem ITEM_OLD_AMBER, 1 diff --git a/data/maps/PokemonLeague_AgathasRoom/scripts.inc b/data/maps/PokemonLeague_AgathasRoom/scripts.inc index 47bbf5d5b..2a46b544d 100644 --- a/data/maps/PokemonLeague_AgathasRoom/scripts.inc +++ b/data/maps/PokemonLeague_AgathasRoom/scripts.inc @@ -51,7 +51,7 @@ PokemonLeague_AgathasRoom_EventScript_162877:: @ 8162877 setvar VAR_0x8005, 2 special UpdatePickStateFromSpecialVar8005 checkflag FLAG_0x4BA - goto_if 1, EventScript_162911 + goto_if_eq EventScript_162911 setvar VAR_0x8004, 11 setvar VAR_0x8005, 0 special SetFlavorTextFlagFromSpecialVars diff --git a/data/maps/PokemonLeague_BrunosRoom/scripts.inc b/data/maps/PokemonLeague_BrunosRoom/scripts.inc index 78ce11521..6cc4a23a4 100644 --- a/data/maps/PokemonLeague_BrunosRoom/scripts.inc +++ b/data/maps/PokemonLeague_BrunosRoom/scripts.inc @@ -51,7 +51,7 @@ PokemonLeague_BrunosRoom_EventScript_1626EC:: @ 81626EC setvar VAR_0x8005, 2 special UpdatePickStateFromSpecialVar8005 checkflag FLAG_0x4B9 - goto_if 1, EventScript_162779 + goto_if_eq EventScript_162779 setvar VAR_0x8004, 10 setvar VAR_0x8005, 0 special SetFlavorTextFlagFromSpecialVars diff --git a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc index e270f182d..b2b8bc46c 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 FLAG_0x1B6 - goto_if 1, EventScript_162B57 + goto_if_eq EventScript_162B57 checktrainerflag FLAG_0x2E3 - goto_if 1, EventScript_162B57 + goto_if_eq EventScript_162B57 return EventScript_162B31:: @ 8162B31 checktrainerflag FLAG_0x1B7 - goto_if 1, EventScript_162B57 + goto_if_eq EventScript_162B57 checktrainerflag FLAG_0x2E4 - goto_if 1, EventScript_162B57 + goto_if_eq EventScript_162B57 return EventScript_162B44:: @ 8162B44 checktrainerflag FLAG_0x1B8 - goto_if 1, EventScript_162B57 + goto_if_eq EventScript_162B57 checktrainerflag FLAG_0x2E5 - goto_if 1, EventScript_162B57 + goto_if_eq EventScript_162B57 return EventScript_162B57:: @ 8162B57 @@ -65,7 +65,7 @@ EventScript_162B76:: @ 8162B76 call_if 1, EventScript_162CBC special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_162C68 + goto_if_eq EventScript_162C68 setflag FLAG_0x003 setflag FLAG_0x005 savebgm BGM_FRLG_KACHI_LEADER diff --git a/data/maps/PokemonLeague_LancesRoom/scripts.inc b/data/maps/PokemonLeague_LancesRoom/scripts.inc index 3fb93bfc8..2eaebe6f7 100644 --- a/data/maps/PokemonLeague_LancesRoom/scripts.inc +++ b/data/maps/PokemonLeague_LancesRoom/scripts.inc @@ -105,7 +105,7 @@ PokemonLeague_LancesRoom_EventScript_162A14:: @ 8162A14 setvar VAR_0x8005, 2 special UpdatePickStateFromSpecialVar8005 checkflag FLAG_0x4BB - goto_if 1, EventScript_162AA1 + goto_if_eq EventScript_162AA1 setvar VAR_0x8004, 12 setvar VAR_0x8005, 0 special SetFlavorTextFlagFromSpecialVars diff --git a/data/maps/PokemonLeague_LoreleisRoom/scripts.inc b/data/maps/PokemonLeague_LoreleisRoom/scripts.inc index fcd1b9399..60e2b5086 100644 --- a/data/maps/PokemonLeague_LoreleisRoom/scripts.inc +++ b/data/maps/PokemonLeague_LoreleisRoom/scripts.inc @@ -56,7 +56,7 @@ PokemonLeague_LoreleisRoom_EventScript_1625DC:: @ 81625DC setvar VAR_0x8005, 2 special UpdatePickStateFromSpecialVar8005 checkflag FLAG_0x4B8 - goto_if 1, EventScript_162669 + goto_if_eq EventScript_162669 setvar VAR_0x8004, 9 setvar VAR_0x8005, 0 special SetFlavorTextFlagFromSpecialVars diff --git a/data/maps/PokemonTower_1F/scripts.inc b/data/maps/PokemonTower_1F/scripts.inc index f9defa3ba..c86280b74 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 1, 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 6caa45d92..dd2bdff80 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 1, 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 1, 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 a62969534..7f319287e 100644 --- a/data/maps/PokemonTower_7F/scripts.inc +++ b/data/maps/PokemonTower_7F/scripts.inc @@ -27,11 +27,11 @@ EventScript_1635A1:: @ 81635A1 closemessage getplayerxy VAR_0x8004, VAR_0x8005 compare_var_to_value VAR_0x8004, 10 - goto_if 1, EventScript_1635E0 + goto_if_eq EventScript_1635E0 compare_var_to_value VAR_0x8004, 11 - goto_if 1, EventScript_1635F0 + goto_if_eq EventScript_1635F0 compare_var_to_value VAR_0x8004, 9 - goto_if 1, EventScript_163600 + goto_if_eq EventScript_163600 applymovement 2, Movement_16362C waitmovement 0 goto EventScript_163616 @@ -117,9 +117,9 @@ EventScript_163658:: @ 8163658 closemessage getplayerxy VAR_0x8004, VAR_0x8005 compare_var_to_value VAR_0x8004, 12 - goto_if 1, EventScript_163699 + goto_if_eq EventScript_163699 compare_var_to_value VAR_0x8004, 13 - goto_if 1, EventScript_1636A9 + goto_if_eq EventScript_1636A9 applymovement 3, Movement_1636C6 waitmovement 0 goto EventScript_1636B9 @@ -182,9 +182,9 @@ EventScript_1636F1:: @ 81636F1 closemessage getplayerxy VAR_0x8004, VAR_0x8005 compare_var_to_value VAR_0x8004, 10 - goto_if 1, EventScript_163725 + goto_if_eq EventScript_163725 compare_var_to_value VAR_0x8004, 9 - goto_if 1, 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 e05f9c473..cb9b3acdc 100644 --- a/data/maps/PowerPlant/scripts.inc +++ b/data/maps/PowerPlant/scripts.inc @@ -40,7 +40,7 @@ EventScript_1637B4:: @ 81637B4 PowerPlant_EventScript_1637B8:: @ 81637B8 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 lock faceplayer @@ -59,11 +59,11 @@ PowerPlant_EventScript_1637B8:: @ 81637B8 clearflag FLAG_0x807 specialvar VAR_RESULT, sub_80CA74C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16381B + goto_if_eq EventScript_16381B compare_var_to_value VAR_RESULT, 4 - goto_if 1, EventScript_163824 + goto_if_eq EventScript_163824 compare_var_to_value VAR_RESULT, 5 - goto_if 1, 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 1, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lock faceplayer setwildbattle SPECIES_ELECTRODE, 34, ITEM_NONE @@ -95,11 +95,11 @@ PowerPlant_EventScript_16382F:: @ 816382F special sub_8112364 specialvar VAR_RESULT, sub_80CA74C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_163884 + goto_if_eq EventScript_163884 compare_var_to_value VAR_RESULT, 4 - goto_if 1, EventScript_163884 + goto_if_eq EventScript_163884 compare_var_to_value VAR_RESULT, 5 - goto_if 1, 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 1, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lock faceplayer setwildbattle SPECIES_ELECTRODE, 34, ITEM_NONE @@ -126,11 +126,11 @@ PowerPlant_EventScript_16388D:: @ 816388D special sub_8112364 specialvar VAR_RESULT, sub_80CA74C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1638E2 + goto_if_eq EventScript_1638E2 compare_var_to_value VAR_RESULT, 4 - goto_if 1, EventScript_1638E2 + goto_if_eq EventScript_1638E2 compare_var_to_value VAR_RESULT, 5 - goto_if 1, 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 d492212dd..949223e85 100644 --- a/data/maps/RocketHideout_B4F/scripts.inc +++ b/data/maps/RocketHideout_B4F/scripts.inc @@ -47,7 +47,7 @@ RocketHideout_B4F_EventScript_161363:: @ 8161363 removeobject 2 giveitem ITEM_SILPH_SCOPE compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1A6BF9 + goto_if_eq EventScript_1A6BF9 release end @@ -71,7 +71,7 @@ RocketHideout_B4F_EventScript_1613AD:: @ 81613AD removeobject 4 giveitem ITEM_LIFT_KEY compare_var_to_value VAR_RESULT, 0 - goto_if 1, 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 c9ffe7a0a..884335234 100644 --- a/data/maps/RocketHideout_Elevator/scripts.inc +++ b/data/maps/RocketHideout_Elevator/scripts.inc @@ -14,13 +14,10 @@ RocketHideout_Elevator_EventScript_1614D9:: @ 81614D9 waitmessage setvar VAR_0x8004, 2 specialvar VAR_RESULT, sub_80CB328 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_161530 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_16153C - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_161548 + switch VAR_RESULT + case 0, EventScript_161530 + case 1, EventScript_16153C + case 2, EventScript_161548 end EventScript_161530:: @ 8161530 @@ -45,24 +42,19 @@ EventScript_161553:: @ 8161553 end EventScript_161554:: @ 8161554 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_161591 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1615B9 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1615E1 - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_161609 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_161609 + switch VAR_RESULT + case 0, EventScript_161591 + case 1, EventScript_1615B9 + case 2, EventScript_1615E1 + case 3, EventScript_161609 + case 127, EventScript_161609 end EventScript_161591:: @ 8161591 setvar VAR_0x8006, 3 setdynamicwarp MAP_ROCKET_HIDEOUT_B1F, 255, 24, 25 compare_var_to_value VAR_0x403A, 3 - goto_if 1, EventScript_161609 + goto_if_eq EventScript_161609 call EventScript_16160E setvar VAR_0x403A, 3 goto EventScript_161609 @@ -74,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 1, EventScript_161609 + goto_if_eq EventScript_161609 call EventScript_16160E setvar VAR_0x403A, 2 goto EventScript_161609 @@ -86,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 1, 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 7c1e41e8c..16bd02597 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_0x230 - goto_if 1, EventScript_167F48 + goto_if_eq EventScript_167F48 msgbox gUnknown_818329D textcolor 3 checkitemspace ITEM_POTION, 1 compare_var_to_value VAR_RESULT, 0 - goto_if 1, 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 819902f19..f9ec2bec4 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 1, EventScript_16FCE7 + goto_if_eq EventScript_16FCE7 msgbox gUnknown_819E5FB, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1A7AD1 + goto_if_eq EventScript_1A7AD1 setvar VAR_0x8004, 0 specialvar VAR_RESULT, sub_80CA3D8 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 1, 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 892d16571..abc877c0e 100644 --- a/data/maps/Route11_EastEntrance_2F/scripts.inc +++ b/data/maps/Route11_EastEntrance_2F/scripts.inc @@ -4,7 +4,7 @@ Route11_EastEntrance_2F_MapScripts:: @ 816FD34 Route11_EastEntrance_2F_EventScript_16FD35:: @ 816FD35 lockall checkflag FLAG_0x253 - goto_if 1, EventScript_16FD49 + goto_if_eq EventScript_16FD49 msgbox gUnknown_819EC8A releaseall end @@ -24,10 +24,10 @@ Route11_EastEntrance_2F_EventScript_16FD5C:: @ 816FD5C setvar VAR_0x8008, 4 call EventScript_1A8CAD checkflag FLAG_0x251 - goto_if 1, EventScript_16FDCE + goto_if_eq EventScript_16FDCE msgbox gUnknown_81A597B, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16FDB6 + goto_if_eq EventScript_16FDB6 call EventScript_1A8CBD compare_var_to_value VAR_0x8004, 6 goto_if 4, EventScript_16FDB6 @@ -61,10 +61,10 @@ Route11_EastEntrance_2F_EventScript_16FDD8:: @ 816FDD8 faceplayer call EventScript_16FE64 checkflag FLAG_0x252 - goto_if 1, EventScript_16FE5A + goto_if_eq EventScript_16FE5A msgbox gUnknown_819E9E5, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1A7AD1 + goto_if_eq EventScript_1A7AD1 setvar VAR_0x8004, 0 specialvar VAR_RESULT, sub_80CA3D8 getnumberstring 2, VAR_0x8006 @@ -74,7 +74,7 @@ Route11_EastEntrance_2F_EventScript_16FDD8:: @ 816FDD8 msgbox gUnknown_819EAE4 checkitemspace ITEM_ITEMFINDER, 1 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1A7AC7 + goto_if_eq EventScript_1A7AC7 additem ITEM_ITEMFINDER, 1 giveitemfanfaremsg gUnknown_819EB37, ITEM_ITEMFINDER setflag FLAG_0x252 diff --git a/data/maps/Route12/scripts.inc b/data/maps/Route12/scripts.inc index 64fb7b75f..81be7952e 100644 --- a/data/maps/Route12/scripts.inc +++ b/data/maps/Route12/scripts.inc @@ -18,11 +18,11 @@ Route12_EventScript_168014:: @ 8168014 goto_if 0, EventScript_168099 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 msgbox gUnknown_81853CC, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16808D + goto_if_eq EventScript_16808D call EventScript_1A924B setwildbattle SPECIES_SNORLAX, 30, ITEM_NONE waitse @@ -36,11 +36,11 @@ Route12_EventScript_168014:: @ 8168014 clearflag FLAG_0x807 specialvar VAR_RESULT, sub_80CA74C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16808F + goto_if_eq EventScript_16808F compare_var_to_value VAR_RESULT, 4 - goto_if 1, EventScript_16808F + goto_if_eq EventScript_16808F compare_var_to_value VAR_RESULT, 5 - goto_if 1, 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 e9fb651a2..d4472473f 100644 --- a/data/maps/Route12_FishingHouse/scripts.inc +++ b/data/maps/Route12_FishingHouse/scripts.inc @@ -5,10 +5,10 @@ Route12_FishingHouse_EventScript_16FF0C:: @ 816FF0C lock faceplayer checkflag FLAG_0x255 - goto_if 1, EventScript_16FF7F + goto_if_eq EventScript_16FF7F msgbox gUnknown_819EFE0, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16FF34 + goto_if_eq EventScript_16FF34 msgbox gUnknown_819F1FA release end @@ -16,7 +16,7 @@ Route12_FishingHouse_EventScript_16FF0C:: @ 816FF0C EventScript_16FF34:: @ 816FF34 checkitemspace ITEM_SUPER_ROD, 1 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16FF75 + goto_if_eq EventScript_16FF75 additem ITEM_SUPER_ROD, 1 msgbox gUnknown_819F05B giveitemfanfaremsg gUnknown_819F0B2, ITEM_SUPER_ROD @@ -33,12 +33,12 @@ EventScript_16FF75:: @ 816FF75 EventScript_16FF7F:: @ 816FF7F special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, 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 1, 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 4, EventScript_16FFFF special sub_80A0984 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_170001 + goto_if_eq EventScript_170001 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_17000B + goto_if_eq EventScript_17000B compare_var_to_value VAR_RESULT, 3 - goto_if 1, EventScript_170031 + goto_if_eq EventScript_170031 compare_var_to_value VAR_RESULT, 4 - goto_if 1, EventScript_17001E + goto_if_eq EventScript_17001E 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 1, 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 1, EventScript_17007B + goto_if_eq 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 42370d54a..3c8727208 100644 --- a/data/maps/Route12_NorthEntrance_2F/scripts.inc +++ b/data/maps/Route12_NorthEntrance_2F/scripts.inc @@ -13,7 +13,7 @@ Route12_NorthEntrance_2F_EventScript_16FE8A:: @ 816FE8A lock faceplayer checkflag FLAG_0x25B - goto_if 1, EventScript_16FF01 + goto_if_eq EventScript_16FF01 checkplayergender compare_var_to_value VAR_RESULT, 0 call_if 1, EventScript_16FEE5 @@ -21,7 +21,7 @@ Route12_NorthEntrance_2F_EventScript_16FE8A:: @ 816FE8A call_if 1, EventScript_16FEEE checkitemspace ITEM_TM27, 1 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16FEF7 + goto_if_eq EventScript_16FEF7 additem ITEM_TM27, 1 giveitemfanfaremsg gUnknown_819EE9F, ITEM_TM27 msgbox gUnknown_819EEC6 diff --git a/data/maps/Route15_WestEntrance_2F/scripts.inc b/data/maps/Route15_WestEntrance_2F/scripts.inc index d8aba36d2..36ea31ca0 100644 --- a/data/maps/Route15_WestEntrance_2F/scripts.inc +++ b/data/maps/Route15_WestEntrance_2F/scripts.inc @@ -22,10 +22,10 @@ Route15_WestEntrance_2F_EventScript_1700B9:: @ 81700B9 faceplayer call EventScript_170145 checkflag FLAG_0x256 - goto_if 1, EventScript_17013B + goto_if_eq EventScript_17013B msgbox gUnknown_819F5AB, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1A7AD1 + goto_if_eq EventScript_1A7AD1 setvar VAR_0x8004, 0 specialvar VAR_RESULT, sub_80CA3D8 getnumberstring 2, VAR_0x8006 @@ -35,7 +35,7 @@ Route15_WestEntrance_2F_EventScript_1700B9:: @ 81700B9 msgbox gUnknown_819F6AA checkitemspace ITEM_EXP_SHARE, 1 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1A7AC7 + goto_if_eq EventScript_1A7AC7 additem ITEM_EXP_SHARE, 1 giveitemfanfaremsg gUnknown_819F6FD, ITEM_EXP_SHARE setflag FLAG_0x256 diff --git a/data/maps/Route16/scripts.inc b/data/maps/Route16/scripts.inc index dba835410..e5fd83934 100644 --- a/data/maps/Route16/scripts.inc +++ b/data/maps/Route16/scripts.inc @@ -37,11 +37,11 @@ Route16_EventScript_168121:: @ 8168121 goto_if 0, EventScript_1681A3 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 msgbox gUnknown_81853CC, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_168197 + goto_if_eq EventScript_168197 call EventScript_1A924B setwildbattle SPECIES_SNORLAX, 30, ITEM_NONE waitse @@ -54,11 +54,11 @@ Route16_EventScript_168121:: @ 8168121 clearflag FLAG_0x807 specialvar VAR_RESULT, sub_80CA74C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_168199 + goto_if_eq EventScript_168199 compare_var_to_value VAR_RESULT, 4 - goto_if 1, EventScript_168199 + goto_if_eq EventScript_168199 compare_var_to_value VAR_RESULT, 5 - goto_if 1, 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 8f30a2aa1..82cc7a6f4 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_0x238 - goto_if 1, EventScript_1701A5 + goto_if_eq EventScript_1701A5 msgbox gUnknown_819F851 checkitemspace ITEM_HM02, 1 compare_var_to_value VAR_RESULT, 0 - goto_if 1, 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_2F/scripts.inc b/data/maps/Route16_NorthEntrance_2F/scripts.inc index 676358b5f..32685e669 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 1, EventScript_170365 + goto_if_eq EventScript_170365 msgbox gUnknown_819FB0E, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1A7AD1 + goto_if_eq EventScript_1A7AD1 setvar VAR_0x8004, 0 specialvar VAR_RESULT, sub_80CA3D8 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 1, 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_2F/scripts.inc b/data/maps/Route18_EastEntrance_2F/scripts.inc index 801e54efd..204a0f879 100644 --- a/data/maps/Route18_EastEntrance_2F/scripts.inc +++ b/data/maps/Route18_EastEntrance_2F/scripts.inc @@ -15,10 +15,10 @@ Route18_EastEntrance_2F_EventScript_17047E:: @ 817047E setvar VAR_0x8008, 5 call EventScript_1A8CAD checkflag FLAG_0x257 - goto_if 1, EventScript_1704F0 + goto_if_eq EventScript_1704F0 msgbox gUnknown_81A597B, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1704D8 + goto_if_eq EventScript_1704D8 call EventScript_1A8CBD compare_var_to_value VAR_0x8004, 6 goto_if 4, EventScript_1704D8 diff --git a/data/maps/Route24/scripts.inc b/data/maps/Route24/scripts.inc index 50497540d..91dfc90f0 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_0x406B, 1 - goto_if 1, EventScript_168656 + goto_if_eq EventScript_168656 msgbox gUnknown_8188C3C checkitemspace ITEM_NUGGET, 1 compare_var_to_value VAR_RESULT, 0 - goto_if 1, 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 1, 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 1da87da68..5707c9938 100644 --- a/data/maps/Route25_SeaCottage/scripts.inc +++ b/data/maps/Route25_SeaCottage/scripts.inc @@ -22,16 +22,16 @@ Route25_SeaCottage_EventScript_17054B:: @ 817054B lock faceplayer checkflag FLAG_0x003 - goto_if 1, EventScript_1706C8 + goto_if_eq EventScript_1706C8 checkflag FLAG_0x234 - goto_if 1, EventScript_170640 + goto_if_eq EventScript_170640 checkflag FLAG_0x233 - goto_if 1, EventScript_17064A + goto_if_eq EventScript_17064A checkplayergender compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_170580 + goto_if_eq EventScript_170580 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_17058E + goto_if_eq EventScript_17058E end EventScript_170580:: @ 8170580 @@ -112,7 +112,7 @@ EventScript_17064A:: @ 817064A call_if 1, EventScript_1706B5 checkitemspace ITEM_SS_TICKET, 1 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1706BE + goto_if_eq EventScript_1706BE additem ITEM_SS_TICKET, 1 giveitemfanfaremsg gUnknown_81A028E, ITEM_SS_TICKET, 1, BGM_FRLG_ME_KEYITEM setflag FLAG_0x235 @@ -160,9 +160,9 @@ Movement_1706DB:: @ 81706DB Route25_SeaCottage_EventScript_1706DD:: @ 81706DD lockall checkflag FLAG_0x003 - goto_if 1, EventScript_1707CA + goto_if_eq EventScript_1707CA checkflag FLAG_0x002 - goto_if 1, EventScript_1706FA + goto_if_eq EventScript_1706FA msgbox gUnknown_81A0402 releaseall end @@ -251,19 +251,13 @@ EventScript_1707D8:: @ 81707D8 message Text_1A0479 waitmessage multichoice 0, 0, 1, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_17082B - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_170840 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_170855 - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_17086A - compare_var_to_value VAR_0x8000, 4 - goto_if 1, EventScript_17087F - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_17087F + switch VAR_RESULT + case 0, EventScript_17082B + case 1, EventScript_170840 + case 2, EventScript_170855 + case 3, EventScript_17086A + case 4, EventScript_17087F + case 127, EventScript_17087F end EventScript_17082B:: @ 817082B diff --git a/data/maps/Route2_EastBuilding/scripts.inc b/data/maps/Route2_EastBuilding/scripts.inc index 21b6f9193..9716879a1 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_0x23B - goto_if 1, EventScript_16F701 + goto_if_eq EventScript_16F701 msgbox gUnknown_819D64F, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1A7AD1 + goto_if_eq EventScript_1A7AD1 setvar VAR_0x8004, 0 specialvar VAR_RESULT, sub_80CA3D8 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 1, EventScript_1A7AC7 + goto_if_eq EventScript_1A7AC7 additem ITEM_HM05, 1 giveitemfanfaremsg gUnknown_819D7A1, ITEM_HM05 setflag FLAG_0x23B diff --git a/data/maps/Route2_House/scripts.inc b/data/maps/Route2_House/scripts.inc index 0759d70de..fd7ac6c05 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_0x248 - goto_if 1, EventScript_16F674 + goto_if_eq EventScript_16F674 msgbox gUnknown_81A597B, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16F65C + goto_if_eq EventScript_16F65C call EventScript_1A8CBD compare_var_to_value VAR_0x8004, 6 goto_if 4, EventScript_16F65C diff --git a/data/maps/Route4_PokemonCenter_1F/scripts.inc b/data/maps/Route4_PokemonCenter_1F/scripts.inc index d2d305823..3019e152f 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_0x249 - goto_if 1, EventScript_16F8A2 + goto_if_eq EventScript_16F8A2 showmoneybox 0, 0, 0 checkplayergender compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16F786 + goto_if_eq EventScript_16F786 compare_var_to_value VAR_RESULT, 1 - goto_if 1, 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 1, EventScript_16F888 + goto_if_eq EventScript_16F888 checkmoney 500, 0 compare_var_to_value VAR_RESULT, 0 - goto_if 1, 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 1, EventScript_16F7F6 + goto_if_eq EventScript_16F7F6 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16F822 + goto_if_eq EventScript_16F822 compare_var_to_value VAR_RESULT, 2 - goto_if 1, 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 1, 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 1, 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 1993be19c..1ac21c6b1 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 1, EventScript_16F958 + goto_if_eq 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 aeea2f7e6..9537d2e82 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 1, EventScript_16FA1E + goto_if_eq 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 2aacbed22..845eab835 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 1, EventScript_16FAE5 + goto_if_eq 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 16d77f8f9..1d347d2d0 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 1, EventScript_16FBAB + goto_if_eq 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 e37fb22fd..aa243949e 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 1, 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 ac794e8c2..1c6c0004c 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 1, 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 1, 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 5cf0b5375..32ab8b95c 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_0x237 - goto_if 1, EventScript_160BB5 + goto_if_eq 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 025d36484..67987618d 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_0x239 - goto_if 1, EventScript_1624A9 + goto_if_eq EventScript_1624A9 msgbox gUnknown_8177DC1 checkitemspace ITEM_HM03, 1 compare_var_to_value VAR_RESULT, 0 - goto_if 1, 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_Dojo/scripts.inc b/data/maps/SaffronCity_Dojo/scripts.inc index 8c7bbe61a..8be7e27a6 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 1, EventScript_16EC3C + goto_if_eq 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 1, 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 1, EventScript_16EC3C + goto_if_eq 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 1, 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 1, EventScript_16ECB5 + goto_if_eq EventScript_16ECB5 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16ECEC + goto_if_eq EventScript_16ECEC compare_var_to_value VAR_RESULT, 2 - goto_if 1, 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 1, 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 1, 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, 317, 0, Text_19B12C, Text_19B193, EventScript_16EDD0 checkflag FLAG_0x278 - goto_if 1, EventScript_16EDC6 + goto_if_eq EventScript_16EDC6 msgbox gUnknown_819B1A7, 6 end diff --git a/data/maps/SaffronCity_Duplicate/scripts.inc b/data/maps/SaffronCity_Duplicate/scripts.inc index e7ad1b506..b19502c90 100644 --- a/data/maps/SaffronCity_Duplicate/scripts.inc +++ b/data/maps/SaffronCity_Duplicate/scripts.inc @@ -43,7 +43,7 @@ SaffronCity_Duplicate_EventScript_1673B0:: @ 81673B0 SaffronCity_Duplicate_EventScript_1673B9:: @ 81673B9 lock checkflag FLAG_0x23C - goto_if 1, EventScript_1673D7 + goto_if_eq EventScript_1673D7 applymovement 6, Movement_1A75E1 waitmovement 0 msgbox gUnknown_81812CA diff --git a/data/maps/SaffronCity_Gym/scripts.inc b/data/maps/SaffronCity_Gym/scripts.inc index 206b2bbb8..cbd8b2d02 100644 --- a/data/maps/SaffronCity_Gym/scripts.inc +++ b/data/maps/SaffronCity_Gym/scripts.inc @@ -31,7 +31,7 @@ EventScript_16EE3D:: @ 816EE3D msgbox gUnknown_819B6FA checkitemspace ITEM_TM04, 1 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16EE7E + goto_if_eq EventScript_16EE7E additem ITEM_TM04, 1 giveitemfanfaremsg gUnknown_819B7D3, ITEM_TM04 setflag FLAG_0x29A @@ -86,7 +86,7 @@ SaffronCity_Gym_EventScript_16EF36:: @ 816EF36 lock faceplayer checkflag FLAG_0x4B5 - goto_if 1, EventScript_16EF4B + goto_if_eq EventScript_16EF4B msgbox gUnknown_819BCF6 release end @@ -99,7 +99,7 @@ EventScript_16EF4B:: @ 816EF4B SaffronCity_Gym_EventScript_16EF55:: @ 816EF55 lockall checkflag FLAG_0x825 - goto_if 1, EventScript_16EF69 + goto_if_eq 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 11da09898..8a6227b38 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 1, 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 1, EventScript_1C4CF6 + goto_if_eq EventScript_1C4CF6 checkplayergender compare_var_to_value VAR_RESULT, 0 call_if 1, EventScript_16EBB7 diff --git a/data/maps/SaffronCity_House3/scripts.inc b/data/maps/SaffronCity_House3/scripts.inc index 3186be2bb..89a44eecd 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_0x245 - goto_if 1, EventScript_16F0B5 + goto_if_eq EventScript_16F0B5 msgbox gUnknown_819C142 checkitemspace ITEM_TM29, 1 compare_var_to_value VAR_RESULT, 0 - goto_if 1, 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 cd657e11f..509fd37b6 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 1, 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 288b26693..17e583372 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_0x4060, 1 - goto_if 1, 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 f4e2d2427..dce3faa1b 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 1, EventScript_16F267 + goto_if_eq EventScript_16F267 compare_var_to_value VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 2 - goto_if 1, 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 1, EventScript_16F2EE + goto_if_eq EventScript_16F2EE specialvar VAR_RESULT, sub_8113364 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16F2C0 + goto_if_eq EventScript_16F2C0 specialvar VAR_RESULT, sub_8113288 compare_var_to_value VAR_RESULT, 7 - goto_if 1, 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 1, 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 1, EventScript_16F365 + goto_if_eq EventScript_16F365 specialvar VAR_RESULT, sub_8113364 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16F337 + goto_if_eq EventScript_16F337 specialvar VAR_RESULT, sub_8113288 compare_var_to_value VAR_RESULT, 7 - goto_if 1, 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 1, 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 1, EventScript_16F3DC + goto_if_eq EventScript_16F3DC specialvar VAR_RESULT, sub_8113364 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16F3AE + goto_if_eq EventScript_16F3AE specialvar VAR_RESULT, sub_8113288 compare_var_to_value VAR_RESULT, 7 - goto_if 1, 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 1, 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 1, EventScript_16F453 + goto_if_eq EventScript_16F453 specialvar VAR_RESULT, sub_8113364 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16F425 + goto_if_eq EventScript_16F425 specialvar VAR_RESULT, sub_8113288 compare_var_to_value VAR_RESULT, 7 - goto_if 1, 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 1, 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 1, EventScript_16F491 + goto_if_eq EventScript_16F491 specialvar VAR_RESULT, sub_8113288 compare_var_to_value VAR_RESULT, 7 - goto_if 1, 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 1, 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 1, EventScript_16F4F3 + goto_if_eq EventScript_16F4F3 specialvar VAR_RESULT, sub_8113288 compare_var_to_value VAR_RESULT, 7 - goto_if 1, 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 1, 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 1, EventScript_16F555 + goto_if_eq EventScript_16F555 specialvar VAR_RESULT, sub_8113288 compare_var_to_value VAR_RESULT, 7 - goto_if 1, 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 1, 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 1, EventScript_16F5B7 + goto_if_eq EventScript_16F5B7 specialvar VAR_RESULT, sub_8113288 compare_var_to_value VAR_RESULT, 7 - goto_if 1, 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 1, 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 8f43bfec1..e54e7ceb7 100644 --- a/data/maps/SeafoamIslands_B3F/scripts.inc +++ b/data/maps/SeafoamIslands_B3F/scripts.inc @@ -40,7 +40,7 @@ EventScript_162FA2:: @ 8162FA2 checkflag FLAG_0x047 call_if 0, EventScript_162FF0 compare_var_to_value VAR_0x4002, 2 - goto_if 1, EventScript_16300C + goto_if_eq EventScript_16300C getplayerxy VAR_0x8008, VAR_0x8009 compare_var_to_value VAR_0x8008, 24 call_if 0, EventScript_162FF6 diff --git a/data/maps/SeafoamIslands_B4F/scripts.inc b/data/maps/SeafoamIslands_B4F/scripts.inc index ffea0c87f..5ec6bc28c 100644 --- a/data/maps/SeafoamIslands_B4F/scripts.inc +++ b/data/maps/SeafoamIslands_B4F/scripts.inc @@ -56,7 +56,7 @@ SeafoamIslands_B4F_MapScript3_1630B1:: @ 81630B1 checkflag FLAG_0x04D call_if 0, EventScript_163169 compare_var_to_value VAR_0x4002, 2 - goto_if 1, EventScript_1630D4 + goto_if_eq EventScript_1630D4 end EventScript_1630D4:: @ 81630D4 @@ -100,7 +100,7 @@ EventScript_163121:: @ 8163121 checkflag FLAG_0x04D call_if 0, EventScript_163169 compare_var_to_value VAR_0x4002, 2 - goto_if 1, EventScript_163185 + goto_if_eq EventScript_163185 getplayerxy VAR_0x8008, VAR_0x8009 compare_var_to_value VAR_0x8008, 9 call_if 0, 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 1, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 lock faceplayer @@ -184,11 +184,11 @@ SeafoamIslands_B4F_EventScript_1631AC:: @ 81631AC clearflag FLAG_0x807 specialvar VAR_RESULT, sub_80CA74C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_16320F + goto_if_eq EventScript_16320F compare_var_to_value VAR_RESULT, 4 - goto_if 1, EventScript_163218 + goto_if_eq EventScript_163218 compare_var_to_value VAR_RESULT, 5 - goto_if 1, 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 d9f6f8526..107b91ad7 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 1, EventScript_17097D compare_var_to_value VAR_0x4001, 1 - goto_if 1, 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 1, EventScript_170A11 + goto_if_eq EventScript_170A11 call EventScript_170A1E compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_170A11 + goto_if_eq EventScript_170A11 msgbox gUnknown_81A0788, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_170A11 + goto_if_eq EventScript_170A11 special LoadPlayerParty call EventScript_1A4EAF compare_var_to_value VAR_RESULT, 0 - goto_if 1, 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 84510f03a..ce9ad21ed 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 1, 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 0aa730a5d..566ed3ee6 100644 --- a/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/scripts.inc +++ b/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/scripts.inc @@ -29,77 +29,77 @@ EventScript_164E07:: @ 8164E07 SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164E39:: @ 8164E39 lockall compare_var_to_value VAR_0x4001, 100 - goto_if 1, EventScript_164F8A + goto_if_eq EventScript_164F8A call EventScript_164F2E setvar VAR_0x4001, 100 compare_var_to_value VAR_0x4008, 7 - goto_if 1, 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 1, EventScript_164F8A + goto_if_eq EventScript_164F8A call EventScript_164F2E setvar VAR_0x4002, 100 compare_var_to_value VAR_0x4008, 7 - goto_if 1, 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 1, EventScript_164F8A + goto_if_eq EventScript_164F8A call EventScript_164F2E setvar VAR_0x4003, 100 compare_var_to_value VAR_0x4008, 7 - goto_if 1, 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 1, EventScript_164F8A + goto_if_eq EventScript_164F8A call EventScript_164F2E setvar VAR_0x4004, 100 compare_var_to_value VAR_0x4008, 7 - goto_if 1, 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 1, EventScript_164F8A + goto_if_eq EventScript_164F8A call EventScript_164F2E setvar VAR_0x4005, 100 compare_var_to_value VAR_0x4008, 7 - goto_if 1, 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 1, EventScript_164F8A + goto_if_eq EventScript_164F8A call EventScript_164F2E setvar VAR_0x4006, 100 compare_var_to_value VAR_0x4008, 7 - goto_if 1, 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 1, EventScript_164F8A + goto_if_eq EventScript_164F8A call EventScript_164F2E setvar VAR_0x4007, 100 compare_var_to_value VAR_0x4008, 7 - goto_if 1, 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 63a9297ef..4098a0e0d 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_0x002 - goto_if 1, EventScript_172211 + goto_if_eq EventScript_172211 playbgm BGM_FRLG_CHANSEY_DANCE, 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 1, 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 736a2aa40..de508c706 100644 --- a/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc @@ -14,11 +14,9 @@ SevenIsland_TrainerTower_Elevator_EventScript_164B03:: @ 8164B03 waitmessage setvar VAR_0x8004, 6 specialvar VAR_RESULT, sub_80CB328 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_164B46 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_164B52 + switch VAR_RESULT + case 0, EventScript_164B46 + case 1, EventScript_164B52 end EventScript_164B46:: @ 8164B46 @@ -32,22 +30,18 @@ EventScript_164B52:: @ 8164B52 end EventScript_164B5E:: @ 8164B5E - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_164BCD - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_164B90 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_164BD3 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_164BD3 + switch VAR_RESULT + case 0, EventScript_164BCD + case 1, EventScript_164B90 + case 2, EventScript_164BD3 + case 127, EventScript_164BD3 end 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 1, 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 2cc5badbf..0b6b930c7 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 1, EventScript_164886 + goto_if_eq EventScript_164886 setvar VAR_0x4000, 0 setobjectxy 255, 9, 7 applymovement 255, Movement_164AD4 @@ -69,13 +69,10 @@ EventScript_1648ED:: @ 81648ED setvar VAR_0x4000, 1 setvar VAR_0x8004, 12 special sub_815D9E8 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_164920 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_164938 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_16495C + switch VAR_RESULT + case 0, EventScript_164920 + case 1, EventScript_164938 + case 2, EventScript_16495C EventScript_164920:: @ 8164920 lock @@ -115,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 1, EventScript_164988 + goto_if_eq EventScript_164988 msgbox gUnknown_817C9A2 goto EventScript_164990 @@ -129,7 +126,7 @@ EventScript_164990:: @ 8164990 SevenIsland_TrainerTower_Lobby_EventScript_164992:: @ 8164992 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lock faceplayer message Text_1A6211 @@ -162,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 1, EventScript_164A00 + goto_if_eq EventScript_164A00 msgbox gUnknown_817C7D9 goto EventScript_164A08 @@ -173,15 +170,11 @@ EventScript_164A08:: @ 8164A08 message Text_17C88D waitmessage multichoice 18, 6, 16, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_164A53 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_164ABF - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_164A45 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_164ABF + switch VAR_RESULT + case 0, EventScript_164A53 + case 1, EventScript_164ABF + case 2, EventScript_164A45 + case 127, EventScript_164ABF end EventScript_164A45:: @ 8164A45 @@ -191,19 +184,13 @@ EventScript_164A45:: @ 8164A45 EventScript_164A53:: @ 8164A53 multichoice 13, 3, 64, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_164AA0 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_164AA0 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_164AA0 - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_164AA0 - compare_var_to_value VAR_0x8000, 4 - goto_if 1, EventScript_164ABF - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_164ABF + switch VAR_RESULT + case 0, EventScript_164AA0 + case 1, EventScript_164AA0 + case 2, EventScript_164AA0 + case 3, EventScript_164AA0 + case 4, EventScript_164ABF + case 127, EventScript_164ABF end EventScript_164AA0:: @ 8164AA0 diff --git a/data/maps/SilphCo_11F/scripts.inc b/data/maps/SilphCo_11F/scripts.inc index 67a8b2b48..92dc9ebc0 100644 --- a/data/maps/SilphCo_11F/scripts.inc +++ b/data/maps/SilphCo_11F/scripts.inc @@ -11,7 +11,7 @@ SilphCo_11F_EventScript_161DFE:: @ 8161DFE lock faceplayer checkflag FLAG_0x250 - goto_if 1, EventScript_161E75 + goto_if_eq EventScript_161E75 checkplayergender compare_var_to_value VAR_RESULT, 0 call_if 1, EventScript_161E59 @@ -19,7 +19,7 @@ SilphCo_11F_EventScript_161DFE:: @ 8161DFE call_if 1, EventScript_161E62 checkitemspace ITEM_MASTER_BALL, 1 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_161E6B + goto_if_eq EventScript_161E6B additem ITEM_MASTER_BALL, 1 giveitemfanfaremsg gUnknown_8176FBD, ITEM_MASTER_BALL, 1, BGM_FRLG_ME_KEYITEM msgbox gUnknown_8176FEB diff --git a/data/maps/SilphCo_7F/scripts.inc b/data/maps/SilphCo_7F/scripts.inc index 9620792fe..93893b711 100644 --- a/data/maps/SilphCo_7F/scripts.inc +++ b/data/maps/SilphCo_7F/scripts.inc @@ -131,16 +131,16 @@ SilphCo_7F_EventScript_161AC8:: @ 8161AC8 lock faceplayer checkflag FLAG_0x246 - goto_if 1, EventScript_161B8D + goto_if_eq 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 1, EventScript_161B12 + goto_if_eq EventScript_161B12 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_161B45 + goto_if_eq EventScript_161B45 compare_var_to_value VAR_RESULT, 2 - goto_if 1, 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 1, 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 1, EventScript_161B73 + goto_if_eq EventScript_161B73 call EventScript_1A8C33 goto EventScript_161B73 diff --git a/data/maps/SilphCo_Elevator/scripts.inc b/data/maps/SilphCo_Elevator/scripts.inc index 795a6dc93..d36334429 100644 --- a/data/maps/SilphCo_Elevator/scripts.inc +++ b/data/maps/SilphCo_Elevator/scripts.inc @@ -14,40 +14,27 @@ SilphCo_Elevator_EventScript_161F6F:: @ 8161F6F specialvar VAR_RESULT, sub_80CB328 special sub_80CB7C4 waitstate - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1621BF - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_162197 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_16216F - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_162147 - compare_var_to_value VAR_0x8000, 4 - goto_if 1, EventScript_16211F - compare_var_to_value VAR_0x8000, 5 - goto_if 1, EventScript_1620F7 - compare_var_to_value VAR_0x8000, 6 - goto_if 1, EventScript_1620CF - compare_var_to_value VAR_0x8000, 7 - goto_if 1, EventScript_1620A7 - compare_var_to_value VAR_0x8000, 8 - goto_if 1, EventScript_16207F - compare_var_to_value VAR_0x8000, 9 - goto_if 1, EventScript_162057 - compare_var_to_value VAR_0x8000, 10 - goto_if 1, EventScript_16202F - compare_var_to_value VAR_0x8000, 11 - goto_if 1, EventScript_1621E7 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_1621E7 + switch VAR_RESULT + case 0, EventScript_1621BF + case 1, EventScript_162197 + case 2, EventScript_16216F + case 3, EventScript_162147 + case 4, EventScript_16211F + case 5, EventScript_1620F7 + case 6, EventScript_1620CF + case 7, EventScript_1620A7 + case 8, EventScript_16207F + case 9, EventScript_162057 + case 10, EventScript_16202F + case 11, EventScript_1621E7 + case 127, EventScript_1621E7 end EventScript_16202F:: @ 816202F setvar VAR_0x8006, 4 setdynamicwarp MAP_SILPH_CO_1F, 255, 22, 3 compare_var_to_value VAR_0x403A, 4 - goto_if 1, EventScript_1621E7 + goto_if_eq EventScript_1621E7 call EventScript_1621EC setvar VAR_0x403A, 4 goto EventScript_1621E7 @@ -59,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 1, EventScript_1621E7 + goto_if_eq EventScript_1621E7 call EventScript_1621EC setvar VAR_0x403A, 5 goto EventScript_1621E7 @@ -71,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 1, EventScript_1621E7 + goto_if_eq EventScript_1621E7 call EventScript_1621EC setvar VAR_0x403A, 6 goto EventScript_1621E7 @@ -83,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 1, EventScript_1621E7 + goto_if_eq EventScript_1621E7 call EventScript_1621EC setvar VAR_0x403A, 7 goto EventScript_1621E7 @@ -95,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 1, EventScript_1621E7 + goto_if_eq EventScript_1621E7 call EventScript_1621EC setvar VAR_0x403A, 8 goto EventScript_1621E7 @@ -107,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 1, EventScript_1621E7 + goto_if_eq EventScript_1621E7 call EventScript_1621EC setvar VAR_0x403A, 9 goto EventScript_1621E7 @@ -119,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 1, EventScript_1621E7 + goto_if_eq EventScript_1621E7 call EventScript_1621EC setvar VAR_0x403A, 10 goto EventScript_1621E7 @@ -131,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 1, EventScript_1621E7 + goto_if_eq EventScript_1621E7 call EventScript_1621EC setvar VAR_0x403A, 11 goto EventScript_1621E7 @@ -143,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 1, EventScript_1621E7 + goto_if_eq EventScript_1621E7 call EventScript_1621EC setvar VAR_0x403A, 12 goto EventScript_1621E7 @@ -155,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 1, EventScript_1621E7 + goto_if_eq EventScript_1621E7 call EventScript_1621EC setvar VAR_0x403A, 13 goto EventScript_1621E7 @@ -167,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 1, 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 711dfc9ef..495a0a991 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 1, 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 54e79c2b3..11c1b730f 100644 --- a/data/maps/SixIsland_RuinValley/scripts.inc +++ b/data/maps/SixIsland_RuinValley/scripts.inc @@ -25,10 +25,10 @@ SixIsland_RuinValley_EventScript_168B6D:: @ 8168B6D SixIsland_RuinValley_EventScript_168B94:: @ 8168B94 lockall checkflag FLAG_0x2E3 - goto_if 1, EventScript_168BC1 + goto_if_eq EventScript_168BC1 msgbox gUnknown_818BDC0, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, 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 190cbd4ce..f9df42396 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 1, 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 1, 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 4, EventScript_1720EF special sub_80A0930 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1720F1 + goto_if_eq EventScript_1720F1 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1720FB + goto_if_eq EventScript_1720FB compare_var_to_value VAR_RESULT, 3 - goto_if 1, EventScript_172121 + goto_if_eq EventScript_172121 compare_var_to_value VAR_RESULT, 4 - goto_if 1, EventScript_17210E + goto_if_eq EventScript_17210E 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 1, 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 1, EventScript_17216B + goto_if_eq EventScript_17216B msgbox gUnknown_81A4CB9 releaseall end diff --git a/data/maps/ThreeIsland/scripts.inc b/data/maps/ThreeIsland/scripts.inc index 2761c612f..4d6773491 100644 --- a/data/maps/ThreeIsland/scripts.inc +++ b/data/maps/ThreeIsland/scripts.inc @@ -29,9 +29,9 @@ ThreeIsland_EventScript_1677D8:: @ 81677D8 ThreeIsland_EventScript_1677E5:: @ 81677E5 lock checkflag FLAG_0x2FC - goto_if 1, EventScript_167806 + goto_if_eq EventScript_167806 compare_var_to_value VAR_0x407B, 4 - goto_if 1, 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 1, 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_0x407B, 4 - goto_if 1, EventScript_1679A1 + goto_if_eq EventScript_1679A1 setvar VAR_0x4001, 1 call EventScript_16786F release @@ -224,7 +224,7 @@ EventScript_167A59:: @ 8167A59 playbgm BGM_FRLG_BOY_EYE, 0 msgbox gUnknown_81823ED, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_167C35 + goto_if_eq EventScript_167C35 msgbox gUnknown_818247D setvar VAR_LAST_TALKED, 5 trainerbattle 3, 527, 0, Text_1824B7 diff --git a/data/maps/ThreeIsland_BerryForest/scripts.inc b/data/maps/ThreeIsland_BerryForest/scripts.inc index dfaa7a9b9..ec85582ef 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 1, 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 9885f9059..9fc141070 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 1, EventScript_164DC2 + goto_if_eq EventScript_164DC2 specialvar VAR_RESULT, sub_806E25C compare_var_to_value VAR_RESULT, 1 - goto_if 1, 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 1, 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 962869abd..d93696c0a 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 1, EventScript_171935 + goto_if_eq EventScript_171935 msgbox gUnknown_81A3469 release end diff --git a/data/maps/ThreeIsland_Mart/scripts.inc b/data/maps/ThreeIsland_Mart/scripts.inc index 70ecca8ef..6986607e3 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 1, 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 39df8625b..a9a42eda5 100644 --- a/data/maps/TwoIsland/scripts.inc +++ b/data/maps/TwoIsland/scripts.inc @@ -10,11 +10,11 @@ TwoIsland_MapScript1_16756A:: @ 816756A EventScript_167576:: @ 8167576 checkflag FLAG_0x844 - goto_if 1, EventScript_167597 + goto_if_eq EventScript_167597 checkflag FLAG_0x82C - goto_if 1, EventScript_1675B8 + goto_if_eq EventScript_1675B8 checkflag FLAG_0x2A3 - goto_if 1, EventScript_1675D9 + goto_if_eq EventScript_1675D9 goto EventScript_1675E8 end @@ -70,21 +70,21 @@ EventScript_167606:: @ 8167606 TwoIsland_EventScript_16760F:: @ 816760F special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lock faceplayer compare_var_to_value VAR_0x4078, 4 - goto_if 1, EventScript_167646 + goto_if_eq EventScript_167646 compare_var_to_value VAR_0x4078, 3 - goto_if 1, EventScript_16765E + goto_if_eq EventScript_16765E compare_var_to_value VAR_0x4078, 2 - goto_if 1, EventScript_167676 + goto_if_eq EventScript_167676 goto EventScript_16768E end EventScript_167646:: @ 8167646 checkflag FLAG_0x2A0 - goto_if 1, EventScript_1676A6 + goto_if_eq EventScript_1676A6 setflag FLAG_0x2A0 message Text_181CAE waitmessage @@ -93,7 +93,7 @@ EventScript_167646:: @ 8167646 EventScript_16765E:: @ 816765E checkflag FLAG_0x29F - goto_if 1, EventScript_1676A6 + goto_if_eq EventScript_1676A6 setflag FLAG_0x29F message Text_181C77 waitmessage @@ -102,7 +102,7 @@ EventScript_16765E:: @ 816765E EventScript_167676:: @ 8167676 checkflag FLAG_0x29E - goto_if 1, EventScript_1676A6 + goto_if_eq EventScript_1676A6 setflag FLAG_0x29E message Text_181B7C waitmessage @@ -111,7 +111,7 @@ EventScript_167676:: @ 8167676 EventScript_16768E:: @ 816768E checkflag FLAG_0x29D - goto_if 1, EventScript_1676A6 + goto_if_eq 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_0x4078, 4 - goto_if 1, EventScript_167728 + goto_if_eq EventScript_167728 compare_var_to_value VAR_0x4078, 3 - goto_if 1, EventScript_167708 + goto_if_eq EventScript_167708 compare_var_to_value VAR_0x4078, 2 - goto_if 1, 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 8829fc845..0f940dd39 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 1, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 lock faceplayer @@ -12,7 +12,7 @@ TwoIsland_House_EventScript_171619:: @ 8171619 clearflag FLAG_0x003 clearflag FLAG_0x004 checkflag FLAG_0x001 - goto_if 1, EventScript_17164F + goto_if_eq EventScript_17164F msgbox gUnknown_81A2B88 setflag FLAG_0x001 goto EventScript_17164F @@ -26,9 +26,9 @@ EventScript_17164F:: @ 817164F compare_var_to_value VAR_RESULT, 1 call_if 1, EventScript_1717AC checkflag FLAG_0x002 - goto_if 1, EventScript_171687 + goto_if_eq EventScript_171687 checkflag FLAG_0x003 - goto_if 1, EventScript_171696 + goto_if_eq EventScript_171696 goto EventScript_17179E end @@ -47,7 +47,7 @@ EventScript_171696:: @ 8171696 EventScript_1716A5:: @ 81716A5 msgbox gUnknown_81A2C63, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_17179E + goto_if_eq EventScript_17179E goto EventScript_1716BE end @@ -59,9 +59,9 @@ EventScript_1716BE:: @ 81716BE goto_if 4, EventScript_17179E special sub_80BFC14 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_171790 + goto_if_eq EventScript_171790 compare_var_to_value VAR_0x8005, 0 - goto_if 1, 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 1, EventScript_1716BE + goto_if_eq EventScript_1716BE checkflag FLAG_0x004 - goto_if 1, EventScript_17175B + goto_if_eq EventScript_17175B checkflag FLAG_0x002 - goto_if 1, EventScript_171727 + goto_if_eq EventScript_171727 checkflag FLAG_0x003 - goto_if 1, EventScript_171741 + goto_if_eq EventScript_171741 end EventScript_171727:: @ 8171727 @@ -99,11 +99,9 @@ EventScript_17175B:: @ 817175B message Text_1A2D43 waitmessage multichoice 0, 0, 51, 1 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_171741 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_171727 + switch VAR_RESULT + case 0, EventScript_171741 + case 1, EventScript_171727 end EventScript_171782:: @ 8171782 diff --git a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc index 9bde64331..f478de107 100644 --- a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc +++ b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc @@ -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 1, EventScript_1BC060 + goto_if_eq EventScript_1BC060 checkflag FLAG_0x2A3 - goto_if 1, EventScript_171555 + goto_if_eq 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 1, EventScript_1BC0CE + goto_if_eq EventScript_1BC0CE checkflag FLAG_0x2FB - goto_if 1, EventScript_1715F5 + goto_if_eq EventScript_1715F5 compare_var_to_value VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 3 - goto_if 1, EventScript_17158A + goto_if_eq EventScript_17158A msgbox gUnknown_81A2743 release end EventScript_17158A:: @ 817158A checkflag FLAG_0x2FE - goto_if 1, EventScript_1715C4 + goto_if_eq 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 1, 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 93fedc7a8..a88b1a55c 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_0x24B - goto_if 1, EventScript_160EAB + goto_if_eq EventScript_160EAB msgbox gUnknown_81A5AD6, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_160E93 + goto_if_eq EventScript_160E93 call EventScript_1A8CBD compare_var_to_value VAR_0x8004, 6 goto_if 4, EventScript_160E93 diff --git a/data/maps/VermilionCity/scripts.inc b/data/maps/VermilionCity/scripts.inc index f9c2b2f21..1f476abf3 100644 --- a/data/maps/VermilionCity/scripts.inc +++ b/data/maps/VermilionCity/scripts.inc @@ -38,7 +38,7 @@ VermilionCity_EventScript_166920:: @ 8166920 lock faceplayer compare_var_to_value VAR_MAP_SCENE_VERMILION_CITY, 3 - goto_if 1, EventScript_166937 + goto_if_eq EventScript_166937 msgbox gUnknown_817F776 release end @@ -52,7 +52,7 @@ VermilionCity_EventScript_166941:: @ 8166941 lock faceplayer compare_var_to_value VAR_MAP_SCENE_VERMILION_CITY, 3 - goto_if 1, EventScript_166996 + goto_if_eq EventScript_166996 msgbox gUnknown_817FA22 release end @@ -62,7 +62,7 @@ EventScript_166958:: @ 8166958 goto_if 0, EventScript_1A77B0 checkitem ITEM_MYSTIC_TICKET, 1 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1A77B0 + goto_if_eq EventScript_1A77B0 goto EventScript_1A77AA end @@ -71,7 +71,7 @@ EventScript_166977:: @ 8166977 goto_if 0, EventScript_1A77B0 checkitem ITEM_AURORA_TICKET, 1 compare_var_to_value VAR_RESULT, 0 - goto_if 1, 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 1, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 call EventScript_166958 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1669FD + goto_if_eq EventScript_1669FD call EventScript_166977 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_166A5F + goto_if_eq EventScript_166A5F setvar VAR_0x8004, 0 message Text_17FBB8 waitmessage @@ -105,21 +105,17 @@ EventScript_1669BB:: @ 81669BB EventScript_1669FD:: @ 81669FD call EventScript_166977 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_166AB1 + goto_if_eq EventScript_166AB1 checkflag FLAG_0x2F0 call_if 0, EventScript_166A53 message Text_17FCC1 waitmessage multichoice 17, 6, 54, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1A911E - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_166B0B - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1A90F6 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_1A90F6 + switch VAR_RESULT + case 0, EventScript_1A911E + case 1, EventScript_166B0B + case 2, EventScript_1A90F6 + case 127, EventScript_1A90F6 end EventScript_166A53:: @ 8166A53 @@ -133,15 +129,11 @@ EventScript_166A5F:: @ 8166A5F message Text_17FCC1 waitmessage multichoice 13, 6, 55, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1A911E - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_166B23 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1A90F6 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_1A90F6 + switch VAR_RESULT + case 0, EventScript_1A911E + case 1, EventScript_166B23 + case 2, EventScript_1A90F6 + case 127, EventScript_1A90F6 end EventScript_166AA5:: @ 8166AA5 @@ -157,17 +149,12 @@ EventScript_166AB1:: @ 8166AB1 message Text_17FCC1 waitmessage multichoice 13, 5, 56, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1A911E - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_166B0B - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_166B23 - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_1A90F6 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_1A90F6 + switch VAR_RESULT + case 0, EventScript_1A911E + case 1, EventScript_166B0B + case 2, EventScript_166B23 + case 3, EventScript_1A90F6 + case 127, EventScript_1A90F6 end EventScript_166B0B:: @ 8166B0B @@ -189,17 +176,12 @@ EventScript_166B3B:: @ 8166B3B waitmessage setvar VAR_0x8004, 0 multichoice 19, 5, 57, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1A8FEE - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1A8FF9 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1A9004 - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_1A90F6 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_1A90F6 + switch VAR_RESULT + case 0, EventScript_1A8FEE + case 1, EventScript_1A8FF9 + case 2, EventScript_1A9004 + case 3, EventScript_1A90F6 + case 127, EventScript_1A90F6 end EventScript_166B88:: @ 8166B88 @@ -228,7 +210,7 @@ EventScript_166BA0:: @ 8166BA0 applymovement 255, Movement_1A75EB waitmovement 0 compare_var_to_value VAR_MAP_SCENE_VERMILION_CITY, 3 - goto_if 1, EventScript_166BED + goto_if_eq EventScript_166BED msgbox gUnknown_817FA3C checkflag FLAG_0x234 goto_if 0, EventScript_166BDE diff --git a/data/maps/VermilionCity_Gym/scripts.inc b/data/maps/VermilionCity_Gym/scripts.inc index d19b973f9..bd49a6955 100644 --- a/data/maps/VermilionCity_Gym/scripts.inc +++ b/data/maps/VermilionCity_Gym/scripts.inc @@ -42,7 +42,7 @@ VermilionCity_Gym_MapScript2_16B772:: @ 816B772 EventScript_16B778:: @ 816B778 checkflag FLAG_0x264 - goto_if 1, EventScript_1A77A9 + goto_if_eq EventScript_1A77A9 special sub_80CADEC copyvar VAR_0x4000, VAR_0x8004 copyvar VAR_0x4001, VAR_0x8005 @@ -141,16 +141,16 @@ VermilionCity_Gym_EventScript_16B837:: @ 816B837 EventScript_16B843:: @ 816B843 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, 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 1, EventScript_16B8E5 + goto_if_eq EventScript_16B8E5 checkflag FLAG_0x001 - goto_if 1, EventScript_16B89E + goto_if_eq EventScript_16B89E compare_var_to_var VAR_0x8004, VAR_0x8008 - goto_if 1, EventScript_16B885 + goto_if_eq EventScript_16B885 msgbox gUnknown_8195289 releaseall end @@ -167,7 +167,7 @@ EventScript_16B885:: @ 816B885 EventScript_16B89E:: @ 816B89E compare_var_to_var VAR_0x8005, VAR_0x8008 - goto_if 1, EventScript_16B8CB + goto_if_eq EventScript_16B8CB msgbox gUnknown_819536C clearflag FLAG_0x001 special sub_80CADEC @@ -240,7 +240,7 @@ EventScript_16B9AF:: @ 816B9AF msgbox gUnknown_8194CFA checkitemspace ITEM_TM34, 1 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16B9F0 + goto_if_eq EventScript_16B9F0 additem ITEM_TM34, 1 giveitemfanfaremsg gUnknown_8194D87, ITEM_TM34 setflag FLAG_0x231 @@ -285,7 +285,7 @@ VermilionCity_Gym_EventScript_16BA6C:: @ 816BA6C lock faceplayer checkflag FLAG_0x4B2 - goto_if 1, EventScript_16BA81 + goto_if_eq EventScript_16BA81 msgbox gUnknown_81950B4 release end @@ -298,7 +298,7 @@ EventScript_16BA81:: @ 816BA81 VermilionCity_Gym_EventScript_16BA8B:: @ 816BA8B lockall checkflag FLAG_0x822 - goto_if 1, EventScript_16BA9F + goto_if_eq EventScript_16BA9F msgbox gUnknown_819520B releaseall end diff --git a/data/maps/VermilionCity_House1/scripts.inc b/data/maps/VermilionCity_House1/scripts.inc index 4c595b48c..a7de85e8f 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_0x240 - goto_if 1, EventScript_16B3CF + goto_if_eq EventScript_16B3CF msgbox gUnknown_8193EC1, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if 1, 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 1, 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_Mart/scripts.inc b/data/maps/VermilionCity_Mart/scripts.inc index c4aa0d666..c83e239d9 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 1, 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 c5e46b07a..60d983af0 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_0x241 - goto_if 1, EventScript_16B4A7 + goto_if_eq EventScript_16B4A7 msgbox gUnknown_819457E, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if 1, 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 1, EventScript_16B4F2 + goto_if_eq EventScript_16B4F2 setflag FLAG_0x241 additem ITEM_BIKE_VOUCHER, 1 giveitemfanfaremsg gUnknown_819474E, ITEM_BIKE_VOUCHER, 1, BGM_FRLG_ME_KEYITEM @@ -39,7 +39,7 @@ VermilionCity_PokemonFanClub_EventScript_16B4FC:: @ 816B4FC lock faceplayer checkflag FLAG_0x82C - goto_if 1, EventScript_16B511 + goto_if_eq EventScript_16B511 msgbox gUnknown_81948E6 release end @@ -56,7 +56,7 @@ VermilionCity_PokemonFanClub_EventScript_16B528:: @ 816B528 lock faceplayer checkflag FLAG_0x003 - goto_if 1, EventScript_16B54B + goto_if_eq EventScript_16B54B msgbox gUnknown_81944CC closemessage applymovement 5, Movement_1A75E5 @@ -78,7 +78,7 @@ VermilionCity_PokemonFanClub_EventScript_16B563:: @ 816B563 lock faceplayer checkflag FLAG_0x002 - goto_if 1, EventScript_16B586 + goto_if_eq EventScript_16B586 msgbox gUnknown_819446F closemessage applymovement 6, Movement_1A75E5 @@ -133,10 +133,10 @@ VermilionCity_House2_EventScript_16B5D7:: @ 816B5D7 setvar VAR_0x8008, 3 call EventScript_1A8CAD checkflag FLAG_0x24D - goto_if 1, EventScript_16B649 + goto_if_eq EventScript_16B649 msgbox gUnknown_81949CB, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16B631 + goto_if_eq EventScript_16B631 call EventScript_1A8CBD compare_var_to_value VAR_0x8004, 6 goto_if 4, EventScript_16B631 diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc index 056e3835a..656bd8e6c 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_0x4064, 100 - goto_if 1, EventScript_160F62 + goto_if_eq EventScript_160F62 setmetatile 12, 14, 721, 0 setmetatile 12, 15, 737, 0 playse SE_MU_PACHI diff --git a/data/maps/VictoryRoad_2F/scripts.inc b/data/maps/VictoryRoad_2F/scripts.inc index ae085dc1f..b35ee7821 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_0x4065, 100 - goto_if 1, EventScript_161004 + goto_if_eq EventScript_161004 setmetatile 13, 10, 721, 0 setmetatile 13, 11, 737, 0 playse SE_MU_PACHI @@ -40,7 +40,7 @@ EventScript_161004:: @ 8161004 VictoryRoad_2F_EventScript_161006:: @ 8161006 lockall compare_var_to_value VAR_0x4066, 100 - goto_if 1, EventScript_161035 + goto_if_eq EventScript_161035 setmetatile 33, 16, 721, 0 setmetatile 33, 17, 737, 0 playse SE_MU_PACHI diff --git a/data/maps/VictoryRoad_3F/scripts.inc b/data/maps/VictoryRoad_3F/scripts.inc index 7aafcb1b4..17331cee4 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_0x4067, 100 - goto_if 1, EventScript_161101 + goto_if_eq EventScript_161101 setmetatile 12, 12, 721, 0 setmetatile 12, 13, 737, 0 playse SE_MU_PACHI diff --git a/data/maps/ViridianCity/scripts.inc b/data/maps/ViridianCity/scripts.inc index b41c6b929..5434fa1fa 100644 --- a/data/maps/ViridianCity/scripts.inc +++ b/data/maps/ViridianCity/scripts.inc @@ -91,7 +91,7 @@ ViridianCity_EventScript_1659CA:: @ 81659CA lock faceplayer compare_var_to_value VAR_0x405A, 1 - goto_if 1, 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_UNK820 - goto_if 1, EventScript_165A23 + goto_if_eq EventScript_165A23 compare_var_to_value VAR_0x4051, 2 goto_if 4, EventScript_165A4A compare_var_to_value VAR_0x4051, 1 - goto_if 1, EventScript_165A54 + goto_if_eq EventScript_165A54 compare_var_to_value VAR_0x4051, 0 - goto_if 1, 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 1, 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 1, 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 1, EventScript_165AB0 + goto_if_eq EventScript_165AB0 compare_var_to_value VAR_RESULT, 0 - goto_if 1, 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_0x4051, 0 - goto_if 1, 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 1, 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 a5dfb05fe..b03bc5d93 100644 --- a/data/maps/ViridianCity_Gym/scripts.inc +++ b/data/maps/ViridianCity_Gym/scripts.inc @@ -33,7 +33,7 @@ EventScript_169F2F:: @ 8169F2F msgbox gUnknown_818F586 checkitemspace ITEM_TM26, 1 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_169F70 + goto_if_eq EventScript_169F70 additem ITEM_TM26, 1 giveitemfanfaremsg gUnknown_818F675, ITEM_TM26 setflag FLAG_0x298 @@ -90,7 +90,7 @@ ViridianCity_Gym_EventScript_16A032:: @ 816A032 lock faceplayer checkflag FLAG_0x4B7 - goto_if 1, EventScript_16A047 + goto_if_eq EventScript_16A047 msgbox gUnknown_818FA81 release end @@ -106,7 +106,7 @@ EventScript_16A047:: @ 816A047 ViridianCity_Gym_EventScript_16A05E:: @ 816A05E lockall checkflag FLAG_0x827 - goto_if 1, EventScript_16A072 + goto_if_eq EventScript_16A072 msgbox gUnknown_818FB8D releaseall end diff --git a/data/maps/ViridianCity_House2/scripts.inc b/data/maps/ViridianCity_House2/scripts.inc index 65ea77a5e..c8388e2f7 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 1, EventScript_16A11B + goto_if_eq EventScript_16A11B msgbox gUnknown_818FD23 msgbox gUnknown_818FF19, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16A11B + goto_if_eq EventScript_16A11B msgbox gUnknown_818FDA8 msgbox gUnknown_818FF19, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_16A11B + goto_if_eq EventScript_16A11B msgbox gUnknown_818FE5C applymovement 2, Movement_1A75E9 waitmovement 0 @@ -57,21 +57,14 @@ EventScript_16A12C:: @ 816A12C message Text_18FF88 waitmessage multichoicegrid 7, 1, 15, 3, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_16A18B - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_16A1A7 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_16A1C3 - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_16A199 - compare_var_to_value VAR_0x8000, 4 - goto_if 1, EventScript_16A1B5 - compare_var_to_value VAR_0x8000, 5 - goto_if 1, EventScript_16A1D1 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_16A1D1 + switch VAR_RESULT + case 0, EventScript_16A18B + case 1, EventScript_16A1A7 + case 2, EventScript_16A1C3 + case 3, EventScript_16A199 + case 4, EventScript_16A1B5 + case 5, EventScript_16A1D1 + case 127, EventScript_16A1D1 end EventScript_16A18B:: @ 816A18B diff --git a/data/maps/ViridianCity_Mart/scripts.inc b/data/maps/ViridianCity_Mart/scripts.inc index 630bb4122..44d9437ea 100644 --- a/data/maps/ViridianCity_Mart/scripts.inc +++ b/data/maps/ViridianCity_Mart/scripts.inc @@ -55,10 +55,10 @@ ViridianCity_Mart_EventScript_16A268:: @ 816A268 lock faceplayer compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 1 - goto_if 1, EventScript_16A2A4 + goto_if_eq EventScript_16A2A4 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 message Text_1A6211 waitmessage pokemart Items_16A298 |