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

10
data/maps/JaggedPass/scripts.inc
View File

@@ -98,12 +98,12 @@ JaggedPass_EventScript_230766:: @ 8230766
end
JaggedPass_EventScript_230785:: @ 8230785
trainerbattle_normal TRAINER_ERIC, JaggedPass_Text_230888, JaggedPass_Text_2308FF
trainerbattle_single TRAINER_ERIC, JaggedPass_Text_230888, JaggedPass_Text_2308FF
msgbox JaggedPass_Text_230916, MSGBOX_AUTOCLOSE
end
JaggedPass_EventScript_23079C:: @ 823079C
trainerbattle_normal TRAINER_DIANA_1, JaggedPass_Text_230974, JaggedPass_Text_2309B5, JaggedPass_EventScript_2307C8
trainerbattle_single TRAINER_DIANA_1, JaggedPass_Text_230974, JaggedPass_Text_2309B5, JaggedPass_EventScript_2307C8
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_eq JaggedPass_EventScript_2307E4
@@ -124,7 +124,7 @@ JaggedPass_EventScript_2307E4:: @ 82307E4
end
JaggedPass_EventScript_2307FB:: @ 82307FB
trainerbattle_normal TRAINER_ETHAN_1, JaggedPass_Text_230B10, JaggedPass_Text_230B50, JaggedPass_EventScript_230827
trainerbattle_single TRAINER_ETHAN_1, JaggedPass_Text_230B10, JaggedPass_Text_230B50, JaggedPass_EventScript_230827
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_eq JaggedPass_EventScript_230843
@@ -145,12 +145,12 @@ JaggedPass_EventScript_230843:: @ 8230843
end
JaggedPass_EventScript_23085A:: @ 823085A
trainerbattle_normal TRAINER_JULIO, JaggedPass_Text_230DF7, JaggedPass_Text_230E38
trainerbattle_single TRAINER_JULIO, JaggedPass_Text_230DF7, JaggedPass_Text_230E38
msgbox JaggedPass_Text_230E57, MSGBOX_AUTOCLOSE
end
JaggedPass_EventScript_230871:: @ 8230871
trainerbattle_normal TRAINER_AUTUMN, JaggedPass_Text_230E8E, JaggedPass_Text_230ECD
trainerbattle_single TRAINER_AUTUMN, JaggedPass_Text_230E8E, JaggedPass_Text_230ECD
msgbox JaggedPass_Text_230EE3, MSGBOX_AUTOCLOSE
end