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/Route115/scripts.inc
+13 -13
View File
@@ -37,7 +37,7 @@ Route115_EventScript_1F2985:: @ 81F2985
end
Route115_EventScript_1F298E:: @ 81F298E
trainerbattle 2, TRAINER_TIMOTHY_1, 0, Route115_Text_29B1FA, Route115_Text_29B230, Route115_EventScript_1F29BA
trainerbattle_normal TRAINER_TIMOTHY_1, Route115_Text_29B1FA, Route115_Text_29B230, Route115_EventScript_1F29BA
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_eq Route115_EventScript_1F29D9
@@ -54,17 +54,17 @@ Route115_EventScript_1F29BA:: @ 81F29BA
end
Route115_EventScript_1F29D9:: @ 81F29D9
trainerbattle 5, TRAINER_TIMOTHY_1, 0, Route115_Text_29B32C, Route115_Text_29B372
trainerbattle_rematch TRAINER_TIMOTHY_1, Route115_Text_29B32C, Route115_Text_29B372
msgbox Route115_Text_29B385, MSGBOX_AUTOCLOSE
end
Route115_EventScript_1F29F0:: @ 81F29F0
trainerbattle 0, TRAINER_KOICHI, 0, Route115_Text_29B3CC, Route115_Text_29B3ED
trainerbattle_normal TRAINER_KOICHI, Route115_Text_29B3CC, Route115_Text_29B3ED
msgbox Route115_Text_29B3FF, MSGBOX_AUTOCLOSE
end
Route115_EventScript_1F2A07:: @ 81F2A07
trainerbattle 2, TRAINER_NOB_1, 0, Route115_Text_29B449, Route115_Text_29B480, Route115_EventScript_1F2A33
trainerbattle_normal TRAINER_NOB_1, Route115_Text_29B449, Route115_Text_29B480, Route115_EventScript_1F2A33
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_eq Route115_EventScript_1F2A52
@@ -81,12 +81,12 @@ Route115_EventScript_1F2A33:: @ 81F2A33
end
Route115_EventScript_1F2A52:: @ 81F2A52
trainerbattle 5, TRAINER_NOB_1, 0, Route115_Text_29B547, Route115_Text_29B59D
trainerbattle_rematch TRAINER_NOB_1, Route115_Text_29B547, Route115_Text_29B59D
msgbox Route115_Text_29B5B5, MSGBOX_AUTOCLOSE
end
Route115_EventScript_1F2A69:: @ 81F2A69
trainerbattle 2, TRAINER_CYNDY_1, 0, Route115_Text_29B5EF, Route115_Text_29B62D, Route115_EventScript_1F2A95
trainerbattle_normal TRAINER_CYNDY_1, Route115_Text_29B5EF, Route115_Text_29B62D, Route115_EventScript_1F2A95
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_eq Route115_EventScript_1F2AB4
@@ -103,37 +103,37 @@ Route115_EventScript_1F2A95:: @ 81F2A95
end
Route115_EventScript_1F2AB4:: @ 81F2AB4
trainerbattle 5, TRAINER_CYNDY_1, 0, Route115_Text_29B6FA, Route115_Text_29B71A
trainerbattle_rematch TRAINER_CYNDY_1, Route115_Text_29B6FA, Route115_Text_29B71A
msgbox Route115_Text_29B737, MSGBOX_AUTOCLOSE
end
Route115_EventScript_1F2ACB:: @ 81F2ACB
trainerbattle 0, TRAINER_HECTOR, 0, Route115_Text_29B78F, Route115_Text_29B7C5
trainerbattle_normal TRAINER_HECTOR, Route115_Text_29B78F, Route115_Text_29B7C5
msgbox Route115_Text_29B7EA, MSGBOX_AUTOCLOSE
end
Route115_EventScript_1F2AE2:: @ 81F2AE2
trainerbattle 0, TRAINER_KYRA, 0, Route115_Text_29B826, Route115_Text_29B85D
trainerbattle_normal TRAINER_KYRA, Route115_Text_29B826, Route115_Text_29B85D
msgbox Route115_Text_29B869, MSGBOX_AUTOCLOSE
end
Route115_EventScript_1F2AF9:: @ 81F2AF9
trainerbattle 0, TRAINER_JAIDEN, 0, Route115_Text_29B8C1, Route115_Text_29B8E8
trainerbattle_normal TRAINER_JAIDEN, Route115_Text_29B8C1, Route115_Text_29B8E8
msgbox Route115_Text_29B904, MSGBOX_AUTOCLOSE
end
Route115_EventScript_1F2B10:: @ 81F2B10
trainerbattle 0, TRAINER_ALIX, 0, Route115_Text_29B9CB, Route115_Text_29B9F6
trainerbattle_normal TRAINER_ALIX, Route115_Text_29B9CB, Route115_Text_29B9F6
msgbox Route115_Text_29BA04, MSGBOX_AUTOCLOSE
end
Route115_EventScript_1F2B27:: @ 81F2B27
trainerbattle 0, TRAINER_HELENE, 0, Route115_Text_29B92D, Route115_Text_29B958
trainerbattle_normal TRAINER_HELENE, Route115_Text_29B92D, Route115_Text_29B958
msgbox Route115_Text_29B971, MSGBOX_AUTOCLOSE
end
Route115_EventScript_1F2B3E:: @ 81F2B3E
trainerbattle 0, TRAINER_MARLENE, 0, Route115_Text_29BA2C, Route115_Text_29BA67
trainerbattle_normal TRAINER_MARLENE, Route115_Text_29BA2C, Route115_Text_29BA67
msgbox Route115_Text_29BA87, MSGBOX_AUTOCLOSE
end