diff options
Diffstat (limited to 'data/maps/CeruleanCity_Gym/scripts.inc')
| -rw-r--r-- | data/maps/CeruleanCity_Gym/scripts.inc | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/data/maps/CeruleanCity_Gym/scripts.inc b/data/maps/CeruleanCity_Gym/scripts.inc index a37d3435b..a172dc5b3 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 @@ -22,10 +21,9 @@ EventScript_16AAD3:: @ 816AAD3 EventScript_16AAF9:: @ 816AAF9 msgbox gUnknown_81922F7 checkitemspace ITEM_TM03, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16AB3A - additem ITEM_TM03, 1 - giveitemfanfaremsg gUnknown_81923F1, ITEM_TM03 + compare VAR_RESULT, FALSE + goto_if_eq EventScript_16AB3A + giveitem_msg gUnknown_81923F1, ITEM_TM03 setflag FLAG_GOT_TM03_FROM_MISTY msgbox gUnknown_81922BF release @@ -37,21 +35,20 @@ EventScript_16AB3A:: @ 816AB3A end CeruleanCity_Gym_EventScript_16AB44:: @ 816AB44 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PICNICKER_DIANA, 0, Text_192481, Text_1924D0 - msgbox gUnknown_81924E4, 6 + trainerbattle_single TRAINER_PICNICKER_DIANA, Text_192481, Text_1924D0 + msgbox gUnknown_81924E4, MSGBOX_AUTOCLOSE 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 + msgbox gUnknown_8192556, MSGBOX_AUTOCLOSE end 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 |