summaryrefslogtreecommitdiff
path: root/data/mapObjects/pallettown.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/pallettown.asm')
-rwxr-xr-xdata/mapObjects/pallettown.asm20
1 files changed, 10 insertions, 10 deletions
diff --git a/data/mapObjects/pallettown.asm b/data/mapObjects/pallettown.asm
index d02cbae2..c6158b68 100755
--- a/data/mapObjects/pallettown.asm
+++ b/data/mapObjects/pallettown.asm
@@ -2,15 +2,15 @@ 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
+ warp $5, $5, $0, REDS_HOUSE_1F
+ warp $d, $5, $0, BLUES_HOUSE
+ warp $c, $b, $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
+ sign $d, $d, $4 ; PalletTownText4
+ sign $7, $9, $5 ; PalletTownText5
+ sign $3, $5, $6 ; PalletTownText6
+ sign $b, $5, $7 ; PalletTownText7
db $3 ; objects
object SPRITE_OAK, $8, $5, STAY, NONE, $1 ; person
@@ -18,6 +18,6 @@ PalletTownObject:
object SPRITE_FISHER2, $b, $e, 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 $d, $5, PALLET_TOWN_WIDTH ; BLUES_HOUSE
+ warp_to $c, $b, PALLET_TOWN_WIDTH ; OAKS_LAB