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/Route110/scripts.inc
+14 -14
View File
@@ -165,17 +165,17 @@ Route110_EventScript_1EF3E8:: @ 81EF3E8
end
Route110_EventScript_1EF3F2:: @ 81EF3F2
trainerbattle_normal TRAINER_EDWARD, Route110_Text_29802B, Route110_Text_298064
trainerbattle_single TRAINER_EDWARD, Route110_Text_29802B, Route110_Text_298064
msgbox Route110_Text_29808A, MSGBOX_AUTOCLOSE
end
Route110_EventScript_1EF409:: @ 81EF409
trainerbattle_normal TRAINER_JACLYN, Route110_Text_2980B9, Route110_Text_2980E5
trainerbattle_single TRAINER_JACLYN, Route110_Text_2980B9, Route110_Text_2980E5
msgbox Route110_Text_2980F8, MSGBOX_AUTOCLOSE
end
Route110_EventScript_1EF420:: @ 81EF420
trainerbattle_normal TRAINER_EDWIN_1, Route110_Text_29815E, Route110_Text_29818F, Route110_EventScript_1EF44C
trainerbattle_single TRAINER_EDWIN_1, Route110_Text_29815E, Route110_Text_29818F, Route110_EventScript_1EF44C
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_eq Route110_EventScript_1EF46B
@@ -197,22 +197,22 @@ Route110_EventScript_1EF46B:: @ 81EF46B
end
Route110_EventScript_1EF482:: @ 81EF482
trainerbattle_normal TRAINER_DALE, Route110_Text_2982CC, Route110_Text_2982F5
trainerbattle_single TRAINER_DALE, Route110_Text_2982CC, Route110_Text_2982F5
msgbox Route110_Text_298303, MSGBOX_AUTOCLOSE
end
Route110_EventScript_1EF499:: @ 81EF499
trainerbattle_normal TRAINER_JACOB, Route110_Text_297B3F, Route110_Text_297B77
trainerbattle_single TRAINER_JACOB, Route110_Text_297B3F, Route110_Text_297B77
msgbox Route110_Text_297B8F, MSGBOX_AUTOCLOSE
end
Route110_EventScript_1EF4B0:: @ 81EF4B0
trainerbattle_normal TRAINER_ANTHONY, Route110_Text_297BE7, Route110_Text_297C0F
trainerbattle_single TRAINER_ANTHONY, Route110_Text_297BE7, Route110_Text_297C0F
msgbox Route110_Text_297C1F, MSGBOX_AUTOCLOSE
end
Route110_EventScript_1EF4C7:: @ 81EF4C7
trainerbattle_normal TRAINER_BENJAMIN_1, Route110_Text_297C63, Route110_Text_297C8A, Route110_EventScript_1EF4F3
trainerbattle_single TRAINER_BENJAMIN_1, Route110_Text_297C63, Route110_Text_297C8A, Route110_EventScript_1EF4F3
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_eq Route110_EventScript_1EF512
@@ -234,12 +234,12 @@ Route110_EventScript_1EF512:: @ 81EF512
end
Route110_EventScript_1EF529:: @ 81EF529
trainerbattle_normal TRAINER_JASMINE, Route110_Text_297F93, Route110_Text_297FD0
trainerbattle_single TRAINER_JASMINE, Route110_Text_297F93, Route110_Text_297FD0
msgbox Route110_Text_297FF1, MSGBOX_AUTOCLOSE
end
Route110_EventScript_1EF540:: @ 81EF540
trainerbattle_normal TRAINER_ABIGAIL_1, Route110_Text_297DFA, Route110_Text_297E69, Route110_EventScript_1EF56C
trainerbattle_single TRAINER_ABIGAIL_1, Route110_Text_297DFA, Route110_Text_297E69, Route110_EventScript_1EF56C
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_eq Route110_EventScript_1EF58B
@@ -261,7 +261,7 @@ Route110_EventScript_1EF58B:: @ 81EF58B
end
Route110_EventScript_1EF5A2:: @ 81EF5A2
trainerbattle_normal TRAINER_ISABEL_1, Route110_Text_298349, Route110_Text_298389, Route110_EventScript_1EF5CE
trainerbattle_single TRAINER_ISABEL_1, Route110_Text_298349, Route110_Text_298389, Route110_EventScript_1EF5CE
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_eq Route110_EventScript_1EF5ED
@@ -283,7 +283,7 @@ Route110_EventScript_1EF5ED:: @ 81EF5ED
end
Route110_EventScript_1EF604:: @ 81EF604
trainerbattle_normal TRAINER_TIMMY, Route110_Text_298525, Route110_Text_298559
trainerbattle_single TRAINER_TIMMY, Route110_Text_298525, Route110_Text_298559
msgbox Route110_Text_298579, MSGBOX_AUTOCLOSE
end
@@ -291,17 +291,17 @@ Route110_EventScript_1EF61B:: @ 81EF61B
end
Route110_EventScript_1EF61C:: @ 81EF61C
trainerbattle_normal TRAINER_KALEB, Route110_Text_2986ED, Route110_Text_298735
trainerbattle_single TRAINER_KALEB, Route110_Text_2986ED, Route110_Text_298735
msgbox Route110_Text_298755, MSGBOX_AUTOCLOSE
end
Route110_EventScript_1EF633:: @ 81EF633
trainerbattle_normal TRAINER_JOSEPH, Route110_Text_298642, Route110_Text_298686
trainerbattle_single TRAINER_JOSEPH, Route110_Text_298642, Route110_Text_298686
msgbox Route110_Text_2986A9, MSGBOX_AUTOCLOSE
end
Route110_EventScript_1EF64A:: @ 81EF64A
trainerbattle_normal TRAINER_ALYSSA, Route110_Text_2985AB, Route110_Text_2985F9
trainerbattle_single TRAINER_ALYSSA, Route110_Text_2985AB, Route110_Text_2985F9
msgbox Route110_Text_298612, MSGBOX_AUTOCLOSE
end