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

24
data/maps/MossdeepCity_Gym/scripts.inc
View File

@@ -211,62 +211,62 @@ MossdeepCity_Gym_EventScript_220AF1:: @ 8220AF1
end
MossdeepCity_Gym_EventScript_220AFD:: @ 8220AFD
trainerbattle_normal TRAINER_PRESTON, MossdeepCity_Gym_Text_220E5C, MossdeepCity_Gym_Text_220EAC
trainerbattle_single TRAINER_PRESTON, MossdeepCity_Gym_Text_220E5C, MossdeepCity_Gym_Text_220EAC
msgbox MossdeepCity_Gym_Text_220ED3, MSGBOX_AUTOCLOSE
end
MossdeepCity_Gym_EventScript_220B14:: @ 8220B14
trainerbattle_normal TRAINER_VIRGIL, MossdeepCity_Gym_Text_220F02, MossdeepCity_Gym_Text_220F1A
trainerbattle_single TRAINER_VIRGIL, MossdeepCity_Gym_Text_220F02, MossdeepCity_Gym_Text_220F1A
msgbox MossdeepCity_Gym_Text_220F3A, MSGBOX_AUTOCLOSE
end
MossdeepCity_Gym_EventScript_220B2B:: @ 8220B2B
trainerbattle_normal TRAINER_BLAKE, MossdeepCity_Gym_Text_220FB0, MossdeepCity_Gym_Text_221024
trainerbattle_single TRAINER_BLAKE, MossdeepCity_Gym_Text_220FB0, MossdeepCity_Gym_Text_221024
msgbox MossdeepCity_Gym_Text_221055, MSGBOX_AUTOCLOSE
end
MossdeepCity_Gym_EventScript_220B42:: @ 8220B42
trainerbattle_normal TRAINER_HANNAH, MossdeepCity_Gym_Text_2210EE, MossdeepCity_Gym_Text_221152
trainerbattle_single TRAINER_HANNAH, MossdeepCity_Gym_Text_2210EE, MossdeepCity_Gym_Text_221152
msgbox MossdeepCity_Gym_Text_22116A, MSGBOX_AUTOCLOSE
end
MossdeepCity_Gym_EventScript_220B59:: @ 8220B59
trainerbattle_normal TRAINER_SAMANTHA, MossdeepCity_Gym_Text_2211E2, MossdeepCity_Gym_Text_221230
trainerbattle_single TRAINER_SAMANTHA, MossdeepCity_Gym_Text_2211E2, MossdeepCity_Gym_Text_221230
msgbox MossdeepCity_Gym_Text_22123D, MSGBOX_AUTOCLOSE
end
MossdeepCity_Gym_EventScript_220B70:: @ 8220B70
trainerbattle_normal TRAINER_MAURA, MossdeepCity_Gym_Text_2212A6, MossdeepCity_Gym_Text_221309
trainerbattle_single TRAINER_MAURA, MossdeepCity_Gym_Text_2212A6, MossdeepCity_Gym_Text_221309
msgbox MossdeepCity_Gym_Text_22132E, MSGBOX_AUTOCLOSE
end
MossdeepCity_Gym_EventScript_220B87:: @ 8220B87
trainerbattle_normal TRAINER_SYLVIA, MossdeepCity_Gym_Text_2213C2, MossdeepCity_Gym_Text_2213F4
trainerbattle_single TRAINER_SYLVIA, MossdeepCity_Gym_Text_2213C2, MossdeepCity_Gym_Text_2213F4
msgbox MossdeepCity_Gym_Text_221412, MSGBOX_AUTOCLOSE
end
MossdeepCity_Gym_EventScript_220B9E:: @ 8220B9E
trainerbattle_normal TRAINER_NATE, MossdeepCity_Gym_Text_221460, MossdeepCity_Gym_Text_2214A7
trainerbattle_single TRAINER_NATE, MossdeepCity_Gym_Text_221460, MossdeepCity_Gym_Text_2214A7
msgbox MossdeepCity_Gym_Text_2214D3, MSGBOX_AUTOCLOSE
end
MossdeepCity_Gym_EventScript_220BB5:: @ 8220BB5
trainerbattle_normal TRAINER_MACEY, MossdeepCity_Gym_Text_22161B, MossdeepCity_Gym_Text_221658
trainerbattle_single TRAINER_MACEY, MossdeepCity_Gym_Text_22161B, MossdeepCity_Gym_Text_221658
msgbox MossdeepCity_Gym_Text_221680, MSGBOX_AUTOCLOSE
end
MossdeepCity_Gym_EventScript_220BCC:: @ 8220BCC
trainerbattle_normal TRAINER_CLIFFORD, MossdeepCity_Gym_Text_22157C, MossdeepCity_Gym_Text_2215B8
trainerbattle_single TRAINER_CLIFFORD, MossdeepCity_Gym_Text_22157C, MossdeepCity_Gym_Text_2215B8
msgbox MossdeepCity_Gym_Text_2215E2, MSGBOX_AUTOCLOSE
end
MossdeepCity_Gym_EventScript_220BE3:: @ 8220BE3
trainerbattle_normal TRAINER_NICHOLAS, MossdeepCity_Gym_Text_2216EE, MossdeepCity_Gym_Text_22172D
trainerbattle_single TRAINER_NICHOLAS, MossdeepCity_Gym_Text_2216EE, MossdeepCity_Gym_Text_22172D
msgbox MossdeepCity_Gym_Text_22173A, MSGBOX_AUTOCLOSE
end
MossdeepCity_Gym_EventScript_220BFA:: @ 8220BFA
trainerbattle_normal TRAINER_KATHLEEN, MossdeepCity_Gym_Text_221507, MossdeepCity_Gym_Text_22153B
trainerbattle_single TRAINER_KATHLEEN, MossdeepCity_Gym_Text_221507, MossdeepCity_Gym_Text_22153B
msgbox MossdeepCity_Gym_Text_221545, MSGBOX_AUTOCLOSE
end