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
+4 -4
View File
@@ -2,22 +2,22 @@ MagmaHideout_2F_1R_MapScripts:: @ 8239B50
.byte 0
MagmaHideout_2F_1R_EventScript_239B51:: @ 8239B51
trainerbattle 0, TRAINER_GRUNT_51, 0, MagmaHideout_2F_1R_Text_239BAD, MagmaHideout_2F_1R_Text_239C4B
trainerbattle_normal TRAINER_GRUNT_51, MagmaHideout_2F_1R_Text_239BAD, MagmaHideout_2F_1R_Text_239C4B
msgbox MagmaHideout_2F_1R_Text_239C74, MSGBOX_AUTOCLOSE
end
MagmaHideout_2F_1R_EventScript_239B68:: @ 8239B68
trainerbattle 0, TRAINER_GRUNT_40, 0, MagmaHideout_2F_1R_Text_239CAB, MagmaHideout_2F_1R_Text_239D09
trainerbattle_normal TRAINER_GRUNT_40, MagmaHideout_2F_1R_Text_239CAB, MagmaHideout_2F_1R_Text_239D09
msgbox MagmaHideout_2F_1R_Text_239D1D, MSGBOX_AUTOCLOSE
end
MagmaHideout_2F_1R_EventScript_239B7F:: @ 8239B7F
trainerbattle 0, TRAINER_GRUNT_41, 0, MagmaHideout_2F_1R_Text_239D62, MagmaHideout_2F_1R_Text_239D75
trainerbattle_normal TRAINER_GRUNT_41, MagmaHideout_2F_1R_Text_239D62, MagmaHideout_2F_1R_Text_239D75
msgbox MagmaHideout_2F_1R_Text_239D7D, MSGBOX_AUTOCLOSE
end
MagmaHideout_2F_1R_EventScript_239B96:: @ 8239B96
trainerbattle 0, TRAINER_GRUNT_42, 0, MagmaHideout_2F_1R_Text_239DC5, MagmaHideout_2F_1R_Text_239DDA
trainerbattle_normal TRAINER_GRUNT_42, MagmaHideout_2F_1R_Text_239DC5, MagmaHideout_2F_1R_Text_239DDA
msgbox MagmaHideout_2F_1R_Text_239DE2, MSGBOX_AUTOCLOSE
end