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/FortreeCity_Gym/scripts.inc
+7 -7
View File
@@ -16,7 +16,7 @@ FortreeCity_Gym_EventScript_2165C4:: @ 82165C4
end
FortreeCity_Gym_EventScript_2165C8:: @ 82165C8
trainerbattle_normal TRAINER_WINONA_1, FortreeCity_Gym_Text_216D75, FortreeCity_Gym_Text_216E60, FortreeCity_Gym_EventScript_2165FD, NO_MUSIC
trainerbattle_single TRAINER_WINONA_1, FortreeCity_Gym_Text_216D75, FortreeCity_Gym_Text_216E60, FortreeCity_Gym_EventScript_2165FD, NO_MUSIC
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_eq FortreeCity_Gym_EventScript_21668D
@@ -72,32 +72,32 @@ FortreeCity_Gym_EventScript_21668D:: @ 821668D
end
FortreeCity_Gym_EventScript_2166A8:: @ 82166A8
trainerbattle_normal TRAINER_JARED, FortreeCity_Gym_Text_2168A2, FortreeCity_Gym_Text_2168D3
trainerbattle_single TRAINER_JARED, FortreeCity_Gym_Text_2168A2, FortreeCity_Gym_Text_2168D3
msgbox FortreeCity_Gym_Text_2168E7, MSGBOX_AUTOCLOSE
end
FortreeCity_Gym_EventScript_2166BF:: @ 82166BF
trainerbattle_normal TRAINER_EDWARDO, FortreeCity_Gym_Text_21695A, FortreeCity_Gym_Text_2169C7
trainerbattle_single TRAINER_EDWARDO, FortreeCity_Gym_Text_21695A, FortreeCity_Gym_Text_2169C7
msgbox FortreeCity_Gym_Text_2169F1, MSGBOX_AUTOCLOSE
end
FortreeCity_Gym_EventScript_2166D6:: @ 82166D6
trainerbattle_normal TRAINER_FLINT, FortreeCity_Gym_Text_216A66, FortreeCity_Gym_Text_216AC4
trainerbattle_single TRAINER_FLINT, FortreeCity_Gym_Text_216A66, FortreeCity_Gym_Text_216AC4
msgbox FortreeCity_Gym_Text_216AD7, MSGBOX_AUTOCLOSE
end
FortreeCity_Gym_EventScript_2166ED:: @ 82166ED
trainerbattle_normal TRAINER_ASHLEY, FortreeCity_Gym_Text_216B1A, FortreeCity_Gym_Text_216B51
trainerbattle_single TRAINER_ASHLEY, FortreeCity_Gym_Text_216B1A, FortreeCity_Gym_Text_216B51
msgbox FortreeCity_Gym_Text_216B5F, MSGBOX_AUTOCLOSE
end
FortreeCity_Gym_EventScript_216704:: @ 8216704
trainerbattle_normal TRAINER_HUMBERTO, FortreeCity_Gym_Text_216B9E, FortreeCity_Gym_Text_216C18
trainerbattle_single TRAINER_HUMBERTO, FortreeCity_Gym_Text_216B9E, FortreeCity_Gym_Text_216C18
msgbox FortreeCity_Gym_Text_216C32, MSGBOX_AUTOCLOSE
end
FortreeCity_Gym_EventScript_21671B:: @ 821671B
trainerbattle_normal TRAINER_DARIUS, FortreeCity_Gym_Text_216C96, FortreeCity_Gym_Text_216CF2
trainerbattle_single TRAINER_DARIUS, FortreeCity_Gym_Text_216C96, FortreeCity_Gym_Text_216CF2
msgbox FortreeCity_Gym_Text_216D0F, MSGBOX_AUTOCLOSE
end