diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-10 00:44:57 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-01-10 01:26:20 -0500 |
| commit | 4a6f15ba24c159ad6cc1be1d7c8c636e416e80d6 (patch) | |
| tree | 823b6f7b6fb71cbfe54add5696b831a9f78a6703 /data/maps | |
| parent | 94fbc3ac489e529176533a1fad7deac7e1014b9d (diff) | |
Sync event macros
Diffstat (limited to 'data/maps')
200 files changed, 1710 insertions, 2115 deletions
diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc index 582d33d57..8d12c5458 100644 --- a/data/maps/BirthIsland_Exterior/scripts.inc +++ b/data/maps/BirthIsland_Exterior/scripts.inc @@ -13,10 +13,8 @@ BirthIsland_Exterior_OnTransition:: @ 8165217 setvar VAR_OBJ_GFX_ID_0, OBJECT_EVENT_GFX_DEOXYS_N setvar VAR_DEOXYS_INTERACTION_STEP_COUNTER, 0 setvar VAR_DEOXYS_INTERACTION_NUM, 0 - checkflag FLAG_FOUGHT_DEOXYS - call_if TRUE, EventScript_16523C - checkflag FLAG_FOUGHT_DEOXYS - call_if FALSE, EventScript_165243 + call_if_set FLAG_FOUGHT_DEOXYS, EventScript_16523C + call_if_unset FLAG_FOUGHT_DEOXYS, EventScript_165243 end EventScript_16523C:: @ 816523C @@ -25,21 +23,19 @@ EventScript_16523C:: @ 816523C return EventScript_165243:: @ 8165243 - checkflag FLAG_DEOXYS_FLEW_AWAY - goto_if TRUE, EventScript_1A77A9 + goto_if_set FLAG_DEOXYS_FLEW_AWAY, EventScript_1A77A9 clearflag FLAG_HIDE_BIRTH_ISLAND_METEORITE clearflag FLAG_SYS_DEOXYS_AWAKENED return BirthIsland_Exterior_OnResume:: @ 8165253 - checkflag FLAG_SYS_SPECIAL_WILD_BATTLE - call_if TRUE, EventScript_16525D + call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, EventScript_16525D end EventScript_16525D:: @ 816525D specialvar VAR_RESULT, Special_GetBattleOutcome compare VAR_RESULT, B_OUTCOME_CAUGHT - goto_if ne, EventScript_1A77A9 + goto_if_ne EventScript_1A77A9 removeobject 2 return @@ -48,7 +44,7 @@ BirthIsland_Exterior_EventScript_165271:: @ 8165271 faceplayer special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 special Special_DeoxysSound waitstate @@ -97,11 +93,11 @@ EventScript_1652C0:: @ 81652C0 clearflag FLAG_SYS_SPECIAL_WILD_BATTLE specialvar VAR_RESULT, Special_GetBattleOutcome compare VAR_RESULT, B_OUTCOME_WON - goto_if eq, EventScript_16533A + goto_if_eq EventScript_16533A compare VAR_RESULT, B_OUTCOME_RAN - goto_if eq, EventScript_165348 + goto_if_eq EventScript_165348 compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED - goto_if eq, EventScript_165348 + goto_if_eq EventScript_165348 setflag FLAG_FOUGHT_DEOXYS release end diff --git a/data/maps/CeladonCity_Condominiums_1F/scripts.inc b/data/maps/CeladonCity_Condominiums_1F/scripts.inc index 11a685e53..f5afb1851 100644 --- a/data/maps/CeladonCity_Condominiums_1F/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_1F/scripts.inc @@ -4,17 +4,14 @@ CeladonCity_Condominiums_1F_MapScripts:: @ 816C320 CeladonCity_Condominiums_1F_EventScript_16C321:: @ 816C321 lock faceplayer - checkflag FLAG_TALKED_TO_TEA_LADY_AFTER_HOF - goto_if TRUE, EventScript_16C36A - checkflag FLAG_SYS_GAME_CLEAR - goto_if TRUE, EventScript_16C374 - checkflag FLAG_GOT_TEA - goto_if TRUE, EventScript_16C36A + goto_if_set FLAG_TALKED_TO_TEA_LADY_AFTER_HOF, EventScript_16C36A + goto_if_set FLAG_SYS_GAME_CLEAR, EventScript_16C374 + goto_if_set FLAG_GOT_TEA, EventScript_16C36A msgbox gUnknown_81960C9 setflag FLAG_GOT_TEA giveitem ITEM_TEA compare VAR_RESULT, 0 - goto_if eq, EventScript_1A6BF9 + goto_if_eq EventScript_1A6BF9 msgbox gUnknown_8196109 release end diff --git a/data/maps/CeladonCity_Condominiums_3F/scripts.inc b/data/maps/CeladonCity_Condominiums_3F/scripts.inc index 5bdf8bf20..e8d1bef2b 100644 --- a/data/maps/CeladonCity_Condominiums_3F/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_3F/scripts.inc @@ -18,7 +18,7 @@ CeladonCity_Condominiums_3F_EventScript_16C3F6:: @ 816C3F6 faceplayer specialvar VAR_RESULT, HasAllKantoMons compare VAR_RESULT, 1 - goto_if eq, EventScript_16C412 + goto_if_eq EventScript_16C412 msgbox gUnknown_8196356 release end @@ -33,7 +33,7 @@ EventScript_16C418:: @ 816C418 delay 60 special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special Special_ShowDiploma waitstate release diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc b/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc index 2e6e09d48..4271cff79 100644 --- a/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc @@ -9,13 +9,13 @@ CeladonCity_Condominiums_RoofRoom_EventScript_16C46D:: @ 816C46D lock faceplayer setvar VAR_TEMP_1, SPECIES_EEVEE - givemon SPECIES_EEVEE, 25, ITEM_NONE, 0, 0, 0 + givemon SPECIES_EEVEE, 25, ITEM_NONE compare VAR_RESULT, 0 - goto_if eq, EventScript_16C4A6 + goto_if_eq EventScript_16C4A6 compare VAR_RESULT, 1 - goto_if eq, EventScript_16C4DA + goto_if_eq EventScript_16C4DA compare VAR_RESULT, 2 - goto_if eq, EventScript_1A927C + goto_if_eq EventScript_1A927C release end @@ -28,7 +28,7 @@ EventScript_16C4A6:: @ 816C4A6 getspeciesname 0, SPECIES_EEVEE msgbox gUnknown_81A56A7, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_16C514 + goto_if_eq EventScript_16C514 call EventScript_1A8C27 call EventScript_1A74EB goto EventScript_16C514 @@ -43,7 +43,7 @@ EventScript_16C4DA:: @ 816C4DA getspeciesname 0, SPECIES_EEVEE msgbox gUnknown_81A56A7, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_16C509 + goto_if_eq EventScript_16C509 call EventScript_1A8C33 goto EventScript_16C509 end diff --git a/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc index a9a7ec544..24cc47519 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_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lock faceplayer message Text_MayIHelpYou @@ -44,7 +44,7 @@ Items_16BB38:: @ 816BB38 CeladonCity_DepartmentStore_2F_EventScript_16BB4E:: @ 816BB4E special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lock faceplayer message Text_MayIHelpYou diff --git a/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc index c55eee6b7..57d7469a6 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_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lock faceplayer message Text_MayIHelpYou diff --git a/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc index 19f21c149..88aced082 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_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lock faceplayer message Text_MayIHelpYou @@ -42,7 +42,7 @@ Items_16BC84:: @ 816BC84 CeladonCity_DepartmentStore_5F_EventScript_16BC96:: @ 816BC96 special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lock faceplayer message Text_MayIHelpYou diff --git a/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc b/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc index 06963d348..8a3d77577 100644 --- a/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc @@ -4,8 +4,7 @@ CeladonCity_DepartmentStore_Elevator_MapScripts:: @ 816C152 CeladonCity_DepartmentStore_Elevator_EventScript_16C153:: @ 816C153 lockall setvar VAR_0x8004, 3 - checkflag FLAG_TEMP_2 - call_if FALSE, EventScript_1A7AB9 + call_if_unset FLAG_TEMP_2, EventScript_1A7AB9 copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR special Special_DrawElevatorCurrentFloorWindow message Text_1A535C @@ -62,7 +61,7 @@ EventScript_16C246:: @ 816C246 setvar VAR_0x8006, 4 setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_1F, 255, 6, 1 compare VAR_ELEVATOR_FLOOR, 4 - goto_if eq, EventScript_16C30E + goto_if_eq EventScript_16C30E call EventScript_16C313 setvar VAR_ELEVATOR_FLOOR, 4 goto EventScript_16C30E @@ -72,7 +71,7 @@ EventScript_16C26E:: @ 816C26E setvar VAR_0x8006, 5 setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_2F, 255, 6, 1 compare VAR_ELEVATOR_FLOOR, 5 - goto_if eq, EventScript_16C30E + goto_if_eq EventScript_16C30E call EventScript_16C313 setvar VAR_ELEVATOR_FLOOR, 5 goto EventScript_16C30E @@ -82,7 +81,7 @@ EventScript_16C296:: @ 816C296 setvar VAR_0x8006, 6 setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_3F, 255, 6, 1 compare VAR_ELEVATOR_FLOOR, 6 - goto_if eq, EventScript_16C30E + goto_if_eq EventScript_16C30E call EventScript_16C313 setvar VAR_ELEVATOR_FLOOR, 6 goto EventScript_16C30E @@ -92,7 +91,7 @@ EventScript_16C2BE:: @ 816C2BE setvar VAR_0x8006, 7 setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_4F, 255, 6, 1 compare VAR_ELEVATOR_FLOOR, 7 - goto_if eq, EventScript_16C30E + goto_if_eq EventScript_16C30E call EventScript_16C313 setvar VAR_ELEVATOR_FLOOR, 7 goto EventScript_16C30E @@ -102,7 +101,7 @@ EventScript_16C2E6:: @ 816C2E6 setvar VAR_0x8006, 8 setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_5F, 255, 6, 1 compare VAR_ELEVATOR_FLOOR, 8 - goto_if eq, EventScript_16C30E + goto_if_eq EventScript_16C30E call EventScript_16C313 setvar VAR_ELEVATOR_FLOOR, 8 goto EventScript_16C30E diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc index 0668a0287..e6341f5d9 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_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 lock faceplayer call EventScript_16BCF6 compare VAR_TEMP_1, 0 - goto_if eq, EventScript_16C00E + goto_if_eq EventScript_16C00E goto EventScript_16BD3E end @@ -18,13 +18,13 @@ EventScript_16BCF6:: @ 816BCF6 setvar VAR_TEMP_1, 0 checkitem ITEM_FRESH_WATER, 1 compare VAR_RESULT, 1 - call_if eq, EventScript_16BD2C + call_if_eq EventScript_16BD2C checkitem ITEM_SODA_POP, 1 compare VAR_RESULT, 1 - call_if eq, EventScript_16BD32 + call_if_eq EventScript_16BD32 checkitem ITEM_LEMONADE, 1 compare VAR_RESULT, 1 - call_if eq, EventScript_16BD38 + call_if_eq EventScript_16BD38 return EventScript_16BD2C:: @ 816BD2C @@ -42,7 +42,7 @@ EventScript_16BD38:: @ 816BD38 EventScript_16BD3E:: @ 816BD3E msgbox gUnknown_8195D22, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_16C00C + goto_if_eq EventScript_16C00C textcolor 3 message Text_195D5F waitmessage @@ -121,8 +121,7 @@ EventScript_16BED7:: @ 816BED7 EventScript_16BF19:: @ 816BF19 setvar VAR_0x8008, ITEM_FRESH_WATER setvar VAR_0x8009, ITEM_TM16 - checkflag FLAG_GOT_TM16_FROM_THIRSTY_GIRL - goto_if TRUE, EventScript_16C018 + goto_if_set FLAG_GOT_TM16_FROM_THIRSTY_GIRL, EventScript_16C018 msgbox gUnknown_8195D75 goto EventScript_16BF7C end @@ -130,8 +129,7 @@ EventScript_16BF19:: @ 816BF19 EventScript_16BF3A:: @ 816BF3A setvar VAR_0x8008, ITEM_SODA_POP setvar VAR_0x8009, ITEM_TM20 - checkflag FLAG_GOT_TM20_FROM_THIRSTY_GIRL - goto_if TRUE, EventScript_16C018 + goto_if_set FLAG_GOT_TM20_FROM_THIRSTY_GIRL, EventScript_16C018 msgbox gUnknown_8195E33 goto EventScript_16BF7C end @@ -139,8 +137,7 @@ EventScript_16BF3A:: @ 816BF3A EventScript_16BF5B:: @ 816BF5B setvar VAR_0x8008, ITEM_LEMONADE setvar VAR_0x8009, ITEM_TM33 - checkflag FLAG_GOT_TM33_FROM_THIRSTY_GIRL - goto_if TRUE, EventScript_16C018 + goto_if_set FLAG_GOT_TM33_FROM_THIRSTY_GIRL, EventScript_16C018 msgbox gUnknown_8195EBF goto EventScript_16BF7C end @@ -151,8 +148,8 @@ EventScript_16BF7C:: @ 816BF7C removeitem VAR_0x8008, 1 checkitemspace VAR_0x8009, 1 compare VAR_RESULT, 0 - goto_if eq, EventScript_16C002 - additem VAR_0x8009, 1 + goto_if_eq EventScript_16C002 + additem VAR_0x8009 textcolor 3 playfanfare MUS_FANFA1 message Text_ReceivedItemFromLittleGirl @@ -161,11 +158,11 @@ EventScript_16BF7C:: @ 816BF7C putitemaway VAR_0x8009 call EventScript_1A6675 compare VAR_0x8008, ITEM_FRESH_WATER - call_if eq, EventScript_16BFDE + call_if_eq EventScript_16BFDE compare VAR_0x8008, ITEM_SODA_POP - call_if eq, EventScript_16BFEA + call_if_eq EventScript_16BFEA compare VAR_0x8008, ITEM_LEMONADE - call_if eq, EventScript_16BFF6 + call_if_eq EventScript_16BFF6 release end @@ -262,21 +259,21 @@ EventScript_16C0C4:: @ 816C0C4 EventScript_16C0CB:: @ 816C0CB compare VAR_RESULT, 0 - goto_if eq, EventScript_16C131 + goto_if_eq EventScript_16C131 checkitemspace VAR_TEMP_0, 1 compare VAR_RESULT, 0 - goto_if eq, EventScript_16C13F + goto_if_eq EventScript_16C13F compare VAR_TEMP_1, 0 - call_if eq, EventScript_16C0B6 + call_if_eq EventScript_16C0B6 compare VAR_TEMP_1, 1 - call_if eq, EventScript_16C0BD + call_if_eq EventScript_16C0BD compare VAR_TEMP_1, 2 - call_if eq, EventScript_16C0C4 + call_if_eq EventScript_16C0C4 updatemoneybox 0, 0, 0 getitemname 0, VAR_TEMP_0 playse SE_JIHANKI msgbox gUnknown_8196076 - additem VAR_TEMP_0, 1 + additem VAR_TEMP_0 goto EventScript_16C125 end diff --git a/data/maps/CeladonCity_GameCorner/scripts.inc b/data/maps/CeladonCity_GameCorner/scripts.inc index eb242f2e6..17756a332 100644 --- a/data/maps/CeladonCity_GameCorner/scripts.inc +++ b/data/maps/CeladonCity_GameCorner/scripts.inc @@ -3,8 +3,7 @@ CeladonCity_GameCorner_MapScripts:: @ 816C646 .byte 0 CeladonCity_GameCorner_OnLoad:: @ 816C64C - checkflag FLAG_OPENED_ROCKET_HIDEOUT - call_if FALSE, EventScript_16C656 + call_if_unset FLAG_OPENED_ROCKET_HIDEOUT, EventScript_16C656 end EventScript_16C656:: @ 816C656 @@ -22,7 +21,7 @@ CeladonCity_GameCorner_EventScript_16C684:: @ 816C684 CeladonCity_GameCorner_EventScript_16C68D:: @ 816C68D special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lock faceplayer showmoneybox 0, 0, 0 @@ -39,21 +38,20 @@ CeladonCity_GameCorner_EventScript_16C68D:: @ 816C68D end EventScript_16C6E6:: @ 816C6E6 - checkflag FLAG_GOT_COIN_CASE - goto_if FALSE, EventScript_16C790 + goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16C790 compare VAR_0x8009, 0 - goto_if eq, EventScript_16C734 + goto_if_eq EventScript_16C734 compare VAR_0x8009, 1 - goto_if eq, EventScript_16C706 + goto_if_eq EventScript_16C706 end EventScript_16C706:: @ 816C706 checkcoins VAR_TEMP_1 compare VAR_TEMP_1, 9500 - goto_if ge, EventScript_16C79E + goto_if_ge EventScript_16C79E checkmoney 10000, 0 compare VAR_RESULT, 0 - goto_if eq, EventScript_16C7AC + goto_if_eq EventScript_16C7AC givecoins 500 takemoney 10000, 0 goto EventScript_16C762 @@ -62,10 +60,10 @@ EventScript_16C706:: @ 816C706 EventScript_16C734:: @ 816C734 checkcoins VAR_TEMP_1 compare VAR_TEMP_1, 9950 - goto_if ge, EventScript_16C79E + goto_if_ge EventScript_16C79E checkmoney 1000, 0 compare VAR_RESULT, 0 - goto_if eq, EventScript_16C7AC + goto_if_eq EventScript_16C7AC givecoins 50 takemoney 1000, 0 goto EventScript_16C762 @@ -129,14 +127,12 @@ CeladonCity_GameCorner_EventScript_16C7D7:: @ 816C7D7 CeladonCity_GameCorner_EventScript_16C7E7:: @ 816C7E7 lock faceplayer - checkflag FLAG_GOT_10_COINS_FROM_GAMBLER - goto_if TRUE, EventScript_16C849 + goto_if_set FLAG_GOT_10_COINS_FROM_GAMBLER, EventScript_16C849 msgbox gUnknown_8196AF3 - checkflag FLAG_GOT_COIN_CASE - goto_if FALSE, EventScript_16C839 + goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16C839 checkcoins VAR_TEMP_1 compare VAR_TEMP_1, 9990 - goto_if ge, EventScript_16C82B + goto_if_ge EventScript_16C82B givecoins 10 textcolor 3 msgbox gUnknown_8196B0D @@ -165,8 +161,7 @@ EventScript_16C849:: @ 816C849 CeladonCity_GameCorner_EventScript_16C857:: @ 816C857 lock faceplayer - checkflag FLAG_DEFEATED_ERIKA - goto_if TRUE, EventScript_16C870 + goto_if_set FLAG_DEFEATED_ERIKA, EventScript_16C870 msgbox gUnknown_8196BAD goto EventScript_16C7CA end @@ -193,14 +188,12 @@ CeladonCity_GameCorner_EventScript_16C88E:: @ 816C88E CeladonCity_GameCorner_EventScript_16C89E:: @ 816C89E lock faceplayer - checkflag FLAG_GOT_20_COINS_FROM_GAMBLER - goto_if TRUE, EventScript_16C8F0 + goto_if_set FLAG_GOT_20_COINS_FROM_GAMBLER, EventScript_16C8F0 msgbox gUnknown_8196D2B - checkflag FLAG_GOT_COIN_CASE - goto_if FALSE, EventScript_16C839 + goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16C839 checkcoins VAR_TEMP_1 compare VAR_TEMP_1, 9980 - goto_if ge, EventScript_16C8E2 + goto_if_ge EventScript_16C8E2 givecoins 20 textcolor 3 msgbox gUnknown_8196D47 @@ -223,14 +216,12 @@ EventScript_16C8F0:: @ 816C8F0 CeladonCity_GameCorner_EventScript_16C8FE:: @ 816C8FE lock faceplayer - checkflag FLAG_GOT_20_COINS_FROM_GAMBLER_2 - goto_if TRUE, EventScript_16C950 + goto_if_set FLAG_GOT_20_COINS_FROM_GAMBLER_2, EventScript_16C950 msgbox gUnknown_8196DB7 - checkflag FLAG_GOT_COIN_CASE - goto_if FALSE, EventScript_16C839 + goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16C839 checkcoins VAR_TEMP_1 compare VAR_TEMP_1, 9980 - goto_if ge, EventScript_16C942 + goto_if_ge EventScript_16C942 givecoins 20 textcolor 3 msgbox gUnknown_8196DF8 @@ -261,11 +252,10 @@ EventScript_16C96A:: @ 816C96A end EventScript_16C96C:: @ 816C96C - checkflag FLAG_GOT_COIN_CASE - goto_if FALSE, EventScript_16CAA0 + goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16CAA0 msgbox gUnknown_8196F46, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_16C96A + goto_if_eq EventScript_16C96A setfieldeffectarg 0, 255 setfieldeffectarg 1, 10 setfieldeffectarg 2, 14 @@ -410,8 +400,7 @@ EventScript_16CAA0:: @ 816CAA0 CeladonCity_GameCorner_EventScript_16CAAA:: @ 816CAAA lockall msgbox gUnknown_8196EDC - checkflag FLAG_OPENED_ROCKET_HIDEOUT - call_if FALSE, EventScript_16CABE + call_if_unset FLAG_OPENED_ROCKET_HIDEOUT, EventScript_16CABE releaseall end @@ -427,7 +416,7 @@ EventScript_16CABE:: @ 816CABE return CeladonCity_GameCorner_EventScript_16CAF5:: @ 816CAF5 - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_TEAM_ROCKET_GRUNT_7, 0, Text_196E69, Text_196E95, EventScript_16CB10 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_7, Text_196E69, Text_196E95, EventScript_16CB10 msgbox gUnknown_8196E9B, 6 end @@ -435,9 +424,9 @@ EventScript_16CB10:: @ 816CB10 msgbox gUnknown_8196E9B closemessage compare VAR_FACING, DIR_WEST - call_if eq, EventScript_16CB34 + call_if_eq EventScript_16CB34 compare VAR_FACING, DIR_WEST - call_if ne, EventScript_16CB3F + call_if_ne EventScript_16CB3F removeobject 11 release end diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc index 92987068e..7eb986640 100644 --- a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc +++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc @@ -12,11 +12,10 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_16CB7F:: @ 816CB7F CeladonCity_GameCorner_PrizeRoom_EventScript_16CB88:: @ 816CB88 lock faceplayer - checkflag FLAG_GOT_COIN_CASE - goto_if FALSE, EventScript_16CD99 + goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16CD99 special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 showcoinsbox 0, 0 msgbox gUnknown_8197057 goto EventScript_16CBB2 @@ -110,10 +109,10 @@ EventScript_16CC65:: @ 816CC65 getspeciesname 0, VAR_TEMP_1 msgbox gUnknown_819709D, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_16CC10 + goto_if_eq EventScript_16CC10 checkcoins VAR_RESULT compare VAR_RESULT, VAR_TEMP_2 - goto_if lt, EventScript_16CDA5 + goto_if_lt EventScript_16CDA5 textcolor 3 switch VAR_TEMP_1 case SPECIES_ABRA, EventScript_16CCD4 @@ -126,10 +125,10 @@ EventScript_16CC65:: @ 816CC65 EventScript_16CCD4:: @ 816CCD4 .ifdef FIRERED - givemon VAR_TEMP_1, 9, ITEM_NONE, 0, 0, 0 + givemon VAR_TEMP_1, 9, ITEM_NONE .else .ifdef LEAFGREEN - givemon VAR_TEMP_1, 7, ITEM_NONE, 0, 0, 0 + givemon VAR_TEMP_1, 7, ITEM_NONE .endif .endif goto EventScript_16CD52 @@ -137,10 +136,10 @@ EventScript_16CCD4:: @ 816CCD4 EventScript_16CCE9:: @ 816CCE9 .ifdef FIRERED - givemon VAR_TEMP_1, 8, ITEM_NONE, 0, 0, 0 + givemon VAR_TEMP_1, 8, ITEM_NONE .else .ifdef LEAFGREEN - givemon VAR_TEMP_1, 12, ITEM_NONE, 0, 0, 0 + givemon VAR_TEMP_1, 12, ITEM_NONE .endif .endif goto EventScript_16CD52 @@ -148,43 +147,43 @@ EventScript_16CCE9:: @ 816CCE9 EventScript_16CCFE:: @ 816CCFE .ifdef FIRERED - givemon VAR_TEMP_1, 18, ITEM_NONE, 0, 0, 0 + givemon VAR_TEMP_1, 18, ITEM_NONE .else .ifdef LEAFGREEN - givemon VAR_TEMP_1, 24, ITEM_NONE, 0, 0, 0 + givemon VAR_TEMP_1, 24, ITEM_NONE .endif .endif goto EventScript_16CD52 end EventScript_16CD13:: @ 816CD13 - givemon VAR_TEMP_1, 25, ITEM_NONE, 0, 0, 0 + givemon VAR_TEMP_1, 25, ITEM_NONE goto EventScript_16CD52 end EventScript_16CD28:: @ 816CD28 .ifdef FIRERED - givemon VAR_TEMP_1, 26, ITEM_NONE, 0, 0, 0 + givemon VAR_TEMP_1, 26, ITEM_NONE .else .ifdef LEAFGREEN - givemon VAR_TEMP_1, 18, ITEM_NONE, 0, 0, 0 + givemon VAR_TEMP_1, 18, ITEM_NONE .endif .endif goto EventScript_16CD52 end EventScript_16CD3D:: @ 816CD3D - givemon VAR_TEMP_1, 18, ITEM_NONE, 0, 0, 0 + givemon VAR_TEMP_1, 18, ITEM_NONE goto EventScript_16CD52 end EventScript_16CD52:: @ 816CD52 compare VAR_RESULT, 0 - goto_if eq, EventScript_16CDB3 + goto_if_eq EventScript_16CDB3 compare VAR_RESULT, 1 - goto_if eq, EventScript_16CDE0 + goto_if_eq EventScript_16CDE0 compare VAR_RESULT, 2 - goto_if eq, EventScript_16CD74 + goto_if_eq EventScript_16CD74 end EventScript_16CD74:: @ 816CD74 @@ -195,7 +194,7 @@ EventScript_16CD74:: @ 816CD74 end EventScript_16CD83:: @ 816CD83 - countpokemon + getpartysize subvar VAR_RESULT, 1 copyvar VAR_0x8004, VAR_RESULT call EventScript_1A74EB @@ -223,7 +222,7 @@ EventScript_16CDB3:: @ 816CDB3 waitfanfare msgbox gUnknown_81A56A7, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if eq, EventScript_16CD83 + goto_if_eq EventScript_16CD83 goto EventScript_16CC10 end @@ -237,7 +236,7 @@ EventScript_16CDE0:: @ 816CDE0 waitfanfare msgbox gUnknown_81A56A7, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_16CE12 + goto_if_eq EventScript_16CE12 call EventScript_1A8C33 goto EventScript_16CE12 end @@ -250,11 +249,10 @@ EventScript_16CE12:: @ 816CE12 CeladonCity_GameCorner_PrizeRoom_EventScript_16CE1D:: @ 816CE1D lock faceplayer - checkflag FLAG_GOT_COIN_CASE - goto_if FALSE, EventScript_16CD99 + goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16CD99 special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 showcoinsbox 0, 0 msgbox gUnknown_8197057 goto EventScript_16CE47 @@ -312,7 +310,7 @@ EventScript_16CEF5:: @ 816CEF5 EventScript_16CF09:: @ 816CF09 msgbox gUnknown_81970B2, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_16CC10 + goto_if_eq EventScript_16CC10 goto EventScript_16CF3F end @@ -320,7 +318,7 @@ EventScript_16CF22:: @ 816CF22 getitemname 0, VAR_TEMP_1 msgbox gUnknown_819709D, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_16CC10 + goto_if_eq EventScript_16CC10 goto EventScript_16CF3F end @@ -328,10 +326,10 @@ EventScript_16CF3F:: @ 816CF3F getitemname 0, VAR_TEMP_1 checkcoins VAR_RESULT compare VAR_RESULT, VAR_TEMP_2 - goto_if lt, EventScript_16CDA5 + goto_if_lt EventScript_16CDA5 checkitemspace VAR_TEMP_1, 1 compare VAR_RESULT, 0 - goto_if eq, EventScript_16CF79 + goto_if_eq EventScript_16CF79 takecoins VAR_TEMP_2 updatecoinsbox 0, 5 giveitem VAR_TEMP_1 @@ -348,11 +346,10 @@ EventScript_16CF79:: @ 816CF79 CeladonCity_GameCorner_PrizeRoom_EventScript_16CF88:: @ 816CF88 lock faceplayer - checkflag FLAG_GOT_COIN_CASE - goto_if FALSE, EventScript_16CD99 + goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16CD99 special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 showcoinsbox 0, 0 msgbox gUnknown_8197057 goto EventScript_16CFB2 diff --git a/data/maps/CeladonCity_Gym/scripts.inc b/data/maps/CeladonCity_Gym/scripts.inc index d7c14ecd3..4948ace5f 100644 --- a/data/maps/CeladonCity_Gym/scripts.inc +++ b/data/maps/CeladonCity_Gym/scripts.inc @@ -3,9 +3,8 @@ CeladonCity_Gym_MapScripts:: @ 816D060 CeladonCity_Gym_EventScript_16D061:: @ 816D061 famechecker FAMECHECKER_ERIKA, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC, TRAINER_LEADER_ERIKA, 0, Text_197114, Text_197260, EventScript_16D0A0 - checkflag FLAG_GOT_TM19_FROM_ERIKA - goto_if FALSE, EventScript_16D0C6 + trainerbattle_single TRAINER_LEADER_ERIKA, Text_197114, Text_197260, EventScript_16D0A0, NO_MUSIC + goto_if_unset FLAG_GOT_TM19_FROM_ERIKA, EventScript_16D0C6 famechecker FAMECHECKER_ERIKA, 4 msgbox gUnknown_81972B8 release @@ -24,9 +23,8 @@ EventScript_16D0C6:: @ 816D0C6 msgbox gUnknown_8197327 checkitemspace ITEM_TM19, 1 compare VAR_RESULT, 0 - goto_if eq, EventScript_16D107 - additem ITEM_TM19, 1 - giveitemfanfaremsg gUnknown_81973BA, ITEM_TM19 + goto_if_eq EventScript_16D107 + giveitem_msg gUnknown_81973BA, ITEM_TM19 setflag FLAG_GOT_TM19_FROM_ERIKA msgbox gUnknown_81973D7 release @@ -38,46 +36,45 @@ EventScript_16D107:: @ 816D107 end CeladonCity_Gym_EventScript_16D111:: @ 816D111 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_KAY, 0, Text_19747C, Text_1974C4 + trainerbattle_single TRAINER_LASS_KAY, Text_19747C, Text_1974C4 msgbox gUnknown_81974D6, 6 end CeladonCity_Gym_EventScript_16D128:: @ 816D128 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_LISA, 0, Text_1976C5, Text_1976FF + trainerbattle_single TRAINER_LASS_LISA, Text_1976C5, Text_1976FF famechecker FAMECHECKER_ERIKA, 2 msgbox gUnknown_8197708, 6 end CeladonCity_Gym_EventScript_16D14C:: @ 816D14C - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_TINA, 0, Text_197595, Text_1975BB + trainerbattle_single TRAINER_PICNICKER_TINA, Text_197595, Text_1975BB msgbox gUnknown_81975D1, 6 end CeladonCity_Gym_EventScript_16D163:: @ 816D163 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BEAUTY_BRIDGET, 0, Text_1974FA, Text_19751C + trainerbattle_single TRAINER_BEAUTY_BRIDGET, Text_1974FA, Text_19751C msgbox gUnknown_8197527, 6 end CeladonCity_Gym_EventScript_16D17A:: @ 816D17A - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BEAUTY_TAMIA, 0, Text_19760B, Text_197660 + trainerbattle_single TRAINER_BEAUTY_TAMIA, Text_19760B, Text_197660 famechecker FAMECHECKER_ERIKA, 3 msgbox gUnknown_8197664, 6 end CeladonCity_Gym_EventScript_16D19E:: @ 816D19E - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BEAUTY_LORI, 0, Text_197747, Text_19777A + trainerbattle_single TRAINER_BEAUTY_LORI, Text_197747, Text_19777A msgbox gUnknown_8197788, 6 end CeladonCity_Gym_EventScript_16D1B5:: @ 816D1B5 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_COOLTRAINER_MARY, 0, Text_1977E5, Text_197832 + trainerbattle_single TRAINER_COOLTRAINER_MARY, Text_1977E5, Text_197832 msgbox gUnknown_819783E, 6 end CeladonCity_Gym_EventScript_16D1CC:: @ 816D1CC lockall - checkflag FLAG_BADGE04_GET - goto_if TRUE, EventScript_16D1E0 + goto_if_set FLAG_BADGE04_GET, EventScript_16D1E0 msgbox gUnknown_8197874 releaseall end diff --git a/data/maps/CeladonCity_Restaurant/scripts.inc b/data/maps/CeladonCity_Restaurant/scripts.inc index 9b85b36f3..d6ba4496c 100644 --- a/data/maps/CeladonCity_Restaurant/scripts.inc +++ b/data/maps/CeladonCity_Restaurant/scripts.inc @@ -12,14 +12,12 @@ CeladonCity_Restaurant_EventScript_16D1F4:: @ 816D1F4 CeladonCity_Restaurant_EventScript_16D1FD:: @ 816D1FD lock faceplayer - checkflag FLAG_GOT_COIN_CASE - goto_if TRUE, EventScript_16D24B + goto_if_set FLAG_GOT_COIN_CASE, EventScript_16D24B msgbox gUnknown_81979C1 checkitemspace ITEM_COIN_CASE, 1 compare VAR_RESULT, 0 - goto_if eq, EventScript_16D241 - additem ITEM_COIN_CASE, 1 - giveitemfanfaremsg gUnknown_8197A38, ITEM_COIN_CASE + goto_if_eq EventScript_16D241 + giveitem_msg gUnknown_8197A38, ITEM_COIN_CASE setflag FLAG_GOT_COIN_CASE release end diff --git a/data/maps/CeruleanCave_B1F/scripts.inc b/data/maps/CeruleanCave_B1F/scripts.inc index 036f564a5..b252bf306 100644 --- a/data/maps/CeruleanCave_B1F/scripts.inc +++ b/data/maps/CeruleanCave_B1F/scripts.inc @@ -4,20 +4,18 @@ CeruleanCave_B1F_MapScripts:: @ 81624BE .byte 0 CeruleanCave_B1F_OnResume:: @ 81624C9 - checkflag FLAG_SYS_SPECIAL_WILD_BATTLE - call_if TRUE, EventScript_1624D3 + call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, EventScript_1624D3 end EventScript_1624D3:: @ 81624D3 specialvar VAR_RESULT, Special_GetBattleOutcome compare VAR_RESULT, B_OUTCOME_CAUGHT - goto_if ne, EventScript_1A77A9 + goto_if_ne EventScript_1A77A9 removeobject VAR_LAST_TALKED return CeruleanCave_B1F_OnTransition:: @ 81624E7 - checkflag FLAG_FOUGHT_MEWTWO - call_if FALSE, EventScript_1624F1 + call_if_unset FLAG_FOUGHT_MEWTWO, EventScript_1624F1 end EventScript_1624F1:: @ 81624F1 @@ -27,7 +25,7 @@ EventScript_1624F1:: @ 81624F1 CeruleanCave_B1F_EventScript_1624F5:: @ 81624F5 special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 lock faceplayer @@ -46,11 +44,11 @@ CeruleanCave_B1F_EventScript_1624F5:: @ 81624F5 clearflag FLAG_SYS_SPECIAL_WILD_BATTLE specialvar VAR_RESULT, Special_GetBattleOutcome compare VAR_RESULT, B_OUTCOME_WON - goto_if eq, EventScript_162558 + goto_if_eq EventScript_162558 compare VAR_RESULT, B_OUTCOME_RAN - goto_if eq, EventScript_162561 + goto_if_eq EventScript_162561 compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED - goto_if eq, EventScript_162561 + goto_if_eq EventScript_162561 setflag FLAG_FOUGHT_MEWTWO release end diff --git a/data/maps/CeruleanCity/scripts.inc b/data/maps/CeruleanCity/scripts.inc index 6edb5737e..ef102064b 100644 --- a/data/maps/CeruleanCity/scripts.inc +++ b/data/maps/CeruleanCity/scripts.inc @@ -4,8 +4,7 @@ CeruleanCity_MapScripts:: @ 8166471 CeruleanCity_OnTransition:: @ 8166477 setworldmapflag FLAG_WORLD_MAP_CERULEAN_CITY - checkflag FLAG_GOT_SS_TICKET - call_if FALSE, EventScript_166484 + call_if_unset FLAG_GOT_SS_TICKET, EventScript_166484 end EventScript_166484:: @ 8166484 @@ -44,21 +43,21 @@ EventScript_1664CC:: @ 81664CC msgbox gUnknown_817EAD7 setvar VAR_LAST_TALKED, 8 compare VAR_STARTER_MON, 2 - call_if eq, EventScript_166582 + call_if_eq EventScript_166582 compare VAR_STARTER_MON, 1 - call_if eq, EventScript_16658D + call_if_eq EventScript_16658D compare VAR_STARTER_MON, 0 - call_if eq, EventScript_166598 + call_if_eq EventScript_166598 famechecker FAMECHECKER_BILL, 0 msgbox gUnknown_817EB95 closemessage playbgm MUS_RIVAL2, 0 compare VAR_TEMP_1, 0 - call_if eq, EventScript_1665A3 + call_if_eq EventScript_1665A3 compare VAR_TEMP_1, 1 - call_if eq, EventScript_1665A3 + call_if_eq EventScript_1665A3 compare VAR_TEMP_1, 2 - call_if eq, EventScript_1665B5 + call_if_eq EventScript_1665B5 msgbox gUnknown_817ECD4 setvar VAR_MAP_SCENE_CERULEAN_CITY_RIVAL, 1 setflag FLAG_GOT_FAME_CHECKER @@ -73,15 +72,15 @@ EventScript_1664CC:: @ 81664CC end EventScript_166582:: @ 8166582 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_RIVAL_CERULEAN_SQUIRTLE, 0, Text_17EB71 + trainerbattle_no_intro TRAINER_RIVAL_CERULEAN_SQUIRTLE, Text_17EB71 return EventScript_16658D:: @ 816658D - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_RIVAL_CERULEAN_BULBASAUR, 0, Text_17EB71 + trainerbattle_no_intro TRAINER_RIVAL_CERULEAN_BULBASAUR, Text_17EB71 return EventScript_166598:: @ 8166598 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_RIVAL_CERULEAN_CHARMANDER, 0, Text_17EB71 + trainerbattle_no_intro TRAINER_RIVAL_CERULEAN_CHARMANDER, Text_17EB71 return EventScript_1665A3:: @ 81665A3 @@ -172,12 +171,12 @@ CeruleanCity_EventScript_166603:: @ 8166603 lock faceplayer checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_5 - goto_if eq, EventScript_16662E + goto_if_eq EventScript_16662E message Text_17EE0E waitmessage playbgm MUS_ROCKET, 0 waitbuttonpress - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_TEAM_ROCKET_GRUNT_5, 0, Text_17EE70 + trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_5, Text_17EE70 setvar VAR_MAP_SCENE_CERULEAN_CITY_ROCKET, 1 goto EventScript_16662E end @@ -186,9 +185,8 @@ EventScript_16662E:: @ 816662E msgbox gUnknown_817EE9C checkitemspace ITEM_TM28, 1 compare VAR_RESULT, 0 - goto_if eq, EventScript_166677 - additem ITEM_TM28, 1 - giveitemfanfaremsg gUnknown_817EEBF, ITEM_TM28 + goto_if_eq EventScript_166677 + giveitem_msg gUnknown_817EEBF, ITEM_TM28 msgbox gUnknown_817EEED closemessage fadescreen 1 @@ -228,7 +226,7 @@ EventScript_1666C3:: @ 81666C3 textcolor 0 msgbox Text_17EE0E setvar VAR_LAST_TALKED, 2 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_TEAM_ROCKET_GRUNT_5, 0, Text_17EE70 + trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_5, Text_17EE70 setvar VAR_MAP_SCENE_CERULEAN_CITY_ROCKET, 1 goto EventScript_16662E end @@ -246,8 +244,7 @@ CeruleanCity_EventScript_1666E7:: @ 81666E7 CeruleanCity_EventScript_1666FE:: @ 81666FE lock faceplayer - checkflag FLAG_GOT_SS_TICKET - goto_if TRUE, EventScript_166713 + goto_if_set FLAG_GOT_SS_TICKET, EventScript_166713 msgbox gUnknown_817F01D release end @@ -284,11 +281,11 @@ CeruleanCity_EventScript_16674F:: @ 816674F random 3 copyvar VAR_0x8008, VAR_RESULT compare VAR_0x8008, 0 - call_if eq, EventScript_1667B0 + call_if_eq EventScript_1667B0 compare VAR_0x8008, 1 - call_if eq, EventScript_1667B6 + call_if_eq EventScript_1667B6 compare VAR_0x8008, 2 - call_if eq, EventScript_1667BC + call_if_eq EventScript_1667BC waitmessage delay 40 playse SE_PIN @@ -296,11 +293,11 @@ CeruleanCity_EventScript_16674F:: @ 816674F waitmovement 0 delay 30 compare VAR_0x8008, 0 - call_if eq, EventScript_1667C2 + call_if_eq EventScript_1667C2 compare VAR_0x8008, 1 - call_if eq, EventScript_1667CB + call_if_eq EventScript_1667CB compare VAR_0x8008, 2 - call_if eq, EventScript_1667D4 + call_if_eq EventScript_1667D4 release end @@ -333,13 +330,13 @@ CeruleanCity_EventScript_1667DD:: @ 81667DD random 4 copyvar VAR_0x8008, VAR_RESULT compare VAR_0x8008, 0 - call_if eq, EventScript_166814 + call_if_eq EventScript_166814 compare VAR_0x8008, 1 - call_if eq, EventScript_16681D + call_if_eq EventScript_16681D compare VAR_0x8008, 2 - call_if eq, EventScript_166826 + call_if_eq EventScript_166826 compare VAR_0x8008, 3 - call_if eq, EventScript_16682F + call_if_eq EventScript_16682F release end diff --git a/data/maps/CeruleanCity_BikeShop/scripts.inc b/data/maps/CeruleanCity_BikeShop/scripts.inc index 75ebd4b6b..9c137f644 100644 --- a/data/maps/CeruleanCity_BikeShop/scripts.inc +++ b/data/maps/CeruleanCity_BikeShop/scripts.inc @@ -4,10 +4,8 @@ CeruleanCity_BikeShop_MapScripts:: @ 816ABBC CeruleanCity_BikeShop_EventScript_16ABBD:: @ 816ABBD lock faceplayer - checkflag FLAG_GOT_BICYCLE - goto_if TRUE, EventScript_16AC58 - checkflag FLAG_GOT_BIKE_VOUCHER - goto_if TRUE, EventScript_16AC22 + goto_if_set FLAG_GOT_BICYCLE, EventScript_16AC58 + goto_if_set FLAG_GOT_BIKE_VOUCHER, EventScript_16AC22 showmoneybox 0, 0, 0 message Text_192755 waitmessage @@ -31,9 +29,9 @@ EventScript_16AC15:: @ 816AC15 EventScript_16AC22:: @ 816AC22 msgbox gUnknown_81927B2 - giveitemfanfaremsg gUnknown_81927E1, ITEM_BICYCLE, 1, MUS_FAN5 + msgreceiveditem gUnknown_81927E1, ITEM_BICYCLE, 1, MUS_FAN5 setflag FLAG_GOT_BICYCLE - additem ITEM_BICYCLE, 1 + additem ITEM_BICYCLE removeitem ITEM_BIKE_VOUCHER, 1 msgbox gUnknown_819280E release @@ -56,8 +54,7 @@ CeruleanCity_BikeShop_EventScript_16AC6C:: @ 816AC6C CeruleanCity_BikeShop_EventScript_16AC75:: @ 816AC75 lock faceplayer - checkflag FLAG_GOT_BICYCLE - goto_if TRUE, EventScript_16AC8A + goto_if_set FLAG_GOT_BICYCLE, EventScript_16AC8A msgbox gUnknown_8192937 release end diff --git a/data/maps/CeruleanCity_Gym/scripts.inc b/data/maps/CeruleanCity_Gym/scripts.inc index fedec7e89..0da4f93a7 100644 --- a/data/maps/CeruleanCity_Gym/scripts.inc +++ b/data/maps/CeruleanCity_Gym/scripts.inc @@ -3,9 +3,8 @@ CeruleanCity_Gym_MapScripts:: @ 816AAA0 CeruleanCity_Gym_EventScript_16AAA1:: @ 816AAA1 famechecker FAMECHECKER_MISTY, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC, TRAINER_LEADER_MISTY, 0, Text_1921EF, Text_19242D, EventScript_16AAD3 - checkflag FLAG_GOT_TM03_FROM_MISTY - goto_if FALSE, EventScript_16AAF9 + trainerbattle_single TRAINER_LEADER_MISTY, Text_1921EF, Text_19242D, EventScript_16AAD3, NO_MUSIC + goto_if_unset FLAG_GOT_TM03_FROM_MISTY, EventScript_16AAF9 msgbox gUnknown_81922BF release end @@ -23,9 +22,8 @@ EventScript_16AAF9:: @ 816AAF9 msgbox gUnknown_81922F7 checkitemspace ITEM_TM03, 1 compare VAR_RESULT, 0 - goto_if eq, EventScript_16AB3A - additem ITEM_TM03, 1 - giveitemfanfaremsg gUnknown_81923F1, ITEM_TM03 + goto_if_eq EventScript_16AB3A + giveitem_msg gUnknown_81923F1, ITEM_TM03 setflag FLAG_GOT_TM03_FROM_MISTY msgbox gUnknown_81922BF release @@ -37,12 +35,12 @@ EventScript_16AB3A:: @ 816AB3A end CeruleanCity_Gym_EventScript_16AB44:: @ 816AB44 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_DIANA, 0, Text_192481, Text_1924D0 + trainerbattle_single TRAINER_PICNICKER_DIANA, Text_192481, Text_1924D0 msgbox gUnknown_81924E4, 6 end CeruleanCity_Gym_EventScript_16AB5B:: @ 816AB5B - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SWIMMER_MALE_LUIS, 0, Text_192524, Text_192547 + trainerbattle_single TRAINER_SWIMMER_MALE_LUIS, Text_192524, Text_192547 famechecker FAMECHECKER_MISTY, 2 msgbox gUnknown_8192556, 6 end @@ -50,8 +48,7 @@ CeruleanCity_Gym_EventScript_16AB5B:: @ 816AB5B CeruleanCity_Gym_EventScript_16AB7F:: @ 816AB7F lock faceplayer - checkflag FLAG_DEFEATED_MISTY - goto_if TRUE, EventScript_16AB94 + goto_if_set FLAG_DEFEATED_MISTY, EventScript_16AB94 msgbox gUnknown_81925AC release end @@ -63,8 +60,7 @@ EventScript_16AB94:: @ 816AB94 CeruleanCity_Gym_EventScript_16AB9E:: @ 816AB9E lockall - checkflag FLAG_BADGE02_GET - goto_if TRUE, EventScript_16ABB2 + goto_if_set FLAG_BADGE02_GET, EventScript_16ABB2 msgbox gUnknown_81926E1 releaseall end diff --git a/data/maps/CeruleanCity_House2/scripts.inc b/data/maps/CeruleanCity_House2/scripts.inc index bdd52e3b0..630b4b919 100644 --- a/data/maps/CeruleanCity_House2/scripts.inc +++ b/data/maps/CeruleanCity_House2/scripts.inc @@ -4,8 +4,7 @@ CeruleanCity_House2_MapScripts:: @ 816A975 CeruleanCity_House2_EventScript_16A976:: @ 816A976 lock faceplayer - checkflag FLAG_GOT_TM28_FROM_ROCKET - goto_if TRUE, EventScript_16A98B + goto_if_set FLAG_GOT_TM28_FROM_ROCKET, EventScript_16A98B msgbox gUnknown_8191E13 release end diff --git a/data/maps/CeruleanCity_House3/scripts.inc b/data/maps/CeruleanCity_House3/scripts.inc index 13ec2b2fd..9d02b8743 100644 --- a/data/maps/CeruleanCity_House3/scripts.inc +++ b/data/maps/CeruleanCity_House3/scripts.inc @@ -10,17 +10,16 @@ CeruleanCity_House3_EventScript_16A9B1:: @ 816A9B1 faceplayer setvar VAR_0x8008, 1 call EventScript_1A8CAD - checkflag FLAG_DID_ZYNX_TRADE - goto_if TRUE, EventScript_16AA23 + goto_if_set FLAG_DID_ZYNX_TRADE, EventScript_16AA23 msgbox gUnknown_81A59FE, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_16AA0B + goto_if_eq EventScript_16AA0B call EventScript_1A8CBD compare VAR_0x8004, 6 - goto_if ge, EventScript_16AA0B + goto_if_ge EventScript_16AA0B call EventScript_1A8CC9 compare VAR_RESULT, VAR_0x8009 - goto_if ne, EventScript_16AA15 + goto_if_ne EventScript_16AA15 call EventScript_1A8CD9 msgbox gUnknown_81A5A9D setflag FLAG_DID_ZYNX_TRADE diff --git a/data/maps/CeruleanCity_House4/scripts.inc b/data/maps/CeruleanCity_House4/scripts.inc index a720d9098..432f1a9f3 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_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 lock specialvar VAR_0x8004, Special_GetMENewsJisanItemAndState copyvar VAR_0x8008, VAR_RESULT compare VAR_0x8004, 0 - goto_if eq, EventScript_CeruleanCity_House4_NoNews + goto_if_eq EventScript_CeruleanCity_House4_NoNews compare VAR_0x8004, 1 - goto_if eq, EventScript_CeruleanCity_House4_News1 + goto_if_eq EventScript_CeruleanCity_House4_News1 compare VAR_0x8004, 2 - goto_if eq, EventScript_CeruleanCity_House4_News2 + goto_if_eq EventScript_CeruleanCity_House4_News2 compare VAR_0x8004, 3 - goto_if eq, EventScript_CeruleanCity_House4_NewsNotSpread + goto_if_eq EventScript_CeruleanCity_House4_NewsNotSpread compare VAR_0x8004, 4 - goto_if eq, EventScript_CeruleanCity_House4_NewsSpread1 + goto_if_eq EventScript_CeruleanCity_House4_NewsSpread1 compare VAR_0x8004, 5 - goto_if eq, EventScript_CeruleanCity_House4_NewsSpread2 + goto_if_eq EventScript_CeruleanCity_House4_NewsSpread2 compare VAR_0x8004, 6 - goto_if eq, EventScript_CeruleanCity_House4_NewsDone + goto_if_eq EventScript_CeruleanCity_House4_NewsDone end EventScript_CeruleanCity_House4_NoNews:: @ 816AD59 @@ -35,7 +35,7 @@ EventScript_CeruleanCity_House4_News1:: @ 816AD63 msgbox gUnknown_8192B43 giveitem VAR_0x8008 compare VAR_RESULT, 0 - goto_if eq, EventScript_16AE45 + goto_if_eq EventScript_16AE45 release end @@ -44,7 +44,7 @@ EventScript_CeruleanCity_House4_News2:: @ 816AD89 msgbox gUnknown_8192C07 giveitem VAR_0x8008, 4 compare VAR_RESULT, 0 - goto_if eq, EventScript_16AE45 + goto_if_eq EventScript_16AE45 release end @@ -60,7 +60,7 @@ EventScript_CeruleanCity_House4_NewsSpread1:: @ 816ADC3 msgbox gUnknown_8192D4B giveitem VAR_0x8008 compare VAR_RESULT, 0 - goto_if eq, EventScript_16AE45 + goto_if_eq EventScript_16AE45 release end @@ -69,7 +69,7 @@ EventScript_CeruleanCity_House4_NewsSpread2:: @ 816ADE9 msgbox gUnknown_8192DE3 giveitem VAR_0x8008, 4 compare VAR_RESULT, 0 - goto_if eq, EventScript_16AE45 + goto_if_eq EventScript_16AE45 release end diff --git a/data/maps/CeruleanCity_House5/scripts.inc b/data/maps/CeruleanCity_House5/scripts.inc index cad1e3f47..3a37f94be 100644 --- a/data/maps/CeruleanCity_House5/scripts.inc +++ b/data/maps/CeruleanCity_House5/scripts.inc @@ -4,18 +4,16 @@ CeruleanCity_House5_MapScripts:: @ 816AE4F CeruleanCity_House5_EventScript_16AE50:: @ 816AE50 lock faceplayer - checkflag FLAG_GOT_POWDER_JAR - goto_if TRUE, EventScript_16AEB7 + goto_if_set FLAG_GOT_POWDER_JAR, EventScript_16AEB7 msgbox gUnknown_8192F67, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_16AEAD - checkflag FLAG_SYS_GOT_BERRY_POUCH - goto_if FALSE, EventScript_16AEA3 + goto_if_eq EventScript_16AEAD + goto_if_unset FLAG_SYS_GOT_BERRY_POUCH, EventScript_16AEA3 msgbox gUnknown_8193003 setflag FLAG_GOT_POWDER_JAR giveitem ITEM_POWDER_JAR compare VAR_RESULT, 0 - goto_if eq, EventScript_1A6BF9 + goto_if_eq EventScript_1A6BF9 msgbox gUnknown_8193033 release end @@ -144,20 +142,20 @@ EventScript_16B048:: @ 816B048 EventScript_16B055:: @ 816B055 msgbox gUnknown_819331E, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_16AEC8 + goto_if_eq EventScript_16AEC8 copyvar VAR_0x8004, VAR_0x8009 specialvar VAR_RESULT, sub_815EEB0 compare VAR_RESULT, 0 - goto_if eq, EventScript_16B0CC + goto_if_eq EventScript_16B0CC giveitem VAR_0x8008 compare VAR_RESULT, 0 - goto_if eq, EventScript_16B0BF + goto_if_eq EventScript_16B0BF copyvar VAR_0x8004, VAR_0x8009 special sub_815EF5C special sub_815F070 msgbox gUnknown_819337A, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if eq, EventScript_16AEC8 + goto_if_eq EventScript_16AEC8 msgbox gUnknown_81933FB special sub_815F114 release @@ -178,7 +176,7 @@ CeruleanCity_House5_EventScript_16B0DA:: @ 816B0DA lockall special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_814EA7C waitstate releaseall diff --git a/data/maps/CeruleanCity_Mart/scripts.inc b/data/maps/CeruleanCity_Mart/scripts.inc index ccac24aed..d51b2f96e 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_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lock faceplayer message Text_MayIHelpYou diff --git a/data/maps/CinnabarIsland/scripts.inc b/data/maps/CinnabarIsland/scripts.inc index fa5546852..9c07369b7 100644 --- a/data/maps/CinnabarIsland/scripts.inc +++ b/data/maps/CinnabarIsland/scripts.inc @@ -7,11 +7,11 @@ CinnabarIsland_OnTransition:: @ 8166EE1 setworldmapflag FLAG_WORLD_MAP_CINNABAR_ISLAND call EventScript_166F5E compare VAR_MAP_SCENE_CINNABAR_ISLAND, 1 - call_if eq, EventScript_166F24 + call_if_eq EventScript_166F24 compare VAR_MAP_SCENE_CINNABAR_ISLAND, 3 - call_if eq, EventScript_166F52 + call_if_eq EventScript_166F52 compare VAR_MAP_SCENE_CINNABAR_ISLAND_2, 1 - call_if eq, EventScript_166F0B + call_if_eq EventScript_166F0B end EventScript_166F0B:: @ 8166F0B @@ -25,7 +25,7 @@ EventScript_166F0B:: @ 8166F0B EventScript_166F24:: @ 8166F24 getplayerxy VAR_0x8004, VAR_0x8005 compare VAR_0x8004, 18 - goto_if ge, EventScript_166F4A + goto_if_ge EventScript_166F4A setflag FLAG_TEMP_2 setobjectxyperm 3, 18, 12 setobjectmovementtype 3, 7 @@ -42,8 +42,7 @@ EventScript_166F52:: @ 8166F52 return EventScript_166F5E:: @ 8166F5E - checkflag FLAG_HIDE_POKEMON_MANSION_B1F_SECRET_KEY - goto_if TRUE, EventScript_166F68 + goto_if_set FLAG_HIDE_POKEMON_MANSION_B1F_SECRET_KEY, EventScript_166F68 return EventScript_166F68:: @ 8166F68 @@ -93,25 +92,21 @@ Movement_166FC6:: @ 8166FC6 EventScript_166FCD:: @ 8166FCD lockall textcolor 0 - checkflag FLAG_TEMP_2 - call_if FALSE, EventScript_167032 - checkflag FLAG_TEMP_2 - call_if TRUE, EventScript_16703D + call_if_unset FLAG_TEMP_2, EventScript_167032 + call_if_set FLAG_TEMP_2, EventScript_16703D playse SE_PIN applymovement 3, Movement_ExclamationMark waitmovement 0 applymovement 3, Movement_Delay48 waitmovement 0 - checkflag FLAG_TEMP_2 - call_if FALSE, EventScript_167048 - checkflag FLAG_TEMP_2 - call_if TRUE, EventScript_167053 + call_if_unset FLAG_TEMP_2, EventScript_167048 + call_if_set FLAG_TEMP_2, EventScript_167053 msgbox gUnknown_8180C90 msgbox gUnknown_8180CAA, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if eq, EventScript_167068 + goto_if_eq EventScript_167068 compare VAR_RESULT, 0 - goto_if eq, EventScript_167078 + goto_if_eq EventScript_167078 end EventScript_167032:: @ 8167032 @@ -146,10 +141,8 @@ EventScript_167068:: @ 8167068 EventScript_167078:: @ 8167078 msgbox gUnknown_8180DF8 closemessage - checkflag FLAG_TEMP_2 - call_if FALSE, EventScript_1670A0 - checkflag FLAG_TEMP_2 - call_if TRUE, EventScript_1670B3 + call_if_unset FLAG_TEMP_2, EventScript_1670A0 + call_if_set FLAG_TEMP_2, EventScript_1670B3 removeobject 3 setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 2 clearflag FLAG_HIDE_CINNABAR_POKECENTER_BILL @@ -201,19 +194,14 @@ Movement_1670E2:: @ 81670E2 step_end EventScript_1670E6:: @ 81670E6 - checkflag FLAG_TEMP_2 - call_if TRUE, EventScript_167142 + call_if_set FLAG_TEMP_2, EventScript_167142 addobject 4 - checkflag FLAG_TEMP_2 - call_if FALSE, EventScript_167154 - checkflag FLAG_TEMP_2 - call_if TRUE, EventScript_167166 + call_if_unset FLAG_TEMP_2, EventScript_167154 + call_if_set FLAG_TEMP_2, EventScript_167166 msgbox gUnknown_8180EAD closemessage - checkflag FLAG_TEMP_2 - call_if FALSE, EventScript_167171 - checkflag FLAG_TEMP_2 - call_if TRUE, EventScript_167183 + call_if_unset FLAG_TEMP_2, EventScript_167171 + call_if_set FLAG_TEMP_2, EventScript_167183 setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 2 removeobject 3 delay 40 diff --git a/data/maps/CinnabarIsland_Gym/scripts.inc b/data/maps/CinnabarIsland_Gym/scripts.inc index 03fbf26f0..2de722229 100644 --- a/data/maps/CinnabarIsland_Gym/scripts.inc +++ b/data/maps/CinnabarIsland_Gym/scripts.inc @@ -3,20 +3,13 @@ CinnabarIsland_Gym_MapScripts:: @ 816D94B .byte 0 CinnabarIsland_Gym_OnLoad:: @ 816D951 - checkflag FLAG_DEFEATED_BLAINE - goto_if TRUE, EventScript_16D991 - checkflag FLAG_CINNABAR_GYM_QUIZ_1 - call_if TRUE, EventScript_16D9B0 - checkflag FLAG_CINNABAR_GYM_QUIZ_2 - call_if TRUE, EventScript_16D9B6 - checkflag FLAG_CINNABAR_GYM_QUIZ_3 - call_if TRUE, EventScript_16D9BC - checkflag FLAG_CINNABAR_GYM_QUIZ_4 - call_if TRUE, EventScript_16D9C2 - checkflag FLAG_CINNABAR_GYM_QUIZ_5 - call_if TRUE, EventScript_16D9C8 - checkflag FLAG_CINNABAR_GYM_QUIZ_6 - call_if TRUE, EventScript_16D9CE + goto_if_set FLAG_DEFEATED_BLAINE, EventScript_16D991 + call_if_set FLAG_CINNABAR_GYM_QUIZ_1, EventScript_16D9B0 + call_if_set FLAG_CINNABAR_GYM_QUIZ_2, EventScript_16D9B6 + call_if_set FLAG_CINNABAR_GYM_QUIZ_3, EventScript_16D9BC + call_if_set FLAG_CINNABAR_GYM_QUIZ_4, EventScript_16D9C2 + call_if_set FLAG_CINNABAR_GYM_QUIZ_5, EventScript_16D9C8 + call_if_set FLAG_CINNABAR_GYM_QUIZ_6, EventScript_16D9CE end EventScript_16D991:: @ 816D991 @@ -54,9 +47,8 @@ EventScript_16D9CE:: @ 816D9CE CinnabarIsland_Gym_EventScript_16D9D4:: @ 816D9D4 famechecker FAMECHECKER_BLAINE, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC, TRAINER_LEADER_BLAINE, 0, Text_199543, Text_1995FA, EventScript_16DA06 - checkflag FLAG_GOT_TM38_FROM_BLAINE - goto_if FALSE, EventScript_16DA34 + trainerbattle_single TRAINER_LEADER_BLAINE, Text_199543, Text_1995FA, EventScript_16DA06, NO_MUSIC + goto_if_unset FLAG_GOT_TM38_FROM_BLAINE, EventScript_16DA34 msgbox gUnknown_819971D release end @@ -76,9 +68,8 @@ EventScript_16DA34:: @ 816DA34 msgbox gUnknown_819969E checkitemspace ITEM_TM38, 1 compare VAR_RESULT, 0 - goto_if eq, EventScript_16DA75 - additem ITEM_TM38, 1 - giveitemfanfaremsg gUnknown_81996FF, ITEM_TM38 + goto_if_eq EventScript_16DA75 + giveitem_msg gUnknown_81996FF, ITEM_TM38 setflag FLAG_GOT_TM38_FROM_BLAINE msgbox gUnknown_8199652 release @@ -90,18 +81,17 @@ EventScript_16DA75:: @ 816DA75 end CinnabarIsland_Gym_EventScript_16DA7F:: @ 816DA7F - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SUPER_NERD_ERIK, 0, Text_1997A5, Text_1997D6 + trainerbattle_single TRAINER_SUPER_NERD_ERIK, Text_1997A5, Text_1997D6 msgbox gUnknown_81997EA, 6 end CinnabarIsland_Gym_EventScript_16DA96:: @ 816DA96 - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_SUPER_NERD_AVERY, 0, Text_1998BD, Text_1998ED, EventScript_16DAB1 + trainerbattle_single TRAINER_SUPER_NERD_AVERY, Text_1998BD, Text_1998ED, EventScript_16DAB1 msgbox gUnknown_8199911, 6 end EventScript_16DAB1:: @ 816DAB1 - checkflag FLAG_CINNABAR_GYM_QUIZ_2 - call_if FALSE, EventScript_16DABC + call_if_unset FLAG_CINNABAR_GYM_QUIZ_2, EventScript_16DABC release end @@ -110,14 +100,13 @@ EventScript_16DABC:: @ 816DABC return CinnabarIsland_Gym_EventScript_16DAC2:: @ 816DAC2 - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_SUPER_NERD_DEREK, 0, Text_1999B7, Text_1999DB, EventScript_16DAEA + trainerbattle_single TRAINER_SUPER_NERD_DEREK, Text_1999B7, Text_1999DB, EventScript_16DAEA famechecker FAMECHECKER_BLAINE, 2 msgbox gUnknown_81999DF, 6 end EventScript_16DAEA:: @ 816DAEA - checkflag FLAG_CINNABAR_GYM_QUIZ_4 - call_if FALSE, EventScript_16DAF5 + call_if_unset FLAG_CINNABAR_GYM_QUIZ_4, EventScript_16DAF5 release end @@ -126,13 +115,12 @@ EventScript_16DAF5:: @ 816DAF5 return CinnabarIsland_Gym_EventScript_16DAFB:: @ 816DAFB - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_SUPER_NERD_ZAC, 0, Text_199AFC, Text_199B16, EventScript_16DB16 + trainerbattle_single TRAINER_SUPER_NERD_ZAC, Text_199AFC, Text_199B16, EventScript_16DB16 msgbox gUnknown_8199B27, 6 end EventScript_16DB16:: @ 816DB16 - checkflag FLAG_CINNABAR_GYM_QUIZ_6 - call_if FALSE, EventScript_16DB21 + call_if_unset FLAG_CINNABAR_GYM_QUIZ_6, EventScript_16DB21 release end @@ -141,13 +129,12 @@ EventScript_16DB21:: @ 816DB21 return CinnabarIsland_Gym_EventScript_16DB27:: @ 816DB27 - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_BURGLAR_QUINN, 0, Text_19983F, Text_199870, EventScript_16DB42 + trainerbattle_single TRAINER_BURGLAR_QUINN, Text_19983F, Text_199870, EventScript_16DB42 msgbox gUnknown_819987D, 6 end EventScript_16DB42:: @ 816DB42 - checkflag FLAG_CINNABAR_GYM_QUIZ_1 - call_if FALSE, EventScript_16DB4D + call_if_unset FLAG_CINNABAR_GYM_QUIZ_1, EventScript_16DB4D release end @@ -156,13 +143,12 @@ EventScript_16DB4D:: @ 816DB4D return CinnabarIsland_Gym_EventScript_16DB53:: @ 816DB53 - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_BURGLAR_RAMON, 0, Text_199948, Text_199973, EventScript_16DB6E + trainerbattle_single TRAINER_BURGLAR_RAMON, Text_199948, Text_199973, EventScript_16DB6E msgbox gUnknown_8199986, 6 end EventScript_16DB6E:: @ 816DB6E - checkflag FLAG_CINNABAR_GYM_QUIZ_3 - call_if FALSE, EventScript_16DB79 + call_if_unset FLAG_CINNABAR_GYM_QUIZ_3, EventScript_16DB79 release end @@ -171,13 +157,12 @@ EventScript_16DB79:: @ 816DB79 return CinnabarIsland_Gym_EventScript_16DB7F:: @ 816DB7F - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_BURGLAR_DUSTY, 0, Text_199A7F, Text_199AB9, EventScript_16DB9A + trainerbattle_single TRAINER_BURGLAR_DUSTY, Text_199A7F, Text_199AB9, EventScript_16DB9A msgbox gUnknown_8199AC9, 6 end EventScript_16DB9A:: @ 816DB9A - checkflag FLAG_CINNABAR_GYM_QUIZ_5 - call_if FALSE, EventScript_16DBA5 + call_if_unset FLAG_CINNABAR_GYM_QUIZ_5, EventScript_16DBA5 release end @@ -188,8 +173,7 @@ EventScript_16DBA5:: @ 816DBA5 CinnabarIsland_Gym_EventScript_16DBAB:: @ 816DBAB lock faceplayer - checkflag FLAG_DEFEATED_BLAINE - goto_if TRUE, EventScript_16DBC0 + goto_if_set FLAG_DEFEATED_BLAINE, EventScript_16DBC0 msgbox gUnknown_8199B81 release end @@ -201,8 +185,7 @@ EventScript_16DBC0:: @ 816DBC0 CinnabarIsland_Gym_EventScript_16DBCA:: @ 816DBCA lockall - checkflag FLAG_BADGE07_GET - goto_if TRUE, EventScript_16DBDE + goto_if_set FLAG_BADGE07_GET, EventScript_16DBDE msgbox gUnknown_8199C29 releaseall end @@ -228,9 +211,9 @@ EventScript_16DC00:: @ 816DC00 msgbox gUnknown_8199C9F msgbox gUnknown_8199D5A, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if eq, EventScript_16DC43 + goto_if_eq EventScript_16DC43 compare VAR_RESULT, 0 - goto_if eq, EventScript_16DC6A + goto_if_eq EventScript_16DC6A end EventScript_16DC27:: @ 816DC27 @@ -249,8 +232,7 @@ EventScript_16DC34:: @ 816DC34 EventScript_16DC43:: @ 816DC43 call EventScript_16DC27 - checkflag FLAG_CINNABAR_GYM_QUIZ_1 - goto_if TRUE, EventScript_16DC68 + goto_if_set FLAG_CINNABAR_GYM_QUIZ_1, EventScript_16DC68 call EventScript_16DC58 releaseall end @@ -270,20 +252,19 @@ EventScript_16DC68:: @ 816DC68 EventScript_16DC6A:: @ 816DC6A call EventScript_16DC34 checktrainerflag TRAINER_BURGLAR_QUINN - goto_if lt, EventScript_16DC7A + goto_if_lt EventScript_16DC7A releaseall end EventScript_16DC7A:: @ 816DC7A compare VAR_TEMP_1, 0 - call_if eq, EventScript_16DCB4 + call_if_eq EventScript_16DCB4 compare VAR_TEMP_1, 1 - call_if eq, EventScript_16DCC6 + call_if_eq EventScript_16DCC6 textcolor 0 msgbox gUnknown_819983F - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_BURGLAR_QUINN, 0, Text_199870 - checkflag FLAG_CINNABAR_GYM_QUIZ_1 - goto_if TRUE, EventScript_16DC68 + trainerbattle_no_intro TRAINER_BURGLAR_QUINN, Text_199870 + goto_if_set FLAG_CINNABAR_GYM_QUIZ_1, EventScript_16DC68 call EventScript_16DC58 releaseall end @@ -325,15 +306,14 @@ EventScript_16DCF5:: @ 816DCF5 msgbox gUnknown_8199C9F msgbox gUnknown_8199D79, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if eq, EventScript_16DD41 + goto_if_eq EventScript_16DD41 compare VAR_RESULT, 0 - goto_if eq, EventScript_16DD1C + goto_if_eq EventScript_16DD1C end EventScript_16DD1C:: @ 816DD1C call EventScript_16DC27 - checkflag FLAG_CINNABAR_GYM_QUIZ_2 - goto_if TRUE, EventScript_16DC68 + goto_if_set FLAG_CINNABAR_GYM_QUIZ_2, EventScript_16DC68 call EventScript_16DD31 releaseall end @@ -349,20 +329,19 @@ EventScript_16DD31:: @ 816DD31 EventScript_16DD41:: @ 816DD41 call EventScript_16DC34 checktrainerflag TRAINER_SUPER_NERD_AVERY - goto_if lt, EventScript_16DD51 + goto_if_lt EventScript_16DD51 releaseall end EventScript_16DD51:: @ 816DD51 compare VAR_TEMP_1, 0 - call_if eq, EventScript_16DD8B + call_if_eq EventScript_16DD8B compare VAR_TEMP_1, 1 - call_if eq, EventScript_16DD9D + call_if_eq EventScript_16DD9D textcolor 0 msgbox gUnknown_81998BD - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_SUPER_NERD_AVERY, 0, Text_1998ED - checkflag FLAG_CINNABAR_GYM_QUIZ_2 - goto_if TRUE, EventScript_16DC68 + trainerbattle_no_intro TRAINER_SUPER_NERD_AVERY, Text_1998ED + goto_if_set FLAG_CINNABAR_GYM_QUIZ_2, EventScript_16DC68 call EventScript_16DD31 releaseall end @@ -413,15 +392,14 @@ EventScript_16DDD3:: @ 816DDD3 msgbox gUnknown_8199C9F msgbox gUnknown_8199DA9, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if eq, EventScript_16DE1F + goto_if_eq EventScript_16DE1F compare VAR_RESULT, 0 - goto_if eq, EventScript_16DDFA + goto_if_eq EventScript_16DDFA end EventScript_16DDFA:: @ 816DDFA call EventScript_16DC27 - checkflag FLAG_CINNABAR_GYM_QUIZ_3 - goto_if TRUE, EventScript_16DC68 + goto_if_set FLAG_CINNABAR_GYM_QUIZ_3, EventScript_16DC68 call EventScript_16DE0F releaseall end @@ -437,20 +415,19 @@ EventScript_16DE0F:: @ 816DE0F EventScript_16DE1F:: @ 816DE1F call EventScript_16DC34 checktrainerflag TRAINER_BURGLAR_RAMON - goto_if lt, EventScript_16DE2F + goto_if_lt EventScript_16DE2F releaseall end EventScript_16DE2F:: @ 816DE2F compare VAR_TEMP_1, 0 - call_if eq, EventScript_16DE69 + call_if_eq EventScript_16DE69 compare VAR_TEMP_1, 1 - call_if eq, EventScript_16DE7B + call_if_eq EventScript_16DE7B textcolor 0 msgbox gUnknown_8199948 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_BURGLAR_RAMON, 0, Text_199973 - checkflag FLAG_CINNABAR_GYM_QUIZ_3 - goto_if TRUE, EventScript_16DC68 + trainerbattle_no_intro TRAINER_BURGLAR_RAMON, Text_199973 + goto_if_set FLAG_CINNABAR_GYM_QUIZ_3, EventScript_16DC68 call EventScript_16DE0F releaseall end @@ -492,15 +469,14 @@ EventScript_16DEAA:: @ 816DEAA msgbox gUnknown_8199C9F msgbox gUnknown_8199DC6, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if eq, EventScript_16DEF6 + goto_if_eq EventScript_16DEF6 compare VAR_RESULT, 0 - goto_if eq, EventScript_16DED1 + goto_if_eq EventScript_16DED1 end EventScript_16DED1:: @ 816DED1 call EventScript_16DC27 - checkflag FLAG_CINNABAR_GYM_QUIZ_4 - goto_if TRUE, EventScript_16DC68 + goto_if_set FLAG_CINNABAR_GYM_QUIZ_4, EventScript_16DC68 call EventScript_16DEE6 releaseall end @@ -516,20 +492,19 @@ EventScript_16DEE6:: @ 816DEE6 EventScript_16DEF6:: @ 816DEF6 call EventScript_16DC34 checktrainerflag TRAINER_SUPER_NERD_DEREK - goto_if lt, EventScript_16DF06 + goto_if_lt EventScript_16DF06 releaseall end EventScript_16DF06:: @ 816DF06 compare VAR_TEMP_1, 0 - call_if eq, EventScript_16DF40 + call_if_eq EventScript_16DF40 compare VAR_TEMP_1, 1 - call_if eq, EventScript_16DF52 + call_if_eq EventScript_16DF52 textcolor 0 msgbox gUnknown_81999B7 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_SUPER_NERD_DEREK, 0, Text_1999DB - checkflag FLAG_CINNABAR_GYM_QUIZ_4 - goto_if TRUE, EventScript_16DC68 + trainerbattle_no_intro TRAINER_SUPER_NERD_DEREK, Text_1999DB + goto_if_set FLAG_CINNABAR_GYM_QUIZ_4, EventScript_16DC68 call EventScript_16DEE6 releaseall end @@ -571,15 +546,14 @@ EventScript_16DF81:: @ 816DF81 msgbox gUnknown_8199C9F msgbox gUnknown_8199E00, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if eq, EventScript_16DFA8 + goto_if_eq EventScript_16DFA8 compare VAR_RESULT, 0 - goto_if eq, EventScript_16DFCD + goto_if_eq EventScript_16DFCD end EventScript_16DFA8:: @ 816DFA8 call EventScript_16DC27 - checkflag FLAG_CINNABAR_GYM_QUIZ_5 - goto_if TRUE, EventScript_16DC68 + goto_if_set FLAG_CINNABAR_GYM_QUIZ_5, EventScript_16DC68 call EventScript_16DFBD releaseall end @@ -595,20 +569,19 @@ EventScript_16DFBD:: @ 816DFBD EventScript_16DFCD:: @ 816DFCD call EventScript_16DC34 checktrainerflag TRAINER_BURGLAR_DUSTY - goto_if lt, EventScript_16DFDD + goto_if_lt EventScript_16DFDD releaseall end EventScript_16DFDD:: @ 816DFDD compare VAR_TEMP_1, 0 - call_if eq, EventScript_16E017 + call_if_eq EventScript_16E017 compare VAR_TEMP_1, 1 - call_if eq, EventScript_16E029 + call_if_eq EventScript_16E029 textcolor 0 msgbox gUnknown_8199A7F - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_BURGLAR_DUSTY, 0, Text_199AB9 - checkflag FLAG_CINNABAR_GYM_QUIZ_5 - goto_if TRUE, EventScript_16DC68 + trainerbattle_no_intro TRAINER_BURGLAR_DUSTY, Text_199AB9 + goto_if_set FLAG_CINNABAR_GYM_QUIZ_5, EventScript_16DC68 call EventScript_16DFBD releaseall end @@ -650,15 +623,14 @@ EventScript_16E058:: @ 816E058 msgbox gUnknown_8199C9F msgbox gUnknown_8199E36, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if eq, EventScript_16E0A4 + goto_if_eq EventScript_16E0A4 compare VAR_RESULT, 0 - goto_if eq, EventScript_16E07F + goto_if_eq EventScript_16E07F end EventScript_16E07F:: @ 816E07F call EventScript_16DC27 - checkflag FLAG_CINNABAR_GYM_QUIZ_6 - goto_if TRUE, EventScript_16DC68 + goto_if_set FLAG_CINNABAR_GYM_QUIZ_6, EventScript_16DC68 call EventScript_16E094 releaseall end @@ -674,20 +646,19 @@ EventScript_16E094:: @ 816E094 EventScript_16E0A4:: @ 816E0A4 call EventScript_16DC34 checktrainerflag TRAINER_SUPER_NERD_ZAC - goto_if lt, EventScript_16E0B4 + goto_if_lt EventScript_16E0B4 releaseall end EventScript_16E0B4:: @ 816E0B4 compare VAR_TEMP_1, 0 - call_if eq, EventScript_16E0EE + call_if_eq EventScript_16E0EE compare VAR_TEMP_1, 1 - call_if eq, EventScript_16E100 + call_if_eq EventScript_16E100 textcolor 0 msgbox gUnknown_8199AFC - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_SUPER_NERD_ZAC, 0, Text_199B16 - checkflag FLAG_CINNABAR_GYM_QUIZ_6 - goto_if TRUE, EventScript_16DC68 + trainerbattle_no_intro TRAINER_SUPER_NERD_ZAC, Text_199B16 + goto_if_set FLAG_CINNABAR_GYM_QUIZ_6, EventScript_16DC68 call EventScript_16E094 releaseall end diff --git a/data/maps/CinnabarIsland_Mart/scripts.inc b/data/maps/CinnabarIsland_Mart/scripts.inc index b6bb33d34..75dc94f46 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_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lock faceplayer message Text_MayIHelpYou diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc index ba6ab7d60..3fc84f92f 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_RESULT, 0 - goto_if eq, EventScript_16E9A5 + goto_if_eq EventScript_16E9A5 msgbox gUnknown_819A785 closemessage playbgm MUS_ANNAI, 1 @@ -40,11 +40,11 @@ CinnabarIsland_PokemonCenter_1F_EventScript_16E90A:: @ 816E90A setflag FLAG_HIDE_CINNABAR_POKECENTER_BILL delay 20 compare VAR_FACING, DIR_SOUTH - call_if eq, EventScript_16E96F + call_if_eq EventScript_16E96F compare VAR_FACING, DIR_EAST - call_if eq, EventScript_16E981 + call_if_eq EventScript_16E981 compare VAR_FACING, DIR_WEST - call_if eq, EventScript_16E993 + call_if_eq EventScript_16E993 removeobject 7 setvar VAR_MAP_SCENE_CINNABAR_ISLAND_2, 1 clearflag FLAG_HIDE_CINNABAR_BILL diff --git a/data/maps/CinnabarIsland_PokemonLab_Entrance/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_Entrance/scripts.inc index 89b8f9f09..d11407f14 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Entrance/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonLab_Entrance/scripts.inc @@ -4,7 +4,7 @@ CinnabarIsland_PokemonLab_Entrance_MapScripts:: @ 816E273 CinnabarIsland_PokemonLab_Entrance_OnTransition:: @ 816E279 compare VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 1 - call_if eq, EventScript_16E285 + call_if_eq EventScript_16E285 end EventScript_16E285:: @ 816E285 diff --git a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc index fba30d1e8..c0dc92ca0 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc @@ -6,17 +6,16 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E401:: @ 816E401 faceplayer setvar VAR_0x8008, 8 call EventScript_1A8CAD - checkflag FLAG_DID_SEELOR_TRADE - goto_if TRUE, EventScript_16E473 + goto_if_set FLAG_DID_SEELOR_TRADE, EventScript_16E473 msgbox gUnknown_81A597B, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_16E45B + goto_if_eq EventScript_16E45B call EventScript_1A8CBD compare VAR_0x8004, 6 - goto_if ge, EventScript_16E45B + goto_if_ge EventScript_16E45B call EventScript_1A8CC9 compare VAR_RESULT, VAR_0x8009 - goto_if ne, EventScript_16E465 + goto_if_ne EventScript_16E465 call EventScript_1A8CD9 msgbox gUnknown_81A59DA setflag FLAG_DID_SEELOR_TRADE @@ -43,48 +42,41 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E47D:: @ 816E47D lock faceplayer setvar VAR_RESULT, 0 - checkflag FLAG_REVIVED_AMBER - call_if TRUE, EventScript_16E8A1 + call_if_set FLAG_REVIVED_AMBER, EventScript_16E8A1 compare VAR_RESULT, 1 - goto_if eq, EventScript_16E897 + goto_if_eq EventScript_16E897 compare VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 2 - goto_if eq, EventScript_16E736 + goto_if_eq EventScript_16E736 compare VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 1 - goto_if eq, EventScript_16E72C + goto_if_eq EventScript_16E72C call EventScript_16E4EC compare VAR_RESULT, 1 - goto_if eq, EventScript_16E544 + goto_if_eq EventScript_16E544 call EventScript_16E504 compare VAR_RESULT, 1 - goto_if eq, EventScript_16E586 + goto_if_eq EventScript_16E586 call EventScript_16E51C compare VAR_RESULT, 1 - goto_if eq, EventScript_16E5C8 + goto_if_eq EventScript_16E5C8 msgbox gUnknown_819A282 goto EventScript_16E53A end EventScript_16E4EC:: @ 816E4EC - checkflag FLAG_GOT_HELIX_FOSSIL - goto_if FALSE, EventScript_16E534 - checkflag FLAG_REVIVED_HELIX - goto_if TRUE, EventScript_16E534 + goto_if_unset FLAG_GOT_HELIX_FOSSIL, EventScript_16E534 + goto_if_set FLAG_REVIVED_HELIX, EventScript_16E534 setvar VAR_RESULT, 1 return EventScript_16E504:: @ 816E504 - checkflag FLAG_GOT_DOME_FOSSIL - goto_if FALSE, EventScript_16E534 - checkflag FLAG_REVIVED_DOME - goto_if TRUE, EventScript_16E534 + goto_if_unset FLAG_GOT_DOME_FOSSIL, EventScript_16E534 + goto_if_set FLAG_REVIVED_DOME, EventScript_16E534 setvar VAR_RESULT, 1 return EventScript_16E51C:: @ 816E51C - checkflag FLAG_GOT_OLD_AMBER - goto_if FALSE, EventScript_16E534 - checkflag FLAG_REVIVED_AMBER - goto_if TRUE, EventScript_16E534 + goto_if_unset FLAG_GOT_OLD_AMBER, EventScript_16E534 + goto_if_set FLAG_REVIVED_AMBER, EventScript_16E534 setvar VAR_RESULT, 1 return @@ -102,7 +94,7 @@ EventScript_16E544:: @ 816E544 waitmessage call EventScript_16E51C compare VAR_RESULT, 1 - goto_if eq, EventScript_16E5FA + goto_if_eq EventScript_16E5FA multichoice 0, 0, MULTICHOICE_HELIX, FALSE switch VAR_RESULT case 0, EventScript_16E668 @@ -115,7 +107,7 @@ EventScript_16E586:: @ 816E586 waitmessage call EventScript_16E51C compare VAR_RESULT, 1 - goto_if eq, EventScript_16E631 + goto_if_eq EventScript_16E631 multichoice 0, 0, MULTICHOICE_DOME, FALSE switch VAR_RESULT case 0, EventScript_16E6A6 @@ -156,7 +148,7 @@ EventScript_16E668:: @ 816E668 getitemname 1, ITEM_HELIX_FOSSIL msgbox gUnknown_819A3D4, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_16E722 + goto_if_eq EventScript_16E722 msgbox gUnknown_819A45D textcolor 0 removeitem ITEM_HELIX_FOSSIL, 1 @@ -171,7 +163,7 @@ EventScript_16E6A6:: @ 816E6A6 getitemname 1, ITEM_DOME_FOSSIL msgbox gUnknown_819A3D4, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_16E722 + goto_if_eq EventScript_16E722 msgbox gUnknown_819A45D textcolor 0 removeitem ITEM_DOME_FOSSIL, 1 @@ -186,7 +178,7 @@ EventScript_16E6E4:: @ 816E6E4 getitemname 1, ITEM_OLD_AMBER msgbox gUnknown_819A3D4, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_16E722 + goto_if_eq EventScript_16E722 msgbox gUnknown_819A45D textcolor 0 removeitem ITEM_OLD_AMBER, 1 @@ -208,53 +200,53 @@ EventScript_16E72C:: @ 816E72C EventScript_16E736:: @ 816E736 compare VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, 1 - goto_if eq, EventScript_16E758 + goto_if_eq EventScript_16E758 compare VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, 2 - goto_if eq, EventScript_16E79D + goto_if_eq EventScript_16E79D compare VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, 3 - goto_if eq, EventScript_16E7E2 + goto_if_eq EventScript_16E7E2 end EventScript_16E758:: @ 816E758 setvar VAR_TEMP_1, SPECIES_OMANYTE getspeciesname 0, SPECIES_OMANYTE msgbox gUnknown_819A34F - givemon SPECIES_OMANYTE, 5, ITEM_NONE, 0, 0, 0 + givemon SPECIES_OMANYTE, 5, ITEM_NONE compare VAR_RESULT, 2 - goto_if eq, EventScript_1A927C + goto_if_eq EventScript_1A927C setflag FLAG_REVIVED_HELIX compare VAR_RESULT, 0 - goto_if eq, EventScript_16E827 + goto_if_eq EventScript_16E827 compare VAR_RESULT, 1 - goto_if eq, EventScript_16E85B + goto_if_eq EventScript_16E85B end EventScript_16E79D:: @ 816E79D setvar VAR_TEMP_1, SPECIES_KABUTO getspeciesname 0, SPECIES_KABUTO msgbox gUnknown_819A34F - givemon SPECIES_KABUTO, 5, ITEM_NONE, 0, 0, 0 + givemon SPECIES_KABUTO, 5, ITEM_NONE compare VAR_RESULT, 2 - goto_if eq, EventScript_1A927C + goto_if_eq EventScript_1A927C setflag FLAG_REVIVED_DOME compare VAR_RESULT, 0 - goto_if eq, EventScript_16E827 + goto_if_eq EventScript_16E827 compare VAR_RESULT, 1 - goto_if eq, EventScript_16E85B + goto_if_eq EventScript_16E85B end EventScript_16E7E2:: @ 816E7E2 setvar VAR_TEMP_1, SPECIES_AERODACTYL getspeciesname 0, SPECIES_AERODACTYL msgbox gUnknown_819A34F - givemon SPECIES_AERODACTYL, 5, ITEM_NONE, 0, 0, 0 + givemon SPECIES_AERODACTYL, 5, ITEM_NONE compare VAR_RESULT, 2 - goto_if eq, EventScript_1A927C + goto_if_eq EventScript_1A927C setflag FLAG_REVIVED_AMBER compare VAR_RESULT, 0 - goto_if eq, EventScript_16E827 + goto_if_eq EventScript_16E827 compare VAR_RESULT, 1 - goto_if eq, EventScript_16E85B + goto_if_eq EventScript_16E85B end EventScript_16E827:: @ 816E827 @@ -266,7 +258,7 @@ EventScript_16E827:: @ 816E827 setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 0 msgbox gUnknown_81A56A7, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_16E895 + goto_if_eq EventScript_16E895 call EventScript_1A8C27 call EventScript_1A74EB goto EventScript_16E895 @@ -281,7 +273,7 @@ EventScript_16E85B:: @ 816E85B setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 0 msgbox gUnknown_81A56A7, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_16E88A + goto_if_eq EventScript_16E88A call EventScript_1A8C33 goto EventScript_16E88A end @@ -301,21 +293,17 @@ EventScript_16E897:: @ 816E897 end EventScript_16E8A1:: @ 816E8A1 - checkflag FLAG_GOT_HELIX_FOSSIL - goto_if TRUE, EventScript_16E8B9 - checkflag FLAG_GOT_DOME_FOSSIL - goto_if TRUE, EventScript_16E8C8 + goto_if_set FLAG_GOT_HELIX_FOSSIL, EventScript_16E8B9 + goto_if_set FLAG_GOT_DOME_FOSSIL, EventScript_16E8C8 goto EventScript_16E534 end EventScript_16E8B9:: @ 816E8B9 - checkflag FLAG_REVIVED_HELIX - goto_if FALSE, EventScript_16E534 + goto_if_unset FLAG_REVIVED_HELIX, EventScript_16E534 setvar VAR_RESULT, 1 return EventScript_16E8C8:: @ 816E8C8 - checkflag FLAG_REVIVED_DOME - goto_if FALSE, EventScript_16E534 + goto_if_unset FLAG_REVIVED_DOME, EventScript_16E534 setvar VAR_RESULT, 1 return diff --git a/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc index 5eaf24fa4..96af461d3 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc @@ -10,17 +10,16 @@ CinnabarIsland_PokemonLab_Lounge_EventScript_16E2C2:: @ 816E2C2 faceplayer setvar VAR_0x8008, 6 call EventScript_1A8CAD - checkflag FLAG_DID_ESPHERE_TRADE - goto_if TRUE, EventScript_16E334 + goto_if_set FLAG_DID_ESPHERE_TRADE, EventScript_16E334 msgbox gUnknown_81A59FE, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_16E31C + goto_if_eq EventScript_16E31C call EventScript_1A8CBD compare VAR_0x8004, 6 - goto_if ge, EventScript_16E31C + goto_if_ge EventScript_16E31C call EventScript_1A8CC9 compare VAR_RESULT, VAR_0x8009 - goto_if ne, EventScript_16E326 + goto_if_ne EventScript_16E326 call EventScript_1A8CD9 msgbox gUnknown_81A5A9D setflag FLAG_DID_ESPHERE_TRADE @@ -50,21 +49,20 @@ CinnabarIsland_PokemonLab_Lounge_EventScript_16E33E:: @ 816E33E copyvar VAR_0x8004, VAR_0x8008 specialvar VAR_RESULT, GetInGameTradeSpeciesInfo copyvar VAR_0x8009, VAR_RESULT - checkflag FLAG_DID_TANGENY_TRADE - goto_if TRUE, EventScript_16E3D4 + goto_if_set FLAG_DID_TANGENY_TRADE, EventScript_16E3D4 msgbox gUnknown_81A5AD6, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_16E3BC + goto_if_eq EventScript_16E3BC special Special_ChooseMonFromParty waitstate copyvar VAR_0x800A, VAR_0x8004 compare VAR_0x8004, 6 - goto_if ge, EventScript_16E3BC + goto_if_ge EventScript_16E3BC copyvar VAR_0x8005, VAR_0x800A specialvar VAR_RESULT, GetTradeSpecies copyvar VAR_0x800B, VAR_RESULT compare VAR_RESULT, VAR_0x8009 - goto_if ne, EventScript_16E3C6 + goto_if_ne EventScript_16E3C6 copyvar VAR_0x8004, VAR_0x8008 copyvar VAR_0x8005, VAR_0x800A special CreateInGameTradePokemon diff --git a/data/maps/FiveIsland_LostCave_Room1/scripts.inc b/data/maps/FiveIsland_LostCave_Room1/scripts.inc index 62880594c..1f608669b 100644 --- a/data/maps/FiveIsland_LostCave_Room1/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Room1/scripts.inc @@ -2,6 +2,6 @@ FiveIsland_LostCave_Room1_MapScripts:: @ 8164BF6 .byte 0 FiveIsland_LostCave_Room1_EventScript_164BF7:: @ 8164BF7 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_RUIN_MANIAC_LAWSON, 0, Text_17CEF5, Text_17CF42 + trainerbattle_single TRAINER_RUIN_MANIAC_LAWSON, Text_17CEF5, Text_17CF42 msgbox gUnknown_817CF54, 6 end diff --git a/data/maps/FiveIsland_LostCave_Room10/scripts.inc b/data/maps/FiveIsland_LostCave_Room10/scripts.inc index 54dc63546..c4ddc2423 100644 --- a/data/maps/FiveIsland_LostCave_Room10/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Room10/scripts.inc @@ -5,7 +5,7 @@ FiveIsland_LostCave_Room10_MapScripts:: @ 8164C2D FiveIsland_LostCave_Room10_OnResume:: @ 8164C38 checktrainerflag TRAINER_LADY_SELPHY - call_if eq, EventScript_164C42 + call_if_eq EventScript_164C42 end EventScript_164C42:: @ 8164C42 @@ -27,8 +27,8 @@ EventScript_164C52:: @ 8164C52 msgbox gUnknown_817D062 special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_164CB6 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_LADY_SELPHY, 0, Text_17D086 + goto_if_eq EventScript_164CB6 + trainerbattle_no_intro TRAINER_LADY_SELPHY, Text_17D086 msgbox gUnknown_817D0B2 closemessage call EventScript_164CA5 diff --git a/data/maps/FiveIsland_LostCave_Room4/scripts.inc b/data/maps/FiveIsland_LostCave_Room4/scripts.inc index 28913bb80..6beca99ec 100644 --- a/data/maps/FiveIsland_LostCave_Room4/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Room4/scripts.inc @@ -2,6 +2,6 @@ FiveIsland_LostCave_Room4_MapScripts:: @ 8164C10 .byte 0 FiveIsland_LostCave_Room4_EventScript_164C11:: @ 8164C11 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PSYCHIC_LAURA, 0, Text_17CFC1, Text_17CFFB + trainerbattle_single TRAINER_PSYCHIC_LAURA, Text_17CFC1, Text_17CFFB msgbox gUnknown_817D037, 6 end diff --git a/data/maps/FiveIsland_Meadow/scripts.inc b/data/maps/FiveIsland_Meadow/scripts.inc index 11283c81b..bf9844b12 100644 --- a/data/maps/FiveIsland_Meadow/scripts.inc +++ b/data/maps/FiveIsland_Meadow/scripts.inc @@ -3,16 +3,13 @@ FiveIsland_Meadow_MapScripts:: @ 8168932 .byte 0 FiveIsland_Meadow_OnLoad:: @ 8168938 - checkflag FLAG_UNLOCKED_ROCKET_WAREHOUSE - call_if TRUE, EventScript_168983 + call_if_set FLAG_UNLOCKED_ROCKET_WAREHOUSE, EventScript_168983 end FiveIsland_Meadow_EventScript_168942:: @ 8168942 lockall - checkflag FLAG_UNLOCKED_ROCKET_WAREHOUSE - goto_if TRUE, EventScript_168979 - checkflag FLAG_LEARNED_YES_NAH_CHANSEY - goto_if TRUE, EventScript_16895F + goto_if_set FLAG_UNLOCKED_ROCKET_WAREHOUSE, EventScript_168979 + goto_if_set FLAG_LEARNED_YES_NAH_CHANSEY, EventScript_16895F msgbox gUnknown_818AB8E releaseall end @@ -39,16 +36,16 @@ EventScript_168983:: @ 8168983 return FiveIsland_Meadow_EventScript_16898D:: @ 816898D - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_49, 0, Text_18AC88, Text_18ACB3 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_49, Text_18AC88, Text_18ACB3 msgbox gUnknown_818ACC5, 6 end FiveIsland_Meadow_EventScript_1689A4:: @ 81689A4 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_50, 0, Text_18ACF0, Text_18AD39 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_50, Text_18ACF0, Text_18AD39 msgbox gUnknown_818AD59, 6 end FiveIsland_Meadow_EventScript_1689BB:: @ 81689BB - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_51, 0, Text_18ADC6, Text_18ADFB + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_51, Text_18ADC6, Text_18ADFB msgbox gUnknown_818AE16, 6 end diff --git a/data/maps/FiveIsland_MemorialPillar/scripts.inc b/data/maps/FiveIsland_MemorialPillar/scripts.inc index 5bc9fbeea..9e3c0d8e1 100644 --- a/data/maps/FiveIsland_MemorialPillar/scripts.inc +++ b/data/maps/FiveIsland_MemorialPillar/scripts.inc @@ -3,10 +3,8 @@ FiveIsland_MemorialPillar_MapScripts:: @ 81689D2 FiveIsland_MemorialPillar_EventScript_1689D3:: @ 81689D3 lock - checkflag FLAG_GOT_TM42_AT_MEMORIAL_PILLAR - goto_if TRUE, EventScript_168A18 - checkflag FLAG_NO_ROOM_FOR_TM42_AT_MEMORIAL_PILLAR - goto_if TRUE, EventScript_168A22 + goto_if_set FLAG_GOT_TM42_AT_MEMORIAL_PILLAR, EventScript_168A18 + goto_if_set FLAG_NO_ROOM_FOR_TM42_AT_MEMORIAL_PILLAR, EventScript_168A22 msgbox gUnknown_818B02E closemessage applymovement 1, Movement_FacePlayer @@ -28,7 +26,7 @@ EventScript_168A22:: @ 8168A22 msgbox gUnknown_818B282 giveitem ITEM_TM42 compare VAR_RESULT, 0 - goto_if eq, EventScript_168AFE + goto_if_eq EventScript_168AFE call EventScript_168AE8 release end @@ -36,24 +34,22 @@ EventScript_168A22:: @ 8168A22 FiveIsland_MemorialPillar_EventScript_168A48:: @ 8168A48 special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 lockall - checkflag FLAG_GOT_TM42_AT_MEMORIAL_PILLAR - goto_if TRUE, EventScript_168B0B - checkflag FLAG_NO_ROOM_FOR_TM42_AT_MEMORIAL_PILLAR - goto_if TRUE, EventScript_168B0B + goto_if_set FLAG_GOT_TM42_AT_MEMORIAL_PILLAR, EventScript_168B0B + goto_if_set FLAG_NO_ROOM_FOR_TM42_AT_MEMORIAL_PILLAR, EventScript_168B0B msgbox gUnknown_818B095 checkitem ITEM_LEMONADE, 1 compare VAR_RESULT, 1 - goto_if eq, EventScript_168A86 + goto_if_eq EventScript_168A86 releaseall end EventScript_168A86:: @ 8168A86 msgbox gUnknown_818B105, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if eq, EventScript_168A9B + goto_if_eq EventScript_168A9B releaseall end @@ -70,7 +66,7 @@ EventScript_168A9B:: @ 8168A9B msgbox gUnknown_818B171 giveitem ITEM_TM42 compare VAR_RESULT, 0 - goto_if eq, EventScript_168AFE + goto_if_eq EventScript_168AFE call EventScript_168AE8 releaseall end diff --git a/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc b/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc index 87b7cda7b..e8c30c862 100644 --- a/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc +++ b/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc @@ -4,16 +4,15 @@ FiveIsland_ResortGorgeous_House_MapScripts:: @ 8171EBD FiveIsland_ResortGorgeous_House_EventScript_171EBE:: @ 8171EBE special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 lock faceplayer - checkflag FLAG_TEMP_2 - goto_if TRUE, EventScript_172043 + goto_if_set FLAG_TEMP_2, EventScript_172043 compare VAR_RESORT_GORGEOUS_REQUESTED_MON, 0xFFFF - goto_if eq, EventScript_171F0B + goto_if_eq EventScript_171F0B compare VAR_RESORT_GORGEOUS_REQUESTED_MON, SPECIES_NONE - goto_if ne, EventScript_171F19 + goto_if_ne EventScript_171F19 msgbox gUnknown_81A42A0 goto EventScript_171EFE end @@ -33,7 +32,7 @@ EventScript_171F19:: @ 8171F19 copyvar VAR_0x8004, VAR_RESORT_GORGEOUS_REQUESTED_MON specialvar VAR_RESULT, Special_PlayerPartyContainsSpecies compare VAR_RESULT, 1 - goto_if eq, EventScript_171F34 + goto_if_eq EventScript_171F34 goto EventScript_171EFE end @@ -53,18 +52,18 @@ EventScript_171F34:: @ 8171F34 msgbox gUnknown_81A4566 closemessage compare VAR_FACING, DIR_NORTH - call_if eq, EventScript_171FCD + call_if_eq EventScript_171FCD compare VAR_FACING, DIR_SOUTH - call_if eq, EventScript_171FE9 + call_if_eq EventScript_171FE9 compare VAR_FACING, DIR_EAST - call_if eq, EventScript_171FFE + call_if_eq EventScript_171FFE compare VAR_FACING, DIR_WEST - call_if eq, EventScript_17201A + call_if_eq EventScript_17201A moveobjectoffscreen 2 msgbox gUnknown_81A458E giveitem VAR_RESORT_GORGEOUS_REWARD compare VAR_RESULT, 0 - goto_if eq, EventScript_172025 + goto_if_eq EventScript_172025 setflag FLAG_TEMP_2 setvar VAR_RESORT_GORGEOUS_REQUESTED_MON, 0 release diff --git a/data/maps/FiveIsland_RocketWarehouse/scripts.inc b/data/maps/FiveIsland_RocketWarehouse/scripts.inc index 0050e2f93..d3d5f7fba 100644 --- a/data/maps/FiveIsland_RocketWarehouse/scripts.inc +++ b/data/maps/FiveIsland_RocketWarehouse/scripts.inc @@ -9,7 +9,7 @@ FiveIsland_RocketWarehouse_OnTransition:: @ 8163F39 FiveIsland_RocketWarehouse_OnLoad:: @ 8163F3D checktrainerflag TRAINER_TEAM_ROCKET_ADMIN - call_if eq, EventScript_163F47 + call_if_eq EventScript_163F47 end EventScript_163F47:: @ 8163F47 @@ -19,8 +19,7 @@ EventScript_163F47:: @ 8163F47 FiveIsland_RocketWarehouse_EventScript_163F5A:: @ 8163F5A lockall - checkflag FLAG_DEFEATED_ROCKETS_IN_WAREHOUSE - goto_if TRUE, EventScript_163F6E + goto_if_set FLAG_DEFEATED_ROCKETS_IN_WAREHOUSE, EventScript_163F6E msgbox gUnknown_817B4E3 releaseall end @@ -43,9 +42,8 @@ FiveIsland_RocketWarehouse_EventScript_163F81:: @ 8163F81 end FiveIsland_RocketWarehouse_EventScript_163F93:: @ 8163F93 - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_SCIENTIST_GIDEON, 0, Text_17BBAF, Text_17BC55, EventScript_163FCD - checkflag FLAG_SYS_CAN_LINK_WITH_RS - goto_if TRUE, EventScript_163FB7 + trainerbattle_single TRAINER_SCIENTIST_GIDEON, Text_17BBAF, Text_17BC55, EventScript_163FCD + goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_163FB7 msgbox gUnknown_817BCA3, 6 end @@ -62,24 +60,24 @@ EventScript_163FCD:: @ 8163FCD end FiveIsland_RocketWarehouse_EventScript_163FE6:: @ 8163FE6 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_47, 0, Text_17B54D, Text_17B585 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_47, Text_17B54D, Text_17B585 msgbox gUnknown_817B5A6, 6 end FiveIsland_RocketWarehouse_EventScript_163FFD:: @ 8163FFD - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_48, 0, Text_17B677, Text_17B6D9 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_48, Text_17B677, Text_17B6D9 msgbox gUnknown_817B6EF, 6 end FiveIsland_RocketWarehouse_EventScript_164014:: @ 8164014 - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_TEAM_ROCKET_ADMIN_2, 0, Text_17B8DA, Text_17B9FB, EventScript_16402F + trainerbattle_single TRAINER_TEAM_ROCKET_ADMIN_2, Text_17B8DA, Text_17B9FB, EventScript_16402F msgbox gUnknown_817BA64, 6 end EventScript_16402F:: @ 816402F getplayerxy VAR_0x8004, VAR_0x8005 compare VAR_0x8004, 24 - call_if le, EventScript_164065 + call_if_le EventScript_164065 msgbox gUnknown_817BA64 closemessage fadescreen 1 @@ -100,12 +98,12 @@ EventScript_164065:: @ 8164065 return FiveIsland_RocketWarehouse_EventScript_164070:: @ 8164070 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_42, 0, Text_17B5D6, Text_17B62F + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_42, Text_17B5D6, Text_17B62F msgbox gUnknown_817B642, 6 end FiveIsland_RocketWarehouse_EventScript_164087:: @ 8164087 - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_TEAM_ROCKET_ADMIN, 0, Text_17B72D, Text_17B79C, EventScript_1640A2 + trainerbattle_single TRAINER_TEAM_ROCKET_ADMIN, Text_17B72D, Text_17B79C, EventScript_1640A2 msgbox gUnknown_817B7FA, 6 end @@ -113,36 +111,36 @@ EventScript_1640A2:: @ 81640A2 getplayerxy VAR_0x8004, VAR_0x8005 specialvar VAR_RESULT, GetPlayerFacingDirection compare VAR_RESULT, DIR_NORTH - call_if eq, EventScript_16412E + call_if_eq EventScript_16412E msgbox gUnknown_817B7AE closemessage compare VAR_0x8004, 24 - call_if le, EventScript_164144 + call_if_le EventScript_164144 compare VAR_0x8004, 25 - call_if eq, EventScript_16414F + call_if_eq EventScript_16414F compare VAR_0x8004, 26 - call_if eq, EventScript_16415A + call_if_eq EventScript_16415A compare VAR_0x8004, 27 - call_if eq, EventScript_16415A + call_if_eq EventScript_16415A playse SE_PIN call EventScript_163F47 special DrawWholeMapView waitse compare VAR_0x8004, 24 - call_if le, EventScript_164165 + call_if_le EventScript_164165 compare VAR_0x8004, 25 - call_if eq, EventScript_164165 + call_if_eq EventScript_164165 compare VAR_0x8004, 26 - call_if eq, EventScript_164165 + call_if_eq EventScript_164165 compare VAR_0x8004, 27 - call_if eq, EventScript_164170 + call_if_eq EventScript_164170 msgbox gUnknown_817B7FA release end EventScript_16412E:: @ 816412E compare VAR_0x8004, 27 - goto_if eq, EventScript_1A77A9 + goto_if_eq EventScript_1A77A9 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 return diff --git a/data/maps/FiveIsland_WaterLabyrinth/scripts.inc b/data/maps/FiveIsland_WaterLabyrinth/scripts.inc index def665782..605b05065 100644 --- a/data/maps/FiveIsland_WaterLabyrinth/scripts.inc +++ b/data/maps/FiveIsland_WaterLabyrinth/scripts.inc @@ -4,18 +4,16 @@ FiveIsland_WaterLabyrinth_MapScripts:: @ 816884D FiveIsland_WaterLabyrinth_EventScript_16884E:: @ 816884E special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 lock faceplayer - checkflag FLAG_GOT_TOGEPI_EGG - goto_if TRUE, EventScript_1688E3 - checkflag FLAG_NO_ROOM_FOR_TOGEPI_EGG - goto_if TRUE, EventScript_16892C + goto_if_set FLAG_GOT_TOGEPI_EGG, EventScript_1688E3 + goto_if_set FLAG_NO_ROOM_FOR_TOGEPI_EGG, EventScript_16892C msgbox gUnknown_818A80D specialvar VAR_RESULT, Special_GetLeadMonFriendship compare VAR_RESULT, 6 - goto_if eq, EventScript_1688AC + goto_if_eq EventScript_1688AC msgbox gUnknown_818A88F release end @@ -32,9 +30,9 @@ EventScript_1688AC:: @ 81688AC end EventScript_1688BA:: @ 81688BA - countpokemon - compare VAR_RESULT, 6 - goto_if eq, EventScript_16891F + getpartysize + compare VAR_RESULT, PARTY_SIZE + goto_if_eq EventScript_16891F setflag FLAG_GOT_TOGEPI_EGG giveegg SPECIES_TOGEPI textcolor 3 @@ -51,12 +49,12 @@ EventScript_1688E3:: @ 81688E3 setvar VAR_0x8004, SPECIES_TOGEPI specialvar VAR_RESULT, Special_PlayerPartyContainsSpeciesWithPlayerID compare VAR_RESULT, 1 - goto_if eq, EventScript_168895 + goto_if_eq EventScript_168895 getspeciesname 1, SPECIES_TOGETIC setvar VAR_0x8004, SPECIES_TOGETIC specialvar VAR_RESULT, Special_PlayerPartyContainsSpeciesWithPlayerID compare VAR_RESULT, 1 - goto_if eq, EventScript_168895 + goto_if_eq EventScript_168895 msgbox gUnknown_818A9C0 release end diff --git a/data/maps/FourIsland/scripts.inc b/data/maps/FourIsland/scripts.inc index 074e92f3f..890891c10 100644 --- a/data/maps/FourIsland/scripts.inc +++ b/data/maps/FourIsland/scripts.inc @@ -6,7 +6,7 @@ FourIsland_MapScripts:: @ 8167CAE FourIsland_OnTransition:: @ 8167CB9 setworldmapflag FLAG_WORLD_MAP_FOUR_ISLAND compare VAR_MAP_SCENE_FOUR_ISLAND, 0 - call_if eq, EventScript_167CCD + call_if_eq EventScript_167CCD call EventScript_167CD1 end @@ -15,8 +15,7 @@ EventScript_167CCD:: @ 8167CCD return EventScript_167CD1:: @ 8167CD1 - checkflag FLAG_PENDING_DAYCARE_EGG - goto_if FALSE, EventScript_167CE1 + goto_if_unset FLAG_PENDING_DAYCARE_EGG, EventScript_167CE1 setobjectxyperm 1, 16, 14 EventScript_167CE1:: @ 8167CE1 @@ -73,18 +72,18 @@ Movement_167D52:: @ 8167D52 FourIsland_EventScript_167D55:: @ 8167D55 special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 lock faceplayer special GetDaycareMonNicknames specialvar VAR_RESULT, GetDaycareState compare VAR_RESULT, 1 - goto_if eq, EventScript_167D9B + goto_if_eq EventScript_167D9B compare VAR_RESULT, 2 - goto_if eq, EventScript_167E0C + goto_if_eq EventScript_167E0C compare VAR_RESULT, 3 - goto_if eq, EventScript_167E19 + goto_if_eq EventScript_167E19 msgbox gUnknown_81BF555 release end @@ -92,10 +91,10 @@ FourIsland_EventScript_167D55:: @ 8167D55 EventScript_167D9B:: @ 8167D9B msgbox gUnknown_81BF5E3, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if eq, EventScript_167DD1 + goto_if_eq EventScript_167DD1 msgbox gUnknown_81BF7B6, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if eq, EventScript_167DD1 + goto_if_eq EventScript_167DD1 msgbox gUnknown_81BF6CF clearflag FLAG_PENDING_DAYCARE_EGG special RejectEggFromDayCare @@ -105,7 +104,7 @@ EventScript_167D9B:: @ 8167D9B EventScript_167DD1:: @ 8167DD1 specialvar VAR_RESULT, CalculatePlayerPartyCount compare VAR_RESULT, 6 - goto_if ne, EventScript_167DEB + goto_if_ne EventScript_167DEB msgbox gUnknown_81BF6F0 release end @@ -142,8 +141,7 @@ EventScript_167E19:: @ 8167E19 FourIsland_EventScript_167E2E:: @ 8167E2E lock faceplayer - checkflag FLAG_SYS_CAN_LINK_WITH_RS - goto_if TRUE, EventScript_167E43 + goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_167E43 msgbox gUnknown_8182A2B release end diff --git a/data/maps/FourIsland_IcefallCave_Back/scripts.inc b/data/maps/FourIsland_IcefallCave_Back/scripts.inc index a7bb1bade..54c60cb56 100644 --- a/data/maps/FourIsland_IcefallCave_Back/scripts.inc +++ b/data/maps/FourIsland_IcefallCave_Back/scripts.inc @@ -4,7 +4,7 @@ FourIsland_IcefallCave_Back_MapScripts:: @ 8163D82 FourIsland_IcefallCave_Back_OnTransition:: @ 8163D88 compare VAR_MAP_SCENE_ICEFALL_CAVE_BACK, 1 - call_if eq, EventScript_163D94 + call_if_eq EventScript_163D94 end EventScript_163D94:: @ 8163D94 @@ -46,7 +46,7 @@ FourIsland_IcefallCave_Back_EventScript_163D98:: @ 8163D98 textcolor 0 msgbox gUnknown_817B20B setvar VAR_LAST_TALKED, 4 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_TEAM_ROCKET_GRUNT_45, 0, Text_17B251 + trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_45, Text_17B251 applymovement 3, Movement_163F1B waitmovement 0 textcolor 1 diff --git a/data/maps/FourIsland_LoreleisHouse/scripts.inc b/data/maps/FourIsland_LoreleisHouse/scripts.inc index a2fa3215c..c39cc1da9 100644 --- a/data/maps/FourIsland_LoreleisHouse/scripts.inc +++ b/data/maps/FourIsland_LoreleisHouse/scripts.inc @@ -9,10 +9,8 @@ FourIsland_LoreleisHouse_OnTransition:: @ 8171C54 FourIsland_LoreleisHouse_EventScript_171C58:: @ 8171C58 lock faceplayer - checkflag FLAG_TALKED_TO_LORELEI_AFTER_WAREHOUSE - goto_if TRUE, EventScript_171C83 - checkflag FLAG_DEFEATED_ROCKETS_IN_WAREHOUSE - goto_if TRUE, EventScript_171C76 + goto_if_set FLAG_TALKED_TO_LORELEI_AFTER_WAREHOUSE, EventScript_171C83 + goto_if_set FLAG_DEFEATED_ROCKETS_IN_WAREHOUSE, EventScript_171C76 msgbox gUnknown_81A3826 release end diff --git a/data/maps/FourIsland_Mart/scripts.inc b/data/maps/FourIsland_Mart/scripts.inc index b2e3b5bb4..5074a4f39 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_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lock faceplayer message Text_MayIHelpYou diff --git a/data/maps/FourIsland_PokemonDayCare/scripts.inc b/data/maps/FourIsland_PokemonDayCare/scripts.inc index 18dcf65fa..3d5409e19 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_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lock faceplayer specialvar VAR_RESULT, GetDaycareState compare VAR_RESULT, 1 - goto_if eq, EventScript_171A2E + goto_if_eq EventScript_171A2E compare VAR_RESULT, 2 - goto_if eq, EventScript_171A52 + goto_if_eq EventScript_171A52 compare VAR_RESULT, 3 - goto_if eq, EventScript_171B86 + goto_if_eq EventScript_171B86 msgbox gUnknown_81BF7E4, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if eq, EventScript_171993 + goto_if_eq EventScript_171993 msgbox gUnknown_81BF916 release end @@ -24,16 +24,16 @@ FourIsland_PokemonDayCare_EventScript_171940:: @ 8171940 EventScript_171993:: @ 8171993 specialvar VAR_RESULT, CountPartyNonEggMons compare VAR_RESULT, 1 - goto_if eq, EventScript_171A1A + goto_if_eq EventScript_171A1A msgbox gUnknown_81BF839 fadescreen 1 special ChooseSendDaycareMon waitstate compare VAR_0x8004, 6 - goto_if ge, EventScript_1719F7 + goto_if_ge EventScript_1719F7 specialvar VAR_RESULT, CountPartyAliveNonEggMons_IgnoreVar0x8004Slot compare VAR_RESULT, 0 - goto_if eq, EventScript_171A24 + goto_if_eq EventScript_171A24 specialvar VAR_0x8005, GetSelectedMonNickAndSpecies waitse playmoncry VAR_0x8005, 0 @@ -43,7 +43,7 @@ EventScript_171993:: @ 8171993 incrementgamestat GAME_STAT_USED_DAYCARE specialvar VAR_RESULT, GetDaycareState compare VAR_RESULT, 2 - goto_if eq, EventScript_171A01 + goto_if_eq EventScript_171A01 release end @@ -55,7 +55,7 @@ EventScript_1719F7:: @ 81719F7 EventScript_171A01:: @ 8171A01 msgbox gUnknown_81BF89F, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if eq, EventScript_171993 + goto_if_eq EventScript_171993 goto EventScript_1719F7 end @@ -81,7 +81,7 @@ EventScript_171A38:: @ 8171A38 EventScript_171A41:: @ 8171A41 specialvar VAR_RESULT, GetNumLevelsGainedFromDaycare compare VAR_RESULT, 0 - call_if ne, EventScript_171A38 + call_if_ne EventScript_171A38 return EventScript_171A52:: @ 8171A52 @@ -90,26 +90,26 @@ EventScript_171A52:: @ 8171A52 call EventScript_171A41 msgbox gUnknown_81BF89F, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if eq, EventScript_171993 + goto_if_eq EventScript_171993 msgbox gUnknown_81BFAE8, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if eq, EventScript_171A90 + goto_if_eq EventScript_171A90 goto EventScript_1719F7 end EventScript_171A90:: @ 8171A90 specialvar VAR_RESULT, CalculatePlayerPartyCount compare VAR_RESULT, 6 - goto_if eq, EventScript_171B67 + goto_if_eq EventScript_171B67 specialvar VAR_RESULT, GetDaycareState setvar VAR_0x8004, 0 compare VAR_RESULT, 2 - goto_if eq, EventScript_171ACF + goto_if_eq EventScript_171ACF special ShowDaycareLevelMenu waitstate copyvar VAR_0x8004, VAR_RESULT compare VAR_RESULT, 2 - goto_if eq, EventScript_1719F7 + goto_if_eq EventScript_1719F7 goto EventScript_171ACF end @@ -117,14 +117,14 @@ EventScript_171ACF:: @ 8171ACF special GetDaycareCost msgbox gUnknown_81BFA3B, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if eq, EventScript_171AEB + goto_if_eq EventScript_171AEB goto EventScript_1719F7 end EventScript_171AEB:: @ 8171AEB specialvar VAR_RESULT, IsEnoughForCostInVar0x8005 compare VAR_RESULT, 1 - goto_if eq, EventScript_171B05 + goto_if_eq EventScript_171B05 msgbox gUnknown_81BF932 release end @@ -144,14 +144,14 @@ EventScript_171B05:: @ 8171B05 waitmoncry specialvar VAR_RESULT, GetDaycareState compare VAR_RESULT, 2 - goto_if eq, EventScript_171B4E + goto_if_eq EventScript_171B4E goto EventScript_1719F7 end EventScript_171B4E:: @ 8171B4E msgbox gUnknown_81BF94F, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if eq, EventScript_171A90 + goto_if_eq EventScript_171A90 goto EventScript_1719F7 end @@ -193,7 +193,7 @@ EventScript_171B86:: @ 8171B86 call EventScript_171A41 msgbox gUnknown_81BFAE8, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if eq, EventScript_171A90 + goto_if_eq EventScript_171A90 msgbox gUnknown_81BF976 release end @@ -202,7 +202,7 @@ EventScript_171BBF:: @ 8171BBF special ShowDaycareLevelMenu waitstate compare VAR_RESULT, 2 - goto_if eq, EventScript_1719F7 + goto_if_eq EventScript_1719F7 copyvar VAR_0x8004, VAR_RESULT specialvar VAR_RESULT, TakePokemonFromDaycare msgbox gUnknown_81BFA67 diff --git a/data/maps/FuchsiaCity/scripts.inc b/data/maps/FuchsiaCity/scripts.inc index 7f26b03f3..15c3330d7 100644 --- a/data/maps/FuchsiaCity/scripts.inc +++ b/data/maps/FuchsiaCity/scripts.inc @@ -4,10 +4,8 @@ FuchsiaCity_MapScripts:: @ 8166D75 FuchsiaCity_OnTransition:: @ 8166D7B setworldmapflag FLAG_WORLD_MAP_FUCHSIA_CITY - checkflag FLAG_GOT_DOME_FOSSIL - call_if TRUE, EventScript_166D91 - checkflag FLAG_GOT_DOME_FOSSIL - call_if FALSE, EventScript_166D97 + call_if_set FLAG_GOT_DOME_FOSSIL, EventScript_166D91 + call_if_unset FLAG_GOT_DOME_FOSSIL, EventScript_166D97 end EventScript_166D91:: @ 8166D91 @@ -121,8 +119,7 @@ FuchsiaCity_EventScript_166E83:: @ 8166E83 FuchsiaCity_EventScript_166E9C:: @ 8166E9C lockall - checkflag FLAG_GOT_DOME_FOSSIL - goto_if TRUE, EventScript_166EBE + goto_if_set FLAG_GOT_DOME_FOSSIL, EventScript_166EBE setvar VAR_0x8004, SPECIES_KABUTO special Special_SetSeenMon drawmonpic SPECIES_KABUTO, 10, 3 diff --git a/data/maps/FuchsiaCity_Building1/scripts.inc b/data/maps/FuchsiaCity_Building1/scripts.inc index f4c0c1625..f0d1e1a01 100644 --- a/data/maps/FuchsiaCity_Building1/scripts.inc +++ b/data/maps/FuchsiaCity_Building1/scripts.inc @@ -4,15 +4,13 @@ FuchsiaCity_Building1_MapScripts:: @ 816D74B FuchsiaCity_Building1_EventScript_16D74C:: @ 816D74C lock faceplayer - checkflag FLAG_GOT_HM04 - goto_if TRUE, EventScript_16D7FA - checkflag FLAG_HIDE_SAFARI_ZONE_WEST_GOLD_TEETH - goto_if TRUE, EventScript_16D780 + goto_if_set FLAG_GOT_HM04, EventScript_16D7FA + goto_if_set FLAG_HIDE_SAFARI_ZONE_WEST_GOLD_TEETH, EventScript_16D780 msgbox gUnknown_8198DF9, MSGBOX_YESNO compare VAR_RESULT, 1 - call_if eq, EventScript_16D7E8 + call_if_eq EventScript_16D7E8 compare VAR_RESULT, 0 - call_if eq, EventScript_16D7F1 + call_if_eq EventScript_16D7F1 release end @@ -26,11 +24,10 @@ EventScript_16D780:: @ 816D780 call EventScript_1A6675 checkplayergender compare VAR_RESULT, 0 - call_if eq, EventScript_16D7D6 + call_if_eq EventScript_16D7D6 compare VAR_RESULT, 1 - call_if eq, EventScript_16D7DF - additem ITEM_HM04, 1 - giveitemfanfaremsg gUnknown_8199068, ITEM_HM04 + call_if_eq EventScript_16D7DF + giveitem_msg gUnknown_8199068, ITEM_HM04 setflag FLAG_GOT_HM04 removeitem ITEM_GOLD_TEETH, 1 release diff --git a/data/maps/FuchsiaCity_Gym/scripts.inc b/data/maps/FuchsiaCity_Gym/scripts.inc index 21bb1e306..38e4190ce 100644 --- a/data/maps/FuchsiaCity_Gym/scripts.inc +++ b/data/maps/FuchsiaCity_Gym/scripts.inc @@ -3,9 +3,8 @@ FuchsiaCity_Gym_MapScripts:: @ 816D54D FuchsiaCity_Gym_EventScript_16D54E:: @ 816D54E famechecker FAMECHECKER_KOGA, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC, TRAINER_LEADER_KOGA, 0, Text_19832E, Text_198444, EventScript_16D580 - checkflag FLAG_GOT_TM06_FROM_KOGA - goto_if FALSE, EventScript_16D5A6 + trainerbattle_single TRAINER_LEADER_KOGA, Text_19832E, Text_198444, EventScript_16D580, NO_MUSIC + goto_if_unset FLAG_GOT_TM06_FROM_KOGA, EventScript_16D5A6 msgbox gUnknown_8198481 release end @@ -23,9 +22,8 @@ EventScript_16D5A6:: @ 816D5A6 msgbox gUnknown_819850E checkitemspace ITEM_TM06, 1 compare VAR_RESULT, 0 - goto_if eq, EventScript_16D5E7 - additem ITEM_TM06, 1 - giveitemfanfaremsg gUnknown_819858F, ITEM_TM06 + goto_if_eq EventScript_16D5E7 + giveitem_msg gUnknown_819858F, ITEM_TM06 setflag FLAG_GOT_TM06_FROM_KOGA msgbox gUnknown_81985AB release @@ -37,41 +35,40 @@ EventScript_16D5E7:: @ 816D5E7 end FuchsiaCity_Gym_EventScript_16D5F1:: @ 816D5F1 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TAMER_PHIL, 0, Text_198866, Text_1988B6 + trainerbattle_single TRAINER_TAMER_PHIL, Text_198866, Text_1988B6 msgbox gUnknown_81988CB, 6 end FuchsiaCity_Gym_EventScript_16D608:: @ 816D608 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TAMER_EDGAR, 0, Text_19891F, Text_19897F + trainerbattle_single TRAINER_TAMER_EDGAR, Text_19891F, Text_19897F msgbox gUnknown_8198985, 6 end FuchsiaCity_Gym_EventScript_16D61F:: @ 816D61F - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_JUGGLER_KIRK, 0, Text_19871E, Text_198779 + trainerbattle_single TRAINER_JUGGLER_KIRK, Text_19871E, Text_198779 famechecker FAMECHECKER_KOGA, 2 msgbox gUnknown_8198787, 6 end FuchsiaCity_Gym_EventScript_16D643:: @ 816D643 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_JUGGLER_SHAWN, 0, Text_1989A1, Text_1989EA + trainerbattle_single TRAINER_JUGGLER_SHAWN, Text_1989A1, Text_1989EA msgbox gUnknown_8198A10, 6 end FuchsiaCity_Gym_EventScript_16D65A:: @ 816D65A - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_JUGGLER_KAYDEN, 0, Text_198629, Text_1986B4 + trainerbattle_single TRAINER_JUGGLER_KAYDEN, Text_198629, Text_1986B4 msgbox gUnknown_81986C9, 6 end FuchsiaCity_Gym_EventScript_16D671:: @ 816D671 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_JUGGLER_NATE, 0, Text_1987E8, Text_198812 + trainerbattle_single TRAINER_JUGGLER_NATE, Text_1987E8, Text_198812 msgbox gUnknown_8198825, 6 end FuchsiaCity_Gym_EventScript_16D688:: @ 816D688 lock faceplayer - checkflag FLAG_DEFEATED_KOGA - goto_if TRUE, EventScript_16D69D + goto_if_set FLAG_DEFEATED_KOGA, EventScript_16D69D msgbox gUnknown_8198A5E release end @@ -83,8 +80,7 @@ EventScript_16D69D:: @ 816D69D FuchsiaCity_Gym_EventScript_16D6A7:: @ 816D6A7 lockall - checkflag FLAG_BADGE05_GET - goto_if TRUE, EventScript_16D6BB + goto_if_set FLAG_BADGE05_GET, EventScript_16D6BB msgbox gUnknown_8198B4B releaseall end diff --git a/data/maps/FuchsiaCity_House2/scripts.inc b/data/maps/FuchsiaCity_House2/scripts.inc index e8116fc69..d0f842a0e 100644 --- a/data/maps/FuchsiaCity_House2/scripts.inc +++ b/data/maps/FuchsiaCity_House2/scripts.inc @@ -4,11 +4,10 @@ FuchsiaCity_House2_MapScripts:: @ 816D816 FuchsiaCity_House2_EventScript_16D817:: @ 816D817 lock faceplayer - checkflag FLAG_GOT_GOOD_ROD - goto_if TRUE, EventScript_16D83F + goto_if_set FLAG_GOT_GOOD_ROD, EventScript_16D83F msgbox gUnknown_819918E, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if eq, EventScript_16D849 + goto_if_eq EventScript_16D849 msgbox gUnknown_8199337 release end @@ -22,9 +21,8 @@ EventScript_16D849:: @ 816D849 msgbox gUnknown_8199207 checkitemspace ITEM_GOOD_ROD, 1 compare VAR_RESULT, 0 - goto_if eq, EventScript_16D88A - additem ITEM_GOOD_ROD, 1 - giveitemfanfaremsg gUnknown_819925E, ITEM_GOOD_ROD + goto_if_eq EventScript_16D88A + giveitem_msg gUnknown_819925E, ITEM_GOOD_ROD msgbox gUnknown_8199296 setflag FLAG_GOT_GOOD_ROD release diff --git a/data/maps/FuchsiaCity_House3/scripts.inc b/data/maps/FuchsiaCity_House3/scripts.inc index 058fc44f6..99af39686 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_RESULT, 1 - goto_if eq, EventScript_16D8B0 + goto_if_eq EventScript_16D8B0 goto EventScript_16D941 end @@ -15,23 +15,23 @@ EventScript_16D8B0:: @ 816D8B0 special Special_ChooseMonFromParty waitstate compare VAR_0x8004, 6 - goto_if ge, EventScript_16D941 + goto_if_ge EventScript_16D941 special IsSelectedMonEgg compare VAR_RESULT, 1 - goto_if eq, EventScript_16D937 + goto_if_eq EventScript_16D937 special ScrSpecial_CountPokemonMoves compare VAR_RESULT, 1 - goto_if eq, EventScript_16D92A + goto_if_eq EventScript_16D92A msgbox gUnknown_8199445 fadescreen 1 special SelectMove fadescreen 0 compare VAR_0x8005, 4 - goto_if eq, EventScript_16D8B0 + goto_if_eq EventScript_16D8B0 special ScrSpecial_GetPokemonNicknameAndMoveName msgbox gUnknown_8199485, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if eq, EventScript_16D919 + goto_if_eq EventScript_16D919 goto EventScript_16D941 end diff --git a/data/maps/FuchsiaCity_Mart/scripts.inc b/data/maps/FuchsiaCity_Mart/scripts.inc index 824cdefe7..85390e4a0 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_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lock faceplayer message Text_MayIHelpYou diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc index 2ec411238..f04639875 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_RESULT, 0 - goto_if eq, EventScript_16D345 + goto_if_eq EventScript_16D345 msgbox gUnknown_8197E48 closemessage applymovement OBJ_EVENT_ID_PLAYER, Movement_16D362 @@ -103,7 +103,7 @@ EventScript_16D391:: @ 816D391 showmoneybox 0, 0, 0 msgbox gUnknown_8197C87, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if eq, EventScript_16D3CA + goto_if_eq EventScript_16D3CA msgbox gUnknown_8197DE9 goto EventScript_16D49A end @@ -112,7 +112,7 @@ EventScript_16D3CA:: @ 816D3CA call EventScript_16D462 checkmoney 500, 0 compare VAR_RESULT, 0 - goto_if eq, EventScript_16D48C + goto_if_eq EventScript_16D48C takemoney 500, 0 updatemoneybox 0, 0, 0 msgbox gUnknown_8197D07 @@ -125,11 +125,11 @@ EventScript_16D3CA:: @ 816D3CA closemessage hidemoneybox 0, 0 compare VAR_TEMP_2, 0 - call_if eq, EventScript_16D44C + call_if_eq EventScript_16D44C compare VAR_TEMP_2, 1 - call_if eq, EventScript_16D441 + call_if_eq EventScript_16D441 compare VAR_TEMP_2, 2 - call_if eq, EventScript_16D457 + call_if_eq EventScript_16D457 special EnterSafariMode setvar VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 2 warp MAP_SAFARI_ZONE_CENTER, 255, 26, 30 @@ -152,12 +152,12 @@ EventScript_16D457:: @ 816D457 return EventScript_16D462:: @ 816D462 - countpokemon - compare VAR_RESULT, 6 - goto_if ne, EventScript_1A77A9 + getpartysize + compare VAR_RESULT, PARTY_SIZE + goto_if_ne EventScript_1A77A9 specialvar VAR_RESULT, Special_IsThereRoomInAnyBoxForMorePokemon compare VAR_RESULT, 1 - goto_if eq, EventScript_1A77A9 + goto_if_eq EventScript_1A77A9 msgbox gUnknown_81BFEAC goto EventScript_16D49A end @@ -201,7 +201,7 @@ FuchsiaCity_SafariZone_Entrance_EventScript_16D4B7:: @ 816D4B7 faceplayer msgbox gUnknown_8197EB0, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if eq, EventScript_16D4D6 + goto_if_eq EventScript_16D4D6 msgbox gUnknown_819809E release end diff --git a/data/maps/IndigoPlateau_Exterior/scripts.inc b/data/maps/IndigoPlateau_Exterior/scripts.inc index a24aa524a..bc9827037 100644 --- a/data/maps/IndigoPlateau_Exterior/scripts.inc +++ b/data/maps/IndigoPlateau_Exterior/scripts.inc @@ -6,7 +6,7 @@ IndigoPlateau_Exterior_MapScripts:: @ 816723B IndigoPlateau_Exterior_OnTransition:: @ 8167246 setworldmapflag FLAG_WORLD_MAP_INDIGO_PLATEAU_EXTERIOR compare VAR_MAP_SCENE_INDIGO_PLATEAU_EXTERIOR, 1 - call_if eq, EventScript_IndigoPlateau_Exterior_PlayCreditsMusic + call_if_eq EventScript_IndigoPlateau_Exterior_PlayCreditsMusic end EventScript_IndigoPlateau_Exterior_PlayCreditsMusic:: @ 8167255 diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc b/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc index 00a11018f..09647da0b 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc +++ b/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc @@ -7,12 +7,11 @@ IndigoPlateau_PokemonCenter_1F_OnTransition:: @ 816EA65 setrespawn SPAWN_INDIGO_PLATEAU specialvar VAR_RESULT, IsNationalPokedexEnabled compare VAR_RESULT, 1 - call_if eq, EventScript_16EA79 + call_if_eq EventScript_16EA79 end EventScript_16EA79:: @ 816EA79 - checkflag FLAG_SYS_CAN_LINK_WITH_RS - goto_if TRUE, EventScript_1A77A9 + goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_1A77A9 setobjectxyperm 4, 4, 2 return @@ -21,14 +20,13 @@ IndigoPlateau_PokemonCenter_1F_EventScript_16EA8A:: @ 816EA8A faceplayer specialvar VAR_RESULT, IsNationalPokedexEnabled compare VAR_RESULT, 1 - goto_if eq, EventScript_16EAA6 + goto_if_eq EventScript_16EAA6 msgbox gUnknown_819A8D8 release end EventScript_16EAA6:: @ 816EAA6 - checkflag FLAG_SYS_CAN_LINK_WITH_RS - goto_if TRUE, EventScript_16EAB9 + goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_16EAB9 msgbox gUnknown_819A943 release end @@ -45,7 +43,7 @@ IndigoPlateau_PokemonCenter_1F_EventScript_16EAC3:: @ 816EAC3 IndigoPlateau_PokemonCenter_1F_EventScript_16EACC:: @ 816EACC special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lock faceplayer message Text_MayIHelpYou diff --git a/data/maps/LavenderTown/scripts.inc b/data/maps/LavenderTown/scripts.inc index 7cbba172b..97c308549 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_RESULT, 1 - goto_if eq, EventScript_16689C + goto_if_eq EventScript_16689C msgbox gUnknown_817F568 release end diff --git a/data/maps/LavenderTown_House1/scripts.inc b/data/maps/LavenderTown_House1/scripts.inc index 2469d4503..d57871971 100644 --- a/data/maps/LavenderTown_House1/scripts.inc +++ b/data/maps/LavenderTown_House1/scripts.inc @@ -4,8 +4,7 @@ LavenderTown_House1_MapScripts:: @ 816B232 LavenderTown_House1_EventScript_16B233:: @ 816B233 lock faceplayer - checkflag FLAG_RESCUED_MR_FUJI - goto_if TRUE, EventScript_16B248 + goto_if_set FLAG_RESCUED_MR_FUJI, EventScript_16B248 msgbox gUnknown_819397D release end diff --git a/data/maps/LavenderTown_House2/scripts.inc b/data/maps/LavenderTown_House2/scripts.inc index 3b5cd8d4c..21cbd52db 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_RESULT, 1 - goto_if eq, EventScript_16B287 + goto_if_eq EventScript_16B287 compare VAR_RESULT, 0 - goto_if eq, EventScript_16B2AA + goto_if_eq EventScript_16B2AA end EventScript_16B287:: @ 816B287 @@ -16,9 +16,9 @@ EventScript_16B287:: @ 816B287 special Special_ChooseMonFromParty waitstate compare VAR_0x8004, 6 - goto_if lt, EventScript_16B2B4 + goto_if_lt EventScript_16B2B4 compare VAR_0x8004, 6 - goto_if ge, EventScript_16B2AA + goto_if_ge EventScript_16B2AA end EventScript_16B2AA:: @ 816B2AA @@ -29,20 +29,20 @@ EventScript_16B2AA:: @ 816B2AA EventScript_16B2B4:: @ 816B2B4 specialvar VAR_RESULT, Special_GetSpeciesOfPartySlot_x8004 compare VAR_RESULT, SPECIES_EGG - goto_if eq, EventScript_16B307 + goto_if_eq EventScript_16B307 special TV_CopyNicknameToStringVar1AndEnsureTerminated special TV_CheckMonOTIDEqualsPlayerID compare VAR_RESULT, 1 - goto_if eq, EventScript_16B311 + goto_if_eq EventScript_16B311 specialvar VAR_RESULT, Special_BufferMonOTNameAndCompareToPlayerName special TV_CopyNicknameToStringVar1AndEnsureTerminated compare VAR_RESULT, 1 - goto_if eq, EventScript_16B311 + goto_if_eq EventScript_16B311 msgbox gUnknown_8193AD2, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if eq, EventScript_16B31B + goto_if_eq EventScript_16B31B compare VAR_RESULT, 0 - goto_if eq, EventScript_16B2AA + goto_if_eq EventScript_16B2AA end EventScript_16B307:: @ 816B307 @@ -61,7 +61,7 @@ EventScript_16B31B:: @ 816B31B specialvar VAR_RESULT, NameRaterWasNicknameChanged special TV_CopyNicknameToStringVar1AndEnsureTerminated compare VAR_RESULT, 1 - goto_if eq, EventScript_16B345 + goto_if_eq EventScript_16B345 msgbox gUnknown_8193BF0 release end diff --git a/data/maps/LavenderTown_Mart/scripts.inc b/data/maps/LavenderTown_Mart/scripts.inc index 47c1b2df8..a09858f03 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_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lock faceplayer message Text_MayIHelpYou diff --git a/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc b/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc index 328ba64de..a8c35b814 100644 --- a/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc +++ b/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc @@ -4,15 +4,13 @@ LavenderTown_VolunteerPokemonHouse_MapScripts:: @ 816B149 LavenderTown_VolunteerPokemonHouse_EventScript_16B14A:: @ 816B14A lock faceplayer - checkflag FLAG_GOT_POKE_FLUTE - goto_if TRUE, EventScript_16B196 + goto_if_set FLAG_GOT_POKE_FLUTE, EventScript_16B196 msgbox gUnknown_81936FF checkitemspace ITEM_POKE_FLUTE, 1 compare VAR_RESULT, 0 - goto_if eq, EventScript_16B1A0 + goto_if_eq EventScript_16B1A0 setflag FLAG_GOT_POKE_FLUTE - additem ITEM_POKE_FLUTE, 1 - giveitemfanfaremsg gUnknown_81937BD, ITEM_POKE_FLUTE, 1, MUS_FAN5 + giveitem_msg gUnknown_81937BD, ITEM_POKE_FLUTE, 1, MUS_FAN5 msgbox gUnknown_81937E5 release end @@ -42,8 +40,7 @@ LavenderTown_VolunteerPokemonHouse_EventScript_16B1C3:: @ 816B1C3 LavenderTown_VolunteerPokemonHouse_EventScript_16B1CC:: @ 816B1CC lock faceplayer - checkflag FLAG_RESCUED_MR_FUJI - goto_if TRUE, EventScript_16B1E1 + goto_if_set FLAG_RESCUED_MR_FUJI, EventScript_16B1E1 msgbox gUnknown_81935ED release end diff --git a/data/maps/MtEmber_Exterior/scripts.inc b/data/maps/MtEmber_Exterior/scripts.inc index 44ca7e479..00209f3c9 100644 --- a/data/maps/MtEmber_Exterior/scripts.inc +++ b/data/maps/MtEmber_Exterior/scripts.inc @@ -6,7 +6,7 @@ MtEmber_Exterior_MapScripts:: @ 8163946 MtEmber_Exterior_OnTransition:: @ 8163951 setworldmapflag FLAG_WORLD_MAP_MT_EMBER_EXTERIOR compare VAR_MAP_SCENE_MT_EMBER_EXTERIOR, 2 - call_if eq, EventScript_163960 + call_if_eq EventScript_163960 end EventScript_163960:: @ 8163960 @@ -16,7 +16,7 @@ EventScript_163960:: @ 8163960 MtEmber_Exterior_OnLoad:: @ 8163969 compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4 - call_if ge, EventScript_163975 + call_if_ge EventScript_163975 end EventScript_163975:: @ 8163975 @@ -26,9 +26,9 @@ EventScript_163975:: @ 8163975 MtEmber_Exterior_EventScript_16397F:: @ 816397F lock checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_43 - goto_if eq, EventScript_16399E + goto_if_eq EventScript_16399E compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4 - goto_if eq, EventScript_1639A8 + goto_if_eq EventScript_1639A8 msgbox gUnknown_817A82A release end @@ -43,10 +43,10 @@ EventScript_1639A8:: @ 81639A8 waitmovement 0 playbgm MUS_ROCKET, 0 msgbox gUnknown_817AA06 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_TEAM_ROCKET_GRUNT_43, 0, Text_17AA34 + trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_43, Text_17AA34 msgbox gUnknown_817AA3F checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_44 - goto_if eq, EventScript_1639DB + goto_if_eq EventScript_1639DB release end @@ -64,9 +64,9 @@ MtEmber_Exterior_EventScript_1639F0:: @ 81639F0 lock faceplayer checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_44 - goto_if eq, EventScript_163A1B + goto_if_eq EventScript_163A1B compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4 - goto_if eq, EventScript_163A25 + goto_if_eq EventScript_163A25 msgbox gUnknown_817A88C closemessage applymovement 3, Movement_FaceOriginalDirection @@ -82,10 +82,10 @@ EventScript_163A1B:: @ 8163A1B EventScript_163A25:: @ 8163A25 playbgm MUS_ROCKET, 0 msgbox gUnknown_817AA56 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_TEAM_ROCKET_GRUNT_44, 0, Text_17AA8A + trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_44, Text_17AA8A msgbox gUnknown_817AA99 checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_43 - goto_if eq, EventScript_1639DB + goto_if_eq EventScript_1639DB release end @@ -116,16 +116,16 @@ MtEmber_Exterior_EventScript_163A4E:: @ 8163A4E end MtEmber_Exterior_EventScript_163AB4:: @ 8163AB4 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PKMN_RANGER_LOGAN, 0, Text_17AB73, Text_17ABAA + trainerbattle_single TRAINER_PKMN_RANGER_LOGAN, Text_17AB73, Text_17ABAA msgbox gUnknown_817ABD8, 6 end MtEmber_Exterior_EventScript_163ACB:: @ 8163ACB - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PKMN_RANGER_BETH, 0, Text_17AC55, Text_17AC82 + trainerbattle_single TRAINER_PKMN_RANGER_BETH, Text_17AC55, Text_17AC82 msgbox gUnknown_817ACA2, 6 end MtEmber_Exterior_EventScript_163AE2:: @ 8163AE2 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CRUSH_GIRL_JOCELYN, 0, Text_17AD06, Text_17AD6B + trainerbattle_single TRAINER_CRUSH_GIRL_JOCELYN, Text_17AD06, Text_17AD6B msgbox gUnknown_817AD89, 6 end diff --git a/data/maps/MtEmber_RubyPath_B3F/scripts.inc b/data/maps/MtEmber_RubyPath_B3F/scripts.inc index 17d276620..59fb37bf3 100644 --- a/data/maps/MtEmber_RubyPath_B3F/scripts.inc +++ b/data/maps/MtEmber_RubyPath_B3F/scripts.inc @@ -7,7 +7,6 @@ MtEmber_RubyPath_B5F_EventScript_163C49:: @ 8163C49 faceplayer setflag FLAG_GOT_RUBY removeobject 1 - additem ITEM_RUBY, 1 - giveitemfanfaremsg gUnknown_817ADC5, ITEM_RUBY, 1, MUS_FAN5 + giveitem_msg gUnknown_817ADC5, ITEM_RUBY, 1, MUS_FAN5 release end diff --git a/data/maps/MtEmber_Summit/scripts.inc b/data/maps/MtEmber_Summit/scripts.inc index 102fa72a5..45d2f76e0 100644 --- a/data/maps/MtEmber_Summit/scripts.inc +++ b/data/maps/MtEmber_Summit/scripts.inc @@ -4,20 +4,18 @@ MtEmber_Summit_MapScripts:: @ 8163AFC .byte 0 MtEmber_Summit_OnResume:: @ 8163B07 - checkflag FLAG_SYS_SPECIAL_WILD_BATTLE - call_if TRUE, EventScript_163B11 + call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, EventScript_163B11 end EventScript_163B11:: @ 8163B11 specialvar VAR_RESULT, Special_GetBattleOutcome compare VAR_RESULT, B_OUTCOME_CAUGHT - goto_if ne, EventScript_1A77A9 + goto_if_ne EventScript_1A77A9 removeobject VAR_LAST_TALKED return MtEmber_Summit_OnTransition:: @ 8163B25 - checkflag FLAG_FOUGHT_MOLTRES - call_if FALSE, EventScript_163B2F + call_if_unset FLAG_FOUGHT_MOLTRES, EventScript_163B2F end EventScript_163B2F:: @ 8163B2F @@ -27,7 +25,7 @@ EventScript_163B2F:: @ 8163B2F MtEmber_Summit_EventScript_163B33:: @ 8163B33 special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 lock faceplayer @@ -46,11 +44,11 @@ MtEmber_Summit_EventScript_163B33:: @ 8163B33 clearflag FLAG_SYS_SPECIAL_WILD_BATTLE specialvar VAR_RESULT, Special_GetBattleOutcome compare VAR_RESULT, B_OUTCOME_WON - goto_if eq, EventScript_163B96 + goto_if_eq EventScript_163B96 compare VAR_RESULT, B_OUTCOME_RAN - goto_if eq, EventScript_163B9F + goto_if_eq EventScript_163B9F compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED - goto_if eq, EventScript_163B9F + goto_if_eq EventScript_163B9F setflag FLAG_FOUGHT_MOLTRES release end diff --git a/data/maps/MtMoon_1F/scripts.inc b/data/maps/MtMoon_1F/scripts.inc index f2c50be17..b4506a56c 100644 --- a/data/maps/MtMoon_1F/scripts.inc +++ b/data/maps/MtMoon_1F/scripts.inc @@ -11,36 +11,36 @@ MtMoon_1F_EventScript_1605EE:: @ 81605EE end MtMoon_1F_EventScript_1605F7:: @ 81605F7 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_MARCOS, 0, Text_17279D, Text_1727CB + trainerbattle_single TRAINER_HIKER_MARCOS, Text_17279D, Text_1727CB msgbox gUnknown_81727DF, 6 end MtMoon_1F_EventScript_16060E:: @ 816060E - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_YOUNGSTER_JOSH, 0, Text_17281D, Text_172844 + trainerbattle_single TRAINER_YOUNGSTER_JOSH, Text_17281D, Text_172844 msgbox gUnknown_8172863, 6 end MtMoon_1F_EventScript_160625:: @ 8160625 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_MIRIAM, 0, Text_172896, Text_1728C3 + trainerbattle_single TRAINER_LASS_MIRIAM, Text_172896, Text_1728C3 msgbox gUnknown_81728D2, 6 end MtMoon_1F_EventScript_16063C:: @ 816063C - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_IRIS, 0, Text_172972, Text_1729A4 + trainerbattle_single TRAINER_LASS_IRIS, Text_172972, Text_1729A4 msgbox gUnknown_81729AC, 6 end MtMoon_1F_EventScript_160653:: @ 8160653 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SUPER_NERD_JOVAN, 0, Text_17290B, Text_172927 + trainerbattle_single TRAINER_SUPER_NERD_JOVAN, Text_17290B, Text_172927 msgbox gUnknown_817293C, 6 end MtMoon_1F_EventScript_16066A:: @ 816066A - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BUG_CATCHER_KENT, 0, Text_1729EA, Text_172A1A + trainerbattle_single TRAINER_BUG_CATCHER_KENT, Text_1729EA, Text_172A1A msgbox gUnknown_8172A26, 6 end MtMoon_1F_EventScript_160681:: @ 8160681 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BUG_CATCHER_ROBBY, 0, Text_172A55, Text_172A8F + trainerbattle_single TRAINER_BUG_CATCHER_ROBBY, Text_172A55, Text_172A8F msgbox gUnknown_8172A97, 6 end diff --git a/data/maps/MtMoon_B2F/scripts.inc b/data/maps/MtMoon_B2F/scripts.inc index 3d2e317e2..cb37f0cbf 100644 --- a/data/maps/MtMoon_B2F/scripts.inc +++ b/data/maps/MtMoon_B2F/scripts.inc @@ -3,8 +3,7 @@ MtMoon_B2F_MapScripts:: @ 8160699 .byte 0 MtMoon_B2F_OnTransition:: @ 816069F - checkflag FLAG_GOT_FOSSIL_FROM_MT_MOON - call_if FALSE, EventScript_1606A9 + call_if_unset FLAG_GOT_FOSSIL_FROM_MT_MOON, EventScript_1606A9 end EventScript_1606A9:: @ 81606A9 @@ -23,10 +22,9 @@ MtMoon_B2F_EventScript_1606B0:: @ 81606B0 MtMoon_B2F_EventScript_1606C2:: @ 81606C2 lock faceplayer - checkflag FLAG_GOT_FOSSIL_FROM_MT_MOON - goto_if TRUE, EventScript_160707 + goto_if_set FLAG_GOT_FOSSIL_FROM_MT_MOON, EventScript_160707 checktrainerflag TRAINER_SUPER_NERD_MIGUEL - goto_if eq, EventScript_160711 + goto_if_eq EventScript_160711 call EventScript_1606DD release end @@ -38,7 +36,7 @@ EventScript_1606DD:: @ 81606DD playbgm MUS_EXEYE, 0 waitbuttonpress setvar VAR_LAST_TALKED, 3 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_SUPER_NERD_MIGUEL, 0, Text_172B99 + trainerbattle_no_intro TRAINER_SUPER_NERD_MIGUEL, Text_172B99 setvar VAR_MAP_SCENE_MT_MOON_B2F, 1 msgbox gUnknown_8172BAB return @@ -58,10 +56,9 @@ MtMoon_B2F_EventScript_16071B:: @ 816071B faceplayer msgbox gUnknown_8172E77, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_1607DE + goto_if_eq EventScript_1607DE removeobject 1 - additem ITEM_DOME_FOSSIL, 1 - giveitemfanfaremsg gUnknown_8172ECD, ITEM_DOME_FOSSIL, 1, MUS_FAN5 + giveitem_msg gUnknown_8172ECD, ITEM_DOME_FOSSIL, 1, MUS_FAN5 closemessage special sub_8112364 delay 10 @@ -91,10 +88,9 @@ MtMoon_B2F_EventScript_16077F:: @ 816077F faceplayer msgbox gUnknown_8172E94, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_1607DE + goto_if_eq EventScript_1607DE removeobject 2 - additem ITEM_HELIX_FOSSIL, 1 - giveitemfanfaremsg gUnknown_8172EB2, ITEM_HELIX_FOSSIL, 1, MUS_FAN5 + giveitem_msg gUnknown_8172EB2, ITEM_HELIX_FOSSIL, 1, MUS_FAN5 closemessage special sub_8112364 delay 10 @@ -123,21 +119,21 @@ Movement_1607E0:: @ 81607E0 step_end MtMoon_B2F_EventScript_1607E4:: @ 81607E4 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT, 0, Text_172C5A, Text_172CB8 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT, Text_172C5A, Text_172CB8 msgbox gUnknown_8172CCB, 6 end MtMoon_B2F_EventScript_1607FB:: @ 81607FB - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_2, 0, Text_172CFC, Text_172D46 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_2, Text_172CFC, Text_172D46 msgbox gUnknown_8172D51, 6 end MtMoon_B2F_EventScript_160812:: @ 8160812 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_3, 0, Text_172D82, Text_172DAF + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_3, Text_172D82, Text_172DAF msgbox gUnknown_8172DC1, 6 end MtMoon_B2F_EventScript_160829:: @ 8160829 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_4, 0, Text_172DF0, Text_172E3E + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_4, Text_172DF0, Text_172E3E msgbox gUnknown_8172E4B, 6 end diff --git a/data/maps/NavelRock_Base/scripts.inc b/data/maps/NavelRock_Base/scripts.inc index 86981b393..a013d6707 100644 --- a/data/maps/NavelRock_Base/scripts.inc +++ b/data/maps/NavelRock_Base/scripts.inc @@ -4,10 +4,8 @@ NavelRock_Base_MapScripts:: @ 81650E7 .byte 0 NavelRock_Base_OnTransition:: @ 81650F2 - checkflag FLAG_FOUGHT_LUGIA - call_if TRUE, EventScript_165105 - checkflag FLAG_FOUGHT_LUGIA - call_if FALSE, EventScript_165109 + call_if_set FLAG_FOUGHT_LUGIA, EventScript_165105 + call_if_unset FLAG_FOUGHT_LUGIA, EventScript_165109 end EventScript_165105:: @ 8165105 @@ -15,27 +13,25 @@ EventScript_165105:: @ 8165105 return EventScript_165109:: @ 8165109 - checkflag FLAG_LUGIA_FLEW_AWAY - goto_if TRUE, EventScript_1A77A9 + goto_if_set FLAG_LUGIA_FLEW_AWAY, EventScript_1A77A9 clearflag FLAG_HIDE_LUGIA return NavelRock_Base_OnResume:: @ 8165116 - checkflag FLAG_SYS_SPECIAL_WILD_BATTLE - call_if TRUE, EventScript_165120 + call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, EventScript_165120 end EventScript_165120:: @ 8165120 specialvar VAR_RESULT, Special_GetBattleOutcome compare VAR_RESULT, B_OUTCOME_CAUGHT - goto_if ne, EventScript_1A77A9 + goto_if_ne EventScript_1A77A9 removeobject 1 return NavelRock_Base_EventScript_165134:: @ 8165134 special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 lock faceplayer @@ -70,11 +66,11 @@ NavelRock_Base_EventScript_165134:: @ 8165134 clearflag FLAG_SYS_SPECIAL_WILD_BATTLE specialvar VAR_RESULT, Special_GetBattleOutcome compare VAR_RESULT, B_OUTCOME_WON - goto_if eq, EventScript_1651D9 + goto_if_eq EventScript_1651D9 compare VAR_RESULT, B_OUTCOME_RAN - goto_if eq, EventScript_1651E7 + goto_if_eq EventScript_1651E7 compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED - goto_if eq, EventScript_1651E7 + goto_if_eq EventScript_1651E7 setflag FLAG_FOUGHT_LUGIA release end diff --git a/data/maps/NavelRock_Summit/scripts.inc b/data/maps/NavelRock_Summit/scripts.inc index 065fdfa42..0f6f7ec04 100644 --- a/data/maps/NavelRock_Summit/scripts.inc +++ b/data/maps/NavelRock_Summit/scripts.inc @@ -4,10 +4,8 @@ NavelRock_Summit_MapScripts:: @ 8164F9F .byte 0 NavelRock_Summit_OnTransition:: @ 8164FAA - checkflag FLAG_FOUGHT_HO_OH - call_if TRUE, EventScript_164FBD - checkflag FLAG_FOUGHT_HO_OH - call_if FALSE, EventScript_164FC6 + call_if_set FLAG_FOUGHT_HO_OH, EventScript_164FBD + call_if_unset FLAG_FOUGHT_HO_OH, EventScript_164FC6 end EventScript_164FBD:: @ 8164FBD @@ -17,28 +15,26 @@ EventScript_164FBD:: @ 8164FBD EventScript_164FC6:: @ 8164FC6 setvar VAR_TEMP_1, 1 - checkflag FLAG_HO_OH_FLEW_AWAY - goto_if TRUE, EventScript_1A77A9 + goto_if_set FLAG_HO_OH_FLEW_AWAY, EventScript_1A77A9 setvar VAR_TEMP_1, 0 clearflag FLAG_HIDE_HO_OH return NavelRock_Summit_OnResume:: @ 8164FDD - checkflag FLAG_SYS_SPECIAL_WILD_BATTLE - call_if TRUE, EventScript_164FE7 + call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, EventScript_164FE7 end EventScript_164FE7:: @ 8164FE7 specialvar VAR_RESULT, Special_GetBattleOutcome compare VAR_RESULT, B_OUTCOME_CAUGHT - goto_if ne, EventScript_1A77A9 + goto_if_ne EventScript_1A77A9 removeobject 1 return NavelRock_Summit_EventScript_164FFB:: @ 8164FFB special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 lockall setvar VAR_TEMP_1, 1 @@ -75,11 +71,11 @@ NavelRock_Summit_EventScript_164FFB:: @ 8164FFB setvar VAR_LAST_TALKED, 1 specialvar VAR_RESULT, Special_GetBattleOutcome compare VAR_RESULT, B_OUTCOME_WON - goto_if eq, EventScript_1650B4 + goto_if_eq EventScript_1650B4 compare VAR_RESULT, B_OUTCOME_RAN - goto_if eq, EventScript_1650C2 + goto_if_eq EventScript_1650C2 compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED - goto_if eq, EventScript_1650C2 + goto_if_eq EventScript_1650C2 setflag FLAG_FOUGHT_HO_OH releaseall end diff --git a/data/maps/OneIsland/scripts.inc b/data/maps/OneIsland/scripts.inc index 3e6f39413..eae7004c8 100644 --- a/data/maps/OneIsland/scripts.inc +++ b/data/maps/OneIsland/scripts.inc @@ -83,10 +83,8 @@ Movement_167514:: @ 8167514 OneIsland_EventScript_167517:: @ 8167517 lock faceplayer - checkflag FLAG_SYS_CAN_LINK_WITH_RS - goto_if TRUE, EventScript_16753F - checkflag FLAG_SEVII_DETOUR_FINISHED - goto_if TRUE, EventScript_167535 + goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_16753F + goto_if_set FLAG_SEVII_DETOUR_FINISHED, 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 a4bd33e22..c0f9e08ed 100644 --- a/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc +++ b/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc @@ -28,8 +28,7 @@ OneIsland_KindleRoad_EmberSpa_EventScript_165380:: @ 8165380 OneIsland_KindleRoad_EmberSpa_EventScript_165399:: @ 8165399 lock faceplayer - checkflag FLAG_GOT_HM06 - goto_if TRUE, EventScript_1653C5 + goto_if_set FLAG_GOT_HM06, EventScript_1653C5 msgbox gUnknown_817D622 giveitem ITEM_HM06 setflag FLAG_GOT_HM06 diff --git a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc index bb4d46273..fac29facf 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc @@ -7,9 +7,8 @@ OneIsland_PokemonCenter_1F_MapScripts:: @ 8170BF8 OneIsland_PokemonCenter_1F_OnLoad:: @ 8170C0D compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 - call_if ge, EventScript_170C22 - checkflag FLAG_SYS_CAN_LINK_WITH_RS - call_if TRUE, EventScript_170C36 + call_if_ge EventScript_170C22 + call_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_170C36 end EventScript_170C22:: @ 8170C22 @@ -29,11 +28,11 @@ EventScript_170C36:: @ 8170C36 OneIsland_PokemonCenter_1F_OnTransition:: @ 8170C4E setrespawn SPAWN_ONE_ISLAND compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 6 - call_if eq, EventScript_170C73 + call_if_eq EventScript_170C73 compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 0 - call_if eq, EventScript_170C79 + call_if_eq EventScript_170C79 compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 2 - call_if eq, EventScript_170C90 + call_if_eq EventScript_170C90 end EventScript_170C73:: @ 8170C73 @@ -84,10 +83,8 @@ EventScript_170CB1:: @ 8170CB1 waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 - checkflag FLAG_SYS_GAME_CLEAR - call_if TRUE, EventScript_170E34 - checkflag FLAG_SYS_GAME_CLEAR - call_if FALSE, EventScript_170E3D + call_if_set FLAG_SYS_GAME_CLEAR, EventScript_170E34 + call_if_unset FLAG_SYS_GAME_CLEAR, EventScript_170E3D applymovement 3, Movement_WalkInPlaceFastestDown waitmovement 0 msgbox gUnknown_81A0E17 @@ -104,18 +101,17 @@ EventScript_170CB1:: @ 8170CB1 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 msgbox gUnknown_81A0FB1 - giveitemfanfaremsg gUnknown_81A10EE, ITEM_METEORITE, 1, MUS_FAN5 - additem ITEM_METEORITE, 1 + msgreceiveditem gUnknown_81A10EE, ITEM_METEORITE, 1, MUS_FAN5 + additem ITEM_METEORITE applymovement 3, Movement_WalkInPlaceFastestDown waitmovement 0 msgbox gUnknown_81A1113 - additem ITEM_TRI_PASS, 1 - giveitemfanfaremsg gUnknown_81A231B, ITEM_TRI_PASS, 1, MUS_FAN5 + giveitem_msg gUnknown_81A231B, ITEM_TRI_PASS, 1, MUS_FAN5 msgbox gUnknown_81A1150 compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 - call_if ge, EventScript_170E46 + call_if_ge EventScript_170E46 compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 - call_if lt, EventScript_170E58 + call_if_lt EventScript_170E58 setflag FLAG_SYS_SEVII_MAP_123 msgbox gUnknown_81A1230 closemessage @@ -148,8 +144,7 @@ EventScript_170E46:: @ 8170E46 EventScript_170E58:: @ 8170E58 setflag FLAG_HIDE_TOWN_MAP setvar VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 - additem ITEM_TOWN_MAP, 1 - giveitemfanfaremsg gUnknown_81A1218, ITEM_TOWN_MAP, 1, MUS_FAN5 + giveitem_msg gUnknown_81A1218, ITEM_TOWN_MAP, 1, MUS_FAN5 return Movement_170E7D:: @ 8170E7D @@ -192,8 +187,7 @@ OneIsland_PokemonCenter_1F_EventScript_170E94:: @ 8170E94 OneIsland_PokemonCenter_1F_EventScript_170E9D:: @ 8170E9D lock - checkflag FLAG_SEVII_DETOUR_FINISHED - goto_if TRUE, EventScript_170EB1 + goto_if_set FLAG_SEVII_DETOUR_FINISHED, EventScript_170EB1 msgbox gUnknown_81A1266 release end @@ -209,22 +203,20 @@ OneIsland_PokemonCenter_1F_EventScript_170EC5:: @ 8170EC5 lock faceplayer compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 7 - goto_if eq, EventScript_170F35 + goto_if_eq EventScript_170F35 compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 6 - goto_if eq, EventScript_170F9B - checkflag FLAG_RECOVERED_SAPPHIRE - goto_if TRUE, EventScript_170FA5 + goto_if_eq EventScript_170F9B + goto_if_set FLAG_RECOVERED_SAPPHIRE, EventScript_170FA5 compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 - goto_if eq, EventScript_17103A - checkflag FLAG_GOT_RUBY - goto_if TRUE, EventScript_171044 + goto_if_eq EventScript_17103A + goto_if_set FLAG_GOT_RUBY, EventScript_171044 compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4 - goto_if eq, EventScript_1710F2 + goto_if_eq EventScript_1710F2 specialvar VAR_RESULT, IsNationalPokedexEnabled compare VAR_RESULT, 1 - goto_if eq, EventScript_1710FC + goto_if_eq EventScript_1710FC compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 3 - goto_if eq, EventScript_171134 + goto_if_eq EventScript_171134 msgbox gUnknown_81A1321 closemessage applymovement 3, Movement_FaceOriginalDirection @@ -236,9 +228,9 @@ EventScript_170F35:: @ 8170F35 msgbox gUnknown_81A1EBD random 3 compare VAR_RESULT, 0 - goto_if eq, EventScript_170F6D + goto_if_eq EventScript_170F6D compare VAR_RESULT, 1 - goto_if eq, EventScript_170F84 + goto_if_eq EventScript_170F84 famechecker FAMECHECKER_BILL, 5 msgbox gUnknown_81A2076 release @@ -325,14 +317,14 @@ EventScript_171044:: @ 8171044 waitmovement 0 msgbox gUnknown_81A19AA, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_171099 + goto_if_eq EventScript_171099 goto EventScript_1710B2 end EventScript_171099:: @ 8171099 msgbox gUnknown_81A1A08, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_171099 + goto_if_eq EventScript_171099 goto EventScript_1710B2 end @@ -341,7 +333,7 @@ EventScript_1710B2:: @ 81710B2 removeitem ITEM_RUBY, 1 removeitem ITEM_TRI_PASS, 1 setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 - additem ITEM_RAINBOW_PASS, 1 + additem ITEM_RAINBOW_PASS setflag FLAG_SYS_SEVII_MAP_4567 textcolor 3 playfanfare MUS_FAN5 @@ -404,8 +396,7 @@ OneIsland_PokemonCenter_1F_EventScript_171151:: @ 8171151 OneIsland_PokemonCenter_1F_EventScript_17115A:: @ 817115A lock faceplayer - checkflag FLAG_SYS_CAN_LINK_WITH_RS - goto_if TRUE, EventScript_17116F + goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_17116F msgbox gUnknown_81A218D release end @@ -417,10 +408,8 @@ EventScript_17116F:: @ 817116F OneIsland_PokemonCenter_1F_EventScript_171179:: @ 8171179 lockall - checkflag FLAG_SYS_CAN_LINK_WITH_RS - goto_if TRUE, EventScript_1711A0 - checkflag FLAG_SEVII_DETOUR_FINISHED - goto_if TRUE, EventScript_171196 + goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_1711A0 + goto_if_set FLAG_SEVII_DETOUR_FINISHED, EventScript_171196 msgbox gUnknown_81A223F releaseall end @@ -467,13 +456,13 @@ EventScript_1711DA:: @ 81711DA msgbox gUnknown_81A13B8 closemessage compare VAR_TEMP_1, 1 - call_if eq, EventScript_1712E4 + call_if_eq EventScript_1712E4 compare VAR_TEMP_1, 2 - call_if eq, EventScript_1712EF + call_if_eq EventScript_1712EF compare VAR_TEMP_1, 3 - call_if eq, EventScript_1712FA + call_if_eq EventScript_1712FA compare VAR_TEMP_1, 4 - call_if eq, EventScript_171305 + call_if_eq EventScript_171305 delay 10 msgbox gUnknown_81A13CB applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown diff --git a/data/maps/PalletTown/scripts.inc b/data/maps/PalletTown/scripts.inc index 831c17dde..1925cabd4 100644 --- a/data/maps/PalletTown/scripts.inc +++ b/data/maps/PalletTown/scripts.inc @@ -5,19 +5,17 @@ PalletTown_MapScripts:: @ 816545A PalletTown_OnTransition:: @ 8165465 setworldmapflag FLAG_WORLD_MAP_PALLET_TOWN - checkflag FLAG_PALLET_LADY_NOT_BLOCKING_SIGN - call_if TRUE, EventScript_165488 + call_if_set FLAG_PALLET_LADY_NOT_BLOCKING_SIGN, EventScript_165488 compare VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 0 - call_if eq, EventScript_1654A8 + call_if_eq EventScript_1654A8 compare VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1 - call_if eq, EventScript_1654A2 + call_if_eq EventScript_1654A2 end EventScript_165488:: @ 8165488 - checkflag FLAG_PALLET_TOWN_LADY_MOVED_FROM_SIGN - goto_if FALSE, EventScript_1A77A9 + goto_if_unset FLAG_PALLET_TOWN_LADY_MOVED_FROM_SIGN, EventScript_1A77A9 compare VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1 - goto_if ge, EventScript_1A77A9 + goto_if_ge EventScript_1A77A9 setvar VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1 return @@ -26,8 +24,7 @@ EventScript_1654A2:: @ 81654A2 return EventScript_1654A8:: @ 81654A8 - checkflag FLAG_PALLET_LADY_NOT_BLOCKING_SIGN - goto_if TRUE, EventScript_1654BD + goto_if_set FLAG_PALLET_LADY_NOT_BLOCKING_SIGN, EventScript_1654BD setobjectxyperm 1, 5, 15 setobjectmovementtype 1, 7 return @@ -50,8 +47,7 @@ EventScript_1654D8:: @ 81654D8 addobject 3 applymovement 3, Movement_1655AF waitmovement 0 - checkflag FLAG_WORLD_MAP_ONE_ISLAND - goto_if FALSE, EventScript_1655A1 + goto_if_unset FLAG_WORLD_MAP_ONE_ISLAND, EventScript_1655A1 msgbox gUnknown_817D8BF setvar VAR_0x8004, 0 specialvar VAR_RESULT, Special_GetPokedexCount @@ -60,7 +56,7 @@ EventScript_1654D8:: @ 81654D8 getnumberstring 0, VAR_0x8008 getnumberstring 1, VAR_0x8009 compare VAR_0x8009, 60 - goto_if lt, EventScript_165593 + goto_if_lt EventScript_165593 msgbox gUnknown_817D9AA closemessage playbgm MUS_ANNAI, 0 @@ -200,17 +196,17 @@ EventScript_165605:: @ 8165605 delay 30 addobject 3 compare VAR_TEMP_1, 0 - call_if eq, EventScript_1656B8 + call_if_eq EventScript_1656B8 compare VAR_TEMP_1, 1 - call_if eq, EventScript_1656C3 + call_if_eq EventScript_1656C3 delay 30 msgbox gUnknown_817D74A closemessage delay 30 compare VAR_TEMP_1, 0 - call_if eq, EventScript_1656CE + call_if_eq EventScript_1656CE compare VAR_TEMP_1, 1 - call_if eq, EventScript_1656E0 + call_if_eq EventScript_1656E0 opendoor 16, 13 waitdooranim applymovement 3, Movement_16572E @@ -375,13 +371,12 @@ Movement_165758:: @ 8165758 PalletTown_EventScript_16575C:: @ 816575C lock compare VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 2 - goto_if eq, EventScript_1657ED + goto_if_eq EventScript_1657ED compare VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1 - goto_if eq, EventScript_165815 + goto_if_eq EventScript_165815 compare VAR_TEMP_2, 1 - goto_if eq, EventScript_1658C2 - checkflag FLAG_TEMP_2 - goto_if TRUE, EventScript_165801 + goto_if_eq EventScript_1658C2 + goto_if_set FLAG_TEMP_2, EventScript_165801 msgbox gUnknown_81B1C8B applymovement 1, Movement_FacePlayer waitmovement 0 @@ -393,9 +388,9 @@ PalletTown_EventScript_16575C:: @ 816575C msgbox gUnknown_81B1C9F closemessage compare VAR_FACING, DIR_EAST - call_if eq, EventScript_1657D7 + call_if_eq EventScript_1657D7 compare VAR_FACING, DIR_EAST - call_if ne, EventScript_1657E2 + call_if_ne EventScript_1657E2 moveobjectoffscreen 1 setflag FLAG_TEMP_2 release diff --git a/data/maps/PalletTown_GarysHouse/scripts.inc b/data/maps/PalletTown_GarysHouse/scripts.inc index 7a76bab27..d9c3729ae 100644 --- a/data/maps/PalletTown_GarysHouse/scripts.inc +++ b/data/maps/PalletTown_GarysHouse/scripts.inc @@ -4,9 +4,9 @@ PalletTown_GarysHouse_MapScripts:: @ 8168D27 PalletTown_GarysHouse_OnTransition:: @ 8168D2D compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 - call_if lt, EventScript_168D44 + call_if_lt EventScript_168D44 compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 - call_if ge, EventScript_168D50 + call_if_ge EventScript_168D50 end EventScript_168D44:: @ 8168D44 @@ -22,16 +22,15 @@ PalletTown_GarysHouse_EventScript_168D56:: @ 8168D56 lock faceplayer famechecker FAMECHECKER_DAISY, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 - checkflag FLAG_SYS_GAME_CLEAR - goto_if TRUE, EventScript_168DB9 + goto_if_set FLAG_SYS_GAME_CLEAR, EventScript_168DB9 compare VAR_TEMP_1, 1 - goto_if eq, EventScript_168EEC + goto_if_eq EventScript_168EEC compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 - goto_if eq, EventScript_168F59 + goto_if_eq EventScript_168F59 compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 1 - goto_if eq, EventScript_168EF6 + goto_if_eq EventScript_168EF6 compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1 - goto_if ge, EventScript_168DAF + goto_if_ge EventScript_168DAF msgbox gUnknown_818D58C closemessage applymovement 1, Movement_FaceOriginalDirection @@ -47,23 +46,23 @@ EventScript_168DAF:: @ 8168DAF EventScript_168DB9:: @ 8168DB9 special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 compare VAR_MASSAGE_COOLDOWN_STEP_COUNTER, 500 - goto_if lt, EventScript_168E46 + goto_if_lt EventScript_168E46 msgbox gUnknown_818D7D3, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_168E3C + goto_if_eq EventScript_168E3C msgbox gUnknown_818D8B2 special Special_ChooseMonFromParty waitstate lock faceplayer compare VAR_0x8004, 6 - goto_if ge, EventScript_168E3C + goto_if_ge EventScript_168E3C specialvar VAR_RESULT, Special_GetSpeciesOfPartySlot_x8004 compare VAR_RESULT, SPECIES_EGG - goto_if eq, EventScript_168E32 + goto_if_eq EventScript_168E32 msgbox gUnknown_818D8CC closemessage fadescreen 1 @@ -144,7 +143,7 @@ EventScript_168EF6:: @ 8168EF6 closemessage checkitemspace ITEM_TOWN_MAP, 1 compare VAR_RESULT, 0 - goto_if eq, EventScript_168F4F + goto_if_eq EventScript_168F4F applymovement 1, Movement_WalkInPlaceFastestRight waitmovement 0 removeobject 2 @@ -153,8 +152,7 @@ EventScript_168EF6:: @ 8168EF6 applymovement 1, Movement_FacePlayer waitmovement 0 delay 12 - additem ITEM_TOWN_MAP, 1 - giveitemfanfaremsg gUnknown_818D661, ITEM_TOWN_MAP, 1, MUS_FAN5 + giveitem_msg gUnknown_818D661, ITEM_TOWN_MAP, 1, MUS_FAN5 release end diff --git a/data/maps/PalletTown_PlayersHouse_1F/scripts.inc b/data/maps/PalletTown_PlayersHouse_1F/scripts.inc index 999cd7dbb..29c4ff710 100644 --- a/data/maps/PalletTown_PlayersHouse_1F/scripts.inc +++ b/data/maps/PalletTown_PlayersHouse_1F/scripts.inc @@ -4,13 +4,12 @@ PalletTown_PlayersHouse_1F_MapScripts:: @ 8168C08 PalletTown_PlayersHouse_1F_EventScript_168C09:: @ 8168C09 lock faceplayer - checkflag FLAG_BEAT_RIVAL_IN_OAKS_LAB - goto_if TRUE, EventScript_168C4A + goto_if_set FLAG_BEAT_RIVAL_IN_OAKS_LAB, EventScript_168C4A checkplayergender compare VAR_RESULT, 0 - call_if eq, EventScript_168C38 + call_if_eq EventScript_168C38 compare VAR_RESULT, 1 - call_if eq, EventScript_168C41 + call_if_eq EventScript_168C41 closemessage applymovement 1, Movement_FaceOriginalDirection waitmovement 0 @@ -36,7 +35,7 @@ EventScript_168C4A:: @ 8168C4A PalletTown_PlayersHouse_1F_EventScript_168C62:: @ 8168C62 lockall compare VAR_FACING, DIR_NORTH - goto_if eq, EventScript_168C78 + goto_if_eq EventScript_168C78 msgbox gUnknown_818D4F9 releaseall end @@ -44,9 +43,9 @@ PalletTown_PlayersHouse_1F_EventScript_168C62:: @ 8168C62 EventScript_168C78:: @ 8168C78 checkplayergender compare VAR_RESULT, 0 - call_if eq, EventScript_168C91 + call_if_eq EventScript_168C91 compare VAR_RESULT, 1 - call_if eq, EventScript_168C9A + call_if_eq EventScript_168C9A releaseall end diff --git a/data/maps/PalletTown_PlayersHouse_2F/scripts.inc b/data/maps/PalletTown_PlayersHouse_2F/scripts.inc index b954f7ef7..983e1b1d3 100644 --- a/data/maps/PalletTown_PlayersHouse_2F/scripts.inc +++ b/data/maps/PalletTown_PlayersHouse_2F/scripts.inc @@ -5,7 +5,7 @@ PalletTown_PlayersHouse_2F_MapScripts:: @ 8168CA3 PalletTown_PlayersHouse_2F_OnTransition:: @ 8168CAE compare VAR_MAP_SCENE_PALLET_TOWN_PLAYERS_HOUSE_2F, 0 - call_if eq, EventScript_168CBA + call_if_eq EventScript_168CBA end EventScript_168CBA:: @ 8168CBA @@ -33,7 +33,7 @@ gUnknown_8168CE4:: @ 8168CE4 PalletTown_PlayersHouse_2F_EventScript_168CE4:: @ 8168CE4 special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lockall setvar VAR_0x8004, 32 special Special_SetSomeVariable diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc index 858b12d8c..8e20d3cab 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc +++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc @@ -7,13 +7,12 @@ PalletTown_ProfessorOaksLab_MapScripts:: @ 8168F7E PalletTown_ProfessorOaksLab_OnTransition:: @ 8168F8E setflag FLAG_VISITED_OAKS_LAB compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1 - call_if eq, EventScript_168FC6 + call_if_eq EventScript_168FC6 compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 7 - call_if eq, EventScript_168FD5 + call_if_eq EventScript_168FD5 compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 8 - call_if eq, EventScript_168FC0 - checkflag FLAG_GOT_POKEBALLS_FROM_OAK_AFTER_22_RIVAL - call_if TRUE, EventScript_168FBC + call_if_eq EventScript_168FC0 + call_if_set FLAG_GOT_POKEBALLS_FROM_OAK_AFTER_22_RIVAL, EventScript_168FBC end EventScript_168FBC:: @ 8168FBC @@ -67,32 +66,32 @@ EventScript_169035:: @ 8169035 msgbox gUnknown_818EE60 closemessage compare VAR_FACING, DIR_NORTH - call_if eq, EventScript_169174 + call_if_eq EventScript_169174 compare VAR_FACING, DIR_SOUTH - call_if eq, EventScript_1691BB + call_if_eq EventScript_1691BB compare VAR_FACING, DIR_EAST - call_if eq, EventScript_169194 + call_if_eq EventScript_169194 compare VAR_FACING, DIR_WEST - call_if eq, EventScript_169194 + call_if_eq EventScript_169194 msgbox gUnknown_818EF59 fadedefaultbgm msgbox gUnknown_818F004 compare VAR_FACING, DIR_NORTH - call_if eq, EventScript_1691DB + call_if_eq EventScript_1691DB compare VAR_FACING, DIR_WEST - call_if eq, EventScript_1691E6 + call_if_eq EventScript_1691E6 textcolor 3 msgbox gUnknown_818F062 closemessage call EventScript_1A6675 compare VAR_FACING, DIR_NORTH - call_if eq, EventScript_1691F1 + call_if_eq EventScript_1691F1 compare VAR_FACING, DIR_SOUTH - call_if eq, EventScript_1691FC + call_if_eq EventScript_1691FC compare VAR_FACING, DIR_EAST - call_if eq, EventScript_169215 + call_if_eq EventScript_169215 compare VAR_FACING, DIR_WEST - call_if eq, EventScript_169227 + call_if_eq EventScript_169227 addobject 9 addobject 10 delay 30 @@ -102,13 +101,13 @@ EventScript_169035:: @ 8169035 removeobject 10 delay 30 compare VAR_FACING, DIR_NORTH - call_if eq, EventScript_169845 + call_if_eq EventScript_169845 compare VAR_FACING, DIR_SOUTH - call_if eq, EventScript_169850 + call_if_eq EventScript_169850 compare VAR_FACING, DIR_EAST - call_if eq, EventScript_16985B + call_if_eq EventScript_16985B compare VAR_FACING, DIR_WEST - call_if eq, EventScript_16986D + call_if_eq EventScript_16986D textcolor 3 playfanfare MUS_FAN5 message Text_18F0E8 @@ -121,13 +120,13 @@ EventScript_169035:: @ 8169035 closemessage playbgm MUS_RIVAL2, 0 compare VAR_FACING, DIR_NORTH - call_if eq, EventScript_169B69 + call_if_eq EventScript_169B69 compare VAR_FACING, DIR_SOUTH - call_if eq, EventScript_169B7B + call_if_eq EventScript_169B7B compare VAR_FACING, DIR_EAST - call_if eq, EventScript_169B7B + call_if_eq EventScript_169B7B compare VAR_FACING, DIR_WEST - call_if eq, EventScript_169B7B + call_if_eq EventScript_169B7B removeobject 8 fadedefaultbgm setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 8 @@ -312,20 +311,20 @@ EventScript_16930B:: @ 816930B applymovement 4, Movement_FaceDown waitmovement 0 compare VAR_STARTER_MON, 0 - goto_if eq, EventScript_1693D2 + goto_if_eq EventScript_1693D2 compare VAR_STARTER_MON, 1 - goto_if eq, EventScript_16944D + goto_if_eq EventScript_16944D compare VAR_STARTER_MON, 2 - goto_if eq, EventScript_16935A + goto_if_eq EventScript_16935A end EventScript_16935A:: @ 816935A compare VAR_TEMP_2, 1 - goto_if eq, EventScript_16937C + goto_if_eq EventScript_16937C compare VAR_TEMP_2, 2 - goto_if eq, EventScript_16938C + goto_if_eq EventScript_16938C compare VAR_TEMP_2, 3 - goto_if eq, EventScript_16939C + goto_if_eq EventScript_16939C end EventScript_16937C:: @ 816937C @@ -347,7 +346,7 @@ EventScript_16939C:: @ 816939C end EventScript_1693AC:: @ 81693AC - trainerbattle TRAINER_BATTLE_TUTORIAL, TRAINER_RIVAL_OAKS_LAB_SQUIRTLE, 3, Text_18DDEA, Text_18DE1A + trainerbattle_tutorial TRAINER_RIVAL_OAKS_LAB_SQUIRTLE, 3, Text_18DDEA, Text_18DE1A goto EventScript_1694C2 end @@ -377,11 +376,11 @@ Movement_1693CD:: @ 81693CD EventScript_1693D2:: @ 81693D2 compare VAR_TEMP_2, 1 - goto_if eq, EventScript_1693F4 + goto_if_eq EventScript_1693F4 compare VAR_TEMP_2, 2 - goto_if eq, EventScript_169404 + goto_if_eq EventScript_169404 compare VAR_TEMP_2, 3 - goto_if eq, EventScript_169414 + goto_if_eq EventScript_169414 end EventScript_1693F4:: @ 81693F4 @@ -403,7 +402,7 @@ EventScript_169414:: @ 8169414 end EventScript_169424:: @ 8169424 - trainerbattle TRAINER_BATTLE_TUTORIAL, TRAINER_RIVAL_OAKS_LAB_CHARMANDER, 3, Text_18DDEA, Text_18DE1A + trainerbattle_tutorial TRAINER_RIVAL_OAKS_LAB_CHARMANDER, 3, Text_18DDEA, Text_18DE1A goto EventScript_1694C2 end @@ -436,11 +435,11 @@ Movement_169447:: @ 8169447 EventScript_16944D:: @ 816944D compare VAR_TEMP_2, 1 - goto_if eq, EventScript_16946F + goto_if_eq EventScript_16946F compare VAR_TEMP_2, 2 - goto_if eq, EventScript_16947F + goto_if_eq EventScript_16947F compare VAR_TEMP_2, 3 - goto_if eq, EventScript_16948F + goto_if_eq EventScript_16948F end EventScript_16946F:: @ 816946F @@ -462,7 +461,7 @@ EventScript_16948F:: @ 816948F end EventScript_16949F:: @ 816949F - trainerbattle TRAINER_BATTLE_TUTORIAL, TRAINER_RIVAL_OAKS_LAB_BULBASAUR, 3, Text_18DDEA, Text_18DE1A + trainerbattle_tutorial TRAINER_RIVAL_OAKS_LAB_BULBASAUR, 3, Text_18DDEA, Text_18DE1A goto EventScript_1694C2 end @@ -493,11 +492,11 @@ EventScript_1694C2:: @ 81694C2 closemessage playbgm MUS_RIVAL2, 0 compare VAR_TEMP_2, 1 - call_if eq, EventScript_169504 + call_if_eq EventScript_169504 compare VAR_TEMP_2, 2 - call_if eq, EventScript_169516 + call_if_eq EventScript_169516 compare VAR_TEMP_2, 3 - call_if eq, EventScript_169528 + call_if_eq EventScript_169528 removeobject 8 playse SE_KAIDAN fadedefaultbgm @@ -575,9 +574,9 @@ PalletTown_ProfessorOaksLab_EventScript_16955F:: @ 816955F lock faceplayer compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 - goto_if eq, EventScript_16958B + goto_if_eq EventScript_16958B compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2 - goto_if eq, EventScript_169581 + goto_if_eq EventScript_169581 msgbox gUnknown_818DC67 release end @@ -595,24 +594,22 @@ EventScript_16958B:: @ 816958B PalletTown_ProfessorOaksLab_EventScript_169595:: @ 8169595 lock faceplayer - checkflag FLAG_TEMP_2 - goto_if TRUE, EventScript_169600 + goto_if_set FLAG_TEMP_2, EventScript_169600 compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 9 - goto_if eq, EventScript_169903 + goto_if_eq EventScript_169903 compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 8 - goto_if eq, EventScript_169A6E - checkflag FLAG_SYS_GAME_CLEAR - goto_if TRUE, EventScript_1699CE + goto_if_eq EventScript_169A6E + goto_if_set FLAG_SYS_GAME_CLEAR, EventScript_1699CE compare VAR_MAP_SCENE_CERULEAN_CITY_RIVAL, 1 - goto_if eq, EventScript_169903 + goto_if_eq EventScript_169903 compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 6 - goto_if eq, EventScript_1698D6 + goto_if_eq EventScript_1698D6 compare VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 1 - goto_if ge, EventScript_16961E + goto_if_ge EventScript_16961E compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 4 - goto_if eq, EventScript_169614 + goto_if_eq EventScript_169614 compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 - goto_if eq, EventScript_16960A + goto_if_eq EventScript_16960A msgbox gUnknown_818E116 release end @@ -646,13 +643,13 @@ EventScript_16961E:: @ 816961E msgbox gUnknown_818DE8D closemessage compare VAR_FACING, DIR_NORTH - call_if eq, EventScript_169A82 + call_if_eq EventScript_169A82 compare VAR_FACING, DIR_SOUTH - call_if eq, EventScript_169AC1 + call_if_eq EventScript_169AC1 compare VAR_FACING, DIR_EAST - call_if eq, EventScript_169A9E + call_if_eq EventScript_169A9E compare VAR_FACING, DIR_WEST - call_if eq, EventScript_169A9E + call_if_eq EventScript_169A9E fadedefaultbgm msgbox gUnknown_818DE99 closemessage @@ -663,23 +660,23 @@ EventScript_16961E:: @ 816961E applymovement 4, Movement_Delay48 waitmovement 0 compare VAR_FACING, DIR_SOUTH - call_if eq, EventScript_169ADD + call_if_eq EventScript_169ADD compare VAR_FACING, DIR_EAST - call_if eq, EventScript_169B14 + call_if_eq EventScript_169B14 compare VAR_FACING, DIR_WEST - call_if eq, EventScript_169AF5 + call_if_eq EventScript_169AF5 compare VAR_FACING, DIR_NORTH - call_if eq, EventScript_169B86 + call_if_eq EventScript_169B86 msgbox gUnknown_818E508 closemessage compare VAR_FACING, DIR_NORTH - call_if eq, EventScript_169882 + call_if_eq EventScript_169882 compare VAR_FACING, DIR_SOUTH - call_if eq, EventScript_16988D + call_if_eq EventScript_16988D compare VAR_FACING, DIR_EAST - call_if eq, EventScript_1698A6 + call_if_eq EventScript_1698A6 compare VAR_FACING, DIR_WEST - call_if eq, EventScript_1698B8 + call_if_eq EventScript_1698B8 msgbox gUnknown_818E536 closemessage delay 40 @@ -692,13 +689,13 @@ EventScript_16961E:: @ 816961E removeobject 10 delay 25 compare VAR_FACING, DIR_NORTH - call_if eq, EventScript_169845 + call_if_eq EventScript_169845 compare VAR_FACING, DIR_SOUTH - call_if eq, EventScript_169850 + call_if_eq EventScript_169850 compare VAR_FACING, DIR_EAST - call_if eq, EventScript_16985B + call_if_eq EventScript_16985B compare VAR_FACING, DIR_WEST - call_if eq, EventScript_16986D + call_if_eq EventScript_16986D delay 10 textcolor 3 playfanfare MUS_FAN5 @@ -710,31 +707,30 @@ EventScript_16961E:: @ 816961E special sub_810B810 setvar VAR_MAP_SCENE_POKEMON_CENTER_TEALA, 1 msgbox gUnknown_818E612 - additem ITEM_POKE_BALL, 5 - giveitemfanfaremsg gUnknown_818E6B3, ITEM_POKE_BALL, 5 + giveitem_msg gUnknown_818E6B3, ITEM_POKE_BALL, 5 msgbox gUnknown_818E6D0 famechecker FAMECHECKER_OAK, 1 msgbox gUnknown_818E784 msgbox gUnknown_818DEC8 compare VAR_FACING, DIR_NORTH - call_if eq, EventScript_169B33 + call_if_eq EventScript_169B33 compare VAR_FACING, DIR_SOUTH - call_if eq, EventScript_169B45 + call_if_eq EventScript_169B45 compare VAR_FACING, DIR_EAST - call_if eq, EventScript_169B57 + call_if_eq EventScript_169B57 compare VAR_FACING, DIR_WEST - call_if eq, EventScript_169B57 + call_if_eq EventScript_169B57 msgbox gUnknown_818DEF3 closemessage playbgm MUS_RIVAL2, 0 compare VAR_FACING, DIR_NORTH - call_if eq, EventScript_169B69 + call_if_eq EventScript_169B69 compare VAR_FACING, DIR_SOUTH - call_if eq, EventScript_169B7B + call_if_eq EventScript_169B7B compare VAR_FACING, DIR_EAST - call_if eq, EventScript_169B7B + call_if_eq EventScript_169B7B compare VAR_FACING, DIR_WEST - call_if eq, EventScript_169B7B + call_if_eq EventScript_169B7B removeobject 8 fadedefaultbgm setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 6 @@ -840,14 +836,13 @@ EventScript_1698D6:: @ 81698D6 getnumberstring 0, VAR_0x8008 getnumberstring 1, VAR_0x8009 compare VAR_0x8009, 1 - goto_if eq, EventScript_1699FB + goto_if_eq EventScript_1699FB goto EventScript_169903 end EventScript_169903:: @ 8169903 call EventScript_1A737B - checkflag FLAG_OAK_SAW_DEX_COMPLETION - goto_if TRUE, EventScript_169913 + goto_if_set FLAG_OAK_SAW_DEX_COMPLETION, EventScript_169913 release end @@ -857,13 +852,13 @@ EventScript_169913:: @ 8169913 message Text_1A7291 waitmessage compare VAR_FACING, DIR_NORTH - call_if eq, EventScript_169964 + call_if_eq EventScript_169964 compare VAR_FACING, DIR_SOUTH - call_if eq, EventScript_16996F + call_if_eq EventScript_16996F compare VAR_FACING, DIR_EAST - call_if eq, EventScript_16997A + call_if_eq EventScript_16997A compare VAR_FACING, DIR_WEST - call_if eq, EventScript_169985 + call_if_eq EventScript_169985 applymovement 4, Movement_FacePlayer waitmovement 0 closemessage @@ -971,9 +966,8 @@ EventScript_1699CE:: @ 81699CE call EventScript_1A737B closemessage compare VAR_0x8009, 60 - goto_if lt, EventScript_1699F9 - checkflag FLAG_WORLD_MAP_ONE_ISLAND - goto_if FALSE, EventScript_1699F9 + goto_if_lt EventScript_1699F9 + goto_if_unset FLAG_WORLD_MAP_ONE_ISLAND, EventScript_1699F9 delay 30 msgbox gUnknown_818EDF5 goto EventScript_169035 @@ -986,28 +980,25 @@ EventScript_1699F9:: @ 81699F9 EventScript_1699FB:: @ 81699FB special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 - checkflag FLAG_OAK_SKIP_22_RIVAL_CHECK - goto_if TRUE, EventScript_169A6E - checkflag FLAG_GOT_POKEBALLS_FROM_OAK_AFTER_22_RIVAL - goto_if TRUE, EventScript_169A78 + goto_if_set FLAG_OAK_SKIP_22_RIVAL_CHECK, EventScript_169A6E + goto_if_set FLAG_GOT_POKEBALLS_FROM_OAK_AFTER_22_RIVAL, EventScript_169A78 checkitem ITEM_POKE_BALL, 1 compare VAR_RESULT, 0 - goto_if eq, EventScript_169A34 + goto_if_eq EventScript_169A34 goto EventScript_169A6E end EventScript_169A34:: @ 8169A34 compare VAR_MAP_SCENE_ROUTE22, 2 - goto_if ge, EventScript_169A45 + goto_if_ge EventScript_169A45 goto EventScript_169A6E end EventScript_169A45:: @ 8169A45 msgbox gUnknown_818E89C - additem ITEM_POKE_BALL, 5 - giveitemfanfaremsg gUnknown_818E6B3, ITEM_POKE_BALL, 5 + giveitem_msg gUnknown_818E6B3, ITEM_POKE_BALL, 5 setflag FLAG_GOT_POKEBALLS_FROM_OAK_AFTER_22_RIVAL release end @@ -1154,9 +1145,9 @@ PalletTown_ProfessorOaksLab_EventScript_169BAB:: @ 8169BAB setvar VAR_OAKSLAB_RIVAL_STARTER_SPECIES, SPECIES_CHARMANDER setvar VAR_OAKSLAB_RIVAL_STARTER_OBJID, 7 compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 - goto_if ge, EventScript_169DE4 + goto_if_ge EventScript_169DE4 compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2 - goto_if eq, EventScript_169BE1 + goto_if_eq EventScript_169BE1 msgbox gUnknown_818EA19 release end @@ -1167,35 +1158,35 @@ EventScript_169BE1:: @ 8169BE1 drawmonpic VAR_OAKSLAB_PLAYER_STARTER_SPECIES, 10, 3 textcolor 0 compare VAR_OAKSLAB_PLAYER_STARTER_NO, 0 - goto_if eq, EventScript_OakDescribesBulbasaur + goto_if_eq EventScript_OakDescribesBulbasaur compare VAR_OAKSLAB_PLAYER_STARTER_NO, 1 - goto_if eq, EventScript_OakDescribesCharmander + goto_if_eq EventScript_OakDescribesCharmander compare VAR_OAKSLAB_PLAYER_STARTER_NO, 2 - goto_if eq, EventScript_OakDescribesSquirtle + goto_if_eq EventScript_OakDescribesSquirtle end EventScript_OakDescribesBulbasaur:: @ 8169C14 msgbox gUnknown_818E272, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if eq, EventScript_ThisPokeIsRealyEnergetic + goto_if_eq EventScript_ThisPokeIsRealyEnergetic compare VAR_RESULT, 0 - goto_if eq, EventScript_DeclinedStarter + goto_if_eq EventScript_DeclinedStarter end EventScript_OakDescribesCharmander:: @ 8169C33 msgbox gUnknown_818E207, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if eq, EventScript_ThisPokeIsRealyEnergetic + goto_if_eq EventScript_ThisPokeIsRealyEnergetic compare VAR_RESULT, 0 - goto_if eq, EventScript_DeclinedStarter + goto_if_eq EventScript_DeclinedStarter end EventScript_OakDescribesSquirtle:: @ 8169C52 msgbox gUnknown_818E194, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if eq, EventScript_ThisPokeIsRealyEnergetic + goto_if_eq EventScript_ThisPokeIsRealyEnergetic compare VAR_RESULT, 0 - goto_if eq, EventScript_DeclinedStarter + goto_if_eq EventScript_DeclinedStarter end EventScript_DeclinedStarter:: @ 8169C71 @@ -1210,7 +1201,7 @@ EventScript_ThisPokeIsRealyEnergetic:: @ 8169C74 call EventScript_1A6675 setflag FLAG_SYS_POKEMON_GET setflag FLAG_PALLET_LADY_NOT_BLOCKING_SIGN - givemon VAR_OAKSLAB_PLAYER_STARTER_SPECIES, 5, ITEM_NONE, 0, 0, 0 + givemon VAR_OAKSLAB_PLAYER_STARTER_SPECIES, 5, ITEM_NONE copyvar VAR_STARTER_MON, VAR_OAKSLAB_PLAYER_STARTER_NO getspeciesname 0, VAR_OAKSLAB_PLAYER_STARTER_SPECIES message Text_18E30D @@ -1219,9 +1210,9 @@ EventScript_ThisPokeIsRealyEnergetic:: @ 8169C74 waitfanfare msgbox gUnknown_81A56A7, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if eq, EventScript_GiveNicknameToStarter + goto_if_eq EventScript_GiveNicknameToStarter compare VAR_RESULT, 0 - goto_if eq, EventScript_SkipGiveNicknameToStarter + goto_if_eq EventScript_SkipGiveNicknameToStarter end EventScript_GiveNicknameToStarter:: @ 8169CCC @@ -1233,11 +1224,11 @@ EventScript_GiveNicknameToStarter:: @ 8169CCC EventScript_SkipGiveNicknameToStarter:: @ 8169CDC closemessage compare VAR_OAKSLAB_PLAYER_STARTER_NO, 0 - goto_if eq, EventScript_RivalWalksToCharmander + goto_if_eq EventScript_RivalWalksToCharmander compare VAR_OAKSLAB_PLAYER_STARTER_NO, 1 - goto_if eq, EventScript_RivalWalksToSquirtle + goto_if_eq EventScript_RivalWalksToSquirtle compare VAR_OAKSLAB_PLAYER_STARTER_NO, 2 - goto_if eq, EventScript_RivalWalksToBulbasaur + goto_if_eq EventScript_RivalWalksToBulbasaur end EventScript_RivalWalksToCharmander:: @ 8169CFF @@ -1269,8 +1260,7 @@ Movement_RivalTakesHisStarter:: @ 8169D2F playfanfare MUS_FAN5 waitfanfare setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 - checkflag FLAG_PALLET_TOWN_LADY_MOVED_FROM_SIGN - call_if TRUE, EventScript_169D5C + call_if_set FLAG_PALLET_TOWN_LADY_MOVED_FROM_SIGN, EventScript_169D5C release end @@ -1314,9 +1304,9 @@ PalletTown_ProfessorOaksLab_EventScript_169D78:: @ 8169D78 setvar VAR_OAKSLAB_RIVAL_STARTER_SPECIES, SPECIES_BULBASAUR setvar VAR_OAKSLAB_RIVAL_STARTER_OBJID, 5 compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 - goto_if ge, EventScript_169DE4 + goto_if_ge EventScript_169DE4 compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2 - goto_if eq, EventScript_169BE1 + goto_if_eq EventScript_169BE1 msgbox gUnknown_818EA19 release end @@ -1329,9 +1319,9 @@ PalletTown_ProfessorOaksLab_EventScript_169DAE:: @ 8169DAE setvar VAR_OAKSLAB_RIVAL_STARTER_SPECIES, SPECIES_SQUIRTLE setvar VAR_OAKSLAB_RIVAL_STARTER_OBJID, 6 compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 - goto_if ge, EventScript_169DE4 + goto_if_ge EventScript_169DE4 compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2 - goto_if eq, EventScript_169BE1 + goto_if_eq EventScript_169BE1 msgbox gUnknown_818EA19 release end @@ -1344,8 +1334,7 @@ EventScript_169DE4:: @ 8169DE4 PalletTown_ProfessorOaksLab_EventScript_169DEE:: @ 8169DEE lock faceplayer - checkflag FLAG_SYS_GAME_CLEAR - goto_if TRUE, EventScript_169E03 + goto_if_set FLAG_SYS_GAME_CLEAR, EventScript_169E03 msgbox gUnknown_818EBE6 release end @@ -1359,8 +1348,7 @@ EventScript_169E03:: @ 8169E03 PalletTown_ProfessorOaksLab_EventScript_169E1A:: @ 8169E1A lock faceplayer - checkflag FLAG_SYS_GAME_CLEAR - goto_if TRUE, EventScript_169E2F + goto_if_set FLAG_SYS_GAME_CLEAR, EventScript_169E2F msgbox gUnknown_818EBE6 release end @@ -1394,7 +1382,7 @@ PalletTown_ProfessorOaksLab_EventScript_169E71:: @ 8169E71 PalletTown_ProfessorOaksLab_EventScript_169E7A:: @ 8169E7A lockall compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 6 - goto_if ge, EventScript_169E90 + goto_if_ge EventScript_169E90 msgbox gUnknown_818EA84 releaseall end diff --git a/data/maps/PewterCity/scripts.inc b/data/maps/PewterCity/scripts.inc index 8b196334c..4f9cef868 100644 --- a/data/maps/PewterCity/scripts.inc +++ b/data/maps/PewterCity/scripts.inc @@ -14,7 +14,7 @@ PewterCity_EventScript_165B9D:: @ 8165B9D closemessage playbgm MUS_ANNAI, 0 compare VAR_FACING, DIR_EAST - call_if eq, EventScript_165BD3 + call_if_eq EventScript_165BD3 msgbox gUnknown_817E6C7 closemessage applymovement 5, Movement_165D83 @@ -446,11 +446,11 @@ EventScript_165DBE:: @ 8165DBE closemessage playbgm MUS_ANNAI, 0 compare VAR_TEMP_1, 0 - call_if eq, EventScript_165E0A + call_if_eq EventScript_165E0A compare VAR_TEMP_1, 1 - call_if eq, EventScript_165E26 + call_if_eq EventScript_165E26 compare VAR_TEMP_1, 2 - call_if eq, EventScript_165E42 + call_if_eq EventScript_165E42 msgbox gUnknown_817E6C7 closemessage applymovement 5, Movement_165D83 @@ -1033,19 +1033,19 @@ PewterCity_EventScript_16607E:: @ 816607E faceplayer msgbox gUnknown_817E53E, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if eq, EventScript_166136 + goto_if_eq EventScript_166136 msgbox gUnknown_817E589 closemessage delay 10 playbgm MUS_ANNAI, 0 compare VAR_FACING, DIR_NORTH - call_if eq, EventScript_1660EE + call_if_eq EventScript_1660EE compare VAR_FACING, DIR_SOUTH - call_if eq, EventScript_166100 + call_if_eq EventScript_166100 compare VAR_FACING, DIR_WEST - call_if eq, EventScript_166112 + call_if_eq EventScript_166112 compare VAR_FACING, DIR_EAST - call_if eq, EventScript_166124 + call_if_eq EventScript_166124 msgbox gUnknown_817E5AC closemessage delay 10 @@ -1352,7 +1352,7 @@ PewterCity_EventScript_166244:: @ 8166244 faceplayer msgbox gUnknown_817E602, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if eq, EventScript_166263 + goto_if_eq EventScript_166263 msgbox gUnknown_817E644 release end @@ -1417,11 +1417,11 @@ PewterCity_EventScript_1662D1:: @ 81662D1 EventScript_1662DE:: @ 81662DE textcolor 0 compare VAR_TEMP_1, 1 - call_if eq, EventScript_1663CA + call_if_eq EventScript_1663CA compare VAR_TEMP_1, 2 - call_if eq, EventScript_1663CA + call_if_eq EventScript_1663CA compare VAR_TEMP_1, 3 - call_if eq, EventScript_1663CA + call_if_eq EventScript_1663CA waitse playse SE_PIN applymovement 7, Movement_ExclamationMark @@ -1430,13 +1430,13 @@ EventScript_1662DE:: @ 81662DE waitmovement 0 msgbox gUnknown_817E902 compare VAR_TEMP_1, 0 - call_if eq, EventScript_1663D5 + call_if_eq EventScript_1663D5 compare VAR_TEMP_1, 1 - call_if eq, EventScript_1663DA + call_if_eq EventScript_1663DA compare VAR_TEMP_1, 2 - call_if eq, EventScript_1663E6 + call_if_eq EventScript_1663E6 compare VAR_TEMP_1, 3 - call_if eq, EventScript_1663FC + call_if_eq EventScript_1663FC msgbox gUnknown_817E90C textcolor 3 playfanfare MUS_FAN5 @@ -1452,13 +1452,13 @@ EventScript_1662DE:: @ 81662DE msgbox gUnknown_817EA06 closemessage compare VAR_TEMP_1, 0 - call_if eq, EventScript_166412 + call_if_eq EventScript_166412 compare VAR_TEMP_1, 1 - call_if eq, EventScript_16641D + call_if_eq EventScript_16641D compare VAR_TEMP_1, 2 - call_if eq, EventScript_166428 + call_if_eq EventScript_166428 compare VAR_TEMP_1, 3 - call_if eq, EventScript_166433 + call_if_eq EventScript_166433 delay 30 textcolor 3 msgbox gUnknown_817EA36 diff --git a/data/maps/PewterCity_Gym/scripts.inc b/data/maps/PewterCity_Gym/scripts.inc index 906a53650..540cf7965 100644 --- a/data/maps/PewterCity_Gym/scripts.inc +++ b/data/maps/PewterCity_Gym/scripts.inc @@ -3,9 +3,8 @@ PewterCity_Gym_MapScripts:: @ 816A592 PewterCity_Gym_EventScript_16A593:: @ 816A593 famechecker FAMECHECKER_BROCK, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC, TRAINER_LEADER_BROCK, 0, Text_190CD4, Text_190E4F, EventScript_16A5C5 - checkflag FLAG_GOT_TM39_FROM_BROCK - goto_if FALSE, EventScript_16A5F3 + trainerbattle_single TRAINER_LEADER_BROCK, Text_190CD4, Text_190E4F, EventScript_16A5C5, NO_MUSIC + goto_if_unset FLAG_GOT_TM39_FROM_BROCK, EventScript_16A5F3 msgbox gUnknown_819110F release end @@ -25,9 +24,8 @@ EventScript_16A5F3:: @ 816A5F3 msgbox gUnknown_8190FC1 checkitemspace ITEM_TM39, 1 compare VAR_RESULT, 0 - goto_if eq, EventScript_16A634 - additem ITEM_TM39, 1 - giveitemfanfaremsg gUnknown_8190FDB, ITEM_TM39 + goto_if_eq EventScript_16A634 + giveitem_msg gUnknown_8190FDB, ITEM_TM39 setflag FLAG_GOT_TM39_FROM_BROCK msgbox gUnknown_8190FF8 release @@ -39,20 +37,19 @@ EventScript_16A634:: @ 816A634 end PewterCity_Gym_EventScript_16A63E:: @ 816A63E - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CAMPER_LIAM, 0, Text_1911EC, Text_191237 + trainerbattle_single TRAINER_CAMPER_LIAM, Text_1911EC, Text_191237 msgbox gUnknown_819126B, 6 end PewterCity_Gym_EventScript_16A655:: @ 816A655 lock faceplayer - checkflag FLAG_DEFEATED_BROCK - goto_if TRUE, EventScript_16A67F + goto_if_set FLAG_DEFEATED_BROCK, EventScript_16A67F msgbox gUnknown_8191298, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if eq, EventScript_16A689 + goto_if_eq EventScript_16A689 compare VAR_RESULT, 0 - goto_if eq, EventScript_16A697 + goto_if_eq EventScript_16A697 end EventScript_16A67F:: @ 816A67F @@ -77,8 +74,7 @@ EventScript_16A6A5:: @ 816A6A5 PewterCity_Gym_EventScript_16A6AF:: @ 816A6AF lockall - checkflag FLAG_BADGE01_GET - goto_if TRUE, EventScript_16A6C3 + goto_if_set FLAG_BADGE01_GET, EventScript_16A6C3 msgbox gUnknown_819146E releaseall end diff --git a/data/maps/PewterCity_Mart/scripts.inc b/data/maps/PewterCity_Mart/scripts.inc index 31ab70f51..72b021f20 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_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lock faceplayer message Text_MayIHelpYou diff --git a/data/maps/PewterCity_Museum_1F/scripts.inc b/data/maps/PewterCity_Museum_1F/scripts.inc index 3fdeee10c..be0f797f3 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_FACING, DIR_WEST - goto_if eq, EventScript_16A348 + goto_if_eq EventScript_16A348 compare VAR_FACING, DIR_SOUTH - goto_if eq, EventScript_16A348 + goto_if_eq EventScript_16A348 compare VAR_FACING, DIR_NORTH - goto_if eq, EventScript_16A348 + goto_if_eq EventScript_16A348 msgbox gUnknown_8190539 release end @@ -17,9 +17,9 @@ PewterCity_Museum_1F_EventScript_16A31B:: @ 816A31B EventScript_16A348:: @ 816A348 msgbox gUnknown_8190550, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if eq, EventScript_16A367 + goto_if_eq EventScript_16A367 compare VAR_RESULT, 0 - goto_if eq, EventScript_16A37B + goto_if_eq EventScript_16A37B end EventScript_16A367:: @ 816A367 @@ -65,7 +65,7 @@ EventScript_16A3D1:: @ 816A3D1 showmoneybox 0, 0, 0 msgbox gUnknown_81904B5, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if eq, EventScript_16A402 + goto_if_eq EventScript_16A402 msgbox gUnknown_81904F9 closemessage hidemoneybox 0, 0 @@ -77,14 +77,14 @@ EventScript_16A3D1:: @ 816A3D1 EventScript_16A402:: @ 816A402 checkmoney 50, 0 compare VAR_RESULT, 0 - goto_if eq, EventScript_16A476 + goto_if_eq EventScript_16A476 closemessage compare VAR_TEMP_1, 0 - call_if eq, EventScript_16A455 + call_if_eq EventScript_16A455 compare VAR_TEMP_1, 1 - call_if eq, EventScript_16A460 + call_if_eq EventScript_16A460 compare VAR_TEMP_1, 2 - call_if eq, EventScript_16A46B + call_if_eq EventScript_16A46B playse SE_SHOP takemoney 50, 0 updatemoneybox 0, 0, 0 @@ -152,16 +152,14 @@ PewterCity_Museum_1F_EventScript_16A4A5:: @ 816A4A5 PewterCity_Museum_1F_EventScript_16A4AE:: @ 816A4AE lock faceplayer - checkflag FLAG_GOT_OLD_AMBER - goto_if TRUE, EventScript_16A4FF + goto_if_set FLAG_GOT_OLD_AMBER, EventScript_16A4FF msgbox gUnknown_8190717 checkitemspace ITEM_OLD_AMBER, 1 compare VAR_RESULT, 0 - goto_if eq, EventScript_16A4F5 + goto_if_eq EventScript_16A4F5 setflag FLAG_GOT_OLD_AMBER removeobject 4 - additem ITEM_OLD_AMBER, 1 - giveitemfanfaremsg gUnknown_8190866, ITEM_OLD_AMBER, 1, MUS_FAN5 + giveitem_msg gUnknown_8190866, ITEM_OLD_AMBER, 1, MUS_FAN5 release end diff --git a/data/maps/PokemonLeague_AgathasRoom/scripts.inc b/data/maps/PokemonLeague_AgathasRoom/scripts.inc index 56816cd76..62293c1ec 100644 --- a/data/maps/PokemonLeague_AgathasRoom/scripts.inc +++ b/data/maps/PokemonLeague_AgathasRoom/scripts.inc @@ -11,10 +11,9 @@ PokemonLeague_AgathasRoom_OnResume:: @ 8162825 end PokemonLeague_AgathasRoom_OnLoad:: @ 8162830 - checkflag FLAG_DEFEATED_AGATHA - call_if TRUE, EventScript_16284B + call_if_set FLAG_DEFEATED_AGATHA, EventScript_16284B compare VAR_MAP_SCENE_POKEMON_LEAGUE, 3 - call_if eq, EventScript_162845 + call_if_eq EventScript_162845 end EventScript_162845:: @ 8162845 @@ -48,21 +47,16 @@ PokemonLeague_AgathasRoom_EventScript_162877:: @ 8162877 lock faceplayer famechecker FAMECHECKER_AGATHA, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 - checkflag FLAG_DEFEATED_AGATHA - goto_if TRUE, EventScript_162911 + goto_if_set FLAG_DEFEATED_AGATHA, EventScript_162911 famechecker FAMECHECKER_AGATHA, 0 famechecker FAMECHECKER_AGATHA, 4 famechecker FAMECHECKER_OAK, 4 - checkflag FLAG_SYS_GAME_CLEAR - call_if FALSE, EventScript_1628E9 - checkflag FLAG_SYS_GAME_CLEAR - call_if TRUE, EventScript_1628F2 + call_if_unset FLAG_SYS_GAME_CLEAR, EventScript_1628E9 + call_if_set FLAG_SYS_GAME_CLEAR, EventScript_1628F2 setflag FLAG_TEMP_3 setflag FLAG_TEMP_5 - checkflag FLAG_SYS_CAN_LINK_WITH_RS - call_if FALSE, EventScript_1628FB - checkflag FLAG_SYS_CAN_LINK_WITH_RS - call_if TRUE, EventScript_162906 + call_if_unset FLAG_SYS_CAN_LINK_WITH_RS, EventScript_1628FB + call_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_162906 clearflag FLAG_TEMP_5 goto EventScript_16291B @@ -78,11 +72,11 @@ EventScript_1628F2:: @ 81628F2 return EventScript_1628FB:: @ 81628FB - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_ELITE_FOUR_AGATHA, 0, Text_1786D7 + trainerbattle_no_intro TRAINER_ELITE_FOUR_AGATHA, Text_1786D7 return EventScript_162906:: @ 8162906 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_ELITE_FOUR_AGATHA_2, 0, Text_1786D7 + trainerbattle_no_intro TRAINER_ELITE_FOUR_AGATHA_2, Text_1786D7 return EventScript_162911:: @ 8162911 diff --git a/data/maps/PokemonLeague_BrunosRoom/scripts.inc b/data/maps/PokemonLeague_BrunosRoom/scripts.inc index 2f3fd90a1..709b5ab03 100644 --- a/data/maps/PokemonLeague_BrunosRoom/scripts.inc +++ b/data/maps/PokemonLeague_BrunosRoom/scripts.inc @@ -11,10 +11,9 @@ PokemonLeague_BrunosRoom_OnResume:: @ 816269A end PokemonLeague_BrunosRoom_OnLoad:: @ 81626A5 - checkflag FLAG_DEFEATED_BRUNO - call_if TRUE, EventScript_1626C0 + call_if_set FLAG_DEFEATED_BRUNO, EventScript_1626C0 compare VAR_MAP_SCENE_POKEMON_LEAGUE, 2 - call_if eq, EventScript_1626BA + call_if_eq EventScript_1626BA end EventScript_1626BA:: @ 81626BA @@ -48,20 +47,15 @@ PokemonLeague_BrunosRoom_EventScript_1626EC:: @ 81626EC lock faceplayer famechecker FAMECHECKER_BRUNO, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 - checkflag FLAG_DEFEATED_BRUNO - goto_if TRUE, EventScript_162779 + goto_if_set FLAG_DEFEATED_BRUNO, EventScript_162779 famechecker FAMECHECKER_BRUNO, 0 famechecker FAMECHECKER_BRUNO, 1 - checkflag FLAG_SYS_GAME_CLEAR - call_if FALSE, EventScript_162751 - checkflag FLAG_SYS_GAME_CLEAR - call_if TRUE, EventScript_16275A + call_if_unset FLAG_SYS_GAME_CLEAR, EventScript_162751 + call_if_set FLAG_SYS_GAME_CLEAR, EventScript_16275A setflag FLAG_TEMP_3 setflag FLAG_TEMP_5 - checkflag FLAG_SYS_CAN_LINK_WITH_RS - call_if FALSE, EventScript_162763 - checkflag FLAG_SYS_CAN_LINK_WITH_RS - call_if TRUE, EventScript_16276E + call_if_unset FLAG_SYS_CAN_LINK_WITH_RS, EventScript_162763 + call_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_16276E clearflag FLAG_TEMP_5 goto EventScript_1627B0 @@ -77,24 +71,24 @@ EventScript_16275A:: @ 816275A return EventScript_162763:: @ 8162763 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_ELITE_FOUR_BRUNO, 0, Text_178409 + trainerbattle_no_intro TRAINER_ELITE_FOUR_BRUNO, Text_178409 return EventScript_16276E:: @ 816276E - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_ELITE_FOUR_BRUNO_2, 0, Text_178409 + trainerbattle_no_intro TRAINER_ELITE_FOUR_BRUNO_2, Text_178409 return EventScript_162779:: @ 8162779 msgbox gUnknown_8178420 closemessage compare VAR_FACING, DIR_NORTH - call_if eq, EventScript_1627FA + call_if_eq EventScript_1627FA compare VAR_FACING, DIR_SOUTH - call_if eq, EventScript_1627EF + call_if_eq EventScript_1627EF compare VAR_FACING, DIR_WEST - call_if eq, EventScript_162805 + call_if_eq EventScript_162805 compare VAR_FACING, DIR_EAST - call_if eq, EventScript_162805 + call_if_eq EventScript_162805 release end @@ -104,13 +98,13 @@ EventScript_1627B0:: @ 81627B0 msgbox gUnknown_8178420 closemessage compare VAR_FACING, DIR_NORTH - call_if eq, EventScript_1627FA + call_if_eq EventScript_1627FA compare VAR_FACING, DIR_SOUTH - call_if eq, EventScript_1627EF + call_if_eq EventScript_1627EF compare VAR_FACING, DIR_WEST - call_if eq, EventScript_162805 + call_if_eq EventScript_162805 compare VAR_FACING, DIR_EAST - call_if eq, EventScript_162805 + call_if_eq EventScript_162805 release end diff --git a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc index 87754a660..010dd4402 100644 --- a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc +++ b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc @@ -8,32 +8,32 @@ PokemonLeague_ChampionsRoom_OnResume:: @ 8162AF2 setvar VAR_0x8004, 4 call EventScript_1A75D5 compare VAR_STARTER_MON, 2 - call_if eq, EventScript_162B1E + call_if_eq EventScript_162B1E compare VAR_STARTER_MON, 1 - call_if eq, EventScript_162B31 + call_if_eq EventScript_162B31 compare VAR_STARTER_MON, 0 - call_if eq, EventScript_162B44 + call_if_eq EventScript_162B44 end EventScript_162B1E:: @ 8162B1E checktrainerflag TRAINER_CHAMPION_FIRST_SQUIRTLE - goto_if eq, EventScript_162B57 + goto_if_eq EventScript_162B57 checktrainerflag TRAINER_CHAMPION_REMATCH_SQUIRTLE - goto_if eq, EventScript_162B57 + goto_if_eq EventScript_162B57 return EventScript_162B31:: @ 8162B31 checktrainerflag TRAINER_CHAMPION_FIRST_BULBASAUR - goto_if eq, EventScript_162B57 + goto_if_eq EventScript_162B57 checktrainerflag TRAINER_CHAMPION_REMATCH_BULBASAUR - goto_if eq, EventScript_162B57 + goto_if_eq EventScript_162B57 return EventScript_162B44:: @ 8162B44 checktrainerflag TRAINER_CHAMPION_FIRST_CHARMANDER - goto_if eq, EventScript_162B57 + goto_if_eq EventScript_162B57 checktrainerflag TRAINER_CHAMPION_REMATCH_CHARMANDER - goto_if eq, EventScript_162B57 + goto_if_eq EventScript_162B57 return EventScript_162B57:: @ 8162B57 @@ -59,20 +59,16 @@ EventScript_162B76:: @ 8162B76 applymovement OBJ_EVENT_ID_PLAYER, Movement_162D07 waitmovement 0 delay 20 - checkflag FLAG_SYS_GAME_CLEAR - call_if FALSE, EventScript_162CB3 - checkflag FLAG_SYS_GAME_CLEAR - call_if TRUE, EventScript_162CBC + call_if_unset FLAG_SYS_GAME_CLEAR, EventScript_162CB3 + call_if_set FLAG_SYS_GAME_CLEAR, EventScript_162CBC special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_162C68 + goto_if_eq EventScript_162C68 setflag FLAG_TEMP_3 setflag FLAG_TEMP_5 savebgm MUS_WIN_GYM - checkflag FLAG_SYS_CAN_LINK_WITH_RS - call_if FALSE, EventScript_162C6F - checkflag FLAG_SYS_CAN_LINK_WITH_RS - call_if TRUE, EventScript_162C91 + call_if_unset FLAG_SYS_CAN_LINK_WITH_RS, EventScript_162C6F + call_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_162C91 setflag FLAG_TEMP_4 clearflag FLAG_TEMP_5 setflag FLAG_DEFEATED_CHAMP @@ -117,20 +113,20 @@ EventScript_162C68:: @ 8162C68 EventScript_162C6F:: @ 8162C6F compare VAR_STARTER_MON, 2 - call_if eq, EventScript_162CC5 + call_if_eq EventScript_162CC5 compare VAR_STARTER_MON, 1 - call_if eq, EventScript_162CD0 + call_if_eq EventScript_162CD0 compare VAR_STARTER_MON, 0 - call_if eq, EventScript_162CDB + call_if_eq EventScript_162CDB return EventScript_162C91:: @ 8162C91 compare VAR_STARTER_MON, 2 - call_if eq, EventScript_162CE6 + call_if_eq EventScript_162CE6 compare VAR_STARTER_MON, 1 - call_if eq, EventScript_162CF1 + call_if_eq EventScript_162CF1 compare VAR_STARTER_MON, 0 - call_if eq, EventScript_162CFC + call_if_eq EventScript_162CFC return EventScript_162CB3:: @ 8162CB3 @@ -142,27 +138,27 @@ EventScript_162CBC:: @ 8162CBC return EventScript_162CC5:: @ 8162CC5 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_CHAMPION_FIRST_SQUIRTLE, 0, Text_178E3F + trainerbattle_no_intro TRAINER_CHAMPION_FIRST_SQUIRTLE, Text_178E3F return EventScript_162CD0:: @ 8162CD0 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_CHAMPION_FIRST_BULBASAUR, 0, Text_178E3F + trainerbattle_no_intro TRAINER_CHAMPION_FIRST_BULBASAUR, Text_178E3F return EventScript_162CDB:: @ 8162CDB - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_CHAMPION_FIRST_CHARMANDER, 0, Text_178E3F + trainerbattle_no_intro TRAINER_CHAMPION_FIRST_CHARMANDER, Text_178E3F return EventScript_162CE6:: @ 8162CE6 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_CHAMPION_REMATCH_SQUIRTLE, 0, Text_178E3F + trainerbattle_no_intro TRAINER_CHAMPION_REMATCH_SQUIRTLE, Text_178E3F return EventScript_162CF1:: @ 8162CF1 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_CHAMPION_REMATCH_BULBASAUR, 0, Text_178E3F + trainerbattle_no_intro TRAINER_CHAMPION_REMATCH_BULBASAUR, Text_178E3F return EventScript_162CFC:: @ 8162CFC - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_CHAMPION_REMATCH_CHARMANDER, 0, Text_178E3F + trainerbattle_no_intro TRAINER_CHAMPION_REMATCH_CHARMANDER, Text_178E3F return Movement_162D07:: @ 8162D07 diff --git a/data/maps/PokemonLeague_LancesRoom/scripts.inc b/data/maps/PokemonLeague_LancesRoom/scripts.inc index d082de03b..8c6b9924e 100644 --- a/data/maps/PokemonLeague_LancesRoom/scripts.inc +++ b/data/maps/PokemonLeague_LancesRoom/scripts.inc @@ -12,9 +12,8 @@ PokemonLeague_LancesRoom_OnResume:: @ 8162942 PokemonLeague_LancesRoom_OnLoad:: @ 816294D compare VAR_MAP_SCENE_POKEMON_LEAGUE, 4 - call_if eq, EventScript_162962 - checkflag FLAG_DEFEATED_LANCE - call_if TRUE, EventScript_162968 + call_if_eq EventScript_162962 + call_if_set FLAG_DEFEATED_LANCE, EventScript_162968 end EventScript_162962:: @ 8162962 @@ -102,20 +101,15 @@ PokemonLeague_LancesRoom_EventScript_162A14:: @ 8162A14 lock faceplayer famechecker FAMECHECKER_LANCE, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 - checkflag FLAG_DEFEATED_LANCE - goto_if TRUE, EventScript_162AA1 + goto_if_set FLAG_DEFEATED_LANCE, EventScript_162AA1 famechecker FAMECHECKER_LANCE, 0 famechecker FAMECHECKER_LANCE, 1 - checkflag FLAG_SYS_GAME_CLEAR - call_if FALSE, EventScript_162A79 - checkflag FLAG_SYS_GAME_CLEAR - call_if TRUE, EventScript_162A82 + call_if_unset FLAG_SYS_GAME_CLEAR, EventScript_162A79 + call_if_set FLAG_SYS_GAME_CLEAR, EventScript_162A82 setflag FLAG_TEMP_3 setflag FLAG_TEMP_5 - checkflag FLAG_SYS_CAN_LINK_WITH_RS - call_if FALSE, EventScript_162A8B - checkflag FLAG_SYS_CAN_LINK_WITH_RS - call_if TRUE, EventScript_162A96 + call_if_unset FLAG_SYS_CAN_LINK_WITH_RS, EventScript_162A8B + call_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_162A96 clearflag FLAG_TEMP_5 goto EventScript_162AAB @@ -131,11 +125,11 @@ EventScript_162A82:: @ 8162A82 return EventScript_162A8B:: @ 8162A8B - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_ELITE_FOUR_LANCE, 0, Text_178A15 + trainerbattle_no_intro TRAINER_ELITE_FOUR_LANCE, Text_178A15 return EventScript_162A96:: @ 8162A96 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_ELITE_FOUR_LANCE_2, 0, Text_178A15 + trainerbattle_no_intro TRAINER_ELITE_FOUR_LANCE_2, Text_178A15 return EventScript_162AA1:: @ 8162AA1 diff --git a/data/maps/PokemonLeague_LoreleisRoom/scripts.inc b/data/maps/PokemonLeague_LoreleisRoom/scripts.inc index 449bd9f9a..e95ecfd98 100644 --- a/data/maps/PokemonLeague_LoreleisRoom/scripts.inc +++ b/data/maps/PokemonLeague_LoreleisRoom/scripts.inc @@ -12,10 +12,9 @@ PokemonLeague_LoreleisRoom_OnResume:: @ 8162586 end PokemonLeague_LoreleisRoom_OnLoad:: @ 8162591 - checkflag FLAG_DEFEATED_LORELEI - call_if TRUE, EventScript_1625AC + call_if_set FLAG_DEFEATED_LORELEI, EventScript_1625AC compare VAR_MAP_SCENE_POKEMON_LEAGUE, 1 - call_if eq, EventScript_1625A6 + call_if_eq EventScript_1625A6 end EventScript_1625A6:: @ 81625A6 @@ -53,20 +52,15 @@ PokemonLeague_LoreleisRoom_EventScript_1625DC:: @ 81625DC lock faceplayer famechecker FAMECHECKER_LORELEI, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 - checkflag FLAG_DEFEATED_LORELEI - goto_if TRUE, EventScript_162669 + goto_if_set FLAG_DEFEATED_LORELEI, EventScript_162669 famechecker FAMECHECKER_LORELEI, 0 famechecker FAMECHECKER_LORELEI, 1 - checkflag FLAG_SYS_CAN_LINK_WITH_RS - call_if FALSE, EventScript_162641 - checkflag FLAG_SYS_CAN_LINK_WITH_RS - call_if TRUE, EventScript_16264A + call_if_unset FLAG_SYS_CAN_LINK_WITH_RS, EventScript_162641 + call_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_16264A setflag FLAG_TEMP_3 setflag FLAG_TEMP_5 - checkflag FLAG_SYS_CAN_LINK_WITH_RS - call_if FALSE, EventScript_162653 - checkflag FLAG_SYS_CAN_LINK_WITH_RS - call_if TRUE, EventScript_16265E + call_if_unset FLAG_SYS_CAN_LINK_WITH_RS, EventScript_162653 + call_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_16265E clearflag FLAG_TEMP_5 goto EventScript_162673 @@ -82,11 +76,11 @@ EventScript_16264A:: @ 816264A return EventScript_162653:: @ 8162653 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_ELITE_FOUR_LORELEI, 0, Text_178191 + trainerbattle_no_intro TRAINER_ELITE_FOUR_LORELEI, Text_178191 return EventScript_16265E:: @ 816265E - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_ELITE_FOUR_LORELEI_2, 0, Text_178191 + trainerbattle_no_intro TRAINER_ELITE_FOUR_LORELEI_2, Text_178191 return EventScript_162669:: @ 8162669 diff --git a/data/maps/PokemonMansion_1F/scripts.inc b/data/maps/PokemonMansion_1F/scripts.inc index cacbe77da..42fe1d0b1 100644 --- a/data/maps/PokemonMansion_1F/scripts.inc +++ b/data/maps/PokemonMansion_1F/scripts.inc @@ -4,8 +4,7 @@ PokemonMansion_1F_MapScripts:: @ 81621F9 .byte 0 PokemonMansion_1F_OnLoad:: @ 8162204 - checkflag FLAG_POKEMON_MANSION_SWITCH_STATE - call_if TRUE, EventScript_1A7B7A + call_if_set FLAG_POKEMON_MANSION_SWITCH_STATE, EventScript_1A7B7A end PokemonMansion_1F_OnTransition:: @ 816220E @@ -23,11 +22,11 @@ PokemonMansion_1F_EventScript_162212:: @ 8162212 end PokemonMansion_1F_EventScript_162226:: @ 8162226 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SCIENTIST_TED, 0, Text_177364, Text_177391 + trainerbattle_single TRAINER_SCIENTIST_TED, Text_177364, Text_177391 msgbox gUnknown_8177397, 6 end PokemonMansion_1F_EventScript_16223D:: @ 816223D - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_YOUNGSTER_JOHNSON, 0, Text_1773C6, Text_1773FD + trainerbattle_single TRAINER_YOUNGSTER_JOHNSON, Text_1773C6, Text_1773FD msgbox gUnknown_8177418, 6 end diff --git a/data/maps/PokemonMansion_2F/scripts.inc b/data/maps/PokemonMansion_2F/scripts.inc index 965993fc8..bc80d5344 100644 --- a/data/maps/PokemonMansion_2F/scripts.inc +++ b/data/maps/PokemonMansion_2F/scripts.inc @@ -3,8 +3,7 @@ PokemonMansion_2F_MapScripts:: @ 8162254 .byte 0 PokemonMansion_2F_OnLoad:: @ 816225A - checkflag FLAG_POKEMON_MANSION_SWITCH_STATE - call_if TRUE, EventScript_1A7D3E + call_if_set FLAG_POKEMON_MANSION_SWITCH_STATE, EventScript_1A7D3E end PokemonMansion_2F_EventScript_162264:: @ 8162264 @@ -26,6 +25,6 @@ PokemonMansion_2F_EventScript_162281:: @ 8162281 end PokemonMansion_2F_EventScript_16228A:: @ 816228A - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BURGLAR_ARNIE, 0, Text_177498, Text_1774CB + trainerbattle_single TRAINER_BURGLAR_ARNIE, Text_177498, Text_1774CB msgbox gUnknown_81774E3, 6 end diff --git a/data/maps/PokemonMansion_3F/scripts.inc b/data/maps/PokemonMansion_3F/scripts.inc index 141c63c7e..ff194f1ec 100644 --- a/data/maps/PokemonMansion_3F/scripts.inc +++ b/data/maps/PokemonMansion_3F/scripts.inc @@ -3,8 +3,7 @@ PokemonMansion_3F_MapScripts:: @ 81622A1 .byte 0 PokemonMansion_3F_OnLoad:: @ 81622A7 - checkflag FLAG_POKEMON_MANSION_SWITCH_STATE - call_if TRUE, EventScript_1A7E72 + call_if_set FLAG_POKEMON_MANSION_SWITCH_STATE, EventScript_1A7E72 end PokemonMansion_3F_EventScript_1622B1:: @ 81622B1 @@ -22,11 +21,11 @@ PokemonMansion_3F_EventScript_1622C5:: @ 81622C5 end PokemonMansion_3F_EventScript_1622CE:: @ 81622CE - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BURGLAR_SIMON, 0, Text_1775E7, Text_177602 + trainerbattle_single TRAINER_BURGLAR_SIMON, Text_1775E7, Text_177602 msgbox gUnknown_8177608, 6 end PokemonMansion_3F_EventScript_1622E5:: @ 81622E5 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SCIENTIST_BRAYDON, 0, Text_177628, Text_177643 + trainerbattle_single TRAINER_SCIENTIST_BRAYDON, Text_177628, Text_177643 msgbox gUnknown_8177657, 6 end diff --git a/data/maps/PokemonMansion_B1F/scripts.inc b/data/maps/PokemonMansion_B1F/scripts.inc index 7d1e70692..db087a466 100644 --- a/data/maps/PokemonMansion_B1F/scripts.inc +++ b/data/maps/PokemonMansion_B1F/scripts.inc @@ -3,8 +3,7 @@ PokemonMansion_B1F_MapScripts:: @ 81622FC .byte 0 PokemonMansion_B1F_OnLoad:: @ 8162302 - checkflag FLAG_POKEMON_MANSION_SWITCH_STATE - call_if TRUE, EventScript_1A7F4C + call_if_set FLAG_POKEMON_MANSION_SWITCH_STATE, EventScript_1A7F4C end PokemonMansion_B1F_EventScript_16230C:: @ 816230C @@ -22,11 +21,11 @@ PokemonMansion_B1F_EventScript_162320:: @ 8162320 end PokemonMansion_B1F_EventScript_162329:: @ 8162329 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BURGLAR_LEWIS, 0, Text_1776C0, Text_1776D7 + trainerbattle_single TRAINER_BURGLAR_LEWIS, Text_1776C0, Text_1776D7 msgbox gUnknown_81776DE, 6 end PokemonMansion_B1F_EventScript_162340:: @ 8162340 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SCIENTIST_IVAN, 0, Text_177720, Text_177757 + trainerbattle_single TRAINER_SCIENTIST_IVAN, Text_177720, Text_177757 msgbox gUnknown_817776A, 6 end diff --git a/data/maps/PokemonTower_1F/scripts.inc b/data/maps/PokemonTower_1F/scripts.inc index 35e34047e..01686671a 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_RESULT, 0 - goto_if eq, EventScript_163272 + goto_if_eq EventScript_163272 msgbox gUnknown_8179BFC release end diff --git a/data/maps/PokemonTower_2F/scripts.inc b/data/maps/PokemonTower_2F/scripts.inc index eb47508bf..802247402 100644 --- a/data/maps/PokemonTower_2F/scripts.inc +++ b/data/maps/PokemonTower_2F/scripts.inc @@ -21,9 +21,9 @@ EventScript_1632A7:: @ 81632A7 textcolor 0 playbgm MUS_RIVAL1, 0 compare VAR_TEMP_1, 0 - call_if eq, EventScript_163339 + call_if_eq EventScript_163339 compare VAR_TEMP_1, 1 - call_if eq, EventScript_16334B + call_if_eq EventScript_16334B applymovement 1, Movement_ExclamationMark waitmovement 0 applymovement 1, Movement_Delay48 @@ -31,18 +31,18 @@ EventScript_1632A7:: @ 81632A7 msgbox gUnknown_8179CFF setvar VAR_LAST_TALKED, 1 compare VAR_STARTER_MON, 2 - call_if eq, EventScript_16335D + call_if_eq EventScript_16335D compare VAR_STARTER_MON, 1 - call_if eq, EventScript_163368 + call_if_eq EventScript_163368 compare VAR_STARTER_MON, 0 - call_if eq, EventScript_163373 + call_if_eq EventScript_163373 msgbox gUnknown_8179DD4 closemessage playbgm MUS_RIVAL2, 0 compare VAR_TEMP_1, 0 - call_if eq, EventScript_16337E + call_if_eq EventScript_16337E compare VAR_TEMP_1, 1 - call_if eq, EventScript_163389 + call_if_eq EventScript_163389 playse SE_KAIDAN delay 25 fadedefaultbgm @@ -64,15 +64,15 @@ EventScript_16334B:: @ 816334B return EventScript_16335D:: @ 816335D - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_RIVAL_POKENON_TOWER_SQUIRTLE, 0, Text_179D73 + trainerbattle_no_intro TRAINER_RIVAL_POKENON_TOWER_SQUIRTLE, Text_179D73 return EventScript_163368:: @ 8163368 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_RIVAL_POKENON_TOWER_BULBASAUR, 0, Text_179D73 + trainerbattle_no_intro TRAINER_RIVAL_POKENON_TOWER_BULBASAUR, Text_179D73 return EventScript_163373:: @ 8163373 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_RIVAL_POKENON_TOWER_CHARMANDER, 0, Text_179D73 + trainerbattle_no_intro TRAINER_RIVAL_POKENON_TOWER_CHARMANDER, Text_179D73 return EventScript_16337E:: @ 816337E diff --git a/data/maps/PokemonTower_3F/scripts.inc b/data/maps/PokemonTower_3F/scripts.inc index 653a4e434..d38b39b66 100644 --- a/data/maps/PokemonTower_3F/scripts.inc +++ b/data/maps/PokemonTower_3F/scripts.inc @@ -2,16 +2,16 @@ PokemonTower_3F_MapScripts:: @ 81633A6 .byte 0 PokemonTower_3F_EventScript_1633A7:: @ 81633A7 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CHANNELER_PATRICIA, 0, Text_179FA0, Text_179FBC + trainerbattle_single TRAINER_CHANNELER_PATRICIA, Text_179FA0, Text_179FBC msgbox gUnknown_8179FD3, 6 end PokemonTower_3F_EventScript_1633BE:: @ 81633BE - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CHANNELER_CARLY, 0, Text_179F62, Text_179F72 + trainerbattle_single TRAINER_CHANNELER_CARLY, Text_179F62, Text_179F72 msgbox gUnknown_8179F88, 6 end PokemonTower_3F_EventScript_1633D5:: @ 81633D5 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CHANNELER_HOPE, 0, Text_179F09, Text_179F21 + trainerbattle_single TRAINER_CHANNELER_HOPE, Text_179F09, Text_179F21 msgbox gUnknown_8179F31, 6 end diff --git a/data/maps/PokemonTower_4F/scripts.inc b/data/maps/PokemonTower_4F/scripts.inc index 7aa23fbe8..c6745eb70 100644 --- a/data/maps/PokemonTower_4F/scripts.inc +++ b/data/maps/PokemonTower_4F/scripts.inc @@ -2,16 +2,16 @@ PokemonTower_4F_MapScripts:: @ 81633EC .byte 0 PokemonTower_4F_EventScript_1633ED:: @ 81633ED - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CHANNELER_PAULA, 0, Text_17A004, Text_17A017 + trainerbattle_single TRAINER_CHANNELER_PAULA, Text_17A004, Text_17A017 msgbox gUnknown_817A02B, 6 end PokemonTower_4F_EventScript_163404:: @ 8163404 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CHANNELER_LAUREL, 0, Text_17A046, Text_17A061 + trainerbattle_single TRAINER_CHANNELER_LAUREL, Text_17A046, Text_17A061 msgbox gUnknown_817A067, 6 end PokemonTower_4F_EventScript_16341B:: @ 816341B - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CHANNELER_JODY, 0, Text_17A096, Text_17A0AB + trainerbattle_single TRAINER_CHANNELER_JODY, Text_17A096, Text_17A0AB msgbox gUnknown_817A0BB, 6 end diff --git a/data/maps/PokemonTower_5F/scripts.inc b/data/maps/PokemonTower_5F/scripts.inc index 18dc1aedd..156cfd038 100644 --- a/data/maps/PokemonTower_5F/scripts.inc +++ b/data/maps/PokemonTower_5F/scripts.inc @@ -22,21 +22,21 @@ PokemonTower_5F_EventScript_163453:: @ 8163453 end PokemonTower_5F_EventScript_16345B:: @ 816345B - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CHANNELER_TAMMY, 0, Text_17A11F, Text_17A132 + trainerbattle_single TRAINER_CHANNELER_TAMMY, Text_17A11F, Text_17A132 msgbox gUnknown_817A138, 6 end PokemonTower_5F_EventScript_163472:: @ 8163472 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CHANNELER_RUTH, 0, Text_17A150, Text_17A164 + trainerbattle_single TRAINER_CHANNELER_RUTH, Text_17A150, Text_17A164 msgbox gUnknown_817A176, 6 end PokemonTower_5F_EventScript_163489:: @ 8163489 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CHANNELER_KARINA, 0, Text_17A187, Text_17A190 + trainerbattle_single TRAINER_CHANNELER_KARINA, Text_17A187, Text_17A190 msgbox gUnknown_817A194, 6 end PokemonTower_5F_EventScript_1634A0:: @ 81634A0 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CHANNELER_JANAE, 0, Text_17A1AA, Text_17A1B7 + trainerbattle_single TRAINER_CHANNELER_JANAE, Text_17A1AA, Text_17A1B7 msgbox gUnknown_817A1BD, 6 end diff --git a/data/maps/PokemonTower_6F/scripts.inc b/data/maps/PokemonTower_6F/scripts.inc index 42c419d8e..3d74508e6 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_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 setwildbattle SPECIES_MAROWAK, 30, ITEM_NONE special ScrSpecial_StartMarowakBattle waitstate special sub_8112364 compare VAR_RESULT, 0 - goto_if eq, EventScript_1634F5 + goto_if_eq EventScript_1634F5 applymovement OBJ_EVENT_ID_PLAYER, Movement_163512 waitmovement 0 releaseall @@ -36,16 +36,16 @@ Movement_163512:: @ 8163512 step_end PokemonTower_6F_EventScript_163514:: @ 8163514 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CHANNELER_ANGELICA, 0, Text_17A243, Text_17A253 + trainerbattle_single TRAINER_CHANNELER_ANGELICA, Text_17A243, Text_17A253 msgbox gUnknown_817A25A, 6 end PokemonTower_6F_EventScript_16352B:: @ 816352B - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CHANNELER_EMILIA, 0, Text_17A272, Text_17A27F + trainerbattle_single TRAINER_CHANNELER_EMILIA, Text_17A272, Text_17A27F msgbox gUnknown_817A293, 6 end PokemonTower_6F_EventScript_163542:: @ 8163542 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CHANNELER_JENNIFER, 0, Text_17A2C8, Text_17A2DC + trainerbattle_single TRAINER_CHANNELER_JENNIFER, Text_17A2C8, Text_17A2DC msgbox gUnknown_817A2E2, 6 end diff --git a/data/maps/PokemonTower_7F/scripts.inc b/data/maps/PokemonTower_7F/scripts.inc index 73a22762d..5ce28e764 100644 --- a/data/maps/PokemonTower_7F/scripts.inc +++ b/data/maps/PokemonTower_7F/scripts.inc @@ -16,7 +16,7 @@ PokemonTower_7F_EventScript_16355A:: @ 816355A end PokemonTower_7F_EventScript_163586:: @ 8163586 - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_TEAM_ROCKET_GRUNT_19, 0, Text_17A380, Text_17A3A4, EventScript_1635A1 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_19, Text_17A380, Text_17A3A4, EventScript_1635A1 msgbox gUnknown_817A3AF, 6 end @@ -25,11 +25,11 @@ EventScript_1635A1:: @ 81635A1 closemessage getplayerxy VAR_0x8004, VAR_0x8005 compare VAR_0x8004, 10 - goto_if eq, EventScript_1635E0 + goto_if_eq EventScript_1635E0 compare VAR_0x8004, 11 - goto_if eq, EventScript_1635F0 + goto_if_eq EventScript_1635F0 compare VAR_0x8004, 9 - goto_if eq, EventScript_163600 + goto_if_eq EventScript_163600 applymovement 2, Movement_16362C waitmovement 0 goto EventScript_163616 @@ -103,7 +103,7 @@ Movement_163633:: @ 8163633 step_end PokemonTower_7F_EventScript_16363D:: @ 816363D - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_TEAM_ROCKET_GRUNT_20, 0, Text_17A3CD, Text_17A466, EventScript_163658 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_20, Text_17A3CD, Text_17A466, EventScript_163658 msgbox gUnknown_817A477, 6 end @@ -113,9 +113,9 @@ EventScript_163658:: @ 8163658 closemessage getplayerxy VAR_0x8004, VAR_0x8005 compare VAR_0x8004, 12 - goto_if eq, EventScript_163699 + goto_if_eq EventScript_163699 compare VAR_0x8004, 13 - goto_if eq, EventScript_1636A9 + goto_if_eq EventScript_1636A9 applymovement 3, Movement_1636C6 waitmovement 0 goto EventScript_1636B9 @@ -169,7 +169,7 @@ Movement_1636CD:: @ 81636CD step_end PokemonTower_7F_EventScript_1636D6:: @ 81636D6 - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_TEAM_ROCKET_GRUNT_21, 0, Text_17A4CF, Text_17A4EE, EventScript_1636F1 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_21, Text_17A4CF, Text_17A4EE, EventScript_1636F1 msgbox gUnknown_817A506, 6 end @@ -178,9 +178,9 @@ EventScript_1636F1:: @ 81636F1 closemessage getplayerxy VAR_0x8004, VAR_0x8005 compare VAR_0x8004, 10 - goto_if eq, EventScript_163725 + goto_if_eq EventScript_163725 compare VAR_0x8004, 9 - goto_if eq, EventScript_163735 + goto_if_eq EventScript_163735 applymovement 4, Movement_163754 waitmovement 0 goto EventScript_163745 diff --git a/data/maps/PowerPlant/scripts.inc b/data/maps/PowerPlant/scripts.inc index cb9867905..1af3e9e76 100644 --- a/data/maps/PowerPlant/scripts.inc +++ b/data/maps/PowerPlant/scripts.inc @@ -4,25 +4,21 @@ PowerPlant_MapScripts:: @ 8163764 .byte 0 PowerPlant_OnResume:: @ 816376F - checkflag FLAG_SYS_SPECIAL_WILD_BATTLE - call_if TRUE, EventScript_163779 + call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, EventScript_163779 end EventScript_163779:: @ 8163779 specialvar VAR_RESULT, Special_GetBattleOutcome compare VAR_RESULT, B_OUTCOME_CAUGHT - goto_if ne, EventScript_1A77A9 + goto_if_ne EventScript_1A77A9 removeobject VAR_LAST_TALKED return PowerPlant_OnTransition:: @ 816378D setworldmapflag FLAG_WORLD_MAP_POWER_PLANT - checkflag FLAG_FOUGHT_ZAPDOS - call_if FALSE, EventScript_1637AC - checkflag FLAG_FOUGHT_POWER_PLANT_ELECTRODE_1 - call_if FALSE, EventScript_1637B0 - checkflag FLAG_FOUGHT_POWER_PLANT_ELECTRODE_2 - call_if FALSE, EventScript_1637B4 + call_if_unset FLAG_FOUGHT_ZAPDOS, EventScript_1637AC + call_if_unset FLAG_FOUGHT_POWER_PLANT_ELECTRODE_1, EventScript_1637B0 + call_if_unset FLAG_FOUGHT_POWER_PLANT_ELECTRODE_2, EventScript_1637B4 end EventScript_1637AC:: @ 81637AC @@ -40,7 +36,7 @@ EventScript_1637B4:: @ 81637B4 PowerPlant_EventScript_1637B8:: @ 81637B8 special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 lock faceplayer @@ -59,11 +55,11 @@ PowerPlant_EventScript_1637B8:: @ 81637B8 clearflag FLAG_SYS_SPECIAL_WILD_BATTLE specialvar VAR_RESULT, Special_GetBattleOutcome compare VAR_RESULT, B_OUTCOME_WON - goto_if eq, EventScript_16381B + goto_if_eq EventScript_16381B compare VAR_RESULT, B_OUTCOME_RAN - goto_if eq, EventScript_163824 + goto_if_eq EventScript_163824 compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED - goto_if eq, EventScript_163824 + goto_if_eq EventScript_163824 setflag FLAG_FOUGHT_ZAPDOS release end @@ -81,7 +77,7 @@ EventScript_163824:: @ 8163824 PowerPlant_EventScript_16382F:: @ 816382F special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lock faceplayer setwildbattle SPECIES_ELECTRODE, 34, ITEM_NONE @@ -95,11 +91,11 @@ PowerPlant_EventScript_16382F:: @ 816382F special sub_8112364 specialvar VAR_RESULT, Special_GetBattleOutcome compare VAR_RESULT, B_OUTCOME_WON - goto_if eq, EventScript_163884 + goto_if_eq EventScript_163884 compare VAR_RESULT, B_OUTCOME_RAN - goto_if eq, EventScript_163884 + goto_if_eq EventScript_163884 compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED - goto_if eq, EventScript_163884 + goto_if_eq EventScript_163884 setflag FLAG_FOUGHT_POWER_PLANT_ELECTRODE_1 release end @@ -112,7 +108,7 @@ EventScript_163884:: @ 8163884 PowerPlant_EventScript_16388D:: @ 816388D special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lock faceplayer setwildbattle SPECIES_ELECTRODE, 34, ITEM_NONE @@ -126,11 +122,11 @@ PowerPlant_EventScript_16388D:: @ 816388D special sub_8112364 specialvar VAR_RESULT, Special_GetBattleOutcome compare VAR_RESULT, B_OUTCOME_WON - goto_if eq, EventScript_1638E2 + goto_if_eq EventScript_1638E2 compare VAR_RESULT, B_OUTCOME_RAN - goto_if eq, EventScript_1638E2 + goto_if_eq EventScript_1638E2 compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED - goto_if eq, EventScript_1638E2 + goto_if_eq EventScript_1638E2 setflag FLAG_FOUGHT_POWER_PLANT_ELECTRODE_2 release end diff --git a/data/maps/RockTunnel_1F/scripts.inc b/data/maps/RockTunnel_1F/scripts.inc index e96d22bb1..8049032dd 100644 --- a/data/maps/RockTunnel_1F/scripts.inc +++ b/data/maps/RockTunnel_1F/scripts.inc @@ -11,36 +11,36 @@ RockTunnel_1F_EventScript_162DE0:: @ 8162DE0 end RockTunnel_1F_EventScript_162DE9:: @ 8162DE9 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_LENNY, 0, Text_179366, Text_179388 + trainerbattle_single TRAINER_HIKER_LENNY, Text_179366, Text_179388 msgbox gUnknown_8179396, 6 end RockTunnel_1F_EventScript_162E00:: @ 8162E00 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_OLIVER, 0, Text_1793F1, Text_17940E + trainerbattle_single TRAINER_HIKER_OLIVER, Text_1793F1, Text_17940E msgbox gUnknown_817943A, 6 end RockTunnel_1F_EventScript_162E17:: @ 8162E17 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_LUCAS, 0, Text_17947B, Text_1794AC + trainerbattle_single TRAINER_HIKER_LUCAS, Text_17947B, Text_1794AC msgbox gUnknown_81794B4, 6 end RockTunnel_1F_EventScript_162E2E:: @ 8162E2E - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_POKEMANIAC_ASHTON, 0, Text_1794D4, Text_1794EE + trainerbattle_single TRAINER_POKEMANIAC_ASHTON, Text_1794D4, Text_1794EE msgbox gUnknown_81794F9, 6 end RockTunnel_1F_EventScript_162E45:: @ 8162E45 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_LEAH, 0, Text_17951C, Text_179547 + trainerbattle_single TRAINER_PICNICKER_LEAH, Text_17951C, Text_179547 msgbox gUnknown_8179558, 6 end RockTunnel_1F_EventScript_162E5C:: @ 8162E5C - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_ARIANA, 0, Text_1795E5, Text_179604 + trainerbattle_single TRAINER_PICNICKER_ARIANA, Text_1795E5, Text_179604 msgbox gUnknown_8179613, 6 end RockTunnel_1F_EventScript_162E73:: @ 8162E73 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_DANA, 0, Text_179577, Text_1795A1 + trainerbattle_single TRAINER_PICNICKER_DANA, Text_179577, Text_1795A1 msgbox gUnknown_81795B5, 6 end diff --git a/data/maps/RockTunnel_B1F/scripts.inc b/data/maps/RockTunnel_B1F/scripts.inc index 27650f752..39cf01a9b 100644 --- a/data/maps/RockTunnel_B1F/scripts.inc +++ b/data/maps/RockTunnel_B1F/scripts.inc @@ -2,41 +2,41 @@ RockTunnel_B1F_MapScripts:: @ 8162E8A .byte 0 RockTunnel_B1F_EventScript_162E8B:: @ 8162E8B - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_SOFIA, 0, Text_179657, Text_1796B9 + trainerbattle_single TRAINER_PICNICKER_SOFIA, Text_179657, Text_1796B9 msgbox gUnknown_81796CE, 6 end RockTunnel_B1F_EventScript_162EA2:: @ 8162EA2 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_MARTHA, 0, Text_1798AD, Text_1798DD + trainerbattle_single TRAINER_PICNICKER_MARTHA, Text_1798AD, Text_1798DD msgbox gUnknown_81798E9, 6 end RockTunnel_B1F_EventScript_162EB9:: @ 8162EB9 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_DUDLEY, 0, Text_1796E1, Text_179700 + trainerbattle_single TRAINER_HIKER_DUDLEY, Text_1796E1, Text_179700 msgbox gUnknown_8179712, 6 end RockTunnel_B1F_EventScript_162ED0:: @ 8162ED0 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_ALLEN, 0, Text_179829, Text_179856 + trainerbattle_single TRAINER_HIKER_ALLEN, Text_179829, Text_179856 msgbox gUnknown_817987A, 6 end RockTunnel_B1F_EventScript_162EE7:: @ 8162EE7 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_HIKER_ERIC, 0, Text_179916, Text_179932 + trainerbattle_single TRAINER_HIKER_ERIC, Text_179916, Text_179932 msgbox gUnknown_817993E, 6 end RockTunnel_B1F_EventScript_162EFE:: @ 8162EFE - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_POKEMANIAC_COOPER, 0, Text_17973A, Text_17975F + trainerbattle_single TRAINER_POKEMANIAC_COOPER, Text_17973A, Text_17975F msgbox gUnknown_8179777, 6 end RockTunnel_B1F_EventScript_162F15:: @ 8162F15 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_POKEMANIAC_STEVE, 0, Text_1797A4, Text_1797CB + trainerbattle_single TRAINER_POKEMANIAC_STEVE, Text_1797A4, Text_1797CB msgbox gUnknown_81797DE, 6 end RockTunnel_B1F_EventScript_162F2C:: @ 8162F2C - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_POKEMANIAC_WINSTON, 0, Text_179968, Text_179997 + trainerbattle_single TRAINER_POKEMANIAC_WINSTON, Text_179968, Text_179997 msgbox gUnknown_81799AC, 6 end diff --git a/data/maps/RocketHideout_B1F/scripts.inc b/data/maps/RocketHideout_B1F/scripts.inc index ee140a736..a5158b6f3 100644 --- a/data/maps/RocketHideout_B1F/scripts.inc +++ b/data/maps/RocketHideout_B1F/scripts.inc @@ -5,7 +5,7 @@ RocketHideout_B1F_MapScripts:: @ 8161195 RocketHideout_B1F_OnLoad:: @ 81611A0 checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_12 - call_if lt, EventScript_161233 + call_if_lt EventScript_161233 end RocketHideout_B1F_OnTransition:: @ 81611AA @@ -13,27 +13,27 @@ RocketHideout_B1F_OnTransition:: @ 81611AA end RocketHideout_B1F_EventScript_1611AE:: @ 81611AE - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_8, 0, Text_174ECA, Text_174EED + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_8, Text_174ECA, Text_174EED msgbox gUnknown_8174EFA, 6 end RocketHideout_B1F_EventScript_1611C5:: @ 81611C5 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_9, 0, Text_174F2C, Text_174F60 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_9, Text_174F2C, Text_174F60 msgbox gUnknown_8174F66, 6 end RocketHideout_B1F_EventScript_1611DC:: @ 81611DC - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_10, 0, Text_174F94, Text_174FA4 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_10, Text_174F94, Text_174FA4 msgbox gUnknown_8174FB3, 6 end RocketHideout_B1F_EventScript_1611F3:: @ 81611F3 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_11, 0, Text_174FE1, Text_174FF8 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_11, Text_174FE1, Text_174FF8 msgbox gUnknown_8175007, 6 end RocketHideout_B1F_EventScript_16120A:: @ 816120A - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_TEAM_ROCKET_GRUNT_12, 0, Text_17503A, Text_17505A, EventScript_161225 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_12, Text_17503A, Text_17505A, EventScript_161225 msgbox gUnknown_8175060, 6 end diff --git a/data/maps/RocketHideout_B2F/scripts.inc b/data/maps/RocketHideout_B2F/scripts.inc index 6264371b7..9e6338f9c 100644 --- a/data/maps/RocketHideout_B2F/scripts.inc +++ b/data/maps/RocketHideout_B2F/scripts.inc @@ -2,6 +2,6 @@ RocketHideout_B2F_MapScripts:: @ 81612A1 .byte 0 RocketHideout_B2F_EventScript_1612A2:: @ 81612A2 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_13, 0, Text_17508C, Text_1750BF + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_13, Text_17508C, Text_1750BF msgbox gUnknown_81750CC, 6 end diff --git a/data/maps/RocketHideout_B3F/scripts.inc b/data/maps/RocketHideout_B3F/scripts.inc index 5cc7fc7d8..962aa3385 100644 --- a/data/maps/RocketHideout_B3F/scripts.inc +++ b/data/maps/RocketHideout_B3F/scripts.inc @@ -2,11 +2,11 @@ RocketHideout_B3F_MapScripts:: @ 81612B9 .byte 0 RocketHideout_B3F_EventScript_1612BA:: @ 81612BA - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_14, 0, Text_17511A, Text_17514A + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_14, Text_17511A, Text_17514A msgbox gUnknown_817515B, 6 end RocketHideout_B3F_EventScript_1612D1:: @ 81612D1 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_15, 0, Text_17519E, Text_1751CE + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_15, Text_17519E, Text_1751CE msgbox gUnknown_81751E0, 6 end diff --git a/data/maps/RocketHideout_B4F/scripts.inc b/data/maps/RocketHideout_B4F/scripts.inc index 7adf4ce23..2324e6fc6 100644 --- a/data/maps/RocketHideout_B4F/scripts.inc +++ b/data/maps/RocketHideout_B4F/scripts.inc @@ -5,11 +5,11 @@ RocketHideout_B4F_MapScripts:: @ 81612E8 RocketHideout_B4F_OnLoad:: @ 81612EE setvar VAR_TEMP_1, 0 checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_16 - call_if eq, EventScript_161311 + call_if_eq EventScript_161311 checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_17 - call_if eq, EventScript_161311 + call_if_eq EventScript_161311 compare VAR_TEMP_1, 2 - call_if ne, EventScript_16146A + call_if_ne EventScript_16146A end EventScript_161311:: @ 8161311 @@ -24,7 +24,7 @@ RocketHideout_B4F_EventScript_161317:: @ 8161317 waitmessage playbgm MUS_ROCKET, 0 waitbuttonpress - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_BOSS_GIOVANNI, 0, Text_175318 + trainerbattle_no_intro TRAINER_BOSS_GIOVANNI, Text_175318 msgbox gUnknown_817532D fadescreen 1 closemessage @@ -43,12 +43,12 @@ RocketHideout_B4F_EventScript_161363:: @ 8161363 removeobject 2 giveitem ITEM_SILPH_SCOPE compare VAR_RESULT, 0 - goto_if eq, EventScript_1A6BF9 + goto_if_eq EventScript_1A6BF9 release end RocketHideout_B4F_EventScript_161381:: @ 8161381 - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_TEAM_ROCKET_GRUNT_18, 0, Text_175488, Text_1754B9, EventScript_16139D + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_18, Text_175488, Text_1754B9, EventScript_16139D msgbox gUnknown_81754BD release end @@ -67,43 +67,43 @@ RocketHideout_B4F_EventScript_1613AD:: @ 81613AD removeobject 4 giveitem ITEM_LIFT_KEY compare VAR_RESULT, 0 - goto_if eq, EventScript_1A6BF9 + goto_if_eq EventScript_1A6BF9 release end RocketHideout_B4F_EventScript_1613CE:: @ 81613CE - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_TEAM_ROCKET_GRUNT_16, 0, Text_1753D0, Text_1753FE, EventScript_1613E9 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_16, Text_1753D0, Text_1753FE, EventScript_1613E9 msgbox gUnknown_817540C, 6 end EventScript_1613E9:: @ 81613E9 setvar VAR_TEMP_1, 0 checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_16 - call_if eq, EventScript_161311 + call_if_eq EventScript_161311 checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_17 - call_if eq, EventScript_161311 + call_if_eq EventScript_161311 compare VAR_TEMP_1, 2 - call_if eq, EventScript_1614A1 + call_if_eq EventScript_1614A1 compare VAR_TEMP_1, 2 - call_if eq, EventScript_161462 + call_if_eq EventScript_161462 release end RocketHideout_B4F_EventScript_161418:: @ 8161418 - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_TEAM_ROCKET_GRUNT_17, 0, Text_175437, Text_175463, EventScript_161433 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_17, Text_175437, Text_175463, EventScript_161433 msgbox gUnknown_817546A, 6 end EventScript_161433:: @ 8161433 setvar VAR_TEMP_1, 0 checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_16 - call_if eq, EventScript_161311 + call_if_eq EventScript_161311 checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_17 - call_if eq, EventScript_161311 + call_if_eq EventScript_161311 compare VAR_TEMP_1, 2 - call_if eq, EventScript_1614A1 + call_if_eq EventScript_1614A1 compare VAR_TEMP_1, 2 - call_if eq, EventScript_161462 + call_if_eq EventScript_161462 release end diff --git a/data/maps/RocketHideout_Elevator/scripts.inc b/data/maps/RocketHideout_Elevator/scripts.inc index 145364418..05e01e27a 100644 --- a/data/maps/RocketHideout_Elevator/scripts.inc +++ b/data/maps/RocketHideout_Elevator/scripts.inc @@ -3,11 +3,9 @@ RocketHideout_Elevator_MapScripts:: @ 81614D8 RocketHideout_Elevator_EventScript_1614D9:: @ 81614D9 lockall - checkflag FLAG_CAN_USE_ROCKET_HIDEOUT_LIFT - goto_if FALSE, EventScript_16161B + goto_if_unset FLAG_CAN_USE_ROCKET_HIDEOUT_LIFT, EventScript_16161B setvar VAR_0x8004, 2 - checkflag FLAG_TEMP_2 - call_if FALSE, EventScript_1A7AB9 + call_if_unset FLAG_TEMP_2, EventScript_1A7AB9 copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR special Special_DrawElevatorCurrentFloorWindow message Text_1A535C @@ -54,7 +52,7 @@ EventScript_161591:: @ 8161591 setvar VAR_0x8006, 3 setdynamicwarp MAP_ROCKET_HIDEOUT_B1F, 255, 24, 25 compare VAR_ELEVATOR_FLOOR, 3 - goto_if eq, EventScript_161609 + goto_if_eq EventScript_161609 call EventScript_16160E setvar VAR_ELEVATOR_FLOOR, 3 goto EventScript_161609 @@ -66,7 +64,7 @@ EventScript_1615B9:: @ 81615B9 setvar VAR_0x8006, 2 setdynamicwarp MAP_ROCKET_HIDEOUT_B2F, 255, 28, 16 compare VAR_ELEVATOR_FLOOR, 2 - goto_if eq, EventScript_161609 + goto_if_eq EventScript_161609 call EventScript_16160E setvar VAR_ELEVATOR_FLOOR, 2 goto EventScript_161609 @@ -78,7 +76,7 @@ EventScript_1615E1:: @ 81615E1 setvar VAR_0x8006, 0 setdynamicwarp MAP_ROCKET_HIDEOUT_B4F, 255, 20, 23 compare VAR_ELEVATOR_FLOOR, 0 - goto_if eq, EventScript_161609 + goto_if_eq EventScript_161609 call EventScript_16160E setvar VAR_ELEVATOR_FLOOR, 0 goto EventScript_161609 diff --git a/data/maps/Route1/scripts.inc b/data/maps/Route1/scripts.inc index 7b8f1f95e..96e12e7da 100644 --- a/data/maps/Route1/scripts.inc +++ b/data/maps/Route1/scripts.inc @@ -4,19 +4,18 @@ Route1_MapScripts:: @ 8167EFD Route1_EventScript_167EFE:: @ 8167EFE lock faceplayer - checkflag FLAG_GOT_POTION_ON_ROUTE_1 - goto_if TRUE, EventScript_167F48 + goto_if_set FLAG_GOT_POTION_ON_ROUTE_1, EventScript_167F48 msgbox gUnknown_818329D textcolor 3 checkitemspace ITEM_POTION, 1 compare VAR_RESULT, 0 - goto_if eq, EventScript_1A6BF9 + goto_if_eq EventScript_1A6BF9 getitemname 1, ITEM_POTION playfanfare MUS_FANFA1 message Text_ObtainedTheX waitmessage waitfanfare - additem ITEM_POTION, 1 + additem ITEM_POTION msgbox gUnknown_8183387 call EventScript_1A6675 setflag FLAG_GOT_POTION_ON_ROUTE_1 diff --git a/data/maps/Route10_PokemonCenter_1F/scripts.inc b/data/maps/Route10_PokemonCenter_1F/scripts.inc index 7e04196d3..32864b8fb 100644 --- a/data/maps/Route10_PokemonCenter_1F/scripts.inc +++ b/data/maps/Route10_PokemonCenter_1F/scripts.inc @@ -31,23 +31,21 @@ Route10_PokemonCenter_1F_EventScript_16FC65:: @ 816FC65 lock faceplayer call EventScript_16FCF1 - checkflag FLAG_GOT_EVERSTONE_FROM_OAKS_AIDE - goto_if TRUE, EventScript_16FCE7 + goto_if_set FLAG_GOT_EVERSTONE_FROM_OAKS_AIDE, EventScript_16FCE7 msgbox gUnknown_819E5FB, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_1A7AD1 + goto_if_eq EventScript_1A7AD1 setvar VAR_0x8004, 0 specialvar VAR_RESULT, Special_GetPokedexCount getnumberstring 2, VAR_0x8006 call EventScript_16FCF1 compare VAR_0x8006, 20 - goto_if lt, EventScript_1A7ABD + goto_if_lt EventScript_1A7ABD msgbox gUnknown_819E733 checkitemspace ITEM_EVERSTONE, 1 compare VAR_RESULT, 0 - goto_if eq, EventScript_1A7AC7 - additem ITEM_EVERSTONE, 1 - giveitemfanfaremsg gUnknown_819E786, ITEM_EVERSTONE + goto_if_eq EventScript_1A7AC7 + giveitem_msg gUnknown_819E786, ITEM_EVERSTONE setflag FLAG_GOT_EVERSTONE_FROM_OAKS_AIDE msgbox gUnknown_819E7AF release diff --git a/data/maps/Route11_EastEntrance_2F/scripts.inc b/data/maps/Route11_EastEntrance_2F/scripts.inc index fe9f21907..28222d32a 100644 --- a/data/maps/Route11_EastEntrance_2F/scripts.inc +++ b/data/maps/Route11_EastEntrance_2F/scripts.inc @@ -3,8 +3,7 @@ Route11_EastEntrance_2F_MapScripts:: @ 816FD34 Route11_EastEntrance_2F_EventScript_16FD35:: @ 816FD35 lockall - checkflag FLAG_WOKE_UP_ROUTE_12_SNORLAX - goto_if TRUE, EventScript_16FD49 + goto_if_set FLAG_WOKE_UP_ROUTE_12_SNORLAX, EventScript_16FD49 msgbox gUnknown_819EC8A releaseall end @@ -23,17 +22,16 @@ Route11_EastEntrance_2F_EventScript_16FD5C:: @ 816FD5C faceplayer setvar VAR_0x8008, 4 call EventScript_1A8CAD - checkflag FLAG_DID_NINA_TRADE - goto_if TRUE, EventScript_16FDCE + goto_if_set FLAG_DID_NINA_TRADE, EventScript_16FDCE msgbox gUnknown_81A597B, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_16FDB6 + goto_if_eq EventScript_16FDB6 call EventScript_1A8CBD compare VAR_0x8004, 6 - goto_if ge, EventScript_16FDB6 + goto_if_ge EventScript_16FDB6 call EventScript_1A8CC9 compare VAR_RESULT, VAR_0x8009 - goto_if ne, EventScript_16FDC0 + goto_if_ne EventScript_16FDC0 call EventScript_1A8CD9 msgbox gUnknown_81A59DA setflag FLAG_DID_NINA_TRADE @@ -60,23 +58,21 @@ Route11_EastEntrance_2F_EventScript_16FDD8:: @ 816FDD8 lock faceplayer call EventScript_16FE64 - checkflag FLAG_GOT_ITEMFINDER - goto_if TRUE, EventScript_16FE5A + goto_if_set FLAG_GOT_ITEMFINDER, EventScript_16FE5A msgbox gUnknown_819E9E5, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_1A7AD1 + goto_if_eq EventScript_1A7AD1 setvar VAR_0x8004, 0 specialvar VAR_RESULT, Special_GetPokedexCount getnumberstring 2, VAR_0x8006 call EventScript_16FE64 compare VAR_0x8006, 30 - goto_if lt, EventScript_1A7ABD + goto_if_lt EventScript_1A7ABD msgbox gUnknown_819EAE4 checkitemspace ITEM_ITEMFINDER, 1 compare VAR_RESULT, 0 - goto_if eq, EventScript_1A7AC7 - additem ITEM_ITEMFINDER, 1 - giveitemfanfaremsg gUnknown_819EB37, ITEM_ITEMFINDER + goto_if_eq EventScript_1A7AC7 + giveitem_msg gUnknown_819EB37, ITEM_ITEMFINDER setflag FLAG_GOT_ITEMFINDER msgbox gUnknown_819EB59 release diff --git a/data/maps/Route12/scripts.inc b/data/maps/Route12/scripts.inc index cdd28f02a..5aa50bfc1 100644 --- a/data/maps/Route12/scripts.inc +++ b/data/maps/Route12/scripts.inc @@ -3,8 +3,7 @@ Route12_MapScripts:: @ 8168000 .byte 0 Route12_OnResume:: @ 8168006 - checkflag FLAG_SYS_SPECIAL_WILD_BATTLE - call_if TRUE, EventScript_168010 + call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, EventScript_168010 end EventScript_168010:: @ 8168010 @@ -14,15 +13,14 @@ EventScript_168010:: @ 8168010 Route12_EventScript_168014:: @ 8168014 lock faceplayer - checkflag FLAG_GOT_POKE_FLUTE - goto_if FALSE, EventScript_168099 + goto_if_unset FLAG_GOT_POKE_FLUTE, EventScript_168099 special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 msgbox gUnknown_81853CC, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_16808D + goto_if_eq EventScript_16808D call EventScript_1A924B setwildbattle SPECIES_SNORLAX, 30, ITEM_NONE waitse @@ -36,11 +34,11 @@ Route12_EventScript_168014:: @ 8168014 clearflag FLAG_SYS_SPECIAL_WILD_BATTLE specialvar VAR_RESULT, Special_GetBattleOutcome compare VAR_RESULT, B_OUTCOME_WON - goto_if eq, EventScript_16808F + goto_if_eq EventScript_16808F compare VAR_RESULT, B_OUTCOME_RAN - goto_if eq, EventScript_16808F + goto_if_eq EventScript_16808F compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED - goto_if eq, EventScript_16808F + goto_if_eq EventScript_16808F release end diff --git a/data/maps/Route12_FishingHouse/scripts.inc b/data/maps/Route12_FishingHouse/scripts.inc index 317ffe41c..d69b1a68a 100644 --- a/data/maps/Route12_FishingHouse/scripts.inc +++ b/data/maps/Route12_FishingHouse/scripts.inc @@ -4,11 +4,10 @@ Route12_FishingHouse_MapScripts:: @ 816FF0B Route12_FishingHouse_EventScript_16FF0C:: @ 816FF0C lock faceplayer - checkflag FLAG_GOT_SUPER_ROD - goto_if TRUE, EventScript_16FF7F + goto_if_set FLAG_GOT_SUPER_ROD, EventScript_16FF7F msgbox gUnknown_819EFE0, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if eq, EventScript_16FF34 + goto_if_eq EventScript_16FF34 msgbox gUnknown_819F1FA release end @@ -16,10 +15,10 @@ Route12_FishingHouse_EventScript_16FF0C:: @ 816FF0C EventScript_16FF34:: @ 816FF34 checkitemspace ITEM_SUPER_ROD, 1 compare VAR_RESULT, 0 - goto_if eq, EventScript_16FF75 - additem ITEM_SUPER_ROD, 1 + goto_if_eq EventScript_16FF75 + additem ITEM_SUPER_ROD msgbox gUnknown_819F05B - giveitemfanfaremsg gUnknown_819F0B2, ITEM_SUPER_ROD + msgreceiveditem gUnknown_819F0B2, ITEM_SUPER_ROD setflag FLAG_GOT_SUPER_ROD msgbox gUnknown_819F0EB release @@ -33,28 +32,28 @@ EventScript_16FF75:: @ 816FF75 EventScript_16FF7F:: @ 816FF7F special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 setvar VAR_0x8004, SPECIES_MAGIKARP specialvar VAR_RESULT, Special_PlayerPartyContainsSpecies compare VAR_RESULT, 0 - goto_if eq, EventScript_16FFF5 + goto_if_eq EventScript_16FFF5 special GetMagikarpSizeRecordInfo msgbox gUnknown_819F2DB special Special_ChooseMonFromParty waitstate copyvar VAR_RESULT, VAR_0x8004 compare VAR_RESULT, 6 - goto_if ge, EventScript_16FFFF + goto_if_ge EventScript_16FFFF special CompareMagikarpSize compare VAR_RESULT, 1 - goto_if eq, EventScript_170001 + goto_if_eq EventScript_170001 compare VAR_RESULT, 2 - goto_if eq, EventScript_17000B + goto_if_eq EventScript_17000B compare VAR_RESULT, 3 - goto_if eq, EventScript_170031 + goto_if_eq EventScript_170031 compare VAR_RESULT, 4 - goto_if eq, EventScript_17001E + goto_if_eq EventScript_17001E release end @@ -73,15 +72,13 @@ EventScript_170001:: @ 8170001 end EventScript_17000B:: @ 817000B - checkflag FLAG_GOT_RECORD_SETTING_MAGIKARP - goto_if FALSE, EventScript_170031 + goto_if_unset FLAG_GOT_RECORD_SETTING_MAGIKARP, EventScript_170031 msgbox gUnknown_819F40A release end EventScript_17001E:: @ 817001E - checkflag FLAG_GOT_RECORD_SETTING_MAGIKARP - goto_if FALSE, EventScript_170031 + goto_if_unset FLAG_GOT_RECORD_SETTING_MAGIKARP, EventScript_170031 msgbox gUnknown_819F3CB release end @@ -91,7 +88,7 @@ EventScript_170031:: @ 8170031 msgbox gUnknown_819F31B giveitem ITEM_NET_BALL compare VAR_RESULT, 0 - goto_if eq, EventScript_17005D + goto_if_eq EventScript_17005D msgbox gUnknown_819F395 release end @@ -103,8 +100,7 @@ EventScript_17005D:: @ 817005D Route12_FishingHouse_EventScript_170067:: @ 8170067 lockall - checkflag FLAG_GOT_RECORD_SETTING_MAGIKARP - goto_if TRUE, EventScript_17007B + goto_if_set FLAG_GOT_RECORD_SETTING_MAGIKARP, 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 44c1629fc..1c6014110 100644 --- a/data/maps/Route12_NorthEntrance_2F/scripts.inc +++ b/data/maps/Route12_NorthEntrance_2F/scripts.inc @@ -12,18 +12,16 @@ Route12_NorthEntrance_2F_EventScript_16FE81:: @ 816FE81 Route12_NorthEntrance_2F_EventScript_16FE8A:: @ 816FE8A lock faceplayer - checkflag FLAG_GOT_TM27 - goto_if TRUE, EventScript_16FF01 + goto_if_set FLAG_GOT_TM27, EventScript_16FF01 checkplayergender compare VAR_RESULT, 0 - call_if eq, EventScript_16FEE5 + call_if_eq EventScript_16FEE5 compare VAR_RESULT, 1 - call_if eq, EventScript_16FEEE + call_if_eq EventScript_16FEEE checkitemspace ITEM_TM27, 1 compare VAR_RESULT, 0 - goto_if eq, EventScript_16FEF7 - additem ITEM_TM27, 1 - giveitemfanfaremsg gUnknown_819EE9F, ITEM_TM27 + goto_if_eq EventScript_16FEF7 + giveitem_msg gUnknown_819EE9F, ITEM_TM27 msgbox gUnknown_819EEC6 setflag FLAG_GOT_TM27 release diff --git a/data/maps/Route15_WestEntrance_2F/scripts.inc b/data/maps/Route15_WestEntrance_2F/scripts.inc index 09983fed1..3968fc32d 100644 --- a/data/maps/Route15_WestEntrance_2F/scripts.inc +++ b/data/maps/Route15_WestEntrance_2F/scripts.inc @@ -21,23 +21,21 @@ Route15_WestEntrance_2F_EventScript_1700B9:: @ 81700B9 lock faceplayer call EventScript_170145 - checkflag FLAG_GOT_EXP_SHARE_FROM_OAKS_AIDE - goto_if TRUE, EventScript_17013B + goto_if_set FLAG_GOT_EXP_SHARE_FROM_OAKS_AIDE, EventScript_17013B msgbox gUnknown_819F5AB, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_1A7AD1 + goto_if_eq EventScript_1A7AD1 setvar VAR_0x8004, 0 specialvar VAR_RESULT, Special_GetPokedexCount getnumberstring 2, VAR_0x8006 call EventScript_170145 compare VAR_0x8006, 50 - goto_if lt, EventScript_1A7ABD + goto_if_lt EventScript_1A7ABD msgbox gUnknown_819F6AA checkitemspace ITEM_EXP_SHARE, 1 compare VAR_RESULT, 0 - goto_if eq, EventScript_1A7AC7 - additem ITEM_EXP_SHARE, 1 - giveitemfanfaremsg gUnknown_819F6FD, ITEM_EXP_SHARE + goto_if_eq EventScript_1A7AC7 + giveitem_msg gUnknown_819F6FD, ITEM_EXP_SHARE setflag FLAG_GOT_EXP_SHARE_FROM_OAKS_AIDE msgbox gUnknown_819F71F release diff --git a/data/maps/Route16/scripts.inc b/data/maps/Route16/scripts.inc index 4ab510912..837ad0fc7 100644 --- a/data/maps/Route16/scripts.inc +++ b/data/maps/Route16/scripts.inc @@ -5,8 +5,7 @@ Route16_MapScripts:: @ 81680E5 .byte 0 Route16_OnResume:: @ 81680F5 - checkflag FLAG_SYS_SPECIAL_WILD_BATTLE - call_if TRUE, EventScript_1680FF + call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, EventScript_1680FF end EventScript_1680FF:: @ 81680FF @@ -15,7 +14,7 @@ EventScript_1680FF:: @ 81680FF Route16_OnTransition:: @ 8168103 compare VAR_MAP_SCENE_ROUTE16, 1 - call_if eq, EventScript_16810F + call_if_eq EventScript_16810F end EventScript_16810F:: @ 816810F @@ -33,15 +32,14 @@ EventScript_16811D:: @ 816811D Route16_EventScript_168121:: @ 8168121 lock faceplayer - checkflag FLAG_GOT_POKE_FLUTE - goto_if FALSE, EventScript_1681A3 + goto_if_unset FLAG_GOT_POKE_FLUTE, EventScript_1681A3 special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 msgbox gUnknown_81853CC, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_168197 + goto_if_eq EventScript_168197 call EventScript_1A924B setwildbattle SPECIES_SNORLAX, 30, ITEM_NONE waitse @@ -54,11 +52,11 @@ Route16_EventScript_168121:: @ 8168121 clearflag FLAG_SYS_SPECIAL_WILD_BATTLE specialvar VAR_RESULT, Special_GetBattleOutcome compare VAR_RESULT, B_OUTCOME_WON - goto_if eq, EventScript_168199 + goto_if_eq EventScript_168199 compare VAR_RESULT, B_OUTCOME_RAN - goto_if eq, EventScript_168199 + goto_if_eq EventScript_168199 compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED - goto_if eq, EventScript_168199 + goto_if_eq EventScript_168199 release end diff --git a/data/maps/Route16_House/scripts.inc b/data/maps/Route16_House/scripts.inc index d6c4c7a9c..dc1271a44 100644 --- a/data/maps/Route16_House/scripts.inc +++ b/data/maps/Route16_House/scripts.inc @@ -4,14 +4,12 @@ Route16_House_MapScripts:: @ 817014E Route16_House_EventScript_17014F:: @ 817014F lock faceplayer - checkflag FLAG_GOT_HM02 - goto_if TRUE, EventScript_1701A5 + goto_if_set FLAG_GOT_HM02, EventScript_1701A5 msgbox gUnknown_819F851 checkitemspace ITEM_HM02, 1 compare VAR_RESULT, 0 - goto_if eq, EventScript_17019B - additem ITEM_HM02, 1 - giveitemfanfaremsg gUnknown_819F8C0, ITEM_HM02 + goto_if_eq EventScript_17019B + giveitem_msg gUnknown_819F8C0, ITEM_HM02 msgbox gUnknown_819F8E0 setflag FLAG_GOT_HM02 release diff --git a/data/maps/Route16_NorthEntrance_1F/scripts.inc b/data/maps/Route16_NorthEntrance_1F/scripts.inc index ecc93ae83..a8abfb255 100644 --- a/data/maps/Route16_NorthEntrance_1F/scripts.inc +++ b/data/maps/Route16_NorthEntrance_1F/scripts.inc @@ -4,8 +4,7 @@ Route16_NorthEntrance_1F_MapScripts:: @ 81701C2 Route16_NorthEntrance_1F_OnTransition:: @ 81701C8 clearflag FLAG_SYS_ON_CYCLING_ROAD - checkflag FLAG_GOT_BICYCLE - call_if TRUE, EventScript_1701D5 + call_if_set FLAG_GOT_BICYCLE, EventScript_1701D5 end EventScript_1701D5:: @ 81701D5 @@ -54,13 +53,13 @@ EventScript_170220:: @ 8170220 waitmovement 0 delay 20 compare VAR_0x8008, 1 - call_if eq, EventScript_170279 + call_if_eq EventScript_170279 compare VAR_0x8008, 2 - call_if eq, EventScript_170284 + call_if_eq EventScript_170284 compare VAR_0x8008, 3 - call_if eq, EventScript_17028F + call_if_eq EventScript_17028F compare VAR_0x8008, 4 - call_if eq, EventScript_17029A + call_if_eq EventScript_17029A msgbox gUnknown_819F95F closemessage applymovement OBJ_EVENT_ID_PLAYER, Movement_1702B3 diff --git a/data/maps/Route16_NorthEntrance_2F/scripts.inc b/data/maps/Route16_NorthEntrance_2F/scripts.inc index da054fd84..9b2dd6737 100644 --- a/data/maps/Route16_NorthEntrance_2F/scripts.inc +++ b/data/maps/Route16_NorthEntrance_2F/scripts.inc @@ -21,23 +21,21 @@ Route16_NorthEntrance_2F_EventScript_1702E3:: @ 81702E3 lock faceplayer call EventScript_17036F - checkflag FLAG_GOT_AMULET_COIN_FROM_OAKS_AIDE - goto_if TRUE, EventScript_170365 + goto_if_set FLAG_GOT_AMULET_COIN_FROM_OAKS_AIDE, EventScript_170365 msgbox gUnknown_819FB0E, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_1A7AD1 + goto_if_eq EventScript_1A7AD1 setvar VAR_0x8004, 0 specialvar VAR_RESULT, Special_GetPokedexCount getnumberstring 2, VAR_0x8006 call EventScript_17036F compare VAR_0x8006, 40 - goto_if lt, EventScript_1A7ABD + goto_if_lt EventScript_1A7ABD msgbox gUnknown_819FC15 checkitemspace ITEM_AMULET_COIN, 1 compare VAR_RESULT, 0 - goto_if eq, EventScript_1A7AC7 - additem ITEM_AMULET_COIN, 1 - giveitemfanfaremsg gUnknown_819FC68, ITEM_AMULET_COIN + goto_if_eq EventScript_1A7AC7 + giveitem_msg gUnknown_819FC68, ITEM_AMULET_COIN setflag FLAG_GOT_AMULET_COIN_FROM_OAKS_AIDE msgbox gUnknown_819FC93 release diff --git a/data/maps/Route18/scripts.inc b/data/maps/Route18/scripts.inc index f3e1f1032..c988ccb1b 100644 --- a/data/maps/Route18/scripts.inc +++ b/data/maps/Route18/scripts.inc @@ -5,7 +5,7 @@ Route18_MapScripts:: @ 81681F6 Route18_OnTransition:: @ 8168201 compare VAR_MAP_SCENE_ROUTE16, 1 - call_if eq, EventScript_16820D + call_if_eq EventScript_16820D end EventScript_16820D:: @ 816820D diff --git a/data/maps/Route18_EastEntrance_1F/scripts.inc b/data/maps/Route18_EastEntrance_1F/scripts.inc index 0be4bc59d..8e8b8a531 100644 --- a/data/maps/Route18_EastEntrance_1F/scripts.inc +++ b/data/maps/Route18_EastEntrance_1F/scripts.inc @@ -4,8 +4,7 @@ Route18_EastEntrance_1F_MapScripts:: @ 8170378 Route18_EastEntrance_1F_OnTransition:: @ 817037E clearflag FLAG_SYS_ON_CYCLING_ROAD - checkflag FLAG_GOT_BICYCLE - call_if TRUE, EventScript_17038B + call_if_set FLAG_GOT_BICYCLE, EventScript_17038B end EventScript_17038B:: @ 817038B @@ -54,13 +53,13 @@ EventScript_1703D6:: @ 81703D6 waitmovement 0 delay 20 compare VAR_0x8008, 1 - call_if eq, EventScript_17042F + call_if_eq EventScript_17042F compare VAR_0x8008, 2 - call_if eq, EventScript_17043A + call_if_eq EventScript_17043A compare VAR_0x8008, 3 - call_if eq, EventScript_170445 + call_if_eq EventScript_170445 compare VAR_0x8008, 4 - call_if eq, EventScript_170450 + call_if_eq EventScript_170450 msgbox gUnknown_819FD0C closemessage applymovement OBJ_EVENT_ID_PLAYER, Movement_170469 diff --git a/data/maps/Route18_EastEntrance_2F/scripts.inc b/data/maps/Route18_EastEntrance_2F/scripts.inc index afe1dd754..8878cfa1f 100644 --- a/data/maps/Route18_EastEntrance_2F/scripts.inc +++ b/data/maps/Route18_EastEntrance_2F/scripts.inc @@ -14,17 +14,16 @@ Route18_EastEntrance_2F_EventScript_17047E:: @ 817047E faceplayer setvar VAR_0x8008, 5 call EventScript_1A8CAD - checkflag FLAG_DID_MARC_TRADE - goto_if TRUE, EventScript_1704F0 + goto_if_set FLAG_DID_MARC_TRADE, EventScript_1704F0 msgbox gUnknown_81A597B, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_1704D8 + goto_if_eq EventScript_1704D8 call EventScript_1A8CBD compare VAR_0x8004, 6 - goto_if ge, EventScript_1704D8 + goto_if_ge EventScript_1704D8 call EventScript_1A8CC9 compare VAR_RESULT, VAR_0x8009 - goto_if ne, EventScript_1704E2 + goto_if_ne EventScript_1704E2 call EventScript_1A8CD9 msgbox gUnknown_81A59DA setflag FLAG_DID_MARC_TRADE diff --git a/data/maps/Route20/scripts.inc b/data/maps/Route20/scripts.inc index 1d277231d..2131ca106 100644 --- a/data/maps/Route20/scripts.inc +++ b/data/maps/Route20/scripts.inc @@ -3,10 +3,8 @@ Route20_MapScripts:: @ 816823B .byte 0 Route20_OnTransition:: @ 8168241 - checkflag FLAG_STOPPED_SEAFOAM_B3F_CURRENT - call_if FALSE, EventScript_168254 - checkflag FLAG_STOPPED_SEAFOAM_B4F_CURRENT - call_if FALSE, EventScript_16826D + call_if_unset FLAG_STOPPED_SEAFOAM_B3F_CURRENT, EventScript_168254 + call_if_unset FLAG_STOPPED_SEAFOAM_B4F_CURRENT, EventScript_16826D end EventScript_168254:: @ 8168254 diff --git a/data/maps/Route22/scripts.inc b/data/maps/Route22/scripts.inc index ad798166c..58380f0e9 100644 --- a/data/maps/Route22/scripts.inc +++ b/data/maps/Route22/scripts.inc @@ -32,29 +32,29 @@ EventScript_1682BE:: @ 81682BE playbgm MUS_RIVAL1, 0 addobject 1 compare VAR_TEMP_1, 0 - call_if eq, EventScript_168350 + call_if_eq EventScript_168350 compare VAR_TEMP_1, 1 - call_if eq, EventScript_168350 + call_if_eq EventScript_168350 compare VAR_TEMP_1, 2 - call_if eq, EventScript_16835B + call_if_eq EventScript_16835B delay 6 msgbox gUnknown_8188890 compare VAR_STARTER_MON, 2 - call_if eq, EventScript_16836D + call_if_eq EventScript_16836D compare VAR_STARTER_MON, 1 - call_if eq, EventScript_16837C + call_if_eq EventScript_16837C compare VAR_STARTER_MON, 0 - call_if eq, EventScript_16838B + call_if_eq EventScript_16838B msgbox gUnknown_8188974 closemessage delay 10 playbgm MUS_RIVAL2, 0 compare VAR_TEMP_1, 0 - call_if eq, EventScript_16839A + call_if_eq EventScript_16839A compare VAR_TEMP_1, 1 - call_if eq, EventScript_16839A + call_if_eq EventScript_16839A compare VAR_TEMP_1, 2 - call_if eq, EventScript_1683A5 + call_if_eq EventScript_1683A5 fadedefaultbgm removeobject 1 setvar VAR_MAP_SCENE_ROUTE22, 2 @@ -73,15 +73,15 @@ EventScript_16835B:: @ 816835B return EventScript_16836D:: @ 816836D - trainerbattle TRAINER_BATTLE_TUTORIAL, TRAINER_RIVAL_ROUTE22_EARLY_SQUIRTLE, 0, Text_188959, Text_18DE1A + trainerbattle_tutorial TRAINER_RIVAL_ROUTE22_EARLY_SQUIRTLE, 0, Text_188959, Text_18DE1A return EventScript_16837C:: @ 816837C - trainerbattle TRAINER_BATTLE_TUTORIAL, TRAINER_RIVAL_ROUTE22_EARLY_BULBASAUR, 0, Text_188959, Text_18DE1A + trainerbattle_tutorial TRAINER_RIVAL_ROUTE22_EARLY_BULBASAUR, 0, Text_188959, Text_18DE1A return EventScript_16838B:: @ 816838B - trainerbattle TRAINER_BATTLE_TUTORIAL, TRAINER_RIVAL_ROUTE22_EARLY_CHARMANDER, 0, Text_188959, Text_18DE1A + trainerbattle_tutorial TRAINER_RIVAL_ROUTE22_EARLY_CHARMANDER, 0, Text_188959, Text_18DE1A return EventScript_16839A:: @ 816839A @@ -198,19 +198,19 @@ EventScript_16841F:: @ 816841F playbgm MUS_RIVAL1, 0 addobject 1 compare VAR_TEMP_1, 0 - call_if eq, EventScript_16849C + call_if_eq EventScript_16849C compare VAR_TEMP_1, 1 - call_if eq, EventScript_16849C + call_if_eq EventScript_16849C compare VAR_TEMP_1, 2 - call_if eq, EventScript_1684A7 + call_if_eq EventScript_1684A7 msgbox gUnknown_8188A3C setvar VAR_LAST_TALKED, 1 compare VAR_STARTER_MON, 2 - call_if eq, EventScript_1684B9 + call_if_eq EventScript_1684B9 compare VAR_STARTER_MON, 1 - call_if eq, EventScript_1684C4 + call_if_eq EventScript_1684C4 compare VAR_STARTER_MON, 0 - call_if eq, EventScript_1684CF + call_if_eq EventScript_1684CF msgbox gUnknown_8188B29 closemessage delay 10 @@ -235,15 +235,15 @@ EventScript_1684A7:: @ 81684A7 return EventScript_1684B9:: @ 81684B9 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_RIVAL_ROUTE22_LATE_SQUIRTLE, 0, Text_188B08 + trainerbattle_no_intro TRAINER_RIVAL_ROUTE22_LATE_SQUIRTLE, Text_188B08 return EventScript_1684C4:: @ 81684C4 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_RIVAL_ROUTE22_LATE_BULBASAUR, 0, Text_188B08 + trainerbattle_no_intro TRAINER_RIVAL_ROUTE22_LATE_BULBASAUR, Text_188B08 return EventScript_1684CF:: @ 81684CF - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_RIVAL_ROUTE22_LATE_CHARMANDER, 0, Text_188B08 + trainerbattle_no_intro TRAINER_RIVAL_ROUTE22_LATE_CHARMANDER, Text_188B08 return Movement_1684DA:: @ 81684DA diff --git a/data/maps/Route24/scripts.inc b/data/maps/Route24/scripts.inc index 6889e739c..f3239d8dc 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_MAP_SCENE_ROUTE24, 1 - goto_if eq, EventScript_168656 + goto_if_eq EventScript_168656 msgbox gUnknown_8188C3C checkitemspace ITEM_NUGGET, 1 compare VAR_RESULT, 0 - goto_if eq, EventScript_16864C + goto_if_eq EventScript_16864C call EventScript_1686B9 release end @@ -39,28 +39,27 @@ Route24_EventScript_16866C:: @ 816866C EventScript_168678:: @ 8168678 textcolor 0 compare VAR_TEMP_1, 0 - call_if eq, EventScript_1686FD + call_if_eq EventScript_1686FD compare VAR_TEMP_1, 1 - call_if eq, EventScript_168708 + call_if_eq EventScript_168708 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 msgbox gUnknown_8188C3C checkitemspace ITEM_NUGGET, 1 compare VAR_RESULT, 0 - goto_if eq, EventScript_168713 + goto_if_eq EventScript_168713 call EventScript_1686B9 releaseall end EventScript_1686B9:: @ 81686B9 - additem ITEM_NUGGET, 1 - giveitemfanfaremsg gUnknown_8188C93, ITEM_NUGGET + giveitem_msg gUnknown_8188C93, ITEM_NUGGET message Text_188CDB waitmessage playbgm MUS_ROCKET, 0 waitbuttonpress setvar VAR_LAST_TALKED, 1 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_TEAM_ROCKET_GRUNT_6, 0, Text_188DDC + trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_6, Text_188DDC msgbox gUnknown_8188DF1 setvar VAR_MAP_SCENE_ROUTE24, 1 return @@ -81,7 +80,7 @@ EventScript_168713:: @ 8168713 applymovement OBJ_EVENT_ID_PLAYER, Movement_168743 waitmovement 0 compare VAR_TEMP_1, 0 - call_if eq, EventScript_168733 + call_if_eq EventScript_168733 release end diff --git a/data/maps/Route25_SeaCottage/scripts.inc b/data/maps/Route25_SeaCottage/scripts.inc index 3b41eac68..1a35552e4 100644 --- a/data/maps/Route25_SeaCottage/scripts.inc +++ b/data/maps/Route25_SeaCottage/scripts.inc @@ -3,10 +3,8 @@ Route25_SeaCottage_MapScripts:: @ 8170523 .byte 0 Route25_SeaCottage_OnTransition:: @ 8170529 - checkflag FLAG_HELPED_BILL_IN_SEA_COTTAGE - call_if FALSE, EventScript_17053C - checkflag FLAG_GOT_SS_TICKET - call_if TRUE, EventScript_170547 + call_if_unset FLAG_HELPED_BILL_IN_SEA_COTTAGE, EventScript_17053C + call_if_set FLAG_GOT_SS_TICKET, EventScript_170547 end EventScript_17053C:: @ 817053C @@ -21,17 +19,14 @@ EventScript_170547:: @ 8170547 Route25_SeaCottage_EventScript_17054B:: @ 817054B lock faceplayer - checkflag FLAG_TEMP_3 - goto_if TRUE, EventScript_1706C8 - checkflag FLAG_GOT_SS_TICKET - goto_if TRUE, EventScript_170640 - checkflag FLAG_HELPED_BILL_IN_SEA_COTTAGE - goto_if TRUE, EventScript_17064A + goto_if_set FLAG_TEMP_3, EventScript_1706C8 + goto_if_set FLAG_GOT_SS_TICKET, EventScript_170640 + goto_if_set FLAG_HELPED_BILL_IN_SEA_COTTAGE, EventScript_17064A checkplayergender compare VAR_RESULT, 0 - goto_if eq, EventScript_170580 + goto_if_eq EventScript_170580 compare VAR_RESULT, 1 - goto_if eq, EventScript_17058E + goto_if_eq EventScript_17058E end EventScript_170580:: @ 8170580 @@ -46,18 +41,18 @@ EventScript_17058E:: @ 817058E EventScript_17059C:: @ 817059C compare VAR_RESULT, 0 - call_if eq, EventScript_170600 + call_if_eq EventScript_170600 msgbox gUnknown_819FFD3 closemessage delay 10 compare VAR_FACING, DIR_SOUTH - call_if eq, EventScript_17062A + call_if_eq EventScript_17062A compare VAR_FACING, DIR_NORTH - call_if eq, EventScript_170635 + call_if_eq EventScript_170635 compare VAR_FACING, DIR_WEST - call_if eq, EventScript_170635 + call_if_eq EventScript_170635 compare VAR_FACING, DIR_EAST - call_if eq, EventScript_170635 + call_if_eq EventScript_170635 opendoor 10, 3 waitdooranim applymovement 2, Movement_1706DB @@ -73,9 +68,9 @@ EventScript_17059C:: @ 817059C EventScript_170600:: @ 8170600 checkplayergender compare VAR_RESULT, 0 - call_if eq, EventScript_170618 + call_if_eq EventScript_170618 compare VAR_RESULT, 1 - call_if eq, EventScript_170621 + call_if_eq EventScript_170621 return EventScript_170618:: @ 8170618 @@ -105,14 +100,13 @@ EventScript_17064A:: @ 817064A famechecker FAMECHECKER_BILL, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 checkplayergender compare VAR_RESULT, 0 - call_if eq, EventScript_1706AC + call_if_eq EventScript_1706AC compare VAR_RESULT, 1 - call_if eq, EventScript_1706B5 + call_if_eq EventScript_1706B5 checkitemspace ITEM_SS_TICKET, 1 compare VAR_RESULT, 0 - goto_if eq, EventScript_1706BE - additem ITEM_SS_TICKET, 1 - giveitemfanfaremsg gUnknown_81A028E, ITEM_SS_TICKET, 1, MUS_FAN5 + goto_if_eq EventScript_1706BE + giveitem_msg gUnknown_81A028E, ITEM_SS_TICKET, 1, MUS_FAN5 setflag FLAG_GOT_SS_TICKET_DUP setflag FLAG_HIDE_NUGGET_BRIDGE_ROCKET setflag FLAG_GOT_SS_TICKET @@ -157,10 +151,8 @@ Movement_1706DB:: @ 81706DB Route25_SeaCottage_EventScript_1706DD:: @ 81706DD lockall - checkflag FLAG_TEMP_3 - goto_if TRUE, EventScript_1707CA - checkflag FLAG_TEMP_2 - goto_if TRUE, EventScript_1706FA + goto_if_set FLAG_TEMP_3, EventScript_1707CA + goto_if_set FLAG_TEMP_2, EventScript_1706FA msgbox gUnknown_81A0402 releaseall end diff --git a/data/maps/Route2_EastBuilding/scripts.inc b/data/maps/Route2_EastBuilding/scripts.inc index 002c928ab..dec1a7e0c 100644 --- a/data/maps/Route2_EastBuilding/scripts.inc +++ b/data/maps/Route2_EastBuilding/scripts.inc @@ -5,23 +5,21 @@ Route2_EastBuilding_EventScript_16F67F:: @ 816F67F lock faceplayer call EventScript_16F70B - checkflag FLAG_GOT_HM05 - goto_if TRUE, EventScript_16F701 + goto_if_set FLAG_GOT_HM05, EventScript_16F701 msgbox gUnknown_819D64F, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_1A7AD1 + goto_if_eq EventScript_1A7AD1 setvar VAR_0x8004, 0 specialvar VAR_RESULT, Special_GetPokedexCount getnumberstring 2, VAR_0x8006 call EventScript_16F70B compare VAR_0x8006, 10 - goto_if lt, EventScript_1A7ABD + goto_if_lt EventScript_1A7ABD msgbox gUnknown_819D74E checkitemspace ITEM_HM05, 1 compare VAR_RESULT, 0 - goto_if eq, EventScript_1A7AC7 - additem ITEM_HM05, 1 - giveitemfanfaremsg gUnknown_819D7A1, ITEM_HM05 + goto_if_eq EventScript_1A7AC7 + giveitem_msg gUnknown_819D7A1, ITEM_HM05 setflag FLAG_GOT_HM05 msgbox gUnknown_819D7C1 release diff --git a/data/maps/Route2_House/scripts.inc b/data/maps/Route2_House/scripts.inc index 0f5604fa3..5b92d8298 100644 --- a/data/maps/Route2_House/scripts.inc +++ b/data/maps/Route2_House/scripts.inc @@ -10,17 +10,16 @@ Route2_House_EventScript_16F602:: @ 816F602 faceplayer setvar VAR_0x8008, 0 call EventScript_1A8CAD - checkflag FLAG_DID_MIMIEN_TRADE - goto_if TRUE, EventScript_16F674 + goto_if_set FLAG_DID_MIMIEN_TRADE, EventScript_16F674 msgbox gUnknown_81A597B, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_16F65C + goto_if_eq EventScript_16F65C call EventScript_1A8CBD compare VAR_0x8004, 6 - goto_if ge, EventScript_16F65C + goto_if_ge EventScript_16F65C call EventScript_1A8CC9 compare VAR_RESULT, VAR_0x8009 - goto_if ne, EventScript_16F666 + goto_if_ne EventScript_16F666 call EventScript_1A8CD9 msgbox gUnknown_81A59DA setflag FLAG_DID_MIMIEN_TRADE diff --git a/data/maps/Route4_PokemonCenter_1F/scripts.inc b/data/maps/Route4_PokemonCenter_1F/scripts.inc index dbb66acfd..bb8294e6d 100644 --- a/data/maps/Route4_PokemonCenter_1F/scripts.inc +++ b/data/maps/Route4_PokemonCenter_1F/scripts.inc @@ -21,14 +21,13 @@ Route4_PokemonCenter_1F_EventScript_16F754:: @ 816F754 Route4_PokemonCenter_1F_EventScript_16F75F:: @ 816F75F lock faceplayer - checkflag FLAG_BOUGHT_MAGIKARP - goto_if TRUE, EventScript_16F8A2 + goto_if_set FLAG_BOUGHT_MAGIKARP, EventScript_16F8A2 showmoneybox 0, 0, 0 checkplayergender compare VAR_RESULT, 0 - goto_if eq, EventScript_16F786 + goto_if_eq EventScript_16F786 compare VAR_RESULT, 1 - goto_if eq, EventScript_16F794 + goto_if_eq EventScript_16F794 end EventScript_16F786:: @ 816F786 @@ -43,26 +42,26 @@ EventScript_16F794:: @ 816F794 EventScript_16F7A2:: @ 816F7A2 compare VAR_RESULT, 0 - goto_if eq, EventScript_16F888 + goto_if_eq EventScript_16F888 checkmoney 500, 0 compare VAR_RESULT, 0 - goto_if eq, EventScript_16F895 + goto_if_eq EventScript_16F895 textcolor 3 setvar VAR_TEMP_1, 129 - givemon SPECIES_MAGIKARP, 5, ITEM_NONE, 0, 0, 0 + givemon SPECIES_MAGIKARP, 5, ITEM_NONE compare VAR_RESULT, 0 - goto_if eq, EventScript_16F7F6 + goto_if_eq EventScript_16F7F6 compare VAR_RESULT, 1 - goto_if eq, EventScript_16F822 + goto_if_eq EventScript_16F822 compare VAR_RESULT, 2 - goto_if eq, EventScript_16F8AC + goto_if_eq EventScript_16F8AC end EventScript_16F7F6:: @ 816F7F6 call EventScript_16F86F msgbox gUnknown_81A56A7, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_16F861 + goto_if_eq EventScript_16F861 call EventScript_1A8C27 fadescreen 1 hidemoneybox 0, 0 @@ -75,7 +74,7 @@ EventScript_16F822:: @ 816F822 call EventScript_16F86F msgbox gUnknown_81A56A7, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_16F84B + goto_if_eq EventScript_16F84B fadescreen 1 hidemoneybox 0, 0 special ChangeBoxPokemonNickname diff --git a/data/maps/Route5_SouthEntrance/scripts.inc b/data/maps/Route5_SouthEntrance/scripts.inc index 2aac04b78..ca7a34e0c 100644 --- a/data/maps/Route5_SouthEntrance/scripts.inc +++ b/data/maps/Route5_SouthEntrance/scripts.inc @@ -27,8 +27,7 @@ EventScript_16F92E:: @ 816F92E textcolor 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft waitmovement 0 - checkflag FLAG_GOT_TEA - goto_if TRUE, EventScript_16F958 + goto_if_set FLAG_GOT_TEA, EventScript_16F958 msgbox gUnknown_819E04B closemessage applymovement OBJ_EVENT_ID_PLAYER, Movement_16F9C4 @@ -45,11 +44,11 @@ EventScript_16F963:: @ 816F963 msgbox gUnknown_819E09B closemessage compare VAR_TEMP_1, 0 - call_if eq, EventScript_16F99C + call_if_eq EventScript_16F99C compare VAR_TEMP_1, 1 - call_if eq, EventScript_16F9A7 + call_if_eq EventScript_16F9A7 compare VAR_TEMP_1, 2 - call_if eq, EventScript_16F9B2 + call_if_eq EventScript_16F9B2 msgbox gUnknown_819E0C1 setvar VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES, 1 releaseall diff --git a/data/maps/Route6_NorthEntrance/scripts.inc b/data/maps/Route6_NorthEntrance/scripts.inc index d85587c03..393c7ee6a 100644 --- a/data/maps/Route6_NorthEntrance/scripts.inc +++ b/data/maps/Route6_NorthEntrance/scripts.inc @@ -27,8 +27,7 @@ EventScript_16F9F4:: @ 816F9F4 textcolor 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 - checkflag FLAG_GOT_TEA - goto_if TRUE, EventScript_16FA1E + goto_if_set FLAG_GOT_TEA, EventScript_16FA1E msgbox gUnknown_819E181 closemessage applymovement OBJ_EVENT_ID_PLAYER, Movement_16FA8A @@ -45,11 +44,11 @@ EventScript_16FA29:: @ 816FA29 msgbox gUnknown_819E1D1 closemessage compare VAR_TEMP_1, 0 - call_if eq, EventScript_16FA62 + call_if_eq EventScript_16FA62 compare VAR_TEMP_1, 1 - call_if eq, EventScript_16FA6D + call_if_eq EventScript_16FA6D compare VAR_TEMP_1, 2 - call_if eq, EventScript_16FA78 + call_if_eq EventScript_16FA78 msgbox gUnknown_819E1F7 setvar VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES, 1 releaseall diff --git a/data/maps/Route7_EastEntrance/scripts.inc b/data/maps/Route7_EastEntrance/scripts.inc index 5cb615467..17ac82ef8 100644 --- a/data/maps/Route7_EastEntrance/scripts.inc +++ b/data/maps/Route7_EastEntrance/scripts.inc @@ -27,8 +27,7 @@ EventScript_16FABB:: @ 816FABB textcolor 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 - checkflag FLAG_GOT_TEA - goto_if TRUE, EventScript_16FAE5 + goto_if_set FLAG_GOT_TEA, EventScript_16FAE5 msgbox gUnknown_819E2B7 closemessage applymovement OBJ_EVENT_ID_PLAYER, Movement_16FB51 @@ -45,11 +44,11 @@ EventScript_16FAF0:: @ 816FAF0 msgbox gUnknown_819E307 closemessage compare VAR_TEMP_1, 0 - call_if eq, EventScript_16FB29 + call_if_eq EventScript_16FB29 compare VAR_TEMP_1, 1 - call_if eq, EventScript_16FB34 + call_if_eq EventScript_16FB34 compare VAR_TEMP_1, 2 - call_if eq, EventScript_16FB3F + call_if_eq EventScript_16FB3F msgbox gUnknown_819E32D setvar VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES, 1 releaseall diff --git a/data/maps/Route8_WestEntrance/scripts.inc b/data/maps/Route8_WestEntrance/scripts.inc index 6d79a9412..0ce1d1f69 100644 --- a/data/maps/Route8_WestEntrance/scripts.inc +++ b/data/maps/Route8_WestEntrance/scripts.inc @@ -27,8 +27,7 @@ EventScript_16FB81:: @ 816FB81 textcolor 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 - checkflag FLAG_GOT_TEA - goto_if TRUE, EventScript_16FBAB + goto_if_set FLAG_GOT_TEA, EventScript_16FBAB msgbox gUnknown_819E3ED closemessage applymovement OBJ_EVENT_ID_PLAYER, Movement_16FC2D @@ -55,11 +54,11 @@ EventScript_16FBCC:: @ 816FBCC msgbox gUnknown_819E43D closemessage compare VAR_TEMP_1, 0 - call_if eq, EventScript_16FC05 + call_if_eq EventScript_16FC05 compare VAR_TEMP_1, 1 - call_if eq, EventScript_16FC10 + call_if_eq EventScript_16FC10 compare VAR_TEMP_1, 2 - call_if eq, EventScript_16FC1B + call_if_eq EventScript_16FC1B msgbox gUnknown_819E463 setvar VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES, 1 releaseall diff --git a/data/maps/SSAnne_1F_Room2/scripts.inc b/data/maps/SSAnne_1F_Room2/scripts.inc index ef73a522a..24414384f 100644 --- a/data/maps/SSAnne_1F_Room2/scripts.inc +++ b/data/maps/SSAnne_1F_Room2/scripts.inc @@ -6,11 +6,11 @@ SSAnne_1F_Room2_EventScript_160BE6:: @ 8160BE6 end SSAnne_1F_Room2_EventScript_160BEF:: @ 8160BEF - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_ANN, 0, Text_173A1A, Text_173A4F + trainerbattle_single TRAINER_LASS_ANN, Text_173A1A, Text_173A4F msgbox gUnknown_8173A7A, 6 end SSAnne_1F_Room2_EventScript_160C06:: @ 8160C06 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_YOUNGSTER_TYLER, 0, Text_173999, Text_1739B1 + trainerbattle_single TRAINER_YOUNGSTER_TYLER, Text_173999, Text_1739B1 msgbox gUnknown_81739C5, 6 end diff --git a/data/maps/SSAnne_1F_Room4/scripts.inc b/data/maps/SSAnne_1F_Room4/scripts.inc index f13ffc7e9..4ebebdc0a 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_RESULT, 0 - goto_if eq, EventScript_160C5C + goto_if_eq EventScript_160C5C msgbox gUnknown_8173BA4 release end diff --git a/data/maps/SSAnne_1F_Room5/scripts.inc b/data/maps/SSAnne_1F_Room5/scripts.inc index 11040e58f..91407ef92 100644 --- a/data/maps/SSAnne_1F_Room5/scripts.inc +++ b/data/maps/SSAnne_1F_Room5/scripts.inc @@ -2,6 +2,6 @@ SSAnne_1F_Room5_MapScripts:: @ 8160C66 .byte 0 SSAnne_1F_Room5_EventScript_160C67:: @ 8160C67 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_GENTLEMAN_ARTHUR, 0, Text_173BD1, Text_173BFA + trainerbattle_single TRAINER_GENTLEMAN_ARTHUR, Text_173BD1, Text_173BFA msgbox gUnknown_8173C30, 6 end diff --git a/data/maps/SSAnne_1F_Room6/scripts.inc b/data/maps/SSAnne_1F_Room6/scripts.inc index 1898942d2..78a0f51e7 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_RESULT, 0 - goto_if eq, EventScript_160E18 + goto_if_eq EventScript_160E18 closemessage call EventScript_FadeOut_Heal_FadeIn msgbox gUnknown_8174490 @@ -16,7 +16,7 @@ SSAnne_1F_Room6_EventScript_160DF3:: @ 8160DF3 EventScript_160E18:: @ 8160E18 checkplayergender compare VAR_RESULT, 0 - goto_if eq, EventScript_160E2E + goto_if_eq EventScript_160E2E msgbox gUnknown_8174515 release end diff --git a/data/maps/SSAnne_1F_Room7/scripts.inc b/data/maps/SSAnne_1F_Room7/scripts.inc index 96b0ae20a..cde454332 100644 --- a/data/maps/SSAnne_1F_Room7/scripts.inc +++ b/data/maps/SSAnne_1F_Room7/scripts.inc @@ -2,6 +2,6 @@ SSAnne_1F_Room7_MapScripts:: @ 8160C7E .byte 0 SSAnne_1F_Room7_EventScript_160C7F:: @ 8160C7F - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_GENTLEMAN_THOMAS, 0, Text_173C52, Text_173CB4 + trainerbattle_single TRAINER_GENTLEMAN_THOMAS, Text_173C52, Text_173CB4 msgbox gUnknown_8173CC4, 6 end diff --git a/data/maps/SSAnne_2F_Corridor/scripts.inc b/data/maps/SSAnne_2F_Corridor/scripts.inc index 7cd9e2f5d..46a69aa10 100644 --- a/data/maps/SSAnne_2F_Corridor/scripts.inc +++ b/data/maps/SSAnne_2F_Corridor/scripts.inc @@ -36,29 +36,29 @@ EventScript_160903:: @ 8160903 waitmovement 0 delay 20 compare VAR_TEMP_1, 0 - call_if eq, EventScript_1609AD + call_if_eq EventScript_1609AD compare VAR_TEMP_1, 1 - call_if eq, EventScript_1609B8 + call_if_eq EventScript_1609B8 compare VAR_TEMP_1, 2 - call_if eq, EventScript_1609CA + call_if_eq EventScript_1609CA msgbox gUnknown_8173035 setvar VAR_LAST_TALKED, 1 compare VAR_STARTER_MON, 2 - call_if eq, EventScript_1609DC + call_if_eq EventScript_1609DC compare VAR_STARTER_MON, 1 - call_if eq, EventScript_1609E7 + call_if_eq EventScript_1609E7 compare VAR_STARTER_MON, 0 - call_if eq, EventScript_1609F2 + call_if_eq EventScript_1609F2 msgbox gUnknown_8173164 closemessage delay 10 playbgm MUS_RIVAL2, 0 compare VAR_TEMP_1, 0 - call_if eq, EventScript_1609FD + call_if_eq EventScript_1609FD compare VAR_TEMP_1, 1 - call_if eq, EventScript_160A08 + call_if_eq EventScript_160A08 compare VAR_TEMP_1, 2 - call_if eq, EventScript_160A13 + call_if_eq EventScript_160A13 fadedefaultbgm removeobject 1 setvar VAR_MAP_SCENE_S_S_ANNE_2F_CORRIDOR, 1 @@ -83,15 +83,15 @@ EventScript_1609CA:: @ 81609CA return EventScript_1609DC:: @ 81609DC - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_RIVAL_SS_ANNE_SQUIRTLE, 0, Text_173110 + trainerbattle_no_intro TRAINER_RIVAL_SS_ANNE_SQUIRTLE, Text_173110 return EventScript_1609E7:: @ 81609E7 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_RIVAL_SS_ANNE_BULBASAUR, 0, Text_173110 + trainerbattle_no_intro TRAINER_RIVAL_SS_ANNE_BULBASAUR, Text_173110 return EventScript_1609F2:: @ 81609F2 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_RIVAL_SS_ANNE_CHARMANDER, 0, Text_173110 + trainerbattle_no_intro TRAINER_RIVAL_SS_ANNE_CHARMANDER, Text_173110 return EventScript_1609FD:: @ 81609FD diff --git a/data/maps/SSAnne_2F_Room2/scripts.inc b/data/maps/SSAnne_2F_Room2/scripts.inc index cabf92f28..90cf0a1fc 100644 --- a/data/maps/SSAnne_2F_Room2/scripts.inc +++ b/data/maps/SSAnne_2F_Room2/scripts.inc @@ -2,11 +2,11 @@ SSAnne_2F_Room2_MapScripts:: @ 8160CB0 .byte 0 SSAnne_2F_Room2_EventScript_160CB1:: @ 8160CB1 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_FISHERMAN_DALE, 0, Text_173DDB, Text_173DF7 + trainerbattle_single TRAINER_FISHERMAN_DALE, Text_173DDB, Text_173DF7 msgbox gUnknown_8173E04, 6 end SSAnne_2F_Room2_EventScript_160CC8:: @ 8160CC8 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_GENTLEMAN_BROOKS, 0, Text_173D63, Text_173D92 + trainerbattle_single TRAINER_GENTLEMAN_BROOKS, Text_173D63, Text_173D92 msgbox gUnknown_8173DB6, 6 end diff --git a/data/maps/SSAnne_2F_Room4/scripts.inc b/data/maps/SSAnne_2F_Room4/scripts.inc index 330b18acc..46fd35501 100644 --- a/data/maps/SSAnne_2F_Room4/scripts.inc +++ b/data/maps/SSAnne_2F_Room4/scripts.inc @@ -2,11 +2,11 @@ SSAnne_2F_Room4_MapScripts:: @ 8160CF2 .byte 0 SSAnne_2F_Room4_EventScript_160CF3:: @ 8160CF3 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_GENTLEMAN_LAMAR, 0, Text_173F07, Text_173F42 + trainerbattle_single TRAINER_GENTLEMAN_LAMAR, Text_173F07, Text_173F42 msgbox gUnknown_8173F55, 6 end SSAnne_2F_Room4_EventScript_160D0A:: @ 8160D0A - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_DAWN, 0, Text_173F83, Text_173FAB + trainerbattle_single TRAINER_LASS_DAWN, Text_173F83, Text_173FAB msgbox gUnknown_8173FB9, 6 end diff --git a/data/maps/SSAnne_B1F_Room1/scripts.inc b/data/maps/SSAnne_B1F_Room1/scripts.inc index 06903353d..68d7ae9d0 100644 --- a/data/maps/SSAnne_B1F_Room1/scripts.inc +++ b/data/maps/SSAnne_B1F_Room1/scripts.inc @@ -2,11 +2,11 @@ SSAnne_B1F_Room1_MapScripts:: @ 8160D47 .byte 0 SSAnne_B1F_Room1_EventScript_160D48:: @ 8160D48 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_FISHERMAN_BARNY, 0, Text_174177, Text_1741EF + trainerbattle_single TRAINER_FISHERMAN_BARNY, Text_174177, Text_1741EF msgbox gUnknown_817420E, 6 end SSAnne_B1F_Room1_EventScript_160D5F:: @ 8160D5F - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SAILOR_PHILLIP, 0, Text_1740F6, Text_174123 + trainerbattle_single TRAINER_SAILOR_PHILLIP, Text_1740F6, Text_174123 msgbox gUnknown_817413A, 6 end diff --git a/data/maps/SSAnne_B1F_Room2/scripts.inc b/data/maps/SSAnne_B1F_Room2/scripts.inc index 01772cab8..9f28f7cf5 100644 --- a/data/maps/SSAnne_B1F_Room2/scripts.inc +++ b/data/maps/SSAnne_B1F_Room2/scripts.inc @@ -2,6 +2,6 @@ SSAnne_B1F_Room2_MapScripts:: @ 8160D76 .byte 0 SSAnne_B1F_Room2_EventScript_160D77:: @ 8160D77 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SAILOR_HUEY, 0, Text_174239, Text_17425C + trainerbattle_single TRAINER_SAILOR_HUEY, Text_174239, Text_17425C msgbox gUnknown_8174272, 6 end diff --git a/data/maps/SSAnne_B1F_Room3/scripts.inc b/data/maps/SSAnne_B1F_Room3/scripts.inc index da4ed9aaf..af2277e2c 100644 --- a/data/maps/SSAnne_B1F_Room3/scripts.inc +++ b/data/maps/SSAnne_B1F_Room3/scripts.inc @@ -2,6 +2,6 @@ SSAnne_B1F_Room3_MapScripts:: @ 8160D8E .byte 0 SSAnne_B1F_Room3_EventScript_160D8F:: @ 8160D8F - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SAILOR_DYLAN, 0, Text_1742A6, Text_1742C3 + trainerbattle_single TRAINER_SAILOR_DYLAN, Text_1742A6, Text_1742C3 msgbox gUnknown_81742D2, 6 end diff --git a/data/maps/SSAnne_B1F_Room4/scripts.inc b/data/maps/SSAnne_B1F_Room4/scripts.inc index e9730a19e..1c5766a91 100644 --- a/data/maps/SSAnne_B1F_Room4/scripts.inc +++ b/data/maps/SSAnne_B1F_Room4/scripts.inc @@ -2,11 +2,11 @@ SSAnne_B1F_Room4_MapScripts:: @ 8160DA6 .byte 0 SSAnne_B1F_Room4_EventScript_160DA7:: @ 8160DA7 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SAILOR_LEONARD, 0, Text_174315, Text_174348 + trainerbattle_single TRAINER_SAILOR_LEONARD, Text_174315, Text_174348 msgbox gUnknown_8174362, 6 end SSAnne_B1F_Room4_EventScript_160DBE:: @ 8160DBE - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SAILOR_DUNCAN, 0, Text_174385, Text_1743B3 + trainerbattle_single TRAINER_SAILOR_DUNCAN, Text_174385, Text_1743B3 msgbox gUnknown_81743C8, 6 end diff --git a/data/maps/SSAnne_CaptainsOffice/scripts.inc b/data/maps/SSAnne_CaptainsOffice/scripts.inc index 562e3b3a6..54481438f 100644 --- a/data/maps/SSAnne_CaptainsOffice/scripts.inc +++ b/data/maps/SSAnne_CaptainsOffice/scripts.inc @@ -3,8 +3,7 @@ SSAnne_CaptainsOffice_MapScripts:: @ 8160B39 SSAnne_CaptainsOffice_EventScript_160B3A:: @ 8160B3A lock - checkflag FLAG_GOT_HM01 - goto_if TRUE, EventScript_160BB5 + goto_if_set FLAG_GOT_HM01, EventScript_160BB5 msgbox gUnknown_8173646 textcolor 3 message Text_173676 @@ -16,8 +15,7 @@ SSAnne_CaptainsOffice_EventScript_160B3A:: @ 8160B3A applymovement 1, Movement_FacePlayer waitmovement 0 msgbox gUnknown_81736A6 - additem ITEM_HM01, 1 - giveitemfanfaremsg gUnknown_81737AF, ITEM_HM01, 1, MUS_FAN5 + giveitem_msg gUnknown_81737AF, ITEM_HM01, 1, MUS_FAN5 msgbox gUnknown_81737D2 setflag FLAG_GOT_HM01 setvar VAR_MAP_SCENE_VERMILION_CITY, 1 diff --git a/data/maps/SSAnne_Deck/scripts.inc b/data/maps/SSAnne_Deck/scripts.inc index 955625e2e..1d93ae66a 100644 --- a/data/maps/SSAnne_Deck/scripts.inc +++ b/data/maps/SSAnne_Deck/scripts.inc @@ -14,11 +14,11 @@ SSAnne_Deck_EventScript_160A7B:: @ 8160A7B end SSAnne_Deck_EventScript_160A84:: @ 8160A84 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SAILOR_EDMOND, 0, Text_173308, Text_17332B + trainerbattle_single TRAINER_SAILOR_EDMOND, Text_173308, Text_17332B msgbox gUnknown_817333E, 6 end SSAnne_Deck_EventScript_160A9B:: @ 8160A9B - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SAILOR_TREVOR, 0, Text_173382, Text_1733A0 + trainerbattle_single TRAINER_SAILOR_TREVOR, Text_173382, Text_1733A0 msgbox gUnknown_81733B5, 6 end diff --git a/data/maps/SSAnne_Exterior/scripts.inc b/data/maps/SSAnne_Exterior/scripts.inc index 9a9327acb..a8ad24173 100644 --- a/data/maps/SSAnne_Exterior/scripts.inc +++ b/data/maps/SSAnne_Exterior/scripts.inc @@ -15,9 +15,9 @@ SSAnne_Exterior_160859:: @ 8160859 lockall getplayerxy VAR_0x8004, VAR_0x8005 compare VAR_0x8005, 6 - call_if le, EventScript_1608A1 + call_if_le EventScript_1608A1 compare VAR_0x8005, 7 - call_if ge, EventScript_1608AC + call_if_ge EventScript_1608AC fadenewbgm MUS_NAMINORI delay 50 special Special_SSAnneDepartureCutscene diff --git a/data/maps/SSAnne_Kitchen/scripts.inc b/data/maps/SSAnne_Kitchen/scripts.inc index 97ca7f889..b5619e78e 100644 --- a/data/maps/SSAnne_Kitchen/scripts.inc +++ b/data/maps/SSAnne_Kitchen/scripts.inc @@ -20,11 +20,11 @@ SSAnne_Kitchen_EventScript_160ACE:: @ 8160ACE random 3 copyvar VAR_0x8008, VAR_RESULT compare VAR_0x8008, 0 - call_if eq, EventScript_160B03 + call_if_eq EventScript_160B03 compare VAR_0x8008, 1 - call_if eq, EventScript_160B0C + call_if_eq EventScript_160B0C compare VAR_0x8008, 2 - call_if eq, EventScript_160B15 + call_if_eq EventScript_160B15 release end diff --git a/data/maps/SafariZone_SecretHouse/scripts.inc b/data/maps/SafariZone_SecretHouse/scripts.inc index fe7a4f6fa..0d8e81924 100644 --- a/data/maps/SafariZone_SecretHouse/scripts.inc +++ b/data/maps/SafariZone_SecretHouse/scripts.inc @@ -4,14 +4,12 @@ SafariZone_SecretHouse_MapScripts:: @ 8162452 SafariZone_SecretHouse_EventScript_162453:: @ 8162453 lock faceplayer - checkflag FLAG_GOT_HM03 - goto_if TRUE, EventScript_1624A9 + goto_if_set FLAG_GOT_HM03, EventScript_1624A9 msgbox gUnknown_8177DC1 checkitemspace ITEM_HM03, 1 compare VAR_RESULT, 0 - goto_if eq, EventScript_16249F - additem ITEM_HM03, 1 - giveitemfanfaremsg gUnknown_8177E92, ITEM_HM03 + goto_if_eq EventScript_16249F + giveitem_msg gUnknown_8177E92, ITEM_HM03 msgbox gUnknown_8177EB7 setflag FLAG_GOT_HM03 release diff --git a/data/maps/SaffronCity/scripts.inc b/data/maps/SaffronCity/scripts.inc index f4cf94274..3973d5e6b 100644 --- a/data/maps/SaffronCity/scripts.inc +++ b/data/maps/SaffronCity/scripts.inc @@ -4,8 +4,7 @@ SaffronCity_MapScripts:: @ 816735F SaffronCity_OnTransition:: @ 8167365 setworldmapflag FLAG_WORLD_MAP_SAFFRON_CITY - checkflag FLAG_RESCUED_MR_FUJI - call_if FALSE, EventScript_167372 + call_if_unset FLAG_RESCUED_MR_FUJI, EventScript_167372 end EventScript_167372:: @ 8167372 @@ -42,8 +41,7 @@ SaffronCity_EventScript_1673B0:: @ 81673B0 SaffronCity_EventScript_1673B9:: @ 81673B9 lock - checkflag FLAG_RESCUED_MR_FUJI - goto_if TRUE, EventScript_1673D7 + goto_if_set FLAG_RESCUED_MR_FUJI, EventScript_1673D7 applymovement 6, Movement_FacePlayer waitmovement 0 msgbox gUnknown_81812CA diff --git a/data/maps/SaffronCity_Dojo/scripts.inc b/data/maps/SaffronCity_Dojo/scripts.inc index 06a315907..c03e62262 100644 --- a/data/maps/SaffronCity_Dojo/scripts.inc +++ b/data/maps/SaffronCity_Dojo/scripts.inc @@ -20,8 +20,7 @@ SaffronCity_Dojo_EventScript_16EBEE:: @ 816EBEE SaffronCity_Dojo_EventScript_16EC00:: @ 816EC00 lock faceplayer - checkflag FLAG_GOT_HITMON_FROM_DOJO - goto_if TRUE, EventScript_16EC3C + goto_if_set FLAG_GOT_HITMON_FROM_DOJO, EventScript_16EC3C drawmonpic SPECIES_HITMONLEE, 10, 3 setvar VAR_TEMP_1, SPECIES_HITMONLEE applymovement 5, Movement_WalkInPlaceFastestUp @@ -30,7 +29,7 @@ SaffronCity_Dojo_EventScript_16EC00:: @ 816EC00 msgbox gUnknown_819B44E, MSGBOX_YESNO call EventScript_1A6675 compare VAR_RESULT, 1 - goto_if eq, EventScript_16EC82 + goto_if_eq EventScript_16EC82 erasemonpic release end @@ -43,8 +42,7 @@ EventScript_16EC3C:: @ 816EC3C SaffronCity_Dojo_EventScript_16EC46:: @ 816EC46 lock faceplayer - checkflag FLAG_GOT_HITMON_FROM_DOJO - goto_if TRUE, EventScript_16EC3C + goto_if_set FLAG_GOT_HITMON_FROM_DOJO, EventScript_16EC3C drawmonpic SPECIES_HITMONCHAN, 10, 3 setvar VAR_TEMP_1, SPECIES_HITMONCHAN applymovement 5, Movement_WalkInPlaceFastestUp @@ -53,20 +51,20 @@ SaffronCity_Dojo_EventScript_16EC46:: @ 816EC46 msgbox gUnknown_819B49E, MSGBOX_YESNO call EventScript_1A6675 compare VAR_RESULT, 1 - goto_if eq, EventScript_16EC82 + goto_if_eq EventScript_16EC82 erasemonpic release end EventScript_16EC82:: @ 816EC82 erasemonpic - givemon VAR_TEMP_1, 25, ITEM_NONE, 0, 0, 0 + givemon VAR_TEMP_1, 25, ITEM_NONE compare VAR_RESULT, 0 - goto_if eq, EventScript_16ECB5 + goto_if_eq EventScript_16ECB5 compare VAR_RESULT, 1 - goto_if eq, EventScript_16ECEC + goto_if_eq EventScript_16ECEC compare VAR_RESULT, 2 - goto_if eq, EventScript_1A927C + goto_if_eq EventScript_1A927C release end @@ -80,7 +78,7 @@ EventScript_16ECB5:: @ 816ECB5 setflag FLAG_GOT_HITMON_FROM_DOJO msgbox gUnknown_81A56A7, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_16ED29 + goto_if_eq EventScript_16ED29 call EventScript_1A8C27 call EventScript_1A74EB goto EventScript_16ED29 @@ -96,7 +94,7 @@ EventScript_16ECEC:: @ 816ECEC setflag FLAG_GOT_HITMON_FROM_DOJO msgbox gUnknown_81A56A7, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_16ED1E + goto_if_eq EventScript_16ED1E call EventScript_1A8C33 goto EventScript_16ED1E end @@ -123,29 +121,28 @@ SaffronCity_Dojo_EventScript_16ED3D:: @ 816ED3D end SaffronCity_Dojo_EventScript_16ED46:: @ 816ED46 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BLACK_BELT_HITOSHI, 0, Text_19B3DF, Text_19B40F + trainerbattle_single TRAINER_BLACK_BELT_HITOSHI, Text_19B3DF, Text_19B40F msgbox gUnknown_819B41F, 6 end SaffronCity_Dojo_EventScript_16ED5D:: @ 816ED5D - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BLACK_BELT_HIDEKI, 0, Text_19B2E0, Text_19B2FD + trainerbattle_single TRAINER_BLACK_BELT_HIDEKI, Text_19B2E0, Text_19B2FD msgbox gUnknown_819B30F, 6 end SaffronCity_Dojo_EventScript_16ED74:: @ 816ED74 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BLACK_BELT_AARON, 0, Text_19B341, Text_19B396 + trainerbattle_single TRAINER_BLACK_BELT_AARON, Text_19B341, Text_19B396 msgbox gUnknown_819B3AC, 6 end SaffronCity_Dojo_EventScript_16ED8B:: @ 816ED8B - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BLACK_BELT_MIKE, 0, Text_19B275, Text_19B292 + trainerbattle_single TRAINER_BLACK_BELT_MIKE, Text_19B275, Text_19B292 msgbox gUnknown_819B29D, 6 end SaffronCity_Dojo_EventScript_16EDA2:: @ 816EDA2 - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_BLACK_BELT_KOICHI, 0, Text_19B12C, Text_19B193, EventScript_16EDD0 - checkflag FLAG_GOT_HITMON_FROM_DOJO - goto_if TRUE, EventScript_16EDC6 + trainerbattle_single TRAINER_BLACK_BELT_KOICHI, Text_19B12C, Text_19B193, EventScript_16EDD0 + goto_if_set FLAG_GOT_HITMON_FROM_DOJO, EventScript_16EDC6 msgbox gUnknown_819B1A7, 6 end diff --git a/data/maps/SaffronCity_Gym/scripts.inc b/data/maps/SaffronCity_Gym/scripts.inc index ad09c3e36..b51cb49b6 100644 --- a/data/maps/SaffronCity_Gym/scripts.inc +++ b/data/maps/SaffronCity_Gym/scripts.inc @@ -3,9 +3,8 @@ SaffronCity_Gym_MapScripts:: @ 816EDD7 SaffronCity_Gym_EventScript_16EDD8:: @ 816EDD8 famechecker FAMECHECKER_SABRINA, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC, TRAINER_LEADER_SABRINA, 0, Text_19B53C, Text_19B602, EventScript_16EE0A - checkflag FLAG_GOT_TM04_FROM_SABRINA - goto_if FALSE, EventScript_16EE3D + trainerbattle_single TRAINER_LEADER_SABRINA, Text_19B53C, Text_19B602, EventScript_16EE0A, NO_MUSIC + goto_if_unset FLAG_GOT_TM04_FROM_SABRINA, EventScript_16EE3D msgbox gUnknown_819B7F2 release end @@ -24,9 +23,8 @@ EventScript_16EE3D:: @ 816EE3D msgbox gUnknown_819B6FA checkitemspace ITEM_TM04, 1 compare VAR_RESULT, 0 - goto_if eq, EventScript_16EE7E - additem ITEM_TM04, 1 - giveitemfanfaremsg gUnknown_819B7D3, ITEM_TM04 + goto_if_eq EventScript_16EE7E + giveitem_msg gUnknown_819B7D3, ITEM_TM04 setflag FLAG_GOT_TM04_FROM_SABRINA msgbox gUnknown_819B685 release @@ -38,46 +36,45 @@ EventScript_16EE7E:: @ 816EE7E end SaffronCity_Gym_EventScript_16EE88:: @ 816EE88 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PSYCHIC_JOHAN, 0, Text_19B936, Text_19B957 + trainerbattle_single TRAINER_PSYCHIC_JOHAN, Text_19B936, Text_19B957 msgbox gUnknown_819B96D, 6 end SaffronCity_Gym_EventScript_16EE9F:: @ 816EE9F - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PSYCHIC_TYRON, 0, Text_19BA45, Text_19BA9E + trainerbattle_single TRAINER_PSYCHIC_TYRON, Text_19BA45, Text_19BA9E famechecker FAMECHECKER_SABRINA, 5 msgbox gUnknown_819BAB4, 6 end SaffronCity_Gym_EventScript_16EEC3:: @ 816EEC3 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PSYCHIC_CAMERON, 0, Text_19BB49, Text_19BBA1 + trainerbattle_single TRAINER_PSYCHIC_CAMERON, Text_19BB49, Text_19BBA1 msgbox gUnknown_819BBB3, 6 end SaffronCity_Gym_EventScript_16EEDA:: @ 816EEDA - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PSYCHIC_PRESTON, 0, Text_19BC57, Text_19BCBC + trainerbattle_single TRAINER_PSYCHIC_PRESTON, Text_19BC57, Text_19BCBC msgbox gUnknown_819BCC4, 6 end SaffronCity_Gym_EventScript_16EEF1:: @ 816EEF1 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CHANNELER_AMANDA, 0, Text_19B86A, Text_19B8A8 + trainerbattle_single TRAINER_CHANNELER_AMANDA, Text_19B86A, Text_19B8A8 msgbox gUnknown_819B8B9, 6 end SaffronCity_Gym_EventScript_16EF08:: @ 816EF08 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CHANNELER_STACY, 0, Text_19B998, Text_19B9EC + trainerbattle_single TRAINER_CHANNELER_STACY, Text_19B998, Text_19B9EC msgbox gUnknown_819B9F7, 6 end SaffronCity_Gym_EventScript_16EF1F:: @ 816EF1F - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CHANNELER_TASHA, 0, Text_19BAE8, Text_19BB0D + trainerbattle_single TRAINER_CHANNELER_TASHA, Text_19BAE8, Text_19BB0D msgbox gUnknown_819BB1F, 6 end SaffronCity_Gym_EventScript_16EF36:: @ 816EF36 lock faceplayer - checkflag FLAG_DEFEATED_SABRINA - goto_if TRUE, EventScript_16EF4B + goto_if_set FLAG_DEFEATED_SABRINA, EventScript_16EF4B msgbox gUnknown_819BCF6 release end @@ -89,8 +86,7 @@ EventScript_16EF4B:: @ 816EF4B SaffronCity_Gym_EventScript_16EF55:: @ 816EF55 lockall - checkflag FLAG_BADGE06_GET - goto_if TRUE, EventScript_16EF69 + goto_if_set FLAG_BADGE06_GET, 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 4ad832d23..e29fbea9d 100644 --- a/data/maps/SaffronCity_House1_2F/scripts.inc +++ b/data/maps/SaffronCity_House1_2F/scripts.inc @@ -20,18 +20,18 @@ SaffronCity_House1_2F_EventScript_16EB70:: @ 816EB70 SaffronCity_House1_2F_EventScript_16EB7B:: @ 816EB7B special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 lock faceplayer checkitem ITEM_POKE_DOLL, 1 compare VAR_RESULT, 1 - goto_if eq, EventScript_1C4CF6 + goto_if_eq EventScript_1C4CF6 checkplayergender compare VAR_RESULT, 0 - call_if eq, EventScript_16EBB7 + call_if_eq EventScript_16EBB7 compare VAR_RESULT, 1 - call_if eq, EventScript_16EBC0 + call_if_eq EventScript_16EBC0 release end diff --git a/data/maps/SaffronCity_House3/scripts.inc b/data/maps/SaffronCity_House3/scripts.inc index 3e7b07c0d..a6b1ce51b 100644 --- a/data/maps/SaffronCity_House3/scripts.inc +++ b/data/maps/SaffronCity_House3/scripts.inc @@ -4,14 +4,12 @@ SaffronCity_House3_MapScripts:: @ 816F05E SaffronCity_House3_EventScript_16F05F:: @ 816F05F lock faceplayer - checkflag FLAG_GOT_TM29_FROM_MR_PSYCHIC - goto_if TRUE, EventScript_16F0B5 + goto_if_set FLAG_GOT_TM29_FROM_MR_PSYCHIC, EventScript_16F0B5 msgbox gUnknown_819C142 checkitemspace ITEM_TM29, 1 compare VAR_RESULT, 0 - goto_if eq, EventScript_16F0AB - additem ITEM_TM29, 1 - giveitemfanfaremsg gUnknown_819C16C, ITEM_TM29 + goto_if_eq EventScript_16F0AB + giveitem_msg gUnknown_819C16C, ITEM_TM29 msgbox gUnknown_819C18F setflag FLAG_GOT_TM29_FROM_MR_PSYCHIC release diff --git a/data/maps/SaffronCity_Mart/scripts.inc b/data/maps/SaffronCity_Mart/scripts.inc index c40cb783c..3779bb5e2 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_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lock faceplayer message Text_MayIHelpYou diff --git a/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc b/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc index 6be25699b..6b7099b5d 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_MAP_SCENE_SILPH_CO_11F, 1 - goto_if eq, EventScript_16F02D + goto_if_eq EventScript_16F02D msgbox gUnknown_819C0B4 release end diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc b/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc index 006f62023..ad839b0ad 100644 --- a/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc +++ b/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc @@ -72,9 +72,9 @@ Movement_16F13E:: @ 816F13E SaffronCity_PokemonTrainerFanClub_OnTransition:: @ 816F144 compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 1 - goto_if eq, EventScript_16F267 + goto_if_eq EventScript_16F267 compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 2 - goto_if eq, EventScript_16F15B + goto_if_eq EventScript_16F15B end EventScript_16F15B:: @ 816F15B @@ -82,35 +82,35 @@ EventScript_16F15B:: @ 816F15B setvar VAR_0x8004, 0 specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember compare VAR_RESULT, 0 - call_if eq, EventScript_16F207 + call_if_eq EventScript_16F207 setvar VAR_0x8004, 1 specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember compare VAR_RESULT, 0 - call_if eq, EventScript_16F213 + call_if_eq EventScript_16F213 setvar VAR_0x8004, 2 specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember compare VAR_RESULT, 0 - call_if eq, EventScript_16F21F + call_if_eq EventScript_16F21F setvar VAR_0x8004, 3 specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember compare VAR_RESULT, 0 - call_if eq, EventScript_16F22B + call_if_eq EventScript_16F22B setvar VAR_0x8004, 4 specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember compare VAR_RESULT, 0 - call_if eq, EventScript_16F237 + call_if_eq EventScript_16F237 setvar VAR_0x8004, 5 specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember compare VAR_RESULT, 0 - call_if eq, EventScript_16F243 + call_if_eq EventScript_16F243 setvar VAR_0x8004, 6 specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember compare VAR_RESULT, 0 - call_if eq, EventScript_16F24F + call_if_eq EventScript_16F24F setvar VAR_0x8004, 7 specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember compare VAR_RESULT, 0 - call_if eq, EventScript_16F25B + call_if_eq EventScript_16F25B end EventScript_16F207:: @ 816F207 @@ -167,13 +167,13 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F281:: @ 816F281 setvar VAR_0x8004, 0 special BufferStreakTrainerText compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0 - goto_if eq, EventScript_16F2EE + goto_if_eq EventScript_16F2EE specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember compare VAR_RESULT, 1 - goto_if eq, EventScript_16F2C0 + goto_if_eq EventScript_16F2C0 specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers compare VAR_RESULT, 7 - goto_if eq, EventScript_16F2E4 + goto_if_eq EventScript_16F2E4 msgbox gUnknown_819C420 release end @@ -181,7 +181,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F281:: @ 816F281 EventScript_16F2C0:: @ 816F2C0 specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers compare VAR_RESULT, 1 - goto_if eq, EventScript_16F2DA + goto_if_eq EventScript_16F2DA msgbox gUnknown_819C390 release end @@ -207,13 +207,13 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F2F8:: @ 816F2F8 setvar VAR_0x8004, 3 special BufferStreakTrainerText compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0 - goto_if eq, EventScript_16F365 + goto_if_eq EventScript_16F365 specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember compare VAR_RESULT, 1 - goto_if eq, EventScript_16F337 + goto_if_eq EventScript_16F337 specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers compare VAR_RESULT, 7 - goto_if eq, EventScript_16F35B + goto_if_eq EventScript_16F35B msgbox gUnknown_819CBD3 release end @@ -221,7 +221,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F2F8:: @ 816F2F8 EventScript_16F337:: @ 816F337 specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers compare VAR_RESULT, 1 - goto_if eq, EventScript_16F351 + goto_if_eq EventScript_16F351 msgbox gUnknown_819CB32 release end @@ -247,13 +247,13 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F36F:: @ 816F36F setvar VAR_0x8004, 1 special BufferStreakTrainerText compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0 - goto_if eq, EventScript_16F3DC + goto_if_eq EventScript_16F3DC specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember compare VAR_RESULT, 1 - goto_if eq, EventScript_16F3AE + goto_if_eq EventScript_16F3AE specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers compare VAR_RESULT, 7 - goto_if eq, EventScript_16F3D2 + goto_if_eq EventScript_16F3D2 msgbox gUnknown_819C6BA release end @@ -261,7 +261,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F36F:: @ 816F36F EventScript_16F3AE:: @ 816F3AE specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers compare VAR_RESULT, 1 - goto_if eq, EventScript_16F3C8 + goto_if_eq EventScript_16F3C8 msgbox gUnknown_819C5A9 release end @@ -287,13 +287,13 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F3E6:: @ 816F3E6 setvar VAR_0x8004, 2 special BufferStreakTrainerText compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0 - goto_if eq, EventScript_16F453 + goto_if_eq EventScript_16F453 specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember compare VAR_RESULT, 1 - goto_if eq, EventScript_16F425 + goto_if_eq EventScript_16F425 specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers compare VAR_RESULT, 7 - goto_if eq, EventScript_16F449 + goto_if_eq EventScript_16F449 msgbox gUnknown_819C986 release end @@ -301,7 +301,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F3E6:: @ 816F3E6 EventScript_16F425:: @ 816F425 specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers compare VAR_RESULT, 1 - goto_if eq, EventScript_16F43F + goto_if_eq EventScript_16F43F msgbox gUnknown_819C81E release end @@ -328,10 +328,10 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F45D:: @ 816F45D special BufferStreakTrainerText specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember compare VAR_RESULT, 1 - goto_if eq, EventScript_16F491 + goto_if_eq EventScript_16F491 specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers compare VAR_RESULT, 7 - goto_if eq, EventScript_16F4B5 + goto_if_eq EventScript_16F4B5 msgbox gUnknown_819D01F release end @@ -339,7 +339,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F45D:: @ 816F45D EventScript_16F491:: @ 816F491 specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers compare VAR_RESULT, 1 - goto_if eq, EventScript_16F4AB + goto_if_eq EventScript_16F4AB msgbox gUnknown_819CEDF release end @@ -361,10 +361,10 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F4BF:: @ 816F4BF special BufferStreakTrainerText specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember compare VAR_RESULT, 1 - goto_if eq, EventScript_16F4F3 + goto_if_eq EventScript_16F4F3 specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers compare VAR_RESULT, 7 - goto_if eq, EventScript_16F517 + goto_if_eq EventScript_16F517 msgbox gUnknown_819CDDA release end @@ -372,7 +372,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F4BF:: @ 816F4BF EventScript_16F4F3:: @ 816F4F3 specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers compare VAR_RESULT, 1 - goto_if eq, EventScript_16F50D + goto_if_eq EventScript_16F50D msgbox gUnknown_819CCF3 release end @@ -394,10 +394,10 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F521:: @ 816F521 special BufferStreakTrainerText specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember compare VAR_RESULT, 1 - goto_if eq, EventScript_16F555 + goto_if_eq EventScript_16F555 specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers compare VAR_RESULT, 7 - goto_if eq, EventScript_16F579 + goto_if_eq EventScript_16F579 msgbox gUnknown_819D1AE release end @@ -405,7 +405,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F521:: @ 816F521 EventScript_16F555:: @ 816F555 specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers compare VAR_RESULT, 1 - goto_if eq, EventScript_16F56F + goto_if_eq EventScript_16F56F msgbox gUnknown_819D0E3 release end @@ -427,10 +427,10 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F583:: @ 816F583 special BufferStreakTrainerText specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember compare VAR_RESULT, 1 - goto_if eq, EventScript_16F5B7 + goto_if_eq EventScript_16F5B7 specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers compare VAR_RESULT, 7 - goto_if eq, EventScript_16F5DB + goto_if_eq EventScript_16F5DB msgbox gUnknown_819D3D2 release end @@ -438,7 +438,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F583:: @ 816F583 EventScript_16F5B7:: @ 816F5B7 specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers compare VAR_RESULT, 1 - goto_if eq, EventScript_16F5D1 + goto_if_eq EventScript_16F5D1 msgbox gUnknown_819D2B4 release end diff --git a/data/maps/SeafoamIslands_B3F/scripts.inc b/data/maps/SeafoamIslands_B3F/scripts.inc index 54543e54a..13c6b606a 100644 --- a/data/maps/SeafoamIslands_B3F/scripts.inc +++ b/data/maps/SeafoamIslands_B3F/scripts.inc @@ -4,20 +4,16 @@ SeafoamIslands_B3F_MapScripts:: @ 8162F4F .byte 0 SeafoamIslands_B3F_OnTransition:: @ 8162F5A - checkflag FLAG_STOPPED_SEAFOAM_B3F_CURRENT - call_if FALSE, EventScript_162F6D - checkflag FLAG_STOPPED_SEAFOAM_B3F_CURRENT - call_if TRUE, EventScript_162F94 + call_if_unset FLAG_STOPPED_SEAFOAM_B3F_CURRENT, EventScript_162F6D + call_if_set FLAG_STOPPED_SEAFOAM_B3F_CURRENT, EventScript_162F94 end EventScript_162F6D:: @ 8162F6D setvar VAR_TEMP_2, 0 - checkflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_1 - call_if FALSE, EventScript_162FF0 - checkflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_2 - call_if FALSE, EventScript_162FF0 + call_if_unset FLAG_HIDE_SEAFOAM_B3F_BOULDER_1, EventScript_162FF0 + call_if_unset FLAG_HIDE_SEAFOAM_B3F_BOULDER_2, EventScript_162FF0 compare VAR_TEMP_2, 2 - call_if eq, EventScript_162F90 + call_if_eq EventScript_162F90 return EventScript_162F90:: @ 8162F90 @@ -35,17 +31,15 @@ SeafoamIslands_B3F_OnFrame:: @ 8162F98 EventScript_162FA2:: @ 8162FA2 lockall setvar VAR_TEMP_2, 0 - checkflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_1 - call_if FALSE, EventScript_162FF0 - checkflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_2 - call_if FALSE, EventScript_162FF0 + call_if_unset FLAG_HIDE_SEAFOAM_B3F_BOULDER_1, EventScript_162FF0 + call_if_unset FLAG_HIDE_SEAFOAM_B3F_BOULDER_2, EventScript_162FF0 compare VAR_TEMP_2, 2 - goto_if eq, EventScript_16300C + goto_if_eq EventScript_16300C getplayerxy VAR_0x8008, VAR_0x8009 compare VAR_0x8008, 24 - call_if lt, EventScript_162FF6 + call_if_lt EventScript_162FF6 compare VAR_0x8008, 24 - call_if ge, EventScript_163001 + call_if_ge EventScript_163001 setvar VAR_MAP_SCENE_SEAFOAM_ISLANDS_B4F, 1 warp MAP_SEAFOAM_ISLANDS_B4F, 255, 27, 21 waitstate diff --git a/data/maps/SeafoamIslands_B4F/scripts.inc b/data/maps/SeafoamIslands_B4F/scripts.inc index 090b65d5f..58596c2e6 100644 --- a/data/maps/SeafoamIslands_B4F/scripts.inc +++ b/data/maps/SeafoamIslands_B4F/scripts.inc @@ -7,34 +7,28 @@ SeafoamIslands_B4F_MapScripts:: @ 816302E .byte 0 SeafoamIslands_B4F_OnResume:: @ 8163048 - checkflag FLAG_SYS_SPECIAL_WILD_BATTLE - call_if TRUE, EventScript_163052 + call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, EventScript_163052 end EventScript_163052:: @ 8163052 specialvar VAR_RESULT, Special_GetBattleOutcome compare VAR_RESULT, B_OUTCOME_CAUGHT - goto_if ne, EventScript_1A77A9 + goto_if_ne EventScript_1A77A9 removeobject VAR_LAST_TALKED return SeafoamIslands_B4F_OnTransition:: @ 8163066 - checkflag FLAG_FOUGHT_ARTICUNO - call_if FALSE, EventScript_1630AD - checkflag FLAG_STOPPED_SEAFOAM_B4F_CURRENT - call_if FALSE, EventScript_163082 - checkflag FLAG_STOPPED_SEAFOAM_B4F_CURRENT - call_if TRUE, EventScript_1630A9 + call_if_unset FLAG_FOUGHT_ARTICUNO, EventScript_1630AD + call_if_unset FLAG_STOPPED_SEAFOAM_B4F_CURRENT, EventScript_163082 + call_if_set FLAG_STOPPED_SEAFOAM_B4F_CURRENT, EventScript_1630A9 end EventScript_163082:: @ 8163082 setvar VAR_TEMP_2, 0 - checkflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_1 - call_if FALSE, EventScript_163169 - checkflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_2 - call_if FALSE, EventScript_163169 + call_if_unset FLAG_HIDE_SEAFOAM_B4F_BOULDER_1, EventScript_163169 + call_if_unset FLAG_HIDE_SEAFOAM_B4F_BOULDER_2, EventScript_163169 compare VAR_TEMP_2, 2 - call_if eq, EventScript_1630A5 + call_if_eq EventScript_1630A5 return EventScript_1630A5:: @ 81630A5 @@ -51,12 +45,10 @@ EventScript_1630AD:: @ 81630AD SeafoamIslands_B4F_OnLoad:: @ 81630B1 setvar VAR_TEMP_2, 0 - checkflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_1 - call_if FALSE, EventScript_163169 - checkflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_2 - call_if FALSE, EventScript_163169 + call_if_unset FLAG_HIDE_SEAFOAM_B4F_BOULDER_1, EventScript_163169 + call_if_unset FLAG_HIDE_SEAFOAM_B4F_BOULDER_2, EventScript_163169 compare VAR_TEMP_2, 2 - goto_if eq, EventScript_1630D4 + goto_if_eq EventScript_1630D4 end EventScript_1630D4:: @ 81630D4 @@ -95,17 +87,15 @@ Movement_16311D:: @ 816311D EventScript_163121:: @ 8163121 lockall setvar VAR_TEMP_2, 0 - checkflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_1 - call_if FALSE, EventScript_163169 - checkflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_2 - call_if FALSE, EventScript_163169 + call_if_unset FLAG_HIDE_SEAFOAM_B4F_BOULDER_1, EventScript_163169 + call_if_unset FLAG_HIDE_SEAFOAM_B4F_BOULDER_2, EventScript_163169 compare VAR_TEMP_2, 2 - goto_if eq, EventScript_163185 + goto_if_eq EventScript_163185 getplayerxy VAR_0x8008, VAR_0x8009 compare VAR_0x8008, 9 - call_if lt, EventScript_16316F + call_if_lt EventScript_16316F compare VAR_0x8008, 9 - call_if ge, EventScript_16317A + call_if_ge EventScript_16317A special sub_805D1A8 setvar VAR_TEMP_1, 0 releaseall @@ -165,7 +155,7 @@ Movement_1631AA:: @ 81631AA SeafoamIslands_B4F_EventScript_1631AC:: @ 81631AC special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 lock faceplayer @@ -184,11 +174,11 @@ SeafoamIslands_B4F_EventScript_1631AC:: @ 81631AC clearflag FLAG_SYS_SPECIAL_WILD_BATTLE specialvar VAR_RESULT, Special_GetBattleOutcome compare VAR_RESULT, B_OUTCOME_WON - goto_if eq, EventScript_16320F + goto_if_eq EventScript_16320F compare VAR_RESULT, B_OUTCOME_RAN - goto_if eq, EventScript_163218 + goto_if_eq EventScript_163218 compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED - goto_if eq, EventScript_163218 + goto_if_eq EventScript_163218 setflag FLAG_FOUGHT_ARTICUNO release end diff --git a/data/maps/SevenIsland_House_Room1/scripts.inc b/data/maps/SevenIsland_House_Room1/scripts.inc index 33b085474..8a44e194c 100644 --- a/data/maps/SevenIsland_House_Room1/scripts.inc +++ b/data/maps/SevenIsland_House_Room1/scripts.inc @@ -6,9 +6,9 @@ SevenIsland_House_Room1_MapScripts:: @ 817088A SevenIsland_House_Room1_OnTransition:: @ 8170895 special ValidateEReaderTrainer compare VAR_RESULT, 0 - call_if eq, EventScript_1708AF + call_if_eq EventScript_1708AF compare VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 0 - call_if ne, EventScript_1708C3 + call_if_ne EventScript_1708C3 end EventScript_1708AF:: @ 81708AF @@ -40,11 +40,11 @@ EventScript_1708E9:: @ 1708E9 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 compare VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 1 - call_if eq, EventScript_170938 + call_if_eq EventScript_170938 compare VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 2 - call_if eq, EventScript_170941 + call_if_eq EventScript_170941 compare VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 3 - call_if eq, EventScript_17094A + call_if_eq EventScript_17094A special LoadPlayerParty setvar VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 0 releaseall @@ -76,9 +76,9 @@ SevenIsland_House_Room1_EventScript_170958:: @ 8170958 faceplayer special ValidateEReaderTrainer compare VAR_RESULT, 1 - call_if eq, EventScript_17097D + call_if_eq EventScript_17097D compare VAR_TEMP_1, 1 - goto_if eq, EventScript_170987 + goto_if_eq EventScript_170987 msgbox gUnknown_81A049B release end @@ -93,27 +93,27 @@ EventScript_170987:: @ 8170987 special Special_BufferEReaderTrainerName5 msgbox gUnknown_81A0598, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_170A11 + goto_if_eq EventScript_170A11 call EventScript_170A1E compare VAR_RESULT, 0 - goto_if eq, EventScript_170A11 + goto_if_eq EventScript_170A11 msgbox gUnknown_81A0788, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_170A11 + goto_if_eq EventScript_170A11 special LoadPlayerParty call EventScript_1A4EAF compare VAR_RESULT, 0 - goto_if eq, EventScript_170A11 + goto_if_eq EventScript_170A11 special SavePlayerParty special ReducePlayerPartyToThree msgbox gUnknown_81A07C4 closemessage compare VAR_FACING, DIR_NORTH - call_if eq, EventScript_170A2D + call_if_eq EventScript_170A2D compare VAR_FACING, DIR_EAST - call_if eq, EventScript_170A3F + call_if_eq EventScript_170A3F compare VAR_FACING, DIR_WEST - call_if eq, EventScript_170A51 + call_if_eq EventScript_170A51 warp MAP_SEVEN_ISLAND_HOUSE_ROOM2, 255, 3, 1 waitstate release diff --git a/data/maps/SevenIsland_House_Room2/scripts.inc b/data/maps/SevenIsland_House_Room2/scripts.inc index 047f55705..c109d3eeb 100644 --- a/data/maps/SevenIsland_House_Room2/scripts.inc +++ b/data/maps/SevenIsland_House_Room2/scripts.inc @@ -23,11 +23,11 @@ EventScript_170A97:: @ 8170A97 special StartSpecialBattle waitstate compare VAR_RESULT, 3 - call_if eq, EventScript_170AFE + call_if_eq EventScript_170AFE compare VAR_RESULT, 1 - call_if eq, EventScript_170B0C + call_if_eq EventScript_170B0C compare VAR_RESULT, 2 - call_if eq, EventScript_170B17 + call_if_eq EventScript_170B17 closemessage special sp000_heal_pokemon applymovement OBJ_EVENT_ID_PLAYER, Movement_170B28 diff --git a/data/maps/SevenIsland_Mart/scripts.inc b/data/maps/SevenIsland_Mart/scripts.inc index 2e7e2ad8a..b5b10b288 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_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lock faceplayer message Text_MayIHelpYou diff --git a/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc b/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc index 63ce3fb65..c5471b1ea 100644 --- a/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc +++ b/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc @@ -3,8 +3,7 @@ SevenIsland_SevaultCanyon_House_MapScripts:: @ 8172182 SevenIsland_SevaultCanyon_House_EventScript_172183:: @ 8172183 lock - checkflag FLAG_TEMP_2 - goto_if TRUE, EventScript_172211 + goto_if_set FLAG_TEMP_2, EventScript_172211 playbgm MUS_P_SCHOOL, 0 applymovement 1, Movement_172231 waitmovement 0 @@ -16,12 +15,12 @@ SevenIsland_SevaultCanyon_House_EventScript_172183:: @ 8172183 textcolor 3 msgbox gUnknown_81A4DAF, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_172225 + goto_if_eq EventScript_172225 msgbox gUnknown_81A4DD8 closemessage call EventScript_1A6675 compare VAR_FACING, DIR_SOUTH - call_if ne, EventScript_172206 + call_if_ne EventScript_172206 delay 30 playbgm MUS_P_SCHOOL, 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_172231 diff --git a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc index c22f3895b..8758f8517 100644 --- a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc +++ b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc @@ -4,8 +4,7 @@ SevenIsland_SevaultCanyon_TanobyKey_MapScripts:: @ 8164DCC SevenIsland_SevaultCanyon_TanobyKey_OnTransition:: @ 8164DD2 setworldmapflag FLAG_WORLD_MAP_SEVEN_ISLAND_SEVAULT_CANYON_TANOBY_KEY - checkflag FLAG_SYS_UNLOCKED_TANOBY_RUINS - call_if TRUE, EventScript_164E07 + call_if_set FLAG_SYS_UNLOCKED_TANOBY_RUINS, EventScript_164E07 setvar VAR_TEMP_1, 0 setvar VAR_TEMP_2, 0 setvar VAR_TEMP_3, 0 @@ -29,77 +28,77 @@ EventScript_164E07:: @ 8164E07 SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E39:: @ 8164E39 lockall compare VAR_TEMP_1, 100 - goto_if eq, EventScript_164F8A + goto_if_eq EventScript_164F8A call EventScript_164F2E setvar VAR_TEMP_1, 100 compare VAR_TEMP_8, 7 - goto_if eq, EventScript_164F8C + goto_if_eq EventScript_164F8C releaseall end SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E5C:: @ 8164E5C lockall compare VAR_TEMP_2, 100 - goto_if eq, EventScript_164F8A + goto_if_eq EventScript_164F8A call EventScript_164F2E setvar VAR_TEMP_2, 100 compare VAR_TEMP_8, 7 - goto_if eq, EventScript_164F8C + goto_if_eq EventScript_164F8C releaseall end SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E7F:: @ 8164E7F lockall compare VAR_TEMP_3, 100 - goto_if eq, EventScript_164F8A + goto_if_eq EventScript_164F8A call EventScript_164F2E setvar VAR_TEMP_3, 100 compare VAR_TEMP_8, 7 - goto_if eq, EventScript_164F8C + goto_if_eq EventScript_164F8C releaseall end SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EA2:: @ 8164EA2 lockall compare VAR_TEMP_4, 100 - goto_if eq, EventScript_164F8A + goto_if_eq EventScript_164F8A call EventScript_164F2E setvar VAR_TEMP_4, 100 compare VAR_TEMP_8, 7 - goto_if eq, EventScript_164F8C + goto_if_eq EventScript_164F8C releaseall end SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EC5:: @ 8164EC5 lockall compare VAR_TEMP_5, 100 - goto_if eq, EventScript_164F8A + goto_if_eq EventScript_164F8A call EventScript_164F2E setvar VAR_TEMP_5, 100 compare VAR_TEMP_8, 7 - goto_if eq, EventScript_164F8C + goto_if_eq EventScript_164F8C releaseall end SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EE8:: @ 8164EE8 lockall compare VAR_TEMP_6, 100 - goto_if eq, EventScript_164F8A + goto_if_eq EventScript_164F8A call EventScript_164F2E setvar VAR_TEMP_6, 100 compare VAR_TEMP_8, 7 - goto_if eq, EventScript_164F8C + goto_if_eq EventScript_164F8C releaseall end SevenIsland_SevaultCanyon_TanobyKey_EventScript_164F0B:: @ 8164F0B lockall compare VAR_TEMP_7, 100 - goto_if eq, EventScript_164F8A + goto_if_eq EventScript_164F8A call EventScript_164F2E setvar VAR_TEMP_7, 100 compare VAR_TEMP_8, 7 - goto_if eq, EventScript_164F8C + goto_if_eq EventScript_164F8C releaseall end diff --git a/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc b/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc index 396d9a4ef..a146b7990 100644 --- a/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc @@ -6,8 +6,7 @@ SevenIsland_TrainerTower_Elevator_MapScripts:: @ 8164AF8 SevenIsland_TrainerTower_Elevator_EventScript_164B03:: @ 8164B03 lockall setvar VAR_0x8004, 6 - checkflag FLAG_TEMP_2 - call_if FALSE, EventScript_1A7AB9 + call_if_unset FLAG_TEMP_2, EventScript_1A7AB9 copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR special Special_DrawElevatorCurrentFloorWindow message Text_1A535C @@ -41,7 +40,7 @@ EventScript_164B90:: @ 8164B90 setvar VAR_0x8006, 3 setdynamicwarp MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY, 255, 17, 8 compare VAR_ELEVATOR_FLOOR, 3 - goto_if eq, EventScript_164BD3 + goto_if_eq EventScript_164BD3 call EventScript_164BD8 setvar VAR_ELEVATOR_FLOOR, 3 special Special_CloseElevatorCurrentFloorWindow diff --git a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc b/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc index 1ae95e0d9..979ae6446 100644 --- a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc @@ -13,7 +13,7 @@ SevenIsland_TrainerTower_Lobby_OnResume:: @ 8164853 setvar VAR_0x8004, 18 special sub_815D9E8 compare VAR_RESULT, 0 - goto_if eq, EventScript_164886 + goto_if_eq EventScript_164886 setvar VAR_TEMP_0, 0 setobjectxy OBJ_EVENT_ID_PLAYER, 9, 7 applymovement OBJ_EVENT_ID_PLAYER, Movement_164AD4 @@ -31,7 +31,7 @@ SevenIsland_TrainerTower_Lobby_OnReturnToField:: @ 8164887 SevenIsland_TrainerTower_Lobby_OnLoad:: @ 8164897 compare VAR_TEMP_D, 17 - call_if eq, EventScript_1648A3 + call_if_eq EventScript_1648A3 end EventScript_1648A3:: @ 81648A3 @@ -112,7 +112,7 @@ SevenIsland_TrainerTower_Lobby_EventScript_164966:: @ 8164966 setvar VAR_0x8004, 20 special sub_815D9E8 compare VAR_RESULT, 1 - goto_if eq, EventScript_164988 + goto_if_eq EventScript_164988 msgbox gUnknown_817C9A2 goto EventScript_164990 @@ -126,7 +126,7 @@ EventScript_164990:: @ 8164990 SevenIsland_TrainerTower_Lobby_EventScript_164992:: @ 8164992 special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lock faceplayer message Text_MayIHelpYou @@ -159,7 +159,7 @@ SevenIsland_TrainerTower_Lobby_EventScript_1649CE:: @ 81649CE setvar VAR_0x8004, 17 special sub_815D9E8 compare VAR_RESULT, 0 - goto_if eq, EventScript_164A00 + goto_if_eq EventScript_164A00 msgbox gUnknown_817C7D9 goto EventScript_164A08 diff --git a/data/maps/SilphCo_10F/scripts.inc b/data/maps/SilphCo_10F/scripts.inc index e597b5ef5..ef6bc4382 100644 --- a/data/maps/SilphCo_10F/scripts.inc +++ b/data/maps/SilphCo_10F/scripts.inc @@ -3,15 +3,14 @@ SilphCo_10F_MapScripts:: @ 8161D86 .byte 0 SilphCo_10F_OnLoad:: @ 8161D8C - checkflag FLAG_SILPH_10F_DOOR - call_if FALSE, EventScript_Close10FDoor + call_if_unset FLAG_SILPH_10F_DOOR, EventScript_Close10FDoor end SilphCo_10F_EventScript_161D96:: @ 8161D96 lock faceplayer compare VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if ge, EventScript_161DAD + goto_if_ge EventScript_161DAD msgbox gUnknown_8176DBA release end @@ -26,11 +25,11 @@ SilphCo_10F_EventScript_161DB7:: @ 8161DB7 end SilphCo_10F_EventScript_161DC0:: @ 8161DC0 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SCIENTIST_TRAVIS, 0, Text_176D57, Text_176D73 + trainerbattle_single TRAINER_SCIENTIST_TRAVIS, Text_176D57, Text_176D73 msgbox gUnknown_8176D86, 6 end SilphCo_10F_EventScript_161DD7:: @ 8161DD7 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_39, 0, Text_176CED, Text_176D18 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_39, Text_176CED, Text_176D18 msgbox gUnknown_8176D25, 6 end diff --git a/data/maps/SilphCo_11F/scripts.inc b/data/maps/SilphCo_11F/scripts.inc index 218838690..c824a3f0b 100644 --- a/data/maps/SilphCo_11F/scripts.inc +++ b/data/maps/SilphCo_11F/scripts.inc @@ -3,25 +3,22 @@ SilphCo_11F_MapScripts:: @ 8161DEE .byte 0 SilphCo_11F_OnLoad:: @ 8161DF4 - checkflag FLAG_SILPH_11F_DOOR - call_if FALSE, EventScript_Close11FDoor + call_if_unset FLAG_SILPH_11F_DOOR, EventScript_Close11FDoor end SilphCo_11F_EventScript_161DFE:: @ 8161DFE lock faceplayer - checkflag FLAG_GOT_MASTER_BALL_FROM_SILPH - goto_if TRUE, EventScript_161E75 + goto_if_set FLAG_GOT_MASTER_BALL_FROM_SILPH, EventScript_161E75 checkplayergender compare VAR_RESULT, 0 - call_if eq, EventScript_161E59 + call_if_eq EventScript_161E59 compare VAR_RESULT, 1 - call_if eq, EventScript_161E62 + call_if_eq EventScript_161E62 checkitemspace ITEM_MASTER_BALL, 1 compare VAR_RESULT, 0 - goto_if eq, EventScript_161E6B - additem ITEM_MASTER_BALL, 1 - giveitemfanfaremsg gUnknown_8176FBD, ITEM_MASTER_BALL, 1, MUS_FAN5 + goto_if_eq EventScript_161E6B + giveitem_msg gUnknown_8176FBD, ITEM_MASTER_BALL, 1, MUS_FAN5 msgbox gUnknown_8176FEB setflag FLAG_GOT_MASTER_BALL_FROM_SILPH release @@ -73,11 +70,11 @@ EventScript_161EA0:: @ 8161EA0 msgbox gUnknown_8177108 closemessage compare VAR_TEMP_1, 0 - call_if eq, EventScript_161F00 + call_if_eq EventScript_161F00 compare VAR_TEMP_1, 1 - call_if eq, EventScript_161F12 + call_if_eq EventScript_161F12 setvar VAR_LAST_TALKED, 3 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_BOSS_GIOVANNI_2, 0, Text_1771AB + trainerbattle_no_intro TRAINER_BOSS_GIOVANNI_2, Text_1771AB msgbox gUnknown_81771C2 closemessage fadescreen 1 @@ -134,11 +131,11 @@ SilphCo_11F_EventScript_161F37:: @ 8161F37 end SilphCo_11F_EventScript_161F40:: @ 8161F40 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_40, 0, Text_1772B8, Text_1772E7 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_40, Text_1772B8, Text_1772E7 msgbox gUnknown_81772F9, 6 end SilphCo_11F_EventScript_161F57:: @ 8161F57 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_41, 0, Text_17726A, Text_17728C + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_41, Text_17726A, Text_17728C msgbox gUnknown_817729B, 6 end diff --git a/data/maps/SilphCo_2F/scripts.inc b/data/maps/SilphCo_2F/scripts.inc index 60d2a39e2..53e9c8129 100644 --- a/data/maps/SilphCo_2F/scripts.inc +++ b/data/maps/SilphCo_2F/scripts.inc @@ -3,10 +3,8 @@ SilphCo_2F_MapScripts:: @ 8161641 .byte 0 SilphCo_2F_OnLoad:: @ 8161647 - checkflag FLAG_SILPH_2F_DOOR_1 - call_if FALSE, EventScript_Close2FDoor1 - checkflag FLAG_SILPH_2F_DOOR_2 - call_if FALSE, EventScript_Close2FDoor2 + call_if_unset FLAG_SILPH_2F_DOOR_1, EventScript_Close2FDoor1 + call_if_unset FLAG_SILPH_2F_DOOR_2, EventScript_Close2FDoor2 end SilphCo_2F_EventScript_16165A:: @ 816165A @@ -20,21 +18,21 @@ SilphCo_2F_EventScript_161660:: @ 8161660 end SilphCo_2F_EventScript_161669:: @ 8161669 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SCIENTIST_CONNOR, 0, Text_175562, Text_17557E + trainerbattle_single TRAINER_SCIENTIST_CONNOR, Text_175562, Text_17557E msgbox gUnknown_817559F, 6 end SilphCo_2F_EventScript_161680:: @ 8161680 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SCIENTIST_JERRY, 0, Text_1755C6, Text_1755E5 + trainerbattle_single TRAINER_SCIENTIST_JERRY, Text_1755C6, Text_1755E5 msgbox gUnknown_81755F2, 6 end SilphCo_2F_EventScript_161697:: @ 8161697 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_23, 0, Text_17562D, Text_17564A + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_23, Text_17562D, Text_17564A msgbox gUnknown_8175651, 6 end SilphCo_2F_EventScript_1616AE:: @ 81616AE - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_24, 0, Text_1756AD, Text_1756D8 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_24, Text_1756AD, Text_1756D8 msgbox gUnknown_81756E2, 6 end diff --git a/data/maps/SilphCo_3F/scripts.inc b/data/maps/SilphCo_3F/scripts.inc index c5fd6d320..2b321225a 100644 --- a/data/maps/SilphCo_3F/scripts.inc +++ b/data/maps/SilphCo_3F/scripts.inc @@ -3,17 +3,15 @@ SilphCo_3F_MapScripts:: @ 81616C5 .byte 0 SilphCo_3F_OnLoad:: @ 81616CB - checkflag FLAG_SILPH_3F_DOOR_1 - call_if FALSE, EventScript_Close3FDoor1 - checkflag FLAG_SILPH_3F_DOOR_2 - call_if FALSE, EventScript_Close3FDoor2 + call_if_unset FLAG_SILPH_3F_DOOR_1, EventScript_Close3FDoor1 + call_if_unset FLAG_SILPH_3F_DOOR_2, EventScript_Close3FDoor2 end SilphCo_3F_EventScript_1616DE:: @ 81616DE lock faceplayer compare VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if ge, EventScript_1616F5 + goto_if_ge EventScript_1616F5 msgbox gUnknown_81758AD release end @@ -28,11 +26,11 @@ SilphCo_3F_EventScript_1616FF:: @ 81616FF end SilphCo_3F_EventScript_161708:: @ 8161708 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SCIENTIST_JOSE, 0, Text_175948, Text_17597D + trainerbattle_single TRAINER_SCIENTIST_JOSE, Text_175948, Text_17597D msgbox gUnknown_8175990, 6 end SilphCo_3F_EventScript_16171F:: @ 816171F - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_25, 0, Text_1758F6, Text_175911 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_25, Text_1758F6, Text_175911 msgbox gUnknown_817591C, 6 end diff --git a/data/maps/SilphCo_4F/scripts.inc b/data/maps/SilphCo_4F/scripts.inc index c72ba7ed8..595f42ab6 100644 --- a/data/maps/SilphCo_4F/scripts.inc +++ b/data/maps/SilphCo_4F/scripts.inc @@ -3,17 +3,15 @@ SilphCo_4F_MapScripts:: @ 8161736 .byte 0 SilphCo_4F_OnLoad:: @ 816173C - checkflag FLAG_SILPH_4F_DOOR_1 - call_if FALSE, EventScript_Close4FDoor1 - checkflag FLAG_SILPH_4F_DOOR_2 - call_if FALSE, EventScript_Close4FDoor2 + call_if_unset FLAG_SILPH_4F_DOOR_1, EventScript_Close4FDoor1 + call_if_unset FLAG_SILPH_4F_DOOR_2, EventScript_Close4FDoor2 end SilphCo_4F_EventScript_16174F:: @ 816174F lock faceplayer compare VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if ge, EventScript_161766 + goto_if_ge EventScript_161766 msgbox gUnknown_81759F5 release end @@ -28,16 +26,16 @@ SilphCo_4F_EventScript_161770:: @ 8161770 end SilphCo_4F_EventScript_161779:: @ 8161779 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SCIENTIST_RODNEY, 0, Text_175A90, Text_175AB0 + trainerbattle_single TRAINER_SCIENTIST_RODNEY, Text_175A90, Text_175AB0 msgbox gUnknown_8175AC8, 6 end SilphCo_4F_EventScript_161790:: @ 8161790 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_26, 0, Text_175A2F, Text_175A5B + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_26, Text_175A2F, Text_175A5B msgbox gUnknown_8175A62, 6 end SilphCo_4F_EventScript_1617A7:: @ 81617A7 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_27, 0, Text_175B19, Text_175B2B + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_27, Text_175B19, Text_175B2B msgbox gUnknown_8175B38, 6 end diff --git a/data/maps/SilphCo_5F/scripts.inc b/data/maps/SilphCo_5F/scripts.inc index fb9e482a5..e702b2876 100644 --- a/data/maps/SilphCo_5F/scripts.inc +++ b/data/maps/SilphCo_5F/scripts.inc @@ -3,19 +3,16 @@ SilphCo_5F_MapScripts:: @ 81617BE .byte 0 SilphCo_5F_OnLoad:: @ 81617C4 - checkflag FLAG_SILPH_5F_DOOR_1 - call_if FALSE, EventScript_Close5FDoor1 - checkflag FLAG_SILPH_5F_DOOR_2 - call_if FALSE, EventScript_Close5FDoor2 - checkflag FLAG_SILPH_5F_DOOR_3 - call_if FALSE, EventScript_Close5FDoor3 + call_if_unset FLAG_SILPH_5F_DOOR_1, EventScript_Close5FDoor1 + call_if_unset FLAG_SILPH_5F_DOOR_2, EventScript_Close5FDoor2 + call_if_unset FLAG_SILPH_5F_DOOR_3, EventScript_Close5FDoor3 end SilphCo_5F_EventScript_1617E0:: @ 81617E0 lock faceplayer compare VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if ge, EventScript_1617F7 + goto_if_ge EventScript_1617F7 msgbox gUnknown_8175B70 release end @@ -42,21 +39,21 @@ SilphCo_5F_EventScript_16181C:: @ 816181C end SilphCo_5F_EventScript_161825:: @ 8161825 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SCIENTIST_BEAU, 0, Text_175C40, Text_175C6D + trainerbattle_single TRAINER_SCIENTIST_BEAU, Text_175C40, Text_175C6D msgbox gUnknown_8175C7D, 6 end SilphCo_5F_EventScript_16183C:: @ 816183C - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_28, 0, Text_175BE5, Text_175C09 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_28, Text_175BE5, Text_175C09 msgbox gUnknown_8175C0F, 6 end SilphCo_5F_EventScript_161853:: @ 8161853 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_29, 0, Text_175D28, Text_175D4B + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_29, Text_175D28, Text_175D4B msgbox gUnknown_8175D59, 6 end SilphCo_5F_EventScript_16186A:: @ 816186A - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_JUGGLER_DALTON, 0, Text_175CBD, Text_175CEB + trainerbattle_single TRAINER_JUGGLER_DALTON, Text_175CBD, Text_175CEB msgbox gUnknown_8175CF9, 6 end diff --git a/data/maps/SilphCo_6F/scripts.inc b/data/maps/SilphCo_6F/scripts.inc index e5b1d9e7b..53fb04ac4 100644 --- a/data/maps/SilphCo_6F/scripts.inc +++ b/data/maps/SilphCo_6F/scripts.inc @@ -3,15 +3,14 @@ SilphCo_6F_MapScripts:: @ 8161881 .byte 0 SilphCo_6F_OnLoad:: @ 8161887 - checkflag FLAG_SILPH_6F_DOOR - call_if FALSE, EventScript_Close6FDoor + call_if_unset FLAG_SILPH_6F_DOOR, EventScript_Close6FDoor end SilphCo_6F_EventScript_161891:: @ 8161891 lock faceplayer compare VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if ge, EventScript_1618A8 + goto_if_ge EventScript_1618A8 msgbox gUnknown_817607E release end @@ -25,7 +24,7 @@ SilphCo_6F_EventScript_1618B2:: @ 81618B2 lock faceplayer compare VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if ge, EventScript_1618C9 + goto_if_ge EventScript_1618C9 msgbox gUnknown_8175F24 release end @@ -39,7 +38,7 @@ SilphCo_6F_EventScript_1618D3:: @ 81618D3 lock faceplayer compare VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if ge, EventScript_1618EA + goto_if_ge EventScript_1618EA msgbox gUnknown_8175F70 release end @@ -53,7 +52,7 @@ SilphCo_6F_EventScript_1618F4:: @ 81618F4 lock faceplayer compare VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if ge, EventScript_16190B + goto_if_ge EventScript_16190B msgbox gUnknown_8175FAA release end @@ -67,7 +66,7 @@ SilphCo_6F_EventScript_161915:: @ 8161915 lock faceplayer compare VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if ge, EventScript_16192C + goto_if_ge EventScript_16192C msgbox gUnknown_8176012 release end @@ -82,16 +81,16 @@ SilphCo_6F_EventScript_161936:: @ 8161936 end SilphCo_6F_EventScript_16193F:: @ 816193F - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SCIENTIST_TAYLOR, 0, Text_176136, Text_1761BD + trainerbattle_single TRAINER_SCIENTIST_TAYLOR, Text_176136, Text_1761BD msgbox gUnknown_81761C4, 6 end SilphCo_6F_EventScript_161956:: @ 8161956 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_30, 0, Text_1760DE, Text_176104 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_30, Text_1760DE, Text_176104 msgbox gUnknown_817610F, 6 end SilphCo_6F_EventScript_16196D:: @ 816196D - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_31, 0, Text_1761F1, Text_17620E + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_31, Text_1761F1, Text_17620E msgbox gUnknown_817621B, 6 end diff --git a/data/maps/SilphCo_7F/scripts.inc b/data/maps/SilphCo_7F/scripts.inc index 02e5de5e7..1fa3d3862 100644 --- a/data/maps/SilphCo_7F/scripts.inc +++ b/data/maps/SilphCo_7F/scripts.inc @@ -4,17 +4,14 @@ SilphCo_7F_MapScripts:: @ 8161984 .byte 0 SilphCo_7F_OnLoad:: @ 816198F - checkflag FLAG_SILPH_7F_DOOR_1 - call_if FALSE, EventScript_Close7FDoor1 - checkflag FLAG_SILPH_7F_DOOR_2 - call_if FALSE, EventScript_Close7FDoor2 - checkflag FLAG_SILPH_7F_DOOR_3 - call_if FALSE, EventScript_Close7FDoor3 + call_if_unset FLAG_SILPH_7F_DOOR_1, EventScript_Close7FDoor1 + call_if_unset FLAG_SILPH_7F_DOOR_2, EventScript_Close7FDoor2 + call_if_unset FLAG_SILPH_7F_DOOR_3, EventScript_Close7FDoor3 end SilphCo_7F_OnTransition:: @ 81619AB compare VAR_MAP_SCENE_SILPH_CO_11F, 1 - call_if ge, EventScript_1619B7 + call_if_ge EventScript_1619B7 end EventScript_1619B7:: @ 81619B7 @@ -47,24 +44,24 @@ EventScript_1619D4:: @ 81619D4 waitmovement 0 msgbox gUnknown_8176710 compare VAR_TEMP_1, 0 - call_if eq, EventScript_161A73 + call_if_eq EventScript_161A73 compare VAR_TEMP_1, 1 - call_if eq, EventScript_161A7F + call_if_eq EventScript_161A7F msgbox gUnknown_8176727 setvar VAR_LAST_TALKED, 1 compare VAR_STARTER_MON, 2 - call_if eq, EventScript_161A80 + call_if_eq EventScript_161A80 compare VAR_STARTER_MON, 1 - call_if eq, EventScript_161A8B + call_if_eq EventScript_161A8B compare VAR_STARTER_MON, 0 - call_if eq, EventScript_161A96 + call_if_eq EventScript_161A96 msgbox gUnknown_8176827 closemessage playbgm MUS_RIVAL2, 0 compare VAR_TEMP_1, 0 - call_if eq, EventScript_161AA1 + call_if_eq EventScript_161AA1 compare VAR_TEMP_1, 1 - call_if eq, EventScript_161AAC + call_if_eq EventScript_161AAC playse SE_TK_WARPIN fadedefaultbgm removeobject 1 @@ -83,15 +80,15 @@ EventScript_161A7F:: @ 8161A7F return EventScript_161A80:: @ 8161A80 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_RIVAL_SILPH_SQUIRTLE, 0, Text_1767D0 + trainerbattle_no_intro TRAINER_RIVAL_SILPH_SQUIRTLE, Text_1767D0 return EventScript_161A8B:: @ 8161A8B - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_RIVAL_SILPH_BULBASAUR, 0, Text_1767D0 + trainerbattle_no_intro TRAINER_RIVAL_SILPH_BULBASAUR, Text_1767D0 return EventScript_161A96:: @ 8161A96 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_RIVAL_SILPH_CHARMANDER, 0, Text_1767D0 + trainerbattle_no_intro TRAINER_RIVAL_SILPH_CHARMANDER, Text_1767D0 return EventScript_161AA1:: @ 8161AA1 @@ -130,17 +127,16 @@ Movement_161ABF:: @ 8161ABF SilphCo_7F_EventScript_161AC8:: @ 8161AC8 lock faceplayer - checkflag FLAG_GOT_LAPRAS_FROM_SILPH - goto_if TRUE, EventScript_161B8D + goto_if_set FLAG_GOT_LAPRAS_FROM_SILPH, EventScript_161B8D msgbox gUnknown_8176266 setvar VAR_TEMP_1, SPECIES_LAPRAS - givemon SPECIES_LAPRAS, 25, ITEM_NONE, 0, 0, 0 + givemon SPECIES_LAPRAS, 25, ITEM_NONE compare VAR_RESULT, 0 - goto_if eq, EventScript_161B12 + goto_if_eq EventScript_161B12 compare VAR_RESULT, 1 - goto_if eq, EventScript_161B45 + goto_if_eq EventScript_161B45 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A927C + goto_if_eq EventScript_1A927C release end @@ -153,7 +149,7 @@ EventScript_161B12:: @ 8161B12 getspeciesname 0, SPECIES_LAPRAS msgbox gUnknown_81A56A7, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_161B7E + goto_if_eq EventScript_161B7E call EventScript_1A8C27 call EventScript_1A74EB goto EventScript_161B7E @@ -170,7 +166,7 @@ EventScript_161B45:: @ 8161B45 getspeciesname 0, SPECIES_LAPRAS msgbox gUnknown_81A56A7, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_161B73 + goto_if_eq EventScript_161B73 call EventScript_1A8C33 goto EventScript_161B73 @@ -200,7 +196,7 @@ SilphCo_7F_EventScript_161B97:: @ 8161B97 lock faceplayer compare VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if ge, EventScript_161BAE + goto_if_ge EventScript_161BAE msgbox gUnknown_8176444 release end @@ -214,7 +210,7 @@ SilphCo_7F_EventScript_161BB8:: @ 8161BB8 lock faceplayer compare VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if ge, EventScript_161BCF + goto_if_ge EventScript_161BCF msgbox gUnknown_81764C2 release end @@ -228,7 +224,7 @@ SilphCo_7F_EventScript_161BD9:: @ 8161BD9 lock faceplayer compare VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if ge, EventScript_161BF0 + goto_if_ge EventScript_161BF0 msgbox gUnknown_8176532 release end @@ -243,21 +239,21 @@ SilphCo_7F_EventScript_161BFA:: @ 8161BFA end SilphCo_7F_EventScript_161C03:: @ 8161C03 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SCIENTIST_JOSHUA, 0, Text_1765E2, Text_17660C + trainerbattle_single TRAINER_SCIENTIST_JOSHUA, Text_1765E2, Text_17660C msgbox gUnknown_8176616, 6 end SilphCo_7F_EventScript_161C1A:: @ 8161C1A - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_33, 0, Text_176643, Text_176669 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_33, Text_176643, Text_176669 msgbox gUnknown_8176681, 6 end SilphCo_7F_EventScript_161C31:: @ 8161C31 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_34, 0, Text_1766B3, Text_1766D7 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_34, Text_1766B3, Text_1766D7 msgbox gUnknown_81766E5, 6 end SilphCo_7F_EventScript_161C48:: @ 8161C48 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_35, 0, Text_176586, Text_1765A5 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_35, Text_176586, Text_1765A5 msgbox gUnknown_81765B1, 6 end diff --git a/data/maps/SilphCo_8F/scripts.inc b/data/maps/SilphCo_8F/scripts.inc index 5570c4be9..84993bf67 100644 --- a/data/maps/SilphCo_8F/scripts.inc +++ b/data/maps/SilphCo_8F/scripts.inc @@ -3,15 +3,14 @@ SilphCo_8F_MapScripts:: @ 8161C5F .byte 0 SilphCo_8F_OnLoad:: @ 8161C65 - checkflag FLAG_SILPH_8F_DOOR - call_if FALSE, EventScript_Close8FDoor + call_if_unset FLAG_SILPH_8F_DOOR, EventScript_Close8FDoor end SilphCo_8F_EventScript_161C6F:: @ 8161C6F lock faceplayer compare VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if ge, EventScript_161C86 + goto_if_ge EventScript_161C86 msgbox gUnknown_817696D release end @@ -26,16 +25,16 @@ SilphCo_8F_EventScript_161C90:: @ 8161C90 end SilphCo_8F_EventScript_161C99:: @ 8161C99 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SCIENTIST_PARKER, 0, Text_1769FD, Text_176A19 + trainerbattle_single TRAINER_SCIENTIST_PARKER, Text_1769FD, Text_176A19 msgbox gUnknown_8176A26, 6 end SilphCo_8F_EventScript_161CB0:: @ 8161CB0 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_32, 0, Text_1769A2, Text_1769BE + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_32, Text_1769A2, Text_1769BE msgbox gUnknown_81769CF, 6 end SilphCo_8F_EventScript_161CC7:: @ 8161CC7 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_36, 0, Text_176A56, Text_176A7C + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_36, Text_176A56, Text_176A7C msgbox gUnknown_8176A90, 6 end diff --git a/data/maps/SilphCo_9F/scripts.inc b/data/maps/SilphCo_9F/scripts.inc index 919d700b0..737cf5f71 100644 --- a/data/maps/SilphCo_9F/scripts.inc +++ b/data/maps/SilphCo_9F/scripts.inc @@ -3,21 +3,17 @@ SilphCo_9F_MapScripts:: @ 8161CDE .byte 0 SilphCo_9F_OnLoad:: @ 8161CE4 - checkflag FLAG_SILPH_9F_DOOR_1 - call_if FALSE, EventScript_Close9FDoor1 - checkflag FLAG_SILPH_9F_DOOR_2 - call_if FALSE, EventScript_Close9FDoor2 - checkflag FLAG_SILPH_9F_DOOR_3 - call_if FALSE, EventScript_Close9FDoor3 - checkflag FLAG_SILPH_9F_DOOR_4 - call_if FALSE, EventScript_Close9FDoor4 + call_if_unset FLAG_SILPH_9F_DOOR_1, EventScript_Close9FDoor1 + call_if_unset FLAG_SILPH_9F_DOOR_2, EventScript_Close9FDoor2 + call_if_unset FLAG_SILPH_9F_DOOR_3, EventScript_Close9FDoor3 + call_if_unset FLAG_SILPH_9F_DOOR_4, EventScript_Close9FDoor4 end SilphCo_9F_EventScript_161D09:: @ 8161D09 lock faceplayer compare VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if ge, EventScript_161D2E + goto_if_ge EventScript_161D2E msgbox gUnknown_8176B54 closemessage call EventScript_FadeOut_Heal_FadeIn @@ -35,16 +31,16 @@ SilphCo_9F_EventScript_161D38:: @ 8161D38 end SilphCo_9F_EventScript_161D41:: @ 8161D41 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SCIENTIST_ED, 0, Text_176BFB, Text_176C2B + trainerbattle_single TRAINER_SCIENTIST_ED, Text_176BFB, Text_176C2B msgbox gUnknown_8176C3C, 6 end SilphCo_9F_EventScript_161D58:: @ 8161D58 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_37, 0, Text_176BA3, Text_176BC8 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_37, Text_176BA3, Text_176BC8 msgbox gUnknown_8176BD0, 6 end SilphCo_9F_EventScript_161D6F:: @ 8161D6F - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_38, 0, Text_176C7A, Text_176CA0 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_38, Text_176C7A, Text_176CA0 msgbox gUnknown_8176CB8, 6 end diff --git a/data/maps/SilphCo_Elevator/scripts.inc b/data/maps/SilphCo_Elevator/scripts.inc index a6ecf471a..8f11d4ef7 100644 --- a/data/maps/SilphCo_Elevator/scripts.inc +++ b/data/maps/SilphCo_Elevator/scripts.inc @@ -4,8 +4,7 @@ SilphCo_Elevator_MapScripts:: @ 8161F6E SilphCo_Elevator_EventScript_161F6F:: @ 8161F6F lockall setvar VAR_0x8004, 1 - checkflag FLAG_TEMP_2 - call_if FALSE, EventScript_1A7AB9 + call_if_unset FLAG_TEMP_2, EventScript_1A7AB9 copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR special Special_DrawElevatorCurrentFloorWindow message Text_1A535C @@ -34,7 +33,7 @@ EventScript_16202F:: @ 816202F setvar VAR_0x8006, 4 setdynamicwarp MAP_SILPH_CO_1F, 255, 22, 3 compare VAR_ELEVATOR_FLOOR, 4 - goto_if eq, EventScript_1621E7 + goto_if_eq EventScript_1621E7 call EventScript_1621EC setvar VAR_ELEVATOR_FLOOR, 4 goto EventScript_1621E7 @@ -46,7 +45,7 @@ EventScript_162057:: @ 8162057 setvar VAR_0x8006, 5 setdynamicwarp MAP_SILPH_CO_2F, 255, 22, 3 compare VAR_ELEVATOR_FLOOR, 5 - goto_if eq, EventScript_1621E7 + goto_if_eq EventScript_1621E7 call EventScript_1621EC setvar VAR_ELEVATOR_FLOOR, 5 goto EventScript_1621E7 @@ -58,7 +57,7 @@ EventScript_16207F:: @ 816207F setvar VAR_0x8006, 6 setdynamicwarp MAP_SILPH_CO_3F, 255, 22, 3 compare VAR_ELEVATOR_FLOOR, 6 - goto_if eq, EventScript_1621E7 + goto_if_eq EventScript_1621E7 call EventScript_1621EC setvar VAR_ELEVATOR_FLOOR, 6 goto EventScript_1621E7 @@ -70,7 +69,7 @@ EventScript_1620A7:: @ 81620A7 setvar VAR_0x8006, 7 setdynamicwarp MAP_SILPH_CO_4F, 255, 22, 3 compare VAR_ELEVATOR_FLOOR, 7 - goto_if eq, EventScript_1621E7 + goto_if_eq EventScript_1621E7 call EventScript_1621EC setvar VAR_ELEVATOR_FLOOR, 7 goto EventScript_1621E7 @@ -82,7 +81,7 @@ EventScript_1620CF:: @ 81620CF setvar VAR_0x8006, 8 setdynamicwarp MAP_SILPH_CO_5F, 255, 22, 3 compare VAR_ELEVATOR_FLOOR, 8 - goto_if eq, EventScript_1621E7 + goto_if_eq EventScript_1621E7 call EventScript_1621EC setvar VAR_ELEVATOR_FLOOR, 8 goto EventScript_1621E7 @@ -94,7 +93,7 @@ EventScript_1620F7:: @ 81620F7 setvar VAR_0x8006, 9 setdynamicwarp MAP_SILPH_CO_6F, 255, 20, 3 compare VAR_ELEVATOR_FLOOR, 9 - goto_if eq, EventScript_1621E7 + goto_if_eq EventScript_1621E7 call EventScript_1621EC setvar VAR_ELEVATOR_FLOOR, 9 goto EventScript_1621E7 @@ -106,7 +105,7 @@ EventScript_16211F:: @ 816211F setvar VAR_0x8006, 10 setdynamicwarp MAP_SILPH_CO_7F, 255, 23, 3 compare VAR_ELEVATOR_FLOOR, 10 - goto_if eq, EventScript_1621E7 + goto_if_eq EventScript_1621E7 call EventScript_1621EC setvar VAR_ELEVATOR_FLOOR, 10 goto EventScript_1621E7 @@ -118,7 +117,7 @@ EventScript_162147:: @ 8162147 setvar VAR_0x8006, 11 setdynamicwarp MAP_SILPH_CO_8F, 255, 22, 3 compare VAR_ELEVATOR_FLOOR, 11 - goto_if eq, EventScript_1621E7 + goto_if_eq EventScript_1621E7 call EventScript_1621EC setvar VAR_ELEVATOR_FLOOR, 11 goto EventScript_1621E7 @@ -130,7 +129,7 @@ EventScript_16216F:: @ 816216F setvar VAR_0x8006, 12 setdynamicwarp MAP_SILPH_CO_9F, 255, 24, 3 compare VAR_ELEVATOR_FLOOR, 12 - goto_if eq, EventScript_1621E7 + goto_if_eq EventScript_1621E7 call EventScript_1621EC setvar VAR_ELEVATOR_FLOOR, 12 goto EventScript_1621E7 @@ -142,7 +141,7 @@ EventScript_162197:: @ 8162197 setvar VAR_0x8006, 13 setdynamicwarp MAP_SILPH_CO_10F, 255, 13, 3 compare VAR_ELEVATOR_FLOOR, 13 - goto_if eq, EventScript_1621E7 + goto_if_eq EventScript_1621E7 call EventScript_1621EC setvar VAR_ELEVATOR_FLOOR, 13 goto EventScript_1621E7 @@ -154,7 +153,7 @@ EventScript_1621BF:: @ 81621BF setvar VAR_0x8006, 14 setdynamicwarp MAP_SILPH_CO_11F, 255, 13, 3 compare VAR_ELEVATOR_FLOOR, 14 - goto_if eq, EventScript_1621E7 + goto_if_eq EventScript_1621E7 call EventScript_1621EC setvar VAR_ELEVATOR_FLOOR, 14 goto EventScript_1621E7 diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc b/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc index 4c7b28205..24106d3ac 100644 --- a/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc +++ b/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc @@ -17,13 +17,13 @@ SixIsland_DottedHole_SapphireRoom_EventScript_1641B5:: @ 81641B5 waitmovement 0 playse SE_W070 compare VAR_FACING, DIR_NORTH - call_if eq, EventScript_16430F + call_if_eq EventScript_16430F compare VAR_FACING, DIR_SOUTH - call_if eq, EventScript_16430F + call_if_eq EventScript_16430F compare VAR_FACING, DIR_EAST - call_if eq, EventScript_16431A + call_if_eq EventScript_16431A compare VAR_FACING, DIR_WEST - call_if eq, EventScript_16431A + call_if_eq EventScript_16431A setvar VAR_0x8004, 3 setvar VAR_0x8005, 0 setvar VAR_0x8006, 12 @@ -31,43 +31,43 @@ SixIsland_DottedHole_SapphireRoom_EventScript_1641B5:: @ 81641B5 special Special_ShakeScreen delay 60 compare VAR_FACING, DIR_NORTH - call_if eq, EventScript_164325 + call_if_eq EventScript_164325 compare VAR_FACING, DIR_SOUTH - call_if eq, EventScript_164330 + call_if_eq EventScript_164330 compare VAR_FACING, DIR_EAST - call_if eq, EventScript_16433B + call_if_eq EventScript_16433B compare VAR_FACING, DIR_WEST - call_if eq, EventScript_164346 + call_if_eq EventScript_164346 textcolor 0 msgbox gUnknown_817BD97 closemessage compare VAR_FACING, DIR_NORTH - call_if eq, EventScript_164351 + call_if_eq EventScript_164351 compare VAR_FACING, DIR_SOUTH - call_if eq, EventScript_164366 + call_if_eq EventScript_164366 compare VAR_FACING, DIR_EAST - call_if eq, EventScript_16437B + call_if_eq EventScript_16437B compare VAR_FACING, DIR_WEST - call_if eq, EventScript_164390 + call_if_eq EventScript_164390 removeobject 1 compare VAR_FACING, DIR_NORTH - call_if eq, EventScript_1642F9 + call_if_eq EventScript_1642F9 compare VAR_FACING, DIR_SOUTH - call_if eq, EventScript_1642F9 + call_if_eq EventScript_1642F9 compare VAR_FACING, DIR_EAST - call_if eq, EventScript_164304 + call_if_eq EventScript_164304 compare VAR_FACING, DIR_WEST - call_if eq, EventScript_164304 + call_if_eq EventScript_164304 msgbox gUnknown_817BDD4 closemessage compare VAR_FACING, DIR_NORTH - call_if eq, EventScript_1643A5 + call_if_eq EventScript_1643A5 compare VAR_FACING, DIR_SOUTH - call_if eq, EventScript_1643B7 + call_if_eq EventScript_1643B7 compare VAR_FACING, DIR_EAST - call_if eq, EventScript_1643C9 + call_if_eq EventScript_1643C9 compare VAR_FACING, DIR_WEST - call_if eq, EventScript_1643DB + call_if_eq EventScript_1643DB playse SE_KAIDAN delay 35 removeobject 2 diff --git a/data/maps/SixIsland_Mart/scripts.inc b/data/maps/SixIsland_Mart/scripts.inc index 3e2a19d53..1da8aa3dc 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_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lock faceplayer message Text_MayIHelpYou diff --git a/data/maps/SixIsland_OutcastIsland/scripts.inc b/data/maps/SixIsland_OutcastIsland/scripts.inc index 3d7069cc8..1a754362f 100644 --- a/data/maps/SixIsland_OutcastIsland/scripts.inc +++ b/data/maps/SixIsland_OutcastIsland/scripts.inc @@ -2,6 +2,6 @@ SixIsland_OutcastIsland_MapScripts:: @ 8168B15 .byte 0 SixIsland_OutcastIsland_EventScript_168B16:: @ 8168B16 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_46, 0, Text_18B35A, Text_18B3C2 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_46, Text_18B35A, Text_18B3C2 msgbox gUnknown_818B3C8, 6 end diff --git a/data/maps/SixIsland_PatternBush/scripts.inc b/data/maps/SixIsland_PatternBush/scripts.inc index dd3eb293a..4d6f63b07 100644 --- a/data/maps/SixIsland_PatternBush/scripts.inc +++ b/data/maps/SixIsland_PatternBush/scripts.inc @@ -6,9 +6,9 @@ SixIsland_PatternBush_OnTransition:: @ 816455F setworldmapflag FLAG_WORLD_MAP_SIX_ISLAND_PATTERN_BUSH getplayerxy VAR_TEMP_1, VAR_TEMP_2 compare VAR_TEMP_1, 50 - call_if ge, EventScript_16457E + call_if_ge EventScript_16457E compare VAR_TEMP_1, 49 - call_if le, EventScript_164587 + call_if_le EventScript_164587 end EventScript_16457E:: @ 816457E @@ -20,61 +20,61 @@ EventScript_164587:: @ 8164587 return SixIsland_PatternBush_EventScript_164590:: @ 8164590 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PKMN_BREEDER_BETHANY, 0, Text_17BF3A, Text_17BF66 + trainerbattle_single TRAINER_PKMN_BREEDER_BETHANY, Text_17BF3A, Text_17BF66 msgbox gUnknown_817BF97, 6 end SixIsland_PatternBush_EventScript_1645A7:: @ 81645A7 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PKMN_BREEDER_ALLISON, 0, Text_17BFEB, Text_17C028 + trainerbattle_single TRAINER_PKMN_BREEDER_ALLISON, Text_17BFEB, Text_17C028 msgbox gUnknown_817C056, 6 end SixIsland_PatternBush_EventScript_1645BE:: @ 81645BE - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BUG_CATCHER_GARRET, 0, Text_17C0BE, Text_17C0F2 + trainerbattle_single TRAINER_BUG_CATCHER_GARRET, Text_17C0BE, Text_17C0F2 msgbox gUnknown_817C113, 6 end SixIsland_PatternBush_EventScript_1645D5:: @ 81645D5 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BUG_CATCHER_JONAH, 0, Text_17C155, Text_17C196 + trainerbattle_single TRAINER_BUG_CATCHER_JONAH, Text_17C155, Text_17C196 msgbox gUnknown_817C1D0, 6 end SixIsland_PatternBush_EventScript_1645EC:: @ 81645EC - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BUG_CATCHER_VANCE, 0, Text_17C246, Text_17C275 + trainerbattle_single TRAINER_BUG_CATCHER_VANCE, Text_17C246, Text_17C275 msgbox gUnknown_817C2A4, 6 end SixIsland_PatternBush_EventScript_164603:: @ 8164603 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_YOUNGSTER_NASH, 0, Text_17C2D9, Text_17C30D + trainerbattle_single TRAINER_YOUNGSTER_NASH, Text_17C2D9, Text_17C30D msgbox gUnknown_817C31C, 6 end SixIsland_PatternBush_EventScript_16461A:: @ 816461A - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_YOUNGSTER_CORDELL, 0, Text_17C373, Text_17C3A5 + trainerbattle_single TRAINER_YOUNGSTER_CORDELL, Text_17C373, Text_17C3A5 msgbox gUnknown_817C3CE, 6 end SixIsland_PatternBush_EventScript_164631:: @ 8164631 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_DALIA, 0, Text_17C42B, Text_17C458 + trainerbattle_single TRAINER_LASS_DALIA, Text_17C42B, Text_17C458 msgbox gUnknown_817C490, 6 end SixIsland_PatternBush_EventScript_164648:: @ 8164648 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_LASS_JOANA, 0, Text_17C4FE, Text_17C552 + trainerbattle_single TRAINER_LASS_JOANA, Text_17C4FE, Text_17C552 msgbox gUnknown_817C590, 6 end SixIsland_PatternBush_EventScript_16465F:: @ 816465F - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CAMPER_RILEY, 0, Text_17C5DB, Text_17C609 + trainerbattle_single TRAINER_CAMPER_RILEY, Text_17C5DB, Text_17C609 msgbox gUnknown_817C615, 6 end SixIsland_PatternBush_EventScript_164676:: @ 8164676 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_MARCY, 0, Text_17C63E, Text_17C660 + trainerbattle_single TRAINER_PICNICKER_MARCY, Text_17C63E, Text_17C660 msgbox gUnknown_817C68E, 6 end SixIsland_PatternBush_EventScript_16468D:: @ 816468D - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_RUIN_MANIAC_LAYTON, 0, Text_17C6C9, Text_17C6FB + trainerbattle_single TRAINER_RUIN_MANIAC_LAYTON, Text_17C6C9, Text_17C6FB msgbox gUnknown_817C728, 6 end diff --git a/data/maps/SixIsland_PokemonCenter_1F/scripts.inc b/data/maps/SixIsland_PokemonCenter_1F/scripts.inc index 55d5e1a16..570d65b4b 100644 --- a/data/maps/SixIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/SixIsland_PokemonCenter_1F/scripts.inc @@ -7,7 +7,7 @@ SixIsland_PokemonCenter_1F_MapScripts:: @ 8171D6A SixIsland_PokemonCenter_1F_OnTransition:: @ 8171D7A setrespawn SPAWN_SIX_ISLAND compare VAR_MAP_SCENE_SIX_ISLAND_POKEMON_CENTER_1F, 0 - call_if eq, EventScript_171D89 + call_if_eq EventScript_171D89 end EventScript_171D89:: @ 8171D89 diff --git a/data/maps/SixIsland_RuinValley/scripts.inc b/data/maps/SixIsland_RuinValley/scripts.inc index 9878f172a..3246909ae 100644 --- a/data/maps/SixIsland_RuinValley/scripts.inc +++ b/data/maps/SixIsland_RuinValley/scripts.inc @@ -3,8 +3,7 @@ SixIsland_RuinValley_MapScripts:: @ 8168B53 .byte 0 SixIsland_RuinValley_OnLoad:: @ 8168B59 - checkflag FLAG_USED_CUT_ON_RUIN_VALLEY_BRAILLE - call_if TRUE, EventScript_168B63 + call_if_set FLAG_USED_CUT_ON_RUIN_VALLEY_BRAILLE, EventScript_168B63 end EventScript_168B63:: @ 8168B63 @@ -24,11 +23,10 @@ SixIsland_RuinValley_EventScript_168B6D:: @ 8168B6D SixIsland_RuinValley_EventScript_168B94:: @ 8168B94 lockall - checkflag FLAG_USED_CUT_ON_RUIN_VALLEY_BRAILLE - goto_if TRUE, EventScript_168BC1 + goto_if_set FLAG_USED_CUT_ON_RUIN_VALLEY_BRAILLE, EventScript_168BC1 msgbox gUnknown_818BDC0, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_168BCB + goto_if_eq EventScript_168BCB msgbox gUnknown_818BE11 braillemessage gUnknown_81A929B waitbuttonpress diff --git a/data/maps/SixIsland_WaterPath_House1/scripts.inc b/data/maps/SixIsland_WaterPath_House1/scripts.inc index 1561e5c36..e8784d75c 100644 --- a/data/maps/SixIsland_WaterPath_House1/scripts.inc +++ b/data/maps/SixIsland_WaterPath_House1/scripts.inc @@ -6,28 +6,28 @@ SixIsland_WaterPath_House1_EventScript_17206D:: @ 817206D faceplayer special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 setvar VAR_0x8004, SPECIES_HERACROSS specialvar VAR_RESULT, Special_PlayerPartyContainsSpecies compare VAR_RESULT, 0 - goto_if eq, EventScript_1720E5 + goto_if_eq EventScript_1720E5 special GetHeracrossSizeRecordInfo msgbox gUnknown_81A4A3F special Special_ChooseMonFromParty waitstate copyvar VAR_RESULT, VAR_0x8004 compare VAR_RESULT, 6 - goto_if ge, EventScript_1720EF + goto_if_ge EventScript_1720EF special CompareHeracrossSize compare VAR_RESULT, 1 - goto_if eq, EventScript_1720F1 + goto_if_eq EventScript_1720F1 compare VAR_RESULT, 2 - goto_if eq, EventScript_1720FB + goto_if_eq EventScript_1720FB compare VAR_RESULT, 3 - goto_if eq, EventScript_172121 + goto_if_eq EventScript_172121 compare VAR_RESULT, 4 - goto_if eq, EventScript_17210E + goto_if_eq EventScript_17210E release end @@ -46,15 +46,13 @@ EventScript_1720F1:: @ 81720F1 end EventScript_1720FB:: @ 81720FB - checkflag FLAG_GOT_NEST_BALL_FROM_WATER_PATH_HOUSE_1 - goto_if FALSE, EventScript_172121 + goto_if_unset FLAG_GOT_NEST_BALL_FROM_WATER_PATH_HOUSE_1, EventScript_172121 msgbox gUnknown_81A4B7A release end EventScript_17210E:: @ 817210E - checkflag FLAG_GOT_NEST_BALL_FROM_WATER_PATH_HOUSE_1 - goto_if FALSE, EventScript_172121 + goto_if_unset FLAG_GOT_NEST_BALL_FROM_WATER_PATH_HOUSE_1, EventScript_172121 msgbox gUnknown_81A4B39 release end @@ -64,7 +62,7 @@ EventScript_172121:: @ 8172121 msgbox gUnknown_81A4A88 giveitem ITEM_NEST_BALL compare VAR_RESULT, 0 - goto_if eq, EventScript_17214D + goto_if_eq EventScript_17214D msgbox gUnknown_81A4AD9 release end @@ -76,8 +74,7 @@ EventScript_17214D:: @ 817214D SixIsland_WaterPath_House1_EventScript_172157:: @ 8172157 lockall - checkflag FLAG_GOT_NEST_BALL_FROM_WATER_PATH_HOUSE_1 - goto_if TRUE, EventScript_17216B + goto_if_set FLAG_GOT_NEST_BALL_FROM_WATER_PATH_HOUSE_1, EventScript_17216B msgbox gUnknown_81A4CB9 releaseall end diff --git a/data/maps/ThreeIsland/scripts.inc b/data/maps/ThreeIsland/scripts.inc index f1fe4883a..9f546cbf2 100644 --- a/data/maps/ThreeIsland/scripts.inc +++ b/data/maps/ThreeIsland/scripts.inc @@ -4,10 +4,9 @@ ThreeIsland_MapScripts:: @ 81677AD ThreeIsland_OnTransition:: @ 81677B3 setworldmapflag FLAG_WORLD_MAP_THREE_ISLAND - checkflag FLAG_RESCUED_LOSTELLE - call_if TRUE, EventScript_1677CB + call_if_set FLAG_RESCUED_LOSTELLE, EventScript_1677CB compare VAR_MAP_SCENE_THREE_ISLAND, 4 - call_if eq, EventScript_1677CF + call_if_eq EventScript_1677CF end EventScript_1677CB:: @ 81677CB @@ -28,10 +27,9 @@ ThreeIsland_EventScript_1677D8:: @ 81677D8 ThreeIsland_EventScript_1677E5:: @ 81677E5 lock - checkflag FLAG_GOT_FULL_RESTORE_FROM_THREE_ISLAND_DEFENDER - goto_if TRUE, EventScript_167806 + goto_if_set FLAG_GOT_FULL_RESTORE_FROM_THREE_ISLAND_DEFENDER, EventScript_167806 compare VAR_MAP_SCENE_THREE_ISLAND, 4 - goto_if eq, EventScript_16781A + goto_if_eq EventScript_16781A setvar VAR_TEMP_1, 0 call EventScript_16786F release @@ -50,9 +48,9 @@ EventScript_16781A:: @ 816781A msgbox gUnknown_818275A checkitemspace ITEM_FULL_RESTORE, 1 compare VAR_RESULT, 0 - goto_if eq, EventScript_167865 - giveitemfanfaremsg gUnknown_81827BE, ITEM_FULL_RESTORE - additem ITEM_FULL_RESTORE, 1 + goto_if_eq EventScript_167865 + msgreceiveditem gUnknown_81827BE, ITEM_FULL_RESTORE + additem ITEM_FULL_RESTORE setflag FLAG_GOT_FULL_RESTORE_FROM_THREE_ISLAND_DEFENDER msgbox gUnknown_81827F1 release @@ -65,36 +63,36 @@ EventScript_167865:: @ 8167865 EventScript_16786F:: @ 816786F compare VAR_TEMP_1, 1 - call_if eq, EventScript_167947 + call_if_eq EventScript_167947 compare VAR_TEMP_1, 2 - call_if eq, EventScript_167947 + call_if_eq EventScript_167947 applymovement 1, Movement_167A1B waitmovement 0 msgbox gUnknown_81820C0 compare VAR_TEMP_1, 0 - call_if eq, EventScript_167952 + call_if_eq EventScript_167952 compare VAR_TEMP_1, 1 - call_if eq, EventScript_167952 + call_if_eq EventScript_167952 compare VAR_TEMP_1, 2 - call_if eq, EventScript_16795D + call_if_eq EventScript_16795D applymovement 5, Movement_167A19 waitmovement 0 msgbox gUnknown_8182125 compare VAR_TEMP_1, 0 - call_if eq, EventScript_167931 + call_if_eq EventScript_167931 compare VAR_TEMP_1, 1 - call_if eq, EventScript_167931 + call_if_eq EventScript_167931 compare VAR_TEMP_1, 2 - call_if eq, EventScript_167973 + call_if_eq EventScript_167973 applymovement 2, Movement_167A1B waitmovement 0 msgbox gUnknown_81821A9 compare VAR_TEMP_1, 0 - call_if eq, EventScript_167952 + call_if_eq EventScript_167952 compare VAR_TEMP_1, 1 - call_if eq, EventScript_167952 + call_if_eq EventScript_167952 compare VAR_TEMP_1, 2 - call_if eq, EventScript_16795D + call_if_eq EventScript_16795D applymovement 4, Movement_167A19 waitmovement 0 msgbox gUnknown_81821DC @@ -123,21 +121,21 @@ EventScript_167952:: @ 8167952 EventScript_16795D:: @ 816795D getplayerxy VAR_0x8004, VAR_0x8005 compare VAR_0x8004, 9 - goto_if ge, EventScript_167931 + goto_if_ge EventScript_167931 goto EventScript_167952 end EventScript_167973:: @ 8167973 getplayerxy VAR_0x8004, VAR_0x8005 compare VAR_0x8004, 9 - goto_if ge, EventScript_167947 + goto_if_ge EventScript_167947 goto EventScript_167931 end ThreeIsland_EventScript_167989:: @ 8167989 lock compare VAR_MAP_SCENE_THREE_ISLAND, 4 - goto_if eq, EventScript_1679A1 + goto_if_eq EventScript_1679A1 setvar VAR_TEMP_1, 1 call EventScript_16786F release @@ -224,10 +222,10 @@ EventScript_167A59:: @ 8167A59 playbgm MUS_SHOUNEN, 0 msgbox gUnknown_81823ED, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_167C35 + goto_if_eq EventScript_167C35 msgbox gUnknown_818247D setvar VAR_LAST_TALKED, 5 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_BIKER_GOON, 0, Text_1824B7 + trainerbattle_no_intro TRAINER_BIKER_GOON, Text_1824B7 applymovement 5, Movement_167C5C waitmovement 0 msgbox gUnknown_81824CF @@ -237,7 +235,7 @@ EventScript_167A59:: @ 8167A59 playbgm MUS_SHOUNEN, 0 msgbox gUnknown_81824EF setvar VAR_LAST_TALKED, 7 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_BIKER_GOON_2, 0, Text_182521 + trainerbattle_no_intro TRAINER_BIKER_GOON_2, Text_182521 applymovement 7, Movement_167C5C waitmovement 0 msgbox gUnknown_8182536 @@ -247,7 +245,7 @@ EventScript_167A59:: @ 8167A59 playbgm MUS_SHOUNEN, 0 msgbox gUnknown_8182582 setvar VAR_LAST_TALKED, 4 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_BIKER_GOON_3, 0, Text_1825D4 + trainerbattle_no_intro TRAINER_BIKER_GOON_3, Text_1825D4 applymovement 4, Movement_WalkInPlaceFastestLeft waitmovement 0 applymovement 6, Movement_WalkInPlaceFastestDown @@ -257,19 +255,19 @@ EventScript_167A59:: @ 8167A59 closemessage delay 45 compare VAR_TEMP_1, 0 - call_if eq, EventScript_167BC6 + call_if_eq EventScript_167BC6 compare VAR_TEMP_1, 1 - call_if eq, EventScript_167BD8 + call_if_eq EventScript_167BD8 compare VAR_TEMP_1, 2 - call_if eq, EventScript_167BEA + call_if_eq EventScript_167BEA compare VAR_TEMP_1, 3 - call_if eq, EventScript_167C03 + call_if_eq EventScript_167C03 compare VAR_TEMP_1, 4 - call_if eq, EventScript_167C1C + call_if_eq EventScript_167C1C playbgm MUS_SHOUNEN, 0 msgbox gUnknown_8182623 setvar VAR_LAST_TALKED, 3 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_CUE_BALL_PAXTON, 0, Text_1826B7 + trainerbattle_no_intro TRAINER_CUE_BALL_PAXTON, Text_1826B7 msgbox gUnknown_818271D closemessage fadescreen 1 diff --git a/data/maps/ThreeIsland_BerryForest/scripts.inc b/data/maps/ThreeIsland_BerryForest/scripts.inc index b1bb6fb7f..8aeb7ac30 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_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 waitse playmoncry SPECIES_HYPNO, 2 waitmoncry @@ -31,7 +31,7 @@ ThreeIsland_BerryForest_EventScript_163C83:: @ 8163C83 msgbox gUnknown_817AEE1 giveitem ITEM_IAPAPA_BERRY compare VAR_RESULT, 0 - call_if eq, EventScript_163D19 + call_if_eq EventScript_163D19 special Special_BufferBigGuyOrBigGirlString msgbox gUnknown_817AF3B closemessage diff --git a/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc b/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc index ba3922f9f..db49c4dcd 100644 --- a/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc +++ b/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc @@ -7,9 +7,9 @@ ThreeIsland_DunsparceTunnel_OnTransition:: @ 8164D2C specialvar VAR_RESULT, IsNationalPokedexEnabled copyvar VAR_0x8008, VAR_RESULT compare VAR_0x8008, 1 - call_if eq, EventScript_164D50 + call_if_eq EventScript_164D50 compare VAR_0x8008, 0 - call_if eq, EventScript_164D54 + call_if_eq EventScript_164D54 end EventScript_164D50:: @ 8164D50 @@ -24,11 +24,10 @@ EventScript_164D54:: @ 8164D54 ThreeIsland_DunsparceTunnel_EventScript_164D60:: @ 8164D60 lock faceplayer - checkflag FLAG_GOT_NUGGET_FROM_DUNSPARCE_TUNNEL - goto_if TRUE, EventScript_164DC2 + goto_if_set FLAG_GOT_NUGGET_FROM_DUNSPARCE_TUNNEL, EventScript_164DC2 specialvar VAR_RESULT, IsNationalPokedexEnabled compare VAR_RESULT, 1 - goto_if eq, EventScript_164D90 + goto_if_eq EventScript_164D90 msgbox gUnknown_817D13B closemessage applymovement 1, Movement_FaceOriginalDirection @@ -40,7 +39,7 @@ EventScript_164D90:: @ 8164D90 msgbox gUnknown_817D1C9 giveitem ITEM_NUGGET compare VAR_RESULT, 0 - goto_if eq, EventScript_164DB8 + goto_if_eq EventScript_164DB8 setflag FLAG_GOT_NUGGET_FROM_DUNSPARCE_TUNNEL goto EventScript_164DC2 end diff --git a/data/maps/ThreeIsland_House5/scripts.inc b/data/maps/ThreeIsland_House5/scripts.inc index 3dee5e153..4a2b4f370 100644 --- a/data/maps/ThreeIsland_House5/scripts.inc +++ b/data/maps/ThreeIsland_House5/scripts.inc @@ -4,8 +4,7 @@ ThreeIsland_House5_MapScripts:: @ 817191F ThreeIsland_House5_EventScript_171920:: @ 8171920 lock faceplayer - checkflag FLAG_RESCUED_LOSTELLE - goto_if TRUE, EventScript_171935 + goto_if_set FLAG_RESCUED_LOSTELLE, EventScript_171935 msgbox gUnknown_81A3469 release end diff --git a/data/maps/ThreeIsland_Mart/scripts.inc b/data/maps/ThreeIsland_Mart/scripts.inc index 531e0de7b..b6e488c03 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_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lock faceplayer message Text_MayIHelpYou diff --git a/data/maps/ThreeIsland_Port/scripts.inc b/data/maps/ThreeIsland_Port/scripts.inc index ee88d85fe..1764efd7b 100644 --- a/data/maps/ThreeIsland_Port/scripts.inc +++ b/data/maps/ThreeIsland_Port/scripts.inc @@ -11,9 +11,9 @@ ThreeIsland_Port_EventScript_168796:: @ 8168796 lock faceplayer compare VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 2 - goto_if ge, EventScript_1687B8 + goto_if_ge EventScript_1687B8 compare VAR_MAP_SCENE_THREE_ISLAND, 4 - goto_if ge, EventScript_1687C2 + goto_if_ge EventScript_1687C2 msgbox gUnknown_818A307 release end diff --git a/data/maps/TwoIsland/scripts.inc b/data/maps/TwoIsland/scripts.inc index 12f3163a2..3bc899bef 100644 --- a/data/maps/TwoIsland/scripts.inc +++ b/data/maps/TwoIsland/scripts.inc @@ -9,38 +9,28 @@ TwoIsland_OnTransition:: @ 816756A end EventScript_167576:: @ 8167576 - checkflag FLAG_SYS_CAN_LINK_WITH_RS - goto_if TRUE, EventScript_167597 - checkflag FLAG_SYS_GAME_CLEAR - goto_if TRUE, EventScript_1675B8 - checkflag FLAG_RESCUED_LOSTELLE - goto_if TRUE, EventScript_1675D9 + goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_167597 + goto_if_set FLAG_SYS_GAME_CLEAR, EventScript_1675B8 + goto_if_set FLAG_RESCUED_LOSTELLE, EventScript_1675D9 goto EventScript_1675E8 end EventScript_167597:: @ 8167597 - checkflag FLAG_TWO_ISLAND_SHOP_INTRODUCED - goto_if FALSE, EventScript_1675EE - checkflag FLAG_TWO_ISLAND_SHOP_EXPANDED_1 - goto_if FALSE, EventScript_1675F4 - checkflag FLAG_TWO_ISLAND_SHOP_EXPANDED_2 - goto_if FALSE, EventScript_1675FD + goto_if_unset FLAG_TWO_ISLAND_SHOP_INTRODUCED, EventScript_1675EE + goto_if_unset FLAG_TWO_ISLAND_SHOP_EXPANDED_1, EventScript_1675F4 + goto_if_unset FLAG_TWO_ISLAND_SHOP_EXPANDED_2, EventScript_1675FD goto EventScript_167606 end EventScript_1675B8:: @ 81675B8 - checkflag FLAG_TWO_ISLAND_SHOP_INTRODUCED - goto_if FALSE, EventScript_1675EE - checkflag FLAG_RESCUED_LOSTELLE - goto_if FALSE, EventScript_1675EE - checkflag FLAG_TWO_ISLAND_SHOP_EXPANDED_1 - goto_if FALSE, EventScript_1675F4 + goto_if_unset FLAG_TWO_ISLAND_SHOP_INTRODUCED, EventScript_1675EE + goto_if_unset FLAG_RESCUED_LOSTELLE, EventScript_1675EE + goto_if_unset FLAG_TWO_ISLAND_SHOP_EXPANDED_1, EventScript_1675F4 goto EventScript_1675FD end EventScript_1675D9:: @ 81675D9 - checkflag FLAG_TWO_ISLAND_SHOP_INTRODUCED - goto_if FALSE, EventScript_1675EE + goto_if_unset FLAG_TWO_ISLAND_SHOP_INTRODUCED, EventScript_1675EE goto EventScript_1675F4 end @@ -70,21 +60,20 @@ EventScript_167606:: @ 8167606 TwoIsland_EventScript_16760F:: @ 816760F special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lock faceplayer compare VAR_MAP_SCENE_TWO_ISLAND, 4 - goto_if eq, EventScript_167646 + goto_if_eq EventScript_167646 compare VAR_MAP_SCENE_TWO_ISLAND, 3 - goto_if eq, EventScript_16765E + goto_if_eq EventScript_16765E compare VAR_MAP_SCENE_TWO_ISLAND, 2 - goto_if eq, EventScript_167676 + goto_if_eq EventScript_167676 goto EventScript_16768E end EventScript_167646:: @ 8167646 - checkflag FLAG_TWO_ISLAND_SHOP_EXPANDED_3 - goto_if TRUE, EventScript_1676A6 + goto_if_set FLAG_TWO_ISLAND_SHOP_EXPANDED_3, EventScript_1676A6 setflag FLAG_TWO_ISLAND_SHOP_EXPANDED_3 message Text_181CAE waitmessage @@ -92,8 +81,7 @@ EventScript_167646:: @ 8167646 end EventScript_16765E:: @ 816765E - checkflag FLAG_TWO_ISLAND_SHOP_EXPANDED_2 - goto_if TRUE, EventScript_1676A6 + goto_if_set FLAG_TWO_ISLAND_SHOP_EXPANDED_2, EventScript_1676A6 setflag FLAG_TWO_ISLAND_SHOP_EXPANDED_2 message Text_181C77 waitmessage @@ -101,8 +89,7 @@ EventScript_16765E:: @ 816765E end EventScript_167676:: @ 8167676 - checkflag FLAG_TWO_ISLAND_SHOP_EXPANDED_1 - goto_if TRUE, EventScript_1676A6 + goto_if_set FLAG_TWO_ISLAND_SHOP_EXPANDED_1, EventScript_1676A6 setflag FLAG_TWO_ISLAND_SHOP_EXPANDED_1 message Text_181B7C waitmessage @@ -110,8 +97,7 @@ EventScript_167676:: @ 8167676 end EventScript_16768E:: @ 816768E - checkflag FLAG_TWO_ISLAND_SHOP_INTRODUCED - goto_if TRUE, EventScript_1676A6 + goto_if_set FLAG_TWO_ISLAND_SHOP_INTRODUCED, EventScript_1676A6 setflag FLAG_TWO_ISLAND_SHOP_INTRODUCED message Text_181AFE waitmessage @@ -122,11 +108,11 @@ EventScript_1676A6:: @ 81676A6 message Text_MayIHelpYou waitmessage compare VAR_MAP_SCENE_TWO_ISLAND, 4 - goto_if eq, EventScript_167728 + goto_if_eq EventScript_167728 compare VAR_MAP_SCENE_TWO_ISLAND, 3 - goto_if eq, EventScript_167708 + goto_if_eq EventScript_167708 compare VAR_MAP_SCENE_TWO_ISLAND, 2 - goto_if eq, EventScript_1676EC + goto_if_eq EventScript_1676EC goto EventScript_1676D3 end diff --git a/data/maps/TwoIsland_House/scripts.inc b/data/maps/TwoIsland_House/scripts.inc index f2761d7e2..68dc50ae8 100644 --- a/data/maps/TwoIsland_House/scripts.inc +++ b/data/maps/TwoIsland_House/scripts.inc @@ -4,15 +4,14 @@ TwoIsland_House_MapScripts:: @ 8171618 TwoIsland_House_EventScript_171619:: @ 8171619 special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 lock faceplayer clearflag FLAG_TEMP_2 clearflag FLAG_TEMP_3 clearflag FLAG_TEMP_4 - checkflag FLAG_TEMP_1 - goto_if TRUE, EventScript_17164F + goto_if_set FLAG_TEMP_1, EventScript_17164F msgbox gUnknown_81A2B88 setflag FLAG_TEMP_1 goto EventScript_17164F @@ -21,33 +20,29 @@ TwoIsland_House_EventScript_171619:: @ 8171619 EventScript_17164F:: @ 817164F checkitem ITEM_BIG_MUSHROOM, 1 compare VAR_RESULT, 1 - call_if eq, EventScript_1717A8 + call_if_eq EventScript_1717A8 checkitem ITEM_TINY_MUSHROOM, 2 compare VAR_RESULT, 1 - call_if eq, EventScript_1717AC - checkflag FLAG_TEMP_2 - goto_if TRUE, EventScript_171687 - checkflag FLAG_TEMP_3 - goto_if TRUE, EventScript_171696 + call_if_eq EventScript_1717AC + goto_if_set FLAG_TEMP_2, EventScript_171687 + goto_if_set FLAG_TEMP_3, EventScript_171696 goto EventScript_17179E end EventScript_171687:: @ 8171687 - checkflag FLAG_TEMP_3 - call_if TRUE, EventScript_1717B0 + call_if_set FLAG_TEMP_3, EventScript_1717B0 goto EventScript_1716A5 end EventScript_171696:: @ 8171696 - checkflag FLAG_TEMP_2 - call_if TRUE, EventScript_1717B0 + call_if_set FLAG_TEMP_2, EventScript_1717B0 goto EventScript_1716A5 end EventScript_1716A5:: @ 81716A5 msgbox gUnknown_81A2C63, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_17179E + goto_if_eq EventScript_17179E goto EventScript_1716BE end @@ -56,12 +51,12 @@ EventScript_1716BE:: @ 81716BE special SelectMoveTutorMon waitstate compare VAR_0x8004, 6 - goto_if ge, EventScript_17179E + goto_if_ge EventScript_17179E special IsSelectedMonEgg compare VAR_RESULT, 1 - goto_if eq, EventScript_171790 + goto_if_eq EventScript_171790 compare VAR_0x8005, 0 - goto_if eq, EventScript_171782 + goto_if_eq EventScript_171782 goto EventScript_1716F4 end @@ -70,13 +65,10 @@ EventScript_1716F4:: @ 81716F4 special DisplayMoveTutorMenu waitstate compare VAR_0x8004, 0 - goto_if eq, EventScript_1716BE - checkflag FLAG_TEMP_4 - goto_if TRUE, EventScript_17175B - checkflag FLAG_TEMP_2 - goto_if TRUE, EventScript_171727 - checkflag FLAG_TEMP_3 - goto_if TRUE, EventScript_171741 + goto_if_eq EventScript_1716BE + goto_if_set FLAG_TEMP_4, EventScript_17175B + goto_if_set FLAG_TEMP_2, EventScript_171727 + goto_if_set FLAG_TEMP_3, EventScript_171741 end EventScript_171727:: @ 8171727 diff --git a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc index 6ad841ea4..fff1e10c5 100644 --- a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc +++ b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc @@ -6,8 +6,7 @@ TwoIsland_JoyfulGameCorner_MapScripts:: @ 81713D0 .byte 0 TwoIsland_JoyfulGameCorner_OnTransition:: @ 81713E5 - checkflag FLAG_GOT_MOON_STONE_FROM_JOYFUL_GAME_CORNER - call_if TRUE, EventScript_1713EF + call_if_set FLAG_GOT_MOON_STONE_FROM_JOYFUL_GAME_CORNER, EventScript_1713EF end EventScript_1713EF:: @ 81713EF @@ -126,9 +125,8 @@ TwoIsland_JoyfulGameCorner_EventScript_171535:: @ 8171535 lock faceplayer compare VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 4 - goto_if eq, EventScript_1BC060 - checkflag FLAG_RESCUED_LOSTELLE - goto_if TRUE, EventScript_171555 + goto_if_eq EventScript_1BC060 + goto_if_set FLAG_RESCUED_LOSTELLE, EventScript_171555 msgbox gUnknown_81A285C release end @@ -142,18 +140,16 @@ TwoIsland_JoyfulGameCorner_EventScript_17155F:: @ 817155F lock faceplayer compare VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 4 - goto_if eq, EventScript_1BC0CE - checkflag FLAG_GOT_MOON_STONE_FROM_JOYFUL_GAME_CORNER - goto_if TRUE, EventScript_1715F5 + goto_if_eq EventScript_1BC0CE + goto_if_set FLAG_GOT_MOON_STONE_FROM_JOYFUL_GAME_CORNER, EventScript_1715F5 compare VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 3 - goto_if eq, EventScript_17158A + goto_if_eq EventScript_17158A msgbox gUnknown_81A2743 release end EventScript_17158A:: @ 817158A - checkflag FLAG_NO_ROOM_FOR_JOYFUL_GAME_CORNER_MOON_STONE - goto_if TRUE, EventScript_1715C4 + goto_if_set FLAG_NO_ROOM_FOR_JOYFUL_GAME_CORNER_MOON_STONE, EventScript_1715C4 msgbox gUnknown_81A296A setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 2 textcolor 3 @@ -170,10 +166,10 @@ EventScript_17158A:: @ 817158A EventScript_1715C4:: @ 81715C4 checkitemspace ITEM_MOON_STONE, 1 compare VAR_RESULT, 0 - goto_if eq, EventScript_1715FF - additem ITEM_MOON_STONE, 1 + goto_if_eq EventScript_1715FF + additem ITEM_MOON_STONE setflag FLAG_GOT_MOON_STONE_FROM_JOYFUL_GAME_CORNER - giveitemfanfaremsg gUnknown_81A2A9A, ITEM_MOON_STONE + msgreceiveditem gUnknown_81A2A9A, ITEM_MOON_STONE release end diff --git a/data/maps/UndergroundPath_NorthEntrance/scripts.inc b/data/maps/UndergroundPath_NorthEntrance/scripts.inc index 39e8c1fcc..55a810d64 100644 --- a/data/maps/UndergroundPath_NorthEntrance/scripts.inc +++ b/data/maps/UndergroundPath_NorthEntrance/scripts.inc @@ -6,17 +6,16 @@ UndergroundPath_NorthEntrance_EventScript_160E39:: @ 8160E39 faceplayer setvar VAR_0x8008, 2 call EventScript_1A8CAD - checkflag FLAG_DID_MS_NIDO_TRADE - goto_if TRUE, EventScript_160EAB + goto_if_set FLAG_DID_MS_NIDO_TRADE, EventScript_160EAB msgbox gUnknown_81A5AD6, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_160E93 + goto_if_eq EventScript_160E93 call EventScript_1A8CBD compare VAR_0x8004, 6 - goto_if ge, EventScript_160E93 + goto_if_ge EventScript_160E93 call EventScript_1A8CC9 compare VAR_RESULT, VAR_0x8009 - goto_if ne, EventScript_160E9D + goto_if_ne EventScript_160E9D call EventScript_1A8CD9 msgbox gUnknown_81A5B4A setflag FLAG_DID_MS_NIDO_TRADE diff --git a/data/maps/VermilionCity/scripts.inc b/data/maps/VermilionCity/scripts.inc index 7c18e34d7..8de5d1e26 100644 --- a/data/maps/VermilionCity/scripts.inc +++ b/data/maps/VermilionCity/scripts.inc @@ -22,8 +22,7 @@ Movement_166903:: @ 8166903 VermilionCity_OnTransition:: @ 8166906 setworldmapflag FLAG_WORLD_MAP_VERMILION_CITY - checkflag FLAG_TALKED_TO_OAKS_AIDE_IN_VERMILION - call_if TRUE, EventScript_166913 + call_if_set FLAG_TALKED_TO_OAKS_AIDE_IN_VERMILION, EventScript_166913 end EventScript_166913:: @ 8166913 @@ -38,7 +37,7 @@ VermilionCity_EventScript_166920:: @ 8166920 lock faceplayer compare VAR_MAP_SCENE_VERMILION_CITY, 3 - goto_if eq, EventScript_166937 + goto_if_eq EventScript_166937 msgbox gUnknown_817F776 release end @@ -52,35 +51,33 @@ VermilionCity_EventScript_166941:: @ 8166941 lock faceplayer compare VAR_MAP_SCENE_VERMILION_CITY, 3 - goto_if eq, EventScript_166996 + goto_if_eq EventScript_166996 msgbox gUnknown_817FA22 release end EventScript_166958:: @ 8166958 - checkflag FLAG_SYS_GOT_MYSTIC_TICKET - goto_if FALSE, EventScript_1A77B0 + goto_if_unset FLAG_SYS_GOT_MYSTIC_TICKET, EventScript_1A77B0 checkitem ITEM_MYSTIC_TICKET, 1 compare VAR_RESULT, 0 - goto_if eq, EventScript_1A77B0 + goto_if_eq EventScript_1A77B0 goto EventScript_1A77AA end EventScript_166977:: @ 8166977 - checkflag FLAG_SYS_GOT_AURORA_TICKET - goto_if FALSE, EventScript_1A77B0 + goto_if_unset FLAG_SYS_GOT_AURORA_TICKET, EventScript_1A77B0 checkitem ITEM_AURORA_TICKET, 1 compare VAR_RESULT, 0 - goto_if eq, EventScript_1A77B0 + goto_if_eq EventScript_1A77B0 goto EventScript_1A77AA end EventScript_166996:: @ 8166996 setvar VAR_0x8004, SEAGALLOP_VERMILION_CITY compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 - goto_if ge, EventScript_1669BB + goto_if_ge EventScript_1669BB compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 1 - goto_if ge, EventScript_166B3B + goto_if_ge EventScript_166B3B msgbox gUnknown_817FB10 release end @@ -88,14 +85,14 @@ EventScript_166996:: @ 8166996 EventScript_1669BB:: @ 81669BB special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 call EventScript_166958 compare VAR_RESULT, 1 - goto_if eq, EventScript_1669FD + goto_if_eq EventScript_1669FD call EventScript_166977 compare VAR_RESULT, 1 - goto_if eq, EventScript_166A5F + goto_if_eq EventScript_166A5F setvar VAR_0x8004, SEAGALLOP_VERMILION_CITY message Text_17FBB8 waitmessage @@ -105,9 +102,8 @@ EventScript_1669BB:: @ 81669BB EventScript_1669FD:: @ 81669FD call EventScript_166977 compare VAR_RESULT, 1 - goto_if eq, EventScript_166AB1 - checkflag FLAG_SHOWED_MYSTICTICKET_TO_CAPTAIN - call_if FALSE, EventScript_166A53 + goto_if_eq EventScript_166AB1 + call_if_unset FLAG_SHOWED_MYSTICTICKET_TO_CAPTAIN, EventScript_166A53 message Text_17FCC1 waitmessage multichoice 17, 6, MULTICHOICE_SEVII_NAVEL, FALSE @@ -124,8 +120,7 @@ EventScript_166A53:: @ 8166A53 return EventScript_166A5F:: @ 8166A5F - checkflag FLAG_SHOWED_AURORATICKET_TO_CAPTAIN - call_if FALSE, EventScript_166AA5 + call_if_unset FLAG_SHOWED_AURORATICKET_TO_CAPTAIN, EventScript_166AA5 message Text_17FCC1 waitmessage multichoice 13, 6, MULTICHOICE_SEVII_BIRTH, FALSE @@ -142,10 +137,8 @@ EventScript_166AA5:: @ 8166AA5 return EventScript_166AB1:: @ 8166AB1 - checkflag FLAG_SHOWED_MYSTICTICKET_TO_CAPTAIN - call_if FALSE, EventScript_166A53 - checkflag FLAG_SHOWED_AURORATICKET_TO_CAPTAIN - call_if FALSE, EventScript_166AA5 + call_if_unset FLAG_SHOWED_MYSTICTICKET_TO_CAPTAIN, EventScript_166A53 + call_if_unset FLAG_SHOWED_AURORATICKET_TO_CAPTAIN, EventScript_166AA5 message Text_17FCC1 waitmessage multichoice 13, 5, MULTICHOICE_SEVII_NAVEL_BIRTH, FALSE @@ -210,10 +203,9 @@ EventScript_166BA0:: @ 8166BA0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 compare VAR_MAP_SCENE_VERMILION_CITY, 3 - goto_if eq, EventScript_166BED + goto_if_eq EventScript_166BED msgbox gUnknown_817FA3C - checkflag FLAG_GOT_SS_TICKET - goto_if FALSE, EventScript_166BDE + goto_if_unset FLAG_GOT_SS_TICKET, EventScript_166BDE msgbox gUnknown_817FA77 setvar VAR_VERMILION_CITY_TICKET_CHECK_TRIGGER, 1 releaseall @@ -228,9 +220,9 @@ EventScript_166BDE:: @ 8166BDE EventScript_166BED:: @ 8166BED setvar VAR_0x8004, SEAGALLOP_VERMILION_CITY compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 - goto_if ge, EventScript_1669BB + goto_if_ge EventScript_1669BB compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 1 - goto_if ge, EventScript_166B3B + goto_if_ge EventScript_166B3B msgbox gUnknown_817FB10 closemessage goto EventScript_1A9108 diff --git a/data/maps/VermilionCity_Gym/scripts.inc b/data/maps/VermilionCity_Gym/scripts.inc index 676a4d3fa..aaa029052 100644 --- a/data/maps/VermilionCity_Gym/scripts.inc +++ b/data/maps/VermilionCity_Gym/scripts.inc @@ -4,10 +4,8 @@ VermilionCity_Gym_MapScripts:: @ 816B69E .byte 0 VermilionCity_Gym_OnLoad:: @ 816B6A9 - checkflag FLAG_TEMP_1 - call_if TRUE, EventScript_16B6BC - checkflag FLAG_FOUND_BOTH_VERMILION_GYM_SWITCHES - call_if TRUE, EventScript_16B717 + call_if_set FLAG_TEMP_1, EventScript_16B6BC + call_if_set FLAG_FOUND_BOTH_VERMILION_GYM_SWITCHES, EventScript_16B717 end EventScript_16B6BC:: @ 816B6BC @@ -41,8 +39,7 @@ VermilionCity_Gym_OnTransition:: @ 816B772 end EventScript_16B778:: @ 816B778 - checkflag FLAG_FOUND_BOTH_VERMILION_GYM_SWITCHES - goto_if TRUE, EventScript_1A77A9 + goto_if_set FLAG_FOUND_BOTH_VERMILION_GYM_SWITCHES, EventScript_1A77A9 special Special_SetVermilionTrashCans copyvar VAR_TEMP_0, VAR_0x8004 copyvar VAR_TEMP_1, VAR_0x8005 @@ -141,16 +138,14 @@ VermilionCity_Gym_EventScript_16B837:: @ 816B837 EventScript_16B843:: @ 816B843 special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 copyvar VAR_0x8004, VAR_TEMP_0 copyvar VAR_0x8005, VAR_TEMP_1 - checkflag FLAG_FOUND_BOTH_VERMILION_GYM_SWITCHES - goto_if TRUE, EventScript_16B8E5 - checkflag FLAG_TEMP_1 - goto_if TRUE, EventScript_16B89E + goto_if_set FLAG_FOUND_BOTH_VERMILION_GYM_SWITCHES, EventScript_16B8E5 + goto_if_set FLAG_TEMP_1, EventScript_16B89E compare VAR_0x8004, VAR_0x8008 - goto_if eq, EventScript_16B885 + goto_if_eq EventScript_16B885 msgbox gUnknown_8195289 releaseall end @@ -167,7 +162,7 @@ EventScript_16B885:: @ 816B885 EventScript_16B89E:: @ 816B89E compare VAR_0x8005, VAR_0x8008 - goto_if eq, EventScript_16B8CB + goto_if_eq EventScript_16B8CB msgbox gUnknown_819536C clearflag FLAG_TEMP_1 special Special_SetVermilionTrashCans @@ -209,17 +204,15 @@ EventScript_16B8EF:: @ 816B8EF VermilionCity_Gym_EventScript_16B94A:: @ 816B94A famechecker FAMECHECKER_LTSURGE, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC, TRAINER_LEADER_LT_SURGE, 0, Text_194BA4, Text_194E03, EventScript_16B97C - checkflag FLAG_GOT_TM34_FROM_SURGE - goto_if FALSE, EventScript_16B9AF + trainerbattle_single TRAINER_LEADER_LT_SURGE, Text_194BA4, Text_194E03, EventScript_16B97C, NO_MUSIC + goto_if_unset FLAG_GOT_TM34_FROM_SURGE, EventScript_16B9AF msgbox gUnknown_8194C8E release end EventScript_16B97C:: @ 816B97C famechecker FAMECHECKER_LTSURGE, 1 - checkflag FLAG_GOT_HM05 - call_if FALSE, EventScript_16B9AB + call_if_unset FLAG_GOT_HM05, EventScript_16B9AB clearflag FLAG_HIDE_FAME_CHECKER_LT_SURGE_JOURNAL setflag FLAG_DEFEATED_LT_SURGE setflag FLAG_BADGE03_GET @@ -235,9 +228,8 @@ EventScript_16B9AF:: @ 816B9AF msgbox gUnknown_8194CFA checkitemspace ITEM_TM34, 1 compare VAR_RESULT, 0 - goto_if eq, EventScript_16B9F0 - additem ITEM_TM34, 1 - giveitemfanfaremsg gUnknown_8194D87, ITEM_TM34 + goto_if_eq EventScript_16B9F0 + giveitem_msg gUnknown_8194D87, ITEM_TM34 setflag FLAG_GOT_TM34_FROM_SURGE msgbox gUnknown_8194DA8 release @@ -249,18 +241,18 @@ EventScript_16B9F0:: @ 816B9F0 end VermilionCity_Gym_EventScript_16B9FA:: @ 816B9FA - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SAILOR_DWAYNE, 0, Text_194FBD, Text_194FF1 + trainerbattle_single TRAINER_SAILOR_DWAYNE, Text_194FBD, Text_194FF1 famechecker FAMECHECKER_LTSURGE, 4 msgbox gUnknown_8195004, 6 end VermilionCity_Gym_EventScript_16BA1E:: @ 816BA1E - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_ENGINEER_BAILY, 0, Text_194F1F, Text_194F6F + trainerbattle_single TRAINER_ENGINEER_BAILY, Text_194F1F, Text_194F6F msgbox gUnknown_8194F76, 6 end VermilionCity_Gym_EventScript_16BA35:: @ 816BA35 - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_GENTLEMAN_TUCKER, 0, Text_194E57, Text_194EA5, EventScript_16BA5D + trainerbattle_single TRAINER_GENTLEMAN_TUCKER, Text_194E57, Text_194EA5, EventScript_16BA5D famechecker FAMECHECKER_LTSURGE, 3 msgbox gUnknown_8194EBD, 6 end @@ -273,8 +265,7 @@ EventScript_16BA5D:: @ 816BA5D VermilionCity_Gym_EventScript_16BA6C:: @ 816BA6C lock faceplayer - checkflag FLAG_DEFEATED_LT_SURGE - goto_if TRUE, EventScript_16BA81 + goto_if_set FLAG_DEFEATED_LT_SURGE, EventScript_16BA81 msgbox gUnknown_81950B4 release end @@ -286,8 +277,7 @@ EventScript_16BA81:: @ 816BA81 VermilionCity_Gym_EventScript_16BA8B:: @ 816BA8B lockall - checkflag FLAG_BADGE03_GET - goto_if TRUE, EventScript_16BA9F + goto_if_set FLAG_BADGE03_GET, EventScript_16BA9F msgbox gUnknown_819520B releaseall end diff --git a/data/maps/VermilionCity_House1/scripts.inc b/data/maps/VermilionCity_House1/scripts.inc index cfa7f143e..f0b5f75e8 100644 --- a/data/maps/VermilionCity_House1/scripts.inc +++ b/data/maps/VermilionCity_House1/scripts.inc @@ -4,11 +4,10 @@ VermilionCity_House1_MapScripts:: @ 816B3A6 VermilionCity_House1_EventScript_16B3A7:: @ 816B3A7 lock faceplayer - checkflag FLAG_GOT_OLD_ROD - goto_if TRUE, EventScript_16B3CF + goto_if_set FLAG_GOT_OLD_ROD, EventScript_16B3CF msgbox gUnknown_8193EC1, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if eq, EventScript_16B3D9 + goto_if_eq EventScript_16B3D9 msgbox gUnknown_8194028 release end @@ -21,10 +20,10 @@ EventScript_16B3CF:: @ 816B3CF EventScript_16B3D9:: @ 816B3D9 checkitemspace ITEM_OLD_ROD, 1 compare VAR_RESULT, 0 - goto_if eq, EventScript_16B41A - additem ITEM_OLD_ROD, 1 + goto_if_eq EventScript_16B41A + additem ITEM_OLD_ROD msgbox gUnknown_8193F2A - giveitemfanfaremsg gUnknown_8193F81, ITEM_OLD_ROD + msgreceiveditem gUnknown_8193F81, ITEM_OLD_ROD setflag FLAG_GOT_OLD_ROD msgbox gUnknown_8193FAF release diff --git a/data/maps/VermilionCity_House2/scripts.inc b/data/maps/VermilionCity_House2/scripts.inc index e24705d6d..ca192abf4 100644 --- a/data/maps/VermilionCity_House2/scripts.inc +++ b/data/maps/VermilionCity_House2/scripts.inc @@ -6,17 +6,16 @@ VermilionCity_House2_EventScript_16B5D7:: @ 816B5D7 faceplayer setvar VAR_0x8008, 3 call EventScript_1A8CAD - checkflag FLAG_DID_CH_DING_TRADE - goto_if TRUE, EventScript_16B649 + goto_if_set FLAG_DID_CH_DING_TRADE, EventScript_16B649 msgbox gUnknown_81949CB, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_16B631 + goto_if_eq EventScript_16B631 call EventScript_1A8CBD compare VAR_0x8004, 6 - goto_if ge, EventScript_16B631 + goto_if_ge EventScript_16B631 call EventScript_1A8CC9 compare VAR_RESULT, VAR_0x8009 - goto_if ne, EventScript_16B63B + goto_if_ne EventScript_16B63B call EventScript_1A8CD9 msgbox gUnknown_8194A44 setflag FLAG_DID_CH_DING_TRADE diff --git a/data/maps/VermilionCity_Mart/scripts.inc b/data/maps/VermilionCity_Mart/scripts.inc index 49b9799b0..1c342fc1c 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_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 lock faceplayer message Text_MayIHelpYou diff --git a/data/maps/VermilionCity_PokemonFanClub/scripts.inc b/data/maps/VermilionCity_PokemonFanClub/scripts.inc index 03e82d3d7..42d810120 100644 --- a/data/maps/VermilionCity_PokemonFanClub/scripts.inc +++ b/data/maps/VermilionCity_PokemonFanClub/scripts.inc @@ -4,11 +4,10 @@ VermilionCity_PokemonFanClub_MapScripts:: @ 816B47E VermilionCity_PokemonFanClub_EventScript_16B47F:: @ 816B47F lock faceplayer - checkflag FLAG_GOT_BIKE_VOUCHER - goto_if TRUE, EventScript_16B4A7 + goto_if_set FLAG_GOT_BIKE_VOUCHER, EventScript_16B4A7 msgbox gUnknown_819457E, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if eq, EventScript_16B4B1 + goto_if_eq EventScript_16B4B1 msgbox gUnknown_8194860 release end @@ -22,10 +21,9 @@ EventScript_16B4B1:: @ 816B4B1 msgbox gUnknown_8194628 checkitemspace ITEM_BIKE_VOUCHER, 1 compare VAR_RESULT, 0 - goto_if eq, EventScript_16B4F2 + goto_if_eq EventScript_16B4F2 setflag FLAG_GOT_BIKE_VOUCHER - additem ITEM_BIKE_VOUCHER, 1 - giveitemfanfaremsg gUnknown_819474E, ITEM_BIKE_VOUCHER, 1, MUS_FAN5 + giveitem_msg gUnknown_819474E, ITEM_BIKE_VOUCHER, 1, MUS_FAN5 msgbox gUnknown_819477C release end @@ -38,8 +36,7 @@ EventScript_16B4F2:: @ 816B4F2 VermilionCity_PokemonFanClub_EventScript_16B4FC:: @ 816B4FC lock faceplayer - checkflag FLAG_SYS_GAME_CLEAR - goto_if TRUE, EventScript_16B511 + goto_if_set FLAG_SYS_GAME_CLEAR, EventScript_16B511 msgbox gUnknown_81948E6 release end @@ -53,8 +50,7 @@ EventScript_16B511:: @ 816B511 VermilionCity_PokemonFanClub_EventScript_16B528:: @ 816B528 lock faceplayer - checkflag FLAG_TEMP_3 - goto_if TRUE, EventScript_16B54B + goto_if_set FLAG_TEMP_3, EventScript_16B54B msgbox gUnknown_81944CC closemessage applymovement 5, Movement_FaceOriginalDirection @@ -75,8 +71,7 @@ EventScript_16B54B:: @ 816B54B VermilionCity_PokemonFanClub_EventScript_16B563:: @ 816B563 lock faceplayer - checkflag FLAG_TEMP_2 - goto_if TRUE, EventScript_16B586 + goto_if_set FLAG_TEMP_2, EventScript_16B586 msgbox gUnknown_819446F closemessage applymovement 6, Movement_FaceOriginalDirection diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc index 569fce4ff..255c5e240 100644 --- a/data/maps/VictoryRoad_1F/scripts.inc +++ b/data/maps/VictoryRoad_1F/scripts.inc @@ -5,7 +5,7 @@ VictoryRoad_1F_MapScripts:: @ 8160F05 VictoryRoad_1F_OnLoad:: @ 8160F10 compare VAR_MAP_SCENE_VICTORY_ROAD_1F, 100 - call_if ne, EventScript_160F1C + call_if_ne EventScript_160F1C end EventScript_160F1C:: @ 8160F1C @@ -20,7 +20,7 @@ VictoryRoad_1F_OnTransition:: @ 8160F2F VictoryRoad_1F_EventScript_160F33:: @ 8160F33 lockall compare VAR_MAP_SCENE_VICTORY_ROAD_1F, 100 - goto_if eq, EventScript_160F62 + goto_if_eq EventScript_160F62 setmetatile 12, 14, 721, 0 setmetatile 12, 15, 737, 0 playse SE_RU_GASYAN @@ -36,11 +36,11 @@ EventScript_160F62:: @ 8160F62 end VictoryRoad_1F_EventScript_160F64:: @ 8160F64 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_COOLTRAINER_NAOMI, 0, Text_174710, Text_174738 + trainerbattle_single TRAINER_COOLTRAINER_NAOMI, Text_174710, Text_174738 msgbox gUnknown_8174744, 6 end VictoryRoad_1F_EventScript_160F7B:: @ 8160F7B - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_COOLTRAINER_ROLANDO, 0, Text_174784, Text_1747B8 + trainerbattle_single TRAINER_COOLTRAINER_ROLANDO, Text_174784, Text_1747B8 msgbox gUnknown_81747C8, 6 end diff --git a/data/maps/VictoryRoad_2F/scripts.inc b/data/maps/VictoryRoad_2F/scripts.inc index ee3367636..1e08d2265 100644 --- a/data/maps/VictoryRoad_2F/scripts.inc +++ b/data/maps/VictoryRoad_2F/scripts.inc @@ -4,9 +4,9 @@ VictoryRoad_2F_MapScripts:: @ 8160F92 VictoryRoad_2F_OnLoad:: @ 8160F98 compare VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER1, 100 - call_if ne, EventScript_160FAF + call_if_ne EventScript_160FAF compare VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER2, 100 - call_if ne, EventScript_160FC2 + call_if_ne EventScript_160FC2 end EventScript_160FAF:: @ 8160FAF @@ -22,7 +22,7 @@ EventScript_160FC2:: @ 8160FC2 VictoryRoad_2F_EventScript_160FD5:: @ 8160FD5 lockall compare VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER1, 100 - goto_if eq, EventScript_161004 + goto_if_eq EventScript_161004 setmetatile 13, 10, 721, 0 setmetatile 13, 11, 737, 0 playse SE_RU_GASYAN @@ -40,7 +40,7 @@ EventScript_161004:: @ 8161004 VictoryRoad_2F_EventScript_161006:: @ 8161006 lockall compare VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER2, 100 - goto_if eq, EventScript_161035 + goto_if_eq EventScript_161035 setmetatile 33, 16, 721, 0 setmetatile 33, 17, 737, 0 playse SE_RU_GASYAN @@ -56,26 +56,26 @@ EventScript_161035:: @ 8161035 end VictoryRoad_2F_EventScript_161037:: @ 8161037 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_POKEMANIAC_DAWSON, 0, Text_1747EF, Text_17482C + trainerbattle_single TRAINER_POKEMANIAC_DAWSON, Text_1747EF, Text_17482C msgbox gUnknown_817483E, 6 end VictoryRoad_2F_EventScript_16104E:: @ 816104E - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BLACK_BELT_DAISUKE, 0, Text_174877, Text_1748B4 + trainerbattle_single TRAINER_BLACK_BELT_DAISUKE, Text_174877, Text_1748B4 msgbox gUnknown_81748BB, 6 end VictoryRoad_2F_EventScript_161065:: @ 8161065 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_JUGGLER_NELSON, 0, Text_1748EE, Text_17491B + trainerbattle_single TRAINER_JUGGLER_NELSON, Text_1748EE, Text_17491B msgbox gUnknown_8174927, 6 end VictoryRoad_2F_EventScript_16107C:: @ 816107C - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_JUGGLER_GREGORY, 0, Text_174995, Text_1749B0 + trainerbattle_single TRAINER_JUGGLER_GREGORY, Text_174995, Text_1749B0 msgbox gUnknown_81749BB, 6 end VictoryRoad_2F_EventScript_161093:: @ 8161093 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TAMER_VINCENT, 0, Text_174942, Text_17495A + trainerbattle_single TRAINER_TAMER_VINCENT, Text_174942, Text_17495A msgbox gUnknown_8174969, 6 end diff --git a/data/maps/VictoryRoad_3F/scripts.inc b/data/maps/VictoryRoad_3F/scripts.inc index cc4f54f13..8e12ddf79 100644 --- a/data/maps/VictoryRoad_3F/scripts.inc +++ b/data/maps/VictoryRoad_3F/scripts.inc @@ -4,7 +4,7 @@ VictoryRoad_3F_MapScripts:: @ 81610AA VictoryRoad_3F_OnLoad:: @ 81610B0 compare VAR_MAP_SCENE_VICTORY_ROAD_3F, 100 - call_if ne, EventScript_1610BC + call_if_ne EventScript_1610BC end EventScript_1610BC:: @ 81610BC @@ -15,7 +15,7 @@ EventScript_1610BC:: @ 81610BC VictoryRoad_3F_EventScript_1610CF:: @ 81610CF lockall compare VAR_MAP_SCENE_VICTORY_ROAD_3F, 100 - goto_if eq, EventScript_161101 + goto_if_eq EventScript_161101 setmetatile 12, 12, 721, 0 setmetatile 12, 13, 737, 0 playse SE_RU_GASYAN @@ -32,31 +32,31 @@ EventScript_161101:: @ 8161101 end VictoryRoad_3F_EventScript_161103:: @ 8161103 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_COOLTRAINER_GEORGE, 0, Text_174B60, Text_174B83 + trainerbattle_single TRAINER_COOLTRAINER_GEORGE, Text_174B60, Text_174B83 msgbox gUnknown_8174B99, 6 end VictoryRoad_3F_EventScript_16111A:: @ 816111A - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_COOLTRAINER_COLBY, 0, Text_174C8A, Text_174CA9 + trainerbattle_single TRAINER_COOLTRAINER_COLBY, Text_174C8A, Text_174CA9 msgbox gUnknown_8174CBD, 6 end VictoryRoad_3F_EventScript_161131:: @ 8161131 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_COOLTRAINER_CAROLINE, 0, Text_174C30, Text_174C5A + trainerbattle_single TRAINER_COOLTRAINER_CAROLINE, Text_174C30, Text_174C5A msgbox gUnknown_8174C67, 6 end VictoryRoad_3F_EventScript_161148:: @ 8161148 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_COOLTRAINER_ALEXA, 0, Text_174BCA, Text_174BF4 + trainerbattle_single TRAINER_COOLTRAINER_ALEXA, Text_174BCA, Text_174BF4 msgbox gUnknown_8174C03, 6 end VictoryRoad_3F_EventScript_16115F:: @ 816115F - trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_COOL_COUPLE_RAY_TYRA, 0, Text_174D0C, Text_174D45, Text_174D96 + trainerbattle_double TRAINER_COOL_COUPLE_RAY_TYRA, Text_174D0C, Text_174D45, Text_174D96 msgbox gUnknown_8174D64, 6 end VictoryRoad_3F_EventScript_16117A:: @ 816117A - trainerbattle TRAINER_BATTLE_DOUBLE, TRAINER_COOL_COUPLE_RAY_TYRA, 0, Text_174E08, Text_174E39, Text_174E8D + trainerbattle_double TRAINER_COOL_COUPLE_RAY_TYRA, Text_174E08, Text_174E39, Text_174E8D msgbox gUnknown_8174E48, 6 end diff --git a/data/maps/ViridianCity/scripts.inc b/data/maps/ViridianCity/scripts.inc index c661ad19b..f87c5ac12 100644 --- a/data/maps/ViridianCity/scripts.inc +++ b/data/maps/ViridianCity/scripts.inc @@ -5,13 +5,13 @@ ViridianCity_MapScripts:: @ 81658D3 ViridianCity_OnTransition:: @ 81658D9 setworldmapflag FLAG_WORLD_MAP_VIRIDIAN_CITY compare VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 0 - call_if eq, EventScript_165920 + call_if_eq EventScript_165920 compare VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 1 - call_if eq, EventScript_16590F + call_if_eq EventScript_16590F compare VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 2 - call_if ge, EventScript_165909 + call_if_ge EventScript_165909 compare VAR_MAP_SCENE_VIRIDIAN_CITY_GYM_DOOR, 0 - call_if eq, EventScript_165931 + call_if_eq EventScript_165931 end EventScript_165909:: @ 8165909 @@ -31,18 +31,12 @@ EventScript_165920:: @ 8165920 return EventScript_165931:: @ 8165931 - checkflag FLAG_BADGE02_GET - goto_if FALSE, EventScript_1A77A9 - checkflag FLAG_BADGE03_GET - goto_if FALSE, EventScript_1A77A9 - checkflag FLAG_BADGE04_GET - goto_if FALSE, EventScript_1A77A9 - checkflag FLAG_BADGE05_GET - goto_if FALSE, EventScript_1A77A9 - checkflag FLAG_BADGE06_GET - goto_if FALSE, EventScript_1A77A9 - checkflag FLAG_BADGE07_GET - goto_if FALSE, EventScript_1A77A9 + goto_if_unset FLAG_BADGE02_GET, EventScript_1A77A9 + goto_if_unset FLAG_BADGE03_GET, EventScript_1A77A9 + goto_if_unset FLAG_BADGE04_GET, EventScript_1A77A9 + goto_if_unset FLAG_BADGE05_GET, EventScript_1A77A9 + goto_if_unset FLAG_BADGE06_GET, EventScript_1A77A9 + goto_if_unset FLAG_BADGE07_GET, EventScript_1A77A9 setvar VAR_MAP_SCENE_VIRIDIAN_CITY_GYM_DOOR, 1 return @@ -91,7 +85,7 @@ ViridianCity_EventScript_1659CA:: @ 81659CA lock faceplayer compare VAR_MAP_SCENE_VIRIDIAN_CITY_GYM_DOOR, 1 - goto_if eq, EventScript_1659EC + goto_if_eq EventScript_1659EC msgbox gUnknown_817DB39 closemessage applymovement 3, Movement_FaceOriginalDirection @@ -107,20 +101,19 @@ EventScript_1659EC:: @ 81659EC ViridianCity_EventScript_1659F6:: @ 81659F6 lock faceplayer - checkflag FLAG_BADGE01_GET - goto_if TRUE, EventScript_165A23 + goto_if_set FLAG_BADGE01_GET, EventScript_165A23 compare VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 2 - goto_if ge, EventScript_165A4A + goto_if_ge EventScript_165A4A compare VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 1 - goto_if eq, EventScript_165A54 + goto_if_eq EventScript_165A54 compare VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 0 - goto_if eq, EventScript_165A84 + goto_if_eq EventScript_165A84 end EventScript_165A23:: @ 8165A23 msgbox gUnknown_817E046, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_165A40 + goto_if_eq EventScript_165A40 msgbox gUnknown_817E0EA release end @@ -149,7 +142,7 @@ EventScript_165A65:: @ 8165A65 msgbox gUnknown_817DE9B special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 special ScrSpecial_StartOldManTutorialBattle waitstate @@ -167,9 +160,9 @@ ViridianCity_EventScript_165A8F:: @ 8165A8F faceplayer msgbox gUnknown_817DB98, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if eq, EventScript_165AB0 + goto_if_eq EventScript_165AB0 compare VAR_RESULT, 0 - goto_if eq, EventScript_165ABA + goto_if_eq EventScript_165ABA end EventScript_165AB0:: @ 8165AB0 @@ -186,7 +179,7 @@ ViridianCity_EventScript_165AC4:: @ 8165AC4 lock faceplayer compare VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 0 - goto_if eq, EventScript_165ADB + goto_if_eq EventScript_165ADB msgbox gUnknown_817DC99 release end @@ -244,7 +237,7 @@ EventScript_165B4C:: @ 8165B4C closemessage special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 special sub_8112364 special ScrSpecial_StartOldManTutorialBattle waitstate diff --git a/data/maps/ViridianCity_Gym/scripts.inc b/data/maps/ViridianCity_Gym/scripts.inc index 43660d1ae..f119d51d1 100644 --- a/data/maps/ViridianCity_Gym/scripts.inc +++ b/data/maps/ViridianCity_Gym/scripts.inc @@ -3,9 +3,8 @@ ViridianCity_Gym_MapScripts:: @ 8169EC9 ViridianCity_Gym_EventScript_169ECA:: @ 8169ECA famechecker FAMECHECKER_GIOVANNI, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC, TRAINER_LEADER_GIOVANNI, 0, Text_18F352, Text_18F43F, EventScript_169F04 - checkflag FLAG_GOT_TM26_FROM_GIOVANNI - goto_if FALSE, EventScript_169F2F + trainerbattle_single TRAINER_LEADER_GIOVANNI, Text_18F352, Text_18F43F, EventScript_169F04, NO_MUSIC + goto_if_unset FLAG_GOT_TM26_FROM_GIOVANNI, EventScript_169F2F msgbox gUnknown_818F4A2 closemessage fadescreen 1 @@ -28,9 +27,8 @@ EventScript_169F2F:: @ 8169F2F msgbox gUnknown_818F586 checkitemspace ITEM_TM26, 1 compare VAR_RESULT, 0 - goto_if eq, EventScript_169F70 - additem ITEM_TM26, 1 - giveitemfanfaremsg gUnknown_818F675, ITEM_TM26 + goto_if_eq EventScript_169F70 + giveitem_msg gUnknown_818F675, ITEM_TM26 setflag FLAG_GOT_TM26_FROM_GIOVANNI msgbox gUnknown_818F695 release @@ -42,50 +40,49 @@ EventScript_169F70:: @ 8169F70 end ViridianCity_Gym_EventScript_169F7A:: @ 8169F7A - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TAMER_JASON, 0, Text_18F7F3, Text_18F824 + trainerbattle_single TRAINER_TAMER_JASON, Text_18F7F3, Text_18F824 msgbox gUnknown_818F840, 6 end ViridianCity_Gym_EventScript_169F91:: @ 8169F91 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TAMER_COLE, 0, Text_18F98A, Text_18F9BB + trainerbattle_single TRAINER_TAMER_COLE, Text_18F98A, Text_18F9BB msgbox gUnknown_818F9CC, 6 end ViridianCity_Gym_EventScript_169FA8:: @ 8169FA8 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BLACK_BELT_ATSUSHI, 0, Text_18F7AD, Text_18F7D6 + trainerbattle_single TRAINER_BLACK_BELT_ATSUSHI, Text_18F7AD, Text_18F7D6 msgbox gUnknown_818F7DD, 6 end ViridianCity_Gym_EventScript_169FBF:: @ 8169FBF - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BLACK_BELT_KIYO, 0, Text_18F86C, Text_18F899 + trainerbattle_single TRAINER_BLACK_BELT_KIYO, Text_18F86C, Text_18F899 msgbox gUnknown_818F8A0, 6 end ViridianCity_Gym_EventScript_169FD6:: @ 8169FD6 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BLACK_BELT_TAKASHI, 0, Text_18F92C, Text_18F95A + trainerbattle_single TRAINER_BLACK_BELT_TAKASHI, Text_18F92C, Text_18F95A msgbox gUnknown_818F960, 6 end ViridianCity_Gym_EventScript_169FED:: @ 8169FED - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_COOLTRAINER_SAMUEL, 0, Text_18F9E7, Text_18FA2D + trainerbattle_single TRAINER_COOLTRAINER_SAMUEL, Text_18F9E7, Text_18FA2D msgbox gUnknown_818FA3B, 6 end ViridianCity_Gym_EventScript_16A004:: @ 816A004 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_COOLTRAINER_YUJI, 0, Text_18F73B, Text_18F769 + trainerbattle_single TRAINER_COOLTRAINER_YUJI, Text_18F73B, Text_18F769 msgbox gUnknown_818F77B, 6 end ViridianCity_Gym_EventScript_16A01B:: @ 816A01B - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_COOLTRAINER_WARREN, 0, Text_18F8CB, Text_18F8EE + trainerbattle_single TRAINER_COOLTRAINER_WARREN, Text_18F8CB, Text_18F8EE msgbox gUnknown_818F8FE, 6 end ViridianCity_Gym_EventScript_16A032:: @ 816A032 lock faceplayer - checkflag FLAG_DEFEATED_LEADER_GIOVANNI - goto_if TRUE, EventScript_16A047 + goto_if_set FLAG_DEFEATED_LEADER_GIOVANNI, EventScript_16A047 msgbox gUnknown_818FA81 release end @@ -98,8 +95,7 @@ EventScript_16A047:: @ 816A047 ViridianCity_Gym_EventScript_16A05E:: @ 816A05E lockall - checkflag FLAG_BADGE08_GET - goto_if TRUE, EventScript_16A072 + goto_if_set FLAG_BADGE08_GET, EventScript_16A072 msgbox gUnknown_818FB8D releaseall end diff --git a/data/maps/ViridianCity_House2/scripts.inc b/data/maps/ViridianCity_House2/scripts.inc index 406bfd7a0..a897b3f1f 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_RESULT, 0 - goto_if eq, EventScript_16A11B + goto_if_eq EventScript_16A11B msgbox gUnknown_818FD23 msgbox gUnknown_818FF19, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_16A11B + goto_if_eq EventScript_16A11B msgbox gUnknown_818FDA8 msgbox gUnknown_818FF19, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_16A11B + goto_if_eq EventScript_16A11B msgbox gUnknown_818FE5C applymovement 2, Movement_WalkInPlaceFastestUp waitmovement 0 diff --git a/data/maps/ViridianCity_Mart/scripts.inc b/data/maps/ViridianCity_Mart/scripts.inc index f0958605a..3ecce3880 100644 --- a/data/maps/ViridianCity_Mart/scripts.inc +++ b/data/maps/ViridianCity_Mart/scripts.inc @@ -4,8 +4,7 @@ ViridianCity_Mart_MapScripts:: @ 816A1D3 .byte 0 ViridianCity_Mart_OnLoad:: @ 816A1DE - checkflag FLAG_SYS_POKEDEX_GET - goto_if FALSE, EventScript_16A1E8 + goto_if_unset FLAG_SYS_POKEDEX_GET, EventScript_16A1E8 end EventScript_16A1E8:: @ 816A1E8 @@ -29,8 +28,7 @@ EventScript_16A205:: @ 816A205 waitmovement 0 msgbox gUnknown_819023A setvar VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 1 - additem ITEM_OAKS_PARCEL, 1 - giveitemfanfaremsg gUnknown_8190289, ITEM_OAKS_PARCEL, 1, MUS_FAN5 + giveitem_msg gUnknown_8190289, ITEM_OAKS_PARCEL, 1, MUS_FAN5 setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 5 releaseall end @@ -55,10 +53,10 @@ ViridianCity_Mart_EventScript_16A268:: @ 816A268 lock faceplayer compare VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 1 - goto_if eq, EventScript_16A2A4 + goto_if_eq EventScript_16A2A4 special sub_8110AB4 compare VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + goto_if_eq EventScript_1A7AE0 message Text_MayIHelpYou waitmessage pokemart Items_16A298 diff --git a/data/maps/ViridianForest/scripts.inc b/data/maps/ViridianForest/scripts.inc index bc6923ea6..95b1f0fb5 100644 --- a/data/maps/ViridianForest/scripts.inc +++ b/data/maps/ViridianForest/scripts.inc @@ -39,26 +39,26 @@ ViridianForest_EventScript_160568:: @ 8160568 end ViridianForest_EventScript_160571:: @ 8160571 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BUG_CATCHER_RICK, 0, Text_1722C7, Text_1722F9 + trainerbattle_single TRAINER_BUG_CATCHER_RICK, Text_1722C7, Text_1722F9 msgbox gUnknown_8172315, 6 end ViridianForest_EventScript_160588:: @ 8160588 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BUG_CATCHER_DOUG, 0, Text_17234A, Text_17237D + trainerbattle_single TRAINER_BUG_CATCHER_DOUG, Text_17234A, Text_17237D msgbox gUnknown_8172398, 6 end ViridianForest_EventScript_16059F:: @ 816059F - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BUG_CATCHER_SAMMY, 0, Text_1723D4, Text_172402 + trainerbattle_single TRAINER_BUG_CATCHER_SAMMY, Text_1723D4, Text_172402 msgbox gUnknown_817241F, 6 end ViridianForest_EventScript_1605B6:: @ 81605B6 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BUG_CATCHER_ANTHONY, 0, Text_172482, Text_1724BF + trainerbattle_single TRAINER_BUG_CATCHER_ANTHONY, Text_172482, Text_1724BF msgbox gUnknown_81724DC, 6 end ViridianForest_EventScript_1605CD:: @ 81605CD - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BUG_CATCHER_CHARLIE, 0, Text_1724F9, Text_17251B + trainerbattle_single TRAINER_BUG_CATCHER_CHARLIE, Text_1724F9, Text_17251B msgbox gUnknown_8172527, 6 end |