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/MtChimney/scripts.inc
+11 -11
View File
@@ -45,7 +45,7 @@ MtChimney_EventScript_22EE0B:: @ 822EE0B
applymovement 2, MtChimney_Movement_27259A
waitmovement 0
msgbox MtChimney_Text_22F32E, MSGBOX_DEFAULT
trainerbattle 3, TRAINER_MAXIE_2, 0, MtChimney_Text_22F5CF
trainerbattle_no_intro TRAINER_MAXIE_2, MtChimney_Text_22F5CF
msgbox MtChimney_Text_22F5F7, MSGBOX_DEFAULT
closemessage
delay 30
@@ -411,12 +411,12 @@ MtChimney_EventScript_22F065:: @ 822F065
end
MtChimney_EventScript_22F06E:: @ 822F06E
trainerbattle 0, TRAINER_TABITHA_2, 0, MtChimney_Text_22F6AA, MtChimney_Text_22F72C
trainerbattle_normal TRAINER_TABITHA_2, MtChimney_Text_22F6AA, MtChimney_Text_22F72C
msgbox MtChimney_Text_22F76D, MSGBOX_AUTOCLOSE
end
MtChimney_EventScript_22F085:: @ 822F085
trainerbattle 0, TRAINER_GRUNT_31, 0, MtChimney_Text_22F7A2, MtChimney_Text_22F83A
trainerbattle_normal TRAINER_GRUNT_31, MtChimney_Text_22F7A2, MtChimney_Text_22F83A
msgbox MtChimney_Text_22F859, MSGBOX_AUTOCLOSE
end
@@ -487,7 +487,7 @@ MtChimney_EventScript_22F141:: @ 822F141
end
MtChimney_EventScript_22F14A:: @ 822F14A
trainerbattle 2, TRAINER_SHELBY_1, 0, MtChimney_Text_23001D, MtChimney_Text_230076, MtChimney_EventScript_22F176
trainerbattle_normal TRAINER_SHELBY_1, MtChimney_Text_23001D, MtChimney_Text_230076, MtChimney_EventScript_22F176
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_eq MtChimney_EventScript_22F195
@@ -504,32 +504,32 @@ MtChimney_EventScript_22F176:: @ 822F176
end
MtChimney_EventScript_22F195:: @ 822F195
trainerbattle 5, TRAINER_SHELBY_1, 0, MtChimney_Text_230153, MtChimney_Text_2301BB
trainerbattle_rematch TRAINER_SHELBY_1, MtChimney_Text_230153, MtChimney_Text_2301BB
msgbox MtChimney_Text_2301E7, MSGBOX_AUTOCLOSE
end
MtChimney_EventScript_22F1AC:: @ 822F1AC
trainerbattle 0, TRAINER_MELISSA, 0, MtChimney_Text_23022A, MtChimney_Text_23026D
trainerbattle_normal TRAINER_MELISSA, MtChimney_Text_23022A, MtChimney_Text_23026D
msgbox MtChimney_Text_230292, MSGBOX_AUTOCLOSE
end
MtChimney_EventScript_22F1C3:: @ 822F1C3
trainerbattle 0, TRAINER_SHEILA, 0, MtChimney_Text_2302BD, MtChimney_Text_230304
trainerbattle_normal TRAINER_SHEILA, MtChimney_Text_2302BD, MtChimney_Text_230304
msgbox MtChimney_Text_23033A, MSGBOX_AUTOCLOSE
end
MtChimney_EventScript_22F1DA:: @ 822F1DA
trainerbattle 0, TRAINER_SHIRLEY, 0, MtChimney_Text_2303DF, MtChimney_Text_230436
trainerbattle_normal TRAINER_SHIRLEY, MtChimney_Text_2303DF, MtChimney_Text_230436
msgbox MtChimney_Text_230463, MSGBOX_AUTOCLOSE
end
MtChimney_EventScript_22F1F1:: @ 822F1F1
trainerbattle 0, TRAINER_GRUNT_24, 0, MtChimney_Text_22F8B6, MtChimney_Text_22F921
trainerbattle_normal TRAINER_GRUNT_24, MtChimney_Text_22F8B6, MtChimney_Text_22F921
msgbox MtChimney_Text_22F93A, MSGBOX_AUTOCLOSE
end
MtChimney_EventScript_22F208:: @ 822F208
trainerbattle 2, TRAINER_SAWYER_1, 0, MtChimney_Text_2304B3, MtChimney_Text_2304F7, MtChimney_EventScript_22F234
trainerbattle_normal TRAINER_SAWYER_1, MtChimney_Text_2304B3, MtChimney_Text_2304F7, MtChimney_EventScript_22F234
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_eq MtChimney_EventScript_22F253
@@ -546,7 +546,7 @@ MtChimney_EventScript_22F234:: @ 822F234
end
MtChimney_EventScript_22F253:: @ 822F253
trainerbattle 5, TRAINER_SAWYER_1, 0, MtChimney_Text_23059C, MtChimney_Text_2305E3
trainerbattle_rematch TRAINER_SAWYER_1, MtChimney_Text_23059C, MtChimney_Text_2305E3
msgbox MtChimney_Text_230614, MSGBOX_AUTOCLOSE
end