aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/pokemontower7.asm
diff options
context:
space:
mode:
authorU-Fish-PC\Daniel <corrnondacqb@yahoo.com>2014-05-21 15:49:59 -0400
committerU-Fish-PC\Daniel <corrnondacqb@yahoo.com>2014-05-21 15:49:59 -0400
commita02c3279102dca60deee70141c31af9fcfa1ff75 (patch)
tree66ee36f2019b9a862363f36346eb229ce9bfe54a /data/mapObjects/pokemontower7.asm
parentMore misc relabelling (diff)
downloadpokeyellow-a02c3279102dca60deee70141c31af9fcfa1ff75.tar.gz
pokeyellow-a02c3279102dca60deee70141c31af9fcfa1ff75.tar.xz
pokeyellow-a02c3279102dca60deee70141c31af9fcfa1ff75.zip
Use more constants in object data
Diffstat (limited to 'data/mapObjects/pokemontower7.asm')
-rwxr-xr-xdata/mapObjects/pokemontower7.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/data/mapObjects/pokemontower7.asm b/data/mapObjects/pokemontower7.asm
index b6815a64..62974782 100755
--- a/data/mapObjects/pokemontower7.asm
+++ b/data/mapObjects/pokemontower7.asm
@@ -7,9 +7,9 @@ PokemonTower7Object: ; 0x60ef6 (size=42)
db $0 ; signs
db $4 ; people
- db SPRITE_ROCKET, $b + 4, $9 + 4, $ff, $d3, $41, ROCKET + $C8, $13 ; trainer
- db SPRITE_ROCKET, $9 + 4, $c + 4, $ff, $d2, $42, ROCKET + $C8, $14 ; trainer
- db SPRITE_ROCKET, $7 + 4, $9 + 4, $ff, $d3, $43, ROCKET + $C8, $15 ; trainer
+ 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
; warp-to