diff options
| author | Logan <log.butt@gmail.com> | 2016-05-30 00:54:10 +1200 |
|---|---|---|
| committer | Logan <log.butt@gmail.com> | 2016-05-30 00:54:10 +1200 |
| commit | 492c0961713e18f0828bc2f88bfc8cfff2b0b8ab (patch) | |
| tree | 6146e2a2f17c7325b5abef7af0bf082effe7453c /data/mapObjects | |
| parent | f71b489ad8c194a392ca79b07261816b61cb55e2 (diff) | |
Merge branch 'master' of https://github.com/einstein95/pokered
Diffstat (limited to 'data/mapObjects')
| -rwxr-xr-x | data/mapObjects/pokemontower7.asm | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/data/mapObjects/pokemontower7.asm b/data/mapObjects/pokemontower7.asm index fd1fc884..b7826b73 100755 --- a/data/mapObjects/pokemontower7.asm +++ b/data/mapObjects/pokemontower7.asm @@ -6,18 +6,11 @@ PokemonTower7Object: ; 0x60ef6 (size=42) db $0 ; signs -IF DEF(_YELLOW) - 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 -ELSE - db $4 ; objects + db 4 ; objects object SPRITE_ROCKET, $9, $b, STAY, RIGHT, $1, OPP_ROCKET, $13 object SPRITE_ROCKET, $c, $9, STAY, LEFT, $2, OPP_ROCKET, $14 object SPRITE_ROCKET, $9, $7, STAY, RIGHT, $3, OPP_ROCKET, $15 object SPRITE_MR_FUJI, $a, $3, STAY, DOWN, $4 ; person -ENDC ; warp-to EVENT_DISP POKEMONTOWER_7_WIDTH, $10, $9 ; POKEMONTOWER_6 |