aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/ssanne3.asm
diff options
context:
space:
mode:
authorluckytyphlosion <alan.rj.huang@gmail.com>2015-08-30 17:55:02 -0400
committerluckytyphlosion <alan.rj.huang@gmail.com>2015-08-30 17:55:02 -0400
commitd2ed7674f499b1fd6c4059da40b8b42c6bf96995 (patch)
treef581489b522fc647477d7b36dee072d553c44fd1 /data/mapObjects/ssanne3.asm
parentMake pokeyellow build to baserom. (diff)
parentMerge pull request #114 from YamaArashi/master (diff)
downloadpokeyellow-d2ed7674f499b1fd6c4059da40b8b42c6bf96995.tar.gz
pokeyellow-d2ed7674f499b1fd6c4059da40b8b42c6bf96995.tar.xz
pokeyellow-d2ed7674f499b1fd6c4059da40b8b42c6bf96995.zip
Merge branch 'master' of https://github.com/iimarckus/pokered
Doesn't build.
Diffstat (limited to 'data/mapObjects/ssanne3.asm')
-rwxr-xr-xdata/mapObjects/ssanne3.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/data/mapObjects/ssanne3.asm b/data/mapObjects/ssanne3.asm
index 2068304d..1037d118 100755
--- a/data/mapObjects/ssanne3.asm
+++ b/data/mapObjects/ssanne3.asm
@@ -7,8 +7,8 @@ SSAnne3Object: ; 0x4493c (size=26)
db $0 ; signs
- db $1 ; people
- db SPRITE_SAILOR, $3 + 4, $9 + 4, $fe, $2, $1 ; person
+ db $1 ; objects
+ object SPRITE_SAILOR, $9, $3, WALK, $2, $1 ; person
; warp-to
EVENT_DISP SS_ANNE_3_WIDTH, $3, $0 ; SS_ANNE_5