summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorIIMarckus <iimarckus@gmail.com>2014-10-26 21:00:29 -0600
committerIIMarckus <iimarckus@gmail.com>2014-10-26 21:00:29 -0600
commit5ea1d8a61f8ba733f2438b963fdc30b766cd808f (patch)
tree2d18e20e70501f7700946b63af9cd7bf9321bb63 /data
parentb17d958e6016588ecc1f1f842ad2194dd7d7c4d9 (diff)
Labels for Fuji in Pokémon Tower.
Diffstat (limited to 'data')
-rwxr-xr-xdata/mapObjects/pokemontower7.asm7
1 files changed, 7 insertions, 0 deletions
diff --git a/data/mapObjects/pokemontower7.asm b/data/mapObjects/pokemontower7.asm
index 62974782..ca5aa669 100755
--- a/data/mapObjects/pokemontower7.asm
+++ b/data/mapObjects/pokemontower7.asm
@@ -6,11 +6,18 @@ 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