diff --git a/charmap.asm b/charmap.asm index 00b9e1f..3c2e78b 100644 --- a/charmap.asm +++ b/charmap.asm @@ -123,6 +123,8 @@ charmap "└", $be charmap "┘", $bf + charmap "+", $cd + charmap "′", $ce charmap "″", $cf diff --git a/constants/tileset_constants.asm b/constants/tileset_constants.asm index 2b4f976..02ceab1 100644 --- a/constants/tileset_constants.asm +++ b/constants/tileset_constants.asm @@ -39,7 +39,7 @@ DEF NUM_TILESETS EQU const_value - 1 ; wTileset struct size -DEF TILESET_LENGTH EQU 15 +DEF TILESET_LENGTH EQU 14 ; roof length (see gfx/tilesets/roofs) DEF ROOF_LENGTH EQU 9 diff --git a/data/maps/blocks.asm b/data/maps/blocks.asm index a698e9b..7cdf608 100644 --- a/data/maps/blocks.asm +++ b/data/maps/blocks.asm @@ -1,58 +1,58 @@ SECTION "Map Blocks 1", ROMX Route32_Blocks: - INCBIN "maps/Route32.blk" + INCBIN "maps/Route32.ablk" Route40_Blocks: - INCBIN "maps/Route40.blk" + INCBIN "maps/Route40.ablk" Route36_Blocks: - INCBIN "maps/Route36.blk" + INCBIN "maps/Route36.ablk" Route44_Blocks: - INCBIN "maps/Route44.blk" + INCBIN "maps/Route44.ablk" Route28_Blocks: - INCBIN "maps/Route28.blk" + INCBIN "maps/Route28.ablk" BetaPlayersHouse2F_Blocks: ; unreferenced - INCBIN "maps/unused/BetaPlayersHouse2F.blk" + INCBIN "maps/unused/BetaPlayersHouse2F.ablk" CeladonCity_Blocks: - INCBIN "maps/CeladonCity.blk" + INCBIN "maps/CeladonCity.ablk" SaffronCity_Blocks: - INCBIN "maps/SaffronCity.blk" + INCBIN "maps/SaffronCity.ablk" Route2_Blocks: - INCBIN "maps/Route2.blk" + INCBIN "maps/Route2.ablk" ElmsHouse_Blocks: - INCBIN "maps/ElmsHouse.blk" + INCBIN "maps/ElmsHouse.ablk" BetaSproutTower1_Blocks: ; unreferenced - INCBIN "maps/unused/BetaSproutTower1.blk" + INCBIN "maps/unused/BetaSproutTower1.ablk" Route11_Blocks: - INCBIN "maps/Route11.blk" + INCBIN "maps/Route11.ablk" BetaSproutTower5_Blocks: ; unreferenced - INCBIN "maps/unused/BetaSproutTower5.blk" + INCBIN "maps/unused/BetaSproutTower5.ablk" Route15_Blocks: - INCBIN "maps/Route15.blk" + INCBIN "maps/Route15.ablk" BetaSproutTower9_Blocks: ; unreferenced - INCBIN "maps/unused/BetaSproutTower9.blk" + INCBIN "maps/unused/BetaSproutTower9.ablk" Route19_Blocks: - INCBIN "maps/Route19.blk" + INCBIN "maps/Route19.ablk" BetaBlackthornCity_Blocks: ; unreferenced - INCBIN "maps/unused/BetaBlackthornCity.blk" + INCBIN "maps/unused/BetaBlackthornCity.ablk" Route10South_Blocks: - INCBIN "maps/Route10South.blk" + INCBIN "maps/Route10South.ablk" Pokecenter2F_Blocks: CinnabarPokecenter2FBeta_Blocks: @@ -65,88 +65,88 @@ LavenderPokecenter2FBeta_Blocks: CeladonPokecenter2FBeta_Blocks: ViridianPokecenter2FBeta_Blocks: SaffronPokecenter2FBeta_Blocks: - INCBIN "maps/Pokecenter2F.blk" + INCBIN "maps/Pokecenter2F.ablk" Route41_Blocks: - INCBIN "maps/Route41.blk" + INCBIN "maps/Route41.ablk" Route33_Blocks: - INCBIN "maps/Route33.blk" + INCBIN "maps/Route33.ablk" Route45_Blocks: - INCBIN "maps/Route45.blk" + INCBIN "maps/Route45.ablk" Route29_Blocks: - INCBIN "maps/Route29.blk" + INCBIN "maps/Route29.ablk" Route37_Blocks: - INCBIN "maps/Route37.blk" + INCBIN "maps/Route37.ablk" LavenderTown_Blocks: - INCBIN "maps/LavenderTown.blk" + INCBIN "maps/LavenderTown.ablk" PalletTown_Blocks: - INCBIN "maps/PalletTown.blk" + INCBIN "maps/PalletTown.ablk" Route25_Blocks: - INCBIN "maps/Route25.blk" + INCBIN "maps/Route25.ablk" Route24_Blocks: - INCBIN "maps/Route24.blk" + INCBIN "maps/Route24.ablk" BetaVioletCity_Blocks: ; unreferenced - INCBIN "maps/unused/BetaVioletCity.blk" + INCBIN "maps/unused/BetaVioletCity.ablk" Route3_Blocks: - INCBIN "maps/Route3.blk" + INCBIN "maps/Route3.ablk" PewterCity_Blocks: - INCBIN "maps/PewterCity.blk" + INCBIN "maps/PewterCity.ablk" BetaSilverCaveOutside_Blocks: ; unreferenced - INCBIN "maps/unused/BetaSilverCaveOutside.blk" + INCBIN "maps/unused/BetaSilverCaveOutside.ablk" BetaSproutTower2_Blocks: ; unreferenced - INCBIN "maps/unused/BetaSproutTower2.blk" + INCBIN "maps/unused/BetaSproutTower2.ablk" Route12_Blocks: - INCBIN "maps/Route12.blk" + INCBIN "maps/Route12.ablk" BetaGoldenrodCity_Blocks: ; unreferenced - INCBIN "maps/unused/BetaGoldenrodCity.blk" + INCBIN "maps/unused/BetaGoldenrodCity.ablk" Route20_Blocks: - INCBIN "maps/Route20.blk" + INCBIN "maps/Route20.ablk" BetaSproutTower6_Blocks: ; unreferenced - INCBIN "maps/unused/BetaSproutTower6.blk" + INCBIN "maps/unused/BetaSproutTower6.ablk" BetaPokecenter_Blocks: ; unreferenced - INCBIN "maps/unused/BetaPokecenter.blk" + INCBIN "maps/unused/BetaPokecenter.ablk" Route30_Blocks: - INCBIN "maps/Route30.blk" + INCBIN "maps/Route30.ablk" Route26_Blocks: - INCBIN "maps/Route26.blk" + INCBIN "maps/Route26.ablk" Route42_Blocks: - INCBIN "maps/Route42.blk" + INCBIN "maps/Route42.ablk" Route34_Blocks: - INCBIN "maps/Route34.blk" + INCBIN "maps/Route34.ablk" Route46_Blocks: - INCBIN "maps/Route46.blk" + INCBIN "maps/Route46.ablk" FuchsiaCity_Blocks: - INCBIN "maps/FuchsiaCity.blk" + INCBIN "maps/FuchsiaCity.ablk" Route38_Blocks: - INCBIN "maps/Route38.blk" + INCBIN "maps/Route38.ablk" BetaCianwoodCity_Blocks: ; unreferenced - INCBIN "maps/unused/BetaCianwoodCity.blk" + INCBIN "maps/unused/BetaCianwoodCity.ablk" OlivineTimsHouse_Blocks: OlivineHouseBeta_Blocks: @@ -198,7 +198,7 @@ CherrygroveGymSpeechHouse_Blocks: GuideGentsHouse_Blocks: CherrygroveEvolutionSpeechHouse_Blocks: Route30BerryHouse_Blocks: - INCBIN "maps/House1.blk" + INCBIN "maps/House1.ablk" SafariZoneFuchsiaGateBeta_Blocks: Route19FuchsiaGate_Blocks: @@ -212,61 +212,61 @@ Route40BattleTowerGate_Blocks: Route2Gate_Blocks: Route29Route46Gate_Blocks: Route5SaffronGate_Blocks: - INCBIN "maps/NorthSouthGate.blk" + INCBIN "maps/NorthSouthGate.ablk" BetaEcruteakCity_Blocks: ; unreferenced - INCBIN "maps/unused/BetaEcruteakCity.blk" + INCBIN "maps/unused/BetaEcruteakCity.ablk" BetaCherrygroveCity_Blocks: ; unreferenced - INCBIN "maps/unused/BetaCherrygroveCity.blk" + INCBIN "maps/unused/BetaCherrygroveCity.ablk" CinnabarIsland_Blocks: - INCBIN "maps/CinnabarIsland.blk" + INCBIN "maps/CinnabarIsland.ablk" Route4_Blocks: - INCBIN "maps/Route4.blk" + INCBIN "maps/Route4.ablk" Route8_Blocks: - INCBIN "maps/Route8.blk" + INCBIN "maps/Route8.ablk" BetaSproutTower3_Blocks: ; unreferenced - INCBIN "maps/unused/BetaSproutTower3.blk" + INCBIN "maps/unused/BetaSproutTower3.ablk" ViridianCity_Blocks: - INCBIN "maps/ViridianCity.blk" + INCBIN "maps/ViridianCity.ablk" Route13_Blocks: - INCBIN "maps/Route13.blk" + INCBIN "maps/Route13.ablk" Route21_Blocks: - INCBIN "maps/Route21.blk" + INCBIN "maps/Route21.ablk" BetaSproutTower7_Blocks: ; unreferenced - INCBIN "maps/unused/BetaSproutTower7.blk" + INCBIN "maps/unused/BetaSproutTower7.ablk" Route17_Blocks: - INCBIN "maps/Route17.blk" + INCBIN "maps/Route17.ablk" BetaMahoganyTown_Blocks: ; unreferenced - INCBIN "maps/unused/BetaMahoganyTown.blk" + INCBIN "maps/unused/BetaMahoganyTown.ablk" Route31_Blocks: - INCBIN "maps/Route31.blk" + INCBIN "maps/Route31.ablk" Route27_Blocks: - INCBIN "maps/Route27.blk" + INCBIN "maps/Route27.ablk" Route35_Blocks: - INCBIN "maps/Route35.blk" + INCBIN "maps/Route35.ablk" Route43_Blocks: - INCBIN "maps/Route43.blk" + INCBIN "maps/Route43.ablk" Route39_Blocks: - INCBIN "maps/Route39.blk" + INCBIN "maps/Route39.ablk" PlayersHouse1F_Blocks: - INCBIN "maps/PlayersHouse1F.blk" + INCBIN "maps/PlayersHouse1F.ablk" Route38EcruteakGate_Blocks: Route42EcruteakGate_Blocks: @@ -278,46 +278,46 @@ Route16Gate_Blocks: Route7SaffronGate_Blocks: Route17Route18Gate_Blocks: Route31VioletGate_Blocks: - INCBIN "maps/EastWestGate.blk" + INCBIN "maps/EastWestGate.ablk" BetaAzaleaTown_Blocks: ; unreferenced - INCBIN "maps/unused/BetaAzaleaTown.blk" + INCBIN "maps/unused/BetaAzaleaTown.ablk" VermilionCity_Blocks: - INCBIN "maps/VermilionCity.blk" + INCBIN "maps/VermilionCity.ablk" BetaOlivineCity_Blocks: ; unreferenced - INCBIN "maps/unused/BetaOlivineCity.blk" + INCBIN "maps/unused/BetaOlivineCity.ablk" BetaNewBarkTown_Blocks: ; unreferenced - INCBIN "maps/unused/BetaNewBarkTown.blk" + INCBIN "maps/unused/BetaNewBarkTown.ablk" ElmsLab_Blocks: - INCBIN "maps/ElmsLab.blk" + INCBIN "maps/ElmsLab.ablk" CeruleanCity_Blocks: - INCBIN "maps/CeruleanCity.blk" + INCBIN "maps/CeruleanCity.ablk" Route1_Blocks: - INCBIN "maps/Route1.blk" + INCBIN "maps/Route1.ablk" Route5_Blocks: - INCBIN "maps/Route5.blk" + INCBIN "maps/Route5.ablk" Route9_Blocks: - INCBIN "maps/Route9.blk" + INCBIN "maps/Route9.ablk" Route22_Blocks: - INCBIN "maps/Route22.blk" + INCBIN "maps/Route22.ablk" SECTION "Map Blocks 2", ROMX Route14_Blocks: - INCBIN "maps/Route14.blk" + INCBIN "maps/Route14.ablk" BetaSproutTower8_Blocks: ; unreferenced - INCBIN "maps/unused/BetaSproutTower8.blk" + INCBIN "maps/unused/BetaSproutTower8.ablk" OlivineMart_Blocks: EcruteakMart_Blocks: @@ -332,13 +332,13 @@ LavenderMart_Blocks: ViridianMart_Blocks: SaffronMart_Blocks: CherrygroveMart_Blocks: - INCBIN "maps/Mart.blk" + INCBIN "maps/Mart.ablk" Route10North_Blocks: - INCBIN "maps/Route10North.blk" + INCBIN "maps/Route10North.ablk" BetaLakeOfRage_Blocks: ; unreferenced - INCBIN "maps/unused/BetaLakeOfRage.blk" + INCBIN "maps/unused/BetaLakeOfRage.ablk" OlivinePokecenter1F_Blocks: MahoganyPokecenter1F_Blocks: @@ -361,687 +361,687 @@ CianwoodPokecenter1F_Blocks: ViridianPokecenter1F_Blocks: SaffronPokecenter1F_Blocks: CherrygrovePokecenter1F_Blocks: - INCBIN "maps/Pokecenter1F.blk" + INCBIN "maps/Pokecenter1F.ablk" BetaPewterMuseumOfScience1F_Blocks: ; unreferenced - INCBIN "maps/unused/BetaPewterMuseumOfScience1F.blk" + INCBIN "maps/unused/BetaPewterMuseumOfScience1F.ablk" BetaPewterMuseumOfScience2F_Blocks: ; unreferenced - INCBIN "maps/unused/BetaPewterMuseumOfScience2F.blk" + INCBIN "maps/unused/BetaPewterMuseumOfScience2F.ablk" EarlsPokemonAcademy_Blocks: - INCBIN "maps/EarlsPokemonAcademy.blk" + INCBIN "maps/EarlsPokemonAcademy.ablk" BetaCinnabarPokemonLabHallway_Blocks: ; unreferenced - INCBIN "maps/unused/BetaCinnabarPokemonLabHallway.blk" + INCBIN "maps/unused/BetaCinnabarPokemonLabHallway.ablk" BetaCinnabarPokemonLabRoom1_Blocks: ; unreferenced - INCBIN "maps/unused/BetaCinnabarPokemonLabRoom1.blk" + INCBIN "maps/unused/BetaCinnabarPokemonLabRoom1.ablk" BetaCinnabarPokemonLabRoom2_Blocks: ; unreferenced - INCBIN "maps/unused/BetaCinnabarPokemonLabRoom2.blk" + INCBIN "maps/unused/BetaCinnabarPokemonLabRoom2.ablk" BetaCinnabarPokemonLabRoom3_Blocks: ; unreferenced - INCBIN "maps/unused/BetaCinnabarPokemonLabRoom3.blk" + INCBIN "maps/unused/BetaCinnabarPokemonLabRoom3.ablk" GoldenrodDeptStore1F_Blocks: CeladonDeptStore1F_Blocks: - INCBIN "maps/DeptStore1F.blk" + INCBIN "maps/DeptStore1F.ablk" GoldenrodDeptStore2F_Blocks: CeladonDeptStore2F_Blocks: - INCBIN "maps/DeptStore2F.blk" + INCBIN "maps/DeptStore2F.ablk" GoldenrodDeptStore3F_Blocks: CeladonDeptStore3F_Blocks: - INCBIN "maps/DeptStore3F.blk" + INCBIN "maps/DeptStore3F.ablk" GoldenrodDeptStore4F_Blocks: CeladonDeptStore4F_Blocks: - INCBIN "maps/DeptStore4F.blk" + INCBIN "maps/DeptStore4F.ablk" GoldenrodDeptStore5F_Blocks: CeladonDeptStore5F_Blocks: - INCBIN "maps/DeptStore5F.blk" + INCBIN "maps/DeptStore5F.ablk" GoldenrodDeptStore6F_Blocks: CeladonDeptStore6F_Blocks: - INCBIN "maps/DeptStore6F.blk" + INCBIN "maps/DeptStore6F.ablk" GoldenrodDeptStoreElevator_Blocks: CeladonDeptStoreElevator_Blocks: - INCBIN "maps/DeptStoreElevator.blk" + INCBIN "maps/DeptStoreElevator.ablk" CeladonMansion1F_Blocks: - INCBIN "maps/CeladonMansion1F.blk" + INCBIN "maps/CeladonMansion1F.ablk" CeladonMansion2F_Blocks: - INCBIN "maps/CeladonMansion2F.blk" + INCBIN "maps/CeladonMansion2F.ablk" CeladonMansion3F_Blocks: - INCBIN "maps/CeladonMansion3F.blk" + INCBIN "maps/CeladonMansion3F.ablk" CeladonMansionRoof_Blocks: - INCBIN "maps/CeladonMansionRoof.blk" + INCBIN "maps/CeladonMansionRoof.ablk" BetaHouse_Blocks: ; unreferenced - INCBIN "maps/unused/BetaHouse.blk" + INCBIN "maps/unused/BetaHouse.ablk" CeladonGameCorner_Blocks: - INCBIN "maps/CeladonGameCorner.blk" + INCBIN "maps/CeladonGameCorner.ablk" CeladonGameCornerPrizeRoom_Blocks: - INCBIN "maps/CeladonGameCornerPrizeRoom.blk" + INCBIN "maps/CeladonGameCornerPrizeRoom.ablk" Colosseum_Blocks: - INCBIN "maps/Colosseum.blk" + INCBIN "maps/Colosseum.ablk" TradeCenter_Blocks: TimeCapsule_Blocks: - INCBIN "maps/TradeCenter.blk" + INCBIN "maps/TradeCenter.ablk" EcruteakLugiaSpeechHouse_Blocks: EcruteakItemfinderHouse_Blocks: VioletNicknameSpeechHouse_Blocks: VioletKylesHouse_Blocks: - INCBIN "maps/House2.blk" + INCBIN "maps/House2.ablk" BetaUnionCave_Blocks: ; unreferenced - INCBIN "maps/unused/BetaUnionCave.blk" + INCBIN "maps/unused/BetaUnionCave.ablk" UnionCaveB1F_Blocks: - INCBIN "maps/UnionCaveB1F.blk" + INCBIN "maps/UnionCaveB1F.ablk" UnionCaveB2F_Blocks: - INCBIN "maps/UnionCaveB2F.blk" + INCBIN "maps/UnionCaveB2F.ablk" UnionCave1F_Blocks: - INCBIN "maps/UnionCave1F.blk" + INCBIN "maps/UnionCave1F.ablk" NationalPark_Blocks: NationalParkBugContest_Blocks: - INCBIN "maps/NationalPark.blk" + INCBIN "maps/NationalPark.ablk" Route5UndergroundPathEntrance_Blocks: Route6UndergroundPathEntrance_Blocks: - INCBIN "maps/UndergroundPathEntrance.blk" + INCBIN "maps/UndergroundPathEntrance.ablk" BetaCapsuleHouse_Blocks: ; unreferenced - INCBIN "maps/unused/BetaCapsuleHouse.blk" + INCBIN "maps/unused/BetaCapsuleHouse.ablk" KurtsHouse_Blocks: - INCBIN "maps/KurtsHouse.blk" + INCBIN "maps/KurtsHouse.ablk" GoldenrodMagnetTrainStation_Blocks: - INCBIN "maps/GoldenrodMagnetTrainStation.blk" + INCBIN "maps/GoldenrodMagnetTrainStation.ablk" RuinsOfAlphOutside_Blocks: - INCBIN "maps/RuinsOfAlphOutside.blk" + INCBIN "maps/RuinsOfAlphOutside.ablk" BetaRuinsOfAlphUnsolvedPuzzleRoom_Blocks: ; unreferenced - INCBIN "maps/unused/BetaRuinsOfAlphUnsolvedPuzzleRoom.blk" + INCBIN "maps/unused/BetaRuinsOfAlphUnsolvedPuzzleRoom.ablk" RuinsOfAlphInnerChamber_Blocks: - INCBIN "maps/RuinsOfAlphInnerChamber.blk" + INCBIN "maps/RuinsOfAlphInnerChamber.ablk" RuinsOfAlphHoOhChamber_Blocks: RuinsOfAlphKabutoChamber_Blocks: RuinsOfAlphOmanyteChamber_Blocks: RuinsOfAlphAerodactylChamber_Blocks: - INCBIN "maps/RuinsOfAlphPuzzleChamber.blk" + INCBIN "maps/RuinsOfAlphPuzzleChamber.ablk" SproutTower1F_Blocks: - INCBIN "maps/SproutTower1F.blk" + INCBIN "maps/SproutTower1F.ablk" BetaSproutTowerCutOut1_Blocks: ; unreferenced - INCBIN "maps/unused/BetaSproutTowerCutOut1.blk" + INCBIN "maps/unused/BetaSproutTowerCutOut1.ablk" SproutTower2F_Blocks: - INCBIN "maps/SproutTower2F.blk" + INCBIN "maps/SproutTower2F.ablk" BetaSproutTowerCutOut2_Blocks: ; unreferenced - INCBIN "maps/unused/BetaSproutTowerCutOut2.blk" + INCBIN "maps/unused/BetaSproutTowerCutOut2.ablk" SproutTower3F_Blocks: - INCBIN "maps/SproutTower3F.blk" + INCBIN "maps/SproutTower3F.ablk" BetaSproutTowerCutOut3_Blocks: ; unreferenced - INCBIN "maps/unused/BetaSproutTowerCutOut3.blk" + INCBIN "maps/unused/BetaSproutTowerCutOut3.ablk" RadioTower1F_Blocks: - INCBIN "maps/RadioTower1F.blk" + INCBIN "maps/RadioTower1F.ablk" RadioTower2F_Blocks: - INCBIN "maps/RadioTower2F.blk" + INCBIN "maps/RadioTower2F.ablk" RadioTower3F_Blocks: - INCBIN "maps/RadioTower3F.blk" + INCBIN "maps/RadioTower3F.ablk" RadioTower4F_Blocks: - INCBIN "maps/RadioTower4F.blk" + INCBIN "maps/RadioTower4F.ablk" RadioTower5F_Blocks: - INCBIN "maps/RadioTower5F.blk" + INCBIN "maps/RadioTower5F.ablk" NewBarkTown_Blocks: - INCBIN "maps/NewBarkTown.blk" + INCBIN "maps/NewBarkTown.ablk" CherrygroveCity_Blocks: - INCBIN "maps/CherrygroveCity.blk" + INCBIN "maps/CherrygroveCity.ablk" VioletCity_Blocks: - INCBIN "maps/VioletCity.blk" + INCBIN "maps/VioletCity.ablk" AzaleaTown_Blocks: - INCBIN "maps/AzaleaTown.blk" + INCBIN "maps/AzaleaTown.ablk" CianwoodCity_Blocks: - INCBIN "maps/CianwoodCity.blk" + INCBIN "maps/CianwoodCity.ablk" GoldenrodCity_Blocks: - INCBIN "maps/GoldenrodCity.blk" + INCBIN "maps/GoldenrodCity.ablk" OlivineCity_Blocks: - INCBIN "maps/OlivineCity.blk" + INCBIN "maps/OlivineCity.ablk" EcruteakCity_Blocks: - INCBIN "maps/EcruteakCity.blk" + INCBIN "maps/EcruteakCity.ablk" MahoganyTown_Blocks: - INCBIN "maps/MahoganyTown.blk" + INCBIN "maps/MahoganyTown.ablk" LakeOfRage_Blocks: - INCBIN "maps/LakeOfRage.blk" + INCBIN "maps/LakeOfRage.ablk" BlackthornCity_Blocks: - INCBIN "maps/BlackthornCity.blk" + INCBIN "maps/BlackthornCity.ablk" SilverCaveOutside_Blocks: - INCBIN "maps/SilverCaveOutside.blk" + INCBIN "maps/SilverCaveOutside.ablk" Route6_Blocks: - INCBIN "maps/Route6.blk" + INCBIN "maps/Route6.ablk" Route7_Blocks: - INCBIN "maps/Route7.blk" + INCBIN "maps/Route7.ablk" Route16_Blocks: - INCBIN "maps/Route16.blk" + INCBIN "maps/Route16.ablk" Route18_Blocks: - INCBIN "maps/Route18.blk" + INCBIN "maps/Route18.ablk" GoldenrodUnderground_Blocks: - INCBIN "maps/GoldenrodUnderground.blk" + INCBIN "maps/GoldenrodUnderground.ablk" GoldenrodUndergroundSwitchRoomEntrances_Blocks: - INCBIN "maps/GoldenrodUndergroundSwitchRoomEntrances.blk" + INCBIN "maps/GoldenrodUndergroundSwitchRoomEntrances.ablk" GoldenrodDeptStoreB1F_Blocks: - INCBIN "maps/GoldenrodDeptStoreB1F.blk" + INCBIN "maps/GoldenrodDeptStoreB1F.ablk" GoldenrodUndergroundWarehouse_Blocks: - INCBIN "maps/GoldenrodUndergroundWarehouse.blk" + INCBIN "maps/GoldenrodUndergroundWarehouse.ablk" BetaElevator_Blocks: ; unreferenced - INCBIN "maps/unused/BetaElevator.blk" + INCBIN "maps/unused/BetaElevator.ablk" TinTower1F_Blocks: - INCBIN "maps/TinTower1F.blk" + INCBIN "maps/TinTower1F.ablk" TinTower2F_Blocks: - INCBIN "maps/TinTower2F.blk" + INCBIN "maps/TinTower2F.ablk" TinTower3F_Blocks: - INCBIN "maps/TinTower3F.blk" + INCBIN "maps/TinTower3F.ablk" TinTower4F_Blocks: - INCBIN "maps/TinTower4F.blk" + INCBIN "maps/TinTower4F.ablk" TinTower5F_Blocks: - INCBIN "maps/TinTower5F.blk" + INCBIN "maps/TinTower5F.ablk" TinTower6F_Blocks: - INCBIN "maps/TinTower6F.blk" + INCBIN "maps/TinTower6F.ablk" TinTower7F_Blocks: - INCBIN "maps/TinTower7F.blk" + INCBIN "maps/TinTower7F.ablk" TinTower8F_Blocks: - INCBIN "maps/TinTower8F.blk" + INCBIN "maps/TinTower8F.ablk" TinTower9F_Blocks: - INCBIN "maps/TinTower9F.blk" + INCBIN "maps/TinTower9F.ablk" TinTowerRoof_Blocks: - INCBIN "maps/TinTowerRoof.blk" + INCBIN "maps/TinTowerRoof.ablk" BurnedTower1F_Blocks: - INCBIN "maps/BurnedTower1F.blk" + INCBIN "maps/BurnedTower1F.ablk" BurnedTowerB1F_Blocks: - INCBIN "maps/BurnedTowerB1F.blk" + INCBIN "maps/BurnedTowerB1F.ablk" BetaCaveTestMap_Blocks: ; unreferenced - INCBIN "maps/unused/BetaCaveTestMap.blk" + INCBIN "maps/unused/BetaCaveTestMap.ablk" MountMortar1FOutside_Blocks: - INCBIN "maps/MountMortar1FOutside.blk" + INCBIN "maps/MountMortar1FOutside.ablk" MountMortar1FInside_Blocks: - INCBIN "maps/MountMortar1FInside.blk" + INCBIN "maps/MountMortar1FInside.ablk" MountMortar2FInside_Blocks: - INCBIN "maps/MountMortar2FInside.blk" + INCBIN "maps/MountMortar2FInside.ablk" MountMortarB1F_Blocks: - INCBIN "maps/MountMortarB1F.blk" + INCBIN "maps/MountMortarB1F.ablk" IcePath1F_Blocks: - INCBIN "maps/IcePath1F.blk" + INCBIN "maps/IcePath1F.ablk" IcePathB1F_Blocks: - INCBIN "maps/IcePathB1F.blk" + INCBIN "maps/IcePathB1F.ablk" IcePathB2FMahoganySide_Blocks: - INCBIN "maps/IcePathB2FMahoganySide.blk" + INCBIN "maps/IcePathB2FMahoganySide.ablk" IcePathB2FBlackthornSide_Blocks: - INCBIN "maps/IcePathB2FBlackthornSide.blk" + INCBIN "maps/IcePathB2FBlackthornSide.ablk" IcePathB3F_Blocks: - INCBIN "maps/IcePathB3F.blk" + INCBIN "maps/IcePathB3F.ablk" WhirlIslandNW_Blocks: - INCBIN "maps/WhirlIslandNW.blk" + INCBIN "maps/WhirlIslandNW.ablk" WhirlIslandNE_Blocks: - INCBIN "maps/WhirlIslandNE.blk" + INCBIN "maps/WhirlIslandNE.ablk" WhirlIslandSW_Blocks: - INCBIN "maps/WhirlIslandSW.blk" + INCBIN "maps/WhirlIslandSW.ablk" WhirlIslandCave_Blocks: - INCBIN "maps/WhirlIslandCave.blk" + INCBIN "maps/WhirlIslandCave.ablk" WhirlIslandSE_Blocks: - INCBIN "maps/WhirlIslandSE.blk" + INCBIN "maps/WhirlIslandSE.ablk" WhirlIslandB1F_Blocks: - INCBIN "maps/WhirlIslandB1F.blk" + INCBIN "maps/WhirlIslandB1F.ablk" WhirlIslandB2F_Blocks: - INCBIN "maps/WhirlIslandB2F.blk" + INCBIN "maps/WhirlIslandB2F.ablk" WhirlIslandLugiaChamber_Blocks: - INCBIN "maps/WhirlIslandLugiaChamber.blk" + INCBIN "maps/WhirlIslandLugiaChamber.ablk" SilverCaveRoom1_Blocks: - INCBIN "maps/SilverCaveRoom1.blk" + INCBIN "maps/SilverCaveRoom1.ablk" SilverCaveRoom2_Blocks: - INCBIN "maps/SilverCaveRoom2.blk" + INCBIN "maps/SilverCaveRoom2.ablk" SilverCaveRoom3_Blocks: - INCBIN "maps/SilverCaveRoom3.blk" + INCBIN "maps/SilverCaveRoom3.ablk" BetaRocketHideoutB2F_Blocks: ; unreferenced - INCBIN "maps/unused/BetaRocketHideoutB2F.blk" + INCBIN "maps/unused/BetaRocketHideoutB2F.ablk" BetaRocketHideoutB1F_Blocks: ; unreferenced - INCBIN "maps/unused/BetaRocketHideoutB1F.blk" + INCBIN "maps/unused/BetaRocketHideoutB1F.ablk" BetaRocketHideout1F_Blocks: ; unreferenced - INCBIN "maps/unused/BetaRocketHideout1F.blk" + INCBIN "maps/unused/BetaRocketHideout1F.ablk" BetaRocketHideoutB3F_Blocks: ; unreferenced - INCBIN "maps/unused/BetaRocketHideoutB3F.blk" + INCBIN "maps/unused/BetaRocketHideoutB3F.ablk" MahoganyMart1F_Blocks: MountMoonGiftShop_Blocks: - INCBIN "maps/GiftShop.blk" + INCBIN "maps/GiftShop.ablk" TeamRocketBaseB1F_Blocks: - INCBIN "maps/TeamRocketBaseB1F.blk" + INCBIN "maps/TeamRocketBaseB1F.ablk" TeamRocketBaseB2F_Blocks: - INCBIN "maps/TeamRocketBaseB2F.blk" + INCBIN "maps/TeamRocketBaseB2F.ablk" TeamRocketBaseB3F_Blocks: - INCBIN "maps/TeamRocketBaseB3F.blk" + INCBIN "maps/TeamRocketBaseB3F.ablk" BetaRoute23_Blocks: ; unreferenced - INCBIN "maps/unused/BetaRoute23.blk" + INCBIN "maps/unused/BetaRoute23.ablk" IndigoPlateauPokecenter1F_Blocks: - INCBIN "maps/IndigoPlateauPokecenter1F.blk" + INCBIN "maps/IndigoPlateauPokecenter1F.ablk" WillsRoom_Blocks: - INCBIN "maps/WillsRoom.blk" + INCBIN "maps/WillsRoom.ablk" KogasRoom_Blocks: - INCBIN "maps/KogasRoom.blk" + INCBIN "maps/KogasRoom.ablk" BrunosRoom_Blocks: - INCBIN "maps/BrunosRoom.blk" + INCBIN "maps/BrunosRoom.ablk" KarensRoom_Blocks: - INCBIN "maps/KarensRoom.blk" + INCBIN "maps/KarensRoom.ablk" AzaleaGym_Blocks: - INCBIN "maps/AzaleaGym.blk" + INCBIN "maps/AzaleaGym.ablk" VioletGym_Blocks: - INCBIN "maps/VioletGym.blk" + INCBIN "maps/VioletGym.ablk" GoldenrodGym_Blocks: - INCBIN "maps/GoldenrodGym.blk" + INCBIN "maps/GoldenrodGym.ablk" EcruteakGym_Blocks: - INCBIN "maps/EcruteakGym.blk" + INCBIN "maps/EcruteakGym.ablk" MahoganyGym_Blocks: - INCBIN "maps/MahoganyGym.blk" + INCBIN "maps/MahoganyGym.ablk" OlivineGym_Blocks: - INCBIN "maps/OlivineGym.blk" + INCBIN "maps/OlivineGym.ablk" BetaUnknownGym_Blocks: ; unreferenced - INCBIN "maps/unused/BetaUnknownGym.blk" + INCBIN "maps/unused/BetaUnknownGym.ablk" CianwoodGym_Blocks: - INCBIN "maps/CianwoodGym.blk" + INCBIN "maps/CianwoodGym.ablk" BlackthornGym1F_Blocks: - INCBIN "maps/BlackthornGym1F.blk" + INCBIN "maps/BlackthornGym1F.ablk" BlackthornGym2F_Blocks: - INCBIN "maps/BlackthornGym2F.blk" + INCBIN "maps/BlackthornGym2F.ablk" OlivineLighthouse1F_Blocks: - INCBIN "maps/OlivineLighthouse1F.blk" + INCBIN "maps/OlivineLighthouse1F.ablk" OlivineLighthouse2F_Blocks: - INCBIN "maps/OlivineLighthouse2F.blk" + INCBIN "maps/OlivineLighthouse2F.ablk" OlivineLighthouse3F_Blocks: - INCBIN "maps/OlivineLighthouse3F.blk" + INCBIN "maps/OlivineLighthouse3F.ablk" OlivineLighthouse4F_Blocks: - INCBIN "maps/OlivineLighthouse4F.blk" + INCBIN "maps/OlivineLighthouse4F.ablk" OlivineLighthouse5F_Blocks: - INCBIN "maps/OlivineLighthouse5F.blk" + INCBIN "maps/OlivineLighthouse5F.ablk" OlivineLighthouse6F_Blocks: - INCBIN "maps/OlivineLighthouse6F.blk" + INCBIN "maps/OlivineLighthouse6F.ablk" SECTION "Map Blocks 3", ROMX BetaSlowpokeWell1F_Blocks: ; unreferenced - INCBIN "maps/unused/BetaSlowpokeWell1F.blk" + INCBIN "maps/unused/BetaSlowpokeWell1F.ablk" SlowpokeWellB1F_Blocks: - INCBIN "maps/SlowpokeWellB1F.blk" + INCBIN "maps/SlowpokeWellB1F.ablk" SlowpokeWellB2F_Blocks: - INCBIN "maps/SlowpokeWellB2F.blk" + INCBIN "maps/SlowpokeWellB2F.ablk" IlexForest_Blocks: - INCBIN "maps/IlexForest.blk" + INCBIN "maps/IlexForest.ablk" DarkCaveVioletEntrance_Blocks: - INCBIN "maps/DarkCaveVioletEntrance.blk" + INCBIN "maps/DarkCaveVioletEntrance.ablk" DarkCaveBlackthornEntrance_Blocks: - INCBIN "maps/DarkCaveBlackthornEntrance.blk" + INCBIN "maps/DarkCaveBlackthornEntrance.ablk" RuinsOfAlphResearchCenter_Blocks: - INCBIN "maps/RuinsOfAlphResearchCenter.blk" + INCBIN "maps/RuinsOfAlphResearchCenter.ablk" GoldenrodBikeShop_Blocks: - INCBIN "maps/GoldenrodBikeShop.blk" + INCBIN "maps/GoldenrodBikeShop.ablk" DanceTheater_Blocks: - INCBIN "maps/DanceTheater.blk" + INCBIN "maps/DanceTheater.ablk" EcruteakTinTowerEntrance_Blocks: - INCBIN "maps/EcruteakTinTowerEntrance.blk" + INCBIN "maps/EcruteakTinTowerEntrance.ablk" GoldenrodGameCorner_Blocks: - INCBIN "maps/GoldenrodGameCorner.blk" + INCBIN "maps/GoldenrodGameCorner.ablk" Route35NationalParkGate_Blocks: - INCBIN "maps/Route35NationalParkGate.blk" + INCBIN "maps/Route35NationalParkGate.ablk" Route36NationalParkGate_Blocks: - INCBIN "maps/Route36NationalParkGate.blk" + INCBIN "maps/Route36NationalParkGate.ablk" FastShip1F_Blocks: - INCBIN "maps/FastShip1F.blk" + INCBIN "maps/FastShip1F.ablk" FastShipB1F_Blocks: - INCBIN "maps/FastShipB1F.blk" + INCBIN "maps/FastShipB1F.ablk" BetaFastShipInsideCutOut_Blocks: ; unreferenced - INCBIN "maps/unused/BetaFastShipInsideCutOut.blk" + INCBIN "maps/unused/BetaFastShipInsideCutOut.ablk" FastShipCabins_NNW_NNE_NE_Blocks: - INCBIN "maps/FastShipCabins_NNW_NNE_NE.blk" + INCBIN "maps/FastShipCabins_NNW_NNE_NE.ablk" FastShipCabins_SW_SSW_NW_Blocks: - INCBIN "maps/FastShipCabins_SW_SSW_NW.blk" + INCBIN "maps/FastShipCabins_SW_SSW_NW.ablk" FastShipCabins_SE_SSE_CaptainsCabin_Blocks: - INCBIN "maps/FastShipCabins_SE_SSE_CaptainsCabin.blk" + INCBIN "maps/FastShipCabins_SE_SSE_CaptainsCabin.ablk" OlivinePort_Blocks: - INCBIN "maps/OlivinePort.blk" + INCBIN "maps/OlivinePort.ablk" VermilionPort_Blocks: - INCBIN "maps/VermilionPort.blk" + INCBIN "maps/VermilionPort.ablk" OlivineCafe_Blocks: SafariZoneMainOffice_Blocks: - INCBIN "maps/OlivineCafe.blk" + INCBIN "maps/OlivineCafe.ablk" PlayersHouse2F_Blocks: - INCBIN "maps/PlayersHouse2F.blk" + INCBIN "maps/PlayersHouse2F.ablk" SaffronMagnetTrainStation_Blocks: - INCBIN "maps/SaffronMagnetTrainStation.blk" + INCBIN "maps/SaffronMagnetTrainStation.ablk" CeruleanGym_Blocks: - INCBIN "maps/CeruleanGym.blk" + INCBIN "maps/CeruleanGym.ablk" VermilionGym_Blocks: - INCBIN "maps/VermilionGym.blk" + INCBIN "maps/VermilionGym.ablk" SaffronGym_Blocks: - INCBIN "maps/SaffronGym.blk" + INCBIN "maps/SaffronGym.ablk" PowerPlant_Blocks: - INCBIN "maps/PowerPlant.blk" + INCBIN "maps/PowerPlant.ablk" PokemonFanClub_Blocks: SafariZoneWardensHome_Blocks: - INCBIN "maps/PokemonFanClub.blk" + INCBIN "maps/PokemonFanClub.ablk" FightingDojo_Blocks: - INCBIN "maps/FightingDojo.blk" + INCBIN "maps/FightingDojo.ablk" SilphCo1F_Blocks: - INCBIN "maps/SilphCo1F.blk" + INCBIN "maps/SilphCo1F.ablk" ViridianGym_Blocks: - INCBIN "maps/ViridianGym.blk" + INCBIN "maps/ViridianGym.ablk" TrainerHouse1F_Blocks: - INCBIN "maps/TrainerHouse1F.blk" + INCBIN "maps/TrainerHouse1F.ablk" TrainerHouseB1F_Blocks: - INCBIN "maps/TrainerHouseB1F.blk" + INCBIN "maps/TrainerHouseB1F.ablk" RedsHouse1F_Blocks: - INCBIN "maps/RedsHouse1F.blk" + INCBIN "maps/RedsHouse1F.ablk" RedsHouse2F_Blocks: - INCBIN "maps/RedsHouse2F.blk" + INCBIN "maps/RedsHouse2F.ablk" OaksLab_Blocks: - INCBIN "maps/OaksLab.blk" + INCBIN "maps/OaksLab.ablk" MrFujisHouse_Blocks: - INCBIN "maps/MrFujisHouse.blk" + INCBIN "maps/MrFujisHouse.ablk" LavRadioTower1F_Blocks: - INCBIN "maps/LavRadioTower1F.blk" + INCBIN "maps/LavRadioTower1F.ablk" SilverCaveItemRooms_Blocks: - INCBIN "maps/SilverCaveItemRooms.blk" + INCBIN "maps/SilverCaveItemRooms.ablk" DayCare_Blocks: - INCBIN "maps/DayCare.blk" + INCBIN "maps/DayCare.ablk" SoulHouse_Blocks: - INCBIN "maps/SoulHouse.blk" + INCBIN "maps/SoulHouse.ablk" PewterGym_Blocks: - INCBIN "maps/PewterGym.blk" + INCBIN "maps/PewterGym.ablk" CeladonGym_Blocks: - INCBIN "maps/CeladonGym.blk" + INCBIN "maps/CeladonGym.ablk" BetaCeladonMansion1F_Blocks: ; unreferenced - INCBIN "maps/unused/BetaCeladonMansion1F.blk" + INCBIN "maps/unused/BetaCeladonMansion1F.ablk" CeladonCafe_Blocks: - INCBIN "maps/CeladonCafe.blk" + INCBIN "maps/CeladonCafe.ablk" BetaCeladonMansion2F_Blocks: ; unreferenced - INCBIN "maps/unused/BetaCeladonMansion2F.blk" + INCBIN "maps/unused/BetaCeladonMansion2F.ablk" RockTunnel1F_Blocks: - INCBIN "maps/RockTunnel1F.blk" + INCBIN "maps/RockTunnel1F.ablk" RockTunnelB1F_Blocks: - INCBIN "maps/RockTunnelB1F.blk" + INCBIN "maps/RockTunnelB1F.ablk" DiglettsCave_Blocks: - INCBIN "maps/DiglettsCave.blk" + INCBIN "maps/DiglettsCave.ablk" MountMoon_Blocks: - INCBIN "maps/MountMoon.blk" + INCBIN "maps/MountMoon.ablk" SeafoamGym_Blocks: - INCBIN "maps/SeafoamGym.blk" + INCBIN "maps/SeafoamGym.ablk" MrPokemonsHouse_Blocks: - INCBIN "maps/MrPokemonsHouse.blk" + INCBIN "maps/MrPokemonsHouse.ablk" VictoryRoadGate_Blocks: - INCBIN "maps/VictoryRoadGate.blk" + INCBIN "maps/VictoryRoadGate.ablk" OlivinePortPassage_Blocks: VermilionPortPassage_Blocks: - INCBIN "maps/PortPassage.blk" + INCBIN "maps/PortPassage.ablk" FuchsiaGym_Blocks: - INCBIN "maps/FuchsiaGym.blk" + INCBIN "maps/FuchsiaGym.ablk" SafariZoneBeta_Blocks: - INCBIN "maps/SafariZoneBeta.blk" + INCBIN "maps/SafariZoneBeta.ablk" UndergroundPath_Blocks: - INCBIN "maps/UndergroundPath.blk" + INCBIN "maps/UndergroundPath.ablk" Route39Barn_Blocks: - INCBIN "maps/Route39Barn.blk" + INCBIN "maps/Route39Barn.ablk" VictoryRoad_Blocks: - INCBIN "maps/VictoryRoad.blk" + INCBIN "maps/VictoryRoad.ablk" Route23_Blocks: - INCBIN "maps/Route23.blk" + INCBIN "maps/Route23.ablk" LancesRoom_Blocks: - INCBIN "maps/LancesRoom.blk" + INCBIN "maps/LancesRoom.ablk" HallOfFame_Blocks: - INCBIN "maps/HallOfFame.blk" + INCBIN "maps/HallOfFame.ablk" CopycatsHouse1F_Blocks: - INCBIN "maps/CopycatsHouse1F.blk" + INCBIN "maps/CopycatsHouse1F.ablk" CopycatsHouse2F_Blocks: - INCBIN "maps/CopycatsHouse2F.blk" + INCBIN "maps/CopycatsHouse2F.ablk" GoldenrodFlowerShop_Blocks: - INCBIN "maps/GoldenrodFlowerShop.blk" + INCBIN "maps/GoldenrodFlowerShop.ablk" MountMoonSquare_Blocks: - INCBIN "maps/MountMoonSquare.blk" + INCBIN "maps/MountMoonSquare.ablk" WiseTriosRoom_Blocks: - INCBIN "maps/WiseTriosRoom.blk" + INCBIN "maps/WiseTriosRoom.ablk" DragonsDen1F_Blocks: - INCBIN "maps/DragonsDen1F.blk" + INCBIN "maps/DragonsDen1F.ablk" DragonsDenB1F_Blocks: - INCBIN "maps/DragonsDenB1F.blk" + INCBIN "maps/DragonsDenB1F.ablk" TohjoFalls_Blocks: - INCBIN "maps/TohjoFalls.blk" + INCBIN "maps/TohjoFalls.ablk" RuinsOfAlphHoOhItemRoom_Blocks: RuinsOfAlphKabutoItemRoom_Blocks: RuinsOfAlphOmanyteItemRoom_Blocks: RuinsOfAlphAerodactylItemRoom_Blocks: - INCBIN "maps/RuinsOfAlphItemRoom.blk" + INCBIN "maps/RuinsOfAlphItemRoom.ablk" RuinsOfAlphHoOhWordRoom_Blocks: - INCBIN "maps/RuinsOfAlphHoOhWordRoom.blk" + INCBIN "maps/RuinsOfAlphHoOhWordRoom.ablk" RuinsOfAlphKabutoWordRoom_Blocks: - INCBIN "maps/RuinsOfAlphKabutoWordRoom.blk" + INCBIN "maps/RuinsOfAlphKabutoWordRoom.ablk" RuinsOfAlphOmanyteWordRoom_Blocks: - INCBIN "maps/RuinsOfAlphOmanyteWordRoom.blk" + INCBIN "maps/RuinsOfAlphOmanyteWordRoom.ablk" RuinsOfAlphAerodactylWordRoom_Blocks: - INCBIN "maps/RuinsOfAlphAerodactylWordRoom.blk" + INCBIN "maps/RuinsOfAlphAerodactylWordRoom.ablk" DragonShrine_Blocks: - INCBIN "maps/DragonShrine.blk" + INCBIN "maps/DragonShrine.ablk" BattleTower1F_Blocks: - INCBIN "maps/BattleTower1F.blk" + INCBIN "maps/BattleTower1F.ablk" BattleTowerBattleRoom_Blocks: - INCBIN "maps/BattleTowerBattleRoom.blk" + INCBIN "maps/BattleTowerBattleRoom.ablk" PokecomCenterAdminOfficeMobile_Blocks: - INCBIN "maps/PokecomCenterAdminOfficeMobile.blk" + INCBIN "maps/PokecomCenterAdminOfficeMobile.ablk" MobileTradeRoom_Blocks: - INCBIN "maps/MobileTradeRoom.blk" + INCBIN "maps/MobileTradeRoom.ablk" MobileBattleRoom_Blocks: - INCBIN "maps/MobileBattleRoom.blk" + INCBIN "maps/MobileBattleRoom.ablk" BattleTowerHallway_Blocks: - INCBIN "maps/BattleTowerHallway.blk" + INCBIN "maps/BattleTowerHallway.ablk" BattleTowerElevator_Blocks: - INCBIN "maps/BattleTowerElevator.blk" + INCBIN "maps/BattleTowerElevator.ablk" BattleTowerOutside_Blocks: - INCBIN "maps/BattleTowerOutside.blk" + INCBIN "maps/BattleTowerOutside.ablk" BetaBlank_Blocks: ; unreferenced - INCBIN "maps/unused/BetaBlank.blk" + INCBIN "maps/unused/BetaBlank.ablk" GoldenrodDeptStoreRoof_Blocks: - INCBIN "maps/GoldenrodDeptStoreRoof.blk" + INCBIN "maps/GoldenrodDeptStoreRoof.ablk" diff --git a/data/tilesets.asm b/data/tilesets.asm index fd19928..024c98b 100644 --- a/data/tilesets.asm +++ b/data/tilesets.asm @@ -1,8 +1,6 @@ MACRO tileset - dba \1GFX, \1Meta, \1Coll + dba \1GFX, \1Meta, \1Coll, \1Attr dw \1Anim - dw NULL - dw \1PalMap ENDM ; Associated data: diff --git a/data/tilesets/aerodactyl_word_room_attributes.bin b/data/tilesets/aerodactyl_word_room_attributes.bin new file mode 100644 index 0000000..0e08077 Binary files /dev/null and b/data/tilesets/aerodactyl_word_room_attributes.bin differ diff --git a/data/tilesets/aerodactyl_word_room_metatiles.bin b/data/tilesets/aerodactyl_word_room_metatiles.bin index 0538baa..22ff9fc 100644 Binary files a/data/tilesets/aerodactyl_word_room_metatiles.bin and b/data/tilesets/aerodactyl_word_room_metatiles.bin differ diff --git a/data/tilesets/battle_tower_inside_attributes.bin b/data/tilesets/battle_tower_inside_attributes.bin new file mode 100644 index 0000000..4949248 Binary files /dev/null and b/data/tilesets/battle_tower_inside_attributes.bin differ diff --git a/data/tilesets/battle_tower_inside_metatiles.bin b/data/tilesets/battle_tower_inside_metatiles.bin index c64ef0a..f8678ba 100644 Binary files a/data/tilesets/battle_tower_inside_metatiles.bin and b/data/tilesets/battle_tower_inside_metatiles.bin differ diff --git a/data/tilesets/battle_tower_outside_attributes.bin b/data/tilesets/battle_tower_outside_attributes.bin new file mode 100644 index 0000000..674c81a Binary files /dev/null and b/data/tilesets/battle_tower_outside_attributes.bin differ diff --git a/data/tilesets/battle_tower_outside_metatiles.bin b/data/tilesets/battle_tower_outside_metatiles.bin index c4390bc..c425d61 100644 Binary files a/data/tilesets/battle_tower_outside_metatiles.bin and b/data/tilesets/battle_tower_outside_metatiles.bin differ diff --git a/data/tilesets/beta_word_room_attributes.bin b/data/tilesets/beta_word_room_attributes.bin new file mode 100644 index 0000000..bed0105 Binary files /dev/null and b/data/tilesets/beta_word_room_attributes.bin differ diff --git a/data/tilesets/beta_word_room_metatiles.bin b/data/tilesets/beta_word_room_metatiles.bin index 47c531b..4adcccb 100644 Binary files a/data/tilesets/beta_word_room_metatiles.bin and b/data/tilesets/beta_word_room_metatiles.bin differ diff --git a/data/tilesets/cave_attributes.bin b/data/tilesets/cave_attributes.bin new file mode 100644 index 0000000..0c79ad3 Binary files /dev/null and b/data/tilesets/cave_attributes.bin differ diff --git a/data/tilesets/champions_room_attributes.bin b/data/tilesets/champions_room_attributes.bin new file mode 100644 index 0000000..87ffc0b Binary files /dev/null and b/data/tilesets/champions_room_attributes.bin differ diff --git a/data/tilesets/champions_room_metatiles.bin b/data/tilesets/champions_room_metatiles.bin index a2adb19..3d0a24d 100644 Binary files a/data/tilesets/champions_room_metatiles.bin and b/data/tilesets/champions_room_metatiles.bin differ diff --git a/data/tilesets/dark_cave_attributes.bin b/data/tilesets/dark_cave_attributes.bin new file mode 100644 index 0000000..0c79ad3 Binary files /dev/null and b/data/tilesets/dark_cave_attributes.bin differ diff --git a/data/tilesets/elite_four_room_attributes.bin b/data/tilesets/elite_four_room_attributes.bin new file mode 100644 index 0000000..9a6ab66 Binary files /dev/null and b/data/tilesets/elite_four_room_attributes.bin differ diff --git a/data/tilesets/facility_attributes.bin b/data/tilesets/facility_attributes.bin new file mode 100644 index 0000000..d33c548 Binary files /dev/null and b/data/tilesets/facility_attributes.bin differ diff --git a/data/tilesets/forest_attributes.bin b/data/tilesets/forest_attributes.bin new file mode 100644 index 0000000..947fbb3 --- /dev/null +++ b/data/tilesets/forest_attributes.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/tilesets/game_corner_attributes.bin b/data/tilesets/game_corner_attributes.bin new file mode 100644 index 0000000..d96773c Binary files /dev/null and b/data/tilesets/game_corner_attributes.bin differ diff --git a/data/tilesets/game_corner_metatiles.bin b/data/tilesets/game_corner_metatiles.bin index 24beba2..08d5b21 100644 Binary files a/data/tilesets/game_corner_metatiles.bin and b/data/tilesets/game_corner_metatiles.bin differ diff --git a/data/tilesets/gate_attributes.bin b/data/tilesets/gate_attributes.bin new file mode 100644 index 0000000..bbd1826 Binary files /dev/null and b/data/tilesets/gate_attributes.bin differ diff --git a/data/tilesets/ho_oh_word_room_attributes.bin b/data/tilesets/ho_oh_word_room_attributes.bin new file mode 100644 index 0000000..f738049 Binary files /dev/null and b/data/tilesets/ho_oh_word_room_attributes.bin differ diff --git a/data/tilesets/ho_oh_word_room_metatiles.bin b/data/tilesets/ho_oh_word_room_metatiles.bin index 2b542c6..2b89315 100644 Binary files a/data/tilesets/ho_oh_word_room_metatiles.bin and b/data/tilesets/ho_oh_word_room_metatiles.bin differ diff --git a/data/tilesets/house_attributes.bin b/data/tilesets/house_attributes.bin new file mode 100644 index 0000000..ef8e53e Binary files /dev/null and b/data/tilesets/house_attributes.bin differ diff --git a/data/tilesets/ice_path_attributes.bin b/data/tilesets/ice_path_attributes.bin new file mode 100644 index 0000000..5346b57 Binary files /dev/null and b/data/tilesets/ice_path_attributes.bin differ diff --git a/data/tilesets/ice_path_metatiles.bin b/data/tilesets/ice_path_metatiles.bin index c92246e..3c84989 100644 Binary files a/data/tilesets/ice_path_metatiles.bin and b/data/tilesets/ice_path_metatiles.bin differ diff --git a/data/tilesets/johto_attributes.bin b/data/tilesets/johto_attributes.bin new file mode 100644 index 0000000..7e3d8d1 Binary files /dev/null and b/data/tilesets/johto_attributes.bin differ diff --git a/data/tilesets/johto_metatiles.bin b/data/tilesets/johto_metatiles.bin index 9024f2a..13ed552 100644 Binary files a/data/tilesets/johto_metatiles.bin and b/data/tilesets/johto_metatiles.bin differ diff --git a/data/tilesets/johto_modern_attributes.bin b/data/tilesets/johto_modern_attributes.bin new file mode 100644 index 0000000..4991307 Binary files /dev/null and b/data/tilesets/johto_modern_attributes.bin differ diff --git a/data/tilesets/johto_modern_metatiles.bin b/data/tilesets/johto_modern_metatiles.bin index a15c0c2..76a6f65 100644 Binary files a/data/tilesets/johto_modern_metatiles.bin and b/data/tilesets/johto_modern_metatiles.bin differ diff --git a/data/tilesets/kabuto_word_room_attributes.bin b/data/tilesets/kabuto_word_room_attributes.bin new file mode 100644 index 0000000..2e71646 Binary files /dev/null and b/data/tilesets/kabuto_word_room_attributes.bin differ diff --git a/data/tilesets/kabuto_word_room_metatiles.bin b/data/tilesets/kabuto_word_room_metatiles.bin index 14d082e..d94c790 100644 Binary files a/data/tilesets/kabuto_word_room_metatiles.bin and b/data/tilesets/kabuto_word_room_metatiles.bin differ diff --git a/data/tilesets/kanto_attributes.bin b/data/tilesets/kanto_attributes.bin new file mode 100644 index 0000000..387714c Binary files /dev/null and b/data/tilesets/kanto_attributes.bin differ diff --git a/data/tilesets/lab_attributes.bin b/data/tilesets/lab_attributes.bin new file mode 100644 index 0000000..59481a8 Binary files /dev/null and b/data/tilesets/lab_attributes.bin differ diff --git a/data/tilesets/lab_metatiles.bin b/data/tilesets/lab_metatiles.bin index 62da01e..3a4e8f7 100644 Binary files a/data/tilesets/lab_metatiles.bin and b/data/tilesets/lab_metatiles.bin differ diff --git a/data/tilesets/lighthouse_attributes.bin b/data/tilesets/lighthouse_attributes.bin new file mode 100644 index 0000000..1efcd76 Binary files /dev/null and b/data/tilesets/lighthouse_attributes.bin differ diff --git a/data/tilesets/lighthouse_metatiles.bin b/data/tilesets/lighthouse_metatiles.bin index 21ca0f0..48088d3 100644 Binary files a/data/tilesets/lighthouse_metatiles.bin and b/data/tilesets/lighthouse_metatiles.bin differ diff --git a/data/tilesets/mansion_attributes.bin b/data/tilesets/mansion_attributes.bin new file mode 100644 index 0000000..1415163 Binary files /dev/null and b/data/tilesets/mansion_attributes.bin differ diff --git a/data/tilesets/mansion_metatiles.bin b/data/tilesets/mansion_metatiles.bin index d450632..3c858b9 100644 Binary files a/data/tilesets/mansion_metatiles.bin and b/data/tilesets/mansion_metatiles.bin differ diff --git a/data/tilesets/mart_attributes.bin b/data/tilesets/mart_attributes.bin new file mode 100644 index 0000000..daa4466 Binary files /dev/null and b/data/tilesets/mart_attributes.bin differ diff --git a/data/tilesets/mart_metatiles.bin b/data/tilesets/mart_metatiles.bin index 63b2f62..4de358c 100644 --- a/data/tilesets/mart_metatiles.bin +++ b/data/tilesets/mart_metatiles.bin @@ -1,3 +1,4 @@ ,-<= -II "#23$%45*+>?>?*+ !01JK ./*;;;>?>?>?;;;;&'67()89@AB+PQRECD\]STU VWVWXYXYZ[Z[ PQPQPQPQ^_^_ؑ*+>?>?,-<=*;;;>?>?::>?::;;;+>?::>?::>?>?:: ::>? F:F:F::G:G:G"#23$%45 LMLMLMLMNONO !HH01HH>?HH>?HHHH&'HH67HH()HH89  -II *+PQ>?PQ>?^_HH&'HH67HH()HH89/HHHHHHHHHHHHHHHHHHHH HHHHHHHHHHHHHHHH;;;;&'67()89>?>?.Ӑڐ܁"#23$% \ No newline at end of file +II "#23$%45*+>?>?*+ !01JK  +'(./012678*;;;>?>?>?;;;;&'67()89@AB+PQRECD\]STU VWVWXYXYZ[Z[ PQPQPQPQ^_^_DEFGTUVWHIJKX*+>?>?,-<=*;;;>?>?::>?::;;;+>?::>?::>?>?:: ::>? F:F:F::G:G:G"#23$%45 LMLMLMLMNONO !HH01HH>?HH>?HHHH&'HH67HH()HH89  +II *+PQ>?PQ>?^_HH&'HH67HH()HH89/HHHHHHHHHHHHHHHHHHHH HHHHHHHHHHHHHHHH;;;;&'67()89>?>?.@ABCPQRSYZ[\"#23$%  !!!!!!!)*!!!")*.///!!!!,,,+ ++///-0129:3;<5=>8 \ No newline at end of file diff --git a/data/tilesets/omanyte_word_room_attributes.bin b/data/tilesets/omanyte_word_room_attributes.bin new file mode 100644 index 0000000..000d370 Binary files /dev/null and b/data/tilesets/omanyte_word_room_attributes.bin differ diff --git a/data/tilesets/omanyte_word_room_metatiles.bin b/data/tilesets/omanyte_word_room_metatiles.bin index 3cc62f5..9742e4d 100644 Binary files a/data/tilesets/omanyte_word_room_metatiles.bin and b/data/tilesets/omanyte_word_room_metatiles.bin differ diff --git a/data/tilesets/park_attributes.bin b/data/tilesets/park_attributes.bin new file mode 100644 index 0000000..4a5b3c9 Binary files /dev/null and b/data/tilesets/park_attributes.bin differ diff --git a/data/tilesets/park_metatiles.bin b/data/tilesets/park_metatiles.bin index 1fe9316..0d6739b 100644 Binary files a/data/tilesets/park_metatiles.bin and b/data/tilesets/park_metatiles.bin differ diff --git a/data/tilesets/players_house_attributes.bin b/data/tilesets/players_house_attributes.bin new file mode 100644 index 0000000..e9fe109 Binary files /dev/null and b/data/tilesets/players_house_attributes.bin differ diff --git a/data/tilesets/players_house_metatiles.bin b/data/tilesets/players_house_metatiles.bin index f316eb8..2c69711 100644 Binary files a/data/tilesets/players_house_metatiles.bin and b/data/tilesets/players_house_metatiles.bin differ diff --git a/data/tilesets/players_room_attributes.bin b/data/tilesets/players_room_attributes.bin new file mode 100644 index 0000000..f221489 Binary files /dev/null and b/data/tilesets/players_room_attributes.bin differ diff --git a/data/tilesets/pokecenter_attributes.bin b/data/tilesets/pokecenter_attributes.bin new file mode 100644 index 0000000..be49246 Binary files /dev/null and b/data/tilesets/pokecenter_attributes.bin differ diff --git a/data/tilesets/pokecom_center_attributes.bin b/data/tilesets/pokecom_center_attributes.bin new file mode 100644 index 0000000..d609ae7 Binary files /dev/null and b/data/tilesets/pokecom_center_attributes.bin differ diff --git a/data/tilesets/pokecom_center_metatiles.bin b/data/tilesets/pokecom_center_metatiles.bin index 097a882..4fec4ff 100644 Binary files a/data/tilesets/pokecom_center_metatiles.bin and b/data/tilesets/pokecom_center_metatiles.bin differ diff --git a/data/tilesets/port_attributes.bin b/data/tilesets/port_attributes.bin new file mode 100644 index 0000000..8872c8d Binary files /dev/null and b/data/tilesets/port_attributes.bin differ diff --git a/data/tilesets/port_metatiles.bin b/data/tilesets/port_metatiles.bin index 69a6007..2d76132 100644 --- a/data/tilesets/port_metatiles.bin +++ b/data/tilesets/port_metatiles.bin @@ -1,4 +1,4 @@ -""""!!!!1111111111111111    ""  !!!!+,--9::3#$%./02;<=>&'()345?@AB*678CDE+,-39:PQXYZFGHIRRSSZ[\\IJKLT,-U]^^^MNOVW_"""""""" +""""!!!!1111111111111111    ""  !!!!+,--9::3#$%./02;<=>&'()345?@AB*678CDE+,-39:PQXYZFGHIRRSSZ[\\IJKLT,-U]^^^MNOVW_"""""""" @@ -62,4 +62,4 @@  -  \ No newline at end of file +  \ No newline at end of file diff --git a/data/tilesets/radio_tower_attributes.bin b/data/tilesets/radio_tower_attributes.bin new file mode 100644 index 0000000..bfa9d49 Binary files /dev/null and b/data/tilesets/radio_tower_attributes.bin differ diff --git a/data/tilesets/radio_tower_metatiles.bin b/data/tilesets/radio_tower_metatiles.bin index 01c0b4a..9a43732 100644 Binary files a/data/tilesets/radio_tower_metatiles.bin and b/data/tilesets/radio_tower_metatiles.bin differ diff --git a/data/tilesets/ruins_of_alph_attributes.bin b/data/tilesets/ruins_of_alph_attributes.bin new file mode 100644 index 0000000..1960f5a Binary files /dev/null and b/data/tilesets/ruins_of_alph_attributes.bin differ diff --git a/data/tilesets/tower_attributes.bin b/data/tilesets/tower_attributes.bin new file mode 100644 index 0000000..4c0ce3b Binary files /dev/null and b/data/tilesets/tower_attributes.bin differ diff --git a/data/tilesets/tower_metatiles.bin b/data/tilesets/tower_metatiles.bin index b6668fc..4e0b9b2 100644 --- a/data/tilesets/tower_metatiles.bin +++ b/data/tilesets/tower_metatiles.bin @@ -1,2 +1,2 @@  @ !!A1A1!!!!!!@ A1A1 - A1A1A1A1A1A1A1A1A1A1!!!!!!!!A1A1!!!! -.=><>MN./>?,NO()89*+:;()89*+:;MN]^NO^_A1A1@ !!A1A1!!@ !!!!^^^^"#23&'67"#23&'67PQPQPQPQPQPQPQPQ$$$$  "#23!!67"#!!2367%545%545%545%545 ^^  FV GW PQPQRSRSBCHZ[!XL\67IBCY!Z[L\67JKZ[L\67JKZ[L\67DETU!!!!PPPPPPPPFV   GW  \ No newline at end of file + A1A1A1A1A1A1A1A1A1A1!!!!!!!!A1A1!!!! -.=><>MN./>?,NO()89*+:;()89*+:;MN]^NO^_A1A1@ !!A1A1!!@ !!!!^^^^"#23&'67"#23&'67PQPQPQPQPQPQPQPQ$$$$  "#23!!67"#!!2367%545%545%545%545 ^^  FV GW PQPQRSRSBCHZ[!XL\67IBCY!Z[L\67JKZ[L\67JKZ[L\67DETU!!!!PPPPPPPPFV   GW  \ No newline at end of file diff --git a/data/tilesets/traditional_house_attributes.bin b/data/tilesets/traditional_house_attributes.bin new file mode 100644 index 0000000..02327a7 Binary files /dev/null and b/data/tilesets/traditional_house_attributes.bin differ diff --git a/data/tilesets/train_station_attributes.bin b/data/tilesets/train_station_attributes.bin new file mode 100644 index 0000000..9511219 Binary files /dev/null and b/data/tilesets/train_station_attributes.bin differ diff --git a/data/tilesets/train_station_metatiles.bin b/data/tilesets/train_station_metatiles.bin index 9bbdd0b..4e8e748 100644 Binary files a/data/tilesets/train_station_metatiles.bin and b/data/tilesets/train_station_metatiles.bin differ diff --git a/data/tilesets/underground_attributes.bin b/data/tilesets/underground_attributes.bin new file mode 100644 index 0000000..ae84f1f Binary files /dev/null and b/data/tilesets/underground_attributes.bin differ diff --git a/engine/overworld/load_map_part.asm b/engine/overworld/load_map_part.asm index 88a0b53..35860f0 100644 --- a/engine/overworld/load_map_part.asm +++ b/engine/overworld/load_map_part.asm @@ -1,5 +1,10 @@ _LoadMapPart:: ld hl, wSurroundingTiles + decoord 0, 0 + call .copy + ld hl, wSurroundingAttributes + decoord 0, 0, wAttrmap +.copy ld a, [wPlayerMetatileY] and a jr z, .top_row @@ -14,7 +19,10 @@ _LoadMapPart:: inc hl .left_column - decoord 0, 0 + ldh a, [rSVBK] + push af + ld a, BANK("Surrounding Data") + ldh [rSVBK], a ld b, SCREEN_HEIGHT .loop ld c, SCREEN_WIDTH @@ -33,4 +41,6 @@ _LoadMapPart:: .carry dec b jr nz, .loop + pop af + ldh [rSVBK], a ret diff --git a/gfx/font/font.png b/gfx/font/font.png index f1c0b5c..603fece 100644 Binary files a/gfx/font/font.png and b/gfx/font/font.png differ diff --git a/gfx/tilesets.asm b/gfx/tilesets.asm index 7fb6b57..4d7e47f 100644 --- a/gfx/tilesets.asm +++ b/gfx/tilesets.asm @@ -335,3 +335,119 @@ INCBIN "data/tilesets/omanyte_word_room_metatiles.bin" TilesetAerodactylWordRoomMeta:: INCBIN "data/tilesets/aerodactyl_word_room_metatiles.bin" + + +SECTION "Tileset Data 9", ROMX + +Tileset0Attr:: +TilesetJohtoAttr:: +INCBIN "data/tilesets/johto_attributes.bin" + +TilesetJohtoModernAttr:: +INCBIN "data/tilesets/johto_modern_attributes.bin" + +TilesetKantoAttr:: +INCBIN "data/tilesets/kanto_attributes.bin" + +TilesetBattleTowerOutsideAttr:: +INCBIN "data/tilesets/battle_tower_outside_attributes.bin" + +TilesetHouseAttr:: +INCBIN "data/tilesets/house_attributes.bin" + +TilesetPlayersHouseAttr:: +INCBIN "data/tilesets/players_house_attributes.bin" + +TilesetPokecenterAttr:: +INCBIN "data/tilesets/pokecenter_attributes.bin" + +TilesetGateAttr:: +INCBIN "data/tilesets/gate_attributes.bin" + +TilesetPortAttr:: +INCBIN "data/tilesets/port_attributes.bin" + +TilesetLabAttr:: +INCBIN "data/tilesets/lab_attributes.bin" + + +SECTION "Tileset Data 10", ROMX + +TilesetFacilityAttr:: +INCBIN "data/tilesets/facility_attributes.bin" + +TilesetMartAttr:: +INCBIN "data/tilesets/mart_attributes.bin" + +TilesetMansionAttr:: +INCBIN "data/tilesets/mansion_attributes.bin" + +TilesetGameCornerAttr:: +INCBIN "data/tilesets/game_corner_attributes.bin" + +TilesetEliteFourRoomAttr:: +INCBIN "data/tilesets/elite_four_room_attributes.bin" + +TilesetTraditionalHouseAttr:: +INCBIN "data/tilesets/traditional_house_attributes.bin" + +TilesetTrainStationAttr:: +INCBIN "data/tilesets/train_station_attributes.bin" + +TilesetChampionsRoomAttr:: +INCBIN "data/tilesets/champions_room_attributes.bin" + +TilesetLighthouseAttr:: +INCBIN "data/tilesets/lighthouse_attributes.bin" + +TilesetPlayersRoomAttr:: +INCBIN "data/tilesets/players_room_attributes.bin" + +TilesetPokeComCenterAttr:: +INCBIN "data/tilesets/pokecom_center_attributes.bin" + +TilesetBattleTowerInsideAttr:: +INCBIN "data/tilesets/battle_tower_inside_attributes.bin" + +TilesetTowerAttr:: +INCBIN "data/tilesets/tower_attributes.bin" + + +SECTION "Tileset Data 11", ROMX + +TilesetCaveAttr:: +TilesetDarkCaveAttr:: +INCBIN "data/tilesets/cave_attributes.bin" + +TilesetParkAttr:: +INCBIN "data/tilesets/park_attributes.bin" + +TilesetRuinsOfAlphAttr:: +INCBIN "data/tilesets/ruins_of_alph_attributes.bin" + +TilesetRadioTowerAttr:: +INCBIN "data/tilesets/radio_tower_attributes.bin" + +TilesetUndergroundAttr:: +INCBIN "data/tilesets/underground_attributes.bin" + +TilesetIcePathAttr:: +INCBIN "data/tilesets/ice_path_attributes.bin" + +TilesetForestAttr:: +INCBIN "data/tilesets/forest_attributes.bin" + +TilesetBetaWordRoomAttr:: +INCBIN "data/tilesets/beta_word_room_attributes.bin" + +TilesetHoOhWordRoomAttr:: +INCBIN "data/tilesets/ho_oh_word_room_attributes.bin" + +TilesetKabutoWordRoomAttr:: +INCBIN "data/tilesets/kabuto_word_room_attributes.bin" + +TilesetOmanyteWordRoomAttr:: +INCBIN "data/tilesets/omanyte_word_room_attributes.bin" + +TilesetAerodactylWordRoomAttr:: +INCBIN "data/tilesets/aerodactyl_word_room_attributes.bin" diff --git a/home/map.asm b/home/map.asm index 5a6765b..47c0db8 100644 --- a/home/map.asm +++ b/home/map.asm @@ -90,8 +90,7 @@ GetMapSceneID:: ret OverworldTextModeSwitch:: - call LoadMapPart - jp SwapTextboxPalettes + ; fallthrough LoadMapPart:: ldh a, [hROMBank] @@ -105,6 +104,10 @@ LoadMapPart:: hlcoord 0, 0 ld bc, SCREEN_WIDTH * SCREEN_HEIGHT call ByteFill + + ld a, [wTilesetAttributesBank] + rst Bankswitch + call LoadMetatileAttributes ld a, BANK(_LoadMapPart) rst Bankswitch @@ -115,12 +118,27 @@ LoadMapPart:: ret LoadMetatiles:: + ld hl, wSurroundingTiles + ld de, wTilesetBlocksAddress + jr _LoadMetatilesOrAttributes + +LoadMetatileAttributes:: + ld hl, wSurroundingAttributes + ld de, wTilesetAttributesAddress + ; fallthrough + +_LoadMetatilesOrAttributes: + ld a, [de] + ld [wTilesetDataAddress], a + inc de + ld a, [de] + ld [wTilesetDataAddress + 1], a + ; de <- wOverworldMapAnchor ld a, [wOverworldMapAnchor] ld e, a ld a, [wOverworldMapAnchor + 1] ld d, a - ld hl, wSurroundingTiles ld b, SCREEN_META_HEIGHT .row @@ -143,19 +161,23 @@ LoadMetatiles:: ld e, l ld d, h ; Set hl to the address of the current metatile data ([wTilesetBlocksAddress] + (a) tiles). -; BUG: LoadMetatiles wraps around past 128 blocks (see docs/bugs_and_glitches.md) - add a ld l, a ld h, 0 add hl, hl add hl, hl add hl, hl - ld a, [wTilesetBlocksAddress] + add hl, hl + ld a, [wTilesetDataAddress] add l ld l, a - ld a, [wTilesetBlocksAddress + 1] + ld a, [wTilesetDataAddress + 1] adc h ld h, a + + ldh a, [rSVBK] + push af + ld a, BANK("Surrounding Data") + ldh [rSVBK], a ; copy the 4x4 metatile rept METATILE_WIDTH - 1 @@ -176,6 +198,10 @@ rept METATILE_WIDTH ld [de], a inc de endr + + pop af + ldh [rSVBK], a + ; Next metatile pop hl ld de, METATILE_WIDTH @@ -1143,8 +1169,9 @@ ScrollMapUp:: hlcoord 0, 0 ld de, wBGMapBuffer call BackupBGMapRow - ld c, 2 * SCREEN_WIDTH - call ScrollBGMapPalettes + hlcoord 0, 0, wAttrmap + ld de, wBGMapPalBuffer + call BackupBGMapRow ld a, [wBGMapAnchor] ld e, a ld a, [wBGMapAnchor + 1] @@ -1158,8 +1185,9 @@ ScrollMapDown:: hlcoord 0, SCREEN_HEIGHT - 2 ld de, wBGMapBuffer call BackupBGMapRow - ld c, 2 * SCREEN_WIDTH - call ScrollBGMapPalettes + hlcoord 0, SCREEN_HEIGHT - 2, wAttrmap + ld de, wBGMapPalBuffer + call BackupBGMapRow ld a, [wBGMapAnchor] ld l, a ld a, [wBGMapAnchor + 1] @@ -1181,8 +1209,9 @@ ScrollMapLeft:: hlcoord 0, 0 ld de, wBGMapBuffer call BackupBGMapColumn - ld c, 2 * SCREEN_HEIGHT - call ScrollBGMapPalettes + hlcoord 0, 0, wAttrmap + ld de, wBGMapPalBuffer + call BackupBGMapColumn ld a, [wBGMapAnchor] ld e, a ld a, [wBGMapAnchor + 1] @@ -1196,8 +1225,9 @@ ScrollMapRight:: hlcoord SCREEN_WIDTH - 2, 0 ld de, wBGMapBuffer call BackupBGMapColumn - ld c, 2 * SCREEN_HEIGHT - call ScrollBGMapPalettes + hlcoord SCREEN_WIDTH - 2, 0, wAttrmap + ld de, wBGMapPalBuffer + call BackupBGMapColumn ld a, [wBGMapAnchor] ld e, a and %11100000 diff --git a/home/palettes.asm b/home/palettes.asm index a65ffff..5f883a1 100644 --- a/home/palettes.asm +++ b/home/palettes.asm @@ -319,11 +319,3 @@ ReloadSpritesNoPalettes:: ld a, TRUE ldh [hCGBPalUpdate], a jp DelayFrame - -SwapTextboxPalettes:: - homecall _SwapTextboxPalettes - ret - -ScrollBGMapPalettes:: - homecall _ScrollBGMapPalettes - ret diff --git a/layout.link b/layout.link index f2b400d..cfe4d56 100644 --- a/layout.link +++ b/layout.link @@ -343,6 +343,7 @@ WRAMX 1 "Party" WRAMX 2 "Pic Animations" + "Surrounding Data" align 8 "16-bit WRAM tables" WRAMX 3 diff --git a/main.asm b/main.asm index 70cd0ab..15645f4 100644 --- a/main.asm +++ b/main.asm @@ -190,8 +190,6 @@ INCLUDE "engine/events/buena_menu.asm" SECTION "bank13", ROMX -INCLUDE "engine/tilesets/map_palettes.asm" -INCLUDE "gfx/tileset_palette_maps.asm" INCLUDE "data/collision/collision_permissions.asm" INCLUDE "engine/menus/empty_sram.asm" INCLUDE "engine/menus/savemenu_copytilemapatonce.asm" diff --git a/maps/AzaleaGym.blk b/maps/AzaleaGym.ablk similarity index 100% rename from maps/AzaleaGym.blk rename to maps/AzaleaGym.ablk diff --git a/maps/AzaleaTown.blk b/maps/AzaleaTown.ablk similarity index 100% rename from maps/AzaleaTown.blk rename to maps/AzaleaTown.ablk diff --git a/maps/BattleTower1F.blk b/maps/BattleTower1F.ablk similarity index 100% rename from maps/BattleTower1F.blk rename to maps/BattleTower1F.ablk diff --git a/maps/BattleTowerBattleRoom.blk b/maps/BattleTowerBattleRoom.ablk similarity index 100% rename from maps/BattleTowerBattleRoom.blk rename to maps/BattleTowerBattleRoom.ablk diff --git a/maps/BattleTowerElevator.blk b/maps/BattleTowerElevator.ablk similarity index 100% rename from maps/BattleTowerElevator.blk rename to maps/BattleTowerElevator.ablk diff --git a/maps/BattleTowerHallway.blk b/maps/BattleTowerHallway.ablk similarity index 100% rename from maps/BattleTowerHallway.blk rename to maps/BattleTowerHallway.ablk diff --git a/maps/BattleTowerOutside.blk b/maps/BattleTowerOutside.ablk similarity index 100% rename from maps/BattleTowerOutside.blk rename to maps/BattleTowerOutside.ablk diff --git a/maps/BlackthornCity.blk b/maps/BlackthornCity.ablk similarity index 100% rename from maps/BlackthornCity.blk rename to maps/BlackthornCity.ablk diff --git a/maps/BlackthornGym1F.blk b/maps/BlackthornGym1F.ablk similarity index 100% rename from maps/BlackthornGym1F.blk rename to maps/BlackthornGym1F.ablk diff --git a/maps/BlackthornGym2F.blk b/maps/BlackthornGym2F.ablk similarity index 100% rename from maps/BlackthornGym2F.blk rename to maps/BlackthornGym2F.ablk diff --git a/maps/BrunosRoom.blk b/maps/BrunosRoom.ablk similarity index 100% rename from maps/BrunosRoom.blk rename to maps/BrunosRoom.ablk diff --git a/maps/BurnedTower1F.blk b/maps/BurnedTower1F.ablk similarity index 100% rename from maps/BurnedTower1F.blk rename to maps/BurnedTower1F.ablk diff --git a/maps/BurnedTowerB1F.blk b/maps/BurnedTowerB1F.ablk similarity index 100% rename from maps/BurnedTowerB1F.blk rename to maps/BurnedTowerB1F.ablk diff --git a/maps/CeladonCafe.blk b/maps/CeladonCafe.ablk similarity index 100% rename from maps/CeladonCafe.blk rename to maps/CeladonCafe.ablk diff --git a/maps/CeladonCity.blk b/maps/CeladonCity.ablk similarity index 100% rename from maps/CeladonCity.blk rename to maps/CeladonCity.ablk diff --git a/maps/CeladonGameCorner.blk b/maps/CeladonGameCorner.ablk similarity index 100% rename from maps/CeladonGameCorner.blk rename to maps/CeladonGameCorner.ablk diff --git a/maps/CeladonGameCornerPrizeRoom.blk b/maps/CeladonGameCornerPrizeRoom.ablk similarity index 100% rename from maps/CeladonGameCornerPrizeRoom.blk rename to maps/CeladonGameCornerPrizeRoom.ablk diff --git a/maps/CeladonGym.blk b/maps/CeladonGym.ablk similarity index 100% rename from maps/CeladonGym.blk rename to maps/CeladonGym.ablk diff --git a/maps/CeladonMansion1F.blk b/maps/CeladonMansion1F.ablk similarity index 100% rename from maps/CeladonMansion1F.blk rename to maps/CeladonMansion1F.ablk diff --git a/maps/CeladonMansion2F.blk b/maps/CeladonMansion2F.ablk similarity index 100% rename from maps/CeladonMansion2F.blk rename to maps/CeladonMansion2F.ablk diff --git a/maps/CeladonMansion3F.blk b/maps/CeladonMansion3F.ablk similarity index 100% rename from maps/CeladonMansion3F.blk rename to maps/CeladonMansion3F.ablk diff --git a/maps/CeladonMansionRoof.blk b/maps/CeladonMansionRoof.ablk similarity index 100% rename from maps/CeladonMansionRoof.blk rename to maps/CeladonMansionRoof.ablk diff --git a/maps/CeruleanCity.blk b/maps/CeruleanCity.ablk similarity index 100% rename from maps/CeruleanCity.blk rename to maps/CeruleanCity.ablk diff --git a/maps/CeruleanGym.blk b/maps/CeruleanGym.ablk similarity index 100% rename from maps/CeruleanGym.blk rename to maps/CeruleanGym.ablk diff --git a/maps/CherrygroveCity.blk b/maps/CherrygroveCity.ablk similarity index 100% rename from maps/CherrygroveCity.blk rename to maps/CherrygroveCity.ablk diff --git a/maps/CianwoodCity.blk b/maps/CianwoodCity.ablk similarity index 100% rename from maps/CianwoodCity.blk rename to maps/CianwoodCity.ablk diff --git a/maps/CianwoodGym.blk b/maps/CianwoodGym.ablk similarity index 100% rename from maps/CianwoodGym.blk rename to maps/CianwoodGym.ablk diff --git a/maps/CinnabarIsland.blk b/maps/CinnabarIsland.ablk similarity index 100% rename from maps/CinnabarIsland.blk rename to maps/CinnabarIsland.ablk diff --git a/maps/Colosseum.blk b/maps/Colosseum.ablk similarity index 100% rename from maps/Colosseum.blk rename to maps/Colosseum.ablk diff --git a/maps/CopycatsHouse1F.blk b/maps/CopycatsHouse1F.ablk similarity index 100% rename from maps/CopycatsHouse1F.blk rename to maps/CopycatsHouse1F.ablk diff --git a/maps/CopycatsHouse2F.blk b/maps/CopycatsHouse2F.ablk similarity index 100% rename from maps/CopycatsHouse2F.blk rename to maps/CopycatsHouse2F.ablk diff --git a/maps/DanceTheater.blk b/maps/DanceTheater.ablk similarity index 100% rename from maps/DanceTheater.blk rename to maps/DanceTheater.ablk diff --git a/maps/DarkCaveBlackthornEntrance.blk b/maps/DarkCaveBlackthornEntrance.ablk similarity index 100% rename from maps/DarkCaveBlackthornEntrance.blk rename to maps/DarkCaveBlackthornEntrance.ablk diff --git a/maps/DarkCaveVioletEntrance.blk b/maps/DarkCaveVioletEntrance.ablk similarity index 100% rename from maps/DarkCaveVioletEntrance.blk rename to maps/DarkCaveVioletEntrance.ablk diff --git a/maps/DayCare.blk b/maps/DayCare.ablk similarity index 100% rename from maps/DayCare.blk rename to maps/DayCare.ablk diff --git a/maps/DeptStore1F.blk b/maps/DeptStore1F.ablk similarity index 100% rename from maps/DeptStore1F.blk rename to maps/DeptStore1F.ablk diff --git a/maps/DeptStore2F.blk b/maps/DeptStore2F.ablk similarity index 100% rename from maps/DeptStore2F.blk rename to maps/DeptStore2F.ablk diff --git a/maps/DeptStore3F.blk b/maps/DeptStore3F.ablk similarity index 100% rename from maps/DeptStore3F.blk rename to maps/DeptStore3F.ablk diff --git a/maps/DeptStore4F.blk b/maps/DeptStore4F.ablk similarity index 100% rename from maps/DeptStore4F.blk rename to maps/DeptStore4F.ablk diff --git a/maps/DeptStore5F.blk b/maps/DeptStore5F.ablk similarity index 100% rename from maps/DeptStore5F.blk rename to maps/DeptStore5F.ablk diff --git a/maps/DeptStore6F.blk b/maps/DeptStore6F.ablk similarity index 100% rename from maps/DeptStore6F.blk rename to maps/DeptStore6F.ablk diff --git a/maps/DeptStoreElevator.blk b/maps/DeptStoreElevator.ablk similarity index 100% rename from maps/DeptStoreElevator.blk rename to maps/DeptStoreElevator.ablk diff --git a/maps/DiglettsCave.blk b/maps/DiglettsCave.ablk similarity index 100% rename from maps/DiglettsCave.blk rename to maps/DiglettsCave.ablk diff --git a/maps/DragonShrine.blk b/maps/DragonShrine.ablk similarity index 100% rename from maps/DragonShrine.blk rename to maps/DragonShrine.ablk diff --git a/maps/DragonsDen1F.blk b/maps/DragonsDen1F.ablk similarity index 100% rename from maps/DragonsDen1F.blk rename to maps/DragonsDen1F.ablk diff --git a/maps/DragonsDenB1F.blk b/maps/DragonsDenB1F.ablk similarity index 100% rename from maps/DragonsDenB1F.blk rename to maps/DragonsDenB1F.ablk diff --git a/maps/EarlsPokemonAcademy.blk b/maps/EarlsPokemonAcademy.ablk similarity index 100% rename from maps/EarlsPokemonAcademy.blk rename to maps/EarlsPokemonAcademy.ablk diff --git a/maps/EastWestGate.blk b/maps/EastWestGate.ablk similarity index 100% rename from maps/EastWestGate.blk rename to maps/EastWestGate.ablk diff --git a/maps/EcruteakCity.blk b/maps/EcruteakCity.ablk similarity index 100% rename from maps/EcruteakCity.blk rename to maps/EcruteakCity.ablk diff --git a/maps/EcruteakGym.blk b/maps/EcruteakGym.ablk similarity index 100% rename from maps/EcruteakGym.blk rename to maps/EcruteakGym.ablk diff --git a/maps/EcruteakTinTowerEntrance.blk b/maps/EcruteakTinTowerEntrance.ablk similarity index 100% rename from maps/EcruteakTinTowerEntrance.blk rename to maps/EcruteakTinTowerEntrance.ablk diff --git a/maps/ElmsHouse.blk b/maps/ElmsHouse.ablk similarity index 100% rename from maps/ElmsHouse.blk rename to maps/ElmsHouse.ablk diff --git a/maps/ElmsLab.blk b/maps/ElmsLab.ablk similarity index 100% rename from maps/ElmsLab.blk rename to maps/ElmsLab.ablk diff --git a/maps/FastShip1F.blk b/maps/FastShip1F.ablk similarity index 100% rename from maps/FastShip1F.blk rename to maps/FastShip1F.ablk diff --git a/maps/FastShipB1F.blk b/maps/FastShipB1F.ablk similarity index 100% rename from maps/FastShipB1F.blk rename to maps/FastShipB1F.ablk diff --git a/maps/FastShipCabins_NNW_NNE_NE.blk b/maps/FastShipCabins_NNW_NNE_NE.ablk similarity index 100% rename from maps/FastShipCabins_NNW_NNE_NE.blk rename to maps/FastShipCabins_NNW_NNE_NE.ablk diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.blk b/maps/FastShipCabins_SE_SSE_CaptainsCabin.ablk similarity index 100% rename from maps/FastShipCabins_SE_SSE_CaptainsCabin.blk rename to maps/FastShipCabins_SE_SSE_CaptainsCabin.ablk diff --git a/maps/FastShipCabins_SW_SSW_NW.blk b/maps/FastShipCabins_SW_SSW_NW.ablk similarity index 100% rename from maps/FastShipCabins_SW_SSW_NW.blk rename to maps/FastShipCabins_SW_SSW_NW.ablk diff --git a/maps/FightingDojo.blk b/maps/FightingDojo.ablk similarity index 100% rename from maps/FightingDojo.blk rename to maps/FightingDojo.ablk diff --git a/maps/FuchsiaCity.blk b/maps/FuchsiaCity.ablk similarity index 100% rename from maps/FuchsiaCity.blk rename to maps/FuchsiaCity.ablk diff --git a/maps/FuchsiaGym.blk b/maps/FuchsiaGym.ablk similarity index 100% rename from maps/FuchsiaGym.blk rename to maps/FuchsiaGym.ablk diff --git a/maps/GiftShop.blk b/maps/GiftShop.ablk similarity index 100% rename from maps/GiftShop.blk rename to maps/GiftShop.ablk diff --git a/maps/GoldenrodBikeShop.blk b/maps/GoldenrodBikeShop.ablk similarity index 100% rename from maps/GoldenrodBikeShop.blk rename to maps/GoldenrodBikeShop.ablk diff --git a/maps/GoldenrodCity.blk b/maps/GoldenrodCity.ablk similarity index 100% rename from maps/GoldenrodCity.blk rename to maps/GoldenrodCity.ablk diff --git a/maps/GoldenrodDeptStoreB1F.blk b/maps/GoldenrodDeptStoreB1F.ablk similarity index 100% rename from maps/GoldenrodDeptStoreB1F.blk rename to maps/GoldenrodDeptStoreB1F.ablk diff --git a/maps/GoldenrodDeptStoreRoof.blk b/maps/GoldenrodDeptStoreRoof.ablk similarity index 100% rename from maps/GoldenrodDeptStoreRoof.blk rename to maps/GoldenrodDeptStoreRoof.ablk diff --git a/maps/GoldenrodFlowerShop.blk b/maps/GoldenrodFlowerShop.ablk similarity index 100% rename from maps/GoldenrodFlowerShop.blk rename to maps/GoldenrodFlowerShop.ablk diff --git a/maps/GoldenrodGameCorner.blk b/maps/GoldenrodGameCorner.ablk similarity index 100% rename from maps/GoldenrodGameCorner.blk rename to maps/GoldenrodGameCorner.ablk diff --git a/maps/GoldenrodGym.blk b/maps/GoldenrodGym.ablk similarity index 100% rename from maps/GoldenrodGym.blk rename to maps/GoldenrodGym.ablk diff --git a/maps/GoldenrodMagnetTrainStation.blk b/maps/GoldenrodMagnetTrainStation.ablk similarity index 100% rename from maps/GoldenrodMagnetTrainStation.blk rename to maps/GoldenrodMagnetTrainStation.ablk diff --git a/maps/GoldenrodUnderground.blk b/maps/GoldenrodUnderground.ablk similarity index 100% rename from maps/GoldenrodUnderground.blk rename to maps/GoldenrodUnderground.ablk diff --git a/maps/GoldenrodUndergroundSwitchRoomEntrances.blk b/maps/GoldenrodUndergroundSwitchRoomEntrances.ablk similarity index 100% rename from maps/GoldenrodUndergroundSwitchRoomEntrances.blk rename to maps/GoldenrodUndergroundSwitchRoomEntrances.ablk diff --git a/maps/GoldenrodUndergroundWarehouse.blk b/maps/GoldenrodUndergroundWarehouse.ablk similarity index 100% rename from maps/GoldenrodUndergroundWarehouse.blk rename to maps/GoldenrodUndergroundWarehouse.ablk diff --git a/maps/HallOfFame.blk b/maps/HallOfFame.ablk similarity index 100% rename from maps/HallOfFame.blk rename to maps/HallOfFame.ablk diff --git a/maps/House1.blk b/maps/House1.ablk similarity index 100% rename from maps/House1.blk rename to maps/House1.ablk diff --git a/maps/House2.blk b/maps/House2.ablk similarity index 100% rename from maps/House2.blk rename to maps/House2.ablk diff --git a/maps/IcePath1F.blk b/maps/IcePath1F.ablk similarity index 100% rename from maps/IcePath1F.blk rename to maps/IcePath1F.ablk diff --git a/maps/IcePathB1F.blk b/maps/IcePathB1F.ablk similarity index 100% rename from maps/IcePathB1F.blk rename to maps/IcePathB1F.ablk diff --git a/maps/IcePathB2FBlackthornSide.blk b/maps/IcePathB2FBlackthornSide.ablk similarity index 100% rename from maps/IcePathB2FBlackthornSide.blk rename to maps/IcePathB2FBlackthornSide.ablk diff --git a/maps/IcePathB2FMahoganySide.blk b/maps/IcePathB2FMahoganySide.ablk similarity index 100% rename from maps/IcePathB2FMahoganySide.blk rename to maps/IcePathB2FMahoganySide.ablk diff --git a/maps/IcePathB3F.blk b/maps/IcePathB3F.ablk similarity index 100% rename from maps/IcePathB3F.blk rename to maps/IcePathB3F.ablk diff --git a/maps/IlexForest.blk b/maps/IlexForest.ablk similarity index 100% rename from maps/IlexForest.blk rename to maps/IlexForest.ablk diff --git a/maps/IndigoPlateauPokecenter1F.blk b/maps/IndigoPlateauPokecenter1F.ablk similarity index 100% rename from maps/IndigoPlateauPokecenter1F.blk rename to maps/IndigoPlateauPokecenter1F.ablk diff --git a/maps/KarensRoom.blk b/maps/KarensRoom.ablk similarity index 100% rename from maps/KarensRoom.blk rename to maps/KarensRoom.ablk diff --git a/maps/KogasRoom.blk b/maps/KogasRoom.ablk similarity index 100% rename from maps/KogasRoom.blk rename to maps/KogasRoom.ablk diff --git a/maps/KurtsHouse.blk b/maps/KurtsHouse.ablk similarity index 100% rename from maps/KurtsHouse.blk rename to maps/KurtsHouse.ablk diff --git a/maps/LakeOfRage.blk b/maps/LakeOfRage.ablk similarity index 100% rename from maps/LakeOfRage.blk rename to maps/LakeOfRage.ablk diff --git a/maps/LancesRoom.blk b/maps/LancesRoom.ablk similarity index 100% rename from maps/LancesRoom.blk rename to maps/LancesRoom.ablk diff --git a/maps/LavRadioTower1F.blk b/maps/LavRadioTower1F.ablk similarity index 100% rename from maps/LavRadioTower1F.blk rename to maps/LavRadioTower1F.ablk diff --git a/maps/LavenderTown.blk b/maps/LavenderTown.ablk similarity index 100% rename from maps/LavenderTown.blk rename to maps/LavenderTown.ablk diff --git a/maps/MahoganyGym.blk b/maps/MahoganyGym.ablk similarity index 100% rename from maps/MahoganyGym.blk rename to maps/MahoganyGym.ablk diff --git a/maps/MahoganyTown.blk b/maps/MahoganyTown.ablk similarity index 100% rename from maps/MahoganyTown.blk rename to maps/MahoganyTown.ablk diff --git a/maps/Mart.blk b/maps/Mart.ablk similarity index 100% rename from maps/Mart.blk rename to maps/Mart.ablk diff --git a/maps/MobileBattleRoom.blk b/maps/MobileBattleRoom.ablk similarity index 100% rename from maps/MobileBattleRoom.blk rename to maps/MobileBattleRoom.ablk diff --git a/maps/MobileTradeRoom.blk b/maps/MobileTradeRoom.ablk similarity index 100% rename from maps/MobileTradeRoom.blk rename to maps/MobileTradeRoom.ablk diff --git a/maps/MountMoon.blk b/maps/MountMoon.ablk similarity index 100% rename from maps/MountMoon.blk rename to maps/MountMoon.ablk diff --git a/maps/MountMoonSquare.blk b/maps/MountMoonSquare.ablk similarity index 100% rename from maps/MountMoonSquare.blk rename to maps/MountMoonSquare.ablk diff --git a/maps/MountMortar1FInside.blk b/maps/MountMortar1FInside.ablk similarity index 100% rename from maps/MountMortar1FInside.blk rename to maps/MountMortar1FInside.ablk diff --git a/maps/MountMortar1FOutside.blk b/maps/MountMortar1FOutside.ablk similarity index 100% rename from maps/MountMortar1FOutside.blk rename to maps/MountMortar1FOutside.ablk diff --git a/maps/MountMortar2FInside.blk b/maps/MountMortar2FInside.ablk similarity index 100% rename from maps/MountMortar2FInside.blk rename to maps/MountMortar2FInside.ablk diff --git a/maps/MountMortarB1F.blk b/maps/MountMortarB1F.ablk similarity index 100% rename from maps/MountMortarB1F.blk rename to maps/MountMortarB1F.ablk diff --git a/maps/MrFujisHouse.blk b/maps/MrFujisHouse.ablk similarity index 100% rename from maps/MrFujisHouse.blk rename to maps/MrFujisHouse.ablk diff --git a/maps/MrPokemonsHouse.blk b/maps/MrPokemonsHouse.ablk similarity index 100% rename from maps/MrPokemonsHouse.blk rename to maps/MrPokemonsHouse.ablk diff --git a/maps/NationalPark.blk b/maps/NationalPark.ablk similarity index 100% rename from maps/NationalPark.blk rename to maps/NationalPark.ablk diff --git a/maps/NewBarkTown.blk b/maps/NewBarkTown.ablk similarity index 100% rename from maps/NewBarkTown.blk rename to maps/NewBarkTown.ablk diff --git a/maps/NorthSouthGate.blk b/maps/NorthSouthGate.ablk similarity index 100% rename from maps/NorthSouthGate.blk rename to maps/NorthSouthGate.ablk diff --git a/maps/OaksLab.blk b/maps/OaksLab.ablk similarity index 100% rename from maps/OaksLab.blk rename to maps/OaksLab.ablk diff --git a/maps/OlivineCafe.blk b/maps/OlivineCafe.ablk similarity index 100% rename from maps/OlivineCafe.blk rename to maps/OlivineCafe.ablk diff --git a/maps/OlivineCity.blk b/maps/OlivineCity.ablk similarity index 100% rename from maps/OlivineCity.blk rename to maps/OlivineCity.ablk diff --git a/maps/OlivineGym.blk b/maps/OlivineGym.ablk similarity index 100% rename from maps/OlivineGym.blk rename to maps/OlivineGym.ablk diff --git a/maps/OlivineLighthouse1F.blk b/maps/OlivineLighthouse1F.ablk similarity index 100% rename from maps/OlivineLighthouse1F.blk rename to maps/OlivineLighthouse1F.ablk diff --git a/maps/OlivineLighthouse2F.blk b/maps/OlivineLighthouse2F.ablk similarity index 100% rename from maps/OlivineLighthouse2F.blk rename to maps/OlivineLighthouse2F.ablk diff --git a/maps/OlivineLighthouse3F.blk b/maps/OlivineLighthouse3F.ablk similarity index 100% rename from maps/OlivineLighthouse3F.blk rename to maps/OlivineLighthouse3F.ablk diff --git a/maps/OlivineLighthouse4F.blk b/maps/OlivineLighthouse4F.ablk similarity index 100% rename from maps/OlivineLighthouse4F.blk rename to maps/OlivineLighthouse4F.ablk diff --git a/maps/OlivineLighthouse5F.blk b/maps/OlivineLighthouse5F.ablk similarity index 100% rename from maps/OlivineLighthouse5F.blk rename to maps/OlivineLighthouse5F.ablk diff --git a/maps/OlivineLighthouse6F.blk b/maps/OlivineLighthouse6F.ablk similarity index 100% rename from maps/OlivineLighthouse6F.blk rename to maps/OlivineLighthouse6F.ablk diff --git a/maps/OlivinePort.blk b/maps/OlivinePort.ablk similarity index 100% rename from maps/OlivinePort.blk rename to maps/OlivinePort.ablk diff --git a/maps/PalletTown.blk b/maps/PalletTown.ablk similarity index 100% rename from maps/PalletTown.blk rename to maps/PalletTown.ablk diff --git a/maps/PewterCity.blk b/maps/PewterCity.ablk similarity index 100% rename from maps/PewterCity.blk rename to maps/PewterCity.ablk diff --git a/maps/PewterGym.blk b/maps/PewterGym.ablk similarity index 100% rename from maps/PewterGym.blk rename to maps/PewterGym.ablk diff --git a/maps/PlayersHouse1F.blk b/maps/PlayersHouse1F.ablk similarity index 100% rename from maps/PlayersHouse1F.blk rename to maps/PlayersHouse1F.ablk diff --git a/maps/PlayersHouse2F.blk b/maps/PlayersHouse2F.ablk similarity index 100% rename from maps/PlayersHouse2F.blk rename to maps/PlayersHouse2F.ablk diff --git a/maps/Pokecenter1F.blk b/maps/Pokecenter1F.ablk similarity index 100% rename from maps/Pokecenter1F.blk rename to maps/Pokecenter1F.ablk diff --git a/maps/Pokecenter2F.blk b/maps/Pokecenter2F.ablk similarity index 100% rename from maps/Pokecenter2F.blk rename to maps/Pokecenter2F.ablk diff --git a/maps/PokecomCenterAdminOfficeMobile.blk b/maps/PokecomCenterAdminOfficeMobile.ablk similarity index 100% rename from maps/PokecomCenterAdminOfficeMobile.blk rename to maps/PokecomCenterAdminOfficeMobile.ablk diff --git a/maps/PokemonFanClub.blk b/maps/PokemonFanClub.ablk similarity index 100% rename from maps/PokemonFanClub.blk rename to maps/PokemonFanClub.ablk diff --git a/maps/PortPassage.blk b/maps/PortPassage.ablk similarity index 100% rename from maps/PortPassage.blk rename to maps/PortPassage.ablk diff --git a/maps/PowerPlant.blk b/maps/PowerPlant.ablk similarity index 100% rename from maps/PowerPlant.blk rename to maps/PowerPlant.ablk diff --git a/maps/RadioTower1F.blk b/maps/RadioTower1F.ablk similarity index 100% rename from maps/RadioTower1F.blk rename to maps/RadioTower1F.ablk diff --git a/maps/RadioTower2F.blk b/maps/RadioTower2F.ablk similarity index 100% rename from maps/RadioTower2F.blk rename to maps/RadioTower2F.ablk diff --git a/maps/RadioTower3F.blk b/maps/RadioTower3F.ablk similarity index 100% rename from maps/RadioTower3F.blk rename to maps/RadioTower3F.ablk diff --git a/maps/RadioTower4F.blk b/maps/RadioTower4F.ablk similarity index 100% rename from maps/RadioTower4F.blk rename to maps/RadioTower4F.ablk diff --git a/maps/RadioTower5F.blk b/maps/RadioTower5F.ablk similarity index 100% rename from maps/RadioTower5F.blk rename to maps/RadioTower5F.ablk diff --git a/maps/RedsHouse1F.blk b/maps/RedsHouse1F.ablk similarity index 100% rename from maps/RedsHouse1F.blk rename to maps/RedsHouse1F.ablk diff --git a/maps/RedsHouse2F.blk b/maps/RedsHouse2F.ablk similarity index 100% rename from maps/RedsHouse2F.blk rename to maps/RedsHouse2F.ablk diff --git a/maps/RockTunnel1F.blk b/maps/RockTunnel1F.ablk similarity index 100% rename from maps/RockTunnel1F.blk rename to maps/RockTunnel1F.ablk diff --git a/maps/RockTunnelB1F.blk b/maps/RockTunnelB1F.ablk similarity index 100% rename from maps/RockTunnelB1F.blk rename to maps/RockTunnelB1F.ablk diff --git a/maps/Route1.blk b/maps/Route1.ablk similarity index 100% rename from maps/Route1.blk rename to maps/Route1.ablk diff --git a/maps/Route10North.blk b/maps/Route10North.ablk similarity index 100% rename from maps/Route10North.blk rename to maps/Route10North.ablk diff --git a/maps/Route10South.blk b/maps/Route10South.ablk similarity index 100% rename from maps/Route10South.blk rename to maps/Route10South.ablk diff --git a/maps/Route11.blk b/maps/Route11.ablk similarity index 100% rename from maps/Route11.blk rename to maps/Route11.ablk diff --git a/maps/Route12.blk b/maps/Route12.ablk similarity index 100% rename from maps/Route12.blk rename to maps/Route12.ablk diff --git a/maps/Route13.blk b/maps/Route13.ablk similarity index 100% rename from maps/Route13.blk rename to maps/Route13.ablk diff --git a/maps/Route14.blk b/maps/Route14.ablk similarity index 100% rename from maps/Route14.blk rename to maps/Route14.ablk diff --git a/maps/Route15.blk b/maps/Route15.ablk similarity index 100% rename from maps/Route15.blk rename to maps/Route15.ablk diff --git a/maps/Route16.blk b/maps/Route16.ablk similarity index 100% rename from maps/Route16.blk rename to maps/Route16.ablk diff --git a/maps/Route17.blk b/maps/Route17.ablk similarity index 100% rename from maps/Route17.blk rename to maps/Route17.ablk diff --git a/maps/Route18.blk b/maps/Route18.ablk similarity index 100% rename from maps/Route18.blk rename to maps/Route18.ablk diff --git a/maps/Route19.blk b/maps/Route19.ablk similarity index 100% rename from maps/Route19.blk rename to maps/Route19.ablk diff --git a/maps/Route2.blk b/maps/Route2.ablk similarity index 100% rename from maps/Route2.blk rename to maps/Route2.ablk diff --git a/maps/Route20.blk b/maps/Route20.ablk similarity index 100% rename from maps/Route20.blk rename to maps/Route20.ablk diff --git a/maps/Route21.blk b/maps/Route21.ablk similarity index 100% rename from maps/Route21.blk rename to maps/Route21.ablk diff --git a/maps/Route22.blk b/maps/Route22.ablk similarity index 100% rename from maps/Route22.blk rename to maps/Route22.ablk diff --git a/maps/Route23.blk b/maps/Route23.ablk similarity index 100% rename from maps/Route23.blk rename to maps/Route23.ablk diff --git a/maps/Route24.blk b/maps/Route24.ablk similarity index 100% rename from maps/Route24.blk rename to maps/Route24.ablk diff --git a/maps/Route25.blk b/maps/Route25.ablk similarity index 100% rename from maps/Route25.blk rename to maps/Route25.ablk diff --git a/maps/Route26.blk b/maps/Route26.ablk similarity index 100% rename from maps/Route26.blk rename to maps/Route26.ablk diff --git a/maps/Route27.blk b/maps/Route27.ablk similarity index 100% rename from maps/Route27.blk rename to maps/Route27.ablk diff --git a/maps/Route28.blk b/maps/Route28.ablk similarity index 100% rename from maps/Route28.blk rename to maps/Route28.ablk diff --git a/maps/Route29.blk b/maps/Route29.ablk similarity index 100% rename from maps/Route29.blk rename to maps/Route29.ablk diff --git a/maps/Route3.blk b/maps/Route3.ablk similarity index 100% rename from maps/Route3.blk rename to maps/Route3.ablk diff --git a/maps/Route30.blk b/maps/Route30.ablk similarity index 100% rename from maps/Route30.blk rename to maps/Route30.ablk diff --git a/maps/Route31.blk b/maps/Route31.ablk similarity index 100% rename from maps/Route31.blk rename to maps/Route31.ablk diff --git a/maps/Route32.blk b/maps/Route32.ablk similarity index 100% rename from maps/Route32.blk rename to maps/Route32.ablk diff --git a/maps/Route33.blk b/maps/Route33.ablk similarity index 100% rename from maps/Route33.blk rename to maps/Route33.ablk diff --git a/maps/Route34.blk b/maps/Route34.ablk similarity index 100% rename from maps/Route34.blk rename to maps/Route34.ablk diff --git a/maps/Route35.blk b/maps/Route35.ablk similarity index 100% rename from maps/Route35.blk rename to maps/Route35.ablk diff --git a/maps/Route35NationalParkGate.blk b/maps/Route35NationalParkGate.ablk similarity index 100% rename from maps/Route35NationalParkGate.blk rename to maps/Route35NationalParkGate.ablk diff --git a/maps/Route36.blk b/maps/Route36.ablk similarity index 100% rename from maps/Route36.blk rename to maps/Route36.ablk diff --git a/maps/Route36NationalParkGate.blk b/maps/Route36NationalParkGate.ablk similarity index 100% rename from maps/Route36NationalParkGate.blk rename to maps/Route36NationalParkGate.ablk diff --git a/maps/Route37.blk b/maps/Route37.ablk similarity index 100% rename from maps/Route37.blk rename to maps/Route37.ablk diff --git a/maps/Route38.blk b/maps/Route38.ablk similarity index 100% rename from maps/Route38.blk rename to maps/Route38.ablk diff --git a/maps/Route39.blk b/maps/Route39.ablk similarity index 100% rename from maps/Route39.blk rename to maps/Route39.ablk diff --git a/maps/Route39Barn.blk b/maps/Route39Barn.ablk similarity index 100% rename from maps/Route39Barn.blk rename to maps/Route39Barn.ablk diff --git a/maps/Route4.blk b/maps/Route4.ablk similarity index 100% rename from maps/Route4.blk rename to maps/Route4.ablk diff --git a/maps/Route40.blk b/maps/Route40.ablk similarity index 100% rename from maps/Route40.blk rename to maps/Route40.ablk diff --git a/maps/Route41.blk b/maps/Route41.ablk similarity index 100% rename from maps/Route41.blk rename to maps/Route41.ablk diff --git a/maps/Route42.blk b/maps/Route42.ablk similarity index 100% rename from maps/Route42.blk rename to maps/Route42.ablk diff --git a/maps/Route43.blk b/maps/Route43.ablk similarity index 100% rename from maps/Route43.blk rename to maps/Route43.ablk diff --git a/maps/Route44.blk b/maps/Route44.ablk similarity index 100% rename from maps/Route44.blk rename to maps/Route44.ablk diff --git a/maps/Route45.blk b/maps/Route45.ablk similarity index 100% rename from maps/Route45.blk rename to maps/Route45.ablk diff --git a/maps/Route46.blk b/maps/Route46.ablk similarity index 100% rename from maps/Route46.blk rename to maps/Route46.ablk diff --git a/maps/Route5.blk b/maps/Route5.ablk similarity index 100% rename from maps/Route5.blk rename to maps/Route5.ablk diff --git a/maps/Route6.blk b/maps/Route6.ablk similarity index 100% rename from maps/Route6.blk rename to maps/Route6.ablk diff --git a/maps/Route7.blk b/maps/Route7.ablk similarity index 100% rename from maps/Route7.blk rename to maps/Route7.ablk diff --git a/maps/Route8.blk b/maps/Route8.ablk similarity index 100% rename from maps/Route8.blk rename to maps/Route8.ablk diff --git a/maps/Route9.blk b/maps/Route9.ablk similarity index 100% rename from maps/Route9.blk rename to maps/Route9.ablk diff --git a/maps/RuinsOfAlphAerodactylWordRoom.blk b/maps/RuinsOfAlphAerodactylWordRoom.ablk similarity index 100% rename from maps/RuinsOfAlphAerodactylWordRoom.blk rename to maps/RuinsOfAlphAerodactylWordRoom.ablk diff --git a/maps/RuinsOfAlphHoOhWordRoom.blk b/maps/RuinsOfAlphHoOhWordRoom.ablk similarity index 100% rename from maps/RuinsOfAlphHoOhWordRoom.blk rename to maps/RuinsOfAlphHoOhWordRoom.ablk diff --git a/maps/RuinsOfAlphInnerChamber.blk b/maps/RuinsOfAlphInnerChamber.ablk similarity index 100% rename from maps/RuinsOfAlphInnerChamber.blk rename to maps/RuinsOfAlphInnerChamber.ablk diff --git a/maps/RuinsOfAlphItemRoom.blk b/maps/RuinsOfAlphItemRoom.ablk similarity index 100% rename from maps/RuinsOfAlphItemRoom.blk rename to maps/RuinsOfAlphItemRoom.ablk diff --git a/maps/RuinsOfAlphKabutoWordRoom.blk b/maps/RuinsOfAlphKabutoWordRoom.ablk similarity index 100% rename from maps/RuinsOfAlphKabutoWordRoom.blk rename to maps/RuinsOfAlphKabutoWordRoom.ablk diff --git a/maps/RuinsOfAlphOmanyteWordRoom.blk b/maps/RuinsOfAlphOmanyteWordRoom.ablk similarity index 100% rename from maps/RuinsOfAlphOmanyteWordRoom.blk rename to maps/RuinsOfAlphOmanyteWordRoom.ablk diff --git a/maps/RuinsOfAlphOutside.blk b/maps/RuinsOfAlphOutside.ablk similarity index 100% rename from maps/RuinsOfAlphOutside.blk rename to maps/RuinsOfAlphOutside.ablk diff --git a/maps/RuinsOfAlphPuzzleChamber.blk b/maps/RuinsOfAlphPuzzleChamber.ablk similarity index 100% rename from maps/RuinsOfAlphPuzzleChamber.blk rename to maps/RuinsOfAlphPuzzleChamber.ablk diff --git a/maps/RuinsOfAlphResearchCenter.blk b/maps/RuinsOfAlphResearchCenter.ablk similarity index 100% rename from maps/RuinsOfAlphResearchCenter.blk rename to maps/RuinsOfAlphResearchCenter.ablk diff --git a/maps/SafariZoneBeta.blk b/maps/SafariZoneBeta.ablk similarity index 100% rename from maps/SafariZoneBeta.blk rename to maps/SafariZoneBeta.ablk diff --git a/maps/SaffronCity.blk b/maps/SaffronCity.ablk similarity index 100% rename from maps/SaffronCity.blk rename to maps/SaffronCity.ablk diff --git a/maps/SaffronGym.blk b/maps/SaffronGym.ablk similarity index 100% rename from maps/SaffronGym.blk rename to maps/SaffronGym.ablk diff --git a/maps/SaffronMagnetTrainStation.blk b/maps/SaffronMagnetTrainStation.ablk similarity index 100% rename from maps/SaffronMagnetTrainStation.blk rename to maps/SaffronMagnetTrainStation.ablk diff --git a/maps/SeafoamGym.blk b/maps/SeafoamGym.ablk similarity index 100% rename from maps/SeafoamGym.blk rename to maps/SeafoamGym.ablk diff --git a/maps/SilphCo1F.blk b/maps/SilphCo1F.ablk similarity index 100% rename from maps/SilphCo1F.blk rename to maps/SilphCo1F.ablk diff --git a/maps/SilverCaveItemRooms.blk b/maps/SilverCaveItemRooms.ablk similarity index 100% rename from maps/SilverCaveItemRooms.blk rename to maps/SilverCaveItemRooms.ablk diff --git a/maps/SilverCaveOutside.blk b/maps/SilverCaveOutside.ablk similarity index 100% rename from maps/SilverCaveOutside.blk rename to maps/SilverCaveOutside.ablk diff --git a/maps/SilverCaveRoom1.blk b/maps/SilverCaveRoom1.ablk similarity index 100% rename from maps/SilverCaveRoom1.blk rename to maps/SilverCaveRoom1.ablk diff --git a/maps/SilverCaveRoom2.blk b/maps/SilverCaveRoom2.ablk similarity index 100% rename from maps/SilverCaveRoom2.blk rename to maps/SilverCaveRoom2.ablk diff --git a/maps/SilverCaveRoom3.blk b/maps/SilverCaveRoom3.ablk similarity index 100% rename from maps/SilverCaveRoom3.blk rename to maps/SilverCaveRoom3.ablk diff --git a/maps/SlowpokeWellB1F.blk b/maps/SlowpokeWellB1F.ablk similarity index 100% rename from maps/SlowpokeWellB1F.blk rename to maps/SlowpokeWellB1F.ablk diff --git a/maps/SlowpokeWellB2F.blk b/maps/SlowpokeWellB2F.ablk similarity index 100% rename from maps/SlowpokeWellB2F.blk rename to maps/SlowpokeWellB2F.ablk diff --git a/maps/SoulHouse.blk b/maps/SoulHouse.ablk similarity index 100% rename from maps/SoulHouse.blk rename to maps/SoulHouse.ablk diff --git a/maps/SproutTower1F.blk b/maps/SproutTower1F.ablk similarity index 100% rename from maps/SproutTower1F.blk rename to maps/SproutTower1F.ablk diff --git a/maps/SproutTower2F.blk b/maps/SproutTower2F.ablk similarity index 100% rename from maps/SproutTower2F.blk rename to maps/SproutTower2F.ablk diff --git a/maps/SproutTower3F.blk b/maps/SproutTower3F.ablk similarity index 100% rename from maps/SproutTower3F.blk rename to maps/SproutTower3F.ablk diff --git a/maps/TeamRocketBaseB1F.blk b/maps/TeamRocketBaseB1F.ablk similarity index 100% rename from maps/TeamRocketBaseB1F.blk rename to maps/TeamRocketBaseB1F.ablk diff --git a/maps/TeamRocketBaseB2F.blk b/maps/TeamRocketBaseB2F.ablk similarity index 100% rename from maps/TeamRocketBaseB2F.blk rename to maps/TeamRocketBaseB2F.ablk diff --git a/maps/TeamRocketBaseB3F.blk b/maps/TeamRocketBaseB3F.ablk similarity index 100% rename from maps/TeamRocketBaseB3F.blk rename to maps/TeamRocketBaseB3F.ablk diff --git a/maps/TinTower1F.blk b/maps/TinTower1F.ablk similarity index 100% rename from maps/TinTower1F.blk rename to maps/TinTower1F.ablk diff --git a/maps/TinTower2F.blk b/maps/TinTower2F.ablk similarity index 100% rename from maps/TinTower2F.blk rename to maps/TinTower2F.ablk diff --git a/maps/TinTower3F.blk b/maps/TinTower3F.ablk similarity index 100% rename from maps/TinTower3F.blk rename to maps/TinTower3F.ablk diff --git a/maps/TinTower4F.blk b/maps/TinTower4F.ablk similarity index 100% rename from maps/TinTower4F.blk rename to maps/TinTower4F.ablk diff --git a/maps/TinTower5F.blk b/maps/TinTower5F.ablk similarity index 100% rename from maps/TinTower5F.blk rename to maps/TinTower5F.ablk diff --git a/maps/TinTower6F.blk b/maps/TinTower6F.ablk similarity index 100% rename from maps/TinTower6F.blk rename to maps/TinTower6F.ablk diff --git a/maps/TinTower7F.blk b/maps/TinTower7F.ablk similarity index 100% rename from maps/TinTower7F.blk rename to maps/TinTower7F.ablk diff --git a/maps/TinTower8F.blk b/maps/TinTower8F.ablk similarity index 100% rename from maps/TinTower8F.blk rename to maps/TinTower8F.ablk diff --git a/maps/TinTower9F.blk b/maps/TinTower9F.ablk similarity index 100% rename from maps/TinTower9F.blk rename to maps/TinTower9F.ablk diff --git a/maps/TinTowerRoof.blk b/maps/TinTowerRoof.ablk similarity index 100% rename from maps/TinTowerRoof.blk rename to maps/TinTowerRoof.ablk diff --git a/maps/TohjoFalls.blk b/maps/TohjoFalls.ablk similarity index 100% rename from maps/TohjoFalls.blk rename to maps/TohjoFalls.ablk diff --git a/maps/TradeCenter.blk b/maps/TradeCenter.ablk similarity index 100% rename from maps/TradeCenter.blk rename to maps/TradeCenter.ablk diff --git a/maps/TrainerHouse1F.blk b/maps/TrainerHouse1F.ablk similarity index 100% rename from maps/TrainerHouse1F.blk rename to maps/TrainerHouse1F.ablk diff --git a/maps/TrainerHouseB1F.blk b/maps/TrainerHouseB1F.ablk similarity index 100% rename from maps/TrainerHouseB1F.blk rename to maps/TrainerHouseB1F.ablk diff --git a/maps/UndergroundPath.blk b/maps/UndergroundPath.ablk similarity index 100% rename from maps/UndergroundPath.blk rename to maps/UndergroundPath.ablk diff --git a/maps/UndergroundPathEntrance.blk b/maps/UndergroundPathEntrance.ablk similarity index 100% rename from maps/UndergroundPathEntrance.blk rename to maps/UndergroundPathEntrance.ablk diff --git a/maps/UnionCave1F.blk b/maps/UnionCave1F.ablk similarity index 100% rename from maps/UnionCave1F.blk rename to maps/UnionCave1F.ablk diff --git a/maps/UnionCaveB1F.blk b/maps/UnionCaveB1F.ablk similarity index 100% rename from maps/UnionCaveB1F.blk rename to maps/UnionCaveB1F.ablk diff --git a/maps/UnionCaveB2F.blk b/maps/UnionCaveB2F.ablk similarity index 100% rename from maps/UnionCaveB2F.blk rename to maps/UnionCaveB2F.ablk diff --git a/maps/VermilionCity.blk b/maps/VermilionCity.ablk similarity index 100% rename from maps/VermilionCity.blk rename to maps/VermilionCity.ablk diff --git a/maps/VermilionGym.blk b/maps/VermilionGym.ablk similarity index 100% rename from maps/VermilionGym.blk rename to maps/VermilionGym.ablk diff --git a/maps/VermilionPort.blk b/maps/VermilionPort.ablk similarity index 100% rename from maps/VermilionPort.blk rename to maps/VermilionPort.ablk diff --git a/maps/VictoryRoad.blk b/maps/VictoryRoad.ablk similarity index 100% rename from maps/VictoryRoad.blk rename to maps/VictoryRoad.ablk diff --git a/maps/VictoryRoadGate.blk b/maps/VictoryRoadGate.ablk similarity index 100% rename from maps/VictoryRoadGate.blk rename to maps/VictoryRoadGate.ablk diff --git a/maps/VioletCity.blk b/maps/VioletCity.ablk similarity index 100% rename from maps/VioletCity.blk rename to maps/VioletCity.ablk diff --git a/maps/VioletGym.blk b/maps/VioletGym.ablk similarity index 100% rename from maps/VioletGym.blk rename to maps/VioletGym.ablk diff --git a/maps/ViridianCity.blk b/maps/ViridianCity.ablk similarity index 100% rename from maps/ViridianCity.blk rename to maps/ViridianCity.ablk diff --git a/maps/ViridianGym.blk b/maps/ViridianGym.ablk similarity index 100% rename from maps/ViridianGym.blk rename to maps/ViridianGym.ablk diff --git a/maps/WhirlIslandB1F.blk b/maps/WhirlIslandB1F.ablk similarity index 100% rename from maps/WhirlIslandB1F.blk rename to maps/WhirlIslandB1F.ablk diff --git a/maps/WhirlIslandB2F.blk b/maps/WhirlIslandB2F.ablk similarity index 100% rename from maps/WhirlIslandB2F.blk rename to maps/WhirlIslandB2F.ablk diff --git a/maps/WhirlIslandCave.blk b/maps/WhirlIslandCave.ablk similarity index 100% rename from maps/WhirlIslandCave.blk rename to maps/WhirlIslandCave.ablk diff --git a/maps/WhirlIslandLugiaChamber.blk b/maps/WhirlIslandLugiaChamber.ablk similarity index 100% rename from maps/WhirlIslandLugiaChamber.blk rename to maps/WhirlIslandLugiaChamber.ablk diff --git a/maps/WhirlIslandNE.blk b/maps/WhirlIslandNE.ablk similarity index 100% rename from maps/WhirlIslandNE.blk rename to maps/WhirlIslandNE.ablk diff --git a/maps/WhirlIslandNW.blk b/maps/WhirlIslandNW.ablk similarity index 100% rename from maps/WhirlIslandNW.blk rename to maps/WhirlIslandNW.ablk diff --git a/maps/WhirlIslandSE.blk b/maps/WhirlIslandSE.ablk similarity index 100% rename from maps/WhirlIslandSE.blk rename to maps/WhirlIslandSE.ablk diff --git a/maps/WhirlIslandSW.blk b/maps/WhirlIslandSW.ablk similarity index 100% rename from maps/WhirlIslandSW.blk rename to maps/WhirlIslandSW.ablk diff --git a/maps/WillsRoom.blk b/maps/WillsRoom.ablk similarity index 100% rename from maps/WillsRoom.blk rename to maps/WillsRoom.ablk diff --git a/maps/WiseTriosRoom.blk b/maps/WiseTriosRoom.ablk similarity index 100% rename from maps/WiseTriosRoom.blk rename to maps/WiseTriosRoom.ablk diff --git a/maps/unused/BetaAzaleaTown.blk b/maps/unused/BetaAzaleaTown.ablk similarity index 100% rename from maps/unused/BetaAzaleaTown.blk rename to maps/unused/BetaAzaleaTown.ablk diff --git a/maps/unused/BetaBlackthornCity.blk b/maps/unused/BetaBlackthornCity.ablk similarity index 100% rename from maps/unused/BetaBlackthornCity.blk rename to maps/unused/BetaBlackthornCity.ablk diff --git a/maps/unused/BetaBlank.blk b/maps/unused/BetaBlank.ablk similarity index 100% rename from maps/unused/BetaBlank.blk rename to maps/unused/BetaBlank.ablk diff --git a/maps/unused/BetaCapsuleHouse.blk b/maps/unused/BetaCapsuleHouse.ablk similarity index 100% rename from maps/unused/BetaCapsuleHouse.blk rename to maps/unused/BetaCapsuleHouse.ablk diff --git a/maps/unused/BetaCaveTestMap.blk b/maps/unused/BetaCaveTestMap.ablk similarity index 100% rename from maps/unused/BetaCaveTestMap.blk rename to maps/unused/BetaCaveTestMap.ablk diff --git a/maps/unused/BetaCeladonMansion1F.blk b/maps/unused/BetaCeladonMansion1F.ablk similarity index 100% rename from maps/unused/BetaCeladonMansion1F.blk rename to maps/unused/BetaCeladonMansion1F.ablk diff --git a/maps/unused/BetaCeladonMansion2F.blk b/maps/unused/BetaCeladonMansion2F.ablk similarity index 100% rename from maps/unused/BetaCeladonMansion2F.blk rename to maps/unused/BetaCeladonMansion2F.ablk diff --git a/maps/unused/BetaCherrygroveCity.blk b/maps/unused/BetaCherrygroveCity.ablk similarity index 100% rename from maps/unused/BetaCherrygroveCity.blk rename to maps/unused/BetaCherrygroveCity.ablk diff --git a/maps/unused/BetaCianwoodCity.blk b/maps/unused/BetaCianwoodCity.ablk similarity index 100% rename from maps/unused/BetaCianwoodCity.blk rename to maps/unused/BetaCianwoodCity.ablk diff --git a/maps/unused/BetaCinnabarPokemonLabHallway.blk b/maps/unused/BetaCinnabarPokemonLabHallway.ablk similarity index 100% rename from maps/unused/BetaCinnabarPokemonLabHallway.blk rename to maps/unused/BetaCinnabarPokemonLabHallway.ablk diff --git a/maps/unused/BetaCinnabarPokemonLabRoom1.blk b/maps/unused/BetaCinnabarPokemonLabRoom1.ablk similarity index 100% rename from maps/unused/BetaCinnabarPokemonLabRoom1.blk rename to maps/unused/BetaCinnabarPokemonLabRoom1.ablk diff --git a/maps/unused/BetaCinnabarPokemonLabRoom2.blk b/maps/unused/BetaCinnabarPokemonLabRoom2.ablk similarity index 100% rename from maps/unused/BetaCinnabarPokemonLabRoom2.blk rename to maps/unused/BetaCinnabarPokemonLabRoom2.ablk diff --git a/maps/unused/BetaCinnabarPokemonLabRoom3.blk b/maps/unused/BetaCinnabarPokemonLabRoom3.ablk similarity index 100% rename from maps/unused/BetaCinnabarPokemonLabRoom3.blk rename to maps/unused/BetaCinnabarPokemonLabRoom3.ablk diff --git a/maps/unused/BetaEcruteakCity.blk b/maps/unused/BetaEcruteakCity.ablk similarity index 100% rename from maps/unused/BetaEcruteakCity.blk rename to maps/unused/BetaEcruteakCity.ablk diff --git a/maps/unused/BetaElevator.blk b/maps/unused/BetaElevator.ablk similarity index 100% rename from maps/unused/BetaElevator.blk rename to maps/unused/BetaElevator.ablk diff --git a/maps/unused/BetaFastShipInsideCutOut.blk b/maps/unused/BetaFastShipInsideCutOut.ablk similarity index 100% rename from maps/unused/BetaFastShipInsideCutOut.blk rename to maps/unused/BetaFastShipInsideCutOut.ablk diff --git a/maps/unused/BetaGoldenrodCity.blk b/maps/unused/BetaGoldenrodCity.ablk similarity index 100% rename from maps/unused/BetaGoldenrodCity.blk rename to maps/unused/BetaGoldenrodCity.ablk diff --git a/maps/unused/BetaHouse.blk b/maps/unused/BetaHouse.ablk similarity index 100% rename from maps/unused/BetaHouse.blk rename to maps/unused/BetaHouse.ablk diff --git a/maps/unused/BetaLakeOfRage.blk b/maps/unused/BetaLakeOfRage.ablk similarity index 100% rename from maps/unused/BetaLakeOfRage.blk rename to maps/unused/BetaLakeOfRage.ablk diff --git a/maps/unused/BetaMahoganyTown.blk b/maps/unused/BetaMahoganyTown.ablk similarity index 100% rename from maps/unused/BetaMahoganyTown.blk rename to maps/unused/BetaMahoganyTown.ablk diff --git a/maps/unused/BetaNewBarkTown.blk b/maps/unused/BetaNewBarkTown.ablk similarity index 100% rename from maps/unused/BetaNewBarkTown.blk rename to maps/unused/BetaNewBarkTown.ablk diff --git a/maps/unused/BetaOlivineCity.blk b/maps/unused/BetaOlivineCity.ablk similarity index 100% rename from maps/unused/BetaOlivineCity.blk rename to maps/unused/BetaOlivineCity.ablk diff --git a/maps/unused/BetaPewterMuseumOfScience1F.blk b/maps/unused/BetaPewterMuseumOfScience1F.ablk similarity index 100% rename from maps/unused/BetaPewterMuseumOfScience1F.blk rename to maps/unused/BetaPewterMuseumOfScience1F.ablk diff --git a/maps/unused/BetaPewterMuseumOfScience2F.blk b/maps/unused/BetaPewterMuseumOfScience2F.ablk similarity index 100% rename from maps/unused/BetaPewterMuseumOfScience2F.blk rename to maps/unused/BetaPewterMuseumOfScience2F.ablk diff --git a/maps/unused/BetaPlayersHouse2F.blk b/maps/unused/BetaPlayersHouse2F.ablk similarity index 100% rename from maps/unused/BetaPlayersHouse2F.blk rename to maps/unused/BetaPlayersHouse2F.ablk diff --git a/maps/unused/BetaPokecenter.blk b/maps/unused/BetaPokecenter.ablk similarity index 100% rename from maps/unused/BetaPokecenter.blk rename to maps/unused/BetaPokecenter.ablk diff --git a/maps/unused/BetaRocketHideout1F.blk b/maps/unused/BetaRocketHideout1F.ablk similarity index 100% rename from maps/unused/BetaRocketHideout1F.blk rename to maps/unused/BetaRocketHideout1F.ablk diff --git a/maps/unused/BetaRocketHideoutB1F.blk b/maps/unused/BetaRocketHideoutB1F.ablk similarity index 100% rename from maps/unused/BetaRocketHideoutB1F.blk rename to maps/unused/BetaRocketHideoutB1F.ablk diff --git a/maps/unused/BetaRocketHideoutB2F.blk b/maps/unused/BetaRocketHideoutB2F.ablk similarity index 100% rename from maps/unused/BetaRocketHideoutB2F.blk rename to maps/unused/BetaRocketHideoutB2F.ablk diff --git a/maps/unused/BetaRocketHideoutB3F.blk b/maps/unused/BetaRocketHideoutB3F.ablk similarity index 100% rename from maps/unused/BetaRocketHideoutB3F.blk rename to maps/unused/BetaRocketHideoutB3F.ablk diff --git a/maps/unused/BetaRoute23.blk b/maps/unused/BetaRoute23.ablk similarity index 100% rename from maps/unused/BetaRoute23.blk rename to maps/unused/BetaRoute23.ablk diff --git a/maps/unused/BetaRuinsOfAlphUnsolvedPuzzleRoom.blk b/maps/unused/BetaRuinsOfAlphUnsolvedPuzzleRoom.ablk similarity index 100% rename from maps/unused/BetaRuinsOfAlphUnsolvedPuzzleRoom.blk rename to maps/unused/BetaRuinsOfAlphUnsolvedPuzzleRoom.ablk diff --git a/maps/unused/BetaSilverCaveOutside.blk b/maps/unused/BetaSilverCaveOutside.ablk similarity index 100% rename from maps/unused/BetaSilverCaveOutside.blk rename to maps/unused/BetaSilverCaveOutside.ablk diff --git a/maps/unused/BetaSlowpokeWell1F.blk b/maps/unused/BetaSlowpokeWell1F.ablk similarity index 100% rename from maps/unused/BetaSlowpokeWell1F.blk rename to maps/unused/BetaSlowpokeWell1F.ablk diff --git a/maps/unused/BetaSproutTower1.blk b/maps/unused/BetaSproutTower1.ablk similarity index 100% rename from maps/unused/BetaSproutTower1.blk rename to maps/unused/BetaSproutTower1.ablk diff --git a/maps/unused/BetaSproutTower2.blk b/maps/unused/BetaSproutTower2.ablk similarity index 100% rename from maps/unused/BetaSproutTower2.blk rename to maps/unused/BetaSproutTower2.ablk diff --git a/maps/unused/BetaSproutTower3.blk b/maps/unused/BetaSproutTower3.ablk similarity index 100% rename from maps/unused/BetaSproutTower3.blk rename to maps/unused/BetaSproutTower3.ablk diff --git a/maps/unused/BetaSproutTower5.blk b/maps/unused/BetaSproutTower5.ablk similarity index 100% rename from maps/unused/BetaSproutTower5.blk rename to maps/unused/BetaSproutTower5.ablk diff --git a/maps/unused/BetaSproutTower6.blk b/maps/unused/BetaSproutTower6.ablk similarity index 100% rename from maps/unused/BetaSproutTower6.blk rename to maps/unused/BetaSproutTower6.ablk diff --git a/maps/unused/BetaSproutTower7.blk b/maps/unused/BetaSproutTower7.ablk similarity index 100% rename from maps/unused/BetaSproutTower7.blk rename to maps/unused/BetaSproutTower7.ablk diff --git a/maps/unused/BetaSproutTower8.blk b/maps/unused/BetaSproutTower8.ablk similarity index 100% rename from maps/unused/BetaSproutTower8.blk rename to maps/unused/BetaSproutTower8.ablk diff --git a/maps/unused/BetaSproutTower9.blk b/maps/unused/BetaSproutTower9.ablk similarity index 100% rename from maps/unused/BetaSproutTower9.blk rename to maps/unused/BetaSproutTower9.ablk diff --git a/maps/unused/BetaSproutTowerCutOut1.blk b/maps/unused/BetaSproutTowerCutOut1.ablk similarity index 100% rename from maps/unused/BetaSproutTowerCutOut1.blk rename to maps/unused/BetaSproutTowerCutOut1.ablk diff --git a/maps/unused/BetaSproutTowerCutOut2.blk b/maps/unused/BetaSproutTowerCutOut2.ablk similarity index 100% rename from maps/unused/BetaSproutTowerCutOut2.blk rename to maps/unused/BetaSproutTowerCutOut2.ablk diff --git a/maps/unused/BetaSproutTowerCutOut3.blk b/maps/unused/BetaSproutTowerCutOut3.ablk similarity index 100% rename from maps/unused/BetaSproutTowerCutOut3.blk rename to maps/unused/BetaSproutTowerCutOut3.ablk diff --git a/maps/unused/BetaUnionCave.blk b/maps/unused/BetaUnionCave.ablk similarity index 100% rename from maps/unused/BetaUnionCave.blk rename to maps/unused/BetaUnionCave.ablk diff --git a/maps/unused/BetaUnknownGym.blk b/maps/unused/BetaUnknownGym.ablk similarity index 100% rename from maps/unused/BetaUnknownGym.blk rename to maps/unused/BetaUnknownGym.ablk diff --git a/maps/unused/BetaVioletCity.blk b/maps/unused/BetaVioletCity.ablk similarity index 100% rename from maps/unused/BetaVioletCity.blk rename to maps/unused/BetaVioletCity.ablk diff --git a/palmap2attr.py b/palmap2attr.py new file mode 100644 index 0000000..b32e805 --- /dev/null +++ b/palmap2attr.py @@ -0,0 +1,59 @@ +import glob + +color_attrs = { + 'GRAY': 0, 'RED': 1, 'GREEN': 2, 'WATER': 3, + 'YELLOW': 4, 'BROWN': 5, 'ROOF': 6, 'TEXT': 7, + 'PRIORITY_GRAY': 0x80, 'PRIORITY_RED': 0x81, + 'PRIORITY_GREEN': 0x82, 'PRIORITY_WATER': 0x83, + 'PRIORITY_YELLOW': 0x84, 'PRIORITY_BROWN': 0x85, + 'PRIORITY_ROOF': 0x86, 'PRIORITY_TEXT': 0x87, +} + +palette_map_names = glob.glob('gfx/tilesets/*_palette_map.asm') +for palette_map_name in palette_map_names: + + if 'unused_museum_palette_map' in palette_map_name: + continue + + palette_map_name = palette_map_name.replace('\\', '/') + metatiles_name = (palette_map_name.replace('gfx/', 'data/') + .replace('_palette_map.asm', '_metatiles.bin')) + attributes_name = metatiles_name.replace('_metatiles', '_attributes') + + print('Convert', palette_map_name.split('/')[-1], '...') + + tile_colors = {} + + with open(palette_map_name, 'r', encoding='utf8') as palette_map: + reached_vram1 = False + tile_index = 0 + for line in palette_map: + if not line.startswith('\ttilepal'): + continue + line = line[len('\ttilepal '):] + colors = (c.strip() for c in line.split(',')) + bank = next(colors) + if not reached_vram1 and bank == '1': + reached_vram1 = True + tile_index = 0x80 + for color in colors: + tile_attr = color_attrs.get(color, 0) + tile_attr |= (tile_index >= 0x80) << 3 + tile_colors[tile_index] = tile_attr + tile_index += 1 + + print('... to', attributes_name.split('/')[-1], '...') + + metatile_bytes = b'' + with open(metatiles_name, 'rb') as metatiles: + with open(attributes_name, 'wb') as attributes: + for block_tiles in iter(lambda: metatiles.read(16), b''): + block_attrs = (tile_colors.get(t, (t >= 0x80) << 3) + for t in block_tiles) + attributes.write(bytes(block_attrs)) + metatile_bytes += block_tiles + + print('... and modify', metatiles_name.split('/')[-1], '!') + + with open(metatiles_name, 'wb') as metatiles: + metatiles.write(bytes(t & 0x7f for t in metatile_bytes)) \ No newline at end of file diff --git a/ram/wram.asm b/ram/wram.asm index b8bf6c1..686d1fc 100644 --- a/ram/wram.asm +++ b/ram/wram.asm @@ -321,14 +321,6 @@ wTilemapEnd:: ; This union spans 480 bytes. SECTION UNION "Miscellaneous", WRAM0 -; surrounding tiles -; This buffer determines the size for the rest of the union; -; it uses exactly 480 bytes. -wSurroundingTiles:: ds SURROUNDING_WIDTH * SURROUNDING_HEIGHT - - -SECTION UNION "Miscellaneous", WRAM0 - ; box save buffer ; SaveBoxAddress uses this buffer in three steps because it ; needs more space than the buffer can hold. @@ -2454,9 +2446,9 @@ wTilesetBlocksBank:: db wTilesetBlocksAddress:: dw wTilesetCollisionBank:: db wTilesetCollisionAddress:: dw +wTilesetAttributesBank:: db +wTilesetAttributesAddress:: dw wTilesetAnim:: dw ; bank 3f - ds 2 ; unused -wTilesetPalettes:: dw ; bank 3f wTilesetEnd:: assert wTilesetEnd - wTileset == TILESET_LENGTH @@ -2709,7 +2701,7 @@ wCurBaseDataEnd:: wCurDamage:: dw - ds 2 +wTilesetDataAddress:: dw wMornEncounterRate:: db wDayEncounterRate:: db @@ -3523,6 +3515,12 @@ SECTION "News Script RAM", WRAMX w4_d000:: ds $1000 +SECTION "Surrounding Data", WRAMX + +wSurroundingTiles:: ds SURROUNDING_WIDTH * SURROUNDING_HEIGHT +wSurroundingAttributes:: ds SURROUNDING_WIDTH * SURROUNDING_HEIGHT + + SECTION "GBC Video", WRAMX, ALIGN[8] ; eight 4-color palettes each