diff options
Diffstat (limited to 'data/maps/CeruleanCity_Gym/scripts.inc')
| -rw-r--r-- | data/maps/CeruleanCity_Gym/scripts.inc | 41 |
1 files changed, 17 insertions, 24 deletions
diff --git a/data/maps/CeruleanCity_Gym/scripts.inc b/data/maps/CeruleanCity_Gym/scripts.inc index d8fe70407..c53c9718b 100644 --- a/data/maps/CeruleanCity_Gym/scripts.inc +++ b/data/maps/CeruleanCity_Gym/scripts.inc @@ -2,25 +2,20 @@ CeruleanCity_Gym_MapScripts:: @ 816AAA0 .byte 0 CeruleanCity_Gym_EventScript_16AAA1:: @ 816AAA1 - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 2 - special UpdatePickStateFromSpecialVar8005 - trainerbattle 1, 415, 0, Text_1921EF, Text_19242D, EventScript_16AAD3 - checkflag FLAG_0x297 - goto_if 0, EventScript_16AAF9 + famechecker FAMECHECKER_MISTY, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 + trainerbattle 1, TRAINER_LEADER_MISTY, 0, Text_1921EF, Text_19242D, EventScript_16AAD3 + checkflag FLAG_GOT_TM03_FROM_MISTY + goto_if FALSE, EventScript_16AAF9 msgbox gUnknown_81922BF release end EventScript_16AAD3:: @ 816AAD3 - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 1 - special SetFlavorTextFlagFromSpecialVars - setflag FLAG_0x4B1 - setflag FLAG_0x821 + famechecker FAMECHECKER_MISTY, 1 + setflag FLAG_DEFEATED_MISTY + setflag FLAG_BADGE02_GET setrespawn SPAWN_CERULEAN_CITY - setvar VAR_0x8008, 2 - call EventScript_1A6B18 + set_gym_trainers 2 goto EventScript_16AAF9 end @@ -28,10 +23,10 @@ EventScript_16AAF9:: @ 816AAF9 msgbox gUnknown_81922F7 checkitemspace ITEM_TM03, 1 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16AB3A + goto_if eq, EventScript_16AB3A additem ITEM_TM03, 1 giveitemfanfaremsg gUnknown_81923F1, ITEM_TM03 - setflag FLAG_0x297 + setflag FLAG_GOT_TM03_FROM_MISTY msgbox gUnknown_81922BF release end @@ -42,23 +37,21 @@ EventScript_16AB3A:: @ 816AB3A end CeruleanCity_Gym_EventScript_16AB44:: @ 816AB44 - trainerbattle 0, 150, 0, Text_192481, Text_1924D0 + trainerbattle 0, TRAINER_PICNICKER_DIANA, 0, Text_192481, Text_1924D0 msgbox gUnknown_81924E4, 6 end CeruleanCity_Gym_EventScript_16AB5B:: @ 816AB5B - trainerbattle 0, 234, 0, Text_192524, Text_192547 - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 2 - special SetFlavorTextFlagFromSpecialVars + trainerbattle 0, TRAINER_SWIMMER_MALE_LUIS, 0, Text_192524, Text_192547 + famechecker FAMECHECKER_MISTY, 2 msgbox gUnknown_8192556, 6 end CeruleanCity_Gym_EventScript_16AB7F:: @ 816AB7F lock faceplayer - checkflag FLAG_0x4B1 - goto_if_eq EventScript_16AB94 + checkflag FLAG_DEFEATED_MISTY + goto_if TRUE, EventScript_16AB94 msgbox gUnknown_81925AC release end @@ -70,8 +63,8 @@ EventScript_16AB94:: @ 816AB94 CeruleanCity_Gym_EventScript_16AB9E:: @ 816AB9E lockall - checkflag FLAG_0x821 - goto_if_eq EventScript_16ABB2 + checkflag FLAG_BADGE02_GET + goto_if TRUE, EventScript_16ABB2 msgbox gUnknown_81926E1 releaseall end |