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

6
data/maps/MtPyre_6F/scripts.inc
View File

@@ -2,7 +2,7 @@ MtPyre_6F_MapScripts:: @ 8231D3A
.byte 0
MtPyre_6F_EventScript_231D3B:: @ 8231D3B
trainerbattle 2, TRAINER_VALERIE_1, 0, MtPyre_6F_Text_231DB4, MtPyre_6F_Text_231DE2, MtPyre_6F_EventScript_231D67
trainerbattle_normal TRAINER_VALERIE_1, MtPyre_6F_Text_231DB4, MtPyre_6F_Text_231DE2, MtPyre_6F_EventScript_231D67
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_eq MtPyre_6F_EventScript_231D86
@@ -19,12 +19,12 @@ MtPyre_6F_EventScript_231D67:: @ 8231D67
end
MtPyre_6F_EventScript_231D86:: @ 8231D86
trainerbattle 5, TRAINER_VALERIE_1, 0, MtPyre_6F_Text_231EB3, MtPyre_6F_Text_231ECB
trainerbattle_rematch TRAINER_VALERIE_1, MtPyre_6F_Text_231EB3, MtPyre_6F_Text_231ECB
msgbox MtPyre_6F_Text_231EE1, MSGBOX_AUTOCLOSE
end
MtPyre_6F_EventScript_231D9D:: @ 8231D9D
trainerbattle 0, TRAINER_CEDRIC, 0, MtPyre_6F_Text_231F11, MtPyre_6F_Text_231F4A
trainerbattle_normal TRAINER_CEDRIC, MtPyre_6F_Text_231F11, MtPyre_6F_Text_231F4A
msgbox MtPyre_6F_Text_231F5C, MSGBOX_AUTOCLOSE
end