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/Route125/scripts.inc
+7 -7
View File
@@ -27,27 +27,27 @@ Route125_MapScript2_1F679A: @ 81F679A
.2byte 0
Route125_EventScript_1F67A4:: @ 81F67A4
trainerbattle_normal TRAINER_NOLEN, Route125_Text_2A1527, Route125_Text_2A155A
trainerbattle_single TRAINER_NOLEN, Route125_Text_2A1527, Route125_Text_2A155A
msgbox Route125_Text_2A1567, MSGBOX_AUTOCLOSE
end
Route125_EventScript_1F67BB:: @ 81F67BB
trainerbattle_normal TRAINER_STAN, Route125_Text_2A159F, Route125_Text_2A15C7
trainerbattle_single TRAINER_STAN, Route125_Text_2A159F, Route125_Text_2A15C7
msgbox Route125_Text_2A15D5, MSGBOX_AUTOCLOSE
end
Route125_EventScript_1F67D2:: @ 81F67D2
trainerbattle_normal TRAINER_TANYA, Route125_Text_2A1615, Route125_Text_2A164D
trainerbattle_single TRAINER_TANYA, Route125_Text_2A1615, Route125_Text_2A164D
msgbox Route125_Text_2A165E, MSGBOX_AUTOCLOSE
end
Route125_EventScript_1F67E9:: @ 81F67E9
trainerbattle_normal TRAINER_SHARON, Route125_Text_2A1686, Route125_Text_2A16C5
trainerbattle_single TRAINER_SHARON, Route125_Text_2A1686, Route125_Text_2A16C5
msgbox Route125_Text_2A16CE, MSGBOX_AUTOCLOSE
end
Route125_EventScript_1F6800:: @ 81F6800
trainerbattle_normal TRAINER_ERNEST_1, Route125_Text_2A16FC, Route125_Text_2A173A, Route125_EventScript_1F682C
trainerbattle_single TRAINER_ERNEST_1, Route125_Text_2A16FC, Route125_Text_2A173A, Route125_EventScript_1F682C
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_eq Route125_EventScript_1F684B
@@ -79,12 +79,12 @@ Route125_EventScript_1F687D:: @ 81F687D
end
Route125_EventScript_1F6898:: @ 81F6898
trainerbattle_normal TRAINER_PRESLEY, Route125_Text_2A1B1A, Route125_Text_2A1B4E
trainerbattle_single TRAINER_PRESLEY, Route125_Text_2A1B1A, Route125_Text_2A1B4E
msgbox Route125_Text_2A1B70, MSGBOX_AUTOCLOSE
end
Route125_EventScript_1F68AF:: @ 81F68AF
trainerbattle_normal TRAINER_AURON, Route125_Text_2A1BCE, Route125_Text_2A1BFD
trainerbattle_single TRAINER_AURON, Route125_Text_2A1BCE, Route125_Text_2A1BFD
msgbox Route125_Text_2A1C2A, MSGBOX_AUTOCLOSE
end