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

trainerbattle_normal → trainerbattle_single

Browse Source 
* trainerbattle_normal → trainerbattle_single
* TRAINER_BATTLE_NORMAL → TRAINER_BATTLE_SINGLE
* improves the macro documentation a little
This commit is contained in:
Melody
2018-12-02 13:54:48 -05:00
parent bad5323642
commit 10725def8e
87 changed files with 471 additions and 465 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/Route108/scripts.inc
+6 -6
View File
@@ -2,32 +2,32 @@ Route108_MapScripts:: @ 81EE689
.byte 0
Route108_EventScript_1EE68A:: @ 81EE68A
trainerbattle_normal TRAINER_JEROME, Route108_Text_296D10, Route108_Text_296D3C
trainerbattle_single TRAINER_JEROME, Route108_Text_296D10, Route108_Text_296D3C
msgbox Route108_Text_296D6E, MSGBOX_AUTOCLOSE
end
Route108_EventScript_1EE6A1:: @ 81EE6A1
trainerbattle_normal TRAINER_MATTHEW, Route108_Text_296DAF, Route108_Text_296DEA
trainerbattle_single TRAINER_MATTHEW, Route108_Text_296DAF, Route108_Text_296DEA
msgbox Route108_Text_296E03, MSGBOX_AUTOCLOSE
end
Route108_EventScript_1EE6B8:: @ 81EE6B8
trainerbattle_normal TRAINER_TARA, Route108_Text_296E33, Route108_Text_296E71
trainerbattle_single TRAINER_TARA, Route108_Text_296E33, Route108_Text_296E71
msgbox Route108_Text_296E7A, MSGBOX_AUTOCLOSE
end
Route108_EventScript_1EE6CF:: @ 81EE6CF
trainerbattle_normal TRAINER_MISSY, Route108_Text_296EC7, Route108_Text_296EFC
trainerbattle_single TRAINER_MISSY, Route108_Text_296EC7, Route108_Text_296EFC
msgbox Route108_Text_296F2A, MSGBOX_AUTOCLOSE
end
Route108_EventScript_1EE6E6:: @ 81EE6E6
trainerbattle_normal TRAINER_CAROLINA, Route108_Text_297094, Route108_Text_2970D7
trainerbattle_single TRAINER_CAROLINA, Route108_Text_297094, Route108_Text_2970D7
msgbox Route108_Text_2970F0, MSGBOX_AUTOCLOSE
end
Route108_EventScript_1EE6FD:: @ 81EE6FD
trainerbattle_normal TRAINER_CORY_1, Route108_Text_296F5D, Route108_Text_296F93, Route108_EventScript_1EE729
trainerbattle_single TRAINER_CORY_1, Route108_Text_296F5D, Route108_Text_296F93, Route108_EventScript_1EE729
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_eq Route108_EventScript_1EE748