aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/CinnabarLabTradeRoom.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/CinnabarLabTradeRoom.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/CinnabarLabTradeRoom.asm')
-rw-r--r--data/maps/objects/CinnabarLabTradeRoom.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/data/maps/objects/CinnabarLabTradeRoom.asm b/data/maps/objects/CinnabarLabTradeRoom.asm
index d117af51..bbb66069 100644
--- a/data/maps/objects/CinnabarLabTradeRoom.asm
+++ b/data/maps/objects/CinnabarLabTradeRoom.asm
@@ -8,8 +8,8 @@ CinnabarLabTradeRoom_Object:
def_bg_events
def_object_events
- object_event 3, 2, SPRITE_SUPER_NERD, STAY, DOWN, 1 ; person
- object_event 1, 4, SPRITE_GRAMPS, STAY, NONE, 2 ; person
- object_event 5, 5, SPRITE_BEAUTY, STAY, UP, 3 ; person
+ object_event 3, 2, SPRITE_SUPER_NERD, STAY, DOWN, 1 ; person
+ object_event 1, 4, SPRITE_GRAMPS, STAY, NONE, 2 ; person
+ object_event 5, 5, SPRITE_BEAUTY, STAY, UP, 3 ; person
def_warps_to CINNABAR_LAB_TRADE_ROOM