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/Route132/scripts.inc
+8 -8
View File
@@ -2,42 +2,42 @@ Route132_MapScripts:: @ 81F74E9
.byte 0
Route132_EventScript_1F74EA:: @ 81F74EA
trainerbattle 0, TRAINER_GILBERT, 0, Route132_Text_2A3B4C, Route132_Text_2A3BAC
trainerbattle_normal TRAINER_GILBERT, Route132_Text_2A3B4C, Route132_Text_2A3BAC
msgbox Route132_Text_2A3BC0, MSGBOX_AUTOCLOSE
end
Route132_EventScript_1F7501:: @ 81F7501
trainerbattle 0, TRAINER_DANA, 0, Route132_Text_2A3C04, Route132_Text_2A3C39
trainerbattle_normal TRAINER_DANA, Route132_Text_2A3C04, Route132_Text_2A3C39
msgbox Route132_Text_2A3C49, MSGBOX_AUTOCLOSE
end
Route132_EventScript_1F7518:: @ 81F7518
trainerbattle 0, TRAINER_RONALD, 0, Route132_Text_2A3C7F, Route132_Text_2A3CAD
trainerbattle_normal TRAINER_RONALD, Route132_Text_2A3C7F, Route132_Text_2A3CAD
msgbox Route132_Text_2A3CC5, MSGBOX_AUTOCLOSE
end
Route132_EventScript_1F752F:: @ 81F752F
trainerbattle 0, TRAINER_KIYO, 0, Route132_Text_2A3D26, Route132_Text_2A3D6C
trainerbattle_normal TRAINER_KIYO, Route132_Text_2A3D26, Route132_Text_2A3D6C
msgbox Route132_Text_2A3D8B, MSGBOX_AUTOCLOSE
end
Route132_EventScript_1F7546:: @ 81F7546
trainerbattle 0, TRAINER_PAXTON, 0, Route132_Text_2A3F4F, Route132_Text_2A3FA8
trainerbattle_normal TRAINER_PAXTON, Route132_Text_2A3F4F, Route132_Text_2A3FA8
msgbox Route132_Text_2A3FE5, MSGBOX_AUTOCLOSE
end
Route132_EventScript_1F755D:: @ 81F755D
trainerbattle 0, TRAINER_DARCY, 0, Route132_Text_2A4026, Route132_Text_2A406E
trainerbattle_normal TRAINER_DARCY, Route132_Text_2A4026, Route132_Text_2A406E
msgbox Route132_Text_2A40A4, MSGBOX_AUTOCLOSE
end
Route132_EventScript_1F7574:: @ 81F7574
trainerbattle 0, TRAINER_JONATHAN, 0, Route132_Text_2A3EAC, Route132_Text_2A3EDD
trainerbattle_normal TRAINER_JONATHAN, Route132_Text_2A3EAC, Route132_Text_2A3EDD
msgbox Route132_Text_2A3F03, MSGBOX_AUTOCLOSE
end
Route132_EventScript_1F758B:: @ 81F758B
trainerbattle 0, TRAINER_MAKAYLA, 0, Route132_Text_2A3DF0, Route132_Text_2A3E2C
trainerbattle_normal TRAINER_MAKAYLA, Route132_Text_2A3DF0, Route132_Text_2A3E2C
msgbox Route132_Text_2A3E4E, MSGBOX_AUTOCLOSE
end