From 94bbfe2f0c97f653db21db3bb68fcc3263340e4e Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Tue, 16 Jan 2018 19:56:21 -0500 Subject: [PATCH] Move map-related "metadata" files into data/maps/ --- Makefile | 2 +- constants/map_constants.asm | 4 +- constants/map_data_constants.asm | 4 +- maps/blockdata.asm => data/maps/blocks.asm | 96 +++++++++---------- {maps => data/maps}/map_headers.asm | 0 .../maps/map_headers_2.asm | 0 data/maps/maps.asm | 12 +++ maps.asm => data/maps/scripts.asm | 12 --- maps/{ => unused}/BetaAzaleaTown.blk | 0 maps/{ => unused}/BetaBlackthornCity.blk | 0 maps/{ => unused}/BetaBlank.blk | 0 maps/{ => unused}/BetaCave.blk | 0 maps/{ => unused}/BetaCave2.blk | 0 maps/{ => unused}/BetaCaveTestMap.blk | 0 maps/{ => unused}/BetaCeladonMansion.blk | 0 maps/{ => unused}/BetaCherrygroveCity.blk | 0 maps/{ => unused}/BetaCianwoodCity.blk | 0 .../BetaCinnabarPokemonLabHallway.blk | 0 .../BetaCinnabarPokemonLabRoom1.blk | 0 .../BetaCinnabarPokemonLabRoom2.blk | 0 .../BetaCinnabarPokemonLabRoom3.blk | 0 maps/{ => unused}/BetaEcruteakCity.blk | 0 maps/{ => unused}/BetaElevator.blk | 0 maps/{ => unused}/BetaEmptyHouse.blk | 0 .../{ => unused}/BetaFastShipInsideCutOut.blk | 0 maps/{ => unused}/BetaGoldenrodCity.blk | 0 maps/{ => unused}/BetaHerosHouse.blk | 0 maps/{ => unused}/BetaHouse.blk | 0 maps/{ => unused}/BetaHouse2.blk | 0 maps/{ => unused}/BetaIlexForest.blk | 0 maps/{ => unused}/BetaLakeOfRage.blk | 0 maps/{ => unused}/BetaMahoganyTown.blk | 0 maps/{ => unused}/BetaNewBarkTown.blk | 0 maps/{ => unused}/BetaOlivineCity.blk | 0 .../BetaPewterMuseumOfScience1F.blk | 0 .../BetaPewterMuseumOfScience2F.blk | 0 maps/{ => unused}/BetaPokecenterMainHouse.blk | 0 .../BetaPokecenterTradeStation.blk | 0 maps/{ => unused}/BetaRocketHideout1.blk | 0 maps/{ => unused}/BetaRocketHideout2.blk | 0 maps/{ => unused}/BetaRocketHideout3.blk | 0 maps/{ => unused}/BetaRoute23EarlyVersion.blk | 0 .../BetaRuinsOfAlphUnsolvedPuzzleRoom.blk | 0 maps/{ => unused}/BetaSproutTower1.blk | 0 maps/{ => unused}/BetaSproutTower2.blk | 0 maps/{ => unused}/BetaSproutTower3.blk | 0 maps/{ => unused}/BetaSproutTower5.blk | 0 maps/{ => unused}/BetaSproutTower6.blk | 0 maps/{ => unused}/BetaSproutTower7.blk | 0 maps/{ => unused}/BetaSproutTower8.blk | 0 maps/{ => unused}/BetaSproutTower9.blk | 0 maps/{ => unused}/BetaSproutTowerCutOut1.blk | 0 maps/{ => unused}/BetaSproutTowerCutOut2.blk | 0 maps/{ => unused}/BetaSproutTowerCutOut3.blk | 0 maps/{ => unused}/BetaUnknown.blk | 0 maps/{ => unused}/BetaVioletCity.blk | 0 56 files changed, 65 insertions(+), 65 deletions(-) rename maps/blockdata.asm => data/maps/blocks.asm (90%) rename {maps => data/maps}/map_headers.asm (100%) rename maps/second_map_headers.asm => data/maps/map_headers_2.asm (100%) create mode 100644 data/maps/maps.asm rename maps.asm => data/maps/scripts.asm (98%) rename maps/{ => unused}/BetaAzaleaTown.blk (100%) rename maps/{ => unused}/BetaBlackthornCity.blk (100%) rename maps/{ => unused}/BetaBlank.blk (100%) rename maps/{ => unused}/BetaCave.blk (100%) rename maps/{ => unused}/BetaCave2.blk (100%) rename maps/{ => unused}/BetaCaveTestMap.blk (100%) rename maps/{ => unused}/BetaCeladonMansion.blk (100%) rename maps/{ => unused}/BetaCherrygroveCity.blk (100%) rename maps/{ => unused}/BetaCianwoodCity.blk (100%) rename maps/{ => unused}/BetaCinnabarPokemonLabHallway.blk (100%) rename maps/{ => unused}/BetaCinnabarPokemonLabRoom1.blk (100%) rename maps/{ => unused}/BetaCinnabarPokemonLabRoom2.blk (100%) rename maps/{ => unused}/BetaCinnabarPokemonLabRoom3.blk (100%) rename maps/{ => unused}/BetaEcruteakCity.blk (100%) rename maps/{ => unused}/BetaElevator.blk (100%) rename maps/{ => unused}/BetaEmptyHouse.blk (100%) rename maps/{ => unused}/BetaFastShipInsideCutOut.blk (100%) rename maps/{ => unused}/BetaGoldenrodCity.blk (100%) rename maps/{ => unused}/BetaHerosHouse.blk (100%) rename maps/{ => unused}/BetaHouse.blk (100%) rename maps/{ => unused}/BetaHouse2.blk (100%) rename maps/{ => unused}/BetaIlexForest.blk (100%) rename maps/{ => unused}/BetaLakeOfRage.blk (100%) rename maps/{ => unused}/BetaMahoganyTown.blk (100%) rename maps/{ => unused}/BetaNewBarkTown.blk (100%) rename maps/{ => unused}/BetaOlivineCity.blk (100%) rename maps/{ => unused}/BetaPewterMuseumOfScience1F.blk (100%) rename maps/{ => unused}/BetaPewterMuseumOfScience2F.blk (100%) rename maps/{ => unused}/BetaPokecenterMainHouse.blk (100%) rename maps/{ => unused}/BetaPokecenterTradeStation.blk (100%) rename maps/{ => unused}/BetaRocketHideout1.blk (100%) rename maps/{ => unused}/BetaRocketHideout2.blk (100%) rename maps/{ => unused}/BetaRocketHideout3.blk (100%) rename maps/{ => unused}/BetaRoute23EarlyVersion.blk (100%) rename maps/{ => unused}/BetaRuinsOfAlphUnsolvedPuzzleRoom.blk (100%) rename maps/{ => unused}/BetaSproutTower1.blk (100%) rename maps/{ => unused}/BetaSproutTower2.blk (100%) rename maps/{ => unused}/BetaSproutTower3.blk (100%) rename maps/{ => unused}/BetaSproutTower5.blk (100%) rename maps/{ => unused}/BetaSproutTower6.blk (100%) rename maps/{ => unused}/BetaSproutTower7.blk (100%) rename maps/{ => unused}/BetaSproutTower8.blk (100%) rename maps/{ => unused}/BetaSproutTower9.blk (100%) rename maps/{ => unused}/BetaSproutTowerCutOut1.blk (100%) rename maps/{ => unused}/BetaSproutTowerCutOut2.blk (100%) rename maps/{ => unused}/BetaSproutTowerCutOut3.blk (100%) rename maps/{ => unused}/BetaUnknown.blk (100%) rename maps/{ => unused}/BetaVioletCity.blk (100%) diff --git a/Makefile b/Makefile index e22a1f3ff..59035a88a 100644 --- a/Makefile +++ b/Makefile @@ -20,9 +20,9 @@ crystal_obj := \ audio.o \ home.o \ main.o \ -maps.o \ wram.o \ data/common_text/common_text.o \ +data/maps/maps.o \ data/pokemon/dex_entries.o \ data/pokemon/egg_moves.o \ data/pokemon/evos_attacks.o \ diff --git a/constants/map_constants.asm b/constants/map_constants.asm index d2319dcec..87096ccef 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -15,11 +15,11 @@ ENDM ; map group ids ; `newgroup` indexes are for: -; - MapGroupPointers (see maps/map_headers.asm) +; - MapGroupPointers (see data/maps/map_headers.asm) ; - MapGroupRoofs (see data/maps/roofs.asm) ; - OutdoorSprites (see data/maps/outdoor_sprites.asm) ; - RoofPals (see gfx/tilesets/roofs.pal) -; `mapgroup` indexes are for the sub-tables of MapGroupPointers (see maps/map_headers.asm) +; `mapgroup` indexes are for the sub-tables of MapGroupPointers (see data/maps/map_headers.asm) const_def newgroup ; 1 diff --git a/constants/map_data_constants.asm b/constants/map_data_constants.asm index 223220db9..179659865 100644 --- a/constants/map_data_constants.asm +++ b/constants/map_data_constants.asm @@ -3,7 +3,7 @@ MAP_N_A EQU -1 GROUP_NONE EQU 0 MAP_NONE EQU 0 -; map header struct members (see maps/map_headers.asm) +; map header struct members (see data/maps/map_headers.asm) const_def const MAPHEADER_MAPHEADER2_BANK ; 0 const MAPHEADER_TILESET ; 1 @@ -52,7 +52,7 @@ const_value set 1 const FISHGROUP_QWILFISH_NO_SWARM -; connection directions +; connection directions (see data/maps/map_headers_2.asm) const_def const EAST_F const WEST_F diff --git a/maps/blockdata.asm b/data/maps/blocks.asm similarity index 90% rename from maps/blockdata.asm rename to data/maps/blocks.asm index 4f0fe925e..c232d00cf 100644 --- a/maps/blockdata.asm +++ b/data/maps/blocks.asm @@ -16,7 +16,7 @@ Route28_BlockData: INCBIN "maps/Route28.blk" BetaHerosHouse_BlockData: - INCBIN "maps/BetaHerosHouse.blk" + INCBIN "maps/unused/BetaHerosHouse.blk" CeladonCity_BlockData: INCBIN "maps/CeladonCity.blk" @@ -31,25 +31,25 @@ ElmsHouse_BlockData: INCBIN "maps/ElmsHouse.blk" BetaSproutTower1_BlockData: - INCBIN "maps/BetaSproutTower1.blk" + INCBIN "maps/unused/BetaSproutTower1.blk" Route11_BlockData: INCBIN "maps/Route11.blk" BetaSproutTower5_BlockData: - INCBIN "maps/BetaSproutTower5.blk" + INCBIN "maps/unused/BetaSproutTower5.blk" Route15_BlockData: INCBIN "maps/Route15.blk" BetaSproutTower9_BlockData: - INCBIN "maps/BetaSproutTower9.blk" + INCBIN "maps/unused/BetaSproutTower9.blk" Route19_BlockData: INCBIN "maps/Route19.blk" BetaBlackthornCity_BlockData: - INCBIN "maps/BetaBlackthornCity.blk" + INCBIN "maps/unused/BetaBlackthornCity.blk" Route10South_BlockData: INCBIN "maps/Route10South.blk" @@ -95,7 +95,7 @@ Route24_BlockData: INCBIN "maps/Route24.blk" BetaVioletCity_BlockData: - INCBIN "maps/BetaVioletCity.blk" + INCBIN "maps/unused/BetaVioletCity.blk" Route3_BlockData: INCBIN "maps/Route3.blk" @@ -104,25 +104,25 @@ PewterCity_BlockData: INCBIN "maps/PewterCity.blk" BetaIlexForest_BlockData: - INCBIN "maps/BetaIlexForest.blk" + INCBIN "maps/unused/BetaIlexForest.blk" BetaSproutTower2_BlockData: - INCBIN "maps/BetaSproutTower2.blk" + INCBIN "maps/unused/BetaSproutTower2.blk" Route12_BlockData: INCBIN "maps/Route12.blk" BetaGoldenrodCity_BlockData: - INCBIN "maps/BetaGoldenrodCity.blk" + INCBIN "maps/unused/BetaGoldenrodCity.blk" Route20_BlockData: INCBIN "maps/Route20.blk" BetaSproutTower6_BlockData: - INCBIN "maps/BetaSproutTower6.blk" + INCBIN "maps/unused/BetaSproutTower6.blk" BetaPokecenterMainHouse_BlockData: - INCBIN "maps/BetaPokecenterMainHouse.blk" + INCBIN "maps/unused/BetaPokecenterMainHouse.blk" Route30_BlockData: INCBIN "maps/Route30.blk" @@ -146,7 +146,7 @@ Route38_BlockData: INCBIN "maps/Route38.blk" BetaCianwoodCity_BlockData: - INCBIN "maps/BetaCianwoodCity.blk" + INCBIN "maps/unused/BetaCianwoodCity.blk" OlivineTimsHouse_BlockData: OlivineHouseBeta_BlockData: @@ -215,10 +215,10 @@ Route5SaffronGate_BlockData: INCBIN "maps/NorthSouthGate.blk" BetaEcruteakCity_BlockData: - INCBIN "maps/BetaEcruteakCity.blk" + INCBIN "maps/unused/BetaEcruteakCity.blk" BetaCherrygroveCity_BlockData: - INCBIN "maps/BetaCherrygroveCity.blk" + INCBIN "maps/unused/BetaCherrygroveCity.blk" CinnabarIsland_BlockData: INCBIN "maps/CinnabarIsland.blk" @@ -230,7 +230,7 @@ Route8_BlockData: INCBIN "maps/Route8.blk" BetaSproutTower3_BlockData: - INCBIN "maps/BetaSproutTower3.blk" + INCBIN "maps/unused/BetaSproutTower3.blk" ViridianCity_BlockData: INCBIN "maps/ViridianCity.blk" @@ -242,13 +242,13 @@ Route21_BlockData: INCBIN "maps/Route21.blk" BetaSproutTower7_BlockData: - INCBIN "maps/BetaSproutTower7.blk" + INCBIN "maps/unused/BetaSproutTower7.blk" Route17_BlockData: INCBIN "maps/Route17.blk" BetaMahoganyTown_BlockData: - INCBIN "maps/BetaMahoganyTown.blk" + INCBIN "maps/unused/BetaMahoganyTown.blk" Route31_BlockData: INCBIN "maps/Route31.blk" @@ -281,16 +281,16 @@ Route31VioletGate_BlockData: INCBIN "maps/EastWestGate.blk" BetaAzaleaTown_BlockData: - INCBIN "maps/BetaAzaleaTown.blk" + INCBIN "maps/unused/BetaAzaleaTown.blk" VermilionCity_BlockData: INCBIN "maps/VermilionCity.blk" BetaOlivineCity_BlockData: - INCBIN "maps/BetaOlivineCity.blk" + INCBIN "maps/unused/BetaOlivineCity.blk" BetaNewBarkTown_BlockData: - INCBIN "maps/BetaNewBarkTown.blk" + INCBIN "maps/unused/BetaNewBarkTown.blk" ElmsLab_BlockData: INCBIN "maps/ElmsLab.blk" @@ -317,7 +317,7 @@ Route14_BlockData: INCBIN "maps/Route14.blk" BetaSproutTower8_BlockData: - INCBIN "maps/BetaSproutTower8.blk" + INCBIN "maps/unused/BetaSproutTower8.blk" OlivineMart_BlockData: EcruteakMart_BlockData: @@ -338,7 +338,7 @@ Route10North_BlockData: INCBIN "maps/Route10North.blk" BetaLakeOfRage_BlockData: - INCBIN "maps/BetaLakeOfRage.blk" + INCBIN "maps/unused/BetaLakeOfRage.blk" OlivinePokecenter1F_BlockData: MahoganyPokecenter1F_BlockData: @@ -364,25 +364,25 @@ CherrygrovePokecenter1F_BlockData: INCBIN "maps/Pokecenter1F.blk" BetaPewterMuseumOfScience1F_BlockData: - INCBIN "maps/BetaPewterMuseumOfScience1F.blk" + INCBIN "maps/unused/BetaPewterMuseumOfScience1F.blk" BetaPewterMuseumOfScience2F_BlockData: - INCBIN "maps/BetaPewterMuseumOfScience2F.blk" + INCBIN "maps/unused/BetaPewterMuseumOfScience2F.blk" EarlsPokemonAcademy_BlockData: INCBIN "maps/EarlsPokemonAcademy.blk" BetaCinnabarPokemonLabHallway_BlockData: - INCBIN "maps/BetaCinnabarPokemonLabHallway.blk" + INCBIN "maps/unused/BetaCinnabarPokemonLabHallway.blk" BetaCinnabarPokemonLabRoom1_BlockData: - INCBIN "maps/BetaCinnabarPokemonLabRoom1.blk" + INCBIN "maps/unused/BetaCinnabarPokemonLabRoom1.blk" BetaCinnabarPokemonLabRoom2_BlockData: - INCBIN "maps/BetaCinnabarPokemonLabRoom2.blk" + INCBIN "maps/unused/BetaCinnabarPokemonLabRoom2.blk" BetaCinnabarPokemonLabRoom3_BlockData: - INCBIN "maps/BetaCinnabarPokemonLabRoom3.blk" + INCBIN "maps/unused/BetaCinnabarPokemonLabRoom3.blk" GoldenrodDeptStore1F_BlockData: CeladonDeptStore1F_BlockData: @@ -425,7 +425,7 @@ CeladonMansionRoof_BlockData: INCBIN "maps/CeladonMansionRoof.blk" BetaHouse_BlockData: - INCBIN "maps/BetaHouse.blk" + INCBIN "maps/unused/BetaHouse.blk" CeladonGameCorner_BlockData: INCBIN "maps/CeladonGameCorner.blk" @@ -447,7 +447,7 @@ VioletKylesHouse_BlockData: INCBIN "maps/House2.blk" BetaCave_BlockData: - INCBIN "maps/BetaCave.blk" + INCBIN "maps/unused/BetaCave.blk" UnionCaveB1F_BlockData: INCBIN "maps/UnionCaveB1F.blk" @@ -467,7 +467,7 @@ Route6UndergroundPathEntrance_BlockData: INCBIN "maps/UndergroundPathEntrance.blk" BetaPokecenterTradeStation_BlockData: - INCBIN "maps/BetaPokecenterTradeStation.blk" + INCBIN "maps/unused/BetaPokecenterTradeStation.blk" KurtsHouse_BlockData: INCBIN "maps/KurtsHouse.blk" @@ -479,7 +479,7 @@ RuinsOfAlphOutside_BlockData: INCBIN "maps/RuinsOfAlphOutside.blk" BetaRuinsOfAlphUnsolvedPuzzleRoom_BlockData: - INCBIN "maps/BetaRuinsOfAlphUnsolvedPuzzleRoom.blk" + INCBIN "maps/unused/BetaRuinsOfAlphUnsolvedPuzzleRoom.blk" RuinsOfAlphInnerChamber_BlockData: INCBIN "maps/RuinsOfAlphInnerChamber.blk" @@ -494,19 +494,19 @@ SproutTower1F_BlockData: INCBIN "maps/SproutTower1F.blk" BetaSproutTowerCutOut1_BlockData: - INCBIN "maps/BetaSproutTowerCutOut1.blk" + INCBIN "maps/unused/BetaSproutTowerCutOut1.blk" SproutTower2F_BlockData: INCBIN "maps/SproutTower2F.blk" BetaSproutTowerCutOut2_BlockData: - INCBIN "maps/BetaSproutTowerCutOut2.blk" + INCBIN "maps/unused/BetaSproutTowerCutOut2.blk" SproutTower3F_BlockData: INCBIN "maps/SproutTower3F.blk" BetaSproutTowerCutOut3_BlockData: - INCBIN "maps/BetaSproutTowerCutOut3.blk" + INCBIN "maps/unused/BetaSproutTowerCutOut3.blk" RadioTower1F_BlockData: INCBIN "maps/RadioTower1F.blk" @@ -584,7 +584,7 @@ GoldenrodUndergroundWarehouse_BlockData: INCBIN "maps/GoldenrodUndergroundWarehouse.blk" BetaElevator_BlockData: - INCBIN "maps/BetaElevator.blk" + INCBIN "maps/unused/BetaElevator.blk" TinTower1F_BlockData: INCBIN "maps/TinTower1F.blk" @@ -623,7 +623,7 @@ BurnedTowerB1F_BlockData: INCBIN "maps/BurnedTowerB1F.blk" BetaCaveTestMap_BlockData: - INCBIN "maps/BetaCaveTestMap.blk" + INCBIN "maps/unused/BetaCaveTestMap.blk" MountMortar1FOutside_BlockData: INCBIN "maps/MountMortar1FOutside.blk" @@ -686,16 +686,16 @@ SilverCaveRoom3_BlockData: INCBIN "maps/SilverCaveRoom3.blk" BetaRocketHideout1_BlockData: - INCBIN "maps/BetaRocketHideout1.blk" + INCBIN "maps/unused/BetaRocketHideout1.blk" BetaRocketHideout2_BlockData: - INCBIN "maps/BetaRocketHideout2.blk" + INCBIN "maps/unused/BetaRocketHideout2.blk" BetaEmptyHouse_BlockData: - INCBIN "maps/BetaEmptyHouse.blk" + INCBIN "maps/unused/BetaEmptyHouse.blk" BetaRocketHideout3_BlockData: - INCBIN "maps/BetaRocketHideout3.blk" + INCBIN "maps/unused/BetaRocketHideout3.blk" MahoganyMart1F_BlockData: MountMoonGiftShop_BlockData: @@ -711,7 +711,7 @@ TeamRocketBaseB3F_BlockData: INCBIN "maps/TeamRocketBaseB3F.blk" BetaRoute23EarlyVersion_BlockData: - INCBIN "maps/BetaRoute23EarlyVersion.blk" + INCBIN "maps/unused/BetaRoute23EarlyVersion.blk" IndigoPlateauPokecenter1F_BlockData: INCBIN "maps/IndigoPlateauPokecenter1F.blk" @@ -747,7 +747,7 @@ OlivineGym_BlockData: INCBIN "maps/OlivineGym.blk" BetaUnknown_BlockData: - INCBIN "maps/BetaUnknown.blk" + INCBIN "maps/unused/BetaUnknown.blk" CianwoodGym_BlockData: INCBIN "maps/CianwoodGym.blk" @@ -780,7 +780,7 @@ OlivineLighthouse6F_BlockData: SECTION "Map Blockdata 3", ROMX BetaCave2_BlockData: - INCBIN "maps/BetaCave2.blk" + INCBIN "maps/unused/BetaCave2.blk" SlowpokeWellB1F_BlockData: INCBIN "maps/SlowpokeWellB1F.blk" @@ -825,7 +825,7 @@ FastShipB1F_BlockData: INCBIN "maps/FastShipB1F.blk" BetaFastShipInsideCutOut_BlockData: - INCBIN "maps/BetaFastShipInsideCutOut.blk" + INCBIN "maps/unused/BetaFastShipInsideCutOut.blk" FastShipCabins_NNW_NNE_NE_BlockData: INCBIN "maps/FastShipCabins_NNW_NNE_NE.blk" @@ -914,13 +914,13 @@ CeladonGym_BlockData: INCBIN "maps/CeladonGym.blk" BetaHouse2_BlockData: - INCBIN "maps/BetaHouse2.blk" + INCBIN "maps/unused/BetaHouse2.blk" CeladonCafe_BlockData: INCBIN "maps/CeladonCafe.blk" BetaCeladonMansion_BlockData: - INCBIN "maps/BetaCeladonMansion.blk" + INCBIN "maps/unused/BetaCeladonMansion.blk" RockTunnel1F_BlockData: INCBIN "maps/RockTunnel1F.blk" @@ -1041,7 +1041,7 @@ BattleTowerOutside_BlockData: INCBIN "maps/BattleTowerOutside.blk" BetaBlank_BlockData: - INCBIN "maps/BetaBlank.blk" + INCBIN "maps/unused/BetaBlank.blk" GoldenrodDeptStoreRoof_BlockData: INCBIN "maps/GoldenrodDeptStoreRoof.blk" diff --git a/maps/map_headers.asm b/data/maps/map_headers.asm similarity index 100% rename from maps/map_headers.asm rename to data/maps/map_headers.asm diff --git a/maps/second_map_headers.asm b/data/maps/map_headers_2.asm similarity index 100% rename from maps/second_map_headers.asm rename to data/maps/map_headers_2.asm diff --git a/data/maps/maps.asm b/data/maps/maps.asm new file mode 100644 index 000000000..b2d6e906a --- /dev/null +++ b/data/maps/maps.asm @@ -0,0 +1,12 @@ +INCLUDE "constants.asm" + + +SECTION "Map Headers", ROMX + +INCLUDE "data/maps/map_headers.asm" +INCLUDE "data/maps/map_headers_2.asm" + + +INCLUDE "data/maps/blocks.asm" + +INCLUDE "data/maps/scripts.asm" diff --git a/maps.asm b/data/maps/scripts.asm similarity index 98% rename from maps.asm rename to data/maps/scripts.asm index 7056957b8..51725fb4f 100644 --- a/maps.asm +++ b/data/maps/scripts.asm @@ -1,15 +1,3 @@ -INCLUDE "constants.asm" - - -SECTION "Map Headers", ROMX - -INCLUDE "maps/map_headers.asm" -INCLUDE "maps/second_map_headers.asm" - - -INCLUDE "maps/blockdata.asm" - - SECTION "Map Scripts 1", ROMX INCLUDE "maps/GoldenrodGym.asm" diff --git a/maps/BetaAzaleaTown.blk b/maps/unused/BetaAzaleaTown.blk similarity index 100% rename from maps/BetaAzaleaTown.blk rename to maps/unused/BetaAzaleaTown.blk diff --git a/maps/BetaBlackthornCity.blk b/maps/unused/BetaBlackthornCity.blk similarity index 100% rename from maps/BetaBlackthornCity.blk rename to maps/unused/BetaBlackthornCity.blk diff --git a/maps/BetaBlank.blk b/maps/unused/BetaBlank.blk similarity index 100% rename from maps/BetaBlank.blk rename to maps/unused/BetaBlank.blk diff --git a/maps/BetaCave.blk b/maps/unused/BetaCave.blk similarity index 100% rename from maps/BetaCave.blk rename to maps/unused/BetaCave.blk diff --git a/maps/BetaCave2.blk b/maps/unused/BetaCave2.blk similarity index 100% rename from maps/BetaCave2.blk rename to maps/unused/BetaCave2.blk diff --git a/maps/BetaCaveTestMap.blk b/maps/unused/BetaCaveTestMap.blk similarity index 100% rename from maps/BetaCaveTestMap.blk rename to maps/unused/BetaCaveTestMap.blk diff --git a/maps/BetaCeladonMansion.blk b/maps/unused/BetaCeladonMansion.blk similarity index 100% rename from maps/BetaCeladonMansion.blk rename to maps/unused/BetaCeladonMansion.blk diff --git a/maps/BetaCherrygroveCity.blk b/maps/unused/BetaCherrygroveCity.blk similarity index 100% rename from maps/BetaCherrygroveCity.blk rename to maps/unused/BetaCherrygroveCity.blk diff --git a/maps/BetaCianwoodCity.blk b/maps/unused/BetaCianwoodCity.blk similarity index 100% rename from maps/BetaCianwoodCity.blk rename to maps/unused/BetaCianwoodCity.blk diff --git a/maps/BetaCinnabarPokemonLabHallway.blk b/maps/unused/BetaCinnabarPokemonLabHallway.blk similarity index 100% rename from maps/BetaCinnabarPokemonLabHallway.blk rename to maps/unused/BetaCinnabarPokemonLabHallway.blk diff --git a/maps/BetaCinnabarPokemonLabRoom1.blk b/maps/unused/BetaCinnabarPokemonLabRoom1.blk similarity index 100% rename from maps/BetaCinnabarPokemonLabRoom1.blk rename to maps/unused/BetaCinnabarPokemonLabRoom1.blk diff --git a/maps/BetaCinnabarPokemonLabRoom2.blk b/maps/unused/BetaCinnabarPokemonLabRoom2.blk similarity index 100% rename from maps/BetaCinnabarPokemonLabRoom2.blk rename to maps/unused/BetaCinnabarPokemonLabRoom2.blk diff --git a/maps/BetaCinnabarPokemonLabRoom3.blk b/maps/unused/BetaCinnabarPokemonLabRoom3.blk similarity index 100% rename from maps/BetaCinnabarPokemonLabRoom3.blk rename to maps/unused/BetaCinnabarPokemonLabRoom3.blk diff --git a/maps/BetaEcruteakCity.blk b/maps/unused/BetaEcruteakCity.blk similarity index 100% rename from maps/BetaEcruteakCity.blk rename to maps/unused/BetaEcruteakCity.blk diff --git a/maps/BetaElevator.blk b/maps/unused/BetaElevator.blk similarity index 100% rename from maps/BetaElevator.blk rename to maps/unused/BetaElevator.blk diff --git a/maps/BetaEmptyHouse.blk b/maps/unused/BetaEmptyHouse.blk similarity index 100% rename from maps/BetaEmptyHouse.blk rename to maps/unused/BetaEmptyHouse.blk diff --git a/maps/BetaFastShipInsideCutOut.blk b/maps/unused/BetaFastShipInsideCutOut.blk similarity index 100% rename from maps/BetaFastShipInsideCutOut.blk rename to maps/unused/BetaFastShipInsideCutOut.blk diff --git a/maps/BetaGoldenrodCity.blk b/maps/unused/BetaGoldenrodCity.blk similarity index 100% rename from maps/BetaGoldenrodCity.blk rename to maps/unused/BetaGoldenrodCity.blk diff --git a/maps/BetaHerosHouse.blk b/maps/unused/BetaHerosHouse.blk similarity index 100% rename from maps/BetaHerosHouse.blk rename to maps/unused/BetaHerosHouse.blk diff --git a/maps/BetaHouse.blk b/maps/unused/BetaHouse.blk similarity index 100% rename from maps/BetaHouse.blk rename to maps/unused/BetaHouse.blk diff --git a/maps/BetaHouse2.blk b/maps/unused/BetaHouse2.blk similarity index 100% rename from maps/BetaHouse2.blk rename to maps/unused/BetaHouse2.blk diff --git a/maps/BetaIlexForest.blk b/maps/unused/BetaIlexForest.blk similarity index 100% rename from maps/BetaIlexForest.blk rename to maps/unused/BetaIlexForest.blk diff --git a/maps/BetaLakeOfRage.blk b/maps/unused/BetaLakeOfRage.blk similarity index 100% rename from maps/BetaLakeOfRage.blk rename to maps/unused/BetaLakeOfRage.blk diff --git a/maps/BetaMahoganyTown.blk b/maps/unused/BetaMahoganyTown.blk similarity index 100% rename from maps/BetaMahoganyTown.blk rename to maps/unused/BetaMahoganyTown.blk diff --git a/maps/BetaNewBarkTown.blk b/maps/unused/BetaNewBarkTown.blk similarity index 100% rename from maps/BetaNewBarkTown.blk rename to maps/unused/BetaNewBarkTown.blk diff --git a/maps/BetaOlivineCity.blk b/maps/unused/BetaOlivineCity.blk similarity index 100% rename from maps/BetaOlivineCity.blk rename to maps/unused/BetaOlivineCity.blk diff --git a/maps/BetaPewterMuseumOfScience1F.blk b/maps/unused/BetaPewterMuseumOfScience1F.blk similarity index 100% rename from maps/BetaPewterMuseumOfScience1F.blk rename to maps/unused/BetaPewterMuseumOfScience1F.blk diff --git a/maps/BetaPewterMuseumOfScience2F.blk b/maps/unused/BetaPewterMuseumOfScience2F.blk similarity index 100% rename from maps/BetaPewterMuseumOfScience2F.blk rename to maps/unused/BetaPewterMuseumOfScience2F.blk diff --git a/maps/BetaPokecenterMainHouse.blk b/maps/unused/BetaPokecenterMainHouse.blk similarity index 100% rename from maps/BetaPokecenterMainHouse.blk rename to maps/unused/BetaPokecenterMainHouse.blk diff --git a/maps/BetaPokecenterTradeStation.blk b/maps/unused/BetaPokecenterTradeStation.blk similarity index 100% rename from maps/BetaPokecenterTradeStation.blk rename to maps/unused/BetaPokecenterTradeStation.blk diff --git a/maps/BetaRocketHideout1.blk b/maps/unused/BetaRocketHideout1.blk similarity index 100% rename from maps/BetaRocketHideout1.blk rename to maps/unused/BetaRocketHideout1.blk diff --git a/maps/BetaRocketHideout2.blk b/maps/unused/BetaRocketHideout2.blk similarity index 100% rename from maps/BetaRocketHideout2.blk rename to maps/unused/BetaRocketHideout2.blk diff --git a/maps/BetaRocketHideout3.blk b/maps/unused/BetaRocketHideout3.blk similarity index 100% rename from maps/BetaRocketHideout3.blk rename to maps/unused/BetaRocketHideout3.blk diff --git a/maps/BetaRoute23EarlyVersion.blk b/maps/unused/BetaRoute23EarlyVersion.blk similarity index 100% rename from maps/BetaRoute23EarlyVersion.blk rename to maps/unused/BetaRoute23EarlyVersion.blk diff --git a/maps/BetaRuinsOfAlphUnsolvedPuzzleRoom.blk b/maps/unused/BetaRuinsOfAlphUnsolvedPuzzleRoom.blk similarity index 100% rename from maps/BetaRuinsOfAlphUnsolvedPuzzleRoom.blk rename to maps/unused/BetaRuinsOfAlphUnsolvedPuzzleRoom.blk diff --git a/maps/BetaSproutTower1.blk b/maps/unused/BetaSproutTower1.blk similarity index 100% rename from maps/BetaSproutTower1.blk rename to maps/unused/BetaSproutTower1.blk diff --git a/maps/BetaSproutTower2.blk b/maps/unused/BetaSproutTower2.blk similarity index 100% rename from maps/BetaSproutTower2.blk rename to maps/unused/BetaSproutTower2.blk diff --git a/maps/BetaSproutTower3.blk b/maps/unused/BetaSproutTower3.blk similarity index 100% rename from maps/BetaSproutTower3.blk rename to maps/unused/BetaSproutTower3.blk diff --git a/maps/BetaSproutTower5.blk b/maps/unused/BetaSproutTower5.blk similarity index 100% rename from maps/BetaSproutTower5.blk rename to maps/unused/BetaSproutTower5.blk diff --git a/maps/BetaSproutTower6.blk b/maps/unused/BetaSproutTower6.blk similarity index 100% rename from maps/BetaSproutTower6.blk rename to maps/unused/BetaSproutTower6.blk diff --git a/maps/BetaSproutTower7.blk b/maps/unused/BetaSproutTower7.blk similarity index 100% rename from maps/BetaSproutTower7.blk rename to maps/unused/BetaSproutTower7.blk diff --git a/maps/BetaSproutTower8.blk b/maps/unused/BetaSproutTower8.blk similarity index 100% rename from maps/BetaSproutTower8.blk rename to maps/unused/BetaSproutTower8.blk diff --git a/maps/BetaSproutTower9.blk b/maps/unused/BetaSproutTower9.blk similarity index 100% rename from maps/BetaSproutTower9.blk rename to maps/unused/BetaSproutTower9.blk diff --git a/maps/BetaSproutTowerCutOut1.blk b/maps/unused/BetaSproutTowerCutOut1.blk similarity index 100% rename from maps/BetaSproutTowerCutOut1.blk rename to maps/unused/BetaSproutTowerCutOut1.blk diff --git a/maps/BetaSproutTowerCutOut2.blk b/maps/unused/BetaSproutTowerCutOut2.blk similarity index 100% rename from maps/BetaSproutTowerCutOut2.blk rename to maps/unused/BetaSproutTowerCutOut2.blk diff --git a/maps/BetaSproutTowerCutOut3.blk b/maps/unused/BetaSproutTowerCutOut3.blk similarity index 100% rename from maps/BetaSproutTowerCutOut3.blk rename to maps/unused/BetaSproutTowerCutOut3.blk diff --git a/maps/BetaUnknown.blk b/maps/unused/BetaUnknown.blk similarity index 100% rename from maps/BetaUnknown.blk rename to maps/unused/BetaUnknown.blk diff --git a/maps/BetaVioletCity.blk b/maps/unused/BetaVioletCity.blk similarity index 100% rename from maps/BetaVioletCity.blk rename to maps/unused/BetaVioletCity.blk