cleans up trainer battle scripts
* 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
@@ -165,17 +165,17 @@ Route110_EventScript_1EF3E8:: @ 81EF3E8
|
||||
end
|
||||
|
||||
Route110_EventScript_1EF3F2:: @ 81EF3F2
|
||||
trainerbattle 0, TRAINER_EDWARD, 0, Route110_Text_29802B, Route110_Text_298064
|
||||
trainerbattle_normal TRAINER_EDWARD, Route110_Text_29802B, Route110_Text_298064
|
||||
msgbox Route110_Text_29808A, MSGBOX_AUTOCLOSE
|
||||
end
|
||||
|
||||
Route110_EventScript_1EF409:: @ 81EF409
|
||||
trainerbattle 0, TRAINER_JACLYN, 0, Route110_Text_2980B9, Route110_Text_2980E5
|
||||
trainerbattle_normal TRAINER_JACLYN, Route110_Text_2980B9, Route110_Text_2980E5
|
||||
msgbox Route110_Text_2980F8, MSGBOX_AUTOCLOSE
|
||||
end
|
||||
|
||||
Route110_EventScript_1EF420:: @ 81EF420
|
||||
trainerbattle 2, TRAINER_EDWIN_1, 0, Route110_Text_29815E, Route110_Text_29818F, Route110_EventScript_1EF44C
|
||||
trainerbattle_normal TRAINER_EDWIN_1, Route110_Text_29815E, Route110_Text_29818F, Route110_EventScript_1EF44C
|
||||
specialvar VAR_RESULT, ShouldTryRematchBattle
|
||||
compare VAR_RESULT, 1
|
||||
goto_eq Route110_EventScript_1EF46B
|
||||
@@ -192,27 +192,27 @@ Route110_EventScript_1EF44C:: @ 81EF44C
|
||||
end
|
||||
|
||||
Route110_EventScript_1EF46B:: @ 81EF46B
|
||||
trainerbattle 5, TRAINER_EDWIN_1, 0, Route110_Text_298232, Route110_Text_298288
|
||||
trainerbattle_rematch TRAINER_EDWIN_1, Route110_Text_298232, Route110_Text_298288
|
||||
msgbox Route110_Text_2982A2, MSGBOX_AUTOCLOSE
|
||||
end
|
||||
|
||||
Route110_EventScript_1EF482:: @ 81EF482
|
||||
trainerbattle 0, TRAINER_DALE, 0, Route110_Text_2982CC, Route110_Text_2982F5
|
||||
trainerbattle_normal TRAINER_DALE, Route110_Text_2982CC, Route110_Text_2982F5
|
||||
msgbox Route110_Text_298303, MSGBOX_AUTOCLOSE
|
||||
end
|
||||
|
||||
Route110_EventScript_1EF499:: @ 81EF499
|
||||
trainerbattle 0, TRAINER_JACOB, 0, Route110_Text_297B3F, Route110_Text_297B77
|
||||
trainerbattle_normal TRAINER_JACOB, Route110_Text_297B3F, Route110_Text_297B77
|
||||
msgbox Route110_Text_297B8F, MSGBOX_AUTOCLOSE
|
||||
end
|
||||
|
||||
Route110_EventScript_1EF4B0:: @ 81EF4B0
|
||||
trainerbattle 0, TRAINER_ANTHONY, 0, Route110_Text_297BE7, Route110_Text_297C0F
|
||||
trainerbattle_normal TRAINER_ANTHONY, Route110_Text_297BE7, Route110_Text_297C0F
|
||||
msgbox Route110_Text_297C1F, MSGBOX_AUTOCLOSE
|
||||
end
|
||||
|
||||
Route110_EventScript_1EF4C7:: @ 81EF4C7
|
||||
trainerbattle 2, TRAINER_BENJAMIN_1, 0, Route110_Text_297C63, Route110_Text_297C8A, Route110_EventScript_1EF4F3
|
||||
trainerbattle_normal TRAINER_BENJAMIN_1, Route110_Text_297C63, Route110_Text_297C8A, Route110_EventScript_1EF4F3
|
||||
specialvar VAR_RESULT, ShouldTryRematchBattle
|
||||
compare VAR_RESULT, 1
|
||||
goto_eq Route110_EventScript_1EF512
|
||||
@@ -229,17 +229,17 @@ Route110_EventScript_1EF4F3:: @ 81EF4F3
|
||||
end
|
||||
|
||||
Route110_EventScript_1EF512:: @ 81EF512
|
||||
trainerbattle 5, TRAINER_BENJAMIN_1, 0, Route110_Text_297D4B, Route110_Text_297D8E
|
||||
trainerbattle_rematch TRAINER_BENJAMIN_1, Route110_Text_297D4B, Route110_Text_297D8E
|
||||
msgbox Route110_Text_297DB0, MSGBOX_AUTOCLOSE
|
||||
end
|
||||
|
||||
Route110_EventScript_1EF529:: @ 81EF529
|
||||
trainerbattle 0, TRAINER_JASMINE, 0, Route110_Text_297F93, Route110_Text_297FD0
|
||||
trainerbattle_normal TRAINER_JASMINE, Route110_Text_297F93, Route110_Text_297FD0
|
||||
msgbox Route110_Text_297FF1, MSGBOX_AUTOCLOSE
|
||||
end
|
||||
|
||||
Route110_EventScript_1EF540:: @ 81EF540
|
||||
trainerbattle 2, TRAINER_ABIGAIL_1, 0, Route110_Text_297DFA, Route110_Text_297E69, Route110_EventScript_1EF56C
|
||||
trainerbattle_normal TRAINER_ABIGAIL_1, Route110_Text_297DFA, Route110_Text_297E69, Route110_EventScript_1EF56C
|
||||
specialvar VAR_RESULT, ShouldTryRematchBattle
|
||||
compare VAR_RESULT, 1
|
||||
goto_eq Route110_EventScript_1EF58B
|
||||
@@ -256,12 +256,12 @@ Route110_EventScript_1EF56C:: @ 81EF56C
|
||||
end
|
||||
|
||||
Route110_EventScript_1EF58B:: @ 81EF58B
|
||||
trainerbattle 5, TRAINER_ABIGAIL_1, 0, Route110_Text_297F09, Route110_Text_297F37
|
||||
trainerbattle_rematch TRAINER_ABIGAIL_1, Route110_Text_297F09, Route110_Text_297F37
|
||||
msgbox Route110_Text_297F58, MSGBOX_AUTOCLOSE
|
||||
end
|
||||
|
||||
Route110_EventScript_1EF5A2:: @ 81EF5A2
|
||||
trainerbattle 2, TRAINER_ISABEL_1, 0, Route110_Text_298349, Route110_Text_298389, Route110_EventScript_1EF5CE
|
||||
trainerbattle_normal TRAINER_ISABEL_1, Route110_Text_298349, Route110_Text_298389, Route110_EventScript_1EF5CE
|
||||
specialvar VAR_RESULT, ShouldTryRematchBattle
|
||||
compare VAR_RESULT, 1
|
||||
goto_eq Route110_EventScript_1EF5ED
|
||||
@@ -278,12 +278,12 @@ Route110_EventScript_1EF5CE:: @ 81EF5CE
|
||||
end
|
||||
|
||||
Route110_EventScript_1EF5ED:: @ 81EF5ED
|
||||
trainerbattle 5, TRAINER_ISABEL_1, 0, Route110_Text_298466, Route110_Text_2984AF
|
||||
trainerbattle_rematch TRAINER_ISABEL_1, Route110_Text_298466, Route110_Text_2984AF
|
||||
msgbox Route110_Text_2984C8, MSGBOX_AUTOCLOSE
|
||||
end
|
||||
|
||||
Route110_EventScript_1EF604:: @ 81EF604
|
||||
trainerbattle 0, TRAINER_TIMMY, 0, Route110_Text_298525, Route110_Text_298559
|
||||
trainerbattle_normal TRAINER_TIMMY, Route110_Text_298525, Route110_Text_298559
|
||||
msgbox Route110_Text_298579, MSGBOX_AUTOCLOSE
|
||||
end
|
||||
|
||||
@@ -291,17 +291,17 @@ Route110_EventScript_1EF61B:: @ 81EF61B
|
||||
end
|
||||
|
||||
Route110_EventScript_1EF61C:: @ 81EF61C
|
||||
trainerbattle 0, TRAINER_KALEB, 0, Route110_Text_2986ED, Route110_Text_298735
|
||||
trainerbattle_normal TRAINER_KALEB, Route110_Text_2986ED, Route110_Text_298735
|
||||
msgbox Route110_Text_298755, MSGBOX_AUTOCLOSE
|
||||
end
|
||||
|
||||
Route110_EventScript_1EF633:: @ 81EF633
|
||||
trainerbattle 0, TRAINER_JOSEPH, 0, Route110_Text_298642, Route110_Text_298686
|
||||
trainerbattle_normal TRAINER_JOSEPH, Route110_Text_298642, Route110_Text_298686
|
||||
msgbox Route110_Text_2986A9, MSGBOX_AUTOCLOSE
|
||||
end
|
||||
|
||||
Route110_EventScript_1EF64A:: @ 81EF64A
|
||||
trainerbattle 0, TRAINER_ALYSSA, 0, Route110_Text_2985AB, Route110_Text_2985F9
|
||||
trainerbattle_normal TRAINER_ALYSSA, Route110_Text_2985AB, Route110_Text_2985F9
|
||||
msgbox Route110_Text_298612, MSGBOX_AUTOCLOSE
|
||||
end
|
||||
|
||||
@@ -421,17 +421,17 @@ Route110_EventScript_1EF7EB:: @ 81EF7EB
|
||||
end
|
||||
|
||||
Route110_EventScript_1EF81A:: @ 81EF81A
|
||||
trainerbattle 3, TRAINER_MAY_5, 0, Route110_Text_1EFCCB
|
||||
trainerbattle_no_intro TRAINER_MAY_5, Route110_Text_1EFCCB
|
||||
goto Route110_EventScript_1EF84A
|
||||
end
|
||||
|
||||
Route110_EventScript_1EF82A:: @ 81EF82A
|
||||
trainerbattle 3, TRAINER_MAY_8, 0, Route110_Text_1EFCCB
|
||||
trainerbattle_no_intro TRAINER_MAY_8, Route110_Text_1EFCCB
|
||||
goto Route110_EventScript_1EF84A
|
||||
end
|
||||
|
||||
Route110_EventScript_1EF83A:: @ 81EF83A
|
||||
trainerbattle 3, TRAINER_MAY_2, 0, Route110_Text_1EFCCB
|
||||
trainerbattle_no_intro TRAINER_MAY_2, Route110_Text_1EFCCB
|
||||
goto Route110_EventScript_1EF84A
|
||||
end
|
||||
|
||||
@@ -451,17 +451,17 @@ Route110_EventScript_1EF865:: @ 81EF865
|
||||
end
|
||||
|
||||
Route110_EventScript_1EF894:: @ 81EF894
|
||||
trainerbattle 3, TRAINER_BRENDAN_5, 0, Route110_Text_1EFEB4
|
||||
trainerbattle_no_intro TRAINER_BRENDAN_5, Route110_Text_1EFEB4
|
||||
goto Route110_EventScript_1EF8C4
|
||||
end
|
||||
|
||||
Route110_EventScript_1EF8A4:: @ 81EF8A4
|
||||
trainerbattle 3, TRAINER_BRENDAN_8, 0, Route110_Text_1EFEB4
|
||||
trainerbattle_no_intro TRAINER_BRENDAN_8, Route110_Text_1EFEB4
|
||||
goto Route110_EventScript_1EF8C4
|
||||
end
|
||||
|
||||
Route110_EventScript_1EF8B4:: @ 81EF8B4
|
||||
trainerbattle 3, TRAINER_BRENDAN_2, 0, Route110_Text_1EFEB4
|
||||
trainerbattle_no_intro TRAINER_BRENDAN_2, Route110_Text_1EFEB4
|
||||
goto Route110_EventScript_1EF8C4
|
||||
end
|
||||
|
||||
|
||||
Reference in New Issue
Block a user