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/copycatshouse2f.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/copycatshouse2f.asm')
| -rwxr-xr-x | data/mapObjects/copycatshouse2f.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/data/mapObjects/copycatshouse2f.asm b/data/mapObjects/copycatshouse2f.asm index 3d0432c6..204c429f 100755 --- a/data/mapObjects/copycatshouse2f.asm +++ b/data/mapObjects/copycatshouse2f.asm @@ -8,12 +8,12 @@ CopycatsHouse2FObject: ; 0x5cd21 (size=48) db $5, $3, $6 ; CopycatsHouse2FText6 db $1, $0, $7 ; CopycatsHouse2FText7 - db $5 ; people - db SPRITE_BRUNETTE_GIRL, $3 + 4, $4 + 4, $fe, $0, $1 ; person - db SPRITE_BIRD, $6 + 4, $4 + 4, $fe, $2, $2 ; person - db SPRITE_SLOWBRO, $1 + 4, $5 + 4, $ff, $d0, $3 ; person - db SPRITE_BIRD, $0 + 4, $2 + 4, $ff, $d0, $4 ; person - db SPRITE_CLEFAIRY, $6 + 4, $1 + 4, $ff, $d3, $5 ; person + db $5 ; objects + object SPRITE_BRUNETTE_GIRL, $4, $3, WALK, $0, $1 ; person + object SPRITE_BIRD, $4, $6, WALK, $2, $2 ; person + object SPRITE_SLOWBRO, $5, $1, STAY, DOWN, $3 ; person + object SPRITE_BIRD, $2, $0, STAY, DOWN, $4 ; person + object SPRITE_CLEFAIRY, $1, $6, STAY, RIGHT, $5 ; person ; warp-to EVENT_DISP COPYCATS_HOUSE_2F_WIDTH, $1, $7 ; COPYCATS_HOUSE_1F |