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/pokemontower7.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/pokemontower7.asm')
| -rwxr-xr-x | data/mapObjects/pokemontower7.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/data/mapObjects/pokemontower7.asm b/data/mapObjects/pokemontower7.asm index a77d1d1e..4d1e26c2 100755 --- a/data/mapObjects/pokemontower7.asm +++ b/data/mapObjects/pokemontower7.asm @@ -6,10 +6,10 @@ PokemonTower7Object: ; 0x60ef6 (size=42) db $0 ; signs - db 3 ; objects - object SPRITE_JESSIE, $a 8, 8, STAY, DOWN, 1 - object SPRITE_JAMES, $b, 8, STAY, DOWN, 2 - object SPRITE_MR_FUJI, $a, 3, STAY, DOWN, 3 + db $3 ; objects + object SPRITE_JESSIE, $a, $8, STAY, DOWN, $1 + object SPRITE_JAMES, $b, $8, STAY, DOWN, $2 + object SPRITE_MR_FUJI, $a, $3, STAY, DOWN, $3 ; warp-to EVENT_DISP POKEMONTOWER_7_WIDTH, $10, $9 ; POKEMONTOWER_6 |