summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpikalaxalt <PikalaxALT@gmail.com>2016-05-13 18:00:38 -0400
committerpikalaxalt <PikalaxALT@gmail.com>2016-05-13 18:00:38 -0400
commit3fe60f77935c0891bae2a10184ec85f0ca066111 (patch)
tree10ea9717d9cd7a9e0fb83bb902749cb508c7d994
parent31b118ab428a7ed88a62b31870a1946f7dbcd2d2 (diff)
Remove the last remaining IF DEF(_YELLOW)
-rwxr-xr-xdata/mapObjects/pokemontower7.asm9
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