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/celadonmart4.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/celadonmart4.asm')
| -rwxr-xr-x | data/mapObjects/celadonmart4.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/data/mapObjects/celadonmart4.asm b/data/mapObjects/celadonmart4.asm index 5bdbbf4a..7dce43dc 100755 --- a/data/mapObjects/celadonmart4.asm +++ b/data/mapObjects/celadonmart4.asm @@ -9,10 +9,10 @@ CeladonMart4Object: ; 0x48370 (size=49) db $1 ; signs db $1, $e, $4 ; CeladonMart4Text4 - db $3 ; people - db SPRITE_MART_GUY, $7 + 4, $5 + 4, $ff, $ff, $1 ; person - db SPRITE_BLACK_HAIR_BOY_2, $5 + 4, $f + 4, $fe, $2, $2 ; person - db SPRITE_BUG_CATCHER, $2 + 4, $5 + 4, $fe, $2, $3 ; person + db $3 ; objects + object SPRITE_MART_GUY, $5, $7, STAY, NONE, $1 ; person + object SPRITE_BLACK_HAIR_BOY_2, $f, $5, WALK, $2, $2 ; person + object SPRITE_BUG_CATCHER, $5, $2, WALK, $2, $3 ; person ; warp-to EVENT_DISP CELADON_MART_4_WIDTH, $1, $c ; CELADON_MART_3 |