From 5ea1d8a61f8ba733f2438b963fdc30b766cd808f Mon Sep 17 00:00:00 2001 From: IIMarckus Date: Sun, 26 Oct 2014 21:00:29 -0600 Subject: =?UTF-8?q?Labels=20for=20Fuji=20in=20Pok=C3=A9mon=20Tower.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/mapObjects/pokemontower7.asm | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'data/mapObjects') 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 -- cgit v1.2.3