aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/SSAnne2F.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/SSAnne2F.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/SSAnne2F.asm')
-rw-r--r--data/maps/objects/SSAnne2F.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/data/maps/objects/SSAnne2F.asm b/data/maps/objects/SSAnne2F.asm
index e582252e..fa3a851f 100644
--- a/data/maps/objects/SSAnne2F.asm
+++ b/data/maps/objects/SSAnne2F.asm
@@ -15,7 +15,7 @@ SSAnne2F_Object:
def_bg_events
def_object_events
- object_event 3, 7, SPRITE_WAITER, WALK, UP_DOWN, 1 ; person
- object_event 36, 4, SPRITE_BLUE, STAY, DOWN, 2, OPP_RIVAL1, 1
+ object_event 3, 7, SPRITE_WAITER, WALK, UP_DOWN, 1 ; person
+ object_event 36, 4, SPRITE_BLUE, STAY, DOWN, 2, OPP_RIVAL1, 1
def_warps_to SS_ANNE_2F