diff options
Diffstat (limited to 'data/maps/CeladonCity_Gym/scripts.inc')
| -rw-r--r-- | data/maps/CeladonCity_Gym/scripts.inc | 63 |
1 files changed, 24 insertions, 39 deletions
diff --git a/data/maps/CeladonCity_Gym/scripts.inc b/data/maps/CeladonCity_Gym/scripts.inc index 9131602c2..e0c5c4306 100644 --- a/data/maps/CeladonCity_Gym/scripts.inc +++ b/data/maps/CeladonCity_Gym/scripts.inc @@ -2,28 +2,21 @@ CeladonCity_Gym_MapScripts:: @ 816D060 .byte 0 CeladonCity_Gym_EventScript_16D061:: @ 816D061 - setvar VAR_0x8004, 5 - setvar VAR_0x8005, 2 - special UpdatePickStateFromSpecialVar8005 - trainerbattle 1, 417, 0, Text_197114, Text_197260, EventScript_16D0A0 - checkflag FLAG_0x293 - goto_if 0, EventScript_16D0C6 - setvar VAR_0x8004, 5 - setvar VAR_0x8005, 4 - special SetFlavorTextFlagFromSpecialVars + famechecker FAMECHECKER_ERIKA, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 + trainerbattle 1, TRAINER_LEADER_ERIKA, 0, Text_197114, Text_197260, EventScript_16D0A0 + checkflag FLAG_GOT_TM19_FROM_ERIKA + goto_if FALSE, EventScript_16D0C6 + famechecker FAMECHECKER_ERIKA, 4 msgbox gUnknown_81972B8 release end EventScript_16D0A0:: @ 816D0A0 - setvar VAR_0x8004, 5 - setvar VAR_0x8005, 1 - special SetFlavorTextFlagFromSpecialVars - clearflag FLAG_0x09E - setflag FLAG_0x4B3 - setflag FLAG_0x823 - setvar VAR_0x8008, 4 - call EventScript_1A6B18 + famechecker FAMECHECKER_ERIKA, 1 + clearflag FLAG_HIDE_FAME_CHECKER_ERIKA_JOURNALS + setflag FLAG_DEFEATED_ERIKA + setflag FLAG_BADGE04_GET + set_gym_trainers 4 goto EventScript_16D0C6 end @@ -31,14 +24,10 @@ EventScript_16D0C6:: @ 816D0C6 msgbox gUnknown_8197327 checkitemspace ITEM_TM19, 1 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16D107 + goto_if eq, EventScript_16D107 additem ITEM_TM19, 1 - loadword 0, gUnknown_81973BA - setorcopyvar VAR_0x8000, ITEM_TM19 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, MUS_FANFA1 - callstd 9 @ gStdScript_ItemMessageAndFanfare - setflag FLAG_0x293 + giveitemfanfaremsg gUnknown_81973BA, ITEM_TM19 + setflag FLAG_GOT_TM19_FROM_ERIKA msgbox gUnknown_81973D7 release end @@ -49,50 +38,46 @@ EventScript_16D107:: @ 816D107 end CeladonCity_Gym_EventScript_16D111:: @ 816D111 - trainerbattle 0, 132, 0, Text_19747C, Text_1974C4 + trainerbattle 0, TRAINER_LASS_KAY, 0, Text_19747C, Text_1974C4 msgbox gUnknown_81974D6, 6 end CeladonCity_Gym_EventScript_16D128:: @ 816D128 - trainerbattle 0, 133, 0, Text_1976C5, Text_1976FF - setvar VAR_0x8004, 5 - setvar VAR_0x8005, 2 - special SetFlavorTextFlagFromSpecialVars + trainerbattle 0, TRAINER_LASS_LISA, 0, Text_1976C5, Text_1976FF + famechecker FAMECHECKER_ERIKA, 2 msgbox gUnknown_8197708, 6 end CeladonCity_Gym_EventScript_16D14C:: @ 816D14C - trainerbattle 0, 160, 0, Text_197595, Text_1975BB + trainerbattle 0, TRAINER_PICNICKER_TINA, 0, Text_197595, Text_1975BB msgbox gUnknown_81975D1, 6 end CeladonCity_Gym_EventScript_16D163:: @ 816D163 - trainerbattle 0, 265, 0, Text_1974FA, Text_19751C + trainerbattle 0, TRAINER_BEAUTY_BRIDGET, 0, Text_1974FA, Text_19751C msgbox gUnknown_8197527, 6 end CeladonCity_Gym_EventScript_16D17A:: @ 816D17A - trainerbattle 0, 266, 0, Text_19760B, Text_197660 - setvar VAR_0x8004, 5 - setvar VAR_0x8005, 3 - special SetFlavorTextFlagFromSpecialVars + trainerbattle 0, TRAINER_BEAUTY_TAMIA, 0, Text_19760B, Text_197660 + famechecker FAMECHECKER_ERIKA, 3 msgbox gUnknown_8197664, 6 end CeladonCity_Gym_EventScript_16D19E:: @ 816D19E - trainerbattle 0, 267, 0, Text_197747, Text_19777A + trainerbattle 0, TRAINER_BEAUTY_LORI, 0, Text_197747, Text_19777A msgbox gUnknown_8197788, 6 end CeladonCity_Gym_EventScript_16D1B5:: @ 816D1B5 - trainerbattle 0, 402, 0, Text_1977E5, Text_197832 + trainerbattle 0, TRAINER_COOLTRAINER_MARY, 0, Text_1977E5, Text_197832 msgbox gUnknown_819783E, 6 end CeladonCity_Gym_EventScript_16D1CC:: @ 816D1CC lockall - checkflag FLAG_0x823 - goto_if_eq EventScript_16D1E0 + checkflag FLAG_BADGE04_GET + goto_if TRUE, EventScript_16D1E0 msgbox gUnknown_8197874 releaseall end |