diff options
Diffstat (limited to 'data/maps/CeladonCity_Gym/scripts.inc')
| -rw-r--r-- | data/maps/CeladonCity_Gym/scripts.inc | 43 |
1 files changed, 20 insertions, 23 deletions
diff --git a/data/maps/CeladonCity_Gym/scripts.inc b/data/maps/CeladonCity_Gym/scripts.inc index b92e99fe1..60a945e21 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 @@ -23,10 +22,9 @@ EventScript_16D0A0:: @ 816D0A0 EventScript_16D0C6:: @ 816D0C6 msgbox gUnknown_8197327 checkitemspace ITEM_TM19, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16D107 - additem ITEM_TM19, 1 - giveitemfanfaremsg gUnknown_81973BA, ITEM_TM19 + compare VAR_RESULT, FALSE + 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 - msgbox gUnknown_81974D6, 6 + trainerbattle_single TRAINER_LASS_KAY, Text_19747C, Text_1974C4 + msgbox gUnknown_81974D6, MSGBOX_AUTOCLOSE 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 + msgbox gUnknown_8197708, MSGBOX_AUTOCLOSE end CeladonCity_Gym_EventScript_16D14C:: @ 816D14C - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_TINA, 0, Text_197595, Text_1975BB - msgbox gUnknown_81975D1, 6 + trainerbattle_single TRAINER_PICNICKER_TINA, Text_197595, Text_1975BB + msgbox gUnknown_81975D1, MSGBOX_AUTOCLOSE end CeladonCity_Gym_EventScript_16D163:: @ 816D163 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BEAUTY_BRIDGET, 0, Text_1974FA, Text_19751C - msgbox gUnknown_8197527, 6 + trainerbattle_single TRAINER_BEAUTY_BRIDGET, Text_1974FA, Text_19751C + msgbox gUnknown_8197527, MSGBOX_AUTOCLOSE 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 + msgbox gUnknown_8197664, MSGBOX_AUTOCLOSE end CeladonCity_Gym_EventScript_16D19E:: @ 816D19E - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BEAUTY_LORI, 0, Text_197747, Text_19777A - msgbox gUnknown_8197788, 6 + trainerbattle_single TRAINER_BEAUTY_LORI, Text_197747, Text_19777A + msgbox gUnknown_8197788, MSGBOX_AUTOCLOSE end CeladonCity_Gym_EventScript_16D1B5:: @ 816D1B5 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_COOLTRAINER_MARY, 0, Text_1977E5, Text_197832 - msgbox gUnknown_819783E, 6 + trainerbattle_single TRAINER_COOLTRAINER_MARY, Text_1977E5, Text_197832 + msgbox gUnknown_819783E, MSGBOX_AUTOCLOSE 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 |