aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/FuchsiaGym.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/FuchsiaGym.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/FuchsiaGym.asm')
-rw-r--r--data/maps/objects/FuchsiaGym.asm16
1 files changed, 8 insertions, 8 deletions
diff --git a/data/maps/objects/FuchsiaGym.asm b/data/maps/objects/FuchsiaGym.asm
index 60b717bd..295c3c60 100644
--- a/data/maps/objects/FuchsiaGym.asm
+++ b/data/maps/objects/FuchsiaGym.asm
@@ -8,13 +8,13 @@ FuchsiaGym_Object:
def_bg_events
def_object_events
- object_event 4, 10, SPRITE_SILPH_WORKER, STAY, DOWN, 1, OPP_KOGA, 1
- object_event 8, 13, SPRITE_ROCKER, STAY, DOWN, 2, OPP_JUGGLER, 7
- object_event 7, 8, SPRITE_ROCKER, STAY, RIGHT, 3, OPP_JUGGLER, 3
- object_event 1, 12, SPRITE_ROCKER, STAY, DOWN, 4, OPP_JUGGLER, 8
- object_event 3, 5, SPRITE_ROCKER, STAY, UP, 5, OPP_TAMER, 1
- object_event 8, 2, SPRITE_ROCKER, STAY, DOWN, 6, OPP_TAMER, 2
- object_event 2, 7, SPRITE_ROCKER, STAY, LEFT, 7, OPP_JUGGLER, 4
- object_event 7, 15, SPRITE_GYM_GUIDE, STAY, DOWN, 8 ; person
+ object_event 4, 10, SPRITE_SILPH_WORKER, STAY, DOWN, 1, OPP_KOGA, 1
+ object_event 8, 13, SPRITE_ROCKER, STAY, DOWN, 2, OPP_JUGGLER, 7
+ object_event 7, 8, SPRITE_ROCKER, STAY, RIGHT, 3, OPP_JUGGLER, 3
+ object_event 1, 12, SPRITE_ROCKER, STAY, DOWN, 4, OPP_JUGGLER, 8
+ object_event 3, 5, SPRITE_ROCKER, STAY, UP, 5, OPP_TAMER, 1
+ object_event 8, 2, SPRITE_ROCKER, STAY, DOWN, 6, OPP_TAMER, 2
+ object_event 2, 7, SPRITE_ROCKER, STAY, LEFT, 7, OPP_JUGGLER, 4
+ object_event 7, 15, SPRITE_GYM_GUIDE, STAY, DOWN, 8 ; person
def_warps_to FUCHSIA_GYM