dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

cleans up trainer battle scripts

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/AquaHideout_B2F/scripts.inc
+4 -4
View File
@@ -24,7 +24,7 @@ AquaHideout_B2F_EventScript_233DE5:: @ 8233DE5
end
AquaHideout_B2F_EventScript_233E09:: @ 8233E09
trainerbattle 2, TRAINER_MATT, 0, AquaHideout_B2F_Text_233EDD, AquaHideout_B2F_Text_233F8D, AquaHideout_B2F_EventScript_233E25
trainerbattle_normal TRAINER_MATT, AquaHideout_B2F_Text_233EDD, AquaHideout_B2F_Text_233F8D, AquaHideout_B2F_EventScript_233E25
msgbox AquaHideout_B2F_Text_233FF2, MSGBOX_DEFAULT
release
end
@@ -67,7 +67,7 @@ AquaHideout_B2F_Movement_233E85: @ 8233E85
step_end
AquaHideout_B2F_EventScript_233E8A:: @ 8233E8A
trainerbattle 2, TRAINER_GRUNT_4, 0, AquaHideout_B2F_Text_2340B4, AquaHideout_B2F_Text_2340F0, AquaHideout_B2F_EventScript_233EA5
trainerbattle_normal TRAINER_GRUNT_4, AquaHideout_B2F_Text_2340B4, AquaHideout_B2F_Text_2340F0, AquaHideout_B2F_EventScript_233EA5
msgbox AquaHideout_B2F_Text_234112, MSGBOX_AUTOCLOSE
end
@@ -77,12 +77,12 @@ AquaHideout_B2F_EventScript_233EA5:: @ 8233EA5
end
AquaHideout_B2F_EventScript_233EAF:: @ 8233EAF
trainerbattle 0, TRAINER_GRUNT_22, 0, AquaHideout_B2F_Text_23412D, AquaHideout_B2F_Text_2341CE
trainerbattle_normal TRAINER_GRUNT_22, AquaHideout_B2F_Text_23412D, AquaHideout_B2F_Text_2341CE
msgbox AquaHideout_B2F_Text_2341FE, MSGBOX_AUTOCLOSE
end
AquaHideout_B2F_EventScript_233EC6:: @ 8233EC6
trainerbattle 0, TRAINER_GRUNT_26, 0, AquaHideout_B2F_Text_23426F, AquaHideout_B2F_Text_2342CC
trainerbattle_normal TRAINER_GRUNT_26, AquaHideout_B2F_Text_23426F, AquaHideout_B2F_Text_2342CC
msgbox AquaHideout_B2F_Text_2342FF, MSGBOX_AUTOCLOSE
end