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_2R_MapScripts:: @ 8239E07
.byte 0
MagmaHideout_2F_2R_EventScript_239E08:: @ 8239E08
trainerbattle 0, TRAINER_GRUNT_52, 0, MagmaHideout_2F_2R_Text_239E64, MagmaHideout_2F_2R_Text_239EA5
trainerbattle_normal TRAINER_GRUNT_52, MagmaHideout_2F_2R_Text_239E64, MagmaHideout_2F_2R_Text_239EA5
msgbox MagmaHideout_2F_2R_Text_239EBB, MSGBOX_AUTOCLOSE
end
MagmaHideout_2F_2R_EventScript_239E1F:: @ 8239E1F
trainerbattle 0, TRAINER_GRUNT_43, 0, MagmaHideout_2F_2R_Text_239F31, MagmaHideout_2F_2R_Text_239F71
trainerbattle_normal TRAINER_GRUNT_43, MagmaHideout_2F_2R_Text_239F31, MagmaHideout_2F_2R_Text_239F71
msgbox MagmaHideout_2F_2R_Text_239FA1, MSGBOX_AUTOCLOSE
end
MagmaHideout_2F_2R_EventScript_239E36:: @ 8239E36
trainerbattle 0, TRAINER_GRUNT_44, 0, MagmaHideout_2F_2R_Text_239FDE, MagmaHideout_2F_2R_Text_23A050
trainerbattle_normal TRAINER_GRUNT_44, MagmaHideout_2F_2R_Text_239FDE, MagmaHideout_2F_2R_Text_23A050
msgbox MagmaHideout_2F_2R_Text_23A07D, MSGBOX_AUTOCLOSE
end
MagmaHideout_2F_2R_EventScript_239E4D:: @ 8239E4D
trainerbattle 0, TRAINER_GRUNT_45, 0, MagmaHideout_2F_2R_Text_23A0E4, MagmaHideout_2F_2R_Text_23A14C
trainerbattle_normal TRAINER_GRUNT_45, MagmaHideout_2F_2R_Text_23A0E4, MagmaHideout_2F_2R_Text_23A14C
msgbox MagmaHideout_2F_2R_Text_23A16F, MSGBOX_AUTOCLOSE
end