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/Route113/scripts.inc
+13 -13
View File
@@ -49,17 +49,17 @@ Route113_EventScript_1F21B7:: @ 81F21B7
end
Route113_EventScript_1F21C0:: @ 81F21C0
trainerbattle 0, TRAINER_JAYLEN, 0, Route113_Text_299D3C, Route113_Text_299D68
trainerbattle_normal TRAINER_JAYLEN, Route113_Text_299D3C, Route113_Text_299D68
msgbox Route113_Text_299D7D, MSGBOX_AUTOCLOSE
end
Route113_EventScript_1F21D7:: @ 81F21D7
trainerbattle 0, TRAINER_DILLON, 0, Route113_Text_299DE3, Route113_Text_299E1C
trainerbattle_normal TRAINER_DILLON, Route113_Text_299DE3, Route113_Text_299E1C
msgbox Route113_Text_299E38, MSGBOX_AUTOCLOSE
end
Route113_EventScript_1F21EE:: @ 81F21EE
trainerbattle 2, TRAINER_MADELINE_1, 0, Route113_Text_299EA6, Route113_Text_299EF9, Route113_EventScript_1F221A
trainerbattle_normal TRAINER_MADELINE_1, Route113_Text_299EA6, Route113_Text_299EF9, Route113_EventScript_1F221A
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_eq Route113_EventScript_1F2239
@@ -76,12 +76,12 @@ Route113_EventScript_1F221A:: @ 81F221A
end
Route113_EventScript_1F2239:: @ 81F2239
trainerbattle 5, TRAINER_MADELINE_1, 0, Route113_Text_299F8A, Route113_Text_299FC9
trainerbattle_rematch TRAINER_MADELINE_1, Route113_Text_299F8A, Route113_Text_299FC9
msgbox Route113_Text_299FD8, MSGBOX_AUTOCLOSE
end
Route113_EventScript_1F2250:: @ 81F2250
trainerbattle 2, TRAINER_LAO_1, 0, Route113_Text_29A015, Route113_Text_29A04C, Route113_EventScript_1F227C
trainerbattle_normal TRAINER_LAO_1, Route113_Text_29A015, Route113_Text_29A04C, Route113_EventScript_1F227C
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_eq Route113_EventScript_1F229B
@@ -98,42 +98,42 @@ Route113_EventScript_1F227C:: @ 81F227C
end
Route113_EventScript_1F229B:: @ 81F229B
trainerbattle 5, TRAINER_LAO_1, 0, Route113_Text_29A0E8, Route113_Text_29A11F
trainerbattle_rematch TRAINER_LAO_1, Route113_Text_29A0E8, Route113_Text_29A11F
msgbox Route113_Text_29A13A, MSGBOX_AUTOCLOSE
end
Route113_EventScript_1F22B2:: @ 81F22B2
trainerbattle 0, TRAINER_LUNG, 0, Route113_Text_29A192, Route113_Text_29A1C6
trainerbattle_normal TRAINER_LUNG, Route113_Text_29A192, Route113_Text_29A1C6
msgbox Route113_Text_29A219, MSGBOX_AUTOCLOSE
end
Route113_EventScript_1F22C9:: @ 81F22C9
trainerbattle 4, TRAINER_TORI_AND_TIA, 0, Route113_Text_29A261, Route113_Text_29A29D, Route113_Text_29A31F
trainerbattle_double TRAINER_TORI_AND_TIA, Route113_Text_29A261, Route113_Text_29A29D, Route113_Text_29A31F
msgbox Route113_Text_29A2DE, MSGBOX_AUTOCLOSE
end
Route113_EventScript_1F22E4:: @ 81F22E4
trainerbattle 4, TRAINER_TORI_AND_TIA, 0, Route113_Text_29A35C, Route113_Text_29A397, Route113_Text_29A419
trainerbattle_double TRAINER_TORI_AND_TIA, Route113_Text_29A35C, Route113_Text_29A397, Route113_Text_29A419
msgbox Route113_Text_29A3DA, MSGBOX_AUTOCLOSE
end
Route113_EventScript_1F22FF:: @ 81F22FF
trainerbattle 0, TRAINER_SOPHIE, 0, Route113_Text_29A4BF, Route113_Text_29A508
trainerbattle_normal TRAINER_SOPHIE, Route113_Text_29A4BF, Route113_Text_29A508
msgbox Route113_Text_29A529, MSGBOX_AUTOCLOSE
end
Route113_EventScript_1F2316:: @ 81F2316
trainerbattle 0, TRAINER_COBY, 0, Route113_Text_29A453, Route113_Text_29A480
trainerbattle_normal TRAINER_COBY, Route113_Text_29A453, Route113_Text_29A480
msgbox Route113_Text_29A489, MSGBOX_AUTOCLOSE
end
Route113_EventScript_1F232D:: @ 81F232D
trainerbattle 0, TRAINER_LAWRENCE, 0, Route113_Text_29A566, Route113_Text_29A5A0
trainerbattle_normal TRAINER_LAWRENCE, Route113_Text_29A566, Route113_Text_29A5A0
msgbox Route113_Text_29A5BE, MSGBOX_AUTOCLOSE
end
Route113_EventScript_1F2344:: @ 81F2344
trainerbattle 0, TRAINER_WYATT, 0, Route113_Text_29A5E4, Route113_Text_29A628
trainerbattle_normal TRAINER_WYATT, Route113_Text_29A5E4, Route113_Text_29A628
msgbox Route113_Text_29A65D, MSGBOX_AUTOCLOSE
end