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/Route124/scripts.inc
+12 -12
View File
@@ -12,17 +12,17 @@ Route124_EventScript_1F657C:: @ 81F657C
end
Route124_EventScript_1F6585:: @ 81F6585
trainerbattle 0, TRAINER_SPENCER, 0, Route124_Text_2A09B1, Route124_Text_2A0A02
trainerbattle_normal TRAINER_SPENCER, Route124_Text_2A09B1, Route124_Text_2A0A02
msgbox Route124_Text_2A0A20, MSGBOX_AUTOCLOSE
end
Route124_EventScript_1F659C:: @ 81F659C
trainerbattle 0, TRAINER_ROLAND, 0, Route124_Text_2A0A84, Route124_Text_2A0ACC
trainerbattle_normal TRAINER_ROLAND, Route124_Text_2A0A84, Route124_Text_2A0ACC
msgbox Route124_Text_2A0AD9, MSGBOX_AUTOCLOSE
end
Route124_EventScript_1F65B3:: @ 81F65B3
trainerbattle 2, TRAINER_JENNY_1, 0, Route124_Text_2A0B37, Route124_Text_2A0B7C, Route124_EventScript_1F65DF
trainerbattle_normal TRAINER_JENNY_1, Route124_Text_2A0B37, Route124_Text_2A0B7C, Route124_EventScript_1F65DF
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_eq Route124_EventScript_1F65FE
@@ -39,22 +39,22 @@ Route124_EventScript_1F65DF:: @ 81F65DF
end
Route124_EventScript_1F65FE:: @ 81F65FE
trainerbattle 5, TRAINER_JENNY_1, 0, Route124_Text_2A0C60, Route124_Text_2A0CA0
trainerbattle_rematch TRAINER_JENNY_1, Route124_Text_2A0C60, Route124_Text_2A0CA0
msgbox Route124_Text_2A0CBE, MSGBOX_AUTOCLOSE
end
Route124_EventScript_1F6615:: @ 81F6615
trainerbattle 0, TRAINER_GRACE, 0, Route124_Text_2A0D0A, Route124_Text_2A0D3D
trainerbattle_normal TRAINER_GRACE, Route124_Text_2A0D0A, Route124_Text_2A0D3D
msgbox Route124_Text_2A0D66, MSGBOX_AUTOCLOSE
end
Route124_EventScript_1F662C:: @ 81F662C
trainerbattle 0, TRAINER_CHAD, 0, Route124_Text_2A0DA0, Route124_Text_2A0DFF
trainerbattle_normal TRAINER_CHAD, Route124_Text_2A0DA0, Route124_Text_2A0DFF
msgbox Route124_Text_2A0E1E, MSGBOX_AUTOCLOSE
end
Route124_EventScript_1F6643:: @ 81F6643
trainerbattle 6, TRAINER_LILA_AND_ROY_1, 0, Route124_Text_2A0E87, Route124_Text_2A0EFE, Route124_Text_2A0F8C, Route124_EventScript_1F6673
trainerbattle_double TRAINER_LILA_AND_ROY_1, Route124_Text_2A0E87, Route124_Text_2A0EFE, Route124_Text_2A0F8C, Route124_EventScript_1F6673
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_eq Route124_EventScript_1F668C
@@ -69,12 +69,12 @@ Route124_EventScript_1F6673:: @ 81F6673
end
Route124_EventScript_1F668C:: @ 81F668C
trainerbattle 7, TRAINER_LILA_AND_ROY_1, 0, Route124_Text_2A111E, Route124_Text_2A11B2, Route124_Text_2A1255
trainerbattle_rematch_double TRAINER_LILA_AND_ROY_1, Route124_Text_2A111E, Route124_Text_2A11B2, Route124_Text_2A1255
msgbox Route124_Text_2A1203, MSGBOX_AUTOCLOSE
end
Route124_EventScript_1F66A7:: @ 81F66A7
trainerbattle 6, TRAINER_LILA_AND_ROY_1, 0, Route124_Text_2A0FD1, Route124_Text_2A1012, Route124_Text_2A10E5, Route124_EventScript_1F66D7
trainerbattle_double TRAINER_LILA_AND_ROY_1, Route124_Text_2A0FD1, Route124_Text_2A1012, Route124_Text_2A10E5, Route124_EventScript_1F66D7
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_eq Route124_EventScript_1F66F0
@@ -89,17 +89,17 @@ Route124_EventScript_1F66D7:: @ 81F66D7
end
Route124_EventScript_1F66F0:: @ 81F66F0
trainerbattle 7, TRAINER_LILA_AND_ROY_1, 0, Route124_Text_2A129A, Route124_Text_2A12DD, Route124_Text_2A1384
trainerbattle_rematch_double TRAINER_LILA_AND_ROY_1, Route124_Text_2A129A, Route124_Text_2A12DD, Route124_Text_2A1384
msgbox Route124_Text_2A130F, MSGBOX_AUTOCLOSE
end
Route124_EventScript_1F670B:: @ 81F670B
trainerbattle 0, TRAINER_DECLAN, 0, Route124_Text_2A13BD, Route124_Text_2A142C
trainerbattle_normal TRAINER_DECLAN, Route124_Text_2A13BD, Route124_Text_2A142C
msgbox Route124_Text_2A144F, MSGBOX_AUTOCLOSE
end
Route124_EventScript_1F6722:: @ 81F6722
trainerbattle 0, TRAINER_ISABELLA, 0, Route124_Text_2A148E, Route124_Text_2A14BC
trainerbattle_normal TRAINER_ISABELLA, Route124_Text_2A148E, Route124_Text_2A14BC
msgbox Route124_Text_2A14ED, MSGBOX_AUTOCLOSE
end