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/Route131/scripts.inc
+8 -8
View File
@@ -18,42 +18,42 @@ Route131_EventScript_1F741F:: @ 81F741F
return
Route131_EventScript_1F7429:: @ 81F7429
trainerbattle 0, TRAINER_RICHARD, 0, Route131_Text_2A34C8, Route131_Text_2A350D
trainerbattle_normal TRAINER_RICHARD, Route131_Text_2A34C8, Route131_Text_2A350D
msgbox Route131_Text_2A353D, MSGBOX_AUTOCLOSE
end
Route131_EventScript_1F7440:: @ 81F7440
trainerbattle 0, TRAINER_HERMAN, 0, Route131_Text_2A35C6, Route131_Text_2A3626
trainerbattle_normal TRAINER_HERMAN, Route131_Text_2A35C6, Route131_Text_2A3626
msgbox Route131_Text_2A362D, MSGBOX_AUTOCLOSE
end
Route131_EventScript_1F7457:: @ 81F7457
trainerbattle 0, TRAINER_SUSIE, 0, Route131_Text_2A367B, Route131_Text_2A36AB
trainerbattle_normal TRAINER_SUSIE, Route131_Text_2A367B, Route131_Text_2A36AB
msgbox Route131_Text_2A36D6, MSGBOX_AUTOCLOSE
end
Route131_EventScript_1F746E:: @ 81F746E
trainerbattle 0, TRAINER_KARA, 0, Route131_Text_2A3751, Route131_Text_2A378A
trainerbattle_normal TRAINER_KARA, Route131_Text_2A3751, Route131_Text_2A378A
msgbox Route131_Text_2A379F, MSGBOX_AUTOCLOSE
end
Route131_EventScript_1F7485:: @ 81F7485
trainerbattle 4, TRAINER_RELI_AND_IAN, 0, Route131_Text_2A37E9, Route131_Text_2A381F, Route131_Text_2A38B7
trainerbattle_double TRAINER_RELI_AND_IAN, Route131_Text_2A37E9, Route131_Text_2A381F, Route131_Text_2A38B7
msgbox Route131_Text_2A3855, MSGBOX_AUTOCLOSE
end
Route131_EventScript_1F74A0:: @ 81F74A0
trainerbattle 4, TRAINER_RELI_AND_IAN, 0, Route131_Text_2A38F8, Route131_Text_2A3925, Route131_Text_2A39CD
trainerbattle_double TRAINER_RELI_AND_IAN, Route131_Text_2A38F8, Route131_Text_2A3925, Route131_Text_2A39CD
msgbox Route131_Text_2A3960, MSGBOX_AUTOCLOSE
end
Route131_EventScript_1F74BB:: @ 81F74BB
trainerbattle 0, TRAINER_TALIA, 0, Route131_Text_2A39FE, Route131_Text_2A3A38
trainerbattle_normal TRAINER_TALIA, Route131_Text_2A39FE, Route131_Text_2A3A38
msgbox Route131_Text_2A3A48, MSGBOX_AUTOCLOSE
end
Route131_EventScript_1F74D2:: @ 81F74D2
trainerbattle 0, TRAINER_KEVIN, 0, Route131_Text_2A3AA0, Route131_Text_2A3AFC
trainerbattle_normal TRAINER_KEVIN, Route131_Text_2A3AA0, Route131_Text_2A3AFC
msgbox Route131_Text_2A3B02, MSGBOX_AUTOCLOSE
end