aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/pokemontower7.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/pokemontower7.asm')
-rwxr-xr-xdata/mapObjects/pokemontower7.asm8
1 files changed, 0 insertions, 8 deletions
diff --git a/data/mapObjects/pokemontower7.asm b/data/mapObjects/pokemontower7.asm
index ca5aa669..a3e72093 100755
--- a/data/mapObjects/pokemontower7.asm
+++ b/data/mapObjects/pokemontower7.asm
@@ -6,18 +6,10 @@ PokemonTower7Object: ; 0x60ef6 (size=42)
db $0 ; signs
-IF DEF(_YELLOW)
db 3 ; people
db SPRITE_JESSIE, 8 + 4, $a + 4, $ff, $d0, 1
db SPRITE_JAMES, 8 + 4, $b + 4, $ff, $d0, 2
db SPRITE_MR_FUJI, 3 + 4, $a + 4, $ff, $d0, 3
-ELSE
- db $4 ; people
- db SPRITE_ROCKET, $b + 4, $9 + 4, $ff, $d3, TRAINER | $1, ROCKET + $C8, $13
- db SPRITE_ROCKET, $9 + 4, $c + 4, $ff, $d2, TRAINER | $2, ROCKET + $C8, $14
- db SPRITE_ROCKET, $7 + 4, $9 + 4, $ff, $d3, TRAINER | $3, ROCKET + $C8, $15
- db SPRITE_MR_FUJI, $3 + 4, $a + 4, $ff, $d0, $4 ; person
-ENDC
; warp-to
EVENT_DISP POKEMONTOWER_7_WIDTH, $10, $9 ; POKEMONTOWER_6