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/Route116/scripts.inc
+12 -12
View File
@@ -248,17 +248,17 @@ Route116_Movement_1F2E7E: @ 81F2E7E
step_end
Route116_EventScript_1F2E89:: @ 81F2E89
trainerbattle 0, TRAINER_JOEY, 0, Route116_Text_29BB79, Route116_Text_29BB9A
trainerbattle_normal TRAINER_JOEY, Route116_Text_29BB79, Route116_Text_29BB9A
msgbox Route116_Text_29BBC6, MSGBOX_AUTOCLOSE
end
Route116_EventScript_1F2EA0:: @ 81F2EA0
trainerbattle 0, TRAINER_JOSE, 0, Route116_Text_29BBFD, Route116_Text_29BC25
trainerbattle_normal TRAINER_JOSE, Route116_Text_29BBFD, Route116_Text_29BC25
msgbox Route116_Text_29BC42, MSGBOX_AUTOCLOSE
end
Route116_EventScript_1F2EB7:: @ 81F2EB7
trainerbattle 2, TRAINER_JERRY_1, 0, Route116_Text_29BD0C, Route116_Text_29BD66, Route116_EventScript_1F2EF8
trainerbattle_normal TRAINER_JERRY_1, Route116_Text_29BD0C, Route116_Text_29BD66, Route116_EventScript_1F2EF8
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_eq Route116_EventScript_1F2F4E
@@ -298,22 +298,22 @@ Route116_EventScript_1F2F35:: @ 81F2F35
end
Route116_EventScript_1F2F4E:: @ 81F2F4E
trainerbattle 5, TRAINER_JERRY_1, 0, Route116_Text_29BEF3, Route116_Text_29BF4C
trainerbattle_rematch TRAINER_JERRY_1, Route116_Text_29BEF3, Route116_Text_29BF4C
msgbox Route116_Text_29BF68, MSGBOX_AUTOCLOSE
end
Route116_EventScript_1F2F65:: @ 81F2F65
trainerbattle 0, TRAINER_CLARK, 0, Route116_Text_29BACD, Route116_Text_29BB0F
trainerbattle_normal TRAINER_CLARK, Route116_Text_29BACD, Route116_Text_29BB0F
msgbox Route116_Text_29BB31, MSGBOX_AUTOCLOSE
end
Route116_EventScript_1F2F7C:: @ 81F2F7C
trainerbattle 0, TRAINER_JANICE, 0, Route116_Text_29BC7F, Route116_Text_29BCB3
trainerbattle_normal TRAINER_JANICE, Route116_Text_29BC7F, Route116_Text_29BCB3
msgbox Route116_Text_29BCCC, MSGBOX_AUTOCLOSE
end
Route116_EventScript_1F2F93:: @ 81F2F93
trainerbattle 2, TRAINER_KAREN_1, 0, Route116_Text_29BFC5, Route116_Text_29BFFA, Route116_EventScript_1F2FD4
trainerbattle_normal TRAINER_KAREN_1, Route116_Text_29BFC5, Route116_Text_29BFFA, Route116_EventScript_1F2FD4
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_eq Route116_EventScript_1F302A
@@ -353,27 +353,27 @@ Route116_EventScript_1F3011:: @ 81F3011
end
Route116_EventScript_1F302A:: @ 81F302A
trainerbattle 5, TRAINER_KAREN_1, 0, Route116_Text_29C0DA, Route116_Text_29C11F
trainerbattle_rematch TRAINER_KAREN_1, Route116_Text_29C0DA, Route116_Text_29C11F
msgbox Route116_Text_29C13B, MSGBOX_AUTOCLOSE
end
Route116_EventScript_1F3041:: @ 81F3041
trainerbattle 0, TRAINER_SARAH, 0, Route116_Text_29C173, Route116_Text_29C1B8
trainerbattle_normal TRAINER_SARAH, Route116_Text_29C173, Route116_Text_29C1B8
msgbox Route116_Text_29C1EA, MSGBOX_AUTOCLOSE
end
Route116_EventScript_1F3058:: @ 81F3058
trainerbattle 0, TRAINER_DAWSON, 0, Route116_Text_29C266, Route116_Text_29C2C2
trainerbattle_normal TRAINER_DAWSON, Route116_Text_29C266, Route116_Text_29C2C2
msgbox Route116_Text_29C2DD, MSGBOX_AUTOCLOSE
end
Route116_EventScript_1F306F:: @ 81F306F
trainerbattle 0, TRAINER_DEVAN, 0, Route116_Text_29C350, Route116_Text_29C365
trainerbattle_normal TRAINER_DEVAN, Route116_Text_29C350, Route116_Text_29C365
msgbox Route116_Text_29C380, MSGBOX_AUTOCLOSE
end
Route116_EventScript_1F3086:: @ 81F3086
trainerbattle 0, TRAINER_JOHNSON, 0, Route116_Text_29C3C1, Route116_Text_29C3F7
trainerbattle_normal TRAINER_JOHNSON, Route116_Text_29C3C1, Route116_Text_29C3F7
msgbox Route116_Text_29C418, MSGBOX_AUTOCLOSE
end