summaryrefslogtreecommitdiff
path: root/data/maps/FuchsiaCity_Gym/scripts.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/FuchsiaCity_Gym/scripts.inc')
-rw-r--r--data/maps/FuchsiaCity_Gym/scripts.inc14
1 files changed, 7 insertions, 7 deletions
diff --git a/data/maps/FuchsiaCity_Gym/scripts.inc b/data/maps/FuchsiaCity_Gym/scripts.inc
index 57d866f6b..8160e0fb3 100644
--- a/data/maps/FuchsiaCity_Gym/scripts.inc
+++ b/data/maps/FuchsiaCity_Gym/scripts.inc
@@ -3,7 +3,7 @@ FuchsiaCity_Gym_MapScripts:: @ 816D54D
FuchsiaCity_Gym_EventScript_16D54E:: @ 816D54E
famechecker FAMECHECKER_KOGA, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
- trainerbattle 1, TRAINER_LEADER_KOGA, 0, Text_19832E, Text_198444, EventScript_16D580
+ trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC, TRAINER_LEADER_KOGA, 0, Text_19832E, Text_198444, EventScript_16D580
checkflag FLAG_GOT_TM06_FROM_KOGA
goto_if FALSE, EventScript_16D5A6
msgbox gUnknown_8198481
@@ -37,33 +37,33 @@ EventScript_16D5E7:: @ 816D5E7
end
FuchsiaCity_Gym_EventScript_16D5F1:: @ 816D5F1
- trainerbattle 0, TRAINER_TAMER_PHIL, 0, Text_198866, Text_1988B6
+ trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TAMER_PHIL, 0, Text_198866, Text_1988B6
msgbox gUnknown_81988CB, 6
end
FuchsiaCity_Gym_EventScript_16D608:: @ 816D608
- trainerbattle 0, TRAINER_TAMER_EDGAR, 0, Text_19891F, Text_19897F
+ trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TAMER_EDGAR, 0, Text_19891F, Text_19897F
msgbox gUnknown_8198985, 6
end
FuchsiaCity_Gym_EventScript_16D61F:: @ 816D61F
- trainerbattle 0, TRAINER_JUGGLER_KIRK, 0, Text_19871E, Text_198779
+ trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_JUGGLER_KIRK, 0, Text_19871E, Text_198779
famechecker FAMECHECKER_KOGA, 2
msgbox gUnknown_8198787, 6
end
FuchsiaCity_Gym_EventScript_16D643:: @ 816D643
- trainerbattle 0, TRAINER_JUGGLER_SHAWN, 0, Text_1989A1, Text_1989EA
+ trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_JUGGLER_SHAWN, 0, Text_1989A1, Text_1989EA
msgbox gUnknown_8198A10, 6
end
FuchsiaCity_Gym_EventScript_16D65A:: @ 816D65A
- trainerbattle 0, TRAINER_JUGGLER_KAYDEN, 0, Text_198629, Text_1986B4
+ trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_JUGGLER_KAYDEN, 0, Text_198629, Text_1986B4
msgbox gUnknown_81986C9, 6
end
FuchsiaCity_Gym_EventScript_16D671:: @ 816D671
- trainerbattle 0, TRAINER_JUGGLER_NATE, 0, Text_1987E8, Text_198812
+ trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_JUGGLER_NATE, 0, Text_1987E8, Text_198812
msgbox gUnknown_8198825, 6
end