aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/VermilionGym.asm
diff options
context:
space:
mode:
authordannye <33dannye@gmail.com>2021-09-26 22:56:02 -0500
committerdannye <33dannye@gmail.com>2021-09-26 22:56:02 -0500
commit94ed208164c3f6484a26923c5bc7664b9a3c4002 (patch)
treee6141c9f312ae0edf4b4741a729b03fea1ddebf5 /data/maps/objects/VermilionGym.asm
parentMerge branch 'master' of https://github.com/pret/pokered (diff)
parentAlign `object_event` coordinates (diff)
downloadpokeyellow-94ed208164c3f6484a26923c5bc7664b9a3c4002.tar.gz
pokeyellow-94ed208164c3f6484a26923c5bc7664b9a3c4002.tar.xz
pokeyellow-94ed208164c3f6484a26923c5bc7664b9a3c4002.zip
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'data/maps/objects/VermilionGym.asm')
-rw-r--r--data/maps/objects/VermilionGym.asm10
1 files changed, 5 insertions, 5 deletions
diff --git a/data/maps/objects/VermilionGym.asm b/data/maps/objects/VermilionGym.asm
index 234b78c7..27e773f7 100644
--- a/data/maps/objects/VermilionGym.asm
+++ b/data/maps/objects/VermilionGym.asm
@@ -8,10 +8,10 @@ VermilionGym_Object:
def_bg_events
def_object_events
- object_event 5, 1, SPRITE_ROCKER, STAY, DOWN, 1, OPP_LT_SURGE, 1
- object_event 9, 6, SPRITE_GENTLEMAN, STAY, LEFT, 2, OPP_GENTLEMAN, 3
- object_event 3, 8, SPRITE_SUPER_NERD, STAY, LEFT, 3, OPP_ROCKER, 1
- object_event 0, 10, SPRITE_SAILOR, STAY, RIGHT, 4, OPP_SAILOR, 8
- object_event 4, 14, SPRITE_GYM_GUIDE, STAY, DOWN, 5 ; person
+ object_event 5, 1, SPRITE_ROCKER, STAY, DOWN, 1, OPP_LT_SURGE, 1
+ object_event 9, 6, SPRITE_GENTLEMAN, STAY, LEFT, 2, OPP_GENTLEMAN, 3
+ object_event 3, 8, SPRITE_SUPER_NERD, STAY, LEFT, 3, OPP_ROCKER, 1
+ object_event 0, 10, SPRITE_SAILOR, STAY, RIGHT, 4, OPP_SAILOR, 8
+ object_event 4, 14, SPRITE_GYM_GUIDE, STAY, DOWN, 5 ; person
def_warps_to VERMILION_GYM