cleans up trainer battle scripts

* adds battle type macros
* adds `trainerbattle_normal` macro
* adds `trainerbattle_double` macro
* adds rematch macros
* adds no intro macro
This commit is contained in:
Melody
2018-12-02 07:17:54 -05:00
parent 2912ec0e37
commit bad5323642
104 changed files with 723 additions and 687 deletions
+5 -5
View File
@@ -2,27 +2,27 @@ VictoryRoad_B1F_MapScripts:: @ 82364E4
.byte 0
VictoryRoad_B1F_EventScript_2364E5:: @ 82364E5
trainerbattle 0, TRAINER_SAMUEL, 0, VictoryRoad_B1F_Text_236558, VictoryRoad_B1F_Text_2365AD
trainerbattle_normal TRAINER_SAMUEL, VictoryRoad_B1F_Text_236558, VictoryRoad_B1F_Text_2365AD
msgbox VictoryRoad_B1F_Text_2365C4, MSGBOX_AUTOCLOSE
end
VictoryRoad_B1F_EventScript_2364FC:: @ 82364FC
trainerbattle 0, TRAINER_SHANNON, 0, VictoryRoad_B1F_Text_2365FD, VictoryRoad_B1F_Text_23664D
trainerbattle_normal TRAINER_SHANNON, VictoryRoad_B1F_Text_2365FD, VictoryRoad_B1F_Text_23664D
msgbox VictoryRoad_B1F_Text_236678, MSGBOX_AUTOCLOSE
end
VictoryRoad_B1F_EventScript_236513:: @ 8236513
trainerbattle 0, TRAINER_MICHELLE, 0, VictoryRoad_B1F_Text_2366C2, VictoryRoad_B1F_Text_23670B
trainerbattle_normal TRAINER_MICHELLE, VictoryRoad_B1F_Text_2366C2, VictoryRoad_B1F_Text_23670B
msgbox VictoryRoad_B1F_Text_23671B, MSGBOX_AUTOCLOSE
end
VictoryRoad_B1F_EventScript_23652A:: @ 823652A
trainerbattle 0, TRAINER_MITCHELL, 0, VictoryRoad_B1F_Text_236757, VictoryRoad_B1F_Text_236780
trainerbattle_normal TRAINER_MITCHELL, VictoryRoad_B1F_Text_236757, VictoryRoad_B1F_Text_236780
msgbox VictoryRoad_B1F_Text_2367A7, MSGBOX_AUTOCLOSE
end
VictoryRoad_B1F_EventScript_236541:: @ 8236541
trainerbattle 0, TRAINER_HALLE, 0, VictoryRoad_B1F_Text_2367FD, VictoryRoad_B1F_Text_23683B
trainerbattle_normal TRAINER_HALLE, VictoryRoad_B1F_Text_2367FD, VictoryRoad_B1F_Text_23683B
msgbox VictoryRoad_B1F_Text_23684C, MSGBOX_AUTOCLOSE
end