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/MauvilleCity_Gym/scripts.inc
+7 -7
View File
@@ -76,7 +76,7 @@ MauvilleCity_Gym_EventScript_20DEE7:: @ 820DEE7
end
MauvilleCity_Gym_EventScript_20DEEB:: @ 820DEEB
trainerbattle 1, TRAINER_WATTSON_1, 0, MauvilleCity_Gym_Text_20E602, MauvilleCity_Gym_Text_20E734, MauvilleCity_Gym_EventScript_20DF2B
trainerbattle_normal TRAINER_WATTSON_1, MauvilleCity_Gym_Text_20E602, MauvilleCity_Gym_Text_20E734, MauvilleCity_Gym_EventScript_20DF2B, NO_MUSIC
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_eq MauvilleCity_Gym_EventScript_20DFDE
@@ -140,7 +140,7 @@ MauvilleCity_Gym_EventScript_20DFD4:: @ 820DFD4
end
MauvilleCity_Gym_EventScript_20DFDE:: @ 820DFDE
trainerbattle 7, TRAINER_WATTSON_1, 0, MauvilleCity_Gym_Text_20E9A7, MauvilleCity_Gym_Text_20EA42, MauvilleCity_Gym_Text_20EAFD
trainerbattle_rematch_double TRAINER_WATTSON_1, MauvilleCity_Gym_Text_20E9A7, MauvilleCity_Gym_Text_20EA42, MauvilleCity_Gym_Text_20EAFD
msgbox MauvilleCity_Gym_Text_20EA5E, MSGBOX_AUTOCLOSE
end
@@ -215,27 +215,27 @@ MauvilleCity_Gym_EventScript_20E0B4:: @ 820E0B4
end
MauvilleCity_Gym_EventScript_20E0B9:: @ 820E0B9
trainerbattle 0, TRAINER_KIRK, 0, MauvilleCity_Gym_Text_20E2BC, MauvilleCity_Gym_Text_20E2FC
trainerbattle_normal TRAINER_KIRK, MauvilleCity_Gym_Text_20E2BC, MauvilleCity_Gym_Text_20E2FC
msgbox MauvilleCity_Gym_Text_20E336, MSGBOX_AUTOCLOSE
end
MauvilleCity_Gym_EventScript_20E0D0:: @ 820E0D0
trainerbattle 0, TRAINER_SHAWN, 0, MauvilleCity_Gym_Text_20E369, MauvilleCity_Gym_Text_20E3A7
trainerbattle_normal TRAINER_SHAWN, MauvilleCity_Gym_Text_20E369, MauvilleCity_Gym_Text_20E3A7
msgbox MauvilleCity_Gym_Text_20E3C1, MSGBOX_AUTOCLOSE
end
MauvilleCity_Gym_EventScript_20E0E7:: @ 820E0E7
trainerbattle 0, TRAINER_BEN, 0, MauvilleCity_Gym_Text_20E443, MauvilleCity_Gym_Text_20E469
trainerbattle_normal TRAINER_BEN, MauvilleCity_Gym_Text_20E443, MauvilleCity_Gym_Text_20E469
msgbox MauvilleCity_Gym_Text_20E47E, MSGBOX_AUTOCLOSE
end
MauvilleCity_Gym_EventScript_20E0FE:: @ 820E0FE
trainerbattle 0, TRAINER_VIVIAN, 0, MauvilleCity_Gym_Text_20E4BB, MauvilleCity_Gym_Text_20E4F4
trainerbattle_normal TRAINER_VIVIAN, MauvilleCity_Gym_Text_20E4BB, MauvilleCity_Gym_Text_20E4F4
msgbox MauvilleCity_Gym_Text_20E50F, MSGBOX_AUTOCLOSE
end
MauvilleCity_Gym_EventScript_20E115:: @ 820E115
trainerbattle 0, TRAINER_ANGELO, 0, MauvilleCity_Gym_Text_20E593, MauvilleCity_Gym_Text_20E5A8
trainerbattle_normal TRAINER_ANGELO, MauvilleCity_Gym_Text_20E593, MauvilleCity_Gym_Text_20E5A8
msgbox MauvilleCity_Gym_Text_20E5C2, MSGBOX_AUTOCLOSE
end