diff options
author | huderlem <huderlem@gmail.com> | 2020-02-12 18:34:19 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-12 18:34:19 -0600 |
commit | 204c431993dad29661a9ff47326787cd0cf381e6 (patch) | |
tree | bda0c76fa20f0cc9e679985d8f7286ad95dd38c4 /data/scripts/elite_four.inc | |
parent | 66c6b7a38b2a071ce7029978dd0d02fe6ec05952 (diff) | |
parent | 6b966d20e5d3866117fc9f1c0616654f2dfc415e (diff) |
Merge pull request #910 from GriffinRichards/fix-eventobj
Standardize Object Event naming
Diffstat (limited to 'data/scripts/elite_four.inc')
-rw-r--r-- | data/scripts/elite_four.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/scripts/elite_four.inc b/data/scripts/elite_four.inc index e7aada698..3b395de21 100644 --- a/data/scripts/elite_four.inc +++ b/data/scripts/elite_four.inc @@ -1,5 +1,5 @@ PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles:: @ 82723F8 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_Delay32 + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_Delay32 waitmovement 0 playse SE_DOOR setmetatile 6, 1, METATILE_EliteFour_OpenDoor_Frame, 0 @@ -18,7 +18,7 @@ PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles:: @ 82723F8 return PokemonLeague_EliteFour_EventScript_WalkInCloseDoor:: @ 8272475 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkUp6 + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkUp6 waitmovement 0 playse SE_TRACK_DOOR setmetatile 5, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1 |