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/SlateportCity_OceanicMuseum_2F/scripts.inc
+2 -2
View File
@@ -32,7 +32,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BB00:: @ 820BB00
call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_20BCA8
compare VAR_FACING, 3
call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_20BCB3
trainerbattle 3, TRAINER_GRUNT_14, 0, SlateportCity_OceanicMuseum_2F_Text_20BEE2
trainerbattle_no_intro TRAINER_GRUNT_14, SlateportCity_OceanicMuseum_2F_Text_20BEE2
msgbox SlateportCity_OceanicMuseum_2F_Text_20BEFA, MSGBOX_DEFAULT
closemessage
applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_20BCEF
@@ -40,7 +40,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BB00:: @ 820BB00
applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_20BCE2
waitmovement 0
msgbox SlateportCity_OceanicMuseum_2F_Text_20BF35, MSGBOX_DEFAULT
trainerbattle 3, TRAINER_GRUNT_15, 0, SlateportCity_OceanicMuseum_2F_Text_20BF66
trainerbattle_no_intro TRAINER_GRUNT_15, SlateportCity_OceanicMuseum_2F_Text_20BF66
applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_20BCEF
waitmovement 0
applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_2725AA