diff options
| author | U-Daniel-PC\Daniel <corrnondacqb@yahoo.com> | 2015-06-06 13:51:06 -0500 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-08-01 17:32:39 -0400 |
| commit | 8f2edd9c413d09c4ec74abab7e2af0a2fcc5d951 (patch) | |
| tree | 08106f9eec9cff1137269c20ccf848cfeffa71c6 /data/mapObjects/pokemontower7.asm | |
| parent | text.o (diff) | |
| download | pokeyellow-8f2edd9c413d09c4ec74abab7e2af0a2fcc5d951.tar.gz pokeyellow-8f2edd9c413d09c4ec74abab7e2af0a2fcc5d951.tar.xz pokeyellow-8f2edd9c413d09c4ec74abab7e2af0a2fcc5d951.zip | |
Build only Yellow
Conflicts:
gfx/intro_nido_1.6x6.png
gfx/intro_nido_2.6x6.png
gfx/intro_nido_3.6x6.png
gfx/redgreenversion.png
text.asm
text/maps/cerulean_trade_house.asm
text/maps/copycats_house_1f.asm
text/maps/daycare_2.asm
text/maps/museum_2f.asm
text/maps/oaks_lab.asm
text/maps/pewter_gym.asm
text/maps/route_9_1.asm
text/maps/school.asm
text/maps/vermilion_gym_1.asm
yellow/main.asm
Diffstat (limited to 'data/mapObjects/pokemontower7.asm')
| -rwxr-xr-x | data/mapObjects/pokemontower7.asm | 8 |
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 |