diff options
Diffstat (limited to 'data/maps/VermilionCity_Gym/scripts.inc')
| -rw-r--r-- | data/maps/VermilionCity_Gym/scripts.inc | 95 |
1 files changed, 42 insertions, 53 deletions
diff --git a/data/maps/VermilionCity_Gym/scripts.inc b/data/maps/VermilionCity_Gym/scripts.inc index 36430c676..48fa76fe0 100644 --- a/data/maps/VermilionCity_Gym/scripts.inc +++ b/data/maps/VermilionCity_Gym/scripts.inc @@ -4,10 +4,10 @@ VermilionCity_Gym_MapScripts:: @ 816B69E .byte 0 VermilionCity_Gym_MapScript1_16B6A9:: @ 816B6A9 - checkflag FLAG_0x001 - call_if 1, EventScript_16B6BC - checkflag FLAG_0x264 - call_if 1, EventScript_16B717 + checkflag FLAG_TEMP_1 + call_if TRUE, EventScript_16B6BC + checkflag FLAG_FOUND_BOTH_VERMILION_GYM_SWITCHES + call_if TRUE, EventScript_16B717 end EventScript_16B6BC:: @ 816B6BC @@ -41,9 +41,9 @@ VermilionCity_Gym_MapScript2_16B772:: @ 816B772 end EventScript_16B778:: @ 816B778 - checkflag FLAG_0x264 - goto_if_eq EventScript_1A77A9 - special sub_80CADEC + checkflag FLAG_FOUND_BOTH_VERMILION_GYM_SWITCHES + goto_if TRUE, EventScript_1A77A9 + special Special_SetVermilionTrashCans copyvar VAR_0x4000, VAR_0x8004 copyvar VAR_0x4001, VAR_0x8005 return @@ -141,16 +141,16 @@ VermilionCity_Gym_EventScript_16B837:: @ 816B837 EventScript_16B843:: @ 816B843 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 special sub_8112364 copyvar VAR_0x8004, VAR_0x4000 copyvar VAR_0x8005, VAR_0x4001 - checkflag FLAG_0x264 - goto_if_eq EventScript_16B8E5 - checkflag FLAG_0x001 - goto_if_eq EventScript_16B89E + checkflag FLAG_FOUND_BOTH_VERMILION_GYM_SWITCHES + goto_if TRUE, EventScript_16B8E5 + checkflag FLAG_TEMP_1 + goto_if TRUE, EventScript_16B89E compare_var_to_var VAR_0x8004, VAR_0x8008 - goto_if_eq EventScript_16B885 + goto_if eq, EventScript_16B885 msgbox gUnknown_8195289 releaseall end @@ -161,16 +161,16 @@ EventScript_16B885:: @ 816B885 waitse call EventScript_16B6BC special DrawWholeMapView - setflag FLAG_0x001 + setflag FLAG_TEMP_1 releaseall end EventScript_16B89E:: @ 816B89E compare_var_to_var VAR_0x8005, VAR_0x8008 - goto_if_eq EventScript_16B8CB + goto_if eq, EventScript_16B8CB msgbox gUnknown_819536C - clearflag FLAG_0x001 - special sub_80CADEC + clearflag FLAG_TEMP_1 + special Special_SetVermilionTrashCans copyvar VAR_0x4000, VAR_0x8004 copyvar VAR_0x4001, VAR_0x8005 call EventScript_16B8EF @@ -185,7 +185,7 @@ EventScript_16B8CB:: @ 816B8CB special DrawWholeMapView playse SE_KI_GASYAN waitse - setflag FLAG_0x264 + setflag FLAG_FOUND_BOTH_VERMILION_GYM_SWITCHES releaseall end @@ -208,42 +208,37 @@ EventScript_16B8EF:: @ 816B8EF return VermilionCity_Gym_EventScript_16B94A:: @ 816B94A - setvar VAR_0x8004, 4 - setvar VAR_0x8005, 2 - special UpdatePickStateFromSpecialVar8005 - trainerbattle 1, 416, 0, Text_194BA4, Text_194E03, EventScript_16B97C - checkflag FLAG_0x231 - goto_if 0, EventScript_16B9AF + famechecker FAMECHECKER_LTSURGE, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 + trainerbattle 1, TRAINER_LEADER_LT_SURGE, 0, Text_194BA4, Text_194E03, EventScript_16B97C + checkflag FLAG_GOT_TM34_FROM_SURGE + goto_if FALSE, EventScript_16B9AF msgbox gUnknown_8194C8E release end EventScript_16B97C:: @ 816B97C - setvar VAR_0x8004, 4 - setvar VAR_0x8005, 1 - special SetFlavorTextFlagFromSpecialVars - checkflag FLAG_0x23B - call_if 0, EventScript_16B9AB - clearflag FLAG_0x0A0 - setflag FLAG_0x4B2 - setflag FLAG_0x822 - setvar VAR_0x8008, 3 - call EventScript_1A6B18 + famechecker FAMECHECKER_LTSURGE, 1 + checkflag FLAG_GOT_HM05 + call_if FALSE, EventScript_16B9AB + clearflag FLAG_HIDE_FAME_CHECKER_LT_SURGE_JOURNAL + setflag FLAG_DEFEATED_LT_SURGE + setflag FLAG_BADGE03_GET + set_gym_trainers 3 goto EventScript_16B9AF end EventScript_16B9AB:: @ 816B9AB - clearflag FLAG_0x0A1 + clearflag FLAG_HIDE_VERMILION_CITY_OAKS_AIDE return EventScript_16B9AF:: @ 816B9AF msgbox gUnknown_8194CFA checkitemspace ITEM_TM34, 1 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16B9F0 + goto_if eq, EventScript_16B9F0 additem ITEM_TM34, 1 giveitemfanfaremsg gUnknown_8194D87, ITEM_TM34 - setflag FLAG_0x231 + setflag FLAG_GOT_TM34_FROM_SURGE msgbox gUnknown_8194DA8 release end @@ -254,38 +249,32 @@ EventScript_16B9F0:: @ 816B9F0 end VermilionCity_Gym_EventScript_16B9FA:: @ 816B9FA - trainerbattle 0, 141, 0, Text_194FBD, Text_194FF1 - setvar VAR_0x8004, 4 - setvar VAR_0x8005, 4 - special SetFlavorTextFlagFromSpecialVars + trainerbattle 0, TRAINER_SAILOR_DWAYNE, 0, Text_194FBD, Text_194FF1 + famechecker FAMECHECKER_LTSURGE, 4 msgbox gUnknown_8195004, 6 end VermilionCity_Gym_EventScript_16BA1E:: @ 816BA1E - trainerbattle 0, 220, 0, Text_194F1F, Text_194F6F + trainerbattle 0, TRAINER_ENGINEER_BAILY, 0, Text_194F1F, Text_194F6F msgbox gUnknown_8194F76, 6 end VermilionCity_Gym_EventScript_16BA35:: @ 816BA35 - trainerbattle 2, 423, 0, Text_194E57, Text_194EA5, EventScript_16BA5D - setvar VAR_0x8004, 4 - setvar VAR_0x8005, 3 - special SetFlavorTextFlagFromSpecialVars + trainerbattle 2, TRAINER_GENTLEMAN_TUCKER, 0, Text_194E57, Text_194EA5, EventScript_16BA5D + famechecker FAMECHECKER_LTSURGE, 3 msgbox gUnknown_8194EBD, 6 end EventScript_16BA5D:: @ 816BA5D - setvar VAR_0x8004, 4 - setvar VAR_0x8005, 2 - special SetFlavorTextFlagFromSpecialVars + famechecker FAMECHECKER_LTSURGE, 2 release end VermilionCity_Gym_EventScript_16BA6C:: @ 816BA6C lock faceplayer - checkflag FLAG_0x4B2 - goto_if_eq EventScript_16BA81 + checkflag FLAG_DEFEATED_LT_SURGE + goto_if TRUE, EventScript_16BA81 msgbox gUnknown_81950B4 release end @@ -297,8 +286,8 @@ EventScript_16BA81:: @ 816BA81 VermilionCity_Gym_EventScript_16BA8B:: @ 816BA8B lockall - checkflag FLAG_0x822 - goto_if_eq EventScript_16BA9F + checkflag FLAG_BADGE03_GET + goto_if TRUE, EventScript_16BA9F msgbox gUnknown_819520B releaseall end |