diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-08-30 17:55:02 -0400 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-08-30 17:55:02 -0400 |
| commit | d2ed7674f499b1fd6c4059da40b8b42c6bf96995 (patch) | |
| tree | f581489b522fc647477d7b36dee072d553c44fd1 /data/mapObjects/ssanne6.asm | |
| parent | Make pokeyellow build to baserom. (diff) | |
| parent | Merge pull request #114 from YamaArashi/master (diff) | |
| download | pokeyellow-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/ssanne6.asm')
| -rwxr-xr-x | data/mapObjects/ssanne6.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/data/mapObjects/ssanne6.asm b/data/mapObjects/ssanne6.asm index 7724ab5c..159a3ed2 100755 --- a/data/mapObjects/ssanne6.asm +++ b/data/mapObjects/ssanne6.asm @@ -6,14 +6,14 @@ SSAnne6Object: ; 0x6181b (size=54) db $0 ; signs - db $7 ; people - db SPRITE_COOK, $8 + 4, $1 + 4, $fe, $1, $1 ; person - db SPRITE_COOK, $8 + 4, $5 + 4, $fe, $1, $2 ; person - db SPRITE_COOK, $7 + 4, $9 + 4, $fe, $1, $3 ; person - db SPRITE_COOK, $6 + 4, $d + 4, $ff, $ff, $4 ; person - db SPRITE_COOK, $8 + 4, $d + 4, $ff, $ff, $5 ; person - db SPRITE_COOK, $a + 4, $d + 4, $ff, $ff, $6 ; person - db SPRITE_COOK, $d + 4, $b + 4, $ff, $d1, $7 ; person + db $7 ; objects + object SPRITE_COOK, $1, $8, WALK, $1, $1 ; person + object SPRITE_COOK, $5, $8, WALK, $1, $2 ; person + object SPRITE_COOK, $9, $7, WALK, $1, $3 ; person + object SPRITE_COOK, $d, $6, STAY, NONE, $4 ; person + object SPRITE_COOK, $d, $8, STAY, NONE, $5 ; person + object SPRITE_COOK, $d, $a, STAY, NONE, $6 ; person + object SPRITE_COOK, $b, $d, STAY, UP, $7 ; person ; warp-to EVENT_DISP SS_ANNE_6_WIDTH, $0, $6 ; SS_ANNE_1 |