From f37cf959c930ae9595f9f71ce0d9b17dcf5421d0 Mon Sep 17 00:00:00 2001 From: Rangi Date: Tue, 14 Jul 2020 10:21:18 -0400 Subject: Clean up some data, using macros for multiline list entries --- data/tilesets/warp_tile_ids.asm | 177 +++++++++++++++++++++------------------- 1 file changed, 95 insertions(+), 82 deletions(-) (limited to 'data/tilesets/warp_tile_ids.asm') diff --git a/data/tilesets/warp_tile_ids.asm b/data/tilesets/warp_tile_ids.asm index 6fd326cc..bf19090b 100755 --- a/data/tilesets/warp_tile_ids.asm +++ b/data/tilesets/warp_tile_ids.asm @@ -1,85 +1,98 @@ WarpTileIDPointers: - dw OverworldWarpTileIDs - dw RedsHouse1WarpTileIDs - dw MartWarpTileIDs - dw ForestWarpTileIDs - dw RedsHouse2WarpTileIDs - dw DojoWarpTileIDs - dw PokecenterWarpTileIDs - dw GymWarpTileIDs - dw HouseWarpTileIDs - dw ForestGateWarpTileIDs - dw MuseumWarpTileIDs - dw UndergroundWarpTileIDs - dw GateWarpTileIDs - dw ShipWarpTileIDs - dw ShipPortWarpTileIDs - dw CemeteryWarpTileIDs - dw InteriorWarpTileIDs - dw CavernWarpTileIDs - dw LobbyWarpTileIDs - dw MansionWarpTileIDs - dw LabWarpTileIDs - dw ClubWarpTileIDs - dw FacilityWarpTileIDs - dw PlateauWarpTileIDs - -OverworldWarpTileIDs: - db $1B,$58,$FF - -ForestGateWarpTileIDs: -MuseumWarpTileIDs: -GateWarpTileIDs: + dw .OverworldWarpTileIDs + dw .RedsHouse1WarpTileIDs + dw .MartWarpTileIDs + dw .ForestWarpTileIDs + dw .RedsHouse2WarpTileIDs + dw .DojoWarpTileIDs + dw .PokecenterWarpTileIDs + dw .GymWarpTileIDs + dw .HouseWarpTileIDs + dw .ForestGateWarpTileIDs + dw .MuseumWarpTileIDs + dw .UndergroundWarpTileIDs + dw .GateWarpTileIDs + dw .ShipWarpTileIDs + dw .ShipPortWarpTileIDs + dw .CemeteryWarpTileIDs + dw .InteriorWarpTileIDs + dw .CavernWarpTileIDs + dw .LobbyWarpTileIDs + dw .MansionWarpTileIDs + dw .LabWarpTileIDs + dw .ClubWarpTileIDs + dw .FacilityWarpTileIDs + dw .PlateauWarpTileIDs + +.OverworldWarpTileIDs: + db $1B, $58 + db -1 ; end + +.ForestGateWarpTileIDs: +.MuseumWarpTileIDs: +.GateWarpTileIDs: db $3B - -RedsHouse1WarpTileIDs: -RedsHouse2WarpTileIDs: - db $1A,$1C,$FF - -MartWarpTileIDs: -PokecenterWarpTileIDs: - db $5E,$FF - -ForestWarpTileIDs: - db $5A,$5C,$3A,$FF - -DojoWarpTileIDs: -GymWarpTileIDs: - db $4A,$FF - -HouseWarpTileIDs: - db $54,$5C,$32,$FF - -ShipWarpTileIDs: - db $37,$39,$1E,$4A,$FF - -InteriorWarpTileIDs: - db $15,$55,$04,$FF - -CavernWarpTileIDs: - db $18,$1A,$22,$FF - -LobbyWarpTileIDs: - db $1A,$1C,$38,$FF - -MansionWarpTileIDs: - db $1A,$1C,$53,$FF - -LabWarpTileIDs: - db $34,$FF - -FacilityWarpTileIDs: - db $43,$58,$20 - -CemeteryWarpTileIDs: + ; fallthrough +.RedsHouse1WarpTileIDs: +.RedsHouse2WarpTileIDs: + db $1A, $1C + db -1 ; end + +.MartWarpTileIDs: +.PokecenterWarpTileIDs: + db $5E + db -1 ; end + +.ForestWarpTileIDs: + db $5A, $5C, $3A + db -1 ; end + +.DojoWarpTileIDs: +.GymWarpTileIDs: + db $4A + db -1 ; end + +.HouseWarpTileIDs: + db $54, $5C, $32 + db -1 ; end + +.ShipWarpTileIDs: + db $37, $39, $1E, $4A + db -1 ; end + +.InteriorWarpTileIDs: + db $15, $55, $04 + db -1 ; end + +.CavernWarpTileIDs: + db $18, $1A, $22 + db -1 ; end + +.LobbyWarpTileIDs: + db $1A, $1C, $38 + db -1 ; end + +.MansionWarpTileIDs: + db $1A, $1C, $53 + db -1 ; end + +.LabWarpTileIDs: + db $34 + db -1 ; end + +.FacilityWarpTileIDs: + db $43, $58, $20 + ; fallthrough +.CemeteryWarpTileIDs: db $1B - -UndergroundWarpTileIDs: - db $13,$FF - -PlateauWarpTileIDs: - db $1B,$3B - -ShipPortWarpTileIDs: -ClubWarpTileIDs: - db $FF + ; fallthrough +.UndergroundWarpTileIDs: + db $13 + db -1 ; end + +.PlateauWarpTileIDs: + db $1B, $3B + ; fallthrough +.ShipPortWarpTileIDs: +.ClubWarpTileIDs: + db -1 ; end -- cgit v1.3.1-sl0p From fcb573f4ac006b73827b6fc317fc7501e17004ae Mon Sep 17 00:00:00 2001 From: Rangi Date: Tue, 14 Jul 2020 14:33:16 -0400 Subject: Use a macro for warp tile IDs, like other tile behaviors --- data/tilesets/warp_carpet_tile_ids.asm | 10 +++---- data/tilesets/warp_tile_ids.asm | 49 +++++++++++++++------------------- 2 files changed, 27 insertions(+), 32 deletions(-) (limited to 'data/tilesets/warp_tile_ids.asm') diff --git a/data/tilesets/warp_carpet_tile_ids.asm b/data/tilesets/warp_carpet_tile_ids.asm index 3929a97c..be327599 100644 --- a/data/tilesets/warp_carpet_tile_ids.asm +++ b/data/tilesets/warp_carpet_tile_ids.asm @@ -4,7 +4,7 @@ WarpTileListPointers: dw .FacingLeftWarpTiles dw .FacingRightWarpTiles -warp_tiles: MACRO +warp_carpet_tiles: MACRO REPT _NARG db \1 shift @@ -13,13 +13,13 @@ ENDR 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 diff --git a/data/tilesets/warp_tile_ids.asm b/data/tilesets/warp_tile_ids.asm index bf19090b..db005dcf 100755 --- a/data/tilesets/warp_tile_ids.asm +++ b/data/tilesets/warp_tile_ids.asm @@ -24,9 +24,16 @@ WarpTileIDPointers: 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: @@ -35,50 +42,39 @@ WarpTileIDPointers: ; 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,12 +83,11 @@ WarpTileIDPointers: db $1B ; fallthrough .UndergroundWarpTileIDs: - db $13 - db -1 ; end + warp_tiles $13 .PlateauWarpTileIDs: db $1B, $3B ; fallthrough .ShipPortWarpTileIDs: .ClubWarpTileIDs: - db -1 ; end + warp_tiles ; end -- cgit v1.3.1-sl0p