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/Route119/scripts.inc
+25 -25
View File
@@ -87,17 +87,17 @@ Route119_EventScript_1F450B:: @ 81F450B
end
Route119_EventScript_1F453A:: @ 81F453A
trainerbattle 3, TRAINER_MAY_6, 0, Route119_Text_1F4A98
trainerbattle_no_intro TRAINER_MAY_6, Route119_Text_1F4A98
goto Route119_EventScript_1F456A
end
Route119_EventScript_1F454A:: @ 81F454A
trainerbattle 3, TRAINER_MAY_9, 0, Route119_Text_1F4A98
trainerbattle_no_intro TRAINER_MAY_9, Route119_Text_1F4A98
goto Route119_EventScript_1F456A
end
Route119_EventScript_1F455A:: @ 81F455A
trainerbattle 3, TRAINER_MAY_3, 0, Route119_Text_1F4A98
trainerbattle_no_intro TRAINER_MAY_3, Route119_Text_1F4A98
goto Route119_EventScript_1F456A
end
@@ -117,17 +117,17 @@ Route119_EventScript_1F4585:: @ 81F4585
end
Route119_EventScript_1F45B4:: @ 81F45B4
trainerbattle 3, TRAINER_BRENDAN_6, 0, Route119_Text_1F4D24
trainerbattle_no_intro TRAINER_BRENDAN_6, Route119_Text_1F4D24
goto Route119_EventScript_1F45E4
end
Route119_EventScript_1F45C4:: @ 81F45C4
trainerbattle 3, TRAINER_BRENDAN_9, 0, Route119_Text_1F4D24
trainerbattle_no_intro TRAINER_BRENDAN_9, Route119_Text_1F4D24
goto Route119_EventScript_1F45E4
end
Route119_EventScript_1F45D4:: @ 81F45D4
trainerbattle 3, TRAINER_BRENDAN_3, 0, Route119_Text_1F4D24
trainerbattle_no_intro TRAINER_BRENDAN_3, Route119_Text_1F4D24
goto Route119_EventScript_1F45E4
end
@@ -337,37 +337,37 @@ Route119_EventScript_1F477D:: @ 81F477D
end
Route119_EventScript_1F4786:: @ 81F4786
trainerbattle 0, TRAINER_BRENT, 0, Route119_Text_29D8C2, Route119_Text_29D8F0
trainerbattle_normal TRAINER_BRENT, Route119_Text_29D8C2, Route119_Text_29D8F0
msgbox Route119_Text_29D902, MSGBOX_AUTOCLOSE
end
Route119_EventScript_1F479D:: @ 81F479D
trainerbattle 0, TRAINER_DONALD, 0, Route119_Text_29D941, Route119_Text_29D97C
trainerbattle_normal TRAINER_DONALD, Route119_Text_29D941, Route119_Text_29D97C
msgbox Route119_Text_29D993, MSGBOX_AUTOCLOSE
end
Route119_EventScript_1F47B4:: @ 81F47B4
trainerbattle 0, TRAINER_TAYLOR, 0, Route119_Text_29D9CD, Route119_Text_29DA14
trainerbattle_normal TRAINER_TAYLOR, Route119_Text_29D9CD, Route119_Text_29DA14
msgbox Route119_Text_29DA2C, MSGBOX_AUTOCLOSE
end
Route119_EventScript_1F47CB:: @ 81F47CB
trainerbattle 0, TRAINER_DOUG, 0, Route119_Text_29DA7D, Route119_Text_29DABC
trainerbattle_normal TRAINER_DOUG, Route119_Text_29DA7D, Route119_Text_29DABC
msgbox Route119_Text_29DADB, MSGBOX_AUTOCLOSE
end
Route119_EventScript_1F47E2:: @ 81F47E2
trainerbattle 0, TRAINER_GREG, 0, Route119_Text_29DB17, Route119_Text_29DB66
trainerbattle_normal TRAINER_GREG, Route119_Text_29DB17, Route119_Text_29DB66
msgbox Route119_Text_29DB7C, MSGBOX_AUTOCLOSE
end
Route119_EventScript_1F47F9:: @ 81F47F9
trainerbattle 0, TRAINER_KENT, 0, Route119_Text_29DBC2, Route119_Text_29DC20
trainerbattle_normal TRAINER_KENT, Route119_Text_29DBC2, Route119_Text_29DC20
msgbox Route119_Text_29DC2B, MSGBOX_AUTOCLOSE
end
Route119_EventScript_1F4810:: @ 81F4810
trainerbattle 2, TRAINER_JACKSON_1, 0, Route119_Text_29DC4C, Route119_Text_29DC9F, Route119_EventScript_1F483C
trainerbattle_normal TRAINER_JACKSON_1, Route119_Text_29DC4C, Route119_Text_29DC9F, Route119_EventScript_1F483C
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_eq Route119_EventScript_1F485B
@@ -384,12 +384,12 @@ Route119_EventScript_1F483C:: @ 81F483C
end
Route119_EventScript_1F485B:: @ 81F485B
trainerbattle 5, TRAINER_JACKSON_1, 0, Route119_Text_29DD62, Route119_Text_29DDA5
trainerbattle_rematch TRAINER_JACKSON_1, Route119_Text_29DD62, Route119_Text_29DDA5
msgbox Route119_Text_29DDBD, MSGBOX_AUTOCLOSE
end
Route119_EventScript_1F4872:: @ 81F4872
trainerbattle 2, TRAINER_CATHERINE_1, 0, Route119_Text_29DE0F, Route119_Text_29DE5D, Route119_EventScript_1F489E
trainerbattle_normal TRAINER_CATHERINE_1, Route119_Text_29DE0F, Route119_Text_29DE5D, Route119_EventScript_1F489E
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_eq Route119_EventScript_1F48BD
@@ -406,52 +406,52 @@ Route119_EventScript_1F489E:: @ 81F489E
end
Route119_EventScript_1F48BD:: @ 81F48BD
trainerbattle 5, TRAINER_CATHERINE_1, 0, Route119_Text_29DF6B, Route119_Text_29DF92
trainerbattle_rematch TRAINER_CATHERINE_1, Route119_Text_29DF6B, Route119_Text_29DF92
msgbox Route119_Text_29DFAF, MSGBOX_AUTOCLOSE
end
Route119_EventScript_1F48D4:: @ 81F48D4
trainerbattle 0, TRAINER_HUGH, 0, Route119_Text_29E007, Route119_Text_29E063
trainerbattle_normal TRAINER_HUGH, Route119_Text_29E007, Route119_Text_29E063
msgbox Route119_Text_29E071, MSGBOX_AUTOCLOSE
end
Route119_EventScript_1F48EB:: @ 81F48EB
trainerbattle 0, TRAINER_PHIL, 0, Route119_Text_29E0A5, Route119_Text_29E0E1
trainerbattle_normal TRAINER_PHIL, Route119_Text_29E0A5, Route119_Text_29E0E1
msgbox Route119_Text_29E0F6, MSGBOX_AUTOCLOSE
end
Route119_EventScript_1F4902:: @ 81F4902
trainerbattle 0, TRAINER_YASU, 0, Route119_Text_29E134, Route119_Text_29E18D
trainerbattle_normal TRAINER_YASU, Route119_Text_29E134, Route119_Text_29E18D
msgbox Route119_Text_29E19D, MSGBOX_AUTOCLOSE
end
Route119_EventScript_1F4919:: @ 81F4919
trainerbattle 0, TRAINER_TAKASHI, 0, Route119_Text_29E1F5, Route119_Text_29E22B
trainerbattle_normal TRAINER_TAKASHI, Route119_Text_29E1F5, Route119_Text_29E22B
msgbox Route119_Text_29E245, MSGBOX_AUTOCLOSE
end
Route119_EventScript_1F4930:: @ 81F4930
trainerbattle 0, TRAINER_HIDEO, 0, Route119_Text_29E26A, Route119_Text_29E288
trainerbattle_normal TRAINER_HIDEO, Route119_Text_29E26A, Route119_Text_29E288
msgbox Route119_Text_29E2A3, MSGBOX_AUTOCLOSE
end
Route119_EventScript_1F4947:: @ 81F4947
trainerbattle 0, TRAINER_CHRIS, 0, Route119_Text_29E30D, Route119_Text_29E372
trainerbattle_normal TRAINER_CHRIS, Route119_Text_29E30D, Route119_Text_29E372
msgbox Route119_Text_29E3A2, MSGBOX_AUTOCLOSE
end
Route119_EventScript_1F495E:: @ 81F495E
trainerbattle 0, TRAINER_FABIAN, 0, Route119_Text_29E3FF, Route119_Text_29E44F
trainerbattle_normal TRAINER_FABIAN, Route119_Text_29E3FF, Route119_Text_29E44F
msgbox Route119_Text_29E492, MSGBOX_AUTOCLOSE
end
Route119_EventScript_1F4975:: @ 81F4975
trainerbattle 0, TRAINER_DAYTON, 0, Route119_Text_29E4DF, Route119_Text_29E513
trainerbattle_normal TRAINER_DAYTON, Route119_Text_29E4DF, Route119_Text_29E513
msgbox Route119_Text_29E532, MSGBOX_AUTOCLOSE
end
Route119_EventScript_1F498C:: @ 81F498C
trainerbattle 0, TRAINER_RACHEL, 0, Route119_Text_29E56F, Route119_Text_29E5B1
trainerbattle_normal TRAINER_RACHEL, Route119_Text_29E56F, Route119_Text_29E5B1
msgbox Route119_Text_29E5CB, MSGBOX_AUTOCLOSE
end