summaryrefslogtreecommitdiff
path: root/data/maps/ViridianCity_Gym/scripts.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/ViridianCity_Gym/scripts.inc')
-rw-r--r--data/maps/ViridianCity_Gym/scripts.inc18
1 files changed, 9 insertions, 9 deletions
diff --git a/data/maps/ViridianCity_Gym/scripts.inc b/data/maps/ViridianCity_Gym/scripts.inc
index 197a38b74..f3d9bfe10 100644
--- a/data/maps/ViridianCity_Gym/scripts.inc
+++ b/data/maps/ViridianCity_Gym/scripts.inc
@@ -3,7 +3,7 @@ ViridianCity_Gym_MapScripts:: @ 8169EC9
ViridianCity_Gym_EventScript_169ECA:: @ 8169ECA
famechecker FAMECHECKER_GIOVANNI, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
- trainerbattle 1, TRAINER_LEADER_GIOVANNI, 0, Text_18F352, Text_18F43F, EventScript_169F04
+ trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC, TRAINER_LEADER_GIOVANNI, 0, Text_18F352, Text_18F43F, EventScript_169F04
checkflag FLAG_GOT_TM26_FROM_GIOVANNI
goto_if FALSE, EventScript_169F2F
msgbox gUnknown_818F4A2
@@ -42,42 +42,42 @@ EventScript_169F70:: @ 8169F70
end
ViridianCity_Gym_EventScript_169F7A:: @ 8169F7A
- trainerbattle 0, TRAINER_TAMER_JASON, 0, Text_18F7F3, Text_18F824
+ trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TAMER_JASON, 0, Text_18F7F3, Text_18F824
msgbox gUnknown_818F840, 6
end
ViridianCity_Gym_EventScript_169F91:: @ 8169F91
- trainerbattle 0, TRAINER_TAMER_COLE, 0, Text_18F98A, Text_18F9BB
+ trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TAMER_COLE, 0, Text_18F98A, Text_18F9BB
msgbox gUnknown_818F9CC, 6
end
ViridianCity_Gym_EventScript_169FA8:: @ 8169FA8
- trainerbattle 0, TRAINER_BLACK_BELT_ATSUSHI, 0, Text_18F7AD, Text_18F7D6
+ trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BLACK_BELT_ATSUSHI, 0, Text_18F7AD, Text_18F7D6
msgbox gUnknown_818F7DD, 6
end
ViridianCity_Gym_EventScript_169FBF:: @ 8169FBF
- trainerbattle 0, TRAINER_BLACK_BELT_KIYO, 0, Text_18F86C, Text_18F899
+ trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BLACK_BELT_KIYO, 0, Text_18F86C, Text_18F899
msgbox gUnknown_818F8A0, 6
end
ViridianCity_Gym_EventScript_169FD6:: @ 8169FD6
- trainerbattle 0, TRAINER_BLACK_BELT_TAKASHI, 0, Text_18F92C, Text_18F95A
+ trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BLACK_BELT_TAKASHI, 0, Text_18F92C, Text_18F95A
msgbox gUnknown_818F960, 6
end
ViridianCity_Gym_EventScript_169FED:: @ 8169FED
- trainerbattle 0, TRAINER_COOLTRAINER_SAMUEL, 0, Text_18F9E7, Text_18FA2D
+ trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_COOLTRAINER_SAMUEL, 0, Text_18F9E7, Text_18FA2D
msgbox gUnknown_818FA3B, 6
end
ViridianCity_Gym_EventScript_16A004:: @ 816A004
- trainerbattle 0, TRAINER_COOLTRAINER_YUJI, 0, Text_18F73B, Text_18F769
+ trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_COOLTRAINER_YUJI, 0, Text_18F73B, Text_18F769
msgbox gUnknown_818F77B, 6
end
ViridianCity_Gym_EventScript_16A01B:: @ 816A01B
- trainerbattle 0, TRAINER_COOLTRAINER_WARREN, 0, Text_18F8CB, Text_18F8EE
+ trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_COOLTRAINER_WARREN, 0, Text_18F8CB, Text_18F8EE
msgbox gUnknown_818F8FE, 6
end