aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/CeladonMart3F.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/CeladonMart3F.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/CeladonMart3F.asm')
-rw-r--r--data/maps/objects/CeladonMart3F.asm10
1 files changed, 5 insertions, 5 deletions
diff --git a/data/maps/objects/CeladonMart3F.asm b/data/maps/objects/CeladonMart3F.asm
index c9f65f9a..e0b61e52 100644
--- a/data/maps/objects/CeladonMart3F.asm
+++ b/data/maps/objects/CeladonMart3F.asm
@@ -21,10 +21,10 @@ CeladonMart3F_Object:
bg_event 10, 1, 17 ; CeladonMart3Text17
def_object_events
- object_event 16, 5, SPRITE_CLERK, STAY, NONE, 1 ; person
- object_event 11, 6, SPRITE_GAMEBOY_KID, STAY, RIGHT, 2 ; person
- object_event 7, 2, SPRITE_GAMEBOY_KID, STAY, DOWN, 3 ; person
- object_event 8, 2, SPRITE_GAMEBOY_KID, STAY, DOWN, 4 ; person
- object_event 2, 5, SPRITE_LITTLE_BOY, STAY, UP, 5 ; person
+ object_event 16, 5, SPRITE_CLERK, STAY, NONE, 1 ; person
+ object_event 11, 6, SPRITE_GAMEBOY_KID, STAY, RIGHT, 2 ; person
+ object_event 7, 2, SPRITE_GAMEBOY_KID, STAY, DOWN, 3 ; person
+ object_event 8, 2, SPRITE_GAMEBOY_KID, STAY, DOWN, 4 ; person
+ object_event 2, 5, SPRITE_LITTLE_BOY, STAY, UP, 5 ; person
def_warps_to CELADON_MART_3F