Assign trainer consts to script cmd args

This commit is contained in:
PikalaxALT
2019-10-18 10:37:48 -04:00
parent 4d8f66774e
commit 9903f7a77a
73 changed files with 805 additions and 804 deletions
+8 -8
View File
@@ -5,7 +5,7 @@ SaffronCity_Gym_EventScript_16EDD8:: @ 816EDD8
setvar VAR_0x8004, 7
setvar VAR_0x8005, 2
special UpdatePickStateFromSpecialVar8005
trainerbattle 1, 420, 0, Text_19B53C, Text_19B602, EventScript_16EE0A
trainerbattle 1, TRAINER_LEADER_SABRINA, 0, Text_19B53C, Text_19B602, EventScript_16EE0A
checkflag FLAG_0x29A
goto_if 0, EventScript_16EE3D
msgbox gUnknown_819B7F2
@@ -45,12 +45,12 @@ EventScript_16EE7E:: @ 816EE7E
end
SaffronCity_Gym_EventScript_16EE88:: @ 816EE88
trainerbattle 0, 280, 0, Text_19B936, Text_19B957
trainerbattle 0, TRAINER_PSYCHIC_JOHAN, 0, Text_19B936, Text_19B957
msgbox gUnknown_819B96D, 6
end
SaffronCity_Gym_EventScript_16EE9F:: @ 816EE9F
trainerbattle 0, 281, 0, Text_19BA45, Text_19BA9E
trainerbattle 0, TRAINER_PSYCHIC_TYRON, 0, Text_19BA45, Text_19BA9E
setvar VAR_0x8004, 7
setvar VAR_0x8005, 5
special SetFlavorTextFlagFromSpecialVars
@@ -58,27 +58,27 @@ SaffronCity_Gym_EventScript_16EE9F:: @ 816EE9F
end
SaffronCity_Gym_EventScript_16EEC3:: @ 816EEC3
trainerbattle 0, 282, 0, Text_19BB49, Text_19BBA1
trainerbattle 0, TRAINER_PSYCHIC_CAMERON, 0, Text_19BB49, Text_19BBA1
msgbox gUnknown_819BBB3, 6
end
SaffronCity_Gym_EventScript_16EEDA:: @ 816EEDA
trainerbattle 0, 283, 0, Text_19BC57, Text_19BCBC
trainerbattle 0, TRAINER_PSYCHIC_PRESTON, 0, Text_19BC57, Text_19BCBC
msgbox gUnknown_819BCC4, 6
end
SaffronCity_Gym_EventScript_16EEF1:: @ 816EEF1
trainerbattle 0, 462, 0, Text_19B86A, Text_19B8A8
trainerbattle 0, TRAINER_CHANNELER_AMANDA, 0, Text_19B86A, Text_19B8A8
msgbox gUnknown_819B8B9, 6
end
SaffronCity_Gym_EventScript_16EF08:: @ 816EF08
trainerbattle 0, 463, 0, Text_19B998, Text_19B9EC
trainerbattle 0, TRAINER_CHANNELER_STACY, 0, Text_19B998, Text_19B9EC
msgbox gUnknown_819B9F7, 6
end
SaffronCity_Gym_EventScript_16EF1F:: @ 816EF1F
trainerbattle 0, 464, 0, Text_19BAE8, Text_19BB0D
trainerbattle 0, TRAINER_CHANNELER_TASHA, 0, Text_19BAE8, Text_19BB0D
msgbox gUnknown_819BB1F, 6
end