dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

cleans up trainer battle scripts

Browse Source 
* adds battle type macros
* adds `trainerbattle_normal` macro
* adds `trainerbattle_double` macro
* adds rematch macros
* adds no intro macro
This commit is contained in:
Melody
2018-12-02 07:17:54 -05:00
parent 2912ec0e37
commit bad5323642
104 changed files with 723 additions and 687 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/PetalburgCity_Gym/scripts.inc
+9 -9
View File
@@ -379,7 +379,7 @@ PetalburgCity_Gym_EventScript_204DAC:: @ 8204DAC
end
PetalburgCity_Gym_EventScript_204DB3:: @ 8204DB3
trainerbattle 7, TRAINER_NORMAN_1, 0, PetalburgCity_Gym_Text_2074A2, PetalburgCity_Gym_Text_2075CE, PetalburgCity_Gym_Text_20764A
trainerbattle_rematch_double TRAINER_NORMAN_1, PetalburgCity_Gym_Text_2074A2, PetalburgCity_Gym_Text_2075CE, PetalburgCity_Gym_Text_20764A
msgbox PetalburgCity_Gym_Text_2075F7, MSGBOX_AUTOCLOSE
end
@@ -413,7 +413,7 @@ PetalburgCity_Gym_EventScript_204E1D:: @ 8204E1D
PetalburgCity_Gym_EventScript_204E3B:: @ 8204E3B
msgbox PetalburgCity_Gym_Text_205FE5, MSGBOX_DEFAULT
trainerbattle 3, TRAINER_NORMAN_1, 0, PetalburgCity_Gym_Text_206107
trainerbattle_no_intro TRAINER_NORMAN_1, PetalburgCity_Gym_Text_206107
message PetalburgCity_Gym_Text_206162
waitmessage
call PetalburgCity_Gym_EventScript_27207E
@@ -958,7 +958,7 @@ PetalburgCity_Gym_EventScript_205387:: @ 8205387
end
PetalburgCity_Gym_EventScript_2053BA:: @ 82053BA
trainerbattle 2, TRAINER_RANDALL, 0, PetalburgCity_Gym_Text_20674F, PetalburgCity_Gym_Text_2067B9, PetalburgCity_Gym_EventScript_2053DE
trainerbattle_normal TRAINER_RANDALL, PetalburgCity_Gym_Text_20674F, PetalburgCity_Gym_Text_2067B9, PetalburgCity_Gym_EventScript_2053DE
checkflag FLAG_0x4F4
goto_eq PetalburgCity_Gym_EventScript_2053ED
msgbox PetalburgCity_Gym_Text_2067D8, MSGBOX_AUTOCLOSE
@@ -976,7 +976,7 @@ PetalburgCity_Gym_EventScript_2053ED:: @ 82053ED
end
PetalburgCity_Gym_EventScript_2053F6:: @ 82053F6
trainerbattle 2, TRAINER_PARKER, 0, PetalburgCity_Gym_Text_2068FD, PetalburgCity_Gym_Text_20694F, PetalburgCity_Gym_EventScript_20541A
trainerbattle_normal TRAINER_PARKER, PetalburgCity_Gym_Text_2068FD, PetalburgCity_Gym_Text_20694F, PetalburgCity_Gym_EventScript_20541A
checkflag FLAG_0x4F4
goto_eq PetalburgCity_Gym_EventScript_205429
msgbox PetalburgCity_Gym_Text_206996, MSGBOX_AUTOCLOSE
@@ -994,7 +994,7 @@ PetalburgCity_Gym_EventScript_205429:: @ 8205429
end
PetalburgCity_Gym_EventScript_205432:: @ 8205432
trainerbattle 2, TRAINER_GEORGE, 0, PetalburgCity_Gym_Text_206A1B, PetalburgCity_Gym_Text_206AB8, PetalburgCity_Gym_EventScript_205456
trainerbattle_normal TRAINER_GEORGE, PetalburgCity_Gym_Text_206A1B, PetalburgCity_Gym_Text_206AB8, PetalburgCity_Gym_EventScript_205456
checkflag FLAG_0x4F4
goto_eq PetalburgCity_Gym_EventScript_205465
msgbox PetalburgCity_Gym_Text_206AE9, MSGBOX_AUTOCLOSE
@@ -1012,7 +1012,7 @@ PetalburgCity_Gym_EventScript_205465:: @ 8205465
end
PetalburgCity_Gym_EventScript_20546E:: @ 820546E
trainerbattle 2, TRAINER_BERKE, 0, PetalburgCity_Gym_Text_206BF4, PetalburgCity_Gym_Text_206C7D, PetalburgCity_Gym_EventScript_205492
trainerbattle_normal TRAINER_BERKE, PetalburgCity_Gym_Text_206BF4, PetalburgCity_Gym_Text_206C7D, PetalburgCity_Gym_EventScript_205492
checkflag FLAG_0x4F4
goto_eq PetalburgCity_Gym_EventScript_2054A1
msgbox PetalburgCity_Gym_Text_206C9F, MSGBOX_AUTOCLOSE
@@ -1030,7 +1030,7 @@ PetalburgCity_Gym_EventScript_2054A1:: @ 82054A1
end
PetalburgCity_Gym_EventScript_2054AA:: @ 82054AA
trainerbattle 2, TRAINER_MARY, 0, PetalburgCity_Gym_Text_206DB2, PetalburgCity_Gym_Text_206E0D, PetalburgCity_Gym_EventScript_2054CE
trainerbattle_normal TRAINER_MARY, PetalburgCity_Gym_Text_206DB2, PetalburgCity_Gym_Text_206E0D, PetalburgCity_Gym_EventScript_2054CE
checkflag FLAG_0x4F4
goto_eq PetalburgCity_Gym_EventScript_2054DD
msgbox PetalburgCity_Gym_Text_206E26, MSGBOX_AUTOCLOSE
@@ -1048,7 +1048,7 @@ PetalburgCity_Gym_EventScript_2054DD:: @ 82054DD
end
PetalburgCity_Gym_EventScript_2054E6:: @ 82054E6
trainerbattle 2, TRAINER_ALEXIA, 0, PetalburgCity_Gym_Text_206F44, PetalburgCity_Gym_Text_206F82, PetalburgCity_Gym_EventScript_20550A
trainerbattle_normal TRAINER_ALEXIA, PetalburgCity_Gym_Text_206F44, PetalburgCity_Gym_Text_206F82, PetalburgCity_Gym_EventScript_20550A
checkflag FLAG_0x4F4
goto_eq PetalburgCity_Gym_EventScript_205519
msgbox PetalburgCity_Gym_Text_206F9F, MSGBOX_AUTOCLOSE
@@ -1066,7 +1066,7 @@ PetalburgCity_Gym_EventScript_205519:: @ 8205519
end
PetalburgCity_Gym_EventScript_205522:: @ 8205522
trainerbattle 2, TRAINER_JODY, 0, PetalburgCity_Gym_Text_207088, PetalburgCity_Gym_Text_2070E6, PetalburgCity_Gym_EventScript_205546
trainerbattle_normal TRAINER_JODY, PetalburgCity_Gym_Text_207088, PetalburgCity_Gym_Text_2070E6, PetalburgCity_Gym_EventScript_205546
checkflag FLAG_0x4F4
goto_eq PetalburgCity_Gym_EventScript_205555
msgbox PetalburgCity_Gym_Text_2070FB, MSGBOX_AUTOCLOSE