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

8
data/maps/MtPyre_3F/scripts.inc
View File

@@ -2,17 +2,17 @@ MtPyre_3F_MapScripts:: @ 8231752
.byte 0
MtPyre_3F_EventScript_231753:: @ 8231753
trainerbattle 0, TRAINER_WILLIAM, 0, MtPyre_3F_Text_2317E3, MtPyre_3F_Text_231853
trainerbattle_normal TRAINER_WILLIAM, MtPyre_3F_Text_2317E3, MtPyre_3F_Text_231853
msgbox MtPyre_3F_Text_231869, MSGBOX_AUTOCLOSE
end
MtPyre_3F_EventScript_23176A:: @ 823176A
trainerbattle 0, TRAINER_KAYLA, 0, MtPyre_3F_Text_2318A1, MtPyre_3F_Text_2318DD
trainerbattle_normal TRAINER_KAYLA, MtPyre_3F_Text_2318A1, MtPyre_3F_Text_2318DD
msgbox MtPyre_3F_Text_2318F2, MSGBOX_AUTOCLOSE
end
MtPyre_3F_EventScript_231781:: @ 8231781
trainerbattle 2, TRAINER_GABRIELLE_1, 0, MtPyre_3F_Text_231952, MtPyre_3F_Text_23196A, MtPyre_3F_EventScript_2317AD
trainerbattle_normal TRAINER_GABRIELLE_1, MtPyre_3F_Text_231952, MtPyre_3F_Text_23196A, MtPyre_3F_EventScript_2317AD
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_eq MtPyre_3F_EventScript_2317CC
@@ -29,7 +29,7 @@ MtPyre_3F_EventScript_2317AD:: @ 82317AD
end
MtPyre_3F_EventScript_2317CC:: @ 82317CC
trainerbattle 5, TRAINER_GABRIELLE_1, 0, MtPyre_3F_Text_231AAB, MtPyre_3F_Text_231AE6
trainerbattle_rematch TRAINER_GABRIELLE_1, MtPyre_3F_Text_231AAB, MtPyre_3F_Text_231AE6
msgbox MtPyre_3F_Text_231B0D, MSGBOX_AUTOCLOSE
end