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

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

@@ -18,27 +18,27 @@ MtPyre_2F_EventScript_23111F:: @ 823111F
end
MtPyre_2F_EventScript_231128:: @ 8231128
trainerbattle 0, TRAINER_MARK, 0, MtPyre_2F_Text_231258, MtPyre_2F_Text_2312A2
trainerbattle_normal TRAINER_MARK, MtPyre_2F_Text_231258, MtPyre_2F_Text_2312A2
msgbox MtPyre_2F_Text_2312CB, MSGBOX_AUTOCLOSE
end
MtPyre_2F_EventScript_23113F:: @ 823113F
trainerbattle 4, TRAINER_DEZ_AND_LUKE, 0, MtPyre_2F_Text_23130F, MtPyre_2F_Text_2313A1, MtPyre_2F_Text_231414
trainerbattle_double TRAINER_DEZ_AND_LUKE, MtPyre_2F_Text_23130F, MtPyre_2F_Text_2313A1, MtPyre_2F_Text_231414
msgbox MtPyre_2F_Text_2313B1, MSGBOX_AUTOCLOSE
end
MtPyre_2F_EventScript_23115A:: @ 823115A
trainerbattle 4, TRAINER_DEZ_AND_LUKE, 0, MtPyre_2F_Text_231492, MtPyre_2F_Text_231534, MtPyre_2F_Text_231582
trainerbattle_double TRAINER_DEZ_AND_LUKE, MtPyre_2F_Text_231492, MtPyre_2F_Text_231534, MtPyre_2F_Text_231582
msgbox MtPyre_2F_Text_23154D, MSGBOX_AUTOCLOSE
end
MtPyre_2F_EventScript_231175:: @ 8231175
trainerbattle 0, TRAINER_LEAH, 0, MtPyre_2F_Text_231604, MtPyre_2F_Text_231645
trainerbattle_normal TRAINER_LEAH, MtPyre_2F_Text_231604, MtPyre_2F_Text_231645
msgbox MtPyre_2F_Text_23165A, MSGBOX_AUTOCLOSE
end
MtPyre_2F_EventScript_23118C:: @ 823118C
trainerbattle 0, TRAINER_ZANDER, 0, MtPyre_2F_Text_2316C7, MtPyre_2F_Text_2316E1
trainerbattle_normal TRAINER_ZANDER, MtPyre_2F_Text_2316C7, MtPyre_2F_Text_2316E1
msgbox MtPyre_2F_Text_2316FB, MSGBOX_AUTOCLOSE
end