Split tilesets/ into gfx/tilesets and data/tilesets/

This commit is contained in:
Remy Oukaour 2018-01-09 23:53:58 -05:00
parent e943ac3308
commit 9af6d8d0f1
124 changed files with 135 additions and 130 deletions

View File

@ -1,10 +1,10 @@
; collision permissions (see tilesets/collision_permissions.asm) ; collision permissions (see data/collision_permissions.asm)
LANDTILE EQU $00 LANDTILE EQU $00
WATERTILE EQU $01 WATERTILE EQU $01
WALLTILE EQU $0f WALLTILE EQU $0f
TALK EQU $10 TALK EQU $10
; collision data types (see tilesets/*_collision.asm) ; collision data types (see data/tilesets/*_collision.asm)
; TileCollisionTable indexes (see data/collision_permissions.asm) ; TileCollisionTable indexes (see data/collision_permissions.asm)
COLL_FLOOR EQU $00 COLL_FLOOR EQU $00
COLL_01 EQU $01 ; garbage COLL_01 EQU $01 ; garbage
@ -28,19 +28,19 @@ COLL_CUT_28 EQU $28 ; garbage
COLL_WATER EQU $29 COLL_WATER EQU $29
COLL_ICE_2B EQU $2b ; unused COLL_ICE_2B EQU $2b ; unused
COLL_WHIRLPOOL_2C EQU $2c ; unused COLL_WHIRLPOOL_2C EQU $2c ; unused
COLL_WATERFALL_RIGHT EQU $30 ; unused !!! COLL_WATERFALL_RIGHT EQU $30 ; unused
COLL_WATERFALL_LEFT EQU $31 ; unused !!! COLL_WATERFALL_LEFT EQU $31 ; unused
COLL_WATERFALL_UP EQU $32 ; unused !!! COLL_WATERFALL_UP EQU $32 ; unused
COLL_WATERFALL EQU $33 COLL_WATERFALL EQU $33
COLL_CURRENT_RIGHT EQU $38 ; unused !!! COLL_CURRENT_RIGHT EQU $38 ; unused
COLL_CURRENT_LEFT EQU $39 ; unused !!! COLL_CURRENT_LEFT EQU $39 ; unused
COLL_CURRENT_UP EQU $3a ; unused !!! COLL_CURRENT_UP EQU $3a ; unused
COLL_CURRENT_DOWN EQU $3b ; unused !!! COLL_CURRENT_DOWN EQU $3b ; unused
COLL_BRAKE EQU $40 ; unused !!! COLL_BRAKE EQU $40 ; unused
COLL_WALK_RIGHT EQU $41 ; unused !!! COLL_WALK_RIGHT EQU $41 ; unused
COLL_WALK_LEFT EQU $42 ; unused !!! COLL_WALK_LEFT EQU $42 ; unused
COLL_WALK_UP EQU $43 ; unused !!! COLL_WALK_UP EQU $43 ; unused
COLL_WALK_DOWN EQU $44 ; unused !!! COLL_WALK_DOWN EQU $44 ; unused
COLL_BRAKE_45 EQU $45 ; garbage COLL_BRAKE_45 EQU $45 ; garbage
COLL_BRAKE_46 EQU $46 ; unused COLL_BRAKE_46 EQU $46 ; unused
COLL_BRAKE_47 EQU $47 ; unused COLL_BRAKE_47 EQU $47 ; unused
@ -92,16 +92,16 @@ COLL_WINDOW EQU $9d
COLL_INCENSE_BURNER EQU $9f COLL_INCENSE_BURNER EQU $9f
COLL_HOP_RIGHT EQU $a0 COLL_HOP_RIGHT EQU $a0
COLL_HOP_LEFT EQU $a1 COLL_HOP_LEFT EQU $a1
COLL_HOP_UP EQU $a2 ; unused !!! COLL_HOP_UP EQU $a2 ; unused
COLL_HOP_DOWN EQU $a3 COLL_HOP_DOWN EQU $a3
COLL_HOP_DOWN_RIGHT EQU $a4 COLL_HOP_DOWN_RIGHT EQU $a4
COLL_HOP_DOWN_LEFT EQU $a5 COLL_HOP_DOWN_LEFT EQU $a5
COLL_HOP_UP_RIGHT EQU $a6 ; unused !!! COLL_HOP_UP_RIGHT EQU $a6 ; unused
COLL_HOP_UP_LEFT EQU $a7 ; unused !!! COLL_HOP_UP_LEFT EQU $a7 ; unused
COLL_RIGHT_WALL EQU $b0 COLL_RIGHT_WALL EQU $b0
COLL_LEFT_WALL EQU $b1 COLL_LEFT_WALL EQU $b1
COLL_UP_WALL EQU $b2 COLL_UP_WALL EQU $b2
COLL_DOWN_WALL EQU $b3 ; unused !!! COLL_DOWN_WALL EQU $b3 ; unused
COLL_FF EQU $ff ; garbage COLL_FF EQU $ff ; garbage
; collision data type nybbles ; collision data type nybbles

View File

@ -1,4 +1,4 @@
; Tilesets indexes (see tilesets/tilesets.asm) ; Tilesets indexes (see data/tilesets.asm)
const_value set 1 const_value set 1
const TILESET_JOHTO_1 ; 01 const TILESET_JOHTO_1 ; 01
const TILESET_JOHTO_2 ; 02 const TILESET_JOHTO_2 ; 02
@ -37,7 +37,7 @@ const_value set 1
const TILESET_OMANYTE_WORD_ROOM ; 23 const TILESET_OMANYTE_WORD_ROOM ; 23
const TILESET_AERODACTYL_WORD_ROOM ; 24 const TILESET_AERODACTYL_WORD_ROOM ; 24
; bg palette values (see tilesets/*_palette_map.asm) ; bg palette values (see gfx/tilesets/*_palette_map.asm)
const_def const_def
const PAL_BG_GRAY ; 0 const PAL_BG_GRAY ; 0
const PAL_BG_RED ; 1 const PAL_BG_RED ; 1

View File

@ -2,6 +2,7 @@
; Maps with environment ROUTE or TOWN can only use these sprites. ; Maps with environment ROUTE or TOWN can only use these sprites.
OutdoorSprites: ; 144b8 OutdoorSprites: ; 144b8
; entries correspond to map groups
dw OlivineGroupSprites dw OlivineGroupSprites
dw MahoganyGroupSprites dw MahoganyGroupSprites
dw DungeonsGroupSprites dw DungeonsGroupSprites

View File

@ -1,5 +1,6 @@
MapGroupRoofs: ; 1c021i MapGroupRoofs: ; 1c021i
; entries correspond to Roofs (see below) ; entries correspond to map groups
; values are indexes for Roofs (see below)
db -1 ; group 0 (unused) db -1 ; group 0 (unused)
db 3 ; group 1 (Olivine) db 3 ; group 1 (Olivine)
db 2 ; group 2 (Mahogany) db 2 ; group 2 (Mahogany)

View File

@ -1,5 +1,5 @@
tilecoll: MACRO tilecoll: MACRO
; used in tilesets/*_collision.asm ; used in data/tilesets/*_collision.asm
db COLL_\1, COLL_\2, COLL_\3, COLL_\4 db COLL_\1, COLL_\2, COLL_\3, COLL_\4
ENDM ENDM
@ -11,11 +11,11 @@ INCBIN "gfx/tilesets/kanto.2bpp.lz"
; 0x18606 ; 0x18606
TilesetKantoMeta: ; 0x18606 TilesetKantoMeta: ; 0x18606
INCBIN "tilesets/kanto_metatiles.bin" INCBIN "data/tilesets/kanto_metatiles.bin"
; 0x18e06 ; 0x18e06
TilesetKantoColl: ; 0x18e06 TilesetKantoColl: ; 0x18e06
INCLUDE "tilesets/kanto_collision.asm" INCLUDE "data/tilesets/kanto_collision.asm"
; 0x19006 ; 0x19006
Tileset0GFX: ; 0x19006 Tileset0GFX: ; 0x19006
@ -25,12 +25,12 @@ INCBIN "gfx/tilesets/johto_1.2bpp.lz"
Tileset0Meta: ; 0x19c0e Tileset0Meta: ; 0x19c0e
TilesetJohto1Meta: ; 0x19c0e TilesetJohto1Meta: ; 0x19c0e
INCBIN "tilesets/johto_1_metatiles.bin" INCBIN "data/tilesets/johto_1_metatiles.bin"
; 0x1a40e ; 0x1a40e
Tileset0Coll: ; 0x1a40e Tileset0Coll: ; 0x1a40e
TilesetJohto1Coll: ; 0x1a40e TilesetJohto1Coll: ; 0x1a40e
INCLUDE "tilesets/johto_1_collision.asm" INCLUDE "data/tilesets/johto_1_collision.asm"
; 0x1a60e ; 0x1a60e
TilesetIcePathGFX: ; 0x1a60e TilesetIcePathGFX: ; 0x1a60e
@ -38,11 +38,11 @@ INCBIN "gfx/tilesets/ice_path.2bpp.lz"
; 0x1af3e ; 0x1af3e
TilesetIcePathMeta: ; 0x1af3e TilesetIcePathMeta: ; 0x1af3e
INCBIN "tilesets/ice_path_metatiles.bin" INCBIN "data/tilesets/ice_path_metatiles.bin"
; 0x1b33e ; 0x1b33e
TilesetIcePathColl: ; 0x1b33e TilesetIcePathColl: ; 0x1b33e
INCLUDE "tilesets/ice_path_collision.asm" INCLUDE "data/tilesets/ice_path_collision.asm"
; 0x1b43e ; 0x1b43e
TilesetPlayersHouse2FGFX: ; 0x1b43e TilesetPlayersHouse2FGFX: ; 0x1b43e
@ -50,11 +50,11 @@ INCBIN "gfx/tilesets/players_house_2f.2bpp.lz"
; 0x1b8fe ; 0x1b8fe
TilesetPlayersHouse2FMeta: ; 0x1b8fe TilesetPlayersHouse2FMeta: ; 0x1b8fe
INCBIN "tilesets/players_house_2f_metatiles.bin" INCBIN "data/tilesets/players_house_2f_metatiles.bin"
; 0x1bcfe ; 0x1bcfe
TilesetPlayersHouse2FColl: ; 0x1bcfe TilesetPlayersHouse2FColl: ; 0x1bcfe
INCLUDE "tilesets/players_house_2f_collision.asm" INCLUDE "data/tilesets/players_house_2f_collision.asm"
; 0x1bdfe ; 0x1bdfe
@ -65,11 +65,11 @@ INCBIN "gfx/tilesets/pokecenter.2bpp.lz"
; 0x1c73c ; 0x1c73c
TilesetPokecenterMeta: ; 0x1c73c TilesetPokecenterMeta: ; 0x1c73c
INCBIN "tilesets/pokecenter_metatiles.bin" INCBIN "data/tilesets/pokecenter_metatiles.bin"
; 0x1cb3c ; 0x1cb3c
TilesetPokecenterColl: ; 0x1cb3c TilesetPokecenterColl: ; 0x1cb3c
INCLUDE "tilesets/pokecenter_collision.asm" INCLUDE "data/tilesets/pokecenter_collision.asm"
; 0x1cc3c ; 0x1cc3c
TilesetPortGFX: ; 0x1cc3c TilesetPortGFX: ; 0x1cc3c
@ -77,11 +77,11 @@ INCBIN "gfx/tilesets/port.2bpp.lz"
; 0x1d04c ; 0x1d04c
TilesetPortMeta: ; 0x1d04c TilesetPortMeta: ; 0x1d04c
INCBIN "tilesets/port_metatiles.bin" INCBIN "data/tilesets/port_metatiles.bin"
; 0x1d44c ; 0x1d44c
TilesetPortColl: ; 0x1d44c TilesetPortColl: ; 0x1d44c
INCLUDE "tilesets/port_collision.asm" INCLUDE "data/tilesets/port_collision.asm"
; 0x1d54c ; 0x1d54c
TilesetPlayersHouseGFX: ; 0x1d54c TilesetPlayersHouseGFX: ; 0x1d54c
@ -89,11 +89,11 @@ INCBIN "gfx/tilesets/players_house.2bpp.lz"
; 0x1d92c ; 0x1d92c
TilesetPlayersHouseMeta: ; 0x1d92c TilesetPlayersHouseMeta: ; 0x1d92c
INCBIN "tilesets/players_house_metatiles.bin" INCBIN "data/tilesets/players_house_metatiles.bin"
; 0x1dd2c ; 0x1dd2c
TilesetPlayersHouseColl: ; 0x1dd2c TilesetPlayersHouseColl: ; 0x1dd2c
INCLUDE "tilesets/players_house_collision.asm" INCLUDE "data/tilesets/players_house_collision.asm"
; 0x1de2c ; 0x1de2c
TilesetCeladonMansionGFX: ; 0x1de2c TilesetCeladonMansionGFX: ; 0x1de2c
@ -101,11 +101,11 @@ INCBIN "gfx/tilesets/celadon_mansion.2bpp.lz"
; 0x1e58c ; 0x1e58c
TilesetCeladonMansionMeta: ; 0x1e58c TilesetCeladonMansionMeta: ; 0x1e58c
INCBIN "tilesets/celadon_mansion_metatiles.bin" INCBIN "data/tilesets/celadon_mansion_metatiles.bin"
; 0x1e98c ; 0x1e98c
TilesetCeladonMansionColl: ; 0x1e98c TilesetCeladonMansionColl: ; 0x1e98c
INCLUDE "tilesets/celadon_mansion_collision.asm" INCLUDE "data/tilesets/celadon_mansion_collision.asm"
; 0x1ea8c ; 0x1ea8c
TilesetCaveGFX: ; 0x1ea8c TilesetCaveGFX: ; 0x1ea8c
@ -114,12 +114,12 @@ INCBIN "gfx/tilesets/cave.2bpp.lz"
TilesetCaveMeta: ; 0x1ee1c TilesetCaveMeta: ; 0x1ee1c
TilesetWhirlIslandsMeta: ; 0x1ee1c TilesetWhirlIslandsMeta: ; 0x1ee1c
INCBIN "tilesets/cave_metatiles.bin" INCBIN "data/tilesets/cave_metatiles.bin"
; 0x1f21c ; 0x1f21c
TilesetCaveColl: ; 0x1f21c TilesetCaveColl: ; 0x1f21c
TilesetWhirlIslandsColl: ; 0x1f21c TilesetWhirlIslandsColl: ; 0x1f21c
INCLUDE "tilesets/cave_collision.asm" INCLUDE "data/tilesets/cave_collision.asm"
; 0x1f31c ; 0x1f31c
@ -130,11 +130,11 @@ INCBIN "gfx/tilesets/sprout_tower.2bpp.lz"
; 0x206e1 ; 0x206e1
TilesetSproutTowerMeta: ; 0x206e1 TilesetSproutTowerMeta: ; 0x206e1
INCBIN "tilesets/sprout_tower_metatiles.bin" INCBIN "data/tilesets/sprout_tower_metatiles.bin"
; 0x20ae1 ; 0x20ae1
TilesetSproutTowerColl: ; 0x20ae1 TilesetSproutTowerColl: ; 0x20ae1
INCLUDE "tilesets/sprout_tower_collision.asm" INCLUDE "data/tilesets/sprout_tower_collision.asm"
; 0x20be1 ; 0x20be1
TilesetLabGFX: ; 0x20be1 TilesetLabGFX: ; 0x20be1
@ -142,11 +142,11 @@ INCBIN "gfx/tilesets/lab.2bpp.lz"
; 0x213e1 ; 0x213e1
TilesetLabMeta: ; 0x213e1 TilesetLabMeta: ; 0x213e1
INCBIN "tilesets/lab_metatiles.bin" INCBIN "data/tilesets/lab_metatiles.bin"
; 0x217e1 ; 0x217e1
TilesetLabColl: ; 0x217e1 TilesetLabColl: ; 0x217e1
INCLUDE "tilesets/lab_collision.asm" INCLUDE "data/tilesets/lab_collision.asm"
; 0x218e1 ; 0x218e1
TilesetMartGFX: ; 0x218e1 TilesetMartGFX: ; 0x218e1
@ -154,11 +154,11 @@ INCBIN "gfx/tilesets/mart.2bpp.lz"
; 0x22031 ; 0x22031
TilesetMartMeta: ; 0x22031 TilesetMartMeta: ; 0x22031
INCBIN "tilesets/mart_metatiles.bin" INCBIN "data/tilesets/mart_metatiles.bin"
; 0x22431 ; 0x22431
TilesetMartColl: ; 0x22431 TilesetMartColl: ; 0x22431
INCLUDE "tilesets/mart_collision.asm" INCLUDE "data/tilesets/mart_collision.asm"
; 0x22531 ; 0x22531
TilesetGameCornerGFX: ; 0x22531 TilesetGameCornerGFX: ; 0x22531
@ -166,11 +166,11 @@ INCBIN "gfx/tilesets/game_corner.2bpp.lz"
; 0x22af1 ; 0x22af1
TilesetGameCornerMeta: ; 0x22af1 TilesetGameCornerMeta: ; 0x22af1
INCBIN "tilesets/game_corner_metatiles.bin" INCBIN "data/tilesets/game_corner_metatiles.bin"
; 0x22ef1 ; 0x22ef1
TilesetGameCornerColl: ; 0x22ef1 TilesetGameCornerColl: ; 0x22ef1
INCLUDE "tilesets/game_corner_collision.asm" INCLUDE "data/tilesets/game_corner_collision.asm"
; 0x22ff1 ; 0x22ff1
TilesetTrainStationGFX: ; 0x22ff1 TilesetTrainStationGFX: ; 0x22ff1
@ -178,15 +178,15 @@ INCBIN "gfx/tilesets/train_station.2bpp.lz"
; 0x23391 ; 0x23391
TilesetTrainStationMeta: ; 0x23391 TilesetTrainStationMeta: ; 0x23391
INCBIN "tilesets/train_station_metatiles.bin" INCBIN "data/tilesets/train_station_metatiles.bin"
; 0x23791 ; 0x23791
TilesetTrainStationColl: ; 0x23791 TilesetTrainStationColl: ; 0x23791
INCLUDE "tilesets/train_station_collision.asm" INCLUDE "data/tilesets/train_station_collision.asm"
; 0x23891 ; 0x23891
TilesetIlexForestMeta: ; 0x23891 TilesetIlexForestMeta: ; 0x23891
INCBIN "tilesets/ilex_forest_metatiles.bin" INCBIN "data/tilesets/ilex_forest_metatiles.bin"
; 0x23b11 ; 0x23b11
@ -197,11 +197,11 @@ INCBIN "gfx/tilesets/gym_1.2bpp.lz"
; 0x304e0 ; 0x304e0
TilesetGym1Meta: ; 0x304e0 TilesetGym1Meta: ; 0x304e0
INCBIN "tilesets/gym_1_metatiles.bin" INCBIN "data/tilesets/gym_1_metatiles.bin"
; 0x308e0 ; 0x308e0
TilesetGym1Coll: ; 0x308e0 TilesetGym1Coll: ; 0x308e0
INCLUDE "tilesets/gym_1_collision.asm" INCLUDE "data/tilesets/gym_1_collision.asm"
; 0x309e0 ; 0x309e0
TilesetParkGFX: ; 0x309e0 TilesetParkGFX: ; 0x309e0
@ -209,11 +209,11 @@ INCBIN "gfx/tilesets/park.2bpp.lz"
; 0x30e80 ; 0x30e80
TilesetParkMeta: ; 0x30e80 TilesetParkMeta: ; 0x30e80
INCBIN "tilesets/park_metatiles.bin" INCBIN "data/tilesets/park_metatiles.bin"
; 0x31280 ; 0x31280
TilesetParkColl: ; 0x31280 TilesetParkColl: ; 0x31280
INCLUDE "tilesets/park_collision.asm" INCLUDE "data/tilesets/park_collision.asm"
; 0x31380 ; 0x31380
TilesetRadioTowerGFX: ; 0x31380 TilesetRadioTowerGFX: ; 0x31380
@ -221,11 +221,11 @@ INCBIN "gfx/tilesets/radio_tower.2bpp.lz"
; 0x318e0 ; 0x318e0
TilesetRadioTowerMeta: ; 0x318e0 TilesetRadioTowerMeta: ; 0x318e0
INCBIN "tilesets/radio_tower_metatiles.bin" INCBIN "data/tilesets/radio_tower_metatiles.bin"
; 0x31ce0 ; 0x31ce0
TilesetRadioTowerColl: ; 0x31ce0 TilesetRadioTowerColl: ; 0x31ce0
INCLUDE "tilesets/radio_tower_collision.asm" INCLUDE "data/tilesets/radio_tower_collision.asm"
; 0x31de0 ; 0x31de0
TilesetUndergroundGFX: ; 0x31de0 TilesetUndergroundGFX: ; 0x31de0
@ -233,11 +233,11 @@ INCBIN "gfx/tilesets/underground.2bpp.lz"
; 0x321b0 ; 0x321b0
TilesetUndergroundMeta: ; 0x321b0 TilesetUndergroundMeta: ; 0x321b0
INCBIN "tilesets/underground_metatiles.bin" INCBIN "data/tilesets/underground_metatiles.bin"
; 0x325b0 ; 0x325b0
TilesetUndergroundColl: ; 0x325b0 TilesetUndergroundColl: ; 0x325b0
INCLUDE "tilesets/underground_collision.asm" INCLUDE "data/tilesets/underground_collision.asm"
; 0x326b0 ; 0x326b0
TilesetWhirlIslandsGFX: ; 0x326b0 TilesetWhirlIslandsGFX: ; 0x326b0
@ -245,11 +245,11 @@ INCBIN "gfx/tilesets/whirl_islands.2bpp.lz"
; 0x329f0 ; 0x329f0
UnusedTilesetWhirlIslandsMeta: ; 0x329f0 UnusedTilesetWhirlIslandsMeta: ; 0x329f0
INCBIN "tilesets/unused_whirl_islands_metatiles.bin" INCBIN "data/tilesets/unused_whirl_islands_metatiles.bin"
; 0x331f0 ; 0x331f0
UnusedTilesetWhirlIslandsColl: ; 0x331f0 UnusedTilesetWhirlIslandsColl: ; 0x331f0
INCLUDE "tilesets/unused_whirl_islands_collision.asm" INCLUDE "data/tilesets/unused_whirl_islands_collision.asm"
; 0x333f0 ; 0x333f0
@ -260,11 +260,11 @@ INCBIN "gfx/tilesets/pokecom_center.2bpp.lz"
; 0xb48a0 ; 0xb48a0
TilesetPokeComCenterMeta: ; 0xb48a0 TilesetPokeComCenterMeta: ; 0xb48a0
INCBIN "tilesets/pokecom_center_metatiles.bin" INCBIN "data/tilesets/pokecom_center_metatiles.bin"
; 0xb4ca0 ; 0xb4ca0
TilesetPokeComCenterColl: ; 0xb4ca0 TilesetPokeComCenterColl: ; 0xb4ca0
INCLUDE "tilesets/pokecom_center_collision.asm" INCLUDE "data/tilesets/pokecom_center_collision.asm"
; 0xb4da0 ; 0xb4da0
TilesetBattleTowerGFX: ; 0xb4da0 TilesetBattleTowerGFX: ; 0xb4da0
@ -272,11 +272,11 @@ INCBIN "gfx/tilesets/battle_tower.2bpp.lz"
; 0xb50e0 ; 0xb50e0
TilesetBattleTowerMeta: ; 0xb50e0 TilesetBattleTowerMeta: ; 0xb50e0
INCBIN "tilesets/battle_tower_metatiles.bin" INCBIN "data/tilesets/battle_tower_metatiles.bin"
; 0xb54e0 ; 0xb54e0
TilesetBattleTowerColl: ; 0xb54e0 TilesetBattleTowerColl: ; 0xb54e0
INCLUDE "tilesets/battle_tower_collision.asm" INCLUDE "data/tilesets/battle_tower_collision.asm"
; 0xb55e0 ; 0xb55e0
TilesetGateGFX: ; 0xb55e0 TilesetGateGFX: ; 0xb55e0
@ -284,11 +284,11 @@ INCBIN "gfx/tilesets/gate.2bpp.lz"
; 0xb59e0 ; 0xb59e0
TilesetGateMeta: ; 0xb59e0 TilesetGateMeta: ; 0xb59e0
INCBIN "tilesets/gate_metatiles.bin" INCBIN "data/tilesets/gate_metatiles.bin"
; 0xb5de0 ; 0xb5de0
TilesetGateColl: ; 0xb5de0 TilesetGateColl: ; 0xb5de0
INCLUDE "tilesets/gate_collision.asm" INCLUDE "data/tilesets/gate_collision.asm"
; 0xb5ee0 ; 0xb5ee0
TilesetJohto2GFX: ; 0xb5ee0 TilesetJohto2GFX: ; 0xb5ee0
@ -297,11 +297,11 @@ INCBIN "gfx/tilesets/johto_2.2bpp.lz"
; 0xb6ae8 ; 0xb6ae8
TilesetJohto2Meta: ; 0xb6ae8 TilesetJohto2Meta: ; 0xb6ae8
INCBIN "tilesets/johto_2_metatiles.bin" INCBIN "data/tilesets/johto_2_metatiles.bin"
; 0xb72e8 ; 0xb72e8
TilesetJohto2Coll: ; 0xb72e8 TilesetJohto2Coll: ; 0xb72e8
INCLUDE "tilesets/johto_2_collision.asm" INCLUDE "data/tilesets/johto_2_collision.asm"
; 0xb74e8 ; 0xb74e8
TilesetKurtsHouseGFX: ; 0xb74e8 TilesetKurtsHouseGFX: ; 0xb74e8
@ -309,11 +309,11 @@ INCBIN "gfx/tilesets/kurts_house.2bpp.lz"
; 0xb79a8 ; 0xb79a8
TilesetKurtsHouseMeta: ; 0xb79a8 TilesetKurtsHouseMeta: ; 0xb79a8
INCBIN "tilesets/kurts_house_metatiles.bin" INCBIN "data/tilesets/kurts_house_metatiles.bin"
; 0xb7da8 ; 0xb7da8
TilesetKurtsHouseColl: ; 0xb7da8 TilesetKurtsHouseColl: ; 0xb7da8
INCLUDE "tilesets/kurts_house_collision.asm" INCLUDE "data/tilesets/kurts_house_collision.asm"
; 0xb7ea8 ; 0xb7ea8
@ -328,11 +328,11 @@ INCBIN "gfx/tilesets/olivine_gym.2bpp.lz"
; 0xdcc50 ; 0xdcc50
TilesetOlivineGymMeta: ; 0xdcc50 TilesetOlivineGymMeta: ; 0xdcc50
INCBIN "tilesets/olivine_gym_metatiles.bin" INCBIN "data/tilesets/olivine_gym_metatiles.bin"
; 0xdd050 ; 0xdd050
TilesetOlivineGymColl: ; 0xdd050 TilesetOlivineGymColl: ; 0xdd050
INCLUDE "tilesets/olivine_gym_collision.asm" INCLUDE "data/tilesets/olivine_gym_collision.asm"
; 0xdd150 ; 0xdd150
TilesetHouse1GFX: ; 0xdd150 TilesetHouse1GFX: ; 0xdd150
@ -340,11 +340,11 @@ INCBIN "gfx/tilesets/house_1.2bpp.lz"
; 0xdd600 ; 0xdd600
TilesetHouse1Meta: ; 0xdd600 TilesetHouse1Meta: ; 0xdd600
INCBIN "tilesets/house_1_metatiles.bin" INCBIN "data/tilesets/house_1_metatiles.bin"
; 0xdda00 ; 0xdda00
TilesetHouse1Coll: ; 0xdda00 TilesetHouse1Coll: ; 0xdda00
INCLUDE "tilesets/house_1_collision.asm" INCLUDE "data/tilesets/house_1_collision.asm"
; 0xddb00 ; 0xddb00
TilesetLighthouseGFX: ; 0xddb00 TilesetLighthouseGFX: ; 0xddb00
@ -352,15 +352,15 @@ INCBIN "gfx/tilesets/lighthouse.2bpp.lz"
; 0xddf70 ; 0xddf70
TilesetLighthouseMeta: ; 0xddf70 TilesetLighthouseMeta: ; 0xddf70
INCBIN "tilesets/lighthouse_metatiles.bin" INCBIN "data/tilesets/lighthouse_metatiles.bin"
; 0xde370 ; 0xde370
TilesetLighthouseColl: ; 0xde370 TilesetLighthouseColl: ; 0xde370
INCLUDE "tilesets/lighthouse_collision.asm" INCLUDE "data/tilesets/lighthouse_collision.asm"
; 0xde470 ; 0xde470
TilesetIlexForestColl: ; 0xde470 TilesetIlexForestColl: ; 0xde470
INCLUDE "tilesets/ilex_forest_collision.asm" INCLUDE "data/tilesets/ilex_forest_collision.asm"
; 0xde570 ; 0xde570
TilesetPowerPlantGFX: ; 0xde570 TilesetPowerPlantGFX: ; 0xde570
@ -368,23 +368,23 @@ INCBIN "gfx/tilesets/power_plant.2bpp.lz"
; 0xde990 ; 0xde990
TilesetPowerPlantMeta: ; 0xde990 TilesetPowerPlantMeta: ; 0xde990
INCBIN "tilesets/power_plant_metatiles.bin" INCBIN "data/tilesets/power_plant_metatiles.bin"
; 0xded90 ; 0xded90
TilesetPowerPlantColl: ; 0xded90 TilesetPowerPlantColl: ; 0xded90
INCLUDE "tilesets/power_plant_collision.asm" INCLUDE "data/tilesets/power_plant_collision.asm"
; 0xdee90 ; 0xdee90
TilesetBattleTowerOutsideMeta: ; 0xdee90 TilesetBattleTowerOutsideMeta: ; 0xdee90
INCBIN "tilesets/battle_tower_outside_metatiles.bin" INCBIN "data/tilesets/battle_tower_outside_metatiles.bin"
; 0xdf690 ; 0xdf690
TilesetBattleTowerOutsideColl: ; 0xdf690 TilesetBattleTowerOutsideColl: ; 0xdf690
INCLUDE "tilesets/battle_tower_outside_collision.asm" INCLUDE "data/tilesets/battle_tower_outside_collision.asm"
; 0xdf890 ; 0xdf890
TilesetBetaWordRoomMeta: ; 0xdf890 TilesetBetaWordRoomMeta: ; 0xdf890
INCBIN "tilesets/beta_word_room_metatiles.bin" INCBIN "data/tilesets/beta_word_room_metatiles.bin"
; 0xdfc90 ; 0xdfc90
TilesetBetaWordRoomColl: ; 0xdfc90 TilesetBetaWordRoomColl: ; 0xdfc90
@ -392,7 +392,7 @@ TilesetHoOhWordRoomColl: ; 0xdfc90
TilesetKabutoWordRoomColl: ; 0xdfc90 TilesetKabutoWordRoomColl: ; 0xdfc90
TilesetOmanyteWordRoomColl: ; 0xdfc90 TilesetOmanyteWordRoomColl: ; 0xdfc90
TilesetAerodactylWordRoomColl: ; 0xdfc90 TilesetAerodactylWordRoomColl: ; 0xdfc90
INCLUDE "tilesets/beta_word_room_collision.asm" INCLUDE "data/tilesets/beta_word_room_collision.asm"
; 0xdfd90 ; 0xdfd90
@ -408,28 +408,28 @@ INCBIN "gfx/tilesets/ruins_of_alph.2bpp.lz"
; 0x1dd1a9 ; 0x1dd1a9
TilesetRuinsOfAlphMeta: ; 0x1dd1a9 TilesetRuinsOfAlphMeta: ; 0x1dd1a9
INCBIN "tilesets/ruins_of_alph_metatiles.bin" INCBIN "data/tilesets/ruins_of_alph_metatiles.bin"
; 0x1dd5a9 ; 0x1dd5a9
TilesetRuinsOfAlphColl: ; 0x1dd5a9 TilesetRuinsOfAlphColl: ; 0x1dd5a9
INCLUDE "tilesets/ruins_of_alph_collision.asm" INCLUDE "data/tilesets/ruins_of_alph_collision.asm"
; 0x1dd6a9 ; 0x1dd6a9
SECTION "Tileset Data 8", ROMX SECTION "Tileset Data 8", ROMX
TilesetHoOhWordRoomMeta: ; 0x1e0000 TilesetHoOhWordRoomMeta: ; 0x1e0000
INCBIN "tilesets/ho_oh_word_room_metatiles.bin" INCBIN "data/tilesets/ho_oh_word_room_metatiles.bin"
; 0x1e0400 ; 0x1e0400
TilesetKabutoWordRoomMeta: ; 0x1e0400 TilesetKabutoWordRoomMeta: ; 0x1e0400
INCBIN "tilesets/kabuto_word_room_metatiles.bin" INCBIN "data/tilesets/kabuto_word_room_metatiles.bin"
; 0x1e0800 ; 0x1e0800
TilesetOmanyteWordRoomMeta: ; 0x1e0800 TilesetOmanyteWordRoomMeta: ; 0x1e0800
INCBIN "tilesets/omanyte_word_room_metatiles.bin" INCBIN "data/tilesets/omanyte_word_room_metatiles.bin"
; 0x1e0c00 ; 0x1e0c00
TilesetAerodactylWordRoomMeta: ; 0x1e0c00 TilesetAerodactylWordRoomMeta: ; 0x1e0c00
INCBIN "tilesets/aerodactyl_word_room_metatiles.bin" INCBIN "data/tilesets/aerodactyl_word_room_metatiles.bin"
; 0x1e1000 ; 0x1e1000

View File

@ -5,6 +5,11 @@ tileset: MACRO
dw \1PalMap dw \1PalMap
ENDM ENDM
; Associated data:
; - The *GFX, *Meta, and *Coll are defined in data/tileset_data.asm
; - The *Anim are defined in engine/tileset_anims.asm
; - The *PalMap are defined in gfx/tilesets/palette_maps.asm
Tilesets:: ; 4d596 Tilesets:: ; 4d596
; entries correspond to TILESET_* constants ; entries correspond to TILESET_* constants
tileset Tileset0 tileset Tileset0

View File

@ -471,7 +471,7 @@ GetNumberedTMHM: ; d417
## `GetForestTreeFrame` works, but it's still bad ## `GetForestTreeFrame` works, but it's still bad
In [tilesets/animations.asm](/tilesets/animations.asm): In [engine/tileset_anims.asm](/engine/tileset_anims.asm):
```asm ```asm
GetForestTreeFrame: ; fc54c GetForestTreeFrame: ; fc54c

View File

@ -204,7 +204,7 @@ Function49496: ; 49496
ret ret
; 494ac ; 494ac
INCLUDE "tilesets/special_palettes.asm" INCLUDE "engine/tileset_palettes.asm"
MG_Mobile_Layout02: ; 49706 MG_Mobile_Layout02: ; 49706
ld hl, .Palette_49732 ld hl, .Palette_49732

Some files were not shown because too many files have changed in this diff Show More