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/Route127/scripts.inc
+9 -9
View File
@@ -27,42 +27,42 @@ Route127_MapScript2_1F6A2B: @ 81F6A2B
.2byte 0
Route127_EventScript_1F6A35:: @ 81F6A35
trainerbattle 0, TRAINER_CAMDEN, 0, Route127_Text_2A225F, Route127_Text_2A2294
trainerbattle_normal TRAINER_CAMDEN, Route127_Text_2A225F, Route127_Text_2A2294
msgbox Route127_Text_2A22A1, MSGBOX_AUTOCLOSE
end
Route127_EventScript_1F6A4C:: @ 81F6A4C
trainerbattle 0, TRAINER_DONNY, 0, Route127_Text_2A22DD, Route127_Text_2A2315
trainerbattle_normal TRAINER_DONNY, Route127_Text_2A22DD, Route127_Text_2A2315
msgbox Route127_Text_2A232C, MSGBOX_AUTOCLOSE
end
Route127_EventScript_1F6A63:: @ 81F6A63
trainerbattle 0, TRAINER_JONAH, 0, Route127_Text_2A2381, Route127_Text_2A23E1
trainerbattle_normal TRAINER_JONAH, Route127_Text_2A2381, Route127_Text_2A23E1
msgbox Route127_Text_2A240C, MSGBOX_AUTOCLOSE
end
Route127_EventScript_1F6A7A:: @ 81F6A7A
trainerbattle 0, TRAINER_HENRY, 0, Route127_Text_2A2450, Route127_Text_2A2483
trainerbattle_normal TRAINER_HENRY, Route127_Text_2A2450, Route127_Text_2A2483
msgbox Route127_Text_2A2494, MSGBOX_AUTOCLOSE
end
Route127_EventScript_1F6A91:: @ 81F6A91
trainerbattle 0, TRAINER_ROGER, 0, Route127_Text_2A24C6, Route127_Text_2A250B
trainerbattle_normal TRAINER_ROGER, Route127_Text_2A24C6, Route127_Text_2A250B
msgbox Route127_Text_2A2538, MSGBOX_AUTOCLOSE
end
Route127_EventScript_1F6AA8:: @ 81F6AA8
trainerbattle 0, TRAINER_AIDAN, 0, Route127_Text_2A257A, Route127_Text_2A25C1
trainerbattle_normal TRAINER_AIDAN, Route127_Text_2A257A, Route127_Text_2A25C1
msgbox Route127_Text_2A25D2, MSGBOX_AUTOCLOSE
end
Route127_EventScript_1F6ABF:: @ 81F6ABF
trainerbattle 0, TRAINER_ATHENA, 0, Route127_Text_2A27D0, Route127_Text_2A27FC
trainerbattle_normal TRAINER_ATHENA, Route127_Text_2A27D0, Route127_Text_2A27FC
msgbox Route127_Text_2A2832, MSGBOX_AUTOCLOSE
end
Route127_EventScript_1F6AD6:: @ 81F6AD6
trainerbattle 2, TRAINER_KOJI_1, 0, Route127_Text_2A264D, Route127_Text_2A2685, Route127_EventScript_1F6B02
trainerbattle_normal TRAINER_KOJI_1, Route127_Text_2A264D, Route127_Text_2A2685, Route127_EventScript_1F6B02
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_eq Route127_EventScript_1F6B21
@@ -79,7 +79,7 @@ Route127_EventScript_1F6B02:: @ 81F6B02
end
Route127_EventScript_1F6B21:: @ 81F6B21
trainerbattle 5, TRAINER_KOJI_1, 0, Route127_Text_2A2734, Route127_Text_2A276B
trainerbattle_rematch TRAINER_KOJI_1, Route127_Text_2A2734, Route127_Text_2A276B
msgbox Route127_Text_2A278E, MSGBOX_AUTOCLOSE
end