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/RustboroCity_Gym/scripts.inc
+4 -4
View File
@@ -2,7 +2,7 @@ RustboroCity_Gym_MapScripts:: @ 8212F30
.byte 0
RustboroCity_Gym_EventScript_212F31:: @ 8212F31
trainerbattle_normal TRAINER_ROXANNE_1, RustboroCity_Gym_Text_21362A, RustboroCity_Gym_Text_21370B, RustboroCity_Gym_EventScript_212F66, NO_MUSIC
trainerbattle_single TRAINER_ROXANNE_1, RustboroCity_Gym_Text_21362A, RustboroCity_Gym_Text_21370B, RustboroCity_Gym_EventScript_212F66, NO_MUSIC
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_eq RustboroCity_Gym_EventScript_212FC8
@@ -43,17 +43,17 @@ RustboroCity_Gym_EventScript_212FC8:: @ 8212FC8
end
RustboroCity_Gym_EventScript_212FE3:: @ 8212FE3
trainerbattle_normal TRAINER_JOSH, RustboroCity_Gym_Text_2133E9, RustboroCity_Gym_Text_21342D
trainerbattle_single TRAINER_JOSH, RustboroCity_Gym_Text_2133E9, RustboroCity_Gym_Text_21342D
msgbox RustboroCity_Gym_Text_213447, MSGBOX_AUTOCLOSE
end
RustboroCity_Gym_EventScript_212FFA:: @ 8212FFA
trainerbattle_normal TRAINER_TOMMY, RustboroCity_Gym_Text_213486, RustboroCity_Gym_Text_2134C6
trainerbattle_single TRAINER_TOMMY, RustboroCity_Gym_Text_213486, RustboroCity_Gym_Text_2134C6
msgbox RustboroCity_Gym_Text_2134E6, MSGBOX_AUTOCLOSE
end
RustboroCity_Gym_EventScript_213011:: @ 8213011
trainerbattle_normal TRAINER_MARC, RustboroCity_Gym_Text_213533, RustboroCity_Gym_Text_213589
trainerbattle_single TRAINER_MARC, RustboroCity_Gym_Text_213533, RustboroCity_Gym_Text_213589
msgbox RustboroCity_Gym_Text_2135C0, MSGBOX_AUTOCLOSE
end