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/Route114/scripts.inc
+15 -15
View File
@@ -89,27 +89,27 @@ Route114_EventScript_1F2637:: @ 81F2637
end
Route114_EventScript_1F2640:: @ 81F2640
trainerbattle 0, TRAINER_LENNY, 0, Route114_Text_29A6B1, Route114_Text_29A707
trainerbattle_normal TRAINER_LENNY, Route114_Text_29A6B1, Route114_Text_29A707
msgbox Route114_Text_29A715, MSGBOX_AUTOCLOSE
end
Route114_EventScript_1F2657:: @ 81F2657
trainerbattle 0, TRAINER_LUCAS_1, 0, Route114_Text_29A777, Route114_Text_29A7B5
trainerbattle_normal TRAINER_LUCAS_1, Route114_Text_29A777, Route114_Text_29A7B5
msgbox Route114_Text_29A7D4, MSGBOX_AUTOCLOSE
end
Route114_EventScript_1F266E:: @ 81F266E
trainerbattle 0, TRAINER_SHANE, 0, Route114_Text_29A818, Route114_Text_29A88F
trainerbattle_normal TRAINER_SHANE, Route114_Text_29A818, Route114_Text_29A88F
msgbox Route114_Text_29A89F, MSGBOX_AUTOCLOSE
end
Route114_EventScript_1F2685:: @ 81F2685
trainerbattle 0, TRAINER_NANCY, 0, Route114_Text_29A8D9, Route114_Text_29A90E
trainerbattle_normal TRAINER_NANCY, Route114_Text_29A8D9, Route114_Text_29A90E
msgbox Route114_Text_29A916, MSGBOX_AUTOCLOSE
end
Route114_EventScript_1F269C:: @ 81F269C
trainerbattle 2, TRAINER_STEVE_1, 0, Route114_Text_29A943, Route114_Text_29A973, Route114_EventScript_1F26C8
trainerbattle_normal TRAINER_STEVE_1, Route114_Text_29A943, Route114_Text_29A973, Route114_EventScript_1F26C8
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_eq Route114_EventScript_1F26E7
@@ -126,12 +126,12 @@ Route114_EventScript_1F26C8:: @ 81F26C8
end
Route114_EventScript_1F26E7:: @ 81F26E7
trainerbattle 5, TRAINER_STEVE_1, 0, Route114_Text_29AA3E, Route114_Text_29AA67
trainerbattle_rematch TRAINER_STEVE_1, Route114_Text_29AA3E, Route114_Text_29AA67
msgbox Route114_Text_29AA94, MSGBOX_AUTOCLOSE
end
Route114_EventScript_1F26FE:: @ 81F26FE
trainerbattle 2, TRAINER_BERNIE_1, 0, Route114_Text_29AADB, Route114_Text_29AB1A, Route114_EventScript_1F272A
trainerbattle_normal TRAINER_BERNIE_1, Route114_Text_29AADB, Route114_Text_29AB1A, Route114_EventScript_1F272A
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_eq Route114_EventScript_1F2749
@@ -148,42 +148,42 @@ Route114_EventScript_1F272A:: @ 81F272A
end
Route114_EventScript_1F2749:: @ 81F2749
trainerbattle 5, TRAINER_BERNIE_1, 0, Route114_Text_29ABDC, Route114_Text_29AC10
trainerbattle_rematch TRAINER_BERNIE_1, Route114_Text_29ABDC, Route114_Text_29AC10
msgbox Route114_Text_29AC43, MSGBOX_AUTOCLOSE
end
Route114_EventScript_1F2760:: @ 81F2760
trainerbattle 0, TRAINER_CLAUDE, 0, Route114_Text_29ACB3, Route114_Text_29AD0A
trainerbattle_normal TRAINER_CLAUDE, Route114_Text_29ACB3, Route114_Text_29AD0A
msgbox Route114_Text_29AD2E, MSGBOX_AUTOCLOSE
end
Route114_EventScript_1F2777:: @ 81F2777
trainerbattle 0, TRAINER_NOLAN, 0, Route114_Text_29ADA1, Route114_Text_29AE05
trainerbattle_normal TRAINER_NOLAN, Route114_Text_29ADA1, Route114_Text_29AE05
msgbox Route114_Text_29AE3D, MSGBOX_AUTOCLOSE
end
Route114_EventScript_1F278E:: @ 81F278E
trainerbattle 4, TRAINER_TYRA_AND_IVY, 0, Route114_Text_29AE96, Route114_Text_29AEE7, Route114_Text_29AF3D
trainerbattle_double TRAINER_TYRA_AND_IVY, Route114_Text_29AE96, Route114_Text_29AEE7, Route114_Text_29AF3D
msgbox Route114_Text_29AF0B, MSGBOX_AUTOCLOSE
end
Route114_EventScript_1F27A9:: @ 81F27A9
trainerbattle 4, TRAINER_TYRA_AND_IVY, 0, Route114_Text_29AF89, Route114_Text_29AFAC, Route114_Text_29B01B
trainerbattle_double TRAINER_TYRA_AND_IVY, Route114_Text_29AF89, Route114_Text_29AFAC, Route114_Text_29B01B
msgbox Route114_Text_29AFCF, MSGBOX_AUTOCLOSE
end
Route114_EventScript_1F27C4:: @ 81F27C4
trainerbattle 0, TRAINER_ANGELINA, 0, Route114_Text_29B16F, Route114_Text_29B19C
trainerbattle_normal TRAINER_ANGELINA, Route114_Text_29B16F, Route114_Text_29B19C
msgbox Route114_Text_29B1BC, MSGBOX_AUTOCLOSE
end
Route114_EventScript_1F27DB:: @ 81F27DB
trainerbattle 0, TRAINER_CHARLOTTE, 0, Route114_Text_29B0DB, Route114_Text_29B0FB
trainerbattle_normal TRAINER_CHARLOTTE, Route114_Text_29B0DB, Route114_Text_29B0FB
msgbox Route114_Text_29B11A, MSGBOX_AUTOCLOSE
end
Route114_EventScript_1F27F2:: @ 81F27F2
trainerbattle 0, TRAINER_KAI, 0, Route114_Text_29B05D, Route114_Text_29B089
trainerbattle_normal TRAINER_KAI, Route114_Text_29B05D, Route114_Text_29B089
msgbox Route114_Text_29B0B5, MSGBOX_AUTOCLOSE
end