summaryrefslogtreecommitdiff
path: root/data/mapObjects/pallettown.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/pallettown.asm')
-rwxr-xr-xdata/mapObjects/pallettown.asm32
1 files changed, 16 insertions, 16 deletions
diff --git a/data/mapObjects/pallettown.asm b/data/mapObjects/pallettown.asm
index d02cbae2..1bd3d62b 100755
--- a/data/mapObjects/pallettown.asm
+++ b/data/mapObjects/pallettown.asm
@@ -1,23 +1,23 @@
PalletTownObject:
db $b ; border block
- db $3 ; warps
- db $5, $5, $0, REDS_HOUSE_1F
- db $5, $d, $0, BLUES_HOUSE
- db $b, $c, $1, OAKS_LAB
+ db 3 ; warps
+ warp 5, 5, 0, REDS_HOUSE_1F
+ warp 13, 5, 0, BLUES_HOUSE
+ warp 12, 11, 1, OAKS_LAB
- db $4 ; signs
- db $d, $d, $4 ; PalletTownText4
- db $9, $7, $5 ; PalletTownText5
- db $5, $3, $6 ; PalletTownText6
- db $5, $b, $7 ; PalletTownText7
+ db 4 ; signs
+ sign 13, 13, 4 ; PalletTownText4
+ sign 7, 9, 5 ; PalletTownText5
+ sign 3, 5, 6 ; PalletTownText6
+ sign 11, 5, 7 ; PalletTownText7
- db $3 ; objects
- object SPRITE_OAK, $8, $5, STAY, NONE, $1 ; person
- object SPRITE_GIRL, $3, $8, WALK, $0, $2 ; person
- object SPRITE_FISHER2, $b, $e, WALK, $0, $3 ; person
+ db 3 ; objects
+ object SPRITE_OAK, 8, 5, STAY, NONE, 1 ; person
+ object SPRITE_GIRL, 3, 8, WALK, 0, 2 ; person
+ object SPRITE_FISHER2, 11, 14, WALK, 0, 3 ; person
; warp-to
- EVENT_DISP PALLET_TOWN_WIDTH, $5, $5 ; REDS_HOUSE_1F
- EVENT_DISP PALLET_TOWN_WIDTH, $5, $d ; BLUES_HOUSE
- EVENT_DISP PALLET_TOWN_WIDTH, $b, $c ; OAKS_LAB
+ warp_to 5, 5, PALLET_TOWN_WIDTH ; REDS_HOUSE_1F
+ warp_to 13, 5, PALLET_TOWN_WIDTH ; BLUES_HOUSE
+ warp_to 12, 11, PALLET_TOWN_WIDTH ; OAKS_LAB