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

14
data/maps/Route103/scripts.inc
View File

@@ -203,7 +203,7 @@ Route103_EventScript_1EC5EB:: @ 81EC5EB
end
Route103_EventScript_1EC5F4:: @ 81EC5F4
trainerbattle_normal TRAINER_DAISY, Route103_Text_29495A, Route103_Text_29498F
trainerbattle_single TRAINER_DAISY, Route103_Text_29495A, Route103_Text_29498F
msgbox Route103_Text_2949B4, MSGBOX_AUTOCLOSE
end
@@ -246,12 +246,12 @@ Route103_EventScript_1EC6B6:: @ 81EC6B6
end
Route103_EventScript_1EC6D1:: @ 81EC6D1
trainerbattle_normal TRAINER_ANDREW, Route103_Text_294E34, Route103_Text_294E92
trainerbattle_single TRAINER_ANDREW, Route103_Text_294E34, Route103_Text_294E92
msgbox Route103_Text_294EBB, MSGBOX_AUTOCLOSE
end
Route103_EventScript_1EC6E8:: @ 81EC6E8
trainerbattle_normal TRAINER_MIGUEL_1, Route103_Text_294EDF, Route103_Text_294F21, Route103_EventScript_1EC714
trainerbattle_single TRAINER_MIGUEL_1, Route103_Text_294EDF, Route103_Text_294F21, Route103_EventScript_1EC714
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_eq Route103_EventScript_1EC733
@@ -273,22 +273,22 @@ Route103_EventScript_1EC733:: @ 81EC733
end
Route103_EventScript_1EC74A:: @ 81EC74A
trainerbattle_normal TRAINER_MARCOS, Route103_Text_295206, Route103_Text_29522B
trainerbattle_single TRAINER_MARCOS, Route103_Text_295206, Route103_Text_29522B
msgbox Route103_Text_295246, MSGBOX_AUTOCLOSE
end
Route103_EventScript_1EC761:: @ 81EC761
trainerbattle_normal TRAINER_RHETT, Route103_Text_295199, Route103_Text_2951C6
trainerbattle_single TRAINER_RHETT, Route103_Text_295199, Route103_Text_2951C6
msgbox Route103_Text_2951DE, MSGBOX_AUTOCLOSE
end
Route103_EventScript_1EC778:: @ 81EC778
trainerbattle_normal TRAINER_PETE, Route103_Text_295063, Route103_Text_295093
trainerbattle_single TRAINER_PETE, Route103_Text_295063, Route103_Text_295093
msgbox Route103_Text_2950AA, MSGBOX_AUTOCLOSE
end
Route103_EventScript_1EC78F:: @ 81EC78F
trainerbattle_normal TRAINER_ISABELLE, Route103_Text_295116, Route103_Text_295146
trainerbattle_single TRAINER_ISABELLE, Route103_Text_295116, Route103_Text_295146
msgbox Route103_Text_29514D, MSGBOX_AUTOCLOSE
end