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/Route109/scripts.inc
+12 -12
View File
@@ -376,27 +376,27 @@ Route109_EventScript_1EEA34:: @ 81EEA34
end
Route109_EventScript_1EEA3D:: @ 81EEA3D
trainerbattle_normal TRAINER_DAVID, Route109_Text_297140, Route109_Text_29717D
trainerbattle_single TRAINER_DAVID, Route109_Text_297140, Route109_Text_29717D
msgbox Route109_Text_297191, MSGBOX_AUTOCLOSE
end
Route109_EventScript_1EEA54:: @ 81EEA54
trainerbattle_normal TRAINER_ALICE, Route109_Text_2971D1, Route109_Text_2971FD
trainerbattle_single TRAINER_ALICE, Route109_Text_2971D1, Route109_Text_2971FD
msgbox Route109_Text_29720F, MSGBOX_AUTOCLOSE
end
Route109_EventScript_1EEA6B:: @ 81EEA6B
trainerbattle_normal TRAINER_HUEY, Route109_Text_297235, Route109_Text_29727B
trainerbattle_single TRAINER_HUEY, Route109_Text_297235, Route109_Text_29727B
msgbox Route109_Text_29728C, MSGBOX_AUTOCLOSE
end
Route109_EventScript_1EEA82:: @ 81EEA82
trainerbattle_normal TRAINER_EDMOND, Route109_Text_2972B3, Route109_Text_2972CE
trainerbattle_single TRAINER_EDMOND, Route109_Text_2972B3, Route109_Text_2972CE
msgbox Route109_Text_2972ED, MSGBOX_AUTOCLOSE
end
Route109_EventScript_1EEA99:: @ 81EEA99
trainerbattle_normal TRAINER_RICKY_1, Route109_Text_29733B, Route109_Text_297379, Route109_EventScript_1EEAC5
trainerbattle_single TRAINER_RICKY_1, Route109_Text_29733B, Route109_Text_297379, Route109_EventScript_1EEAC5
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_eq Route109_EventScript_1EEAE4
@@ -418,7 +418,7 @@ Route109_EventScript_1EEAE4:: @ 81EEAE4
end
Route109_EventScript_1EEAFB:: @ 81EEAFB
trainerbattle_normal TRAINER_LOLA_1, Route109_Text_29749C, Route109_Text_2974CF, Route109_EventScript_1EEB27
trainerbattle_single TRAINER_LOLA_1, Route109_Text_29749C, Route109_Text_2974CF, Route109_EventScript_1EEB27
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_eq Route109_EventScript_1EEB46
@@ -440,17 +440,17 @@ Route109_EventScript_1EEB46:: @ 81EEB46
end
Route109_EventScript_1EEB5D:: @ 81EEB5D
trainerbattle_normal TRAINER_AUSTINA, Route109_Text_2975C0, Route109_Text_297601
trainerbattle_single TRAINER_AUSTINA, Route109_Text_2975C0, Route109_Text_297601
msgbox Route109_Text_29762A, MSGBOX_AUTOCLOSE
end
Route109_EventScript_1EEB74:: @ 81EEB74
trainerbattle_normal TRAINER_GWEN, Route109_Text_297667, Route109_Text_297691
trainerbattle_single TRAINER_GWEN, Route109_Text_297667, Route109_Text_297691
msgbox Route109_Text_2976A4, MSGBOX_AUTOCLOSE
end
Route109_EventScript_1EEB8B:: @ 81EEB8B
trainerbattle_normal TRAINER_CARTER, Route109_Text_2976C5, Route109_Text_2976FC
trainerbattle_single TRAINER_CARTER, Route109_Text_2976C5, Route109_Text_2976FC
msgbox Route109_Text_297715, MSGBOX_AUTOCLOSE
end
@@ -465,17 +465,17 @@ Route109_EventScript_1EEBBD:: @ 81EEBBD
end
Route109_EventScript_1EEBD8:: @ 81EEBD8
trainerbattle_normal TRAINER_CHANDLER, Route109_Text_29798A, Route109_Text_2979AE
trainerbattle_single TRAINER_CHANDLER, Route109_Text_29798A, Route109_Text_2979AE
msgbox Route109_Text_2979BF, MSGBOX_AUTOCLOSE
end
Route109_EventScript_1EEBEF:: @ 81EEBEF
trainerbattle_normal TRAINER_HAILEY, Route109_Text_2979EC, Route109_Text_297A15
trainerbattle_single TRAINER_HAILEY, Route109_Text_2979EC, Route109_Text_297A15
msgbox Route109_Text_297A40, MSGBOX_AUTOCLOSE
end
Route109_EventScript_1EEC06:: @ 81EEC06
trainerbattle_normal TRAINER_ELIJAH, Route109_Text_297A82, Route109_Text_297AC7
trainerbattle_single TRAINER_ELIJAH, Route109_Text_297A82, Route109_Text_297AC7
msgbox Route109_Text_297AE5, MSGBOX_AUTOCLOSE
end