dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Convert tilesets.s to C

Browse Source
This commit is contained in:
GriffinR
2022-10-08 00:12:36 -04:00
parent b41b3614ad
commit 5dfc494c00
16 changed files with 2414 additions and 2800 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/tilesets.s
-8
View File
@@ -1,8 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.include "data/tilesets/graphics.inc"
.include "data/tilesets/metatiles.inc"
.include "data/tilesets/headers.inc"
data/tilesets/graphics.inc
-1471
View File
File diff suppressed because it is too large Load Diff
data/tilesets/headers.inc
-749
View File
@@ -1,749 +0,0 @@
.align 2
gTileset_General::
.byte TRUE @ is compressed
.byte FALSE @ is secondary
.2byte 0 @ padding
.4byte gTilesetTiles_General
.4byte gTilesetPalettes_General
.4byte gMetatiles_General
.4byte InitTilesetAnim_General
.4byte gMetatileAttributes_General
.align 2
gTileset_PalletTown::
.byte TRUE @ is compressed
.byte TRUE @ is secondary
.2byte 0 @ padding
.4byte gTilesetTiles_PalletTown
.4byte gTilesetPalettes_PalletTown
.4byte gMetatiles_PalletTown
.4byte 0x0
.4byte gMetatileAttributes_PalletTown
.align 2
gTileset_ViridianCity::
.byte TRUE @ is compressed
.byte TRUE @ is secondary
.2byte 0 @ padding
.4byte gTilesetTiles_ViridianCity
.4byte gTilesetPalettes_ViridianCity
.4byte gMetatiles_ViridianCity
.4byte 0x0
.4byte gMetatileAttributes_ViridianCity
.align 2
gTileset_PewterCity::
.byte TRUE @ is compressed
.byte TRUE @ is secondary
.2byte 0 @ padding
.4byte gTilesetTiles_PewterCity
.4byte gTilesetPalettes_PewterCity
.4byte gMetatiles_PewterCity
.4byte 0x0
.4byte gMetatileAttributes_PewterCity
.align 2
gTileset_CeruleanCity::
.byte TRUE @ is compressed
.byte TRUE @ is secondary
.2byte 0 @ padding
.4byte gTilesetTiles_CeruleanCity
.4byte gTilesetPalettes_CeruleanCity
.4byte gMetatiles_CeruleanCity
.4byte 0x0
.4byte gMetatileAttributes_CeruleanCity
.align 2
gTileset_LavenderTown::
.byte TRUE @ is compressed
.byte TRUE @ is secondary
.2byte 0 @ padding
.4byte gTilesetTiles_LavenderTown
.4byte gTilesetPalettes_LavenderTown
.4byte gMetatiles_LavenderTown
.4byte 0x0
.4byte gMetatileAttributes_LavenderTown
.align 2
gTileset_VermilionCity::
.byte TRUE @ is compressed
.byte TRUE @ is secondary
.2byte 0 @ padding
.4byte gTilesetTiles_VermilionCity
.4byte gTilesetPalettes_VermilionCity
.4byte gMetatiles_VermilionCity
.4byte 0x0
.4byte gMetatileAttributes_VermilionCity
.align 2
gTileset_CeladonCity::
.byte TRUE @ is compressed
.byte TRUE @ is secondary
.2byte 0 @ padding
.4byte gTilesetTiles_CeladonCity
.4byte gTilesetPalettes_CeladonCity
.4byte gMetatiles_CeladonCity
.4byte InitTilesetAnim_CeladonCity
.4byte gMetatileAttributes_CeladonCity
.align 2
gTileset_FuchsiaCity::
.byte TRUE @ is compressed
.byte TRUE @ is secondary
.2byte 0 @ padding
.4byte gTilesetTiles_FuchsiaCity
.4byte gTilesetPalettes_FuchsiaCity
.4byte gMetatiles_FuchsiaCity
.4byte 0x0
.4byte gMetatileAttributes_FuchsiaCity
.align 2
gTileset_CinnabarIsland::
.byte TRUE @ is compressed
.byte TRUE @ is secondary
.2byte 0 @ padding
.4byte gTilesetTiles_CinnabarIsland
.4byte gTilesetPalettes_CinnabarIsland
.4byte gMetatiles_CinnabarIsland
.4byte 0x0
.4byte gMetatileAttributes_CinnabarIsland
.align 2
gTileset_IndigoPlateau::
.byte TRUE @ is compressed
.byte TRUE @ is secondary
.2byte 0 @ padding
.4byte gTilesetTiles_IndigoPlateau
.4byte gTilesetPalettes_IndigoPlateau
.4byte gMetatiles_IndigoPlateau
.4byte 0x0
.4byte gMetatileAttributes_IndigoPlateau
.align 2
gTileset_SaffronCity::
.byte TRUE @ is compressed
.byte TRUE @ is secondary
.2byte 0 @ padding
.4byte gTilesetTiles_SaffronCity
.4byte gTilesetPalettes_SaffronCity
.4byte gMetatiles_SaffronCity
.4byte 0x0
.4byte gMetatileAttributes_SaffronCity
.align 2
gTileset_Building::
.byte TRUE @ is compressed
.byte FALSE @ is secondary
.2byte 0 @ padding
.4byte gTilesetTiles_Building
.4byte gTilesetPalettes_Building
.4byte gMetatiles_Building
.4byte 0x0
.4byte gMetatileAttributes_Building
.align 2
gTileset_Mart::
.byte TRUE @ is compressed
.byte TRUE @ is secondary
.2byte 0 @ padding
.4byte gTilesetTiles_Mart
.4byte gTilesetPalettes_Mart
.4byte gMetatiles_Mart
.4byte 0x0
.4byte gMetatileAttributes_Mart
.align 2
gTileset_PokemonCenter::
.byte TRUE @ is compressed
.byte TRUE @ is secondary
.2byte 0 @ padding
.4byte gTilesetTiles_PokemonCenter
.4byte gTilesetPalettes_PokemonCenter
.4byte gMetatiles_PokemonCenter
.4byte 0x0
.4byte gMetatileAttributes_PokemonCenter
.align 2
gTileset_Cave::
.byte TRUE @ is compressed
.byte TRUE @ is secondary
.2byte 0 @ padding
.4byte gTilesetTiles_Cave
.4byte gTilesetPalettes_Cave
.4byte gMetatiles_Cave
.4byte 0x0
.4byte gMetatileAttributes_Cave
.align 2
gTileset_Dummy1::
.byte TRUE @ is compressed
.byte TRUE @ is secondary
.2byte 0 @ padding
.4byte gTilesetTiles_Dummy1
.4byte gTilesetPalettes_Dummy1
.4byte gMetatiles_Dummy1
.4byte 0x0
.4byte gMetatileAttributes_Dummy1
.align 2
gTileset_Museum::
.byte TRUE @ is compressed
.byte TRUE @ is secondary
.2byte 0 @ padding
.4byte gTilesetTiles_Museum
.4byte gTilesetPalettes_Museum
.4byte gMetatiles_Museum
.4byte 0x0
.4byte gMetatileAttributes_Museum
.align 2
gTileset_CableClub::
.byte FALSE @ is compressed
.byte TRUE @ is secondary
.2byte 0 @ padding
.4byte gTilesetTiles_CableClub
.4byte gTilesetPalettes_CableClub
.4byte gMetatiles_CableClub
.4byte 0x0
.4byte gMetatileAttributes_CableClub
.align 2
gTileset_BikeShop::
.byte TRUE @ is compressed
.byte TRUE @ is secondary
.2byte 0 @ padding
.4byte gTilesetTiles_BikeShop
.4byte gTilesetPalettes_BikeShop
.4byte gMetatiles_BikeShop
.4byte 0x0
.4byte gMetatileAttributes_BikeShop
.align 2
gTileset_GenericBuilding1::
.byte TRUE @ is compressed
.byte TRUE @ is secondary
.2byte 0 @ padding
.4byte gTilesetTiles_GenericBuilding1
.4byte gTilesetPalettes_GenericBuilding1
.4byte gMetatiles_GenericBuilding1
.4byte 0x0
.4byte gMetatileAttributes_GenericBuilding1
.align 2
gTileset_Lab::
.byte TRUE @ is compressed
.byte TRUE @ is secondary
.2byte 0 @ padding
.4byte gTilesetTiles_Lab
.4byte gTilesetPalettes_Lab
.4byte gMetatiles_Lab
.4byte 0x0
.4byte gMetatileAttributes_Lab
.align 2
gTileset_FuchsiaGym::
.byte TRUE @ is compressed
.byte TRUE @ is secondary
.2byte 0 @ padding
.4byte gTilesetTiles_FuchsiaGym
.4byte gTilesetPalettes_FuchsiaGym
.4byte gMetatiles_FuchsiaGym
.4byte 0x0
.4byte gMetatileAttributes_FuchsiaGym
.align 2
gTileset_ViridianGym::
.byte TRUE @ is compressed
.byte TRUE @ is secondary
.2byte 0 @ padding
.4byte gTilesetTiles_ViridianGym
.4byte gTilesetPalettes_ViridianGym
.4byte gMetatiles_ViridianGym
.4byte 0x0
.4byte gMetatileAttributes_ViridianGym
.align 2
gTileset_HoennBuilding::
.byte TRUE @ is compressed
.byte TRUE @ is secondary
.2byte 0 @ padding
.4byte gTilesetTiles_HoennBuilding
.4byte gTilesetPalettes_HoennBuilding
.4byte gMetatiles_HoennBuilding
.4byte 0x0
.4byte gMetatileAttributes_HoennBuilding
.align 2
gTileset_GameCorner::
.byte TRUE @ is compressed
.byte TRUE @ is secondary
.2byte 0 @ padding
.4byte gTilesetTiles_GameCorner
.4byte gTilesetPalettes_GameCorner
.4byte gMetatiles_GameCorner
.4byte 0x0
.4byte gMetatileAttributes_GameCorner
.align 2
gTileset_PewterGym::
.byte TRUE @ is compressed
.byte TRUE @ is secondary
.2byte 0 @ padding
.4byte gTilesetTiles_PewterGym
.4byte gTilesetPalettes_PewterGym
.4byte gMetatiles_PewterGym
.4byte 0x0
.4byte gMetatileAttributes_PewterGym
.align 2
gTileset_CeruleanGym::
.byte TRUE @ is compressed
.byte TRUE @ is secondary
.2byte 0 @ padding
.4byte gTilesetTiles_CeruleanGym
.4byte gTilesetPalettes_CeruleanGym
.4byte gMetatiles_CeruleanGym
.4byte 0x0
.4byte gMetatileAttributes_CeruleanGym
.align 2
gTileset_VermilionGym::
.byte TRUE @ is compressed
.byte TRUE @ is secondary
.2byte 0 @ padding
.4byte gTilesetTiles_VermilionGym
.4byte gTilesetPalettes_VermilionGym
.4byte gMetatiles_VermilionGym
.4byte InitTilesetAnim_VermilionGym
.4byte gMetatileAttributes_VermilionGym
.align 2
gTileset_CeladonGym::
.byte TRUE @ is compressed
.byte TRUE @ is secondary
.2byte 0 @ padding
.4byte gTilesetTiles_CeladonGym
.4byte gTilesetPalettes_CeladonGym
.4byte gMetatiles_CeladonGym
.4byte InitTilesetAnim_CeladonGym
.4byte gMetatileAttributes_CeladonGym
.align 2
gTileset_SaffronGym::
.byte TRUE @ is compressed
.byte TRUE @ is secondary
.2byte 0 @ padding
.4byte gTilesetTiles_SaffronGym
.4byte gTilesetPalettes_SaffronGym
.4byte gMetatiles_SaffronGym
.4byte 0x0
.4byte gMetatileAttributes_SaffronGym
.align 2
gTileset_CinnabarGym::
.byte TRUE @ is compressed
.byte TRUE @ is secondary
.2byte 0 @ padding
.4byte gTilesetTiles_CinnabarGym
.4byte gTilesetPalettes_CinnabarGym
.4byte gMetatiles_CinnabarGym
.4byte 0x0
.4byte gMetatileAttributes_CinnabarGym
.align 2
gTileset_SSAnne::
.byte TRUE @ is compressed
.byte TRUE @ is secondary
.2byte 0 @ padding
.4byte gTilesetTiles_SSAnne
.4byte gTilesetPalettes_SSAnne
.4byte gMetatiles_SSAnne
.4byte 0x0
.4byte gMetatileAttributes_SSAnne
.align 2
gTileset_Dummy2::
.byte TRUE @ is compressed
.byte TRUE @ is secondary
.2byte 0 @ padding
.4byte gTilesetTiles_Dummy2
.4byte gTilesetPalettes_Dummy2
.4byte gMetatiles_Dummy2
.4byte 0x0
.4byte gMetatileAttributes_Dummy2
.align 2
gTileset_ViridianForest::
.byte TRUE @ is compressed
.byte TRUE @ is secondary
.2byte 0 @ padding
.4byte gTilesetTiles_ViridianForest
.4byte gTilesetPalettes_ViridianForest
.4byte gMetatiles_ViridianForest
.4byte 0x0
.4byte gMetatileAttributes_ViridianForest
.align 2
gTileset_UnusedGatehouse1::
.byte TRUE @ is compressed
.byte TRUE @ is secondary
.2byte 0 @ padding
.4byte gTilesetTiles_UnusedGatehouse1
.4byte gTilesetPalettes_UnusedGatehouse1
.4byte gMetatiles_UnusedGatehouse1
.4byte 0x0
.4byte gMetatileAttributes_UnusedGatehouse1
.align 2
gTileset_RockTunnel::
.byte TRUE @ is compressed
.byte TRUE @ is secondary
.2byte 0 @ padding
.4byte gTilesetTiles_RockTunnel
.4byte gTilesetPalettes_RockTunnel
.4byte gMetatiles_RockTunnel
.4byte 0x0
.4byte gMetatileAttributes_RockTunnel
.align 2
gTileset_DiglettsCave::
.byte TRUE @ is compressed
.byte TRUE @ is secondary
.2byte 0 @ padding
.4byte gTilesetTiles_DiglettsCave
.4byte gTilesetPalettes_DiglettsCave
.4byte gMetatiles_DiglettsCave
.4byte 0x0
.4byte gMetatileAttributes_DiglettsCave
.align 2
gTileset_SeafoamIslands::
.byte TRUE @ is compressed
.byte TRUE @ is secondary
.2byte 0 @ padding
.4byte gTilesetTiles_SeafoamIslands
.4byte gTilesetPalettes_SeafoamIslands
.4byte gMetatiles_SeafoamIslands
.4byte 0x0
.4byte gMetatileAttributes_SeafoamIslands
.align 2
gTileset_UnusedGatehouse2::
.byte TRUE @ is compressed
.byte TRUE @ is secondary
.2byte 0 @ padding
.4byte gTilesetTiles_UnusedGatehouse2
.4byte gTilesetPalettes_UnusedGatehouse2
.4byte gMetatiles_UnusedGatehouse2
.4byte 0x0
.4byte gMetatileAttributes_UnusedGatehouse2
.align 2
gTileset_CeruleanCave::
.byte TRUE @ is compressed
.byte TRUE @ is secondary
.2byte 0 @ padding
.4byte gTilesetTiles_CeruleanCave
.4byte gTilesetPalettes_CeruleanCave
.4byte gMetatiles_CeruleanCave
.4byte 0x0
.4byte gMetatileAttributes_CeruleanCave
.align 2
gTileset_DepartmentStore::
.byte TRUE @ is compressed
.byte TRUE @ is secondary
.2byte 0 @ padding
.4byte gTilesetTiles_DepartmentStore
.4byte gTilesetPalettes_DepartmentStore
.4byte gMetatiles_DepartmentStore
.4byte 0x0
.4byte gMetatileAttributes_DepartmentStore
.align 2
gTileset_GenericBuilding2::
.byte TRUE @ is compressed
.byte TRUE @ is secondary
.2byte 0 @ padding
.4byte gTilesetTiles_GenericBuilding2
.4byte gTilesetPalettes_GenericBuilding2
.4byte gMetatiles_GenericBuilding2
.4byte 0x0
.4byte gMetatileAttributes_GenericBuilding2
.align 2
gTileset_PowerPlant::
.byte TRUE @ is compressed
.byte TRUE @ is secondary
.2byte 0 @ padding
.4byte gTilesetTiles_PowerPlant
.4byte gTilesetPalettes_PowerPlant
.4byte gMetatiles_PowerPlant
.4byte 0x0
.4byte gMetatileAttributes_PowerPlant
.align 2
gTileset_SeaCottage::
.byte TRUE @ is compressed
.byte TRUE @ is secondary
.2byte 0 @ padding
.4byte gTilesetTiles_SeaCottage
.4byte gTilesetPalettes_SeaCottage
.4byte gMetatiles_SeaCottage
.4byte 0x0
.4byte gMetatileAttributes_SeaCottage
.align 2
gTileset_SilphCo::
.byte TRUE @ is compressed
.byte TRUE @ is secondary
.2byte 0 @ padding
.4byte gTilesetTiles_SilphCo
.4byte gTilesetPalettes_SilphCo
.4byte gMetatiles_SilphCo
.4byte InitTilesetAnim_SilphCo
.4byte gMetatileAttributes_SilphCo
.align 2
gTileset_UndergroundPath::
.byte TRUE @ is compressed
.byte TRUE @ is secondary
.2byte 0 @ padding
.4byte gTilesetTiles_UndergroundPath
.4byte gTilesetPalettes_UndergroundPath
.4byte gMetatiles_UndergroundPath
.4byte 0x0
.4byte gMetatileAttributes_UndergroundPath
.align 2
gTileset_PokemonTower::
.byte TRUE @ is compressed
.byte TRUE @ is secondary
.2byte 0 @ padding
.4byte gTilesetTiles_PokemonTower
.4byte gTilesetPalettes_PokemonTower
.4byte gMetatiles_PokemonTower
.4byte 0x0
.4byte gMetatileAttributes_PokemonTower
.align 2
gTileset_SafariZoneBuilding::
.byte TRUE @ is compressed
.byte TRUE @ is secondary
.2byte 0 @ padding
.4byte gTilesetTiles_SafariZoneBuilding
.4byte gTilesetPalettes_SafariZoneBuilding
.4byte gMetatiles_SafariZoneBuilding
.4byte 0x0
.4byte gMetatileAttributes_SafariZoneBuilding
.align 2
gTileset_PokemonMansion::
.byte TRUE @ is compressed
.byte TRUE @ is secondary
.2byte 0 @ padding
.4byte gTilesetTiles_PokemonMansion
.4byte gTilesetPalettes_PokemonMansion
.4byte gMetatiles_PokemonMansion
.4byte 0x0
.4byte gMetatileAttributes_PokemonMansion
.align 2
gTileset_RestaurantHotel::
.byte TRUE @ is compressed
.byte TRUE @ is secondary
.2byte 0 @ padding
.4byte gTilesetTiles_RestaurantHotel
.4byte gTilesetPalettes_RestaurantHotel
.4byte gMetatiles_RestaurantHotel
.4byte 0x0
.4byte gMetatileAttributes_RestaurantHotel
.align 2
gTileset_School::
.byte TRUE @ is compressed
.byte TRUE @ is secondary
.2byte 0 @ padding
.4byte gTilesetTiles_School
.4byte gTilesetPalettes_School
.4byte gMetatiles_School
.4byte 0x0
.4byte gMetatileAttributes_School
.align 2
gTileset_FanClubDaycare::
.byte TRUE @ is compressed
.byte TRUE @ is secondary
.2byte 0 @ padding
.4byte gTilesetTiles_FanClubDaycare
.4byte gTilesetPalettes_FanClubDaycare
.4byte gMetatiles_FanClubDaycare
.4byte 0x0
.4byte gMetatileAttributes_FanClubDaycare
.align 2
gTileset_Condominiums::
.byte TRUE @ is compressed
.byte TRUE @ is secondary
.2byte 0 @ padding
.4byte gTilesetTiles_SilphCo
.4byte gTilesetPalettes_SilphCo
.4byte gMetatiles_Condominiums
.4byte 0x0
.4byte gMetatileAttributes_Condominiums
.align 2
gTileset_BurgledHouse::
.byte TRUE @ is compressed
.byte TRUE @ is secondary
.2byte 0 @ padding
.4byte gTilesetTiles_BurgledHouse
.4byte gTilesetPalettes_BurgledHouse
.4byte gMetatiles_BurgledHouse
.4byte 0x0
.4byte gMetatileAttributes_BurgledHouse
.align 2
gTileset_Dummy3::
.byte TRUE @ is compressed
.byte TRUE @ is secondary
.2byte 0 @ padding
.4byte gTilesetTiles_Dummy3
.4byte gTilesetPalettes_Dummy3
.4byte gMetatiles_Dummy3
.4byte 0x0
.4byte gMetatileAttributes_Dummy3
.align 2
gTileset_Dummy4::
.byte TRUE @ is compressed
.byte TRUE @ is secondary
.2byte 0 @ padding
.4byte gTilesetTiles_Dummy4
.4byte gTilesetPalettes_Dummy4
.4byte gMetatiles_Dummy4
.4byte 0x0
.4byte gMetatileAttributes_Dummy4
.align 2
gTileset_MtEmber::
.byte TRUE @ is compressed
.byte TRUE @ is secondary
.2byte 0 @ padding
.4byte gTilesetTiles_MtEmber
.4byte gTilesetPalettes_MtEmber
.4byte gMetatiles_MtEmber
.4byte InitTilesetAnim_MtEmber
.4byte gMetatileAttributes_MtEmber
.align 2
gTileset_BerryForest::
.byte TRUE @ is compressed
.byte TRUE @ is secondary
.2byte 0 @ padding
.4byte gTilesetTiles_BerryForest
.4byte gTilesetPalettes_BerryForest
.4byte gMetatiles_BerryForest
.4byte 0x0
.4byte gMetatileAttributes_BerryForest
.align 2
gTileset_NavelRock::
.byte TRUE @ is compressed
.byte TRUE @ is secondary
.2byte 0 @ padding
.4byte gTilesetTiles_NavelRock
.4byte gTilesetPalettes_NavelRock
.4byte gMetatiles_NavelRock
.4byte 0x0
.4byte gMetatileAttributes_NavelRock
.align 2
gTileset_TanobyRuins::
.byte TRUE @ is compressed
.byte TRUE @ is secondary
.2byte 0 @ padding
.4byte gTilesetTiles_TanobyRuins
.4byte gTilesetPalettes_TanobyRuins
.4byte gMetatiles_TanobyRuins
.4byte 0x0
.4byte gMetatileAttributes_TanobyRuins
.align 2
gTileset_SeviiIslands123::
.byte TRUE @ is compressed
.byte TRUE @ is secondary
.2byte 0 @ padding
.4byte gTilesetTiles_SeviiIslands123
.4byte gTilesetPalettes_SeviiIslands123
.4byte gMetatiles_SeviiIslands123
.4byte 0x0
.4byte gMetatileAttributes_SeviiIslands123
.align 2
gTileset_SeviiIslands45::
.byte TRUE @ is compressed
.byte TRUE @ is secondary
.2byte 0 @ padding
.4byte gTilesetTiles_SeviiIslands45
.4byte gTilesetPalettes_SeviiIslands45
.4byte gMetatiles_SeviiIslands45
.4byte 0x0
.4byte gMetatileAttributes_SeviiIslands45
.align 2
gTileset_SeviiIslands67::
.byte TRUE @ is compressed
.byte TRUE @ is secondary
.2byte 0 @ padding
.4byte gTilesetTiles_SeviiIslands67
.4byte gTilesetPalettes_SeviiIslands67
.4byte gMetatiles_SeviiIslands67
.4byte 0x0
.4byte gMetatileAttributes_SeviiIslands67
.align 2
gTileset_TrainerTower::
.byte TRUE @ is compressed
.byte TRUE @ is secondary
.2byte 0 @ padding
.4byte gTilesetTiles_TrainerTower
.4byte gTilesetPalettes_TrainerTower
.4byte gMetatiles_TrainerTower
.4byte 0x0
.4byte gMetatileAttributes_TrainerTower
.align 2
gTileset_IslandHarbor::
.byte TRUE @ is compressed
.byte TRUE @ is secondary
.2byte 0 @ padding
.4byte gTilesetTiles_IslandHarbor
.4byte gTilesetPalettes_IslandHarbor
.4byte gMetatiles_IslandHarbor
.4byte 0x0
.4byte gMetatileAttributes_IslandHarbor
.align 2
gTileset_PokemonLeague::
.byte TRUE @ is compressed
.byte TRUE @ is secondary
.2byte 0 @ padding
.4byte gTilesetTiles_PokemonLeague
.4byte gTilesetPalettes_PokemonLeague
.4byte gMetatiles_PokemonLeague
.4byte 0x0
.4byte gMetatileAttributes_PokemonLeague
.align 2
gTileset_HallOfFame::
.byte TRUE @ is compressed
.byte TRUE @ is secondary
.2byte 0 @ padding
.4byte gTilesetTiles_HallOfFame
.4byte gTilesetPalettes_HallOfFame
.4byte gMetatiles_HallOfFame
.4byte 0x0
.4byte gMetatileAttributes_HallOfFame
data/tilesets/metatiles.inc
-543
View File
@@ -1,543 +0,0 @@
.align 1
gMetatiles_General::
.incbin "data/tilesets/primary/general/metatiles.bin"
.align 1
gMetatileAttributes_General::
.incbin "data/tilesets/primary/general/metatile_attributes.bin"
.align 1
gMetatiles_PalletTown::
.incbin "data/tilesets/secondary/pallet_town/metatiles.bin"
.align 1
gMetatileAttributes_PalletTown::
.incbin "data/tilesets/secondary/pallet_town/metatile_attributes.bin"
.align 1
gMetatiles_ViridianCity::
.incbin "data/tilesets/secondary/viridian_city/metatiles.bin"
.align 1
gMetatileAttributes_ViridianCity::
.incbin "data/tilesets/secondary/viridian_city/metatile_attributes.bin"
.align 1
gMetatiles_PewterCity::
.incbin "data/tilesets/secondary/pewter_city/metatiles.bin"
.align 1
gMetatileAttributes_PewterCity::
.incbin "data/tilesets/secondary/pewter_city/metatile_attributes.bin"
.align 1
gMetatiles_CeruleanCity::
.incbin "data/tilesets/secondary/cerulean_city/metatiles.bin"
.align 1
gMetatileAttributes_CeruleanCity::
.incbin "data/tilesets/secondary/cerulean_city/metatile_attributes.bin"
.align 1
gMetatiles_LavenderTown::
.incbin "data/tilesets/secondary/lavender_town/metatiles.bin"
.align 1
gMetatileAttributes_LavenderTown::
.incbin "data/tilesets/secondary/lavender_town/metatile_attributes.bin"
.align 1
gMetatiles_VermilionCity::
.incbin "data/tilesets/secondary/vermilion_city/metatiles.bin"
.align 1
gMetatileAttributes_VermilionCity::
.incbin "data/tilesets/secondary/vermilion_city/metatile_attributes.bin"
.align 1
gMetatiles_CeladonCity::
.incbin "data/tilesets/secondary/celadon_city/metatiles.bin"
.align 1
gMetatileAttributes_CeladonCity::
.incbin "data/tilesets/secondary/celadon_city/metatile_attributes.bin"
.align 1
gMetatiles_FuchsiaCity::
.incbin "data/tilesets/secondary/fuchsia_city/metatiles.bin"
.align 1
gMetatileAttributes_FuchsiaCity::
.incbin "data/tilesets/secondary/fuchsia_city/metatile_attributes.bin"
.align 1
gMetatiles_CinnabarIsland::
.incbin "data/tilesets/secondary/cinnabar_island/metatiles.bin"
.align 1
gMetatileAttributes_CinnabarIsland::
.incbin "data/tilesets/secondary/cinnabar_island/metatile_attributes.bin"
.align 1
gMetatiles_IndigoPlateau::
.incbin "data/tilesets/secondary/indigo_plateau/metatiles.bin"
.align 1
gMetatileAttributes_IndigoPlateau::
.incbin "data/tilesets/secondary/indigo_plateau/metatile_attributes.bin"
.align 1
gMetatiles_SaffronCity::
.incbin "data/tilesets/secondary/saffron_city/metatiles.bin"
.align 1
gMetatileAttributes_SaffronCity::
.incbin "data/tilesets/secondary/saffron_city/metatile_attributes.bin"
.align 1
gMetatiles_PewterGym::
.incbin "data/tilesets/secondary/pewter_gym/metatiles.bin"
.align 1
gMetatileAttributes_PewterGym::
.incbin "data/tilesets/secondary/pewter_gym/metatile_attributes.bin"
.align 1
gMetatiles_CeruleanGym::
.incbin "data/tilesets/secondary/cerulean_gym/metatiles.bin"
.align 1
gMetatileAttributes_CeruleanGym::
.incbin "data/tilesets/secondary/cerulean_gym/metatile_attributes.bin"
.align 1
gMetatiles_VermilionGym::
.incbin "data/tilesets/secondary/vermilion_gym/metatiles.bin"
.align 1
gMetatileAttributes_VermilionGym::
.incbin "data/tilesets/secondary/vermilion_gym/metatile_attributes.bin"
.align 1
gMetatiles_CeladonGym::
.incbin "data/tilesets/secondary/celadon_gym/metatiles.bin"
.align 1
gMetatileAttributes_CeladonGym::
.incbin "data/tilesets/secondary/celadon_gym/metatile_attributes.bin"
.align 1
gMetatiles_FuchsiaGym::
.incbin "data/tilesets/secondary/fuchsia_gym/metatiles.bin"
.align 1
gMetatileAttributes_FuchsiaGym::
.incbin "data/tilesets/secondary/fuchsia_gym/metatile_attributes.bin"
.align 1
gMetatiles_SaffronGym::
.incbin "data/tilesets/secondary/saffron_gym/metatiles.bin"
.align 1
gMetatileAttributes_SaffronGym::
.incbin "data/tilesets/secondary/saffron_gym/metatile_attributes.bin"
.align 1
gMetatiles_CinnabarGym::
.incbin "data/tilesets/secondary/cinnabar_gym/metatiles.bin"
.align 1
gMetatileAttributes_CinnabarGym::
.incbin "data/tilesets/secondary/cinnabar_gym/metatile_attributes.bin"
.align 1
gMetatiles_ViridianGym::
.incbin "data/tilesets/secondary/viridian_gym/metatiles.bin"
.align 1
gMetatileAttributes_ViridianGym::
.incbin "data/tilesets/secondary/viridian_gym/metatile_attributes.bin"
.align 1
gMetatiles_Building:: @ Building
.incbin "data/tilesets/primary/building/metatiles.bin"
.align 1
gMetatileAttributes_Building:: @ Building
.incbin "data/tilesets/primary/building/metatile_attributes.bin"
.align 1
gMetatiles_Dummy1::
.incbin "data/tilesets/secondary/dummy_1/metatiles.bin"
.align 1
gMetatileAttributes_Dummy1::
.incbin "data/tilesets/secondary/dummy_1/metatile_attributes.bin"
.align 1
gMetatiles_HoennBuilding::
.incbin "data/tilesets/secondary/hoenn_building/metatiles.bin"
.align 1
gMetatileAttributes_HoennBuilding::
.incbin "data/tilesets/secondary/hoenn_building/metatile_attributes.bin"
.align 1
gMetatiles_BikeShop::
.incbin "data/tilesets/secondary/bike_shop/metatiles.bin"
.align 1
gMetatileAttributes_BikeShop::
.incbin "data/tilesets/secondary/bike_shop/metatile_attributes.bin"
.align 1
gMetatiles_Mart::
.incbin "data/tilesets/secondary/mart/metatiles.bin"
.align 1
gMetatileAttributes_Mart::
.incbin "data/tilesets/secondary/mart/metatile_attributes.bin"
.align 1
gMetatiles_PokemonCenter::
.incbin "data/tilesets/secondary/pokemon_center/metatiles.bin"
.align 1
gMetatileAttributes_PokemonCenter::
.incbin "data/tilesets/secondary/pokemon_center/metatile_attributes.bin"
.align 1
gMetatiles_GenericBuilding1::
.incbin "data/tilesets/secondary/generic_building_1/metatiles.bin"
.align 1
gMetatileAttributes_GenericBuilding1::
.incbin "data/tilesets/secondary/generic_building_1/metatile_attributes.bin"
.align 1
gMetatiles_Cave::
.incbin "data/tilesets/secondary/cave/metatiles.bin"
.align 1
gMetatileAttributes_Cave::
.incbin "data/tilesets/secondary/cave/metatile_attributes.bin"
.align 1
gMetatiles_GameCorner::
.incbin "data/tilesets/secondary/game_corner/metatiles.bin"
.align 1
gMetatileAttributes_GameCorner::
.incbin "data/tilesets/secondary/game_corner/metatile_attributes.bin"
.align 1
gMetatiles_Lab::
.incbin "data/tilesets/secondary/lab/metatiles.bin"
.align 1
gMetatileAttributes_Lab::
.incbin "data/tilesets/secondary/lab/metatile_attributes.bin"
.align 1
gMetatiles_SSAnne::
.incbin "data/tilesets/secondary/ss_anne/metatiles.bin"
.align 1
gMetatileAttributes_SSAnne::
.incbin "data/tilesets/secondary/ss_anne/metatile_attributes.bin"
.align 1
gMetatiles_Dummy2::
.incbin "data/tilesets/secondary/dummy_2/metatiles.bin"
.align 1
gMetatileAttributes_Dummy2::
.incbin "data/tilesets/secondary/dummy_2/metatile_attributes.bin"
.align 1
gMetatiles_ViridianForest::
.incbin "data/tilesets/secondary/viridian_forest/metatiles.bin"
.align 1
gMetatileAttributes_ViridianForest::
.incbin "data/tilesets/secondary/viridian_forest/metatile_attributes.bin"
.align 1
gMetatiles_UnusedGatehouse1::
.incbin "data/tilesets/secondary/unused_gatehouse_1/metatiles.bin"
.align 1
gMetatileAttributes_UnusedGatehouse1::
.incbin "data/tilesets/secondary/unused_gatehouse_1/metatile_attributes.bin"
.align 1
gMetatiles_RockTunnel::
.incbin "data/tilesets/secondary/rock_tunnel/metatiles.bin"
.align 1
gMetatileAttributes_RockTunnel::
.incbin "data/tilesets/secondary/rock_tunnel/metatile_attributes.bin"
.align 1
gMetatiles_DiglettsCave::
.incbin "data/tilesets/secondary/digletts_cave/metatiles.bin"
.align 1
gMetatileAttributes_DiglettsCave::
.incbin "data/tilesets/secondary/digletts_cave/metatile_attributes.bin"
.align 1
gMetatiles_SeafoamIslands::
.incbin "data/tilesets/secondary/seafoam_islands/metatiles.bin"
.align 1
gMetatileAttributes_SeafoamIslands::
.incbin "data/tilesets/secondary/seafoam_islands/metatile_attributes.bin"
.align 1
gMetatiles_UnusedGatehouse2::
.incbin "data/tilesets/secondary/unused_gatehouse_2/metatiles.bin"
.align 1
gMetatileAttributes_UnusedGatehouse2::
.incbin "data/tilesets/secondary/unused_gatehouse_2/metatile_attributes.bin"
.align 1
gMetatiles_CeruleanCave::
.incbin "data/tilesets/secondary/cerulean_cave/metatiles.bin"
.align 1
gMetatileAttributes_CeruleanCave::
.incbin "data/tilesets/secondary/cerulean_cave/metatile_attributes.bin"
.align 1
gMetatiles_DepartmentStore::
.incbin "data/tilesets/secondary/department_store/metatiles.bin"
.align 1
gMetatileAttributes_DepartmentStore::
.incbin "data/tilesets/secondary/department_store/metatile_attributes.bin"
.align 1
gMetatiles_GenericBuilding2::
.incbin "data/tilesets/secondary/generic_building_2/metatiles.bin"
.align 1
gMetatileAttributes_GenericBuilding2::
.incbin "data/tilesets/secondary/generic_building_2/metatile_attributes.bin"
.align 1
gMetatiles_PowerPlant::
.incbin "data/tilesets/secondary/power_plant/metatiles.bin"
.align 1
gMetatileAttributes_PowerPlant::
.incbin "data/tilesets/secondary/power_plant/metatile_attributes.bin"
.align 1
gMetatiles_SeaCottage::
.incbin "data/tilesets/secondary/sea_cottage/metatiles.bin"
.align 1
gMetatileAttributes_SeaCottage::
.incbin "data/tilesets/secondary/sea_cottage/metatile_attributes.bin"
.align 1
gMetatiles_SilphCo::
.incbin "data/tilesets/secondary/silph_co/metatiles.bin"
.align 1
gMetatileAttributes_SilphCo::
.incbin "data/tilesets/secondary/silph_co/metatile_attributes.bin"
.align 1
gMetatiles_UndergroundPath::
.incbin "data/tilesets/secondary/underground_path/metatiles.bin"
.align 1
gMetatileAttributes_UndergroundPath::
.incbin "data/tilesets/secondary/underground_path/metatile_attributes.bin"
.align 1
gMetatiles_PokemonTower::
.incbin "data/tilesets/secondary/pokemon_tower/metatiles.bin"
.align 1
gMetatileAttributes_PokemonTower::
.incbin "data/tilesets/secondary/pokemon_tower/metatile_attributes.bin"
.align 1
gMetatiles_SafariZoneBuilding::
.incbin "data/tilesets/secondary/safari_zone_building/metatiles.bin"
.align 1
gMetatileAttributes_SafariZoneBuilding::
.incbin "data/tilesets/secondary/safari_zone_building/metatile_attributes.bin"
.align 1
gMetatiles_PokemonMansion::
.incbin "data/tilesets/secondary/pokemon_mansion/metatiles.bin"
.align 1
gMetatileAttributes_PokemonMansion::
.incbin "data/tilesets/secondary/pokemon_mansion/metatile_attributes.bin"
.align 1
gMetatiles_Museum::
.incbin "data/tilesets/secondary/museum/metatiles.bin"
.align 1
gMetatileAttributes_Museum::
.incbin "data/tilesets/secondary/museum/metatile_attributes.bin"
.align 1
gMetatiles_CableClub::
.incbin "data/tilesets/secondary/cable_club/metatiles.bin"
.align 1
gMetatileAttributes_CableClub::
.incbin "data/tilesets/secondary/cable_club/metatile_attributes.bin"
.align 1
gMetatiles_RestaurantHotel::
.incbin "data/tilesets/secondary/restaurant_hotel/metatiles.bin"
.align 1
gMetatileAttributes_RestaurantHotel::
.incbin "data/tilesets/secondary/restaurant_hotel/metatile_attributes.bin"
.align 1
gMetatiles_School::
.incbin "data/tilesets/secondary/school/metatiles.bin"
.align 1
gMetatileAttributes_School::
.incbin "data/tilesets/secondary/school/metatile_attributes.bin"
.align 1
gMetatiles_FanClubDaycare::
.incbin "data/tilesets/secondary/fan_club_daycare/metatiles.bin"
.align 1
gMetatileAttributes_FanClubDaycare::
.incbin "data/tilesets/secondary/fan_club_daycare/metatile_attributes.bin"
.align 1
gMetatiles_Condominiums::
.incbin "data/tilesets/secondary/condominiums/metatiles.bin"
.align 1
gMetatileAttributes_Condominiums::
.incbin "data/tilesets/secondary/condominiums/metatile_attributes.bin"
.align 1
gMetatiles_BurgledHouse::
.incbin "data/tilesets/secondary/burgled_house/metatiles.bin"
.align 1
gMetatileAttributes_BurgledHouse::
.incbin "data/tilesets/secondary/burgled_house/metatile_attributes.bin"
.align 1
gMetatiles_Dummy3::
.incbin "data/tilesets/secondary/dummy_3/metatiles.bin"
.align 1
gMetatileAttributes_Dummy3::
.incbin "data/tilesets/secondary/dummy_3/metatile_attributes.bin"
.align 1
gMetatiles_Dummy4::
.incbin "data/tilesets/secondary/dummy_4/metatiles.bin"
.align 1
gMetatileAttributes_Dummy4::
.incbin "data/tilesets/secondary/dummy_4/metatile_attributes.bin"
.align 1
gMetatiles_MtEmber::
.incbin "data/tilesets/secondary/mt_ember/metatiles.bin"
.align 1
gMetatileAttributes_MtEmber::
.incbin "data/tilesets/secondary/mt_ember/metatile_attributes.bin"
.align 1
gMetatiles_BerryForest::
.incbin "data/tilesets/secondary/berry_forest/metatiles.bin"
.align 1
gMetatileAttributes_BerryForest::
.incbin "data/tilesets/secondary/berry_forest/metatile_attributes.bin"
.align 1
gMetatiles_NavelRock::
.incbin "data/tilesets/secondary/navel_rock/metatiles.bin"
.align 1
gMetatileAttributes_NavelRock::
.incbin "data/tilesets/secondary/navel_rock/metatile_attributes.bin"
.align 1
gMetatiles_TanobyRuins::
.incbin "data/tilesets/secondary/tanoby_ruins/metatiles.bin"
.align 1
gMetatileAttributes_TanobyRuins::
.incbin "data/tilesets/secondary/tanoby_ruins/metatile_attributes.bin"
.align 1
gMetatiles_SeviiIslands123::
.incbin "data/tilesets/secondary/sevii_islands_123/metatiles.bin"
.align 1
gMetatileAttributes_SeviiIslands123::
.incbin "data/tilesets/secondary/sevii_islands_123/metatile_attributes.bin"
.align 1
gMetatiles_SeviiIslands45::
.incbin "data/tilesets/secondary/sevii_islands_45/metatiles.bin"
.align 1
gMetatileAttributes_SeviiIslands45::
.incbin "data/tilesets/secondary/sevii_islands_45/metatile_attributes.bin"
.align 1
gMetatiles_SeviiIslands67::
.incbin "data/tilesets/secondary/sevii_islands_67/metatiles.bin"
.align 1
gMetatileAttributes_SeviiIslands67::
.incbin "data/tilesets/secondary/sevii_islands_67/metatile_attributes.bin"
.align 1
gMetatiles_TrainerTower::
.incbin "data/tilesets/secondary/trainer_tower/metatiles.bin"
.align 1
gMetatileAttributes_TrainerTower::
.incbin "data/tilesets/secondary/trainer_tower/metatile_attributes.bin"
.align 1
gMetatiles_IslandHarbor::
.incbin "data/tilesets/secondary/island_harbor/metatiles.bin"
.align 1
gMetatileAttributes_IslandHarbor::
.incbin "data/tilesets/secondary/island_harbor/metatile_attributes.bin"
.align 1
gMetatiles_PokemonLeague::
.incbin "data/tilesets/secondary/pokemon_league/metatiles.bin"
.align 1
gMetatileAttributes_PokemonLeague::
.incbin "data/tilesets/secondary/pokemon_league/metatile_attributes.bin"
.align 1
gMetatiles_HallOfFame::
.incbin "data/tilesets/secondary/hall_of_fame/metatiles.bin"
.align 1
gMetatileAttributes_HallOfFame::
.incbin "data/tilesets/secondary/hall_of_fame/metatile_attributes.bin"
include/global.fieldmap.h
+4 -4
View File
@@ -68,11 +68,11 @@ struct Tileset
{
/*0x00*/ bool8 isCompressed;
/*0x01*/ bool8 isSecondary;
/*0x04*/ void *tiles;
/*0x08*/ void *palettes;
/*0x0c*/ void *metatiles;
/*0x04*/ const u32 *tiles;
/*0x08*/ const u16 (*palettes)[16];
/*0x0c*/ const u16 *metatiles;
/*0x10*/ TilesetCB callback;
/*0x14*/ u32 *metatileAttributes;
/*0x14*/ const u32 *metatileAttributes;
};
struct MapLayout
include/tileset_anims.h
+7
View File
@@ -6,4 +6,11 @@ void InitSecondaryTilesetAnimation(void);
void UpdateTilesetAnimations(void);
void TransferTilesetAnimsBuffer(void);
void InitTilesetAnim_General(void);
void InitTilesetAnim_CeladonCity(void);
void InitTilesetAnim_VermilionGym(void);
void InitTilesetAnim_CeladonGym(void);
void InitTilesetAnim_SilphCo(void);
void InitTilesetAnim_MtEmber(void);
#endif // GUARD_TILESET_ANIMS_H
include/tilesets.h
+13
View File
@@ -0,0 +1,13 @@
#ifndef GUARD_TILESETS_H
#define GUARD_TILESETS_H
extern const u32 gTilesetTiles_General[];
extern const u16 gTilesetPalettes_General[][16];
extern const u32 gTilesetTiles_GenericBuilding1[];
extern const u16 gTilesetPalettes_GenericBuilding1[][16];
extern const u32 gTilesetTiles_DepartmentStore[];
extern const u16 gTilesetPalettes_DepartmentStore[][16];
#endif // GUARD_TILESETS_H
ld_script.txt
+1 -1
View File
@@ -420,7 +420,7 @@ SECTIONS {
src/trade.o(.rodata);
src/trade_scene.o(.rodata);
src/overworld.o(.rodata);
data/tilesets.o(.rodata);
src/tilesets.o(.rodata);
data/maps.o(.rodata);
src/fieldmap.o(.rodata);
src/metatile_behavior.o(.rodata);
src/data/tilesets/graphics.h
+1407
View File
File diff suppressed because it is too large Load Diff
src/data/tilesets/headers.h
+748
View File
@@ -0,0 +1,748 @@
const struct Tileset gTileset_General =
{
.isCompressed = TRUE,
.isSecondary = FALSE,
.tiles = gTilesetTiles_General,
.palettes = gTilesetPalettes_General,
.metatiles = gMetatiles_General,
.metatileAttributes = gMetatileAttributes_General,
.callback = InitTilesetAnim_General,
};
const struct Tileset gTileset_PalletTown =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_PalletTown,
.palettes = gTilesetPalettes_PalletTown,
.metatiles = gMetatiles_PalletTown,
.metatileAttributes = gMetatileAttributes_PalletTown,
.callback = NULL,
};
const struct Tileset gTileset_ViridianCity =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_ViridianCity,
.palettes = gTilesetPalettes_ViridianCity,
.metatiles = gMetatiles_ViridianCity,
.metatileAttributes = gMetatileAttributes_ViridianCity,
.callback = NULL,
};
const struct Tileset gTileset_PewterCity =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_PewterCity,
.palettes = gTilesetPalettes_PewterCity,
.metatiles = gMetatiles_PewterCity,
.metatileAttributes = gMetatileAttributes_PewterCity,
.callback = NULL,
};
const struct Tileset gTileset_CeruleanCity =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_CeruleanCity,
.palettes = gTilesetPalettes_CeruleanCity,
.metatiles = gMetatiles_CeruleanCity,
.metatileAttributes = gMetatileAttributes_CeruleanCity,
.callback = NULL,
};
const struct Tileset gTileset_LavenderTown =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_LavenderTown,
.palettes = gTilesetPalettes_LavenderTown,
.metatiles = gMetatiles_LavenderTown,
.metatileAttributes = gMetatileAttributes_LavenderTown,
.callback = NULL,
};
const struct Tileset gTileset_VermilionCity =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_VermilionCity,
.palettes = gTilesetPalettes_VermilionCity,
.metatiles = gMetatiles_VermilionCity,
.metatileAttributes = gMetatileAttributes_VermilionCity,
.callback = NULL,
};
const struct Tileset gTileset_CeladonCity =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_CeladonCity,
.palettes = gTilesetPalettes_CeladonCity,
.metatiles = gMetatiles_CeladonCity,
.metatileAttributes = gMetatileAttributes_CeladonCity,
.callback = InitTilesetAnim_CeladonCity,
};
const struct Tileset gTileset_FuchsiaCity =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_FuchsiaCity,
.palettes = gTilesetPalettes_FuchsiaCity,
.metatiles = gMetatiles_FuchsiaCity,
.metatileAttributes = gMetatileAttributes_FuchsiaCity,
.callback = NULL,
};
const struct Tileset gTileset_CinnabarIsland =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_CinnabarIsland,
.palettes = gTilesetPalettes_CinnabarIsland,
.metatiles = gMetatiles_CinnabarIsland,
.metatileAttributes = gMetatileAttributes_CinnabarIsland,
.callback = NULL,
};
const struct Tileset gTileset_IndigoPlateau =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_IndigoPlateau,
.palettes = gTilesetPalettes_IndigoPlateau,
.metatiles = gMetatiles_IndigoPlateau,
.metatileAttributes = gMetatileAttributes_IndigoPlateau,
.callback = NULL,
};
const struct Tileset gTileset_SaffronCity =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_SaffronCity,
.palettes = gTilesetPalettes_SaffronCity,
.metatiles = gMetatiles_SaffronCity,
.metatileAttributes = gMetatileAttributes_SaffronCity,
.callback = NULL,
};
const struct Tileset gTileset_Building =
{
.isCompressed = TRUE,
.isSecondary = FALSE,
.tiles = gTilesetTiles_Building,
.palettes = gTilesetPalettes_Building,
.metatiles = gMetatiles_Building,
.metatileAttributes = gMetatileAttributes_Building,
.callback = NULL,
};
const struct Tileset gTileset_Mart =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_Mart,
.palettes = gTilesetPalettes_Mart,
.metatiles = gMetatiles_Mart,
.metatileAttributes = gMetatileAttributes_Mart,
.callback = NULL,
};
const struct Tileset gTileset_PokemonCenter =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_PokemonCenter,
.palettes = gTilesetPalettes_PokemonCenter,
.metatiles = gMetatiles_PokemonCenter,
.metatileAttributes = gMetatileAttributes_PokemonCenter,
.callback = NULL,
};
const struct Tileset gTileset_Cave =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_Cave,
.palettes = gTilesetPalettes_Cave,
.metatiles = gMetatiles_Cave,
.metatileAttributes = gMetatileAttributes_Cave,
.callback = NULL,
};
const struct Tileset gTileset_Dummy1 =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_Dummy1,
.palettes = gTilesetPalettes_Dummy1,
.metatiles = gMetatiles_Dummy1,
.metatileAttributes = gMetatileAttributes_Dummy1,
.callback = NULL,
};
const struct Tileset gTileset_Museum =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_Museum,
.palettes = gTilesetPalettes_Museum,
.metatiles = gMetatiles_Museum,
.metatileAttributes = gMetatileAttributes_Museum,
.callback = NULL,
};
const struct Tileset gTileset_CableClub =
{
.isCompressed = FALSE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_CableClub,
.palettes = gTilesetPalettes_CableClub,
.metatiles = gMetatiles_CableClub,
.metatileAttributes = gMetatileAttributes_CableClub,
.callback = NULL,
};
const struct Tileset gTileset_BikeShop =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_BikeShop,
.palettes = gTilesetPalettes_BikeShop,
.metatiles = gMetatiles_BikeShop,
.metatileAttributes = gMetatileAttributes_BikeShop,
.callback = NULL,
};
const struct Tileset gTileset_GenericBuilding1 =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_GenericBuilding1,
.palettes = gTilesetPalettes_GenericBuilding1,
.metatiles = gMetatiles_GenericBuilding1,
.metatileAttributes = gMetatileAttributes_GenericBuilding1,
.callback = NULL,
};
const struct Tileset gTileset_Lab =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_Lab,
.palettes = gTilesetPalettes_Lab,
.metatiles = gMetatiles_Lab,
.metatileAttributes = gMetatileAttributes_Lab,
.callback = NULL,
};
const struct Tileset gTileset_FuchsiaGym =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_FuchsiaGym,
.palettes = gTilesetPalettes_FuchsiaGym,
.metatiles = gMetatiles_FuchsiaGym,
.metatileAttributes = gMetatileAttributes_FuchsiaGym,
.callback = NULL,
};
const struct Tileset gTileset_ViridianGym =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_ViridianGym,
.palettes = gTilesetPalettes_ViridianGym,
.metatiles = gMetatiles_ViridianGym,
.metatileAttributes = gMetatileAttributes_ViridianGym,
.callback = NULL,
};
const struct Tileset gTileset_HoennBuilding =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_HoennBuilding,
.palettes = gTilesetPalettes_HoennBuilding,
.metatiles = gMetatiles_HoennBuilding,
.metatileAttributes = gMetatileAttributes_HoennBuilding,
.callback = NULL,
};
const struct Tileset gTileset_GameCorner =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_GameCorner,
.palettes = gTilesetPalettes_GameCorner,
.metatiles = gMetatiles_GameCorner,
.metatileAttributes = gMetatileAttributes_GameCorner,
.callback = NULL,
};
const struct Tileset gTileset_PewterGym =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_PewterGym,
.palettes = gTilesetPalettes_PewterGym,
.metatiles = gMetatiles_PewterGym,
.metatileAttributes = gMetatileAttributes_PewterGym,
.callback = NULL,
};
const struct Tileset gTileset_CeruleanGym =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_CeruleanGym,
.palettes = gTilesetPalettes_CeruleanGym,
.metatiles = gMetatiles_CeruleanGym,
.metatileAttributes = gMetatileAttributes_CeruleanGym,
.callback = NULL,
};
const struct Tileset gTileset_VermilionGym =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_VermilionGym,
.palettes = gTilesetPalettes_VermilionGym,
.metatiles = gMetatiles_VermilionGym,
.metatileAttributes = gMetatileAttributes_VermilionGym,
.callback = InitTilesetAnim_VermilionGym,
};
const struct Tileset gTileset_CeladonGym =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_CeladonGym,
.palettes = gTilesetPalettes_CeladonGym,
.metatiles = gMetatiles_CeladonGym,
.metatileAttributes = gMetatileAttributes_CeladonGym,
.callback = InitTilesetAnim_CeladonGym,
};
const struct Tileset gTileset_SaffronGym =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_SaffronGym,
.palettes = gTilesetPalettes_SaffronGym,
.metatiles = gMetatiles_SaffronGym,
.metatileAttributes = gMetatileAttributes_SaffronGym,
.callback = NULL,
};
const struct Tileset gTileset_CinnabarGym =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_CinnabarGym,
.palettes = gTilesetPalettes_CinnabarGym,
.metatiles = gMetatiles_CinnabarGym,
.metatileAttributes = gMetatileAttributes_CinnabarGym,
.callback = NULL,
};
const struct Tileset gTileset_SSAnne =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_SSAnne,
.palettes = gTilesetPalettes_SSAnne,
.metatiles = gMetatiles_SSAnne,
.metatileAttributes = gMetatileAttributes_SSAnne,
.callback = NULL,
};
const struct Tileset gTileset_Dummy2 =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_Dummy2,
.palettes = gTilesetPalettes_Dummy2,
.metatiles = gMetatiles_Dummy2,
.metatileAttributes = gMetatileAttributes_Dummy2,
.callback = NULL,
};
const struct Tileset gTileset_ViridianForest =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_ViridianForest,
.palettes = gTilesetPalettes_ViridianForest,
.metatiles = gMetatiles_ViridianForest,
.metatileAttributes = gMetatileAttributes_ViridianForest,
.callback = NULL,
};
const struct Tileset gTileset_UnusedGatehouse1 =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_UnusedGatehouse1,
.palettes = gTilesetPalettes_UnusedGatehouse1,
.metatiles = gMetatiles_UnusedGatehouse1,
.metatileAttributes = gMetatileAttributes_UnusedGatehouse1,
.callback = NULL,
};
const struct Tileset gTileset_RockTunnel =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_RockTunnel,
.palettes = gTilesetPalettes_RockTunnel,
.metatiles = gMetatiles_RockTunnel,
.metatileAttributes = gMetatileAttributes_RockTunnel,
.callback = NULL,
};
const struct Tileset gTileset_DiglettsCave =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_DiglettsCave,
.palettes = gTilesetPalettes_DiglettsCave,
.metatiles = gMetatiles_DiglettsCave,
.metatileAttributes = gMetatileAttributes_DiglettsCave,
.callback = NULL,
};
const struct Tileset gTileset_SeafoamIslands =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_SeafoamIslands,
.palettes = gTilesetPalettes_SeafoamIslands,
.metatiles = gMetatiles_SeafoamIslands,
.metatileAttributes = gMetatileAttributes_SeafoamIslands,
.callback = NULL,
};
const struct Tileset gTileset_UnusedGatehouse2 =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_UnusedGatehouse2,
.palettes = gTilesetPalettes_UnusedGatehouse2,
.metatiles = gMetatiles_UnusedGatehouse2,
.metatileAttributes = gMetatileAttributes_UnusedGatehouse2,
.callback = NULL,
};
const struct Tileset gTileset_CeruleanCave =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_CeruleanCave,
.palettes = gTilesetPalettes_CeruleanCave,
.metatiles = gMetatiles_CeruleanCave,
.metatileAttributes = gMetatileAttributes_CeruleanCave,
.callback = NULL,
};
const struct Tileset gTileset_DepartmentStore =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_DepartmentStore,
.palettes = gTilesetPalettes_DepartmentStore,
.metatiles = gMetatiles_DepartmentStore,
.metatileAttributes = gMetatileAttributes_DepartmentStore,
.callback = NULL,
};
const struct Tileset gTileset_GenericBuilding2 =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_GenericBuilding2,
.palettes = gTilesetPalettes_GenericBuilding2,
.metatiles = gMetatiles_GenericBuilding2,
.metatileAttributes = gMetatileAttributes_GenericBuilding2,
.callback = NULL,
};
const struct Tileset gTileset_PowerPlant =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_PowerPlant,
.palettes = gTilesetPalettes_PowerPlant,
.metatiles = gMetatiles_PowerPlant,
.metatileAttributes = gMetatileAttributes_PowerPlant,
.callback = NULL,
};
const struct Tileset gTileset_SeaCottage =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_SeaCottage,
.palettes = gTilesetPalettes_SeaCottage,
.metatiles = gMetatiles_SeaCottage,
.metatileAttributes = gMetatileAttributes_SeaCottage,
.callback = NULL,
};
const struct Tileset gTileset_SilphCo =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_SilphCo,
.palettes = gTilesetPalettes_SilphCo,
.metatiles = gMetatiles_SilphCo,
.metatileAttributes = gMetatileAttributes_SilphCo,
.callback = InitTilesetAnim_SilphCo,
};
const struct Tileset gTileset_UndergroundPath =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_UndergroundPath,
.palettes = gTilesetPalettes_UndergroundPath,
.metatiles = gMetatiles_UndergroundPath,
.metatileAttributes = gMetatileAttributes_UndergroundPath,
.callback = NULL,
};
const struct Tileset gTileset_PokemonTower =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_PokemonTower,
.palettes = gTilesetPalettes_PokemonTower,
.metatiles = gMetatiles_PokemonTower,
.metatileAttributes = gMetatileAttributes_PokemonTower,
.callback = NULL,
};
const struct Tileset gTileset_SafariZoneBuilding =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_SafariZoneBuilding,
.palettes = gTilesetPalettes_SafariZoneBuilding,
.metatiles = gMetatiles_SafariZoneBuilding,
.metatileAttributes = gMetatileAttributes_SafariZoneBuilding,
.callback = NULL,
};
const struct Tileset gTileset_PokemonMansion =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_PokemonMansion,
.palettes = gTilesetPalettes_PokemonMansion,
.metatiles = gMetatiles_PokemonMansion,
.metatileAttributes = gMetatileAttributes_PokemonMansion,
.callback = NULL,
};
const struct Tileset gTileset_RestaurantHotel =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_RestaurantHotel,
.palettes = gTilesetPalettes_RestaurantHotel,
.metatiles = gMetatiles_RestaurantHotel,
.metatileAttributes = gMetatileAttributes_RestaurantHotel,
.callback = NULL,
};
const struct Tileset gTileset_School =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_School,
.palettes = gTilesetPalettes_School,
.metatiles = gMetatiles_School,
.metatileAttributes = gMetatileAttributes_School,
.callback = NULL,
};
const struct Tileset gTileset_FanClubDaycare =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_FanClubDaycare,
.palettes = gTilesetPalettes_FanClubDaycare,
.metatiles = gMetatiles_FanClubDaycare,
.metatileAttributes = gMetatileAttributes_FanClubDaycare,
.callback = NULL,
};
const struct Tileset gTileset_Condominiums =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_SilphCo,
.palettes = gTilesetPalettes_SilphCo,
.metatiles = gMetatiles_Condominiums,
.metatileAttributes = gMetatileAttributes_Condominiums,
.callback = NULL,
};
const struct Tileset gTileset_BurgledHouse =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_BurgledHouse,
.palettes = gTilesetPalettes_BurgledHouse,
.metatiles = gMetatiles_BurgledHouse,
.metatileAttributes = gMetatileAttributes_BurgledHouse,
.callback = NULL,
};
const struct Tileset gTileset_Dummy3 =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_Dummy3,
.palettes = gTilesetPalettes_Dummy3,
.metatiles = gMetatiles_Dummy3,
.metatileAttributes = gMetatileAttributes_Dummy3,
.callback = NULL,
};
const struct Tileset gTileset_Dummy4 =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_Dummy4,
.palettes = gTilesetPalettes_Dummy4,
.metatiles = gMetatiles_Dummy4,
.metatileAttributes = gMetatileAttributes_Dummy4,
.callback = NULL,
};
const struct Tileset gTileset_MtEmber =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_MtEmber,
.palettes = gTilesetPalettes_MtEmber,
.metatiles = gMetatiles_MtEmber,
.metatileAttributes = gMetatileAttributes_MtEmber,
.callback = InitTilesetAnim_MtEmber,
};
const struct Tileset gTileset_BerryForest =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_BerryForest,
.palettes = gTilesetPalettes_BerryForest,
.metatiles = gMetatiles_BerryForest,
.metatileAttributes = gMetatileAttributes_BerryForest,
.callback = NULL,
};
const struct Tileset gTileset_NavelRock =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_NavelRock,
.palettes = gTilesetPalettes_NavelRock,
.metatiles = gMetatiles_NavelRock,
.metatileAttributes = gMetatileAttributes_NavelRock,
.callback = NULL,
};
const struct Tileset gTileset_TanobyRuins =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_TanobyRuins,
.palettes = gTilesetPalettes_TanobyRuins,
.metatiles = gMetatiles_TanobyRuins,
.metatileAttributes = gMetatileAttributes_TanobyRuins,
.callback = NULL,
};
const struct Tileset gTileset_SeviiIslands123 =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_SeviiIslands123,
.palettes = gTilesetPalettes_SeviiIslands123,
.metatiles = gMetatiles_SeviiIslands123,
.metatileAttributes = gMetatileAttributes_SeviiIslands123,
.callback = NULL,
};
const struct Tileset gTileset_SeviiIslands45 =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_SeviiIslands45,
.palettes = gTilesetPalettes_SeviiIslands45,
.metatiles = gMetatiles_SeviiIslands45,
.metatileAttributes = gMetatileAttributes_SeviiIslands45,
.callback = NULL,
};
const struct Tileset gTileset_SeviiIslands67 =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_SeviiIslands67,
.palettes = gTilesetPalettes_SeviiIslands67,
.metatiles = gMetatiles_SeviiIslands67,
.metatileAttributes = gMetatileAttributes_SeviiIslands67,
.callback = NULL,
};
const struct Tileset gTileset_TrainerTower =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_TrainerTower,
.palettes = gTilesetPalettes_TrainerTower,
.metatiles = gMetatiles_TrainerTower,
.metatileAttributes = gMetatileAttributes_TrainerTower,
.callback = NULL,
};
const struct Tileset gTileset_IslandHarbor =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_IslandHarbor,
.palettes = gTilesetPalettes_IslandHarbor,
.metatiles = gMetatiles_IslandHarbor,
.metatileAttributes = gMetatileAttributes_IslandHarbor,
.callback = NULL,
};
const struct Tileset gTileset_PokemonLeague =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_PokemonLeague,
.palettes = gTilesetPalettes_PokemonLeague,
.metatiles = gMetatiles_PokemonLeague,
.metatileAttributes = gMetatileAttributes_PokemonLeague,
.callback = NULL,
};
const struct Tileset gTileset_HallOfFame =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_HallOfFame,
.palettes = gTilesetPalettes_HallOfFame,
.metatiles = gMetatiles_HallOfFame,
.metatileAttributes = gMetatileAttributes_HallOfFame,
.callback = NULL,
};
src/data/tilesets/metatiles.h
+203
View File
@@ -0,0 +1,203 @@
const u16 gMetatiles_General[] = INCBIN_U16("data/tilesets/primary/general/metatiles.bin");
const u32 gMetatileAttributes_General[] = INCBIN_U32("data/tilesets/primary/general/metatile_attributes.bin");
const u16 gMetatiles_PalletTown[] = INCBIN_U16("data/tilesets/secondary/pallet_town/metatiles.bin");
const u32 gMetatileAttributes_PalletTown[] = INCBIN_U32("data/tilesets/secondary/pallet_town/metatile_attributes.bin");
const u16 gMetatiles_ViridianCity[] = INCBIN_U16("data/tilesets/secondary/viridian_city/metatiles.bin");
const u32 gMetatileAttributes_ViridianCity[] = INCBIN_U32("data/tilesets/secondary/viridian_city/metatile_attributes.bin");
const u16 gMetatiles_PewterCity[] = INCBIN_U16("data/tilesets/secondary/pewter_city/metatiles.bin");
const u32 gMetatileAttributes_PewterCity[] = INCBIN_U32("data/tilesets/secondary/pewter_city/metatile_attributes.bin");
const u16 gMetatiles_CeruleanCity[] = INCBIN_U16("data/tilesets/secondary/cerulean_city/metatiles.bin");
const u32 gMetatileAttributes_CeruleanCity[] = INCBIN_U32("data/tilesets/secondary/cerulean_city/metatile_attributes.bin");
const u16 gMetatiles_LavenderTown[] = INCBIN_U16("data/tilesets/secondary/lavender_town/metatiles.bin");
const u32 gMetatileAttributes_LavenderTown[] = INCBIN_U32("data/tilesets/secondary/lavender_town/metatile_attributes.bin");
const u16 gMetatiles_VermilionCity[] = INCBIN_U16("data/tilesets/secondary/vermilion_city/metatiles.bin");
const u32 gMetatileAttributes_VermilionCity[] = INCBIN_U32("data/tilesets/secondary/vermilion_city/metatile_attributes.bin");
const u16 gMetatiles_CeladonCity[] = INCBIN_U16("data/tilesets/secondary/celadon_city/metatiles.bin");
const u32 gMetatileAttributes_CeladonCity[] = INCBIN_U32("data/tilesets/secondary/celadon_city/metatile_attributes.bin");
const u16 gMetatiles_FuchsiaCity[] = INCBIN_U16("data/tilesets/secondary/fuchsia_city/metatiles.bin");
const u32 gMetatileAttributes_FuchsiaCity[] = INCBIN_U32("data/tilesets/secondary/fuchsia_city/metatile_attributes.bin");
const u16 gMetatiles_CinnabarIsland[] = INCBIN_U16("data/tilesets/secondary/cinnabar_island/metatiles.bin");
const u32 gMetatileAttributes_CinnabarIsland[] = INCBIN_U32("data/tilesets/secondary/cinnabar_island/metatile_attributes.bin");
const u16 gMetatiles_IndigoPlateau[] = INCBIN_U16("data/tilesets/secondary/indigo_plateau/metatiles.bin");
const u32 gMetatileAttributes_IndigoPlateau[] = INCBIN_U32("data/tilesets/secondary/indigo_plateau/metatile_attributes.bin");
const u16 gMetatiles_SaffronCity[] = INCBIN_U16("data/tilesets/secondary/saffron_city/metatiles.bin");
const u32 gMetatileAttributes_SaffronCity[] = INCBIN_U32("data/tilesets/secondary/saffron_city/metatile_attributes.bin");
const u16 gMetatiles_PewterGym[] = INCBIN_U16("data/tilesets/secondary/pewter_gym/metatiles.bin");
const u32 gMetatileAttributes_PewterGym[] = INCBIN_U32("data/tilesets/secondary/pewter_gym/metatile_attributes.bin");
const u16 gMetatiles_CeruleanGym[] = INCBIN_U16("data/tilesets/secondary/cerulean_gym/metatiles.bin");
const u32 gMetatileAttributes_CeruleanGym[] = INCBIN_U32("data/tilesets/secondary/cerulean_gym/metatile_attributes.bin");
const u16 gMetatiles_VermilionGym[] = INCBIN_U16("data/tilesets/secondary/vermilion_gym/metatiles.bin");
const u32 gMetatileAttributes_VermilionGym[] = INCBIN_U32("data/tilesets/secondary/vermilion_gym/metatile_attributes.bin");
const u16 gMetatiles_CeladonGym[] = INCBIN_U16("data/tilesets/secondary/celadon_gym/metatiles.bin");
const u32 gMetatileAttributes_CeladonGym[] = INCBIN_U32("data/tilesets/secondary/celadon_gym/metatile_attributes.bin");
const u16 gMetatiles_FuchsiaGym[] = INCBIN_U16("data/tilesets/secondary/fuchsia_gym/metatiles.bin");
const u32 gMetatileAttributes_FuchsiaGym[] = INCBIN_U32("data/tilesets/secondary/fuchsia_gym/metatile_attributes.bin");
const u16 gMetatiles_SaffronGym[] = INCBIN_U16("data/tilesets/secondary/saffron_gym/metatiles.bin");
const u32 gMetatileAttributes_SaffronGym[] = INCBIN_U32("data/tilesets/secondary/saffron_gym/metatile_attributes.bin");
const u16 gMetatiles_CinnabarGym[] = INCBIN_U16("data/tilesets/secondary/cinnabar_gym/metatiles.bin");
const u32 gMetatileAttributes_CinnabarGym[] = INCBIN_U32("data/tilesets/secondary/cinnabar_gym/metatile_attributes.bin");
const u16 gMetatiles_ViridianGym[] = INCBIN_U16("data/tilesets/secondary/viridian_gym/metatiles.bin");
const u32 gMetatileAttributes_ViridianGym[] = INCBIN_U32("data/tilesets/secondary/viridian_gym/metatile_attributes.bin");
const u16 gMetatiles_Building[] = INCBIN_U16("data/tilesets/primary/building/metatiles.bin");
const u32 gMetatileAttributes_Building[] = INCBIN_U32("data/tilesets/primary/building/metatile_attributes.bin");
const u16 gMetatiles_Dummy1[] = INCBIN_U16("data/tilesets/secondary/dummy_1/metatiles.bin");
const u32 gMetatileAttributes_Dummy1[] = INCBIN_U32("data/tilesets/secondary/dummy_1/metatile_attributes.bin");
const u16 gMetatiles_HoennBuilding[] = INCBIN_U16("data/tilesets/secondary/hoenn_building/metatiles.bin");
const u32 gMetatileAttributes_HoennBuilding[] = INCBIN_U32("data/tilesets/secondary/hoenn_building/metatile_attributes.bin");
const u16 gMetatiles_BikeShop[] = INCBIN_U16("data/tilesets/secondary/bike_shop/metatiles.bin");
const u32 gMetatileAttributes_BikeShop[] = INCBIN_U32("data/tilesets/secondary/bike_shop/metatile_attributes.bin");
const u16 gMetatiles_Mart[] = INCBIN_U16("data/tilesets/secondary/mart/metatiles.bin");
const u32 gMetatileAttributes_Mart[] = INCBIN_U32("data/tilesets/secondary/mart/metatile_attributes.bin");
const u16 gMetatiles_PokemonCenter[] = INCBIN_U16("data/tilesets/secondary/pokemon_center/metatiles.bin");
const u32 gMetatileAttributes_PokemonCenter[] = INCBIN_U32("data/tilesets/secondary/pokemon_center/metatile_attributes.bin");
const u16 gMetatiles_GenericBuilding1[] = INCBIN_U16("data/tilesets/secondary/generic_building_1/metatiles.bin");
const u32 gMetatileAttributes_GenericBuilding1[] = INCBIN_U32("data/tilesets/secondary/generic_building_1/metatile_attributes.bin");
const u16 gMetatiles_Cave[] = INCBIN_U16("data/tilesets/secondary/cave/metatiles.bin");
const u32 gMetatileAttributes_Cave[] = INCBIN_U32("data/tilesets/secondary/cave/metatile_attributes.bin");
const u16 gMetatiles_GameCorner[] = INCBIN_U16("data/tilesets/secondary/game_corner/metatiles.bin");
const u32 gMetatileAttributes_GameCorner[] = INCBIN_U32("data/tilesets/secondary/game_corner/metatile_attributes.bin");
const u16 gMetatiles_Lab[] = INCBIN_U16("data/tilesets/secondary/lab/metatiles.bin");
const u32 gMetatileAttributes_Lab[] = INCBIN_U32("data/tilesets/secondary/lab/metatile_attributes.bin");
const u16 gMetatiles_SSAnne[] = INCBIN_U16("data/tilesets/secondary/ss_anne/metatiles.bin");
const u32 gMetatileAttributes_SSAnne[] = INCBIN_U32("data/tilesets/secondary/ss_anne/metatile_attributes.bin");
const u16 gMetatiles_Dummy2[] = INCBIN_U16("data/tilesets/secondary/dummy_2/metatiles.bin");
const u32 gMetatileAttributes_Dummy2[] = INCBIN_U32("data/tilesets/secondary/dummy_2/metatile_attributes.bin");
const u16 gMetatiles_ViridianForest[] = INCBIN_U16("data/tilesets/secondary/viridian_forest/metatiles.bin");
const u32 gMetatileAttributes_ViridianForest[] = INCBIN_U32("data/tilesets/secondary/viridian_forest/metatile_attributes.bin");
const u16 gMetatiles_UnusedGatehouse1[] = INCBIN_U16("data/tilesets/secondary/unused_gatehouse_1/metatiles.bin");
const u32 gMetatileAttributes_UnusedGatehouse1[] = INCBIN_U32("data/tilesets/secondary/unused_gatehouse_1/metatile_attributes.bin");
const u16 gMetatiles_RockTunnel[] = INCBIN_U16("data/tilesets/secondary/rock_tunnel/metatiles.bin");
const u32 gMetatileAttributes_RockTunnel[] = INCBIN_U32("data/tilesets/secondary/rock_tunnel/metatile_attributes.bin");
const u16 gMetatiles_DiglettsCave[] = INCBIN_U16("data/tilesets/secondary/digletts_cave/metatiles.bin");
const u32 gMetatileAttributes_DiglettsCave[] = INCBIN_U32("data/tilesets/secondary/digletts_cave/metatile_attributes.bin");
const u16 gMetatiles_SeafoamIslands[] = INCBIN_U16("data/tilesets/secondary/seafoam_islands/metatiles.bin");
const u32 gMetatileAttributes_SeafoamIslands[] = INCBIN_U32("data/tilesets/secondary/seafoam_islands/metatile_attributes.bin");
const u16 gMetatiles_UnusedGatehouse2[] = INCBIN_U16("data/tilesets/secondary/unused_gatehouse_2/metatiles.bin");
const u32 gMetatileAttributes_UnusedGatehouse2[] = INCBIN_U32("data/tilesets/secondary/unused_gatehouse_2/metatile_attributes.bin");
const u16 gMetatiles_CeruleanCave[] = INCBIN_U16("data/tilesets/secondary/cerulean_cave/metatiles.bin");
const u32 gMetatileAttributes_CeruleanCave[] = INCBIN_U32("data/tilesets/secondary/cerulean_cave/metatile_attributes.bin");
const u16 gMetatiles_DepartmentStore[] = INCBIN_U16("data/tilesets/secondary/department_store/metatiles.bin");
const u32 gMetatileAttributes_DepartmentStore[] = INCBIN_U32("data/tilesets/secondary/department_store/metatile_attributes.bin");
const u16 gMetatiles_GenericBuilding2[] = INCBIN_U16("data/tilesets/secondary/generic_building_2/metatiles.bin");
const u32 gMetatileAttributes_GenericBuilding2[] = INCBIN_U32("data/tilesets/secondary/generic_building_2/metatile_attributes.bin");
const u16 gMetatiles_PowerPlant[] = INCBIN_U16("data/tilesets/secondary/power_plant/metatiles.bin");
const u32 gMetatileAttributes_PowerPlant[] = INCBIN_U32("data/tilesets/secondary/power_plant/metatile_attributes.bin");
const u16 gMetatiles_SeaCottage[] = INCBIN_U16("data/tilesets/secondary/sea_cottage/metatiles.bin");
const u32 gMetatileAttributes_SeaCottage[] = INCBIN_U32("data/tilesets/secondary/sea_cottage/metatile_attributes.bin");
const u16 gMetatiles_SilphCo[] = INCBIN_U16("data/tilesets/secondary/silph_co/metatiles.bin");
const u32 gMetatileAttributes_SilphCo[] = INCBIN_U32("data/tilesets/secondary/silph_co/metatile_attributes.bin");
const u16 gMetatiles_UndergroundPath[] = INCBIN_U16("data/tilesets/secondary/underground_path/metatiles.bin");
const u32 gMetatileAttributes_UndergroundPath[] = INCBIN_U32("data/tilesets/secondary/underground_path/metatile_attributes.bin");
const u16 gMetatiles_PokemonTower[] = INCBIN_U16("data/tilesets/secondary/pokemon_tower/metatiles.bin");
const u32 gMetatileAttributes_PokemonTower[] = INCBIN_U32("data/tilesets/secondary/pokemon_tower/metatile_attributes.bin");
const u16 gMetatiles_SafariZoneBuilding[] = INCBIN_U16("data/tilesets/secondary/safari_zone_building/metatiles.bin");
const u32 gMetatileAttributes_SafariZoneBuilding[] = INCBIN_U32("data/tilesets/secondary/safari_zone_building/metatile_attributes.bin");
const u16 gMetatiles_PokemonMansion[] = INCBIN_U16("data/tilesets/secondary/pokemon_mansion/metatiles.bin");
const u32 gMetatileAttributes_PokemonMansion[] = INCBIN_U32("data/tilesets/secondary/pokemon_mansion/metatile_attributes.bin");
const u16 gMetatiles_Museum[] = INCBIN_U16("data/tilesets/secondary/museum/metatiles.bin");
const u32 gMetatileAttributes_Museum[] = INCBIN_U32("data/tilesets/secondary/museum/metatile_attributes.bin");
const u16 gMetatiles_CableClub[] = INCBIN_U16("data/tilesets/secondary/cable_club/metatiles.bin");
const u32 gMetatileAttributes_CableClub[] = INCBIN_U32("data/tilesets/secondary/cable_club/metatile_attributes.bin");
const u16 gMetatiles_RestaurantHotel[] = INCBIN_U16("data/tilesets/secondary/restaurant_hotel/metatiles.bin");
const u32 gMetatileAttributes_RestaurantHotel[] = INCBIN_U32("data/tilesets/secondary/restaurant_hotel/metatile_attributes.bin");
const u16 gMetatiles_School[] = INCBIN_U16("data/tilesets/secondary/school/metatiles.bin");
const u32 gMetatileAttributes_School[] = INCBIN_U32("data/tilesets/secondary/school/metatile_attributes.bin");
const u16 gMetatiles_FanClubDaycare[] = INCBIN_U16("data/tilesets/secondary/fan_club_daycare/metatiles.bin");
const u32 gMetatileAttributes_FanClubDaycare[] = INCBIN_U32("data/tilesets/secondary/fan_club_daycare/metatile_attributes.bin");
const u16 gMetatiles_Condominiums[] = INCBIN_U16("data/tilesets/secondary/condominiums/metatiles.bin");
const u32 gMetatileAttributes_Condominiums[] = INCBIN_U32("data/tilesets/secondary/condominiums/metatile_attributes.bin");
const u16 gMetatiles_BurgledHouse[] = INCBIN_U16("data/tilesets/secondary/burgled_house/metatiles.bin");
const u32 gMetatileAttributes_BurgledHouse[] = INCBIN_U32("data/tilesets/secondary/burgled_house/metatile_attributes.bin");
const u16 gMetatiles_Dummy3[] = INCBIN_U16("data/tilesets/secondary/dummy_3/metatiles.bin");
const u32 gMetatileAttributes_Dummy3[] = INCBIN_U32("data/tilesets/secondary/dummy_3/metatile_attributes.bin");
const u16 gMetatiles_Dummy4[] = INCBIN_U16("data/tilesets/secondary/dummy_4/metatiles.bin");
const u32 gMetatileAttributes_Dummy4[] = INCBIN_U32("data/tilesets/secondary/dummy_4/metatile_attributes.bin");
const u16 gMetatiles_MtEmber[] = INCBIN_U16("data/tilesets/secondary/mt_ember/metatiles.bin");
const u32 gMetatileAttributes_MtEmber[] = INCBIN_U32("data/tilesets/secondary/mt_ember/metatile_attributes.bin");
const u16 gMetatiles_BerryForest[] = INCBIN_U16("data/tilesets/secondary/berry_forest/metatiles.bin");
const u32 gMetatileAttributes_BerryForest[] = INCBIN_U32("data/tilesets/secondary/berry_forest/metatile_attributes.bin");
const u16 gMetatiles_NavelRock[] = INCBIN_U16("data/tilesets/secondary/navel_rock/metatiles.bin");
const u32 gMetatileAttributes_NavelRock[] = INCBIN_U32("data/tilesets/secondary/navel_rock/metatile_attributes.bin");
const u16 gMetatiles_TanobyRuins[] = INCBIN_U16("data/tilesets/secondary/tanoby_ruins/metatiles.bin");
const u32 gMetatileAttributes_TanobyRuins[] = INCBIN_U32("data/tilesets/secondary/tanoby_ruins/metatile_attributes.bin");
const u16 gMetatiles_SeviiIslands123[] = INCBIN_U16("data/tilesets/secondary/sevii_islands_123/metatiles.bin");
const u32 gMetatileAttributes_SeviiIslands123[] = INCBIN_U32("data/tilesets/secondary/sevii_islands_123/metatile_attributes.bin");
const u16 gMetatiles_SeviiIslands45[] = INCBIN_U16("data/tilesets/secondary/sevii_islands_45/metatiles.bin");
const u32 gMetatileAttributes_SeviiIslands45[] = INCBIN_U32("data/tilesets/secondary/sevii_islands_45/metatile_attributes.bin");
const u16 gMetatiles_SeviiIslands67[] = INCBIN_U16("data/tilesets/secondary/sevii_islands_67/metatiles.bin");
const u32 gMetatileAttributes_SeviiIslands67[] = INCBIN_U32("data/tilesets/secondary/sevii_islands_67/metatile_attributes.bin");
const u16 gMetatiles_TrainerTower[] = INCBIN_U16("data/tilesets/secondary/trainer_tower/metatiles.bin");
const u32 gMetatileAttributes_TrainerTower[] = INCBIN_U32("data/tilesets/secondary/trainer_tower/metatile_attributes.bin");
const u16 gMetatiles_IslandHarbor[] = INCBIN_U16("data/tilesets/secondary/island_harbor/metatiles.bin");
const u32 gMetatileAttributes_IslandHarbor[] = INCBIN_U32("data/tilesets/secondary/island_harbor/metatile_attributes.bin");
const u16 gMetatiles_PokemonLeague[] = INCBIN_U16("data/tilesets/secondary/pokemon_league/metatiles.bin");
const u32 gMetatileAttributes_PokemonLeague[] = INCBIN_U32("data/tilesets/secondary/pokemon_league/metatile_attributes.bin");
const u16 gMetatiles_HallOfFame[] = INCBIN_U16("data/tilesets/secondary/hall_of_fame/metatiles.bin");
const u32 gMetatileAttributes_HallOfFame[] = INCBIN_U32("data/tilesets/secondary/hall_of_fame/metatile_attributes.bin");
src/field_camera.c
+1 -1
View File
@@ -225,7 +225,7 @@ void DrawDoorMetatileAt(int x, int y, const u16 *tiles)
static void DrawMetatileAt(const struct MapLayout *mapLayout, u16 offset, int x, int y)
{
u16 metatileId = MapGridGetMetatileIdAt(x, y);
u16 *metatiles;
const u16 *metatiles;
if (metatileId > NUM_METATILES_TOTAL)
metatileId = 0;
src/fieldmap.c
+4 -4
View File
@@ -431,7 +431,7 @@ void MapGridSetMetatileImpassabilityAt(s32 x, s32 y, bool32 impassable)
static u32 GetAttributeByMetatileIdAndMapLayout(const struct MapLayout *mapLayout, u16 metatile, u8 attributeType)
{
u32 * attributes;
const u32 * attributes;
if (metatile < NUM_METATILES_IN_PRIMARY)
{
@@ -891,17 +891,17 @@ static void LoadTilesetPalette(struct Tileset const *tileset, u16 destOffset, u1
if (tileset->isSecondary == FALSE)
{
LoadPalette(&black, destOffset, 2);
LoadPalette(((u16 *)tileset->palettes) + 1, destOffset + 1, size - 2);
LoadPalette(tileset->palettes[0] + 1, destOffset + 1, size - 2);
ApplyGlobalTintToPaletteEntries(destOffset + 1, (size - 2) >> 1);
}
else if (tileset->isSecondary == TRUE)
{
LoadPalette(((u16 *)tileset->palettes) + (NUM_PALS_IN_PRIMARY * 16), destOffset, size);
LoadPalette(tileset->palettes[NUM_PALS_IN_PRIMARY], destOffset, size);
ApplyGlobalTintToPaletteEntries(destOffset, size >> 1);
}
else
{
LoadCompressedPalette((u32 *)tileset->palettes, destOffset, size);
LoadCompressedPalette((const u32 *)tileset->palettes, destOffset, size);
ApplyGlobalTintToPaletteEntries(destOffset, size >> 1);
}
}
src/shop.c
+2 -2
View File
@@ -751,9 +751,9 @@ static void BuyMenuDrawMapBg(void)
metatileLayerType = MapGridGetMetatileLayerTypeAt(x + i, y + j);
if (metatile < NUM_METATILES_IN_PRIMARY)
BuyMenuDrawMapMetatile(i, j, (u16 *)mapLayout->primaryTileset->metatiles + metatile * 8, metatileLayerType);
BuyMenuDrawMapMetatile(i, j, mapLayout->primaryTileset->metatiles + metatile * 8, metatileLayerType);
else
BuyMenuDrawMapMetatile(i, j, (u16 *)mapLayout->secondaryTileset->metatiles + ((metatile - NUM_METATILES_IN_PRIMARY) * 8), metatileLayerType);
BuyMenuDrawMapMetatile(i, j, mapLayout->secondaryTileset->metatiles + ((metatile - NUM_METATILES_IN_PRIMARY) * 8), metatileLayerType);
}
}
}
src/teachy_tv.c
+17 -17
View File
@@ -96,7 +96,7 @@ static void TeachyTvRestorePlayerPartyCallback(void);
static void TeachyTvPreBattleAnimAndSetBattleCallback(u8 taskId);
static void TeachyTvLoadMapTilesetToBuffer(struct Tileset *ts, u8 *dstBuffer, u16 size);
static void TeachyTvPushBackNewMapPalIndexArrayEntry(const struct MapLayout *mStruct, u16 *buf1, u8 *palIndexArray, u16 mapEntry, u16 offset);
static void TeachyTvComputeMapTilesFromTilesetAndMetaTiles(u16 *metaTilesArray, u8 *blockBuf, u8 *tileset);
static void TeachyTvComputeMapTilesFromTilesetAndMetaTiles(const u16 *metaTilesArray, u8 *blockBuf, u8 *tileset);
static void TeachyTvComputeSingleMapTileBlockFromTilesetAndMetaTiles(u8 *blockBuf, u8 *tileset, u8 metaTile);
static u16 TeachyTvComputePalIndexArrayEntryByMetaTile(u8 *palIndexArrayBuf, u16 metaTile);
static void TeachyTvLoadMapPalette(const struct MapLayout * mStruct, const u8 *palIndexArray);
@@ -1225,12 +1225,12 @@ static void TeachyTvLoadBg3Map(u16 *buffer)
u16 numMapTilesRows = 0;
const struct MapLayout *layout = &Route1_Layout;
u16 * blockIndicesBuffer = AllocZeroed(0x800);
tilesetsBuffer = AllocZeroed(0x8000);
tilesetsBuffer = AllocZeroed(NUM_TILES_TOTAL * TILE_SIZE_4BPP);
palIndicesBuffer = Alloc(16);
memset(palIndicesBuffer, 0xFF, 16);
TeachyTvLoadMapTilesetToBuffer(layout->primaryTileset, tilesetsBuffer, 0x280);
TeachyTvLoadMapTilesetToBuffer(layout->secondaryTileset, tilesetsBuffer + 0x5000, 0x180);
TeachyTvLoadMapTilesetToBuffer(layout->primaryTileset, tilesetsBuffer, NUM_TILES_IN_PRIMARY);
TeachyTvLoadMapTilesetToBuffer(layout->secondaryTileset, tilesetsBuffer + NUM_TILES_IN_PRIMARY * TILE_SIZE_4BPP, NUM_TILES_TOTAL - NUM_TILES_IN_PRIMARY);
for (i = 0; i < 9; i++)
{
@@ -1258,14 +1258,10 @@ static void TeachyTvLoadBg3Map(u16 *buffer)
for (i = 0; i < numMapTilesRows; i++)
{
memset(mapTilesRowBuffer, 0, 0x80);
if (blockIndicesBuffer[i] < 0x280)
{
TeachyTvComputeMapTilesFromTilesetAndMetaTiles(layout->primaryTileset->metatiles + blockIndicesBuffer[i] * 16, mapTilesRowBuffer, tilesetsBuffer);
}
if (blockIndicesBuffer[i] < NUM_METATILES_IN_PRIMARY)
TeachyTvComputeMapTilesFromTilesetAndMetaTiles((const void *)layout->primaryTileset->metatiles + blockIndicesBuffer[i] * 16, mapTilesRowBuffer, tilesetsBuffer);
else
{
TeachyTvComputeMapTilesFromTilesetAndMetaTiles(layout->secondaryTileset->metatiles + (blockIndicesBuffer[i] - 0x280) * 16, mapTilesRowBuffer, tilesetsBuffer);
}
TeachyTvComputeMapTilesFromTilesetAndMetaTiles((const void *)layout->secondaryTileset->metatiles + (blockIndicesBuffer[i] - NUM_METATILES_IN_PRIMARY) * 16, mapTilesRowBuffer, tilesetsBuffer);
CpuFastCopy(mapTilesRowBuffer, bgTilesBuffer + i * 0x40, 0x80);
}
@@ -1292,14 +1288,18 @@ static void TeachyTvLoadMapTilesetToBuffer(struct Tileset *ts, u8 *dstBuffer, u1
static void TeachyTvPushBackNewMapPalIndexArrayEntry(const struct MapLayout *mStruct, u16 *buf1, u8 *palIndexArray, u16 mapEntry, u16 offset)
{
u16 * metaTileEntryAddr = mapEntry < 0x280 ? &((u16 *)(mStruct->primaryTileset->metatiles))[8 * mapEntry] : &((u16 *)(mStruct->secondaryTileset->metatiles))[8 * (mapEntry - 0x280)];
const u16 * metaTileEntryAddr;
if (mapEntry < NUM_METATILES_IN_PRIMARY)
metaTileEntryAddr = &mStruct->primaryTileset->metatiles[8 * mapEntry];
else
metaTileEntryAddr = &mStruct->secondaryTileset->metatiles[8 * (mapEntry - NUM_METATILES_IN_PRIMARY)];
buf1[0] = (TeachyTvComputePalIndexArrayEntryByMetaTile(palIndexArray, metaTileEntryAddr[0]) << 12) + 4 * offset;
buf1[1] = (TeachyTvComputePalIndexArrayEntryByMetaTile(palIndexArray, metaTileEntryAddr[1]) << 12) + 4 * offset + 1;
buf1[32] = (TeachyTvComputePalIndexArrayEntryByMetaTile(palIndexArray, metaTileEntryAddr[2]) << 12) + 4 * offset + 2;
buf1[33] = (TeachyTvComputePalIndexArrayEntryByMetaTile(palIndexArray, metaTileEntryAddr[3]) << 12) + 4 * offset + 3;
}
static void TeachyTvComputeMapTilesFromTilesetAndMetaTiles(u16 *metaTilesArray, u8 *blockBuf, u8 *tileset)
static void TeachyTvComputeMapTilesFromTilesetAndMetaTiles(const u16 *metaTilesArray, u8 *blockBuf, u8 *tileset)
{
TeachyTvComputeSingleMapTileBlockFromTilesetAndMetaTiles(blockBuf, &tileset[0x20 * (*metaTilesArray & 0x3FF)], (*metaTilesArray >> 10) & 3);
TeachyTvComputeSingleMapTileBlockFromTilesetAndMetaTiles(blockBuf, &tileset[0x20 * (metaTilesArray[4] & 0x3FF)], (metaTilesArray[4] >> 10) & 3);
@@ -1384,16 +1384,16 @@ static void TeachyTvLoadMapPalette(const struct MapLayout * mStruct, const u8 *
{
u8 i;
const struct Tileset * ts;
u16 * dest;
const u16 * dest;
for (i = 0; i < 16; i++)
{
if (palIndexArray[i] == 0xFF)
break;
if (palIndexArray[i] > 6)
dest = (u16 *)mStruct->secondaryTileset->palettes + 0x10 * palIndexArray[i];
if (palIndexArray[i] >= NUM_PALS_IN_PRIMARY)
dest = mStruct->secondaryTileset->palettes[palIndexArray[i]];
else
dest = (u16 *)mStruct->primaryTileset->palettes + 0x10 * palIndexArray[i];
dest = mStruct->primaryTileset->palettes[palIndexArray[i]];
LoadPalette(dest, 0x10 * (15 - i), 0x20);
}
}
src/tilesets.c
+7
View File
@@ -0,0 +1,7 @@
#include "global.h"
#include "tilesets.h"
#include "tileset_anims.h"
#include "data/tilesets/graphics.h"
#include "data/tilesets/metatiles.h"
#include "data/tilesets/headers.h"