summaryrefslogtreecommitdiff
path: root/data/mapObjects/pokemontower1.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/pokemontower1.asm')
-rwxr-xr-xdata/mapObjects/pokemontower1.asm30
1 files changed, 15 insertions, 15 deletions
diff --git a/data/mapObjects/pokemontower1.asm b/data/mapObjects/pokemontower1.asm
index fdddcd9c..036f0f13 100755
--- a/data/mapObjects/pokemontower1.asm
+++ b/data/mapObjects/pokemontower1.asm
@@ -1,21 +1,21 @@
PokemonTower1Object:
- db $1 ; border block
+ db 1 ; border block
- db $3 ; warps
- warp $a, $11, $1, $ff
- warp $b, $11, $1, $ff
- warp $12, $9, $1, POKEMONTOWER_2
+ db 3 ; warps
+ warp 10, 17, 1, -1
+ warp 11, 17, 1, -1
+ warp 18, 9, 1, POKEMONTOWER_2
- db $0 ; signs
+ db 0 ; signs
- db $5 ; objects
- object SPRITE_CABLE_CLUB_WOMAN, $f, $d, STAY, UP, $1 ; person
- object SPRITE_MOM_GEISHA, $6, $8, STAY, NONE, $2 ; person
- object SPRITE_BALDING_GUY, $8, $c, STAY, NONE, $3 ; person
- object SPRITE_GIRL, $d, $7, STAY, NONE, $4 ; person
- object SPRITE_MEDIUM, $11, $7, STAY, LEFT, $5 ; person
+ db 5 ; objects
+ object SPRITE_CABLE_CLUB_WOMAN, 15, 13, STAY, UP, 1 ; person
+ object SPRITE_MOM_GEISHA, 6, 8, STAY, NONE, 2 ; person
+ object SPRITE_BALDING_GUY, 8, 12, STAY, NONE, 3 ; person
+ object SPRITE_GIRL, 13, 7, STAY, NONE, 4 ; person
+ object SPRITE_MEDIUM, 17, 7, STAY, LEFT, 5 ; person
; warp-to
- warp_to $a, $11, POKEMONTOWER_1_WIDTH
- warp_to $b, $11, POKEMONTOWER_1_WIDTH
- warp_to $12, $9, POKEMONTOWER_1_WIDTH ; POKEMONTOWER_2
+ warp_to 10, 17, POKEMONTOWER_1_WIDTH
+ warp_to 11, 17, POKEMONTOWER_1_WIDTH
+ warp_to 18, 9, POKEMONTOWER_1_WIDTH ; POKEMONTOWER_2