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/cinnabargym.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/cinnabargym.asm')
| -rwxr-xr-x | data/mapObjects/cinnabargym.asm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/data/mapObjects/cinnabargym.asm b/data/mapObjects/cinnabargym.asm index d9b69192..2b9f34cb 100755 --- a/data/mapObjects/cinnabargym.asm +++ b/data/mapObjects/cinnabargym.asm @@ -8,7 +8,7 @@ CinnabarGymObject: ; 0x75acc (size=90) db $0 ; signs db $9 ; objects - object SPRITE_FAT_BALD_GUY, $3, $3, STAY, DOWN, $1, OPP_BLAINE, $1 + object SPRITE_MR_MASTERBALL, $3, $3, STAY, DOWN, $1, OPP_BLAINE, $1 object SPRITE_BLACK_HAIR_BOY_2, $11, $2, STAY, DOWN, $2, OPP_SUPER_NERD, $9 object SPRITE_BLACK_HAIR_BOY_2, $11, $8, STAY, DOWN, $3, OPP_BURGLAR, $4 object SPRITE_BLACK_HAIR_BOY_2, $b, $4, STAY, DOWN, $4, OPP_SUPER_NERD, $a |