ref: fcb573f4ac006b73827b6fc317fc7501e17004ae
parent: eb1ca5813bc24e0d3d2c86d99f7f02c87bbb1955
author: Rangi <remy.oukaour+rangi42@gmail.com>
date: Tue Jul 14 10:33:16 EDT 2020
Use a macro for warp tile IDs, like other tile behaviors
--- a/data/tilesets/warp_carpet_tile_ids.asm
+++ b/data/tilesets/warp_carpet_tile_ids.asm
@@ -4,7 +4,7 @@
dw .FacingLeftWarpTiles
dw .FacingRightWarpTiles
-warp_tiles: MACRO
+warp_carpet_tiles: MACRO
REPT _NARG
db \1
shift
@@ -13,13 +13,13 @@
ENDM
.FacingDownWarpTiles:
- warp_tiles $01, $12, $17, $3D, $04, $18, $33
+ warp_carpet_tiles $01, $12, $17, $3D, $04, $18, $33
.FacingUpWarpTiles:
- warp_tiles $01, $5C
+ warp_carpet_tiles $01, $5C
.FacingLeftWarpTiles:
- warp_tiles $1A, $4B
+ warp_carpet_tiles $1A, $4B
.FacingRightWarpTiles:
- warp_tiles $0F, $4E
+ warp_carpet_tiles $0F, $4E
--- a/data/tilesets/warp_tile_ids.asm
+++ b/data/tilesets/warp_tile_ids.asm
@@ -24,10 +24,17 @@
dw .FacilityWarpTileIDs
dw .PlateauWarpTileIDs
-.OverworldWarpTileIDs:
- db $1B, $58
+warp_tiles: MACRO
+REPT _NARG
+ db \1
+ shift
+ENDR
db -1 ; end
+ENDM
+.OverworldWarpTileIDs:
+ warp_tiles $1B, $58
+
.ForestGateWarpTileIDs:
.MuseumWarpTileIDs:
.GateWarpTileIDs:
@@ -35,50 +42,39 @@
; fallthrough
.RedsHouse1WarpTileIDs:
.RedsHouse2WarpTileIDs:
- db $1A, $1C
- db -1 ; end
+ warp_tiles $1A, $1C
.MartWarpTileIDs:
.PokecenterWarpTileIDs:
- db $5E
- db -1 ; end
+ warp_tiles $5E
.ForestWarpTileIDs:
- db $5A, $5C, $3A
- db -1 ; end
+ warp_tiles $5A, $5C, $3A
.DojoWarpTileIDs:
.GymWarpTileIDs:
- db $4A
- db -1 ; end
+ warp_tiles $4A
.HouseWarpTileIDs:
- db $54, $5C, $32
- db -1 ; end
+ warp_tiles $54, $5C, $32
.ShipWarpTileIDs:
- db $37, $39, $1E, $4A
- db -1 ; end
+ warp_tiles $37, $39, $1E, $4A
.InteriorWarpTileIDs:
- db $15, $55, $04
- db -1 ; end
+ warp_tiles $15, $55, $04
.CavernWarpTileIDs:
- db $18, $1A, $22
- db -1 ; end
+ warp_tiles $18, $1A, $22
.LobbyWarpTileIDs:
- db $1A, $1C, $38
- db -1 ; end
+ warp_tiles $1A, $1C, $38
.MansionWarpTileIDs:
- db $1A, $1C, $53
- db -1 ; end
+ warp_tiles $1A, $1C, $53
.LabWarpTileIDs:
- db $34
- db -1 ; end
+ warp_tiles $34
.FacilityWarpTileIDs:
db $43, $58, $20
@@ -87,8 +83,7 @@
db $1B
; fallthrough
.UndergroundWarpTileIDs:
- db $13
- db -1 ; end
+ warp_tiles $13
.PlateauWarpTileIDs:
db $1B, $3B
@@ -95,4 +90,4 @@
; fallthrough
.ShipPortWarpTileIDs:
.ClubWarpTileIDs:
- db -1 ; end
+ warp_tiles ; end