diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2016-06-03 17:54:53 -0400 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2016-06-03 17:54:53 -0400 |
| commit | 8cdf73265f95e9a55112f373804867244512878d (patch) | |
| tree | 64f4263b86839e1eb9770688ad890683fa89c503 /data/mapObjects/indigoplateaulobby.asm | |
| parent | Update extras with fixed gbz80disasm.py (diff) | |
| parent | Fix tileset incbin statement alignment (diff) | |
| download | pokeyellow-8cdf73265f95e9a55112f373804867244512878d.tar.gz pokeyellow-8cdf73265f95e9a55112f373804867244512878d.tar.xz pokeyellow-8cdf73265f95e9a55112f373804867244512878d.zip | |
Merge pull request #10 from PikalaxALT/master
Next batch of scripts, etc.
Diffstat (limited to 'data/mapObjects/indigoplateaulobby.asm')
| -rwxr-xr-x | data/mapObjects/indigoplateaulobby.asm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/data/mapObjects/indigoplateaulobby.asm b/data/mapObjects/indigoplateaulobby.asm index dfcd97b7..c41e2cfc 100755 --- a/data/mapObjects/indigoplateaulobby.asm +++ b/data/mapObjects/indigoplateaulobby.asm @@ -8,12 +8,13 @@ IndigoPlateauLobbyObject: ; 0x19c95 (size=58) db $0 ; signs - db $5 ; objects + db $6 ; objects object SPRITE_NURSE, $7, $5, STAY, DOWN, $1 ; person object SPRITE_GYM_HELPER, $4, $9, STAY, RIGHT, $2 ; person object SPRITE_LASS, $5, $1, STAY, DOWN, $3 ; person object SPRITE_MART_GUY, $0, $5, STAY, RIGHT, $4 ; person object SPRITE_CABLE_CLUB_WOMAN, $d, $6, STAY, DOWN, $5 ; person + object SPRITE_CHANSEY, $8, $5, STAY, DOWN, $6 ; person ; warp-to EVENT_DISP INDIGO_PLATEAU_LOBBY_WIDTH, $b, $7 |