diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-11-21 17:37:36 -0500 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-11-21 17:37:36 -0500 |
| commit | 7e0a4968b35c3f76dee9570ce2113ee1070a653c (patch) | |
| tree | 76bdaa63c5c1a751c305fb935fc72ac032b3ce70 /data/mapObjects | |
| parent | db8741635917237d6bc96d5260034953b7344b8e (diff) | |
LoadPokedexTilePatterns and engine/overworld/map_sprites.asm
Also replace dummy sprites and fix replace.sh to only parse .asm files
Diffstat (limited to 'data/mapObjects')
| -rwxr-xr-x | data/mapObjects/celadonmart3.asm | 6 | ||||
| -rwxr-xr-x | data/mapObjects/route2house.asm | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/data/mapObjects/celadonmart3.asm b/data/mapObjects/celadonmart3.asm index 5e11a62c..36760d25 100755 --- a/data/mapObjects/celadonmart3.asm +++ b/data/mapObjects/celadonmart3.asm @@ -22,9 +22,9 @@ CeladonMart3Object: ; 0x482c4 (size=94) db $5 ; objects object SPRITE_MART_GUY, $10, $5, STAY, NONE, $1 ; person - object SPRITE_GAMEBOY_KID_COPY, $b, $6, STAY, RIGHT, $2 ; person - object SPRITE_GAMEBOY_KID_COPY, $7, $2, STAY, DOWN, $3 ; person - object SPRITE_GAMEBOY_KID_COPY, $8, $2, STAY, DOWN, $4 ; person + object SPRITE_GAMEBOY_KID, $b, $6, STAY, RIGHT, $2 ; person + object SPRITE_GAMEBOY_KID, $7, $2, STAY, DOWN, $3 ; person + object SPRITE_GAMEBOY_KID, $8, $2, STAY, DOWN, $4 ; person object SPRITE_YOUNG_BOY, $2, $5, STAY, UP, $5 ; person ; warp-to diff --git a/data/mapObjects/route2house.asm b/data/mapObjects/route2house.asm index b8d6d20f..463d9a1a 100755 --- a/data/mapObjects/route2house.asm +++ b/data/mapObjects/route2house.asm @@ -9,7 +9,7 @@ Route2HouseObject: ; 0x1df07 (size=32) db $2 ; objects object SPRITE_OAK_AIDE, $2, $4, STAY, RIGHT, $1 ; person - object SPRITE_GAMEBOY_KID_COPY, $4, $1, STAY, DOWN, $2 ; person + object SPRITE_GAMEBOY_KID, $4, $1, STAY, DOWN, $2 ; person ; warp-to EVENT_DISP ROUTE_2_HOUSE_WIDTH, $7, $2 |