From 55bb99580eeccc92106437c4ad86edb8ca89ecda Mon Sep 17 00:00:00 2001
From: Rangi <remy.oukaour+rangi42@gmail.com>
Date: Fri, 3 Jul 2020 18:19:56 -0400
Subject: [PATCH] data/mapHeaders -> data/maps/headers; data/mapObjects ->
 data/maps/objects

To do: Polished Map support for loading the objects
---
 .../headers}/AgathasRoom.asm                  |   0
 .../{mapHeaders => maps/headers}/BikeShop.asm |   0
 .../headers}/BillsHouse.asm                   |   0
 .../headers}/BluesHouse.asm                   |   0
 .../headers}/BrunosRoom.asm                   |   0
 .../headers}/CeladonChiefHouse.asm            |   0
 .../headers}/CeladonCity.asm                  |   0
 .../headers}/CeladonDiner.asm                 |   0
 .../headers}/CeladonGym.asm                   |   0
 .../headers}/CeladonHotel.asm                 |   0
 .../headers}/CeladonMansion1F.asm             |   0
 .../headers}/CeladonMansion2F.asm             |   0
 .../headers}/CeladonMansion3F.asm             |   0
 .../headers}/CeladonMansionRoof.asm           |   0
 .../headers}/CeladonMansionRoofHouse.asm      |   0
 .../headers}/CeladonMart1F.asm                |   0
 .../headers}/CeladonMart2F.asm                |   0
 .../headers}/CeladonMart3F.asm                |   0
 .../headers}/CeladonMart4F.asm                |   0
 .../headers}/CeladonMart5F.asm                |   0
 .../headers}/CeladonMartElevator.asm          |   0
 .../headers}/CeladonMartRoof.asm              |   0
 .../headers}/CeladonPokecenter.asm            |   0
 .../headers}/CeruleanBadgeHouse.asm           |   0
 .../headers}/CeruleanCave1F.asm               |   0
 .../headers}/CeruleanCave2F.asm               |   0
 .../headers}/CeruleanCaveB1F.asm              |   0
 .../headers}/CeruleanCity.asm                 |   0
 .../headers}/CeruleanGym.asm                  |   0
 .../headers}/CeruleanMart.asm                 |   0
 .../headers}/CeruleanPokecenter.asm           |   0
 .../headers}/CeruleanTradeHouse.asm           |   0
 .../headers}/CeruleanTrashedHouse.asm         |   0
 .../headers}/ChampionsRoom.asm                |   0
 .../headers}/CinnabarGym.asm                  |   0
 .../headers}/CinnabarIsland.asm               |   0
 .../headers}/CinnabarLab.asm                  |   0
 .../headers}/CinnabarLabFossilRoom.asm        |   0
 .../headers}/CinnabarLabMetronomeRoom.asm     |   0
 .../headers}/CinnabarLabTradeRoom.asm         |   0
 .../headers}/CinnabarMart.asm                 |   0
 .../headers}/CinnabarPokecenter.asm           |   0
 .../headers}/Colosseum.asm                    |   0
 .../headers}/CopycatsHouse1F.asm              |   0
 .../headers}/CopycatsHouse2F.asm              |   0
 data/{mapHeaders => maps/headers}/Daycare.asm |   0
 .../headers}/DiglettsCave.asm                 |   0
 .../headers}/DiglettsCaveRoute11.asm          |   0
 .../headers}/DiglettsCaveRoute2.asm           |   0
 .../headers}/FightingDojo.asm                 |   0
 .../headers}/FuchsiaBillsGrandpasHouse.asm    |   0
 .../headers}/FuchsiaCity.asm                  |   0
 .../headers}/FuchsiaGoodRodHouse.asm          |   0
 .../headers}/FuchsiaGym.asm                   |   0
 .../headers}/FuchsiaMart.asm                  |   0
 .../headers}/FuchsiaMeetingRoom.asm           |   0
 .../headers}/FuchsiaPokecenter.asm            |   0
 .../headers}/GameCorner.asm                   |   0
 .../headers}/GameCornerPrizeRoom.asm          |   0
 .../headers}/HallOfFame.asm                   |   0
 .../headers}/IndigoPlateau.asm                |   0
 .../headers}/IndigoPlateauLobby.asm           |   0
 .../headers}/LancesRoom.asm                   |   0
 .../headers}/LavenderCuboneHouse.asm          |   0
 .../headers}/LavenderMart.asm                 |   0
 .../headers}/LavenderPokecenter.asm           |   0
 .../headers}/LavenderTown.asm                 |   0
 .../headers}/LoreleisRoom.asm                 |   0
 .../headers}/MrFujisHouse.asm                 |   0
 .../headers}/MrPsychicsHouse.asm              |   0
 .../{mapHeaders => maps/headers}/MtMoon1F.asm |   0
 .../headers}/MtMoonB1F.asm                    |   0
 .../headers}/MtMoonB2F.asm                    |   0
 .../headers}/MtMoonPokecenter.asm             |   0
 .../{mapHeaders => maps/headers}/Museum1F.asm |   0
 .../{mapHeaders => maps/headers}/Museum2F.asm |   0
 .../headers}/NameRatersHouse.asm              |   0
 data/{mapHeaders => maps/headers}/OaksLab.asm |   0
 .../headers}/PalletTown.asm                   |   0
 .../headers}/PewterCity.asm                   |   0
 .../headers}/PewterGym.asm                    |   0
 .../headers}/PewterMart.asm                   |   0
 .../headers}/PewterNidoranHouse.asm           |   0
 .../headers}/PewterPokecenter.asm             |   0
 .../headers}/PewterSpeechHouse.asm            |   0
 .../headers}/PokemonFanClub.asm               |   0
 .../headers}/PokemonMansion1F.asm             |   0
 .../headers}/PokemonMansion2F.asm             |   0
 .../headers}/PokemonMansion3F.asm             |   0
 .../headers}/PokemonMansionB1F.asm            |   0
 .../headers}/PokemonTower1F.asm               |   0
 .../headers}/PokemonTower2F.asm               |   0
 .../headers}/PokemonTower3F.asm               |   0
 .../headers}/PokemonTower4F.asm               |   0
 .../headers}/PokemonTower5F.asm               |   0
 .../headers}/PokemonTower6F.asm               |   0
 .../headers}/PokemonTower7F.asm               |   0
 .../headers}/PowerPlant.asm                   |   0
 .../headers}/RedsHouse1F.asm                  |   0
 .../headers}/RedsHouse2F.asm                  |   0
 .../headers}/RockTunnel1F.asm                 |   0
 .../headers}/RockTunnelB1F.asm                |   0
 .../headers}/RockTunnelPokecenter.asm         |   0
 .../headers}/RocketHideoutB1F.asm             |   0
 .../headers}/RocketHideoutB2F.asm             |   0
 .../headers}/RocketHideoutB3F.asm             |   0
 .../headers}/RocketHideoutB4F.asm             |   0
 .../headers}/RocketHideoutElevator.asm        |   0
 data/{mapHeaders => maps/headers}/Route1.asm  |   0
 data/{mapHeaders => maps/headers}/Route10.asm |   0
 data/{mapHeaders => maps/headers}/Route11.asm |   0
 .../headers}/Route11Gate1F.asm                |   0
 .../headers}/Route11Gate2F.asm                |   0
 data/{mapHeaders => maps/headers}/Route12.asm |   0
 .../headers}/Route12Gate1F.asm                |   0
 .../headers}/Route12Gate2F.asm                |   0
 .../headers}/Route12SuperRodHouse.asm         |   0
 data/{mapHeaders => maps/headers}/Route13.asm |   0
 data/{mapHeaders => maps/headers}/Route14.asm |   0
 data/{mapHeaders => maps/headers}/Route15.asm |   0
 .../headers}/Route15Gate1F.asm                |   0
 .../headers}/Route15Gate2F.asm                |   0
 data/{mapHeaders => maps/headers}/Route16.asm |   0
 .../headers}/Route16FlyHouse.asm              |   0
 .../headers}/Route16Gate1F.asm                |   0
 .../headers}/Route16Gate2F.asm                |   0
 data/{mapHeaders => maps/headers}/Route17.asm |   0
 data/{mapHeaders => maps/headers}/Route18.asm |   0
 .../headers}/Route18Gate1F.asm                |   0
 .../headers}/Route18Gate2F.asm                |   0
 data/{mapHeaders => maps/headers}/Route19.asm |   0
 data/{mapHeaders => maps/headers}/Route2.asm  |   0
 data/{mapHeaders => maps/headers}/Route20.asm |   0
 data/{mapHeaders => maps/headers}/Route21.asm |   0
 data/{mapHeaders => maps/headers}/Route22.asm |   0
 .../headers}/Route22Gate.asm                  |   0
 data/{mapHeaders => maps/headers}/Route23.asm |   0
 data/{mapHeaders => maps/headers}/Route24.asm |   0
 data/{mapHeaders => maps/headers}/Route25.asm |   0
 .../headers}/Route2Gate.asm                   |   0
 .../headers}/Route2TradeHouse.asm             |   0
 data/{mapHeaders => maps/headers}/Route3.asm  |   0
 data/{mapHeaders => maps/headers}/Route4.asm  |   0
 data/{mapHeaders => maps/headers}/Route5.asm  |   0
 .../headers}/Route5Gate.asm                   |   0
 data/{mapHeaders => maps/headers}/Route6.asm  |   0
 .../headers}/Route6Gate.asm                   |   0
 data/{mapHeaders => maps/headers}/Route7.asm  |   0
 .../headers}/Route7Gate.asm                   |   0
 data/{mapHeaders => maps/headers}/Route8.asm  |   0
 .../headers}/Route8Gate.asm                   |   0
 data/{mapHeaders => maps/headers}/Route9.asm  |   0
 .../{mapHeaders => maps/headers}/SSAnne1F.asm |   0
 .../headers}/SSAnne1FRooms.asm                |   0
 .../{mapHeaders => maps/headers}/SSAnne2F.asm |   0
 .../headers}/SSAnne2FRooms.asm                |   0
 .../{mapHeaders => maps/headers}/SSAnne3F.asm |   0
 .../headers}/SSAnneB1F.asm                    |   0
 .../headers}/SSAnneB1FRooms.asm               |   0
 .../headers}/SSAnneBow.asm                    |   0
 .../headers}/SSAnneCaptainsRoom.asm           |   0
 .../headers}/SSAnneKitchen.asm                |   0
 .../headers}/SafariZoneCenter.asm             |   0
 .../headers}/SafariZoneCenterRestHouse.asm    |   0
 .../headers}/SafariZoneEast.asm               |   0
 .../headers}/SafariZoneEastRestHouse.asm      |   0
 .../headers}/SafariZoneGate.asm               |   0
 .../headers}/SafariZoneNorth.asm              |   0
 .../headers}/SafariZoneNorthRestHouse.asm     |   0
 .../headers}/SafariZoneSecretHouse.asm        |   0
 .../headers}/SafariZoneWest.asm               |   0
 .../headers}/SafariZoneWestRestHouse.asm      |   0
 .../headers}/SaffronCity.asm                  |   0
 .../headers}/SaffronGym.asm                   |   0
 .../headers}/SaffronMart.asm                  |   0
 .../headers}/SaffronPidgeyHouse.asm           |   0
 .../headers}/SaffronPokecenter.asm            |   0
 .../headers}/SeafoamIslands1F.asm             |   0
 .../headers}/SeafoamIslandsB1F.asm            |   0
 .../headers}/SeafoamIslandsB2F.asm            |   0
 .../headers}/SeafoamIslandsB3F.asm            |   0
 .../headers}/SeafoamIslandsB4F.asm            |   0
 .../headers}/SilphCo10F.asm                   |   0
 .../headers}/SilphCo11F.asm                   |   0
 .../headers}/SilphCo1F.asm                    |   0
 .../headers}/SilphCo2F.asm                    |   0
 .../headers}/SilphCo3F.asm                    |   0
 .../headers}/SilphCo4F.asm                    |   0
 .../headers}/SilphCo5F.asm                    |   0
 .../headers}/SilphCo6F.asm                    |   0
 .../headers}/SilphCo7F.asm                    |   0
 .../headers}/SilphCo8F.asm                    |   0
 .../headers}/SilphCo9F.asm                    |   0
 .../headers}/SilphCoElevator.asm              |   0
 .../headers}/TradeCenter.asm                  |   0
 .../headers}/UndergroundPathNorthSouth.asm    |   0
 .../headers}/UndergroundPathRoute5.asm        |   0
 .../headers}/UndergroundPathRoute6.asm        |   0
 .../headers}/UndergroundPathRoute7.asm        |   0
 .../headers}/UndergroundPathRoute7Copy.asm    |   0
 .../headers}/UndergroundPathRoute8.asm        |   0
 .../headers}/UndergroundPathWestEast.asm      |   0
 .../headers}/VermilionCity.asm                |   0
 .../headers}/VermilionDock.asm                |   0
 .../headers}/VermilionGym.asm                 |   0
 .../headers}/VermilionMart.asm                |   0
 .../headers}/VermilionOldRodHouse.asm         |   0
 .../headers}/VermilionPidgeyHouse.asm         |   0
 .../headers}/VermilionPokecenter.asm          |   0
 .../headers}/VermilionTradeHouse.asm          |   0
 .../headers}/VictoryRoad1F.asm                |   0
 .../headers}/VictoryRoad2F.asm                |   0
 .../headers}/VictoryRoad3F.asm                |   0
 .../headers}/ViridianCity.asm                 |   0
 .../headers}/ViridianForest.asm               |   0
 .../headers}/ViridianForestNorthGate.asm      |   0
 .../headers}/ViridianForestSouthGate.asm      |   0
 .../headers}/ViridianGym.asm                  |   0
 .../headers}/ViridianMart.asm                 |   0
 .../headers}/ViridianNicknameHouse.asm        |   0
 .../headers}/ViridianPokecenter.asm           |   0
 .../headers}/ViridianSchoolHouse.asm          |   0
 .../headers}/WardensHouse.asm                 |   0
 .../objects}/AgathasRoom.asm                  |   0
 .../{mapObjects => maps/objects}/BikeShop.asm |   0
 .../objects}/BillsHouse.asm                   |   0
 .../objects}/BluesHouse.asm                   |   0
 .../objects}/BrunosRoom.asm                   |   0
 .../objects}/CeladonChiefHouse.asm            |   0
 .../objects}/CeladonCity.asm                  |   0
 .../objects}/CeladonDiner.asm                 |   0
 .../objects}/CeladonGym.asm                   |   0
 .../objects}/CeladonHotel.asm                 |   0
 .../objects}/CeladonMansion1F.asm             |   0
 .../objects}/CeladonMansion2F.asm             |   0
 .../objects}/CeladonMansion3F.asm             |   0
 .../objects}/CeladonMansionRoof.asm           |   0
 .../objects}/CeladonMansionRoofHouse.asm      |   0
 .../objects}/CeladonMart1F.asm                |   0
 .../objects}/CeladonMart2F.asm                |   0
 .../objects}/CeladonMart3F.asm                |   0
 .../objects}/CeladonMart4F.asm                |   0
 .../objects}/CeladonMart5F.asm                |   0
 .../objects}/CeladonMartElevator.asm          |   0
 .../objects}/CeladonMartRoof.asm              |   0
 .../objects}/CeladonPokecenter.asm            |   0
 .../objects}/CeruleanBadgeHouse.asm           |   0
 .../objects}/CeruleanCave1F.asm               |   0
 .../objects}/CeruleanCave2F.asm               |   0
 .../objects}/CeruleanCaveB1F.asm              |   0
 .../objects}/CeruleanCity.asm                 |   0
 .../objects}/CeruleanGym.asm                  |   0
 .../objects}/CeruleanMart.asm                 |   0
 .../objects}/CeruleanPokecenter.asm           |   0
 .../objects}/CeruleanTradeHouse.asm           |   0
 .../objects}/CeruleanTrashedHouse.asm         |   0
 .../objects}/ChampionsRoom.asm                |   0
 .../objects}/CinnabarGym.asm                  |   0
 .../objects}/CinnabarIsland.asm               |   0
 .../objects}/CinnabarLab.asm                  |   0
 .../objects}/CinnabarLabFossilRoom.asm        |   0
 .../objects}/CinnabarLabMetronomeRoom.asm     |   0
 .../objects}/CinnabarLabTradeRoom.asm         |   0
 .../objects}/CinnabarMart.asm                 |   0
 .../objects}/CinnabarPokecenter.asm           |   0
 .../objects}/Colosseum.asm                    |   0
 .../objects}/CopycatsHouse1F.asm              |   0
 .../objects}/CopycatsHouse2F.asm              |   0
 data/{mapObjects => maps/objects}/Daycare.asm |   0
 .../objects}/DiglettsCave.asm                 |   0
 .../objects}/DiglettsCaveRoute11.asm          |   0
 .../objects}/DiglettsCaveRoute2.asm           |   0
 .../objects}/FightingDojo.asm                 |   0
 .../objects}/FuchsiaBillsGrandpasHouse.asm    |   0
 .../objects}/FuchsiaCity.asm                  |   0
 .../objects}/FuchsiaGoodRodHouse.asm          |   0
 .../objects}/FuchsiaGym.asm                   |   0
 .../objects}/FuchsiaMart.asm                  |   0
 .../objects}/FuchsiaMeetingRoom.asm           |   0
 .../objects}/FuchsiaPokecenter.asm            |   0
 .../objects}/GameCorner.asm                   |   0
 .../objects}/GameCornerPrizeRoom.asm          |   0
 .../objects}/HallOfFame.asm                   |   0
 .../objects}/IndigoPlateau.asm                |   0
 .../objects}/IndigoPlateauLobby.asm           |   0
 .../objects}/LancesRoom.asm                   |   0
 .../objects}/LavenderCuboneHouse.asm          |   0
 .../objects}/LavenderMart.asm                 |   0
 .../objects}/LavenderPokecenter.asm           |   0
 .../objects}/LavenderTown.asm                 |   0
 .../objects}/LoreleisRoom.asm                 |   0
 .../objects}/MrFujisHouse.asm                 |   0
 .../objects}/MrPsychicsHouse.asm              |   0
 .../{mapObjects => maps/objects}/MtMoon1F.asm |   0
 .../objects}/MtMoonB1F.asm                    |   0
 .../objects}/MtMoonB2F.asm                    |   0
 .../objects}/MtMoonPokecenter.asm             |   0
 .../{mapObjects => maps/objects}/Museum1F.asm |   0
 .../{mapObjects => maps/objects}/Museum2F.asm |   0
 .../objects}/NameRatersHouse.asm              |   0
 data/{mapObjects => maps/objects}/OaksLab.asm |   0
 .../objects}/PalletTown.asm                   |   0
 .../objects}/PewterCity.asm                   |   0
 .../objects}/PewterGym.asm                    |   0
 .../objects}/PewterMart.asm                   |   0
 .../objects}/PewterNidoranHouse.asm           |   0
 .../objects}/PewterPokecenter.asm             |   0
 .../objects}/PewterSpeechHouse.asm            |   0
 .../objects}/PokemonFanClub.asm               |   0
 .../objects}/PokemonMansion1F.asm             |   0
 .../objects}/PokemonMansion2F.asm             |   0
 .../objects}/PokemonMansion3F.asm             |   0
 .../objects}/PokemonMansionB1F.asm            |   0
 .../objects}/PokemonTower1F.asm               |   0
 .../objects}/PokemonTower2F.asm               |   0
 .../objects}/PokemonTower3F.asm               |   0
 .../objects}/PokemonTower4F.asm               |   0
 .../objects}/PokemonTower5F.asm               |   0
 .../objects}/PokemonTower6F.asm               |   0
 .../objects}/PokemonTower7F.asm               |   0
 .../objects}/PowerPlant.asm                   |   0
 .../objects}/RedsHouse1F.asm                  |   0
 .../objects}/RedsHouse2F.asm                  |   0
 .../objects}/RockTunnel1F.asm                 |   0
 .../objects}/RockTunnelB1F.asm                |   0
 .../objects}/RockTunnelPokecenter.asm         |   0
 .../objects}/RocketHideoutB1F.asm             |   0
 .../objects}/RocketHideoutB2F.asm             |   0
 .../objects}/RocketHideoutB3F.asm             |   0
 .../objects}/RocketHideoutB4F.asm             |   0
 .../objects}/RocketHideoutElevator.asm        |   0
 data/{mapObjects => maps/objects}/Route1.asm  |   0
 data/{mapObjects => maps/objects}/Route10.asm |   0
 data/{mapObjects => maps/objects}/Route11.asm |   0
 .../objects}/Route11Gate1F.asm                |   0
 .../objects}/Route11Gate2F.asm                |   0
 data/{mapObjects => maps/objects}/Route12.asm |   0
 .../objects}/Route12Gate1F.asm                |   0
 .../objects}/Route12Gate2F.asm                |   0
 .../objects}/Route12SuperRodHouse.asm         |   0
 data/{mapObjects => maps/objects}/Route13.asm |   0
 data/{mapObjects => maps/objects}/Route14.asm |   0
 data/{mapObjects => maps/objects}/Route15.asm |   0
 .../objects}/Route15Gate1F.asm                |   0
 .../objects}/Route15Gate2F.asm                |   0
 data/{mapObjects => maps/objects}/Route16.asm |   0
 .../objects}/Route16FlyHouse.asm              |   0
 .../objects}/Route16Gate1F.asm                |   0
 .../objects}/Route16Gate2F.asm                |   0
 data/{mapObjects => maps/objects}/Route17.asm |   0
 data/{mapObjects => maps/objects}/Route18.asm |   0
 .../objects}/Route18Gate1F.asm                |   0
 .../objects}/Route18Gate2F.asm                |   0
 data/{mapObjects => maps/objects}/Route19.asm |   0
 data/{mapObjects => maps/objects}/Route2.asm  |   0
 data/{mapObjects => maps/objects}/Route20.asm |   0
 data/{mapObjects => maps/objects}/Route21.asm |   0
 data/{mapObjects => maps/objects}/Route22.asm |   0
 .../objects}/Route22Gate.asm                  |   0
 data/{mapObjects => maps/objects}/Route23.asm |   0
 data/{mapObjects => maps/objects}/Route24.asm |   0
 data/{mapObjects => maps/objects}/Route25.asm |   0
 .../objects}/Route2Gate.asm                   |   0
 .../objects}/Route2TradeHouse.asm             |   0
 data/{mapObjects => maps/objects}/Route3.asm  |   0
 data/{mapObjects => maps/objects}/Route4.asm  |   0
 data/{mapObjects => maps/objects}/Route5.asm  |   0
 .../objects}/Route5Gate.asm                   |   0
 data/{mapObjects => maps/objects}/Route6.asm  |   0
 .../objects}/Route6Gate.asm                   |   0
 data/{mapObjects => maps/objects}/Route7.asm  |   0
 .../objects}/Route7Gate.asm                   |   0
 data/{mapObjects => maps/objects}/Route8.asm  |   0
 .../objects}/Route8Gate.asm                   |   0
 data/{mapObjects => maps/objects}/Route9.asm  |   0
 .../{mapObjects => maps/objects}/SSAnne1F.asm |   0
 .../objects}/SSAnne1FRooms.asm                |   0
 .../{mapObjects => maps/objects}/SSAnne2F.asm |   0
 .../objects}/SSAnne2FRooms.asm                |   0
 .../{mapObjects => maps/objects}/SSAnne3F.asm |   0
 .../objects}/SSAnneB1F.asm                    |   0
 .../objects}/SSAnneB1FRooms.asm               |   0
 .../objects}/SSAnneBow.asm                    |   0
 .../objects}/SSAnneCaptainsRoom.asm           |   0
 .../objects}/SSAnneKitchen.asm                |   0
 .../objects}/SafariZoneCenter.asm             |   0
 .../objects}/SafariZoneCenterRestHouse.asm    |   0
 .../objects}/SafariZoneEast.asm               |   0
 .../objects}/SafariZoneEastRestHouse.asm      |   0
 .../objects}/SafariZoneGate.asm               |   0
 .../objects}/SafariZoneNorth.asm              |   0
 .../objects}/SafariZoneNorthRestHouse.asm     |   0
 .../objects}/SafariZoneSecretHouse.asm        |   0
 .../objects}/SafariZoneWest.asm               |   0
 .../objects}/SafariZoneWestRestHouse.asm      |   0
 .../objects}/SaffronCity.asm                  |   0
 .../objects}/SaffronGym.asm                   |   0
 .../objects}/SaffronMart.asm                  |   0
 .../objects}/SaffronPidgeyHouse.asm           |   0
 .../objects}/SaffronPokecenter.asm            |   0
 .../objects}/SeafoamIslands1F.asm             |   0
 .../objects}/SeafoamIslandsB1F.asm            |   0
 .../objects}/SeafoamIslandsB2F.asm            |   0
 .../objects}/SeafoamIslandsB3F.asm            |   0
 .../objects}/SeafoamIslandsB4F.asm            |   0
 .../objects}/SilphCo10F.asm                   |   0
 .../objects}/SilphCo11F.asm                   |   0
 .../objects}/SilphCo1F.asm                    |   0
 .../objects}/SilphCo2F.asm                    |   0
 .../objects}/SilphCo3F.asm                    |   0
 .../objects}/SilphCo4F.asm                    |   0
 .../objects}/SilphCo5F.asm                    |   0
 .../objects}/SilphCo6F.asm                    |   0
 .../objects}/SilphCo7F.asm                    |   0
 .../objects}/SilphCo8F.asm                    |   0
 .../objects}/SilphCo9F.asm                    |   0
 .../objects}/SilphCoElevator.asm              |   0
 .../objects}/TradeCenter.asm                  |   0
 .../objects}/UndergroundPathNorthSouth.asm    |   0
 .../objects}/UndergroundPathRoute5.asm        |   0
 .../objects}/UndergroundPathRoute6.asm        |   0
 .../objects}/UndergroundPathRoute7.asm        |   0
 .../objects}/UndergroundPathRoute7Copy.asm    |   0
 .../objects}/UndergroundPathRoute8.asm        |   0
 .../objects}/UndergroundPathWestEast.asm      |   0
 .../objects}/VermilionCity.asm                |   0
 .../objects}/VermilionDock.asm                |   0
 .../objects}/VermilionGym.asm                 |   0
 .../objects}/VermilionMart.asm                |   0
 .../objects}/VermilionOldRodHouse.asm         |   0
 .../objects}/VermilionPidgeyHouse.asm         |   0
 .../objects}/VermilionPokecenter.asm          |   0
 .../objects}/VermilionTradeHouse.asm          |   0
 .../objects}/VictoryRoad1F.asm                |   0
 .../objects}/VictoryRoad2F.asm                |   0
 .../objects}/VictoryRoad3F.asm                |   0
 .../objects}/ViridianCity.asm                 |   0
 .../objects}/ViridianForest.asm               |   0
 .../objects}/ViridianForestNorthGate.asm      |   0
 .../objects}/ViridianForestSouthGate.asm      |   0
 .../objects}/ViridianGym.asm                  |   0
 .../objects}/ViridianMart.asm                 |   0
 .../objects}/ViridianNicknameHouse.asm        |   0
 .../objects}/ViridianPokecenter.asm           |   0
 .../objects}/ViridianSchoolHouse.asm          |   0
 .../objects}/WardensHouse.asm                 |   0
 maps.asm                                      | 892 +++++++++---------
 447 files changed, 446 insertions(+), 446 deletions(-)
 rename data/{mapHeaders => maps/headers}/AgathasRoom.asm (100%)
 rename data/{mapHeaders => maps/headers}/BikeShop.asm (100%)
 rename data/{mapHeaders => maps/headers}/BillsHouse.asm (100%)
 rename data/{mapHeaders => maps/headers}/BluesHouse.asm (100%)
 rename data/{mapHeaders => maps/headers}/BrunosRoom.asm (100%)
 rename data/{mapHeaders => maps/headers}/CeladonChiefHouse.asm (100%)
 rename data/{mapHeaders => maps/headers}/CeladonCity.asm (100%)
 rename data/{mapHeaders => maps/headers}/CeladonDiner.asm (100%)
 rename data/{mapHeaders => maps/headers}/CeladonGym.asm (100%)
 rename data/{mapHeaders => maps/headers}/CeladonHotel.asm (100%)
 rename data/{mapHeaders => maps/headers}/CeladonMansion1F.asm (100%)
 rename data/{mapHeaders => maps/headers}/CeladonMansion2F.asm (100%)
 rename data/{mapHeaders => maps/headers}/CeladonMansion3F.asm (100%)
 rename data/{mapHeaders => maps/headers}/CeladonMansionRoof.asm (100%)
 rename data/{mapHeaders => maps/headers}/CeladonMansionRoofHouse.asm (100%)
 rename data/{mapHeaders => maps/headers}/CeladonMart1F.asm (100%)
 rename data/{mapHeaders => maps/headers}/CeladonMart2F.asm (100%)
 rename data/{mapHeaders => maps/headers}/CeladonMart3F.asm (100%)
 rename data/{mapHeaders => maps/headers}/CeladonMart4F.asm (100%)
 rename data/{mapHeaders => maps/headers}/CeladonMart5F.asm (100%)
 rename data/{mapHeaders => maps/headers}/CeladonMartElevator.asm (100%)
 rename data/{mapHeaders => maps/headers}/CeladonMartRoof.asm (100%)
 rename data/{mapHeaders => maps/headers}/CeladonPokecenter.asm (100%)
 rename data/{mapHeaders => maps/headers}/CeruleanBadgeHouse.asm (100%)
 rename data/{mapHeaders => maps/headers}/CeruleanCave1F.asm (100%)
 rename data/{mapHeaders => maps/headers}/CeruleanCave2F.asm (100%)
 rename data/{mapHeaders => maps/headers}/CeruleanCaveB1F.asm (100%)
 rename data/{mapHeaders => maps/headers}/CeruleanCity.asm (100%)
 rename data/{mapHeaders => maps/headers}/CeruleanGym.asm (100%)
 rename data/{mapHeaders => maps/headers}/CeruleanMart.asm (100%)
 rename data/{mapHeaders => maps/headers}/CeruleanPokecenter.asm (100%)
 rename data/{mapHeaders => maps/headers}/CeruleanTradeHouse.asm (100%)
 rename data/{mapHeaders => maps/headers}/CeruleanTrashedHouse.asm (100%)
 rename data/{mapHeaders => maps/headers}/ChampionsRoom.asm (100%)
 rename data/{mapHeaders => maps/headers}/CinnabarGym.asm (100%)
 rename data/{mapHeaders => maps/headers}/CinnabarIsland.asm (100%)
 rename data/{mapHeaders => maps/headers}/CinnabarLab.asm (100%)
 rename data/{mapHeaders => maps/headers}/CinnabarLabFossilRoom.asm (100%)
 rename data/{mapHeaders => maps/headers}/CinnabarLabMetronomeRoom.asm (100%)
 rename data/{mapHeaders => maps/headers}/CinnabarLabTradeRoom.asm (100%)
 rename data/{mapHeaders => maps/headers}/CinnabarMart.asm (100%)
 rename data/{mapHeaders => maps/headers}/CinnabarPokecenter.asm (100%)
 rename data/{mapHeaders => maps/headers}/Colosseum.asm (100%)
 rename data/{mapHeaders => maps/headers}/CopycatsHouse1F.asm (100%)
 rename data/{mapHeaders => maps/headers}/CopycatsHouse2F.asm (100%)
 rename data/{mapHeaders => maps/headers}/Daycare.asm (100%)
 rename data/{mapHeaders => maps/headers}/DiglettsCave.asm (100%)
 rename data/{mapHeaders => maps/headers}/DiglettsCaveRoute11.asm (100%)
 rename data/{mapHeaders => maps/headers}/DiglettsCaveRoute2.asm (100%)
 rename data/{mapHeaders => maps/headers}/FightingDojo.asm (100%)
 rename data/{mapHeaders => maps/headers}/FuchsiaBillsGrandpasHouse.asm (100%)
 rename data/{mapHeaders => maps/headers}/FuchsiaCity.asm (100%)
 rename data/{mapHeaders => maps/headers}/FuchsiaGoodRodHouse.asm (100%)
 rename data/{mapHeaders => maps/headers}/FuchsiaGym.asm (100%)
 rename data/{mapHeaders => maps/headers}/FuchsiaMart.asm (100%)
 rename data/{mapHeaders => maps/headers}/FuchsiaMeetingRoom.asm (100%)
 rename data/{mapHeaders => maps/headers}/FuchsiaPokecenter.asm (100%)
 rename data/{mapHeaders => maps/headers}/GameCorner.asm (100%)
 rename data/{mapHeaders => maps/headers}/GameCornerPrizeRoom.asm (100%)
 rename data/{mapHeaders => maps/headers}/HallOfFame.asm (100%)
 rename data/{mapHeaders => maps/headers}/IndigoPlateau.asm (100%)
 rename data/{mapHeaders => maps/headers}/IndigoPlateauLobby.asm (100%)
 rename data/{mapHeaders => maps/headers}/LancesRoom.asm (100%)
 rename data/{mapHeaders => maps/headers}/LavenderCuboneHouse.asm (100%)
 rename data/{mapHeaders => maps/headers}/LavenderMart.asm (100%)
 rename data/{mapHeaders => maps/headers}/LavenderPokecenter.asm (100%)
 rename data/{mapHeaders => maps/headers}/LavenderTown.asm (100%)
 rename data/{mapHeaders => maps/headers}/LoreleisRoom.asm (100%)
 rename data/{mapHeaders => maps/headers}/MrFujisHouse.asm (100%)
 rename data/{mapHeaders => maps/headers}/MrPsychicsHouse.asm (100%)
 rename data/{mapHeaders => maps/headers}/MtMoon1F.asm (100%)
 rename data/{mapHeaders => maps/headers}/MtMoonB1F.asm (100%)
 rename data/{mapHeaders => maps/headers}/MtMoonB2F.asm (100%)
 rename data/{mapHeaders => maps/headers}/MtMoonPokecenter.asm (100%)
 rename data/{mapHeaders => maps/headers}/Museum1F.asm (100%)
 rename data/{mapHeaders => maps/headers}/Museum2F.asm (100%)
 rename data/{mapHeaders => maps/headers}/NameRatersHouse.asm (100%)
 rename data/{mapHeaders => maps/headers}/OaksLab.asm (100%)
 rename data/{mapHeaders => maps/headers}/PalletTown.asm (100%)
 rename data/{mapHeaders => maps/headers}/PewterCity.asm (100%)
 rename data/{mapHeaders => maps/headers}/PewterGym.asm (100%)
 rename data/{mapHeaders => maps/headers}/PewterMart.asm (100%)
 rename data/{mapHeaders => maps/headers}/PewterNidoranHouse.asm (100%)
 rename data/{mapHeaders => maps/headers}/PewterPokecenter.asm (100%)
 rename data/{mapHeaders => maps/headers}/PewterSpeechHouse.asm (100%)
 rename data/{mapHeaders => maps/headers}/PokemonFanClub.asm (100%)
 rename data/{mapHeaders => maps/headers}/PokemonMansion1F.asm (100%)
 rename data/{mapHeaders => maps/headers}/PokemonMansion2F.asm (100%)
 rename data/{mapHeaders => maps/headers}/PokemonMansion3F.asm (100%)
 rename data/{mapHeaders => maps/headers}/PokemonMansionB1F.asm (100%)
 rename data/{mapHeaders => maps/headers}/PokemonTower1F.asm (100%)
 rename data/{mapHeaders => maps/headers}/PokemonTower2F.asm (100%)
 rename data/{mapHeaders => maps/headers}/PokemonTower3F.asm (100%)
 rename data/{mapHeaders => maps/headers}/PokemonTower4F.asm (100%)
 rename data/{mapHeaders => maps/headers}/PokemonTower5F.asm (100%)
 rename data/{mapHeaders => maps/headers}/PokemonTower6F.asm (100%)
 rename data/{mapHeaders => maps/headers}/PokemonTower7F.asm (100%)
 rename data/{mapHeaders => maps/headers}/PowerPlant.asm (100%)
 rename data/{mapHeaders => maps/headers}/RedsHouse1F.asm (100%)
 rename data/{mapHeaders => maps/headers}/RedsHouse2F.asm (100%)
 rename data/{mapHeaders => maps/headers}/RockTunnel1F.asm (100%)
 rename data/{mapHeaders => maps/headers}/RockTunnelB1F.asm (100%)
 rename data/{mapHeaders => maps/headers}/RockTunnelPokecenter.asm (100%)
 rename data/{mapHeaders => maps/headers}/RocketHideoutB1F.asm (100%)
 rename data/{mapHeaders => maps/headers}/RocketHideoutB2F.asm (100%)
 rename data/{mapHeaders => maps/headers}/RocketHideoutB3F.asm (100%)
 rename data/{mapHeaders => maps/headers}/RocketHideoutB4F.asm (100%)
 rename data/{mapHeaders => maps/headers}/RocketHideoutElevator.asm (100%)
 rename data/{mapHeaders => maps/headers}/Route1.asm (100%)
 rename data/{mapHeaders => maps/headers}/Route10.asm (100%)
 rename data/{mapHeaders => maps/headers}/Route11.asm (100%)
 rename data/{mapHeaders => maps/headers}/Route11Gate1F.asm (100%)
 rename data/{mapHeaders => maps/headers}/Route11Gate2F.asm (100%)
 rename data/{mapHeaders => maps/headers}/Route12.asm (100%)
 rename data/{mapHeaders => maps/headers}/Route12Gate1F.asm (100%)
 rename data/{mapHeaders => maps/headers}/Route12Gate2F.asm (100%)
 rename data/{mapHeaders => maps/headers}/Route12SuperRodHouse.asm (100%)
 rename data/{mapHeaders => maps/headers}/Route13.asm (100%)
 rename data/{mapHeaders => maps/headers}/Route14.asm (100%)
 rename data/{mapHeaders => maps/headers}/Route15.asm (100%)
 rename data/{mapHeaders => maps/headers}/Route15Gate1F.asm (100%)
 rename data/{mapHeaders => maps/headers}/Route15Gate2F.asm (100%)
 rename data/{mapHeaders => maps/headers}/Route16.asm (100%)
 rename data/{mapHeaders => maps/headers}/Route16FlyHouse.asm (100%)
 rename data/{mapHeaders => maps/headers}/Route16Gate1F.asm (100%)
 rename data/{mapHeaders => maps/headers}/Route16Gate2F.asm (100%)
 rename data/{mapHeaders => maps/headers}/Route17.asm (100%)
 rename data/{mapHeaders => maps/headers}/Route18.asm (100%)
 rename data/{mapHeaders => maps/headers}/Route18Gate1F.asm (100%)
 rename data/{mapHeaders => maps/headers}/Route18Gate2F.asm (100%)
 rename data/{mapHeaders => maps/headers}/Route19.asm (100%)
 rename data/{mapHeaders => maps/headers}/Route2.asm (100%)
 rename data/{mapHeaders => maps/headers}/Route20.asm (100%)
 rename data/{mapHeaders => maps/headers}/Route21.asm (100%)
 rename data/{mapHeaders => maps/headers}/Route22.asm (100%)
 rename data/{mapHeaders => maps/headers}/Route22Gate.asm (100%)
 rename data/{mapHeaders => maps/headers}/Route23.asm (100%)
 rename data/{mapHeaders => maps/headers}/Route24.asm (100%)
 rename data/{mapHeaders => maps/headers}/Route25.asm (100%)
 rename data/{mapHeaders => maps/headers}/Route2Gate.asm (100%)
 rename data/{mapHeaders => maps/headers}/Route2TradeHouse.asm (100%)
 rename data/{mapHeaders => maps/headers}/Route3.asm (100%)
 rename data/{mapHeaders => maps/headers}/Route4.asm (100%)
 rename data/{mapHeaders => maps/headers}/Route5.asm (100%)
 rename data/{mapHeaders => maps/headers}/Route5Gate.asm (100%)
 rename data/{mapHeaders => maps/headers}/Route6.asm (100%)
 rename data/{mapHeaders => maps/headers}/Route6Gate.asm (100%)
 rename data/{mapHeaders => maps/headers}/Route7.asm (100%)
 rename data/{mapHeaders => maps/headers}/Route7Gate.asm (100%)
 rename data/{mapHeaders => maps/headers}/Route8.asm (100%)
 rename data/{mapHeaders => maps/headers}/Route8Gate.asm (100%)
 rename data/{mapHeaders => maps/headers}/Route9.asm (100%)
 rename data/{mapHeaders => maps/headers}/SSAnne1F.asm (100%)
 rename data/{mapHeaders => maps/headers}/SSAnne1FRooms.asm (100%)
 rename data/{mapHeaders => maps/headers}/SSAnne2F.asm (100%)
 rename data/{mapHeaders => maps/headers}/SSAnne2FRooms.asm (100%)
 rename data/{mapHeaders => maps/headers}/SSAnne3F.asm (100%)
 rename data/{mapHeaders => maps/headers}/SSAnneB1F.asm (100%)
 rename data/{mapHeaders => maps/headers}/SSAnneB1FRooms.asm (100%)
 rename data/{mapHeaders => maps/headers}/SSAnneBow.asm (100%)
 rename data/{mapHeaders => maps/headers}/SSAnneCaptainsRoom.asm (100%)
 rename data/{mapHeaders => maps/headers}/SSAnneKitchen.asm (100%)
 rename data/{mapHeaders => maps/headers}/SafariZoneCenter.asm (100%)
 rename data/{mapHeaders => maps/headers}/SafariZoneCenterRestHouse.asm (100%)
 rename data/{mapHeaders => maps/headers}/SafariZoneEast.asm (100%)
 rename data/{mapHeaders => maps/headers}/SafariZoneEastRestHouse.asm (100%)
 rename data/{mapHeaders => maps/headers}/SafariZoneGate.asm (100%)
 rename data/{mapHeaders => maps/headers}/SafariZoneNorth.asm (100%)
 rename data/{mapHeaders => maps/headers}/SafariZoneNorthRestHouse.asm (100%)
 rename data/{mapHeaders => maps/headers}/SafariZoneSecretHouse.asm (100%)
 rename data/{mapHeaders => maps/headers}/SafariZoneWest.asm (100%)
 rename data/{mapHeaders => maps/headers}/SafariZoneWestRestHouse.asm (100%)
 rename data/{mapHeaders => maps/headers}/SaffronCity.asm (100%)
 rename data/{mapHeaders => maps/headers}/SaffronGym.asm (100%)
 rename data/{mapHeaders => maps/headers}/SaffronMart.asm (100%)
 rename data/{mapHeaders => maps/headers}/SaffronPidgeyHouse.asm (100%)
 rename data/{mapHeaders => maps/headers}/SaffronPokecenter.asm (100%)
 rename data/{mapHeaders => maps/headers}/SeafoamIslands1F.asm (100%)
 rename data/{mapHeaders => maps/headers}/SeafoamIslandsB1F.asm (100%)
 rename data/{mapHeaders => maps/headers}/SeafoamIslandsB2F.asm (100%)
 rename data/{mapHeaders => maps/headers}/SeafoamIslandsB3F.asm (100%)
 rename data/{mapHeaders => maps/headers}/SeafoamIslandsB4F.asm (100%)
 rename data/{mapHeaders => maps/headers}/SilphCo10F.asm (100%)
 rename data/{mapHeaders => maps/headers}/SilphCo11F.asm (100%)
 rename data/{mapHeaders => maps/headers}/SilphCo1F.asm (100%)
 rename data/{mapHeaders => maps/headers}/SilphCo2F.asm (100%)
 rename data/{mapHeaders => maps/headers}/SilphCo3F.asm (100%)
 rename data/{mapHeaders => maps/headers}/SilphCo4F.asm (100%)
 rename data/{mapHeaders => maps/headers}/SilphCo5F.asm (100%)
 rename data/{mapHeaders => maps/headers}/SilphCo6F.asm (100%)
 rename data/{mapHeaders => maps/headers}/SilphCo7F.asm (100%)
 rename data/{mapHeaders => maps/headers}/SilphCo8F.asm (100%)
 rename data/{mapHeaders => maps/headers}/SilphCo9F.asm (100%)
 rename data/{mapHeaders => maps/headers}/SilphCoElevator.asm (100%)
 rename data/{mapHeaders => maps/headers}/TradeCenter.asm (100%)
 rename data/{mapHeaders => maps/headers}/UndergroundPathNorthSouth.asm (100%)
 rename data/{mapHeaders => maps/headers}/UndergroundPathRoute5.asm (100%)
 rename data/{mapHeaders => maps/headers}/UndergroundPathRoute6.asm (100%)
 rename data/{mapHeaders => maps/headers}/UndergroundPathRoute7.asm (100%)
 rename data/{mapHeaders => maps/headers}/UndergroundPathRoute7Copy.asm (100%)
 rename data/{mapHeaders => maps/headers}/UndergroundPathRoute8.asm (100%)
 rename data/{mapHeaders => maps/headers}/UndergroundPathWestEast.asm (100%)
 rename data/{mapHeaders => maps/headers}/VermilionCity.asm (100%)
 rename data/{mapHeaders => maps/headers}/VermilionDock.asm (100%)
 rename data/{mapHeaders => maps/headers}/VermilionGym.asm (100%)
 rename data/{mapHeaders => maps/headers}/VermilionMart.asm (100%)
 rename data/{mapHeaders => maps/headers}/VermilionOldRodHouse.asm (100%)
 rename data/{mapHeaders => maps/headers}/VermilionPidgeyHouse.asm (100%)
 rename data/{mapHeaders => maps/headers}/VermilionPokecenter.asm (100%)
 rename data/{mapHeaders => maps/headers}/VermilionTradeHouse.asm (100%)
 rename data/{mapHeaders => maps/headers}/VictoryRoad1F.asm (100%)
 rename data/{mapHeaders => maps/headers}/VictoryRoad2F.asm (100%)
 rename data/{mapHeaders => maps/headers}/VictoryRoad3F.asm (100%)
 rename data/{mapHeaders => maps/headers}/ViridianCity.asm (100%)
 rename data/{mapHeaders => maps/headers}/ViridianForest.asm (100%)
 rename data/{mapHeaders => maps/headers}/ViridianForestNorthGate.asm (100%)
 rename data/{mapHeaders => maps/headers}/ViridianForestSouthGate.asm (100%)
 rename data/{mapHeaders => maps/headers}/ViridianGym.asm (100%)
 rename data/{mapHeaders => maps/headers}/ViridianMart.asm (100%)
 rename data/{mapHeaders => maps/headers}/ViridianNicknameHouse.asm (100%)
 rename data/{mapHeaders => maps/headers}/ViridianPokecenter.asm (100%)
 rename data/{mapHeaders => maps/headers}/ViridianSchoolHouse.asm (100%)
 rename data/{mapHeaders => maps/headers}/WardensHouse.asm (100%)
 rename data/{mapObjects => maps/objects}/AgathasRoom.asm (100%)
 rename data/{mapObjects => maps/objects}/BikeShop.asm (100%)
 rename data/{mapObjects => maps/objects}/BillsHouse.asm (100%)
 rename data/{mapObjects => maps/objects}/BluesHouse.asm (100%)
 rename data/{mapObjects => maps/objects}/BrunosRoom.asm (100%)
 rename data/{mapObjects => maps/objects}/CeladonChiefHouse.asm (100%)
 rename data/{mapObjects => maps/objects}/CeladonCity.asm (100%)
 rename data/{mapObjects => maps/objects}/CeladonDiner.asm (100%)
 rename data/{mapObjects => maps/objects}/CeladonGym.asm (100%)
 rename data/{mapObjects => maps/objects}/CeladonHotel.asm (100%)
 rename data/{mapObjects => maps/objects}/CeladonMansion1F.asm (100%)
 rename data/{mapObjects => maps/objects}/CeladonMansion2F.asm (100%)
 rename data/{mapObjects => maps/objects}/CeladonMansion3F.asm (100%)
 rename data/{mapObjects => maps/objects}/CeladonMansionRoof.asm (100%)
 rename data/{mapObjects => maps/objects}/CeladonMansionRoofHouse.asm (100%)
 rename data/{mapObjects => maps/objects}/CeladonMart1F.asm (100%)
 rename data/{mapObjects => maps/objects}/CeladonMart2F.asm (100%)
 rename data/{mapObjects => maps/objects}/CeladonMart3F.asm (100%)
 rename data/{mapObjects => maps/objects}/CeladonMart4F.asm (100%)
 rename data/{mapObjects => maps/objects}/CeladonMart5F.asm (100%)
 rename data/{mapObjects => maps/objects}/CeladonMartElevator.asm (100%)
 rename data/{mapObjects => maps/objects}/CeladonMartRoof.asm (100%)
 rename data/{mapObjects => maps/objects}/CeladonPokecenter.asm (100%)
 rename data/{mapObjects => maps/objects}/CeruleanBadgeHouse.asm (100%)
 rename data/{mapObjects => maps/objects}/CeruleanCave1F.asm (100%)
 rename data/{mapObjects => maps/objects}/CeruleanCave2F.asm (100%)
 rename data/{mapObjects => maps/objects}/CeruleanCaveB1F.asm (100%)
 rename data/{mapObjects => maps/objects}/CeruleanCity.asm (100%)
 rename data/{mapObjects => maps/objects}/CeruleanGym.asm (100%)
 rename data/{mapObjects => maps/objects}/CeruleanMart.asm (100%)
 rename data/{mapObjects => maps/objects}/CeruleanPokecenter.asm (100%)
 rename data/{mapObjects => maps/objects}/CeruleanTradeHouse.asm (100%)
 rename data/{mapObjects => maps/objects}/CeruleanTrashedHouse.asm (100%)
 rename data/{mapObjects => maps/objects}/ChampionsRoom.asm (100%)
 rename data/{mapObjects => maps/objects}/CinnabarGym.asm (100%)
 rename data/{mapObjects => maps/objects}/CinnabarIsland.asm (100%)
 rename data/{mapObjects => maps/objects}/CinnabarLab.asm (100%)
 rename data/{mapObjects => maps/objects}/CinnabarLabFossilRoom.asm (100%)
 rename data/{mapObjects => maps/objects}/CinnabarLabMetronomeRoom.asm (100%)
 rename data/{mapObjects => maps/objects}/CinnabarLabTradeRoom.asm (100%)
 rename data/{mapObjects => maps/objects}/CinnabarMart.asm (100%)
 rename data/{mapObjects => maps/objects}/CinnabarPokecenter.asm (100%)
 rename data/{mapObjects => maps/objects}/Colosseum.asm (100%)
 rename data/{mapObjects => maps/objects}/CopycatsHouse1F.asm (100%)
 rename data/{mapObjects => maps/objects}/CopycatsHouse2F.asm (100%)
 rename data/{mapObjects => maps/objects}/Daycare.asm (100%)
 rename data/{mapObjects => maps/objects}/DiglettsCave.asm (100%)
 rename data/{mapObjects => maps/objects}/DiglettsCaveRoute11.asm (100%)
 rename data/{mapObjects => maps/objects}/DiglettsCaveRoute2.asm (100%)
 rename data/{mapObjects => maps/objects}/FightingDojo.asm (100%)
 rename data/{mapObjects => maps/objects}/FuchsiaBillsGrandpasHouse.asm (100%)
 rename data/{mapObjects => maps/objects}/FuchsiaCity.asm (100%)
 rename data/{mapObjects => maps/objects}/FuchsiaGoodRodHouse.asm (100%)
 rename data/{mapObjects => maps/objects}/FuchsiaGym.asm (100%)
 rename data/{mapObjects => maps/objects}/FuchsiaMart.asm (100%)
 rename data/{mapObjects => maps/objects}/FuchsiaMeetingRoom.asm (100%)
 rename data/{mapObjects => maps/objects}/FuchsiaPokecenter.asm (100%)
 rename data/{mapObjects => maps/objects}/GameCorner.asm (100%)
 rename data/{mapObjects => maps/objects}/GameCornerPrizeRoom.asm (100%)
 rename data/{mapObjects => maps/objects}/HallOfFame.asm (100%)
 rename data/{mapObjects => maps/objects}/IndigoPlateau.asm (100%)
 rename data/{mapObjects => maps/objects}/IndigoPlateauLobby.asm (100%)
 rename data/{mapObjects => maps/objects}/LancesRoom.asm (100%)
 rename data/{mapObjects => maps/objects}/LavenderCuboneHouse.asm (100%)
 rename data/{mapObjects => maps/objects}/LavenderMart.asm (100%)
 rename data/{mapObjects => maps/objects}/LavenderPokecenter.asm (100%)
 rename data/{mapObjects => maps/objects}/LavenderTown.asm (100%)
 rename data/{mapObjects => maps/objects}/LoreleisRoom.asm (100%)
 rename data/{mapObjects => maps/objects}/MrFujisHouse.asm (100%)
 rename data/{mapObjects => maps/objects}/MrPsychicsHouse.asm (100%)
 rename data/{mapObjects => maps/objects}/MtMoon1F.asm (100%)
 rename data/{mapObjects => maps/objects}/MtMoonB1F.asm (100%)
 rename data/{mapObjects => maps/objects}/MtMoonB2F.asm (100%)
 rename data/{mapObjects => maps/objects}/MtMoonPokecenter.asm (100%)
 rename data/{mapObjects => maps/objects}/Museum1F.asm (100%)
 rename data/{mapObjects => maps/objects}/Museum2F.asm (100%)
 rename data/{mapObjects => maps/objects}/NameRatersHouse.asm (100%)
 rename data/{mapObjects => maps/objects}/OaksLab.asm (100%)
 rename data/{mapObjects => maps/objects}/PalletTown.asm (100%)
 rename data/{mapObjects => maps/objects}/PewterCity.asm (100%)
 rename data/{mapObjects => maps/objects}/PewterGym.asm (100%)
 rename data/{mapObjects => maps/objects}/PewterMart.asm (100%)
 rename data/{mapObjects => maps/objects}/PewterNidoranHouse.asm (100%)
 rename data/{mapObjects => maps/objects}/PewterPokecenter.asm (100%)
 rename data/{mapObjects => maps/objects}/PewterSpeechHouse.asm (100%)
 rename data/{mapObjects => maps/objects}/PokemonFanClub.asm (100%)
 rename data/{mapObjects => maps/objects}/PokemonMansion1F.asm (100%)
 rename data/{mapObjects => maps/objects}/PokemonMansion2F.asm (100%)
 rename data/{mapObjects => maps/objects}/PokemonMansion3F.asm (100%)
 rename data/{mapObjects => maps/objects}/PokemonMansionB1F.asm (100%)
 rename data/{mapObjects => maps/objects}/PokemonTower1F.asm (100%)
 rename data/{mapObjects => maps/objects}/PokemonTower2F.asm (100%)
 rename data/{mapObjects => maps/objects}/PokemonTower3F.asm (100%)
 rename data/{mapObjects => maps/objects}/PokemonTower4F.asm (100%)
 rename data/{mapObjects => maps/objects}/PokemonTower5F.asm (100%)
 rename data/{mapObjects => maps/objects}/PokemonTower6F.asm (100%)
 rename data/{mapObjects => maps/objects}/PokemonTower7F.asm (100%)
 rename data/{mapObjects => maps/objects}/PowerPlant.asm (100%)
 rename data/{mapObjects => maps/objects}/RedsHouse1F.asm (100%)
 rename data/{mapObjects => maps/objects}/RedsHouse2F.asm (100%)
 rename data/{mapObjects => maps/objects}/RockTunnel1F.asm (100%)
 rename data/{mapObjects => maps/objects}/RockTunnelB1F.asm (100%)
 rename data/{mapObjects => maps/objects}/RockTunnelPokecenter.asm (100%)
 rename data/{mapObjects => maps/objects}/RocketHideoutB1F.asm (100%)
 rename data/{mapObjects => maps/objects}/RocketHideoutB2F.asm (100%)
 rename data/{mapObjects => maps/objects}/RocketHideoutB3F.asm (100%)
 rename data/{mapObjects => maps/objects}/RocketHideoutB4F.asm (100%)
 rename data/{mapObjects => maps/objects}/RocketHideoutElevator.asm (100%)
 rename data/{mapObjects => maps/objects}/Route1.asm (100%)
 rename data/{mapObjects => maps/objects}/Route10.asm (100%)
 rename data/{mapObjects => maps/objects}/Route11.asm (100%)
 rename data/{mapObjects => maps/objects}/Route11Gate1F.asm (100%)
 rename data/{mapObjects => maps/objects}/Route11Gate2F.asm (100%)
 rename data/{mapObjects => maps/objects}/Route12.asm (100%)
 rename data/{mapObjects => maps/objects}/Route12Gate1F.asm (100%)
 rename data/{mapObjects => maps/objects}/Route12Gate2F.asm (100%)
 rename data/{mapObjects => maps/objects}/Route12SuperRodHouse.asm (100%)
 rename data/{mapObjects => maps/objects}/Route13.asm (100%)
 rename data/{mapObjects => maps/objects}/Route14.asm (100%)
 rename data/{mapObjects => maps/objects}/Route15.asm (100%)
 rename data/{mapObjects => maps/objects}/Route15Gate1F.asm (100%)
 rename data/{mapObjects => maps/objects}/Route15Gate2F.asm (100%)
 rename data/{mapObjects => maps/objects}/Route16.asm (100%)
 rename data/{mapObjects => maps/objects}/Route16FlyHouse.asm (100%)
 rename data/{mapObjects => maps/objects}/Route16Gate1F.asm (100%)
 rename data/{mapObjects => maps/objects}/Route16Gate2F.asm (100%)
 rename data/{mapObjects => maps/objects}/Route17.asm (100%)
 rename data/{mapObjects => maps/objects}/Route18.asm (100%)
 rename data/{mapObjects => maps/objects}/Route18Gate1F.asm (100%)
 rename data/{mapObjects => maps/objects}/Route18Gate2F.asm (100%)
 rename data/{mapObjects => maps/objects}/Route19.asm (100%)
 rename data/{mapObjects => maps/objects}/Route2.asm (100%)
 rename data/{mapObjects => maps/objects}/Route20.asm (100%)
 rename data/{mapObjects => maps/objects}/Route21.asm (100%)
 rename data/{mapObjects => maps/objects}/Route22.asm (100%)
 rename data/{mapObjects => maps/objects}/Route22Gate.asm (100%)
 rename data/{mapObjects => maps/objects}/Route23.asm (100%)
 rename data/{mapObjects => maps/objects}/Route24.asm (100%)
 rename data/{mapObjects => maps/objects}/Route25.asm (100%)
 rename data/{mapObjects => maps/objects}/Route2Gate.asm (100%)
 rename data/{mapObjects => maps/objects}/Route2TradeHouse.asm (100%)
 rename data/{mapObjects => maps/objects}/Route3.asm (100%)
 rename data/{mapObjects => maps/objects}/Route4.asm (100%)
 rename data/{mapObjects => maps/objects}/Route5.asm (100%)
 rename data/{mapObjects => maps/objects}/Route5Gate.asm (100%)
 rename data/{mapObjects => maps/objects}/Route6.asm (100%)
 rename data/{mapObjects => maps/objects}/Route6Gate.asm (100%)
 rename data/{mapObjects => maps/objects}/Route7.asm (100%)
 rename data/{mapObjects => maps/objects}/Route7Gate.asm (100%)
 rename data/{mapObjects => maps/objects}/Route8.asm (100%)
 rename data/{mapObjects => maps/objects}/Route8Gate.asm (100%)
 rename data/{mapObjects => maps/objects}/Route9.asm (100%)
 rename data/{mapObjects => maps/objects}/SSAnne1F.asm (100%)
 rename data/{mapObjects => maps/objects}/SSAnne1FRooms.asm (100%)
 rename data/{mapObjects => maps/objects}/SSAnne2F.asm (100%)
 rename data/{mapObjects => maps/objects}/SSAnne2FRooms.asm (100%)
 rename data/{mapObjects => maps/objects}/SSAnne3F.asm (100%)
 rename data/{mapObjects => maps/objects}/SSAnneB1F.asm (100%)
 rename data/{mapObjects => maps/objects}/SSAnneB1FRooms.asm (100%)
 rename data/{mapObjects => maps/objects}/SSAnneBow.asm (100%)
 rename data/{mapObjects => maps/objects}/SSAnneCaptainsRoom.asm (100%)
 rename data/{mapObjects => maps/objects}/SSAnneKitchen.asm (100%)
 rename data/{mapObjects => maps/objects}/SafariZoneCenter.asm (100%)
 rename data/{mapObjects => maps/objects}/SafariZoneCenterRestHouse.asm (100%)
 rename data/{mapObjects => maps/objects}/SafariZoneEast.asm (100%)
 rename data/{mapObjects => maps/objects}/SafariZoneEastRestHouse.asm (100%)
 rename data/{mapObjects => maps/objects}/SafariZoneGate.asm (100%)
 rename data/{mapObjects => maps/objects}/SafariZoneNorth.asm (100%)
 rename data/{mapObjects => maps/objects}/SafariZoneNorthRestHouse.asm (100%)
 rename data/{mapObjects => maps/objects}/SafariZoneSecretHouse.asm (100%)
 rename data/{mapObjects => maps/objects}/SafariZoneWest.asm (100%)
 rename data/{mapObjects => maps/objects}/SafariZoneWestRestHouse.asm (100%)
 rename data/{mapObjects => maps/objects}/SaffronCity.asm (100%)
 rename data/{mapObjects => maps/objects}/SaffronGym.asm (100%)
 rename data/{mapObjects => maps/objects}/SaffronMart.asm (100%)
 rename data/{mapObjects => maps/objects}/SaffronPidgeyHouse.asm (100%)
 rename data/{mapObjects => maps/objects}/SaffronPokecenter.asm (100%)
 rename data/{mapObjects => maps/objects}/SeafoamIslands1F.asm (100%)
 rename data/{mapObjects => maps/objects}/SeafoamIslandsB1F.asm (100%)
 rename data/{mapObjects => maps/objects}/SeafoamIslandsB2F.asm (100%)
 rename data/{mapObjects => maps/objects}/SeafoamIslandsB3F.asm (100%)
 rename data/{mapObjects => maps/objects}/SeafoamIslandsB4F.asm (100%)
 rename data/{mapObjects => maps/objects}/SilphCo10F.asm (100%)
 rename data/{mapObjects => maps/objects}/SilphCo11F.asm (100%)
 rename data/{mapObjects => maps/objects}/SilphCo1F.asm (100%)
 rename data/{mapObjects => maps/objects}/SilphCo2F.asm (100%)
 rename data/{mapObjects => maps/objects}/SilphCo3F.asm (100%)
 rename data/{mapObjects => maps/objects}/SilphCo4F.asm (100%)
 rename data/{mapObjects => maps/objects}/SilphCo5F.asm (100%)
 rename data/{mapObjects => maps/objects}/SilphCo6F.asm (100%)
 rename data/{mapObjects => maps/objects}/SilphCo7F.asm (100%)
 rename data/{mapObjects => maps/objects}/SilphCo8F.asm (100%)
 rename data/{mapObjects => maps/objects}/SilphCo9F.asm (100%)
 rename data/{mapObjects => maps/objects}/SilphCoElevator.asm (100%)
 rename data/{mapObjects => maps/objects}/TradeCenter.asm (100%)
 rename data/{mapObjects => maps/objects}/UndergroundPathNorthSouth.asm (100%)
 rename data/{mapObjects => maps/objects}/UndergroundPathRoute5.asm (100%)
 rename data/{mapObjects => maps/objects}/UndergroundPathRoute6.asm (100%)
 rename data/{mapObjects => maps/objects}/UndergroundPathRoute7.asm (100%)
 rename data/{mapObjects => maps/objects}/UndergroundPathRoute7Copy.asm (100%)
 rename data/{mapObjects => maps/objects}/UndergroundPathRoute8.asm (100%)
 rename data/{mapObjects => maps/objects}/UndergroundPathWestEast.asm (100%)
 rename data/{mapObjects => maps/objects}/VermilionCity.asm (100%)
 rename data/{mapObjects => maps/objects}/VermilionDock.asm (100%)
 rename data/{mapObjects => maps/objects}/VermilionGym.asm (100%)
 rename data/{mapObjects => maps/objects}/VermilionMart.asm (100%)
 rename data/{mapObjects => maps/objects}/VermilionOldRodHouse.asm (100%)
 rename data/{mapObjects => maps/objects}/VermilionPidgeyHouse.asm (100%)
 rename data/{mapObjects => maps/objects}/VermilionPokecenter.asm (100%)
 rename data/{mapObjects => maps/objects}/VermilionTradeHouse.asm (100%)
 rename data/{mapObjects => maps/objects}/VictoryRoad1F.asm (100%)
 rename data/{mapObjects => maps/objects}/VictoryRoad2F.asm (100%)
 rename data/{mapObjects => maps/objects}/VictoryRoad3F.asm (100%)
 rename data/{mapObjects => maps/objects}/ViridianCity.asm (100%)
 rename data/{mapObjects => maps/objects}/ViridianForest.asm (100%)
 rename data/{mapObjects => maps/objects}/ViridianForestNorthGate.asm (100%)
 rename data/{mapObjects => maps/objects}/ViridianForestSouthGate.asm (100%)
 rename data/{mapObjects => maps/objects}/ViridianGym.asm (100%)
 rename data/{mapObjects => maps/objects}/ViridianMart.asm (100%)
 rename data/{mapObjects => maps/objects}/ViridianNicknameHouse.asm (100%)
 rename data/{mapObjects => maps/objects}/ViridianPokecenter.asm (100%)
 rename data/{mapObjects => maps/objects}/ViridianSchoolHouse.asm (100%)
 rename data/{mapObjects => maps/objects}/WardensHouse.asm (100%)

diff --git a/data/mapHeaders/AgathasRoom.asm b/data/maps/headers/AgathasRoom.asm
similarity index 100%
rename from data/mapHeaders/AgathasRoom.asm
rename to data/maps/headers/AgathasRoom.asm
diff --git a/data/mapHeaders/BikeShop.asm b/data/maps/headers/BikeShop.asm
similarity index 100%
rename from data/mapHeaders/BikeShop.asm
rename to data/maps/headers/BikeShop.asm
diff --git a/data/mapHeaders/BillsHouse.asm b/data/maps/headers/BillsHouse.asm
similarity index 100%
rename from data/mapHeaders/BillsHouse.asm
rename to data/maps/headers/BillsHouse.asm
diff --git a/data/mapHeaders/BluesHouse.asm b/data/maps/headers/BluesHouse.asm
similarity index 100%
rename from data/mapHeaders/BluesHouse.asm
rename to data/maps/headers/BluesHouse.asm
diff --git a/data/mapHeaders/BrunosRoom.asm b/data/maps/headers/BrunosRoom.asm
similarity index 100%
rename from data/mapHeaders/BrunosRoom.asm
rename to data/maps/headers/BrunosRoom.asm
diff --git a/data/mapHeaders/CeladonChiefHouse.asm b/data/maps/headers/CeladonChiefHouse.asm
similarity index 100%
rename from data/mapHeaders/CeladonChiefHouse.asm
rename to data/maps/headers/CeladonChiefHouse.asm
diff --git a/data/mapHeaders/CeladonCity.asm b/data/maps/headers/CeladonCity.asm
similarity index 100%
rename from data/mapHeaders/CeladonCity.asm
rename to data/maps/headers/CeladonCity.asm
diff --git a/data/mapHeaders/CeladonDiner.asm b/data/maps/headers/CeladonDiner.asm
similarity index 100%
rename from data/mapHeaders/CeladonDiner.asm
rename to data/maps/headers/CeladonDiner.asm
diff --git a/data/mapHeaders/CeladonGym.asm b/data/maps/headers/CeladonGym.asm
similarity index 100%
rename from data/mapHeaders/CeladonGym.asm
rename to data/maps/headers/CeladonGym.asm
diff --git a/data/mapHeaders/CeladonHotel.asm b/data/maps/headers/CeladonHotel.asm
similarity index 100%
rename from data/mapHeaders/CeladonHotel.asm
rename to data/maps/headers/CeladonHotel.asm
diff --git a/data/mapHeaders/CeladonMansion1F.asm b/data/maps/headers/CeladonMansion1F.asm
similarity index 100%
rename from data/mapHeaders/CeladonMansion1F.asm
rename to data/maps/headers/CeladonMansion1F.asm
diff --git a/data/mapHeaders/CeladonMansion2F.asm b/data/maps/headers/CeladonMansion2F.asm
similarity index 100%
rename from data/mapHeaders/CeladonMansion2F.asm
rename to data/maps/headers/CeladonMansion2F.asm
diff --git a/data/mapHeaders/CeladonMansion3F.asm b/data/maps/headers/CeladonMansion3F.asm
similarity index 100%
rename from data/mapHeaders/CeladonMansion3F.asm
rename to data/maps/headers/CeladonMansion3F.asm
diff --git a/data/mapHeaders/CeladonMansionRoof.asm b/data/maps/headers/CeladonMansionRoof.asm
similarity index 100%
rename from data/mapHeaders/CeladonMansionRoof.asm
rename to data/maps/headers/CeladonMansionRoof.asm
diff --git a/data/mapHeaders/CeladonMansionRoofHouse.asm b/data/maps/headers/CeladonMansionRoofHouse.asm
similarity index 100%
rename from data/mapHeaders/CeladonMansionRoofHouse.asm
rename to data/maps/headers/CeladonMansionRoofHouse.asm
diff --git a/data/mapHeaders/CeladonMart1F.asm b/data/maps/headers/CeladonMart1F.asm
similarity index 100%
rename from data/mapHeaders/CeladonMart1F.asm
rename to data/maps/headers/CeladonMart1F.asm
diff --git a/data/mapHeaders/CeladonMart2F.asm b/data/maps/headers/CeladonMart2F.asm
similarity index 100%
rename from data/mapHeaders/CeladonMart2F.asm
rename to data/maps/headers/CeladonMart2F.asm
diff --git a/data/mapHeaders/CeladonMart3F.asm b/data/maps/headers/CeladonMart3F.asm
similarity index 100%
rename from data/mapHeaders/CeladonMart3F.asm
rename to data/maps/headers/CeladonMart3F.asm
diff --git a/data/mapHeaders/CeladonMart4F.asm b/data/maps/headers/CeladonMart4F.asm
similarity index 100%
rename from data/mapHeaders/CeladonMart4F.asm
rename to data/maps/headers/CeladonMart4F.asm
diff --git a/data/mapHeaders/CeladonMart5F.asm b/data/maps/headers/CeladonMart5F.asm
similarity index 100%
rename from data/mapHeaders/CeladonMart5F.asm
rename to data/maps/headers/CeladonMart5F.asm
diff --git a/data/mapHeaders/CeladonMartElevator.asm b/data/maps/headers/CeladonMartElevator.asm
similarity index 100%
rename from data/mapHeaders/CeladonMartElevator.asm
rename to data/maps/headers/CeladonMartElevator.asm
diff --git a/data/mapHeaders/CeladonMartRoof.asm b/data/maps/headers/CeladonMartRoof.asm
similarity index 100%
rename from data/mapHeaders/CeladonMartRoof.asm
rename to data/maps/headers/CeladonMartRoof.asm
diff --git a/data/mapHeaders/CeladonPokecenter.asm b/data/maps/headers/CeladonPokecenter.asm
similarity index 100%
rename from data/mapHeaders/CeladonPokecenter.asm
rename to data/maps/headers/CeladonPokecenter.asm
diff --git a/data/mapHeaders/CeruleanBadgeHouse.asm b/data/maps/headers/CeruleanBadgeHouse.asm
similarity index 100%
rename from data/mapHeaders/CeruleanBadgeHouse.asm
rename to data/maps/headers/CeruleanBadgeHouse.asm
diff --git a/data/mapHeaders/CeruleanCave1F.asm b/data/maps/headers/CeruleanCave1F.asm
similarity index 100%
rename from data/mapHeaders/CeruleanCave1F.asm
rename to data/maps/headers/CeruleanCave1F.asm
diff --git a/data/mapHeaders/CeruleanCave2F.asm b/data/maps/headers/CeruleanCave2F.asm
similarity index 100%
rename from data/mapHeaders/CeruleanCave2F.asm
rename to data/maps/headers/CeruleanCave2F.asm
diff --git a/data/mapHeaders/CeruleanCaveB1F.asm b/data/maps/headers/CeruleanCaveB1F.asm
similarity index 100%
rename from data/mapHeaders/CeruleanCaveB1F.asm
rename to data/maps/headers/CeruleanCaveB1F.asm
diff --git a/data/mapHeaders/CeruleanCity.asm b/data/maps/headers/CeruleanCity.asm
similarity index 100%
rename from data/mapHeaders/CeruleanCity.asm
rename to data/maps/headers/CeruleanCity.asm
diff --git a/data/mapHeaders/CeruleanGym.asm b/data/maps/headers/CeruleanGym.asm
similarity index 100%
rename from data/mapHeaders/CeruleanGym.asm
rename to data/maps/headers/CeruleanGym.asm
diff --git a/data/mapHeaders/CeruleanMart.asm b/data/maps/headers/CeruleanMart.asm
similarity index 100%
rename from data/mapHeaders/CeruleanMart.asm
rename to data/maps/headers/CeruleanMart.asm
diff --git a/data/mapHeaders/CeruleanPokecenter.asm b/data/maps/headers/CeruleanPokecenter.asm
similarity index 100%
rename from data/mapHeaders/CeruleanPokecenter.asm
rename to data/maps/headers/CeruleanPokecenter.asm
diff --git a/data/mapHeaders/CeruleanTradeHouse.asm b/data/maps/headers/CeruleanTradeHouse.asm
similarity index 100%
rename from data/mapHeaders/CeruleanTradeHouse.asm
rename to data/maps/headers/CeruleanTradeHouse.asm
diff --git a/data/mapHeaders/CeruleanTrashedHouse.asm b/data/maps/headers/CeruleanTrashedHouse.asm
similarity index 100%
rename from data/mapHeaders/CeruleanTrashedHouse.asm
rename to data/maps/headers/CeruleanTrashedHouse.asm
diff --git a/data/mapHeaders/ChampionsRoom.asm b/data/maps/headers/ChampionsRoom.asm
similarity index 100%
rename from data/mapHeaders/ChampionsRoom.asm
rename to data/maps/headers/ChampionsRoom.asm
diff --git a/data/mapHeaders/CinnabarGym.asm b/data/maps/headers/CinnabarGym.asm
similarity index 100%
rename from data/mapHeaders/CinnabarGym.asm
rename to data/maps/headers/CinnabarGym.asm
diff --git a/data/mapHeaders/CinnabarIsland.asm b/data/maps/headers/CinnabarIsland.asm
similarity index 100%
rename from data/mapHeaders/CinnabarIsland.asm
rename to data/maps/headers/CinnabarIsland.asm
diff --git a/data/mapHeaders/CinnabarLab.asm b/data/maps/headers/CinnabarLab.asm
similarity index 100%
rename from data/mapHeaders/CinnabarLab.asm
rename to data/maps/headers/CinnabarLab.asm
diff --git a/data/mapHeaders/CinnabarLabFossilRoom.asm b/data/maps/headers/CinnabarLabFossilRoom.asm
similarity index 100%
rename from data/mapHeaders/CinnabarLabFossilRoom.asm
rename to data/maps/headers/CinnabarLabFossilRoom.asm
diff --git a/data/mapHeaders/CinnabarLabMetronomeRoom.asm b/data/maps/headers/CinnabarLabMetronomeRoom.asm
similarity index 100%
rename from data/mapHeaders/CinnabarLabMetronomeRoom.asm
rename to data/maps/headers/CinnabarLabMetronomeRoom.asm
diff --git a/data/mapHeaders/CinnabarLabTradeRoom.asm b/data/maps/headers/CinnabarLabTradeRoom.asm
similarity index 100%
rename from data/mapHeaders/CinnabarLabTradeRoom.asm
rename to data/maps/headers/CinnabarLabTradeRoom.asm
diff --git a/data/mapHeaders/CinnabarMart.asm b/data/maps/headers/CinnabarMart.asm
similarity index 100%
rename from data/mapHeaders/CinnabarMart.asm
rename to data/maps/headers/CinnabarMart.asm
diff --git a/data/mapHeaders/CinnabarPokecenter.asm b/data/maps/headers/CinnabarPokecenter.asm
similarity index 100%
rename from data/mapHeaders/CinnabarPokecenter.asm
rename to data/maps/headers/CinnabarPokecenter.asm
diff --git a/data/mapHeaders/Colosseum.asm b/data/maps/headers/Colosseum.asm
similarity index 100%
rename from data/mapHeaders/Colosseum.asm
rename to data/maps/headers/Colosseum.asm
diff --git a/data/mapHeaders/CopycatsHouse1F.asm b/data/maps/headers/CopycatsHouse1F.asm
similarity index 100%
rename from data/mapHeaders/CopycatsHouse1F.asm
rename to data/maps/headers/CopycatsHouse1F.asm
diff --git a/data/mapHeaders/CopycatsHouse2F.asm b/data/maps/headers/CopycatsHouse2F.asm
similarity index 100%
rename from data/mapHeaders/CopycatsHouse2F.asm
rename to data/maps/headers/CopycatsHouse2F.asm
diff --git a/data/mapHeaders/Daycare.asm b/data/maps/headers/Daycare.asm
similarity index 100%
rename from data/mapHeaders/Daycare.asm
rename to data/maps/headers/Daycare.asm
diff --git a/data/mapHeaders/DiglettsCave.asm b/data/maps/headers/DiglettsCave.asm
similarity index 100%
rename from data/mapHeaders/DiglettsCave.asm
rename to data/maps/headers/DiglettsCave.asm
diff --git a/data/mapHeaders/DiglettsCaveRoute11.asm b/data/maps/headers/DiglettsCaveRoute11.asm
similarity index 100%
rename from data/mapHeaders/DiglettsCaveRoute11.asm
rename to data/maps/headers/DiglettsCaveRoute11.asm
diff --git a/data/mapHeaders/DiglettsCaveRoute2.asm b/data/maps/headers/DiglettsCaveRoute2.asm
similarity index 100%
rename from data/mapHeaders/DiglettsCaveRoute2.asm
rename to data/maps/headers/DiglettsCaveRoute2.asm
diff --git a/data/mapHeaders/FightingDojo.asm b/data/maps/headers/FightingDojo.asm
similarity index 100%
rename from data/mapHeaders/FightingDojo.asm
rename to data/maps/headers/FightingDojo.asm
diff --git a/data/mapHeaders/FuchsiaBillsGrandpasHouse.asm b/data/maps/headers/FuchsiaBillsGrandpasHouse.asm
similarity index 100%
rename from data/mapHeaders/FuchsiaBillsGrandpasHouse.asm
rename to data/maps/headers/FuchsiaBillsGrandpasHouse.asm
diff --git a/data/mapHeaders/FuchsiaCity.asm b/data/maps/headers/FuchsiaCity.asm
similarity index 100%
rename from data/mapHeaders/FuchsiaCity.asm
rename to data/maps/headers/FuchsiaCity.asm
diff --git a/data/mapHeaders/FuchsiaGoodRodHouse.asm b/data/maps/headers/FuchsiaGoodRodHouse.asm
similarity index 100%
rename from data/mapHeaders/FuchsiaGoodRodHouse.asm
rename to data/maps/headers/FuchsiaGoodRodHouse.asm
diff --git a/data/mapHeaders/FuchsiaGym.asm b/data/maps/headers/FuchsiaGym.asm
similarity index 100%
rename from data/mapHeaders/FuchsiaGym.asm
rename to data/maps/headers/FuchsiaGym.asm
diff --git a/data/mapHeaders/FuchsiaMart.asm b/data/maps/headers/FuchsiaMart.asm
similarity index 100%
rename from data/mapHeaders/FuchsiaMart.asm
rename to data/maps/headers/FuchsiaMart.asm
diff --git a/data/mapHeaders/FuchsiaMeetingRoom.asm b/data/maps/headers/FuchsiaMeetingRoom.asm
similarity index 100%
rename from data/mapHeaders/FuchsiaMeetingRoom.asm
rename to data/maps/headers/FuchsiaMeetingRoom.asm
diff --git a/data/mapHeaders/FuchsiaPokecenter.asm b/data/maps/headers/FuchsiaPokecenter.asm
similarity index 100%
rename from data/mapHeaders/FuchsiaPokecenter.asm
rename to data/maps/headers/FuchsiaPokecenter.asm
diff --git a/data/mapHeaders/GameCorner.asm b/data/maps/headers/GameCorner.asm
similarity index 100%
rename from data/mapHeaders/GameCorner.asm
rename to data/maps/headers/GameCorner.asm
diff --git a/data/mapHeaders/GameCornerPrizeRoom.asm b/data/maps/headers/GameCornerPrizeRoom.asm
similarity index 100%
rename from data/mapHeaders/GameCornerPrizeRoom.asm
rename to data/maps/headers/GameCornerPrizeRoom.asm
diff --git a/data/mapHeaders/HallOfFame.asm b/data/maps/headers/HallOfFame.asm
similarity index 100%
rename from data/mapHeaders/HallOfFame.asm
rename to data/maps/headers/HallOfFame.asm
diff --git a/data/mapHeaders/IndigoPlateau.asm b/data/maps/headers/IndigoPlateau.asm
similarity index 100%
rename from data/mapHeaders/IndigoPlateau.asm
rename to data/maps/headers/IndigoPlateau.asm
diff --git a/data/mapHeaders/IndigoPlateauLobby.asm b/data/maps/headers/IndigoPlateauLobby.asm
similarity index 100%
rename from data/mapHeaders/IndigoPlateauLobby.asm
rename to data/maps/headers/IndigoPlateauLobby.asm
diff --git a/data/mapHeaders/LancesRoom.asm b/data/maps/headers/LancesRoom.asm
similarity index 100%
rename from data/mapHeaders/LancesRoom.asm
rename to data/maps/headers/LancesRoom.asm
diff --git a/data/mapHeaders/LavenderCuboneHouse.asm b/data/maps/headers/LavenderCuboneHouse.asm
similarity index 100%
rename from data/mapHeaders/LavenderCuboneHouse.asm
rename to data/maps/headers/LavenderCuboneHouse.asm
diff --git a/data/mapHeaders/LavenderMart.asm b/data/maps/headers/LavenderMart.asm
similarity index 100%
rename from data/mapHeaders/LavenderMart.asm
rename to data/maps/headers/LavenderMart.asm
diff --git a/data/mapHeaders/LavenderPokecenter.asm b/data/maps/headers/LavenderPokecenter.asm
similarity index 100%
rename from data/mapHeaders/LavenderPokecenter.asm
rename to data/maps/headers/LavenderPokecenter.asm
diff --git a/data/mapHeaders/LavenderTown.asm b/data/maps/headers/LavenderTown.asm
similarity index 100%
rename from data/mapHeaders/LavenderTown.asm
rename to data/maps/headers/LavenderTown.asm
diff --git a/data/mapHeaders/LoreleisRoom.asm b/data/maps/headers/LoreleisRoom.asm
similarity index 100%
rename from data/mapHeaders/LoreleisRoom.asm
rename to data/maps/headers/LoreleisRoom.asm
diff --git a/data/mapHeaders/MrFujisHouse.asm b/data/maps/headers/MrFujisHouse.asm
similarity index 100%
rename from data/mapHeaders/MrFujisHouse.asm
rename to data/maps/headers/MrFujisHouse.asm
diff --git a/data/mapHeaders/MrPsychicsHouse.asm b/data/maps/headers/MrPsychicsHouse.asm
similarity index 100%
rename from data/mapHeaders/MrPsychicsHouse.asm
rename to data/maps/headers/MrPsychicsHouse.asm
diff --git a/data/mapHeaders/MtMoon1F.asm b/data/maps/headers/MtMoon1F.asm
similarity index 100%
rename from data/mapHeaders/MtMoon1F.asm
rename to data/maps/headers/MtMoon1F.asm
diff --git a/data/mapHeaders/MtMoonB1F.asm b/data/maps/headers/MtMoonB1F.asm
similarity index 100%
rename from data/mapHeaders/MtMoonB1F.asm
rename to data/maps/headers/MtMoonB1F.asm
diff --git a/data/mapHeaders/MtMoonB2F.asm b/data/maps/headers/MtMoonB2F.asm
similarity index 100%
rename from data/mapHeaders/MtMoonB2F.asm
rename to data/maps/headers/MtMoonB2F.asm
diff --git a/data/mapHeaders/MtMoonPokecenter.asm b/data/maps/headers/MtMoonPokecenter.asm
similarity index 100%
rename from data/mapHeaders/MtMoonPokecenter.asm
rename to data/maps/headers/MtMoonPokecenter.asm
diff --git a/data/mapHeaders/Museum1F.asm b/data/maps/headers/Museum1F.asm
similarity index 100%
rename from data/mapHeaders/Museum1F.asm
rename to data/maps/headers/Museum1F.asm
diff --git a/data/mapHeaders/Museum2F.asm b/data/maps/headers/Museum2F.asm
similarity index 100%
rename from data/mapHeaders/Museum2F.asm
rename to data/maps/headers/Museum2F.asm
diff --git a/data/mapHeaders/NameRatersHouse.asm b/data/maps/headers/NameRatersHouse.asm
similarity index 100%
rename from data/mapHeaders/NameRatersHouse.asm
rename to data/maps/headers/NameRatersHouse.asm
diff --git a/data/mapHeaders/OaksLab.asm b/data/maps/headers/OaksLab.asm
similarity index 100%
rename from data/mapHeaders/OaksLab.asm
rename to data/maps/headers/OaksLab.asm
diff --git a/data/mapHeaders/PalletTown.asm b/data/maps/headers/PalletTown.asm
similarity index 100%
rename from data/mapHeaders/PalletTown.asm
rename to data/maps/headers/PalletTown.asm
diff --git a/data/mapHeaders/PewterCity.asm b/data/maps/headers/PewterCity.asm
similarity index 100%
rename from data/mapHeaders/PewterCity.asm
rename to data/maps/headers/PewterCity.asm
diff --git a/data/mapHeaders/PewterGym.asm b/data/maps/headers/PewterGym.asm
similarity index 100%
rename from data/mapHeaders/PewterGym.asm
rename to data/maps/headers/PewterGym.asm
diff --git a/data/mapHeaders/PewterMart.asm b/data/maps/headers/PewterMart.asm
similarity index 100%
rename from data/mapHeaders/PewterMart.asm
rename to data/maps/headers/PewterMart.asm
diff --git a/data/mapHeaders/PewterNidoranHouse.asm b/data/maps/headers/PewterNidoranHouse.asm
similarity index 100%
rename from data/mapHeaders/PewterNidoranHouse.asm
rename to data/maps/headers/PewterNidoranHouse.asm
diff --git a/data/mapHeaders/PewterPokecenter.asm b/data/maps/headers/PewterPokecenter.asm
similarity index 100%
rename from data/mapHeaders/PewterPokecenter.asm
rename to data/maps/headers/PewterPokecenter.asm
diff --git a/data/mapHeaders/PewterSpeechHouse.asm b/data/maps/headers/PewterSpeechHouse.asm
similarity index 100%
rename from data/mapHeaders/PewterSpeechHouse.asm
rename to data/maps/headers/PewterSpeechHouse.asm
diff --git a/data/mapHeaders/PokemonFanClub.asm b/data/maps/headers/PokemonFanClub.asm
similarity index 100%
rename from data/mapHeaders/PokemonFanClub.asm
rename to data/maps/headers/PokemonFanClub.asm
diff --git a/data/mapHeaders/PokemonMansion1F.asm b/data/maps/headers/PokemonMansion1F.asm
similarity index 100%
rename from data/mapHeaders/PokemonMansion1F.asm
rename to data/maps/headers/PokemonMansion1F.asm
diff --git a/data/mapHeaders/PokemonMansion2F.asm b/data/maps/headers/PokemonMansion2F.asm
similarity index 100%
rename from data/mapHeaders/PokemonMansion2F.asm
rename to data/maps/headers/PokemonMansion2F.asm
diff --git a/data/mapHeaders/PokemonMansion3F.asm b/data/maps/headers/PokemonMansion3F.asm
similarity index 100%
rename from data/mapHeaders/PokemonMansion3F.asm
rename to data/maps/headers/PokemonMansion3F.asm
diff --git a/data/mapHeaders/PokemonMansionB1F.asm b/data/maps/headers/PokemonMansionB1F.asm
similarity index 100%
rename from data/mapHeaders/PokemonMansionB1F.asm
rename to data/maps/headers/PokemonMansionB1F.asm
diff --git a/data/mapHeaders/PokemonTower1F.asm b/data/maps/headers/PokemonTower1F.asm
similarity index 100%
rename from data/mapHeaders/PokemonTower1F.asm
rename to data/maps/headers/PokemonTower1F.asm
diff --git a/data/mapHeaders/PokemonTower2F.asm b/data/maps/headers/PokemonTower2F.asm
similarity index 100%
rename from data/mapHeaders/PokemonTower2F.asm
rename to data/maps/headers/PokemonTower2F.asm
diff --git a/data/mapHeaders/PokemonTower3F.asm b/data/maps/headers/PokemonTower3F.asm
similarity index 100%
rename from data/mapHeaders/PokemonTower3F.asm
rename to data/maps/headers/PokemonTower3F.asm
diff --git a/data/mapHeaders/PokemonTower4F.asm b/data/maps/headers/PokemonTower4F.asm
similarity index 100%
rename from data/mapHeaders/PokemonTower4F.asm
rename to data/maps/headers/PokemonTower4F.asm
diff --git a/data/mapHeaders/PokemonTower5F.asm b/data/maps/headers/PokemonTower5F.asm
similarity index 100%
rename from data/mapHeaders/PokemonTower5F.asm
rename to data/maps/headers/PokemonTower5F.asm
diff --git a/data/mapHeaders/PokemonTower6F.asm b/data/maps/headers/PokemonTower6F.asm
similarity index 100%
rename from data/mapHeaders/PokemonTower6F.asm
rename to data/maps/headers/PokemonTower6F.asm
diff --git a/data/mapHeaders/PokemonTower7F.asm b/data/maps/headers/PokemonTower7F.asm
similarity index 100%
rename from data/mapHeaders/PokemonTower7F.asm
rename to data/maps/headers/PokemonTower7F.asm
diff --git a/data/mapHeaders/PowerPlant.asm b/data/maps/headers/PowerPlant.asm
similarity index 100%
rename from data/mapHeaders/PowerPlant.asm
rename to data/maps/headers/PowerPlant.asm
diff --git a/data/mapHeaders/RedsHouse1F.asm b/data/maps/headers/RedsHouse1F.asm
similarity index 100%
rename from data/mapHeaders/RedsHouse1F.asm
rename to data/maps/headers/RedsHouse1F.asm
diff --git a/data/mapHeaders/RedsHouse2F.asm b/data/maps/headers/RedsHouse2F.asm
similarity index 100%
rename from data/mapHeaders/RedsHouse2F.asm
rename to data/maps/headers/RedsHouse2F.asm
diff --git a/data/mapHeaders/RockTunnel1F.asm b/data/maps/headers/RockTunnel1F.asm
similarity index 100%
rename from data/mapHeaders/RockTunnel1F.asm
rename to data/maps/headers/RockTunnel1F.asm
diff --git a/data/mapHeaders/RockTunnelB1F.asm b/data/maps/headers/RockTunnelB1F.asm
similarity index 100%
rename from data/mapHeaders/RockTunnelB1F.asm
rename to data/maps/headers/RockTunnelB1F.asm
diff --git a/data/mapHeaders/RockTunnelPokecenter.asm b/data/maps/headers/RockTunnelPokecenter.asm
similarity index 100%
rename from data/mapHeaders/RockTunnelPokecenter.asm
rename to data/maps/headers/RockTunnelPokecenter.asm
diff --git a/data/mapHeaders/RocketHideoutB1F.asm b/data/maps/headers/RocketHideoutB1F.asm
similarity index 100%
rename from data/mapHeaders/RocketHideoutB1F.asm
rename to data/maps/headers/RocketHideoutB1F.asm
diff --git a/data/mapHeaders/RocketHideoutB2F.asm b/data/maps/headers/RocketHideoutB2F.asm
similarity index 100%
rename from data/mapHeaders/RocketHideoutB2F.asm
rename to data/maps/headers/RocketHideoutB2F.asm
diff --git a/data/mapHeaders/RocketHideoutB3F.asm b/data/maps/headers/RocketHideoutB3F.asm
similarity index 100%
rename from data/mapHeaders/RocketHideoutB3F.asm
rename to data/maps/headers/RocketHideoutB3F.asm
diff --git a/data/mapHeaders/RocketHideoutB4F.asm b/data/maps/headers/RocketHideoutB4F.asm
similarity index 100%
rename from data/mapHeaders/RocketHideoutB4F.asm
rename to data/maps/headers/RocketHideoutB4F.asm
diff --git a/data/mapHeaders/RocketHideoutElevator.asm b/data/maps/headers/RocketHideoutElevator.asm
similarity index 100%
rename from data/mapHeaders/RocketHideoutElevator.asm
rename to data/maps/headers/RocketHideoutElevator.asm
diff --git a/data/mapHeaders/Route1.asm b/data/maps/headers/Route1.asm
similarity index 100%
rename from data/mapHeaders/Route1.asm
rename to data/maps/headers/Route1.asm
diff --git a/data/mapHeaders/Route10.asm b/data/maps/headers/Route10.asm
similarity index 100%
rename from data/mapHeaders/Route10.asm
rename to data/maps/headers/Route10.asm
diff --git a/data/mapHeaders/Route11.asm b/data/maps/headers/Route11.asm
similarity index 100%
rename from data/mapHeaders/Route11.asm
rename to data/maps/headers/Route11.asm
diff --git a/data/mapHeaders/Route11Gate1F.asm b/data/maps/headers/Route11Gate1F.asm
similarity index 100%
rename from data/mapHeaders/Route11Gate1F.asm
rename to data/maps/headers/Route11Gate1F.asm
diff --git a/data/mapHeaders/Route11Gate2F.asm b/data/maps/headers/Route11Gate2F.asm
similarity index 100%
rename from data/mapHeaders/Route11Gate2F.asm
rename to data/maps/headers/Route11Gate2F.asm
diff --git a/data/mapHeaders/Route12.asm b/data/maps/headers/Route12.asm
similarity index 100%
rename from data/mapHeaders/Route12.asm
rename to data/maps/headers/Route12.asm
diff --git a/data/mapHeaders/Route12Gate1F.asm b/data/maps/headers/Route12Gate1F.asm
similarity index 100%
rename from data/mapHeaders/Route12Gate1F.asm
rename to data/maps/headers/Route12Gate1F.asm
diff --git a/data/mapHeaders/Route12Gate2F.asm b/data/maps/headers/Route12Gate2F.asm
similarity index 100%
rename from data/mapHeaders/Route12Gate2F.asm
rename to data/maps/headers/Route12Gate2F.asm
diff --git a/data/mapHeaders/Route12SuperRodHouse.asm b/data/maps/headers/Route12SuperRodHouse.asm
similarity index 100%
rename from data/mapHeaders/Route12SuperRodHouse.asm
rename to data/maps/headers/Route12SuperRodHouse.asm
diff --git a/data/mapHeaders/Route13.asm b/data/maps/headers/Route13.asm
similarity index 100%
rename from data/mapHeaders/Route13.asm
rename to data/maps/headers/Route13.asm
diff --git a/data/mapHeaders/Route14.asm b/data/maps/headers/Route14.asm
similarity index 100%
rename from data/mapHeaders/Route14.asm
rename to data/maps/headers/Route14.asm
diff --git a/data/mapHeaders/Route15.asm b/data/maps/headers/Route15.asm
similarity index 100%
rename from data/mapHeaders/Route15.asm
rename to data/maps/headers/Route15.asm
diff --git a/data/mapHeaders/Route15Gate1F.asm b/data/maps/headers/Route15Gate1F.asm
similarity index 100%
rename from data/mapHeaders/Route15Gate1F.asm
rename to data/maps/headers/Route15Gate1F.asm
diff --git a/data/mapHeaders/Route15Gate2F.asm b/data/maps/headers/Route15Gate2F.asm
similarity index 100%
rename from data/mapHeaders/Route15Gate2F.asm
rename to data/maps/headers/Route15Gate2F.asm
diff --git a/data/mapHeaders/Route16.asm b/data/maps/headers/Route16.asm
similarity index 100%
rename from data/mapHeaders/Route16.asm
rename to data/maps/headers/Route16.asm
diff --git a/data/mapHeaders/Route16FlyHouse.asm b/data/maps/headers/Route16FlyHouse.asm
similarity index 100%
rename from data/mapHeaders/Route16FlyHouse.asm
rename to data/maps/headers/Route16FlyHouse.asm
diff --git a/data/mapHeaders/Route16Gate1F.asm b/data/maps/headers/Route16Gate1F.asm
similarity index 100%
rename from data/mapHeaders/Route16Gate1F.asm
rename to data/maps/headers/Route16Gate1F.asm
diff --git a/data/mapHeaders/Route16Gate2F.asm b/data/maps/headers/Route16Gate2F.asm
similarity index 100%
rename from data/mapHeaders/Route16Gate2F.asm
rename to data/maps/headers/Route16Gate2F.asm
diff --git a/data/mapHeaders/Route17.asm b/data/maps/headers/Route17.asm
similarity index 100%
rename from data/mapHeaders/Route17.asm
rename to data/maps/headers/Route17.asm
diff --git a/data/mapHeaders/Route18.asm b/data/maps/headers/Route18.asm
similarity index 100%
rename from data/mapHeaders/Route18.asm
rename to data/maps/headers/Route18.asm
diff --git a/data/mapHeaders/Route18Gate1F.asm b/data/maps/headers/Route18Gate1F.asm
similarity index 100%
rename from data/mapHeaders/Route18Gate1F.asm
rename to data/maps/headers/Route18Gate1F.asm
diff --git a/data/mapHeaders/Route18Gate2F.asm b/data/maps/headers/Route18Gate2F.asm
similarity index 100%
rename from data/mapHeaders/Route18Gate2F.asm
rename to data/maps/headers/Route18Gate2F.asm
diff --git a/data/mapHeaders/Route19.asm b/data/maps/headers/Route19.asm
similarity index 100%
rename from data/mapHeaders/Route19.asm
rename to data/maps/headers/Route19.asm
diff --git a/data/mapHeaders/Route2.asm b/data/maps/headers/Route2.asm
similarity index 100%
rename from data/mapHeaders/Route2.asm
rename to data/maps/headers/Route2.asm
diff --git a/data/mapHeaders/Route20.asm b/data/maps/headers/Route20.asm
similarity index 100%
rename from data/mapHeaders/Route20.asm
rename to data/maps/headers/Route20.asm
diff --git a/data/mapHeaders/Route21.asm b/data/maps/headers/Route21.asm
similarity index 100%
rename from data/mapHeaders/Route21.asm
rename to data/maps/headers/Route21.asm
diff --git a/data/mapHeaders/Route22.asm b/data/maps/headers/Route22.asm
similarity index 100%
rename from data/mapHeaders/Route22.asm
rename to data/maps/headers/Route22.asm
diff --git a/data/mapHeaders/Route22Gate.asm b/data/maps/headers/Route22Gate.asm
similarity index 100%
rename from data/mapHeaders/Route22Gate.asm
rename to data/maps/headers/Route22Gate.asm
diff --git a/data/mapHeaders/Route23.asm b/data/maps/headers/Route23.asm
similarity index 100%
rename from data/mapHeaders/Route23.asm
rename to data/maps/headers/Route23.asm
diff --git a/data/mapHeaders/Route24.asm b/data/maps/headers/Route24.asm
similarity index 100%
rename from data/mapHeaders/Route24.asm
rename to data/maps/headers/Route24.asm
diff --git a/data/mapHeaders/Route25.asm b/data/maps/headers/Route25.asm
similarity index 100%
rename from data/mapHeaders/Route25.asm
rename to data/maps/headers/Route25.asm
diff --git a/data/mapHeaders/Route2Gate.asm b/data/maps/headers/Route2Gate.asm
similarity index 100%
rename from data/mapHeaders/Route2Gate.asm
rename to data/maps/headers/Route2Gate.asm
diff --git a/data/mapHeaders/Route2TradeHouse.asm b/data/maps/headers/Route2TradeHouse.asm
similarity index 100%
rename from data/mapHeaders/Route2TradeHouse.asm
rename to data/maps/headers/Route2TradeHouse.asm
diff --git a/data/mapHeaders/Route3.asm b/data/maps/headers/Route3.asm
similarity index 100%
rename from data/mapHeaders/Route3.asm
rename to data/maps/headers/Route3.asm
diff --git a/data/mapHeaders/Route4.asm b/data/maps/headers/Route4.asm
similarity index 100%
rename from data/mapHeaders/Route4.asm
rename to data/maps/headers/Route4.asm
diff --git a/data/mapHeaders/Route5.asm b/data/maps/headers/Route5.asm
similarity index 100%
rename from data/mapHeaders/Route5.asm
rename to data/maps/headers/Route5.asm
diff --git a/data/mapHeaders/Route5Gate.asm b/data/maps/headers/Route5Gate.asm
similarity index 100%
rename from data/mapHeaders/Route5Gate.asm
rename to data/maps/headers/Route5Gate.asm
diff --git a/data/mapHeaders/Route6.asm b/data/maps/headers/Route6.asm
similarity index 100%
rename from data/mapHeaders/Route6.asm
rename to data/maps/headers/Route6.asm
diff --git a/data/mapHeaders/Route6Gate.asm b/data/maps/headers/Route6Gate.asm
similarity index 100%
rename from data/mapHeaders/Route6Gate.asm
rename to data/maps/headers/Route6Gate.asm
diff --git a/data/mapHeaders/Route7.asm b/data/maps/headers/Route7.asm
similarity index 100%
rename from data/mapHeaders/Route7.asm
rename to data/maps/headers/Route7.asm
diff --git a/data/mapHeaders/Route7Gate.asm b/data/maps/headers/Route7Gate.asm
similarity index 100%
rename from data/mapHeaders/Route7Gate.asm
rename to data/maps/headers/Route7Gate.asm
diff --git a/data/mapHeaders/Route8.asm b/data/maps/headers/Route8.asm
similarity index 100%
rename from data/mapHeaders/Route8.asm
rename to data/maps/headers/Route8.asm
diff --git a/data/mapHeaders/Route8Gate.asm b/data/maps/headers/Route8Gate.asm
similarity index 100%
rename from data/mapHeaders/Route8Gate.asm
rename to data/maps/headers/Route8Gate.asm
diff --git a/data/mapHeaders/Route9.asm b/data/maps/headers/Route9.asm
similarity index 100%
rename from data/mapHeaders/Route9.asm
rename to data/maps/headers/Route9.asm
diff --git a/data/mapHeaders/SSAnne1F.asm b/data/maps/headers/SSAnne1F.asm
similarity index 100%
rename from data/mapHeaders/SSAnne1F.asm
rename to data/maps/headers/SSAnne1F.asm
diff --git a/data/mapHeaders/SSAnne1FRooms.asm b/data/maps/headers/SSAnne1FRooms.asm
similarity index 100%
rename from data/mapHeaders/SSAnne1FRooms.asm
rename to data/maps/headers/SSAnne1FRooms.asm
diff --git a/data/mapHeaders/SSAnne2F.asm b/data/maps/headers/SSAnne2F.asm
similarity index 100%
rename from data/mapHeaders/SSAnne2F.asm
rename to data/maps/headers/SSAnne2F.asm
diff --git a/data/mapHeaders/SSAnne2FRooms.asm b/data/maps/headers/SSAnne2FRooms.asm
similarity index 100%
rename from data/mapHeaders/SSAnne2FRooms.asm
rename to data/maps/headers/SSAnne2FRooms.asm
diff --git a/data/mapHeaders/SSAnne3F.asm b/data/maps/headers/SSAnne3F.asm
similarity index 100%
rename from data/mapHeaders/SSAnne3F.asm
rename to data/maps/headers/SSAnne3F.asm
diff --git a/data/mapHeaders/SSAnneB1F.asm b/data/maps/headers/SSAnneB1F.asm
similarity index 100%
rename from data/mapHeaders/SSAnneB1F.asm
rename to data/maps/headers/SSAnneB1F.asm
diff --git a/data/mapHeaders/SSAnneB1FRooms.asm b/data/maps/headers/SSAnneB1FRooms.asm
similarity index 100%
rename from data/mapHeaders/SSAnneB1FRooms.asm
rename to data/maps/headers/SSAnneB1FRooms.asm
diff --git a/data/mapHeaders/SSAnneBow.asm b/data/maps/headers/SSAnneBow.asm
similarity index 100%
rename from data/mapHeaders/SSAnneBow.asm
rename to data/maps/headers/SSAnneBow.asm
diff --git a/data/mapHeaders/SSAnneCaptainsRoom.asm b/data/maps/headers/SSAnneCaptainsRoom.asm
similarity index 100%
rename from data/mapHeaders/SSAnneCaptainsRoom.asm
rename to data/maps/headers/SSAnneCaptainsRoom.asm
diff --git a/data/mapHeaders/SSAnneKitchen.asm b/data/maps/headers/SSAnneKitchen.asm
similarity index 100%
rename from data/mapHeaders/SSAnneKitchen.asm
rename to data/maps/headers/SSAnneKitchen.asm
diff --git a/data/mapHeaders/SafariZoneCenter.asm b/data/maps/headers/SafariZoneCenter.asm
similarity index 100%
rename from data/mapHeaders/SafariZoneCenter.asm
rename to data/maps/headers/SafariZoneCenter.asm
diff --git a/data/mapHeaders/SafariZoneCenterRestHouse.asm b/data/maps/headers/SafariZoneCenterRestHouse.asm
similarity index 100%
rename from data/mapHeaders/SafariZoneCenterRestHouse.asm
rename to data/maps/headers/SafariZoneCenterRestHouse.asm
diff --git a/data/mapHeaders/SafariZoneEast.asm b/data/maps/headers/SafariZoneEast.asm
similarity index 100%
rename from data/mapHeaders/SafariZoneEast.asm
rename to data/maps/headers/SafariZoneEast.asm
diff --git a/data/mapHeaders/SafariZoneEastRestHouse.asm b/data/maps/headers/SafariZoneEastRestHouse.asm
similarity index 100%
rename from data/mapHeaders/SafariZoneEastRestHouse.asm
rename to data/maps/headers/SafariZoneEastRestHouse.asm
diff --git a/data/mapHeaders/SafariZoneGate.asm b/data/maps/headers/SafariZoneGate.asm
similarity index 100%
rename from data/mapHeaders/SafariZoneGate.asm
rename to data/maps/headers/SafariZoneGate.asm
diff --git a/data/mapHeaders/SafariZoneNorth.asm b/data/maps/headers/SafariZoneNorth.asm
similarity index 100%
rename from data/mapHeaders/SafariZoneNorth.asm
rename to data/maps/headers/SafariZoneNorth.asm
diff --git a/data/mapHeaders/SafariZoneNorthRestHouse.asm b/data/maps/headers/SafariZoneNorthRestHouse.asm
similarity index 100%
rename from data/mapHeaders/SafariZoneNorthRestHouse.asm
rename to data/maps/headers/SafariZoneNorthRestHouse.asm
diff --git a/data/mapHeaders/SafariZoneSecretHouse.asm b/data/maps/headers/SafariZoneSecretHouse.asm
similarity index 100%
rename from data/mapHeaders/SafariZoneSecretHouse.asm
rename to data/maps/headers/SafariZoneSecretHouse.asm
diff --git a/data/mapHeaders/SafariZoneWest.asm b/data/maps/headers/SafariZoneWest.asm
similarity index 100%
rename from data/mapHeaders/SafariZoneWest.asm
rename to data/maps/headers/SafariZoneWest.asm
diff --git a/data/mapHeaders/SafariZoneWestRestHouse.asm b/data/maps/headers/SafariZoneWestRestHouse.asm
similarity index 100%
rename from data/mapHeaders/SafariZoneWestRestHouse.asm
rename to data/maps/headers/SafariZoneWestRestHouse.asm
diff --git a/data/mapHeaders/SaffronCity.asm b/data/maps/headers/SaffronCity.asm
similarity index 100%
rename from data/mapHeaders/SaffronCity.asm
rename to data/maps/headers/SaffronCity.asm
diff --git a/data/mapHeaders/SaffronGym.asm b/data/maps/headers/SaffronGym.asm
similarity index 100%
rename from data/mapHeaders/SaffronGym.asm
rename to data/maps/headers/SaffronGym.asm
diff --git a/data/mapHeaders/SaffronMart.asm b/data/maps/headers/SaffronMart.asm
similarity index 100%
rename from data/mapHeaders/SaffronMart.asm
rename to data/maps/headers/SaffronMart.asm
diff --git a/data/mapHeaders/SaffronPidgeyHouse.asm b/data/maps/headers/SaffronPidgeyHouse.asm
similarity index 100%
rename from data/mapHeaders/SaffronPidgeyHouse.asm
rename to data/maps/headers/SaffronPidgeyHouse.asm
diff --git a/data/mapHeaders/SaffronPokecenter.asm b/data/maps/headers/SaffronPokecenter.asm
similarity index 100%
rename from data/mapHeaders/SaffronPokecenter.asm
rename to data/maps/headers/SaffronPokecenter.asm
diff --git a/data/mapHeaders/SeafoamIslands1F.asm b/data/maps/headers/SeafoamIslands1F.asm
similarity index 100%
rename from data/mapHeaders/SeafoamIslands1F.asm
rename to data/maps/headers/SeafoamIslands1F.asm
diff --git a/data/mapHeaders/SeafoamIslandsB1F.asm b/data/maps/headers/SeafoamIslandsB1F.asm
similarity index 100%
rename from data/mapHeaders/SeafoamIslandsB1F.asm
rename to data/maps/headers/SeafoamIslandsB1F.asm
diff --git a/data/mapHeaders/SeafoamIslandsB2F.asm b/data/maps/headers/SeafoamIslandsB2F.asm
similarity index 100%
rename from data/mapHeaders/SeafoamIslandsB2F.asm
rename to data/maps/headers/SeafoamIslandsB2F.asm
diff --git a/data/mapHeaders/SeafoamIslandsB3F.asm b/data/maps/headers/SeafoamIslandsB3F.asm
similarity index 100%
rename from data/mapHeaders/SeafoamIslandsB3F.asm
rename to data/maps/headers/SeafoamIslandsB3F.asm
diff --git a/data/mapHeaders/SeafoamIslandsB4F.asm b/data/maps/headers/SeafoamIslandsB4F.asm
similarity index 100%
rename from data/mapHeaders/SeafoamIslandsB4F.asm
rename to data/maps/headers/SeafoamIslandsB4F.asm
diff --git a/data/mapHeaders/SilphCo10F.asm b/data/maps/headers/SilphCo10F.asm
similarity index 100%
rename from data/mapHeaders/SilphCo10F.asm
rename to data/maps/headers/SilphCo10F.asm
diff --git a/data/mapHeaders/SilphCo11F.asm b/data/maps/headers/SilphCo11F.asm
similarity index 100%
rename from data/mapHeaders/SilphCo11F.asm
rename to data/maps/headers/SilphCo11F.asm
diff --git a/data/mapHeaders/SilphCo1F.asm b/data/maps/headers/SilphCo1F.asm
similarity index 100%
rename from data/mapHeaders/SilphCo1F.asm
rename to data/maps/headers/SilphCo1F.asm
diff --git a/data/mapHeaders/SilphCo2F.asm b/data/maps/headers/SilphCo2F.asm
similarity index 100%
rename from data/mapHeaders/SilphCo2F.asm
rename to data/maps/headers/SilphCo2F.asm
diff --git a/data/mapHeaders/SilphCo3F.asm b/data/maps/headers/SilphCo3F.asm
similarity index 100%
rename from data/mapHeaders/SilphCo3F.asm
rename to data/maps/headers/SilphCo3F.asm
diff --git a/data/mapHeaders/SilphCo4F.asm b/data/maps/headers/SilphCo4F.asm
similarity index 100%
rename from data/mapHeaders/SilphCo4F.asm
rename to data/maps/headers/SilphCo4F.asm
diff --git a/data/mapHeaders/SilphCo5F.asm b/data/maps/headers/SilphCo5F.asm
similarity index 100%
rename from data/mapHeaders/SilphCo5F.asm
rename to data/maps/headers/SilphCo5F.asm
diff --git a/data/mapHeaders/SilphCo6F.asm b/data/maps/headers/SilphCo6F.asm
similarity index 100%
rename from data/mapHeaders/SilphCo6F.asm
rename to data/maps/headers/SilphCo6F.asm
diff --git a/data/mapHeaders/SilphCo7F.asm b/data/maps/headers/SilphCo7F.asm
similarity index 100%
rename from data/mapHeaders/SilphCo7F.asm
rename to data/maps/headers/SilphCo7F.asm
diff --git a/data/mapHeaders/SilphCo8F.asm b/data/maps/headers/SilphCo8F.asm
similarity index 100%
rename from data/mapHeaders/SilphCo8F.asm
rename to data/maps/headers/SilphCo8F.asm
diff --git a/data/mapHeaders/SilphCo9F.asm b/data/maps/headers/SilphCo9F.asm
similarity index 100%
rename from data/mapHeaders/SilphCo9F.asm
rename to data/maps/headers/SilphCo9F.asm
diff --git a/data/mapHeaders/SilphCoElevator.asm b/data/maps/headers/SilphCoElevator.asm
similarity index 100%
rename from data/mapHeaders/SilphCoElevator.asm
rename to data/maps/headers/SilphCoElevator.asm
diff --git a/data/mapHeaders/TradeCenter.asm b/data/maps/headers/TradeCenter.asm
similarity index 100%
rename from data/mapHeaders/TradeCenter.asm
rename to data/maps/headers/TradeCenter.asm
diff --git a/data/mapHeaders/UndergroundPathNorthSouth.asm b/data/maps/headers/UndergroundPathNorthSouth.asm
similarity index 100%
rename from data/mapHeaders/UndergroundPathNorthSouth.asm
rename to data/maps/headers/UndergroundPathNorthSouth.asm
diff --git a/data/mapHeaders/UndergroundPathRoute5.asm b/data/maps/headers/UndergroundPathRoute5.asm
similarity index 100%
rename from data/mapHeaders/UndergroundPathRoute5.asm
rename to data/maps/headers/UndergroundPathRoute5.asm
diff --git a/data/mapHeaders/UndergroundPathRoute6.asm b/data/maps/headers/UndergroundPathRoute6.asm
similarity index 100%
rename from data/mapHeaders/UndergroundPathRoute6.asm
rename to data/maps/headers/UndergroundPathRoute6.asm
diff --git a/data/mapHeaders/UndergroundPathRoute7.asm b/data/maps/headers/UndergroundPathRoute7.asm
similarity index 100%
rename from data/mapHeaders/UndergroundPathRoute7.asm
rename to data/maps/headers/UndergroundPathRoute7.asm
diff --git a/data/mapHeaders/UndergroundPathRoute7Copy.asm b/data/maps/headers/UndergroundPathRoute7Copy.asm
similarity index 100%
rename from data/mapHeaders/UndergroundPathRoute7Copy.asm
rename to data/maps/headers/UndergroundPathRoute7Copy.asm
diff --git a/data/mapHeaders/UndergroundPathRoute8.asm b/data/maps/headers/UndergroundPathRoute8.asm
similarity index 100%
rename from data/mapHeaders/UndergroundPathRoute8.asm
rename to data/maps/headers/UndergroundPathRoute8.asm
diff --git a/data/mapHeaders/UndergroundPathWestEast.asm b/data/maps/headers/UndergroundPathWestEast.asm
similarity index 100%
rename from data/mapHeaders/UndergroundPathWestEast.asm
rename to data/maps/headers/UndergroundPathWestEast.asm
diff --git a/data/mapHeaders/VermilionCity.asm b/data/maps/headers/VermilionCity.asm
similarity index 100%
rename from data/mapHeaders/VermilionCity.asm
rename to data/maps/headers/VermilionCity.asm
diff --git a/data/mapHeaders/VermilionDock.asm b/data/maps/headers/VermilionDock.asm
similarity index 100%
rename from data/mapHeaders/VermilionDock.asm
rename to data/maps/headers/VermilionDock.asm
diff --git a/data/mapHeaders/VermilionGym.asm b/data/maps/headers/VermilionGym.asm
similarity index 100%
rename from data/mapHeaders/VermilionGym.asm
rename to data/maps/headers/VermilionGym.asm
diff --git a/data/mapHeaders/VermilionMart.asm b/data/maps/headers/VermilionMart.asm
similarity index 100%
rename from data/mapHeaders/VermilionMart.asm
rename to data/maps/headers/VermilionMart.asm
diff --git a/data/mapHeaders/VermilionOldRodHouse.asm b/data/maps/headers/VermilionOldRodHouse.asm
similarity index 100%
rename from data/mapHeaders/VermilionOldRodHouse.asm
rename to data/maps/headers/VermilionOldRodHouse.asm
diff --git a/data/mapHeaders/VermilionPidgeyHouse.asm b/data/maps/headers/VermilionPidgeyHouse.asm
similarity index 100%
rename from data/mapHeaders/VermilionPidgeyHouse.asm
rename to data/maps/headers/VermilionPidgeyHouse.asm
diff --git a/data/mapHeaders/VermilionPokecenter.asm b/data/maps/headers/VermilionPokecenter.asm
similarity index 100%
rename from data/mapHeaders/VermilionPokecenter.asm
rename to data/maps/headers/VermilionPokecenter.asm
diff --git a/data/mapHeaders/VermilionTradeHouse.asm b/data/maps/headers/VermilionTradeHouse.asm
similarity index 100%
rename from data/mapHeaders/VermilionTradeHouse.asm
rename to data/maps/headers/VermilionTradeHouse.asm
diff --git a/data/mapHeaders/VictoryRoad1F.asm b/data/maps/headers/VictoryRoad1F.asm
similarity index 100%
rename from data/mapHeaders/VictoryRoad1F.asm
rename to data/maps/headers/VictoryRoad1F.asm
diff --git a/data/mapHeaders/VictoryRoad2F.asm b/data/maps/headers/VictoryRoad2F.asm
similarity index 100%
rename from data/mapHeaders/VictoryRoad2F.asm
rename to data/maps/headers/VictoryRoad2F.asm
diff --git a/data/mapHeaders/VictoryRoad3F.asm b/data/maps/headers/VictoryRoad3F.asm
similarity index 100%
rename from data/mapHeaders/VictoryRoad3F.asm
rename to data/maps/headers/VictoryRoad3F.asm
diff --git a/data/mapHeaders/ViridianCity.asm b/data/maps/headers/ViridianCity.asm
similarity index 100%
rename from data/mapHeaders/ViridianCity.asm
rename to data/maps/headers/ViridianCity.asm
diff --git a/data/mapHeaders/ViridianForest.asm b/data/maps/headers/ViridianForest.asm
similarity index 100%
rename from data/mapHeaders/ViridianForest.asm
rename to data/maps/headers/ViridianForest.asm
diff --git a/data/mapHeaders/ViridianForestNorthGate.asm b/data/maps/headers/ViridianForestNorthGate.asm
similarity index 100%
rename from data/mapHeaders/ViridianForestNorthGate.asm
rename to data/maps/headers/ViridianForestNorthGate.asm
diff --git a/data/mapHeaders/ViridianForestSouthGate.asm b/data/maps/headers/ViridianForestSouthGate.asm
similarity index 100%
rename from data/mapHeaders/ViridianForestSouthGate.asm
rename to data/maps/headers/ViridianForestSouthGate.asm
diff --git a/data/mapHeaders/ViridianGym.asm b/data/maps/headers/ViridianGym.asm
similarity index 100%
rename from data/mapHeaders/ViridianGym.asm
rename to data/maps/headers/ViridianGym.asm
diff --git a/data/mapHeaders/ViridianMart.asm b/data/maps/headers/ViridianMart.asm
similarity index 100%
rename from data/mapHeaders/ViridianMart.asm
rename to data/maps/headers/ViridianMart.asm
diff --git a/data/mapHeaders/ViridianNicknameHouse.asm b/data/maps/headers/ViridianNicknameHouse.asm
similarity index 100%
rename from data/mapHeaders/ViridianNicknameHouse.asm
rename to data/maps/headers/ViridianNicknameHouse.asm
diff --git a/data/mapHeaders/ViridianPokecenter.asm b/data/maps/headers/ViridianPokecenter.asm
similarity index 100%
rename from data/mapHeaders/ViridianPokecenter.asm
rename to data/maps/headers/ViridianPokecenter.asm
diff --git a/data/mapHeaders/ViridianSchoolHouse.asm b/data/maps/headers/ViridianSchoolHouse.asm
similarity index 100%
rename from data/mapHeaders/ViridianSchoolHouse.asm
rename to data/maps/headers/ViridianSchoolHouse.asm
diff --git a/data/mapHeaders/WardensHouse.asm b/data/maps/headers/WardensHouse.asm
similarity index 100%
rename from data/mapHeaders/WardensHouse.asm
rename to data/maps/headers/WardensHouse.asm
diff --git a/data/mapObjects/AgathasRoom.asm b/data/maps/objects/AgathasRoom.asm
similarity index 100%
rename from data/mapObjects/AgathasRoom.asm
rename to data/maps/objects/AgathasRoom.asm
diff --git a/data/mapObjects/BikeShop.asm b/data/maps/objects/BikeShop.asm
similarity index 100%
rename from data/mapObjects/BikeShop.asm
rename to data/maps/objects/BikeShop.asm
diff --git a/data/mapObjects/BillsHouse.asm b/data/maps/objects/BillsHouse.asm
similarity index 100%
rename from data/mapObjects/BillsHouse.asm
rename to data/maps/objects/BillsHouse.asm
diff --git a/data/mapObjects/BluesHouse.asm b/data/maps/objects/BluesHouse.asm
similarity index 100%
rename from data/mapObjects/BluesHouse.asm
rename to data/maps/objects/BluesHouse.asm
diff --git a/data/mapObjects/BrunosRoom.asm b/data/maps/objects/BrunosRoom.asm
similarity index 100%
rename from data/mapObjects/BrunosRoom.asm
rename to data/maps/objects/BrunosRoom.asm
diff --git a/data/mapObjects/CeladonChiefHouse.asm b/data/maps/objects/CeladonChiefHouse.asm
similarity index 100%
rename from data/mapObjects/CeladonChiefHouse.asm
rename to data/maps/objects/CeladonChiefHouse.asm
diff --git a/data/mapObjects/CeladonCity.asm b/data/maps/objects/CeladonCity.asm
similarity index 100%
rename from data/mapObjects/CeladonCity.asm
rename to data/maps/objects/CeladonCity.asm
diff --git a/data/mapObjects/CeladonDiner.asm b/data/maps/objects/CeladonDiner.asm
similarity index 100%
rename from data/mapObjects/CeladonDiner.asm
rename to data/maps/objects/CeladonDiner.asm
diff --git a/data/mapObjects/CeladonGym.asm b/data/maps/objects/CeladonGym.asm
similarity index 100%
rename from data/mapObjects/CeladonGym.asm
rename to data/maps/objects/CeladonGym.asm
diff --git a/data/mapObjects/CeladonHotel.asm b/data/maps/objects/CeladonHotel.asm
similarity index 100%
rename from data/mapObjects/CeladonHotel.asm
rename to data/maps/objects/CeladonHotel.asm
diff --git a/data/mapObjects/CeladonMansion1F.asm b/data/maps/objects/CeladonMansion1F.asm
similarity index 100%
rename from data/mapObjects/CeladonMansion1F.asm
rename to data/maps/objects/CeladonMansion1F.asm
diff --git a/data/mapObjects/CeladonMansion2F.asm b/data/maps/objects/CeladonMansion2F.asm
similarity index 100%
rename from data/mapObjects/CeladonMansion2F.asm
rename to data/maps/objects/CeladonMansion2F.asm
diff --git a/data/mapObjects/CeladonMansion3F.asm b/data/maps/objects/CeladonMansion3F.asm
similarity index 100%
rename from data/mapObjects/CeladonMansion3F.asm
rename to data/maps/objects/CeladonMansion3F.asm
diff --git a/data/mapObjects/CeladonMansionRoof.asm b/data/maps/objects/CeladonMansionRoof.asm
similarity index 100%
rename from data/mapObjects/CeladonMansionRoof.asm
rename to data/maps/objects/CeladonMansionRoof.asm
diff --git a/data/mapObjects/CeladonMansionRoofHouse.asm b/data/maps/objects/CeladonMansionRoofHouse.asm
similarity index 100%
rename from data/mapObjects/CeladonMansionRoofHouse.asm
rename to data/maps/objects/CeladonMansionRoofHouse.asm
diff --git a/data/mapObjects/CeladonMart1F.asm b/data/maps/objects/CeladonMart1F.asm
similarity index 100%
rename from data/mapObjects/CeladonMart1F.asm
rename to data/maps/objects/CeladonMart1F.asm
diff --git a/data/mapObjects/CeladonMart2F.asm b/data/maps/objects/CeladonMart2F.asm
similarity index 100%
rename from data/mapObjects/CeladonMart2F.asm
rename to data/maps/objects/CeladonMart2F.asm
diff --git a/data/mapObjects/CeladonMart3F.asm b/data/maps/objects/CeladonMart3F.asm
similarity index 100%
rename from data/mapObjects/CeladonMart3F.asm
rename to data/maps/objects/CeladonMart3F.asm
diff --git a/data/mapObjects/CeladonMart4F.asm b/data/maps/objects/CeladonMart4F.asm
similarity index 100%
rename from data/mapObjects/CeladonMart4F.asm
rename to data/maps/objects/CeladonMart4F.asm
diff --git a/data/mapObjects/CeladonMart5F.asm b/data/maps/objects/CeladonMart5F.asm
similarity index 100%
rename from data/mapObjects/CeladonMart5F.asm
rename to data/maps/objects/CeladonMart5F.asm
diff --git a/data/mapObjects/CeladonMartElevator.asm b/data/maps/objects/CeladonMartElevator.asm
similarity index 100%
rename from data/mapObjects/CeladonMartElevator.asm
rename to data/maps/objects/CeladonMartElevator.asm
diff --git a/data/mapObjects/CeladonMartRoof.asm b/data/maps/objects/CeladonMartRoof.asm
similarity index 100%
rename from data/mapObjects/CeladonMartRoof.asm
rename to data/maps/objects/CeladonMartRoof.asm
diff --git a/data/mapObjects/CeladonPokecenter.asm b/data/maps/objects/CeladonPokecenter.asm
similarity index 100%
rename from data/mapObjects/CeladonPokecenter.asm
rename to data/maps/objects/CeladonPokecenter.asm
diff --git a/data/mapObjects/CeruleanBadgeHouse.asm b/data/maps/objects/CeruleanBadgeHouse.asm
similarity index 100%
rename from data/mapObjects/CeruleanBadgeHouse.asm
rename to data/maps/objects/CeruleanBadgeHouse.asm
diff --git a/data/mapObjects/CeruleanCave1F.asm b/data/maps/objects/CeruleanCave1F.asm
similarity index 100%
rename from data/mapObjects/CeruleanCave1F.asm
rename to data/maps/objects/CeruleanCave1F.asm
diff --git a/data/mapObjects/CeruleanCave2F.asm b/data/maps/objects/CeruleanCave2F.asm
similarity index 100%
rename from data/mapObjects/CeruleanCave2F.asm
rename to data/maps/objects/CeruleanCave2F.asm
diff --git a/data/mapObjects/CeruleanCaveB1F.asm b/data/maps/objects/CeruleanCaveB1F.asm
similarity index 100%
rename from data/mapObjects/CeruleanCaveB1F.asm
rename to data/maps/objects/CeruleanCaveB1F.asm
diff --git a/data/mapObjects/CeruleanCity.asm b/data/maps/objects/CeruleanCity.asm
similarity index 100%
rename from data/mapObjects/CeruleanCity.asm
rename to data/maps/objects/CeruleanCity.asm
diff --git a/data/mapObjects/CeruleanGym.asm b/data/maps/objects/CeruleanGym.asm
similarity index 100%
rename from data/mapObjects/CeruleanGym.asm
rename to data/maps/objects/CeruleanGym.asm
diff --git a/data/mapObjects/CeruleanMart.asm b/data/maps/objects/CeruleanMart.asm
similarity index 100%
rename from data/mapObjects/CeruleanMart.asm
rename to data/maps/objects/CeruleanMart.asm
diff --git a/data/mapObjects/CeruleanPokecenter.asm b/data/maps/objects/CeruleanPokecenter.asm
similarity index 100%
rename from data/mapObjects/CeruleanPokecenter.asm
rename to data/maps/objects/CeruleanPokecenter.asm
diff --git a/data/mapObjects/CeruleanTradeHouse.asm b/data/maps/objects/CeruleanTradeHouse.asm
similarity index 100%
rename from data/mapObjects/CeruleanTradeHouse.asm
rename to data/maps/objects/CeruleanTradeHouse.asm
diff --git a/data/mapObjects/CeruleanTrashedHouse.asm b/data/maps/objects/CeruleanTrashedHouse.asm
similarity index 100%
rename from data/mapObjects/CeruleanTrashedHouse.asm
rename to data/maps/objects/CeruleanTrashedHouse.asm
diff --git a/data/mapObjects/ChampionsRoom.asm b/data/maps/objects/ChampionsRoom.asm
similarity index 100%
rename from data/mapObjects/ChampionsRoom.asm
rename to data/maps/objects/ChampionsRoom.asm
diff --git a/data/mapObjects/CinnabarGym.asm b/data/maps/objects/CinnabarGym.asm
similarity index 100%
rename from data/mapObjects/CinnabarGym.asm
rename to data/maps/objects/CinnabarGym.asm
diff --git a/data/mapObjects/CinnabarIsland.asm b/data/maps/objects/CinnabarIsland.asm
similarity index 100%
rename from data/mapObjects/CinnabarIsland.asm
rename to data/maps/objects/CinnabarIsland.asm
diff --git a/data/mapObjects/CinnabarLab.asm b/data/maps/objects/CinnabarLab.asm
similarity index 100%
rename from data/mapObjects/CinnabarLab.asm
rename to data/maps/objects/CinnabarLab.asm
diff --git a/data/mapObjects/CinnabarLabFossilRoom.asm b/data/maps/objects/CinnabarLabFossilRoom.asm
similarity index 100%
rename from data/mapObjects/CinnabarLabFossilRoom.asm
rename to data/maps/objects/CinnabarLabFossilRoom.asm
diff --git a/data/mapObjects/CinnabarLabMetronomeRoom.asm b/data/maps/objects/CinnabarLabMetronomeRoom.asm
similarity index 100%
rename from data/mapObjects/CinnabarLabMetronomeRoom.asm
rename to data/maps/objects/CinnabarLabMetronomeRoom.asm
diff --git a/data/mapObjects/CinnabarLabTradeRoom.asm b/data/maps/objects/CinnabarLabTradeRoom.asm
similarity index 100%
rename from data/mapObjects/CinnabarLabTradeRoom.asm
rename to data/maps/objects/CinnabarLabTradeRoom.asm
diff --git a/data/mapObjects/CinnabarMart.asm b/data/maps/objects/CinnabarMart.asm
similarity index 100%
rename from data/mapObjects/CinnabarMart.asm
rename to data/maps/objects/CinnabarMart.asm
diff --git a/data/mapObjects/CinnabarPokecenter.asm b/data/maps/objects/CinnabarPokecenter.asm
similarity index 100%
rename from data/mapObjects/CinnabarPokecenter.asm
rename to data/maps/objects/CinnabarPokecenter.asm
diff --git a/data/mapObjects/Colosseum.asm b/data/maps/objects/Colosseum.asm
similarity index 100%
rename from data/mapObjects/Colosseum.asm
rename to data/maps/objects/Colosseum.asm
diff --git a/data/mapObjects/CopycatsHouse1F.asm b/data/maps/objects/CopycatsHouse1F.asm
similarity index 100%
rename from data/mapObjects/CopycatsHouse1F.asm
rename to data/maps/objects/CopycatsHouse1F.asm
diff --git a/data/mapObjects/CopycatsHouse2F.asm b/data/maps/objects/CopycatsHouse2F.asm
similarity index 100%
rename from data/mapObjects/CopycatsHouse2F.asm
rename to data/maps/objects/CopycatsHouse2F.asm
diff --git a/data/mapObjects/Daycare.asm b/data/maps/objects/Daycare.asm
similarity index 100%
rename from data/mapObjects/Daycare.asm
rename to data/maps/objects/Daycare.asm
diff --git a/data/mapObjects/DiglettsCave.asm b/data/maps/objects/DiglettsCave.asm
similarity index 100%
rename from data/mapObjects/DiglettsCave.asm
rename to data/maps/objects/DiglettsCave.asm
diff --git a/data/mapObjects/DiglettsCaveRoute11.asm b/data/maps/objects/DiglettsCaveRoute11.asm
similarity index 100%
rename from data/mapObjects/DiglettsCaveRoute11.asm
rename to data/maps/objects/DiglettsCaveRoute11.asm
diff --git a/data/mapObjects/DiglettsCaveRoute2.asm b/data/maps/objects/DiglettsCaveRoute2.asm
similarity index 100%
rename from data/mapObjects/DiglettsCaveRoute2.asm
rename to data/maps/objects/DiglettsCaveRoute2.asm
diff --git a/data/mapObjects/FightingDojo.asm b/data/maps/objects/FightingDojo.asm
similarity index 100%
rename from data/mapObjects/FightingDojo.asm
rename to data/maps/objects/FightingDojo.asm
diff --git a/data/mapObjects/FuchsiaBillsGrandpasHouse.asm b/data/maps/objects/FuchsiaBillsGrandpasHouse.asm
similarity index 100%
rename from data/mapObjects/FuchsiaBillsGrandpasHouse.asm
rename to data/maps/objects/FuchsiaBillsGrandpasHouse.asm
diff --git a/data/mapObjects/FuchsiaCity.asm b/data/maps/objects/FuchsiaCity.asm
similarity index 100%
rename from data/mapObjects/FuchsiaCity.asm
rename to data/maps/objects/FuchsiaCity.asm
diff --git a/data/mapObjects/FuchsiaGoodRodHouse.asm b/data/maps/objects/FuchsiaGoodRodHouse.asm
similarity index 100%
rename from data/mapObjects/FuchsiaGoodRodHouse.asm
rename to data/maps/objects/FuchsiaGoodRodHouse.asm
diff --git a/data/mapObjects/FuchsiaGym.asm b/data/maps/objects/FuchsiaGym.asm
similarity index 100%
rename from data/mapObjects/FuchsiaGym.asm
rename to data/maps/objects/FuchsiaGym.asm
diff --git a/data/mapObjects/FuchsiaMart.asm b/data/maps/objects/FuchsiaMart.asm
similarity index 100%
rename from data/mapObjects/FuchsiaMart.asm
rename to data/maps/objects/FuchsiaMart.asm
diff --git a/data/mapObjects/FuchsiaMeetingRoom.asm b/data/maps/objects/FuchsiaMeetingRoom.asm
similarity index 100%
rename from data/mapObjects/FuchsiaMeetingRoom.asm
rename to data/maps/objects/FuchsiaMeetingRoom.asm
diff --git a/data/mapObjects/FuchsiaPokecenter.asm b/data/maps/objects/FuchsiaPokecenter.asm
similarity index 100%
rename from data/mapObjects/FuchsiaPokecenter.asm
rename to data/maps/objects/FuchsiaPokecenter.asm
diff --git a/data/mapObjects/GameCorner.asm b/data/maps/objects/GameCorner.asm
similarity index 100%
rename from data/mapObjects/GameCorner.asm
rename to data/maps/objects/GameCorner.asm
diff --git a/data/mapObjects/GameCornerPrizeRoom.asm b/data/maps/objects/GameCornerPrizeRoom.asm
similarity index 100%
rename from data/mapObjects/GameCornerPrizeRoom.asm
rename to data/maps/objects/GameCornerPrizeRoom.asm
diff --git a/data/mapObjects/HallOfFame.asm b/data/maps/objects/HallOfFame.asm
similarity index 100%
rename from data/mapObjects/HallOfFame.asm
rename to data/maps/objects/HallOfFame.asm
diff --git a/data/mapObjects/IndigoPlateau.asm b/data/maps/objects/IndigoPlateau.asm
similarity index 100%
rename from data/mapObjects/IndigoPlateau.asm
rename to data/maps/objects/IndigoPlateau.asm
diff --git a/data/mapObjects/IndigoPlateauLobby.asm b/data/maps/objects/IndigoPlateauLobby.asm
similarity index 100%
rename from data/mapObjects/IndigoPlateauLobby.asm
rename to data/maps/objects/IndigoPlateauLobby.asm
diff --git a/data/mapObjects/LancesRoom.asm b/data/maps/objects/LancesRoom.asm
similarity index 100%
rename from data/mapObjects/LancesRoom.asm
rename to data/maps/objects/LancesRoom.asm
diff --git a/data/mapObjects/LavenderCuboneHouse.asm b/data/maps/objects/LavenderCuboneHouse.asm
similarity index 100%
rename from data/mapObjects/LavenderCuboneHouse.asm
rename to data/maps/objects/LavenderCuboneHouse.asm
diff --git a/data/mapObjects/LavenderMart.asm b/data/maps/objects/LavenderMart.asm
similarity index 100%
rename from data/mapObjects/LavenderMart.asm
rename to data/maps/objects/LavenderMart.asm
diff --git a/data/mapObjects/LavenderPokecenter.asm b/data/maps/objects/LavenderPokecenter.asm
similarity index 100%
rename from data/mapObjects/LavenderPokecenter.asm
rename to data/maps/objects/LavenderPokecenter.asm
diff --git a/data/mapObjects/LavenderTown.asm b/data/maps/objects/LavenderTown.asm
similarity index 100%
rename from data/mapObjects/LavenderTown.asm
rename to data/maps/objects/LavenderTown.asm
diff --git a/data/mapObjects/LoreleisRoom.asm b/data/maps/objects/LoreleisRoom.asm
similarity index 100%
rename from data/mapObjects/LoreleisRoom.asm
rename to data/maps/objects/LoreleisRoom.asm
diff --git a/data/mapObjects/MrFujisHouse.asm b/data/maps/objects/MrFujisHouse.asm
similarity index 100%
rename from data/mapObjects/MrFujisHouse.asm
rename to data/maps/objects/MrFujisHouse.asm
diff --git a/data/mapObjects/MrPsychicsHouse.asm b/data/maps/objects/MrPsychicsHouse.asm
similarity index 100%
rename from data/mapObjects/MrPsychicsHouse.asm
rename to data/maps/objects/MrPsychicsHouse.asm
diff --git a/data/mapObjects/MtMoon1F.asm b/data/maps/objects/MtMoon1F.asm
similarity index 100%
rename from data/mapObjects/MtMoon1F.asm
rename to data/maps/objects/MtMoon1F.asm
diff --git a/data/mapObjects/MtMoonB1F.asm b/data/maps/objects/MtMoonB1F.asm
similarity index 100%
rename from data/mapObjects/MtMoonB1F.asm
rename to data/maps/objects/MtMoonB1F.asm
diff --git a/data/mapObjects/MtMoonB2F.asm b/data/maps/objects/MtMoonB2F.asm
similarity index 100%
rename from data/mapObjects/MtMoonB2F.asm
rename to data/maps/objects/MtMoonB2F.asm
diff --git a/data/mapObjects/MtMoonPokecenter.asm b/data/maps/objects/MtMoonPokecenter.asm
similarity index 100%
rename from data/mapObjects/MtMoonPokecenter.asm
rename to data/maps/objects/MtMoonPokecenter.asm
diff --git a/data/mapObjects/Museum1F.asm b/data/maps/objects/Museum1F.asm
similarity index 100%
rename from data/mapObjects/Museum1F.asm
rename to data/maps/objects/Museum1F.asm
diff --git a/data/mapObjects/Museum2F.asm b/data/maps/objects/Museum2F.asm
similarity index 100%
rename from data/mapObjects/Museum2F.asm
rename to data/maps/objects/Museum2F.asm
diff --git a/data/mapObjects/NameRatersHouse.asm b/data/maps/objects/NameRatersHouse.asm
similarity index 100%
rename from data/mapObjects/NameRatersHouse.asm
rename to data/maps/objects/NameRatersHouse.asm
diff --git a/data/mapObjects/OaksLab.asm b/data/maps/objects/OaksLab.asm
similarity index 100%
rename from data/mapObjects/OaksLab.asm
rename to data/maps/objects/OaksLab.asm
diff --git a/data/mapObjects/PalletTown.asm b/data/maps/objects/PalletTown.asm
similarity index 100%
rename from data/mapObjects/PalletTown.asm
rename to data/maps/objects/PalletTown.asm
diff --git a/data/mapObjects/PewterCity.asm b/data/maps/objects/PewterCity.asm
similarity index 100%
rename from data/mapObjects/PewterCity.asm
rename to data/maps/objects/PewterCity.asm
diff --git a/data/mapObjects/PewterGym.asm b/data/maps/objects/PewterGym.asm
similarity index 100%
rename from data/mapObjects/PewterGym.asm
rename to data/maps/objects/PewterGym.asm
diff --git a/data/mapObjects/PewterMart.asm b/data/maps/objects/PewterMart.asm
similarity index 100%
rename from data/mapObjects/PewterMart.asm
rename to data/maps/objects/PewterMart.asm
diff --git a/data/mapObjects/PewterNidoranHouse.asm b/data/maps/objects/PewterNidoranHouse.asm
similarity index 100%
rename from data/mapObjects/PewterNidoranHouse.asm
rename to data/maps/objects/PewterNidoranHouse.asm
diff --git a/data/mapObjects/PewterPokecenter.asm b/data/maps/objects/PewterPokecenter.asm
similarity index 100%
rename from data/mapObjects/PewterPokecenter.asm
rename to data/maps/objects/PewterPokecenter.asm
diff --git a/data/mapObjects/PewterSpeechHouse.asm b/data/maps/objects/PewterSpeechHouse.asm
similarity index 100%
rename from data/mapObjects/PewterSpeechHouse.asm
rename to data/maps/objects/PewterSpeechHouse.asm
diff --git a/data/mapObjects/PokemonFanClub.asm b/data/maps/objects/PokemonFanClub.asm
similarity index 100%
rename from data/mapObjects/PokemonFanClub.asm
rename to data/maps/objects/PokemonFanClub.asm
diff --git a/data/mapObjects/PokemonMansion1F.asm b/data/maps/objects/PokemonMansion1F.asm
similarity index 100%
rename from data/mapObjects/PokemonMansion1F.asm
rename to data/maps/objects/PokemonMansion1F.asm
diff --git a/data/mapObjects/PokemonMansion2F.asm b/data/maps/objects/PokemonMansion2F.asm
similarity index 100%
rename from data/mapObjects/PokemonMansion2F.asm
rename to data/maps/objects/PokemonMansion2F.asm
diff --git a/data/mapObjects/PokemonMansion3F.asm b/data/maps/objects/PokemonMansion3F.asm
similarity index 100%
rename from data/mapObjects/PokemonMansion3F.asm
rename to data/maps/objects/PokemonMansion3F.asm
diff --git a/data/mapObjects/PokemonMansionB1F.asm b/data/maps/objects/PokemonMansionB1F.asm
similarity index 100%
rename from data/mapObjects/PokemonMansionB1F.asm
rename to data/maps/objects/PokemonMansionB1F.asm
diff --git a/data/mapObjects/PokemonTower1F.asm b/data/maps/objects/PokemonTower1F.asm
similarity index 100%
rename from data/mapObjects/PokemonTower1F.asm
rename to data/maps/objects/PokemonTower1F.asm
diff --git a/data/mapObjects/PokemonTower2F.asm b/data/maps/objects/PokemonTower2F.asm
similarity index 100%
rename from data/mapObjects/PokemonTower2F.asm
rename to data/maps/objects/PokemonTower2F.asm
diff --git a/data/mapObjects/PokemonTower3F.asm b/data/maps/objects/PokemonTower3F.asm
similarity index 100%
rename from data/mapObjects/PokemonTower3F.asm
rename to data/maps/objects/PokemonTower3F.asm
diff --git a/data/mapObjects/PokemonTower4F.asm b/data/maps/objects/PokemonTower4F.asm
similarity index 100%
rename from data/mapObjects/PokemonTower4F.asm
rename to data/maps/objects/PokemonTower4F.asm
diff --git a/data/mapObjects/PokemonTower5F.asm b/data/maps/objects/PokemonTower5F.asm
similarity index 100%
rename from data/mapObjects/PokemonTower5F.asm
rename to data/maps/objects/PokemonTower5F.asm
diff --git a/data/mapObjects/PokemonTower6F.asm b/data/maps/objects/PokemonTower6F.asm
similarity index 100%
rename from data/mapObjects/PokemonTower6F.asm
rename to data/maps/objects/PokemonTower6F.asm
diff --git a/data/mapObjects/PokemonTower7F.asm b/data/maps/objects/PokemonTower7F.asm
similarity index 100%
rename from data/mapObjects/PokemonTower7F.asm
rename to data/maps/objects/PokemonTower7F.asm
diff --git a/data/mapObjects/PowerPlant.asm b/data/maps/objects/PowerPlant.asm
similarity index 100%
rename from data/mapObjects/PowerPlant.asm
rename to data/maps/objects/PowerPlant.asm
diff --git a/data/mapObjects/RedsHouse1F.asm b/data/maps/objects/RedsHouse1F.asm
similarity index 100%
rename from data/mapObjects/RedsHouse1F.asm
rename to data/maps/objects/RedsHouse1F.asm
diff --git a/data/mapObjects/RedsHouse2F.asm b/data/maps/objects/RedsHouse2F.asm
similarity index 100%
rename from data/mapObjects/RedsHouse2F.asm
rename to data/maps/objects/RedsHouse2F.asm
diff --git a/data/mapObjects/RockTunnel1F.asm b/data/maps/objects/RockTunnel1F.asm
similarity index 100%
rename from data/mapObjects/RockTunnel1F.asm
rename to data/maps/objects/RockTunnel1F.asm
diff --git a/data/mapObjects/RockTunnelB1F.asm b/data/maps/objects/RockTunnelB1F.asm
similarity index 100%
rename from data/mapObjects/RockTunnelB1F.asm
rename to data/maps/objects/RockTunnelB1F.asm
diff --git a/data/mapObjects/RockTunnelPokecenter.asm b/data/maps/objects/RockTunnelPokecenter.asm
similarity index 100%
rename from data/mapObjects/RockTunnelPokecenter.asm
rename to data/maps/objects/RockTunnelPokecenter.asm
diff --git a/data/mapObjects/RocketHideoutB1F.asm b/data/maps/objects/RocketHideoutB1F.asm
similarity index 100%
rename from data/mapObjects/RocketHideoutB1F.asm
rename to data/maps/objects/RocketHideoutB1F.asm
diff --git a/data/mapObjects/RocketHideoutB2F.asm b/data/maps/objects/RocketHideoutB2F.asm
similarity index 100%
rename from data/mapObjects/RocketHideoutB2F.asm
rename to data/maps/objects/RocketHideoutB2F.asm
diff --git a/data/mapObjects/RocketHideoutB3F.asm b/data/maps/objects/RocketHideoutB3F.asm
similarity index 100%
rename from data/mapObjects/RocketHideoutB3F.asm
rename to data/maps/objects/RocketHideoutB3F.asm
diff --git a/data/mapObjects/RocketHideoutB4F.asm b/data/maps/objects/RocketHideoutB4F.asm
similarity index 100%
rename from data/mapObjects/RocketHideoutB4F.asm
rename to data/maps/objects/RocketHideoutB4F.asm
diff --git a/data/mapObjects/RocketHideoutElevator.asm b/data/maps/objects/RocketHideoutElevator.asm
similarity index 100%
rename from data/mapObjects/RocketHideoutElevator.asm
rename to data/maps/objects/RocketHideoutElevator.asm
diff --git a/data/mapObjects/Route1.asm b/data/maps/objects/Route1.asm
similarity index 100%
rename from data/mapObjects/Route1.asm
rename to data/maps/objects/Route1.asm
diff --git a/data/mapObjects/Route10.asm b/data/maps/objects/Route10.asm
similarity index 100%
rename from data/mapObjects/Route10.asm
rename to data/maps/objects/Route10.asm
diff --git a/data/mapObjects/Route11.asm b/data/maps/objects/Route11.asm
similarity index 100%
rename from data/mapObjects/Route11.asm
rename to data/maps/objects/Route11.asm
diff --git a/data/mapObjects/Route11Gate1F.asm b/data/maps/objects/Route11Gate1F.asm
similarity index 100%
rename from data/mapObjects/Route11Gate1F.asm
rename to data/maps/objects/Route11Gate1F.asm
diff --git a/data/mapObjects/Route11Gate2F.asm b/data/maps/objects/Route11Gate2F.asm
similarity index 100%
rename from data/mapObjects/Route11Gate2F.asm
rename to data/maps/objects/Route11Gate2F.asm
diff --git a/data/mapObjects/Route12.asm b/data/maps/objects/Route12.asm
similarity index 100%
rename from data/mapObjects/Route12.asm
rename to data/maps/objects/Route12.asm
diff --git a/data/mapObjects/Route12Gate1F.asm b/data/maps/objects/Route12Gate1F.asm
similarity index 100%
rename from data/mapObjects/Route12Gate1F.asm
rename to data/maps/objects/Route12Gate1F.asm
diff --git a/data/mapObjects/Route12Gate2F.asm b/data/maps/objects/Route12Gate2F.asm
similarity index 100%
rename from data/mapObjects/Route12Gate2F.asm
rename to data/maps/objects/Route12Gate2F.asm
diff --git a/data/mapObjects/Route12SuperRodHouse.asm b/data/maps/objects/Route12SuperRodHouse.asm
similarity index 100%
rename from data/mapObjects/Route12SuperRodHouse.asm
rename to data/maps/objects/Route12SuperRodHouse.asm
diff --git a/data/mapObjects/Route13.asm b/data/maps/objects/Route13.asm
similarity index 100%
rename from data/mapObjects/Route13.asm
rename to data/maps/objects/Route13.asm
diff --git a/data/mapObjects/Route14.asm b/data/maps/objects/Route14.asm
similarity index 100%
rename from data/mapObjects/Route14.asm
rename to data/maps/objects/Route14.asm
diff --git a/data/mapObjects/Route15.asm b/data/maps/objects/Route15.asm
similarity index 100%
rename from data/mapObjects/Route15.asm
rename to data/maps/objects/Route15.asm
diff --git a/data/mapObjects/Route15Gate1F.asm b/data/maps/objects/Route15Gate1F.asm
similarity index 100%
rename from data/mapObjects/Route15Gate1F.asm
rename to data/maps/objects/Route15Gate1F.asm
diff --git a/data/mapObjects/Route15Gate2F.asm b/data/maps/objects/Route15Gate2F.asm
similarity index 100%
rename from data/mapObjects/Route15Gate2F.asm
rename to data/maps/objects/Route15Gate2F.asm
diff --git a/data/mapObjects/Route16.asm b/data/maps/objects/Route16.asm
similarity index 100%
rename from data/mapObjects/Route16.asm
rename to data/maps/objects/Route16.asm
diff --git a/data/mapObjects/Route16FlyHouse.asm b/data/maps/objects/Route16FlyHouse.asm
similarity index 100%
rename from data/mapObjects/Route16FlyHouse.asm
rename to data/maps/objects/Route16FlyHouse.asm
diff --git a/data/mapObjects/Route16Gate1F.asm b/data/maps/objects/Route16Gate1F.asm
similarity index 100%
rename from data/mapObjects/Route16Gate1F.asm
rename to data/maps/objects/Route16Gate1F.asm
diff --git a/data/mapObjects/Route16Gate2F.asm b/data/maps/objects/Route16Gate2F.asm
similarity index 100%
rename from data/mapObjects/Route16Gate2F.asm
rename to data/maps/objects/Route16Gate2F.asm
diff --git a/data/mapObjects/Route17.asm b/data/maps/objects/Route17.asm
similarity index 100%
rename from data/mapObjects/Route17.asm
rename to data/maps/objects/Route17.asm
diff --git a/data/mapObjects/Route18.asm b/data/maps/objects/Route18.asm
similarity index 100%
rename from data/mapObjects/Route18.asm
rename to data/maps/objects/Route18.asm
diff --git a/data/mapObjects/Route18Gate1F.asm b/data/maps/objects/Route18Gate1F.asm
similarity index 100%
rename from data/mapObjects/Route18Gate1F.asm
rename to data/maps/objects/Route18Gate1F.asm
diff --git a/data/mapObjects/Route18Gate2F.asm b/data/maps/objects/Route18Gate2F.asm
similarity index 100%
rename from data/mapObjects/Route18Gate2F.asm
rename to data/maps/objects/Route18Gate2F.asm
diff --git a/data/mapObjects/Route19.asm b/data/maps/objects/Route19.asm
similarity index 100%
rename from data/mapObjects/Route19.asm
rename to data/maps/objects/Route19.asm
diff --git a/data/mapObjects/Route2.asm b/data/maps/objects/Route2.asm
similarity index 100%
rename from data/mapObjects/Route2.asm
rename to data/maps/objects/Route2.asm
diff --git a/data/mapObjects/Route20.asm b/data/maps/objects/Route20.asm
similarity index 100%
rename from data/mapObjects/Route20.asm
rename to data/maps/objects/Route20.asm
diff --git a/data/mapObjects/Route21.asm b/data/maps/objects/Route21.asm
similarity index 100%
rename from data/mapObjects/Route21.asm
rename to data/maps/objects/Route21.asm
diff --git a/data/mapObjects/Route22.asm b/data/maps/objects/Route22.asm
similarity index 100%
rename from data/mapObjects/Route22.asm
rename to data/maps/objects/Route22.asm
diff --git a/data/mapObjects/Route22Gate.asm b/data/maps/objects/Route22Gate.asm
similarity index 100%
rename from data/mapObjects/Route22Gate.asm
rename to data/maps/objects/Route22Gate.asm
diff --git a/data/mapObjects/Route23.asm b/data/maps/objects/Route23.asm
similarity index 100%
rename from data/mapObjects/Route23.asm
rename to data/maps/objects/Route23.asm
diff --git a/data/mapObjects/Route24.asm b/data/maps/objects/Route24.asm
similarity index 100%
rename from data/mapObjects/Route24.asm
rename to data/maps/objects/Route24.asm
diff --git a/data/mapObjects/Route25.asm b/data/maps/objects/Route25.asm
similarity index 100%
rename from data/mapObjects/Route25.asm
rename to data/maps/objects/Route25.asm
diff --git a/data/mapObjects/Route2Gate.asm b/data/maps/objects/Route2Gate.asm
similarity index 100%
rename from data/mapObjects/Route2Gate.asm
rename to data/maps/objects/Route2Gate.asm
diff --git a/data/mapObjects/Route2TradeHouse.asm b/data/maps/objects/Route2TradeHouse.asm
similarity index 100%
rename from data/mapObjects/Route2TradeHouse.asm
rename to data/maps/objects/Route2TradeHouse.asm
diff --git a/data/mapObjects/Route3.asm b/data/maps/objects/Route3.asm
similarity index 100%
rename from data/mapObjects/Route3.asm
rename to data/maps/objects/Route3.asm
diff --git a/data/mapObjects/Route4.asm b/data/maps/objects/Route4.asm
similarity index 100%
rename from data/mapObjects/Route4.asm
rename to data/maps/objects/Route4.asm
diff --git a/data/mapObjects/Route5.asm b/data/maps/objects/Route5.asm
similarity index 100%
rename from data/mapObjects/Route5.asm
rename to data/maps/objects/Route5.asm
diff --git a/data/mapObjects/Route5Gate.asm b/data/maps/objects/Route5Gate.asm
similarity index 100%
rename from data/mapObjects/Route5Gate.asm
rename to data/maps/objects/Route5Gate.asm
diff --git a/data/mapObjects/Route6.asm b/data/maps/objects/Route6.asm
similarity index 100%
rename from data/mapObjects/Route6.asm
rename to data/maps/objects/Route6.asm
diff --git a/data/mapObjects/Route6Gate.asm b/data/maps/objects/Route6Gate.asm
similarity index 100%
rename from data/mapObjects/Route6Gate.asm
rename to data/maps/objects/Route6Gate.asm
diff --git a/data/mapObjects/Route7.asm b/data/maps/objects/Route7.asm
similarity index 100%
rename from data/mapObjects/Route7.asm
rename to data/maps/objects/Route7.asm
diff --git a/data/mapObjects/Route7Gate.asm b/data/maps/objects/Route7Gate.asm
similarity index 100%
rename from data/mapObjects/Route7Gate.asm
rename to data/maps/objects/Route7Gate.asm
diff --git a/data/mapObjects/Route8.asm b/data/maps/objects/Route8.asm
similarity index 100%
rename from data/mapObjects/Route8.asm
rename to data/maps/objects/Route8.asm
diff --git a/data/mapObjects/Route8Gate.asm b/data/maps/objects/Route8Gate.asm
similarity index 100%
rename from data/mapObjects/Route8Gate.asm
rename to data/maps/objects/Route8Gate.asm
diff --git a/data/mapObjects/Route9.asm b/data/maps/objects/Route9.asm
similarity index 100%
rename from data/mapObjects/Route9.asm
rename to data/maps/objects/Route9.asm
diff --git a/data/mapObjects/SSAnne1F.asm b/data/maps/objects/SSAnne1F.asm
similarity index 100%
rename from data/mapObjects/SSAnne1F.asm
rename to data/maps/objects/SSAnne1F.asm
diff --git a/data/mapObjects/SSAnne1FRooms.asm b/data/maps/objects/SSAnne1FRooms.asm
similarity index 100%
rename from data/mapObjects/SSAnne1FRooms.asm
rename to data/maps/objects/SSAnne1FRooms.asm
diff --git a/data/mapObjects/SSAnne2F.asm b/data/maps/objects/SSAnne2F.asm
similarity index 100%
rename from data/mapObjects/SSAnne2F.asm
rename to data/maps/objects/SSAnne2F.asm
diff --git a/data/mapObjects/SSAnne2FRooms.asm b/data/maps/objects/SSAnne2FRooms.asm
similarity index 100%
rename from data/mapObjects/SSAnne2FRooms.asm
rename to data/maps/objects/SSAnne2FRooms.asm
diff --git a/data/mapObjects/SSAnne3F.asm b/data/maps/objects/SSAnne3F.asm
similarity index 100%
rename from data/mapObjects/SSAnne3F.asm
rename to data/maps/objects/SSAnne3F.asm
diff --git a/data/mapObjects/SSAnneB1F.asm b/data/maps/objects/SSAnneB1F.asm
similarity index 100%
rename from data/mapObjects/SSAnneB1F.asm
rename to data/maps/objects/SSAnneB1F.asm
diff --git a/data/mapObjects/SSAnneB1FRooms.asm b/data/maps/objects/SSAnneB1FRooms.asm
similarity index 100%
rename from data/mapObjects/SSAnneB1FRooms.asm
rename to data/maps/objects/SSAnneB1FRooms.asm
diff --git a/data/mapObjects/SSAnneBow.asm b/data/maps/objects/SSAnneBow.asm
similarity index 100%
rename from data/mapObjects/SSAnneBow.asm
rename to data/maps/objects/SSAnneBow.asm
diff --git a/data/mapObjects/SSAnneCaptainsRoom.asm b/data/maps/objects/SSAnneCaptainsRoom.asm
similarity index 100%
rename from data/mapObjects/SSAnneCaptainsRoom.asm
rename to data/maps/objects/SSAnneCaptainsRoom.asm
diff --git a/data/mapObjects/SSAnneKitchen.asm b/data/maps/objects/SSAnneKitchen.asm
similarity index 100%
rename from data/mapObjects/SSAnneKitchen.asm
rename to data/maps/objects/SSAnneKitchen.asm
diff --git a/data/mapObjects/SafariZoneCenter.asm b/data/maps/objects/SafariZoneCenter.asm
similarity index 100%
rename from data/mapObjects/SafariZoneCenter.asm
rename to data/maps/objects/SafariZoneCenter.asm
diff --git a/data/mapObjects/SafariZoneCenterRestHouse.asm b/data/maps/objects/SafariZoneCenterRestHouse.asm
similarity index 100%
rename from data/mapObjects/SafariZoneCenterRestHouse.asm
rename to data/maps/objects/SafariZoneCenterRestHouse.asm
diff --git a/data/mapObjects/SafariZoneEast.asm b/data/maps/objects/SafariZoneEast.asm
similarity index 100%
rename from data/mapObjects/SafariZoneEast.asm
rename to data/maps/objects/SafariZoneEast.asm
diff --git a/data/mapObjects/SafariZoneEastRestHouse.asm b/data/maps/objects/SafariZoneEastRestHouse.asm
similarity index 100%
rename from data/mapObjects/SafariZoneEastRestHouse.asm
rename to data/maps/objects/SafariZoneEastRestHouse.asm
diff --git a/data/mapObjects/SafariZoneGate.asm b/data/maps/objects/SafariZoneGate.asm
similarity index 100%
rename from data/mapObjects/SafariZoneGate.asm
rename to data/maps/objects/SafariZoneGate.asm
diff --git a/data/mapObjects/SafariZoneNorth.asm b/data/maps/objects/SafariZoneNorth.asm
similarity index 100%
rename from data/mapObjects/SafariZoneNorth.asm
rename to data/maps/objects/SafariZoneNorth.asm
diff --git a/data/mapObjects/SafariZoneNorthRestHouse.asm b/data/maps/objects/SafariZoneNorthRestHouse.asm
similarity index 100%
rename from data/mapObjects/SafariZoneNorthRestHouse.asm
rename to data/maps/objects/SafariZoneNorthRestHouse.asm
diff --git a/data/mapObjects/SafariZoneSecretHouse.asm b/data/maps/objects/SafariZoneSecretHouse.asm
similarity index 100%
rename from data/mapObjects/SafariZoneSecretHouse.asm
rename to data/maps/objects/SafariZoneSecretHouse.asm
diff --git a/data/mapObjects/SafariZoneWest.asm b/data/maps/objects/SafariZoneWest.asm
similarity index 100%
rename from data/mapObjects/SafariZoneWest.asm
rename to data/maps/objects/SafariZoneWest.asm
diff --git a/data/mapObjects/SafariZoneWestRestHouse.asm b/data/maps/objects/SafariZoneWestRestHouse.asm
similarity index 100%
rename from data/mapObjects/SafariZoneWestRestHouse.asm
rename to data/maps/objects/SafariZoneWestRestHouse.asm
diff --git a/data/mapObjects/SaffronCity.asm b/data/maps/objects/SaffronCity.asm
similarity index 100%
rename from data/mapObjects/SaffronCity.asm
rename to data/maps/objects/SaffronCity.asm
diff --git a/data/mapObjects/SaffronGym.asm b/data/maps/objects/SaffronGym.asm
similarity index 100%
rename from data/mapObjects/SaffronGym.asm
rename to data/maps/objects/SaffronGym.asm
diff --git a/data/mapObjects/SaffronMart.asm b/data/maps/objects/SaffronMart.asm
similarity index 100%
rename from data/mapObjects/SaffronMart.asm
rename to data/maps/objects/SaffronMart.asm
diff --git a/data/mapObjects/SaffronPidgeyHouse.asm b/data/maps/objects/SaffronPidgeyHouse.asm
similarity index 100%
rename from data/mapObjects/SaffronPidgeyHouse.asm
rename to data/maps/objects/SaffronPidgeyHouse.asm
diff --git a/data/mapObjects/SaffronPokecenter.asm b/data/maps/objects/SaffronPokecenter.asm
similarity index 100%
rename from data/mapObjects/SaffronPokecenter.asm
rename to data/maps/objects/SaffronPokecenter.asm
diff --git a/data/mapObjects/SeafoamIslands1F.asm b/data/maps/objects/SeafoamIslands1F.asm
similarity index 100%
rename from data/mapObjects/SeafoamIslands1F.asm
rename to data/maps/objects/SeafoamIslands1F.asm
diff --git a/data/mapObjects/SeafoamIslandsB1F.asm b/data/maps/objects/SeafoamIslandsB1F.asm
similarity index 100%
rename from data/mapObjects/SeafoamIslandsB1F.asm
rename to data/maps/objects/SeafoamIslandsB1F.asm
diff --git a/data/mapObjects/SeafoamIslandsB2F.asm b/data/maps/objects/SeafoamIslandsB2F.asm
similarity index 100%
rename from data/mapObjects/SeafoamIslandsB2F.asm
rename to data/maps/objects/SeafoamIslandsB2F.asm
diff --git a/data/mapObjects/SeafoamIslandsB3F.asm b/data/maps/objects/SeafoamIslandsB3F.asm
similarity index 100%
rename from data/mapObjects/SeafoamIslandsB3F.asm
rename to data/maps/objects/SeafoamIslandsB3F.asm
diff --git a/data/mapObjects/SeafoamIslandsB4F.asm b/data/maps/objects/SeafoamIslandsB4F.asm
similarity index 100%
rename from data/mapObjects/SeafoamIslandsB4F.asm
rename to data/maps/objects/SeafoamIslandsB4F.asm
diff --git a/data/mapObjects/SilphCo10F.asm b/data/maps/objects/SilphCo10F.asm
similarity index 100%
rename from data/mapObjects/SilphCo10F.asm
rename to data/maps/objects/SilphCo10F.asm
diff --git a/data/mapObjects/SilphCo11F.asm b/data/maps/objects/SilphCo11F.asm
similarity index 100%
rename from data/mapObjects/SilphCo11F.asm
rename to data/maps/objects/SilphCo11F.asm
diff --git a/data/mapObjects/SilphCo1F.asm b/data/maps/objects/SilphCo1F.asm
similarity index 100%
rename from data/mapObjects/SilphCo1F.asm
rename to data/maps/objects/SilphCo1F.asm
diff --git a/data/mapObjects/SilphCo2F.asm b/data/maps/objects/SilphCo2F.asm
similarity index 100%
rename from data/mapObjects/SilphCo2F.asm
rename to data/maps/objects/SilphCo2F.asm
diff --git a/data/mapObjects/SilphCo3F.asm b/data/maps/objects/SilphCo3F.asm
similarity index 100%
rename from data/mapObjects/SilphCo3F.asm
rename to data/maps/objects/SilphCo3F.asm
diff --git a/data/mapObjects/SilphCo4F.asm b/data/maps/objects/SilphCo4F.asm
similarity index 100%
rename from data/mapObjects/SilphCo4F.asm
rename to data/maps/objects/SilphCo4F.asm
diff --git a/data/mapObjects/SilphCo5F.asm b/data/maps/objects/SilphCo5F.asm
similarity index 100%
rename from data/mapObjects/SilphCo5F.asm
rename to data/maps/objects/SilphCo5F.asm
diff --git a/data/mapObjects/SilphCo6F.asm b/data/maps/objects/SilphCo6F.asm
similarity index 100%
rename from data/mapObjects/SilphCo6F.asm
rename to data/maps/objects/SilphCo6F.asm
diff --git a/data/mapObjects/SilphCo7F.asm b/data/maps/objects/SilphCo7F.asm
similarity index 100%
rename from data/mapObjects/SilphCo7F.asm
rename to data/maps/objects/SilphCo7F.asm
diff --git a/data/mapObjects/SilphCo8F.asm b/data/maps/objects/SilphCo8F.asm
similarity index 100%
rename from data/mapObjects/SilphCo8F.asm
rename to data/maps/objects/SilphCo8F.asm
diff --git a/data/mapObjects/SilphCo9F.asm b/data/maps/objects/SilphCo9F.asm
similarity index 100%
rename from data/mapObjects/SilphCo9F.asm
rename to data/maps/objects/SilphCo9F.asm
diff --git a/data/mapObjects/SilphCoElevator.asm b/data/maps/objects/SilphCoElevator.asm
similarity index 100%
rename from data/mapObjects/SilphCoElevator.asm
rename to data/maps/objects/SilphCoElevator.asm
diff --git a/data/mapObjects/TradeCenter.asm b/data/maps/objects/TradeCenter.asm
similarity index 100%
rename from data/mapObjects/TradeCenter.asm
rename to data/maps/objects/TradeCenter.asm
diff --git a/data/mapObjects/UndergroundPathNorthSouth.asm b/data/maps/objects/UndergroundPathNorthSouth.asm
similarity index 100%
rename from data/mapObjects/UndergroundPathNorthSouth.asm
rename to data/maps/objects/UndergroundPathNorthSouth.asm
diff --git a/data/mapObjects/UndergroundPathRoute5.asm b/data/maps/objects/UndergroundPathRoute5.asm
similarity index 100%
rename from data/mapObjects/UndergroundPathRoute5.asm
rename to data/maps/objects/UndergroundPathRoute5.asm
diff --git a/data/mapObjects/UndergroundPathRoute6.asm b/data/maps/objects/UndergroundPathRoute6.asm
similarity index 100%
rename from data/mapObjects/UndergroundPathRoute6.asm
rename to data/maps/objects/UndergroundPathRoute6.asm
diff --git a/data/mapObjects/UndergroundPathRoute7.asm b/data/maps/objects/UndergroundPathRoute7.asm
similarity index 100%
rename from data/mapObjects/UndergroundPathRoute7.asm
rename to data/maps/objects/UndergroundPathRoute7.asm
diff --git a/data/mapObjects/UndergroundPathRoute7Copy.asm b/data/maps/objects/UndergroundPathRoute7Copy.asm
similarity index 100%
rename from data/mapObjects/UndergroundPathRoute7Copy.asm
rename to data/maps/objects/UndergroundPathRoute7Copy.asm
diff --git a/data/mapObjects/UndergroundPathRoute8.asm b/data/maps/objects/UndergroundPathRoute8.asm
similarity index 100%
rename from data/mapObjects/UndergroundPathRoute8.asm
rename to data/maps/objects/UndergroundPathRoute8.asm
diff --git a/data/mapObjects/UndergroundPathWestEast.asm b/data/maps/objects/UndergroundPathWestEast.asm
similarity index 100%
rename from data/mapObjects/UndergroundPathWestEast.asm
rename to data/maps/objects/UndergroundPathWestEast.asm
diff --git a/data/mapObjects/VermilionCity.asm b/data/maps/objects/VermilionCity.asm
similarity index 100%
rename from data/mapObjects/VermilionCity.asm
rename to data/maps/objects/VermilionCity.asm
diff --git a/data/mapObjects/VermilionDock.asm b/data/maps/objects/VermilionDock.asm
similarity index 100%
rename from data/mapObjects/VermilionDock.asm
rename to data/maps/objects/VermilionDock.asm
diff --git a/data/mapObjects/VermilionGym.asm b/data/maps/objects/VermilionGym.asm
similarity index 100%
rename from data/mapObjects/VermilionGym.asm
rename to data/maps/objects/VermilionGym.asm
diff --git a/data/mapObjects/VermilionMart.asm b/data/maps/objects/VermilionMart.asm
similarity index 100%
rename from data/mapObjects/VermilionMart.asm
rename to data/maps/objects/VermilionMart.asm
diff --git a/data/mapObjects/VermilionOldRodHouse.asm b/data/maps/objects/VermilionOldRodHouse.asm
similarity index 100%
rename from data/mapObjects/VermilionOldRodHouse.asm
rename to data/maps/objects/VermilionOldRodHouse.asm
diff --git a/data/mapObjects/VermilionPidgeyHouse.asm b/data/maps/objects/VermilionPidgeyHouse.asm
similarity index 100%
rename from data/mapObjects/VermilionPidgeyHouse.asm
rename to data/maps/objects/VermilionPidgeyHouse.asm
diff --git a/data/mapObjects/VermilionPokecenter.asm b/data/maps/objects/VermilionPokecenter.asm
similarity index 100%
rename from data/mapObjects/VermilionPokecenter.asm
rename to data/maps/objects/VermilionPokecenter.asm
diff --git a/data/mapObjects/VermilionTradeHouse.asm b/data/maps/objects/VermilionTradeHouse.asm
similarity index 100%
rename from data/mapObjects/VermilionTradeHouse.asm
rename to data/maps/objects/VermilionTradeHouse.asm
diff --git a/data/mapObjects/VictoryRoad1F.asm b/data/maps/objects/VictoryRoad1F.asm
similarity index 100%
rename from data/mapObjects/VictoryRoad1F.asm
rename to data/maps/objects/VictoryRoad1F.asm
diff --git a/data/mapObjects/VictoryRoad2F.asm b/data/maps/objects/VictoryRoad2F.asm
similarity index 100%
rename from data/mapObjects/VictoryRoad2F.asm
rename to data/maps/objects/VictoryRoad2F.asm
diff --git a/data/mapObjects/VictoryRoad3F.asm b/data/maps/objects/VictoryRoad3F.asm
similarity index 100%
rename from data/mapObjects/VictoryRoad3F.asm
rename to data/maps/objects/VictoryRoad3F.asm
diff --git a/data/mapObjects/ViridianCity.asm b/data/maps/objects/ViridianCity.asm
similarity index 100%
rename from data/mapObjects/ViridianCity.asm
rename to data/maps/objects/ViridianCity.asm
diff --git a/data/mapObjects/ViridianForest.asm b/data/maps/objects/ViridianForest.asm
similarity index 100%
rename from data/mapObjects/ViridianForest.asm
rename to data/maps/objects/ViridianForest.asm
diff --git a/data/mapObjects/ViridianForestNorthGate.asm b/data/maps/objects/ViridianForestNorthGate.asm
similarity index 100%
rename from data/mapObjects/ViridianForestNorthGate.asm
rename to data/maps/objects/ViridianForestNorthGate.asm
diff --git a/data/mapObjects/ViridianForestSouthGate.asm b/data/maps/objects/ViridianForestSouthGate.asm
similarity index 100%
rename from data/mapObjects/ViridianForestSouthGate.asm
rename to data/maps/objects/ViridianForestSouthGate.asm
diff --git a/data/mapObjects/ViridianGym.asm b/data/maps/objects/ViridianGym.asm
similarity index 100%
rename from data/mapObjects/ViridianGym.asm
rename to data/maps/objects/ViridianGym.asm
diff --git a/data/mapObjects/ViridianMart.asm b/data/maps/objects/ViridianMart.asm
similarity index 100%
rename from data/mapObjects/ViridianMart.asm
rename to data/maps/objects/ViridianMart.asm
diff --git a/data/mapObjects/ViridianNicknameHouse.asm b/data/maps/objects/ViridianNicknameHouse.asm
similarity index 100%
rename from data/mapObjects/ViridianNicknameHouse.asm
rename to data/maps/objects/ViridianNicknameHouse.asm
diff --git a/data/mapObjects/ViridianPokecenter.asm b/data/maps/objects/ViridianPokecenter.asm
similarity index 100%
rename from data/mapObjects/ViridianPokecenter.asm
rename to data/maps/objects/ViridianPokecenter.asm
diff --git a/data/mapObjects/ViridianSchoolHouse.asm b/data/maps/objects/ViridianSchoolHouse.asm
similarity index 100%
rename from data/mapObjects/ViridianSchoolHouse.asm
rename to data/maps/objects/ViridianSchoolHouse.asm
diff --git a/data/mapObjects/WardensHouse.asm b/data/maps/objects/WardensHouse.asm
similarity index 100%
rename from data/mapObjects/WardensHouse.asm
rename to data/maps/objects/WardensHouse.asm
diff --git a/maps.asm b/maps.asm
index 8b3cbea4..4f00f451 100644
--- a/maps.asm
+++ b/maps.asm
@@ -3,33 +3,33 @@ INCLUDE "constants.asm"
 
 SECTION "Maps 1", ROMX
 
-INCLUDE "data/mapHeaders/CeladonCity.asm"
-INCLUDE "data/mapObjects/CeladonCity.asm"
+INCLUDE "data/maps/headers/CeladonCity.asm"
+INCLUDE "data/maps/objects/CeladonCity.asm"
 CeladonCity_Blocks: INCBIN "maps/CeladonCity.blk"
 
-INCLUDE "data/mapHeaders/PalletTown.asm"
-INCLUDE "data/mapObjects/PalletTown.asm"
+INCLUDE "data/maps/headers/PalletTown.asm"
+INCLUDE "data/maps/objects/PalletTown.asm"
 PalletTown_Blocks: INCBIN "maps/PalletTown.blk"
 
-INCLUDE "data/mapHeaders/ViridianCity.asm"
-INCLUDE "data/mapObjects/ViridianCity.asm"
+INCLUDE "data/maps/headers/ViridianCity.asm"
+INCLUDE "data/maps/objects/ViridianCity.asm"
 ViridianCity_Blocks: INCBIN "maps/ViridianCity.blk"
 
-INCLUDE "data/mapHeaders/PewterCity.asm"
+INCLUDE "data/maps/headers/PewterCity.asm"
 	ds 1
-INCLUDE "data/mapObjects/PewterCity.asm"
+INCLUDE "data/maps/objects/PewterCity.asm"
 PewterCity_Blocks: INCBIN "maps/PewterCity.blk"
 
-INCLUDE "data/mapHeaders/CeruleanCity.asm"
-INCLUDE "data/mapObjects/CeruleanCity.asm"
+INCLUDE "data/maps/headers/CeruleanCity.asm"
+INCLUDE "data/maps/objects/CeruleanCity.asm"
 CeruleanCity_Blocks: INCBIN "maps/CeruleanCity.blk"
 
-INCLUDE "data/mapHeaders/VermilionCity.asm"
-INCLUDE "data/mapObjects/VermilionCity.asm"
+INCLUDE "data/maps/headers/VermilionCity.asm"
+INCLUDE "data/maps/objects/VermilionCity.asm"
 VermilionCity_Blocks: INCBIN "maps/VermilionCity.blk"
 
-INCLUDE "data/mapHeaders/FuchsiaCity.asm"
-INCLUDE "data/mapObjects/FuchsiaCity.asm"
+INCLUDE "data/maps/headers/FuchsiaCity.asm"
+INCLUDE "data/maps/objects/FuchsiaCity.asm"
 FuchsiaCity_Blocks: INCBIN "maps/FuchsiaCity.blk"
 
 
@@ -43,45 +43,45 @@ INCLUDE "scripts/VermilionCity.asm"
 INCLUDE "scripts/CeladonCity.asm"
 INCLUDE "scripts/FuchsiaCity.asm"
 
-INCLUDE "data/mapHeaders/BluesHouse.asm"
+INCLUDE "data/maps/headers/BluesHouse.asm"
 INCLUDE "scripts/BluesHouse.asm"
-INCLUDE "data/mapObjects/BluesHouse.asm"
+INCLUDE "data/maps/objects/BluesHouse.asm"
 BluesHouse_Blocks: INCBIN "maps/BluesHouse.blk"
 
-INCLUDE "data/mapHeaders/VermilionTradeHouse.asm"
+INCLUDE "data/maps/headers/VermilionTradeHouse.asm"
 INCLUDE "scripts/VermilionTradeHouse.asm"
-INCLUDE "data/mapObjects/VermilionTradeHouse.asm"
+INCLUDE "data/maps/objects/VermilionTradeHouse.asm"
 VermilionTradeHouse_Blocks: INCBIN "maps/VermilionTradeHouse.blk"
 
-INCLUDE "data/mapHeaders/IndigoPlateauLobby.asm"
+INCLUDE "data/maps/headers/IndigoPlateauLobby.asm"
 INCLUDE "scripts/IndigoPlateauLobby.asm"
-INCLUDE "data/mapObjects/IndigoPlateauLobby.asm"
+INCLUDE "data/maps/objects/IndigoPlateauLobby.asm"
 IndigoPlateauLobby_Blocks: INCBIN "maps/IndigoPlateauLobby.blk"
 
-INCLUDE "data/mapHeaders/SilphCo4F.asm"
+INCLUDE "data/maps/headers/SilphCo4F.asm"
 INCLUDE "scripts/SilphCo4F.asm"
-INCLUDE "data/mapObjects/SilphCo4F.asm"
+INCLUDE "data/maps/objects/SilphCo4F.asm"
 SilphCo4F_Blocks: INCBIN "maps/SilphCo4F.blk"
 
-INCLUDE "data/mapHeaders/SilphCo5F.asm"
+INCLUDE "data/maps/headers/SilphCo5F.asm"
 INCLUDE "scripts/SilphCo5F.asm"
-INCLUDE "data/mapObjects/SilphCo5F.asm"
+INCLUDE "data/maps/objects/SilphCo5F.asm"
 SilphCo5F_Blocks: INCBIN "maps/SilphCo5F.blk"
 
-INCLUDE "data/mapHeaders/SilphCo6F.asm"
+INCLUDE "data/maps/headers/SilphCo6F.asm"
 INCLUDE "scripts/SilphCo6F.asm"
-INCLUDE "data/mapObjects/SilphCo6F.asm"
+INCLUDE "data/maps/objects/SilphCo6F.asm"
 SilphCo6F_Blocks: INCBIN "maps/SilphCo6F.blk"
 
 
 SECTION "Maps 3", ROMX
 
-INCLUDE "data/mapHeaders/CinnabarIsland.asm"
-INCLUDE "data/mapObjects/CinnabarIsland.asm"
+INCLUDE "data/maps/headers/CinnabarIsland.asm"
+INCLUDE "data/maps/objects/CinnabarIsland.asm"
 CinnabarIsland_Blocks: INCBIN "maps/CinnabarIsland.blk"
 
-INCLUDE "data/mapHeaders/Route1.asm"
-INCLUDE "data/mapObjects/Route1.asm"
+INCLUDE "data/maps/headers/Route1.asm"
+INCLUDE "data/maps/objects/Route1.asm"
 Route1_Blocks: INCBIN "maps/Route1.blk"
 
 UndergroundPathRoute8_Blocks: INCBIN "maps/UndergroundPathRoute8.blk"
@@ -116,143 +116,143 @@ INCLUDE "scripts/CinnabarIsland.asm"
 
 INCLUDE "scripts/Route1.asm"
 
-INCLUDE "data/mapHeaders/OaksLab.asm"
+INCLUDE "data/maps/headers/OaksLab.asm"
 INCLUDE "scripts/OaksLab.asm"
-INCLUDE "data/mapObjects/OaksLab.asm"
+INCLUDE "data/maps/objects/OaksLab.asm"
 
-INCLUDE "data/mapHeaders/ViridianMart.asm"
+INCLUDE "data/maps/headers/ViridianMart.asm"
 INCLUDE "scripts/ViridianMart.asm"
-INCLUDE "data/mapObjects/ViridianMart.asm"
+INCLUDE "data/maps/objects/ViridianMart.asm"
 ViridianMart_Blocks: INCBIN "maps/ViridianMart.blk"
 
-INCLUDE "data/mapHeaders/ViridianSchoolHouse.asm"
+INCLUDE "data/maps/headers/ViridianSchoolHouse.asm"
 INCLUDE "scripts/ViridianSchoolHouse.asm"
-INCLUDE "data/mapObjects/ViridianSchoolHouse.asm"
+INCLUDE "data/maps/objects/ViridianSchoolHouse.asm"
 
-INCLUDE "data/mapHeaders/ViridianNicknameHouse.asm"
+INCLUDE "data/maps/headers/ViridianNicknameHouse.asm"
 	ds 1
 INCLUDE "scripts/ViridianNicknameHouse.asm"
-INCLUDE "data/mapObjects/ViridianNicknameHouse.asm"
+INCLUDE "data/maps/objects/ViridianNicknameHouse.asm"
 
-INCLUDE "data/mapHeaders/PewterNidoranHouse.asm"
+INCLUDE "data/maps/headers/PewterNidoranHouse.asm"
 INCLUDE "scripts/PewterNidoranHouse.asm"
-INCLUDE "data/mapObjects/PewterNidoranHouse.asm"
+INCLUDE "data/maps/objects/PewterNidoranHouse.asm"
 
-INCLUDE "data/mapHeaders/PewterSpeechHouse.asm"
+INCLUDE "data/maps/headers/PewterSpeechHouse.asm"
 INCLUDE "scripts/PewterSpeechHouse.asm"
-INCLUDE "data/mapObjects/PewterSpeechHouse.asm"
+INCLUDE "data/maps/objects/PewterSpeechHouse.asm"
 
-INCLUDE "data/mapHeaders/CeruleanTrashedHouse.asm"
+INCLUDE "data/maps/headers/CeruleanTrashedHouse.asm"
 INCLUDE "scripts/CeruleanTrashedHouse.asm"
-INCLUDE "data/mapObjects/CeruleanTrashedHouse.asm"
+INCLUDE "data/maps/objects/CeruleanTrashedHouse.asm"
 
-INCLUDE "data/mapHeaders/CeruleanTradeHouse.asm"
+INCLUDE "data/maps/headers/CeruleanTradeHouse.asm"
 INCLUDE "scripts/CeruleanTradeHouse.asm"
-INCLUDE "data/mapObjects/CeruleanTradeHouse.asm"
+INCLUDE "data/maps/objects/CeruleanTradeHouse.asm"
 
-INCLUDE "data/mapHeaders/BikeShop.asm"
+INCLUDE "data/maps/headers/BikeShop.asm"
 INCLUDE "scripts/BikeShop.asm"
-INCLUDE "data/mapObjects/BikeShop.asm"
+INCLUDE "data/maps/objects/BikeShop.asm"
 BikeShop_Blocks: INCBIN "maps/BikeShop.blk"
 
-INCLUDE "data/mapHeaders/MrFujisHouse.asm"
+INCLUDE "data/maps/headers/MrFujisHouse.asm"
 INCLUDE "scripts/MrFujisHouse.asm"
-INCLUDE "data/mapObjects/MrFujisHouse.asm"
+INCLUDE "data/maps/objects/MrFujisHouse.asm"
 
-INCLUDE "data/mapHeaders/LavenderCuboneHouse.asm"
+INCLUDE "data/maps/headers/LavenderCuboneHouse.asm"
 INCLUDE "scripts/LavenderCuboneHouse.asm"
-INCLUDE "data/mapObjects/LavenderCuboneHouse.asm"
+INCLUDE "data/maps/objects/LavenderCuboneHouse.asm"
 
-INCLUDE "data/mapHeaders/NameRatersHouse.asm"
+INCLUDE "data/maps/headers/NameRatersHouse.asm"
 INCLUDE "scripts/NameRatersHouse.asm"
-INCLUDE "data/mapObjects/NameRatersHouse.asm"
+INCLUDE "data/maps/objects/NameRatersHouse.asm"
 
-INCLUDE "data/mapHeaders/VermilionPidgeyHouse.asm"
+INCLUDE "data/maps/headers/VermilionPidgeyHouse.asm"
 INCLUDE "scripts/VermilionPidgeyHouse.asm"
-INCLUDE "data/mapObjects/VermilionPidgeyHouse.asm"
+INCLUDE "data/maps/objects/VermilionPidgeyHouse.asm"
 
-INCLUDE "data/mapHeaders/VermilionDock.asm"
+INCLUDE "data/maps/headers/VermilionDock.asm"
 INCLUDE "scripts/VermilionDock.asm"
-INCLUDE "data/mapObjects/VermilionDock.asm"
+INCLUDE "data/maps/objects/VermilionDock.asm"
 VermilionDock_Blocks: INCBIN "maps/VermilionDock.blk"
 
-INCLUDE "data/mapHeaders/CeladonMansionRoofHouse.asm"
+INCLUDE "data/maps/headers/CeladonMansionRoofHouse.asm"
 INCLUDE "scripts/CeladonMansionRoofHouse.asm"
-INCLUDE "data/mapObjects/CeladonMansionRoofHouse.asm"
+INCLUDE "data/maps/objects/CeladonMansionRoofHouse.asm"
 
-INCLUDE "data/mapHeaders/FuchsiaMart.asm"
+INCLUDE "data/maps/headers/FuchsiaMart.asm"
 INCLUDE "scripts/FuchsiaMart.asm"
-INCLUDE "data/mapObjects/FuchsiaMart.asm"
+INCLUDE "data/maps/objects/FuchsiaMart.asm"
 FuchsiaMart_Blocks: INCBIN "maps/FuchsiaMart.blk"
 
-INCLUDE "data/mapHeaders/SaffronPidgeyHouse.asm"
+INCLUDE "data/maps/headers/SaffronPidgeyHouse.asm"
 INCLUDE "scripts/SaffronPidgeyHouse.asm"
-INCLUDE "data/mapObjects/SaffronPidgeyHouse.asm"
+INCLUDE "data/maps/objects/SaffronPidgeyHouse.asm"
 
-INCLUDE "data/mapHeaders/MrPsychicsHouse.asm"
+INCLUDE "data/maps/headers/MrPsychicsHouse.asm"
 INCLUDE "scripts/MrPsychicsHouse.asm"
-INCLUDE "data/mapObjects/MrPsychicsHouse.asm"
+INCLUDE "data/maps/objects/MrPsychicsHouse.asm"
 
-INCLUDE "data/mapHeaders/DiglettsCaveRoute2.asm"
+INCLUDE "data/maps/headers/DiglettsCaveRoute2.asm"
 INCLUDE "scripts/DiglettsCaveRoute2.asm"
-INCLUDE "data/mapObjects/DiglettsCaveRoute2.asm"
+INCLUDE "data/maps/objects/DiglettsCaveRoute2.asm"
 
-INCLUDE "data/mapHeaders/Route2TradeHouse.asm"
+INCLUDE "data/maps/headers/Route2TradeHouse.asm"
 INCLUDE "scripts/Route2TradeHouse.asm"
-INCLUDE "data/mapObjects/Route2TradeHouse.asm"
+INCLUDE "data/maps/objects/Route2TradeHouse.asm"
 
-INCLUDE "data/mapHeaders/Route5Gate.asm"
+INCLUDE "data/maps/headers/Route5Gate.asm"
 INCLUDE "scripts/Route5Gate.asm"
-INCLUDE "data/mapObjects/Route5Gate.asm"
+INCLUDE "data/maps/objects/Route5Gate.asm"
 Route5Gate_Blocks: INCBIN "maps/Route5Gate.blk"
 
-INCLUDE "data/mapHeaders/Route6Gate.asm"
+INCLUDE "data/maps/headers/Route6Gate.asm"
 INCLUDE "scripts/Route6Gate.asm"
-INCLUDE "data/mapObjects/Route6Gate.asm"
+INCLUDE "data/maps/objects/Route6Gate.asm"
 Route6Gate_Blocks: INCBIN "maps/Route6Gate.blk"
 
-INCLUDE "data/mapHeaders/Route7Gate.asm"
+INCLUDE "data/maps/headers/Route7Gate.asm"
 INCLUDE "scripts/Route7Gate.asm"
-INCLUDE "data/mapObjects/Route7Gate.asm"
+INCLUDE "data/maps/objects/Route7Gate.asm"
 Route7Gate_Blocks: INCBIN "maps/Route7Gate.blk"
 
-INCLUDE "data/mapHeaders/Route8Gate.asm"
+INCLUDE "data/maps/headers/Route8Gate.asm"
 INCLUDE "scripts/Route8Gate.asm"
-INCLUDE "data/mapObjects/Route8Gate.asm"
+INCLUDE "data/maps/objects/Route8Gate.asm"
 Route8Gate_Blocks: INCBIN "maps/Route8Gate.blk"
 
-INCLUDE "data/mapHeaders/UndergroundPathRoute8.asm"
+INCLUDE "data/maps/headers/UndergroundPathRoute8.asm"
 INCLUDE "scripts/UndergroundPathRoute8.asm"
-INCLUDE "data/mapObjects/UndergroundPathRoute8.asm"
+INCLUDE "data/maps/objects/UndergroundPathRoute8.asm"
 
-INCLUDE "data/mapHeaders/PowerPlant.asm"
+INCLUDE "data/maps/headers/PowerPlant.asm"
 INCLUDE "scripts/PowerPlant.asm"
-INCLUDE "data/mapObjects/PowerPlant.asm"
+INCLUDE "data/maps/objects/PowerPlant.asm"
 PowerPlant_Blocks: INCBIN "maps/PowerPlant.blk"
 
-INCLUDE "data/mapHeaders/DiglettsCaveRoute11.asm"
+INCLUDE "data/maps/headers/DiglettsCaveRoute11.asm"
 INCLUDE "scripts/DiglettsCaveRoute11.asm"
-INCLUDE "data/mapObjects/DiglettsCaveRoute11.asm"
+INCLUDE "data/maps/objects/DiglettsCaveRoute11.asm"
 
-INCLUDE "data/mapHeaders/Route16FlyHouse.asm"
+INCLUDE "data/maps/headers/Route16FlyHouse.asm"
 INCLUDE "scripts/Route16FlyHouse.asm"
-INCLUDE "data/mapObjects/Route16FlyHouse.asm"
+INCLUDE "data/maps/objects/Route16FlyHouse.asm"
 
-INCLUDE "data/mapHeaders/Route22Gate.asm"
+INCLUDE "data/maps/headers/Route22Gate.asm"
 INCLUDE "scripts/Route22Gate.asm"
-INCLUDE "data/mapObjects/Route22Gate.asm"
+INCLUDE "data/maps/objects/Route22Gate.asm"
 Route22Gate_Blocks: INCBIN "maps/Route22Gate.blk"
 
-INCLUDE "data/mapHeaders/BillsHouse.asm"
+INCLUDE "data/maps/headers/BillsHouse.asm"
 INCLUDE "scripts/BillsHouse.asm"
-INCLUDE "data/mapObjects/BillsHouse.asm"
+INCLUDE "data/maps/objects/BillsHouse.asm"
 BillsHouse_Blocks: INCBIN "maps/BillsHouse.blk"
 
 
 SECTION "Maps 5", ROMX
 
-INCLUDE "data/mapHeaders/LavenderTown.asm"
-INCLUDE "data/mapObjects/LavenderTown.asm"
+INCLUDE "data/maps/headers/LavenderTown.asm"
+INCLUDE "data/maps/objects/LavenderTown.asm"
 LavenderTown_Blocks: INCBIN "maps/LavenderTown.blk"
 
 ViridianPokecenter_Blocks: INCBIN "maps/ViridianPokecenter.blk"
@@ -267,136 +267,136 @@ INCLUDE "scripts/LavenderTown.asm"
 
 SECTION "Maps 6", ROMX
 
-INCLUDE "data/mapHeaders/ViridianPokecenter.asm"
+INCLUDE "data/maps/headers/ViridianPokecenter.asm"
 INCLUDE "scripts/ViridianPokecenter.asm"
-INCLUDE "data/mapObjects/ViridianPokecenter.asm"
+INCLUDE "data/maps/objects/ViridianPokecenter.asm"
 
-INCLUDE "data/mapHeaders/PokemonMansion1F.asm"
+INCLUDE "data/maps/headers/PokemonMansion1F.asm"
 INCLUDE "scripts/PokemonMansion1F.asm"
-INCLUDE "data/mapObjects/PokemonMansion1F.asm"
+INCLUDE "data/maps/objects/PokemonMansion1F.asm"
 PokemonMansion1F_Blocks: INCBIN "maps/PokemonMansion1F.blk"
 
-INCLUDE "data/mapHeaders/RockTunnel1F.asm"
+INCLUDE "data/maps/headers/RockTunnel1F.asm"
 INCLUDE "scripts/RockTunnel1F.asm"
-INCLUDE "data/mapObjects/RockTunnel1F.asm"
+INCLUDE "data/maps/objects/RockTunnel1F.asm"
 RockTunnel1F_Blocks: INCBIN "maps/RockTunnel1F.blk"
 
-INCLUDE "data/mapHeaders/SeafoamIslands1F.asm"
+INCLUDE "data/maps/headers/SeafoamIslands1F.asm"
 INCLUDE "scripts/SeafoamIslands1F.asm"
-INCLUDE "data/mapObjects/SeafoamIslands1F.asm"
+INCLUDE "data/maps/objects/SeafoamIslands1F.asm"
 SeafoamIslands1F_Blocks: INCBIN "maps/SeafoamIslands1F.blk"
 
-INCLUDE "data/mapHeaders/SSAnne3F.asm"
+INCLUDE "data/maps/headers/SSAnne3F.asm"
 INCLUDE "scripts/SSAnne3F.asm"
-INCLUDE "data/mapObjects/SSAnne3F.asm"
+INCLUDE "data/maps/objects/SSAnne3F.asm"
 SSAnne3F_Blocks: INCBIN "maps/SSAnne3F.blk"
 
-INCLUDE "data/mapHeaders/VictoryRoad3F.asm"
+INCLUDE "data/maps/headers/VictoryRoad3F.asm"
 INCLUDE "scripts/VictoryRoad3F.asm"
-INCLUDE "data/mapObjects/VictoryRoad3F.asm"
+INCLUDE "data/maps/objects/VictoryRoad3F.asm"
 VictoryRoad3F_Blocks: INCBIN "maps/VictoryRoad3F.blk"
 
-INCLUDE "data/mapHeaders/RocketHideoutB1F.asm"
+INCLUDE "data/maps/headers/RocketHideoutB1F.asm"
 INCLUDE "scripts/RocketHideoutB1F.asm"
-INCLUDE "data/mapObjects/RocketHideoutB1F.asm"
+INCLUDE "data/maps/objects/RocketHideoutB1F.asm"
 RocketHideoutB1F_Blocks: INCBIN "maps/RocketHideoutB1F.blk"
 
-INCLUDE "data/mapHeaders/RocketHideoutB2F.asm"
+INCLUDE "data/maps/headers/RocketHideoutB2F.asm"
 INCLUDE "scripts/RocketHideoutB2F.asm"
-INCLUDE "data/mapObjects/RocketHideoutB2F.asm"
+INCLUDE "data/maps/objects/RocketHideoutB2F.asm"
 RocketHideoutB2F_Blocks: INCBIN "maps/RocketHideoutB2F.blk"
 
-INCLUDE "data/mapHeaders/RocketHideoutB3F.asm"
+INCLUDE "data/maps/headers/RocketHideoutB3F.asm"
 INCLUDE "scripts/RocketHideoutB3F.asm"
-INCLUDE "data/mapObjects/RocketHideoutB3F.asm"
+INCLUDE "data/maps/objects/RocketHideoutB3F.asm"
 RocketHideoutB3F_Blocks: INCBIN "maps/RocketHideoutB3F.blk"
 
-INCLUDE "data/mapHeaders/RocketHideoutB4F.asm"
+INCLUDE "data/maps/headers/RocketHideoutB4F.asm"
 INCLUDE "scripts/RocketHideoutB4F.asm"
-INCLUDE "data/mapObjects/RocketHideoutB4F.asm"
+INCLUDE "data/maps/objects/RocketHideoutB4F.asm"
 RocketHideoutB4F_Blocks: INCBIN "maps/RocketHideoutB4F.blk"
 
-INCLUDE "data/mapHeaders/RocketHideoutElevator.asm"
+INCLUDE "data/maps/headers/RocketHideoutElevator.asm"
 INCLUDE "scripts/RocketHideoutElevator.asm"
-INCLUDE "data/mapObjects/RocketHideoutElevator.asm"
+INCLUDE "data/maps/objects/RocketHideoutElevator.asm"
 RocketHideoutElevator_Blocks: INCBIN "maps/RocketHideoutElevator.blk"
 
-INCLUDE "data/mapHeaders/SilphCoElevator.asm"
+INCLUDE "data/maps/headers/SilphCoElevator.asm"
 INCLUDE "scripts/SilphCoElevator.asm"
-INCLUDE "data/mapObjects/SilphCoElevator.asm"
+INCLUDE "data/maps/objects/SilphCoElevator.asm"
 SilphCoElevator_Blocks: INCBIN "maps/SilphCoElevator.blk"
 
-INCLUDE "data/mapHeaders/SafariZoneEast.asm"
+INCLUDE "data/maps/headers/SafariZoneEast.asm"
 INCLUDE "scripts/SafariZoneEast.asm"
-INCLUDE "data/mapObjects/SafariZoneEast.asm"
+INCLUDE "data/maps/objects/SafariZoneEast.asm"
 SafariZoneEast_Blocks: INCBIN "maps/SafariZoneEast.blk"
 
-INCLUDE "data/mapHeaders/SafariZoneNorth.asm"
+INCLUDE "data/maps/headers/SafariZoneNorth.asm"
 INCLUDE "scripts/SafariZoneNorth.asm"
-INCLUDE "data/mapObjects/SafariZoneNorth.asm"
+INCLUDE "data/maps/objects/SafariZoneNorth.asm"
 SafariZoneNorth_Blocks: INCBIN "maps/SafariZoneNorth.blk"
 
-INCLUDE "data/mapHeaders/SafariZoneCenter.asm"
+INCLUDE "data/maps/headers/SafariZoneCenter.asm"
 INCLUDE "scripts/SafariZoneCenter.asm"
-INCLUDE "data/mapObjects/SafariZoneCenter.asm"
+INCLUDE "data/maps/objects/SafariZoneCenter.asm"
 SafariZoneCenter_Blocks: INCBIN "maps/SafariZoneCenter.blk"
 
-INCLUDE "data/mapHeaders/SafariZoneCenterRestHouse.asm"
+INCLUDE "data/maps/headers/SafariZoneCenterRestHouse.asm"
 INCLUDE "scripts/SafariZoneCenterRestHouse.asm"
-INCLUDE "data/mapObjects/SafariZoneCenterRestHouse.asm"
+INCLUDE "data/maps/objects/SafariZoneCenterRestHouse.asm"
 
-INCLUDE "data/mapHeaders/SafariZoneWestRestHouse.asm"
+INCLUDE "data/maps/headers/SafariZoneWestRestHouse.asm"
 INCLUDE "scripts/SafariZoneWestRestHouse.asm"
-INCLUDE "data/mapObjects/SafariZoneWestRestHouse.asm"
+INCLUDE "data/maps/objects/SafariZoneWestRestHouse.asm"
 
-INCLUDE "data/mapHeaders/SafariZoneEastRestHouse.asm"
+INCLUDE "data/maps/headers/SafariZoneEastRestHouse.asm"
 INCLUDE "scripts/SafariZoneEastRestHouse.asm"
-INCLUDE "data/mapObjects/SafariZoneEastRestHouse.asm"
+INCLUDE "data/maps/objects/SafariZoneEastRestHouse.asm"
 
-INCLUDE "data/mapHeaders/SafariZoneNorthRestHouse.asm"
+INCLUDE "data/maps/headers/SafariZoneNorthRestHouse.asm"
 INCLUDE "scripts/SafariZoneNorthRestHouse.asm"
-INCLUDE "data/mapObjects/SafariZoneNorthRestHouse.asm"
+INCLUDE "data/maps/objects/SafariZoneNorthRestHouse.asm"
 
-INCLUDE "data/mapHeaders/CeruleanCave2F.asm"
+INCLUDE "data/maps/headers/CeruleanCave2F.asm"
 INCLUDE "scripts/CeruleanCave2F.asm"
-INCLUDE "data/mapObjects/CeruleanCave2F.asm"
+INCLUDE "data/maps/objects/CeruleanCave2F.asm"
 CeruleanCave2F_Blocks: INCBIN "maps/CeruleanCave2F.blk"
 
-INCLUDE "data/mapHeaders/CeruleanCaveB1F.asm"
+INCLUDE "data/maps/headers/CeruleanCaveB1F.asm"
 INCLUDE "scripts/CeruleanCaveB1F.asm"
-INCLUDE "data/mapObjects/CeruleanCaveB1F.asm"
+INCLUDE "data/maps/objects/CeruleanCaveB1F.asm"
 CeruleanCaveB1F_Blocks: INCBIN "maps/CeruleanCaveB1F.blk"
 
-INCLUDE "data/mapHeaders/RockTunnelB1F.asm"
+INCLUDE "data/maps/headers/RockTunnelB1F.asm"
 INCLUDE "scripts/RockTunnelB1F.asm"
-INCLUDE "data/mapObjects/RockTunnelB1F.asm"
+INCLUDE "data/maps/objects/RockTunnelB1F.asm"
 RockTunnelB1F_Blocks: INCBIN "maps/RockTunnelB1F.blk"
 
-INCLUDE "data/mapHeaders/SeafoamIslandsB1F.asm"
+INCLUDE "data/maps/headers/SeafoamIslandsB1F.asm"
 INCLUDE "scripts/SeafoamIslandsB1F.asm"
-INCLUDE "data/mapObjects/SeafoamIslandsB1F.asm"
+INCLUDE "data/maps/objects/SeafoamIslandsB1F.asm"
 SeafoamIslandsB1F_Blocks: INCBIN "maps/SeafoamIslandsB1F.blk"
 
-INCLUDE "data/mapHeaders/SeafoamIslandsB2F.asm"
+INCLUDE "data/maps/headers/SeafoamIslandsB2F.asm"
 INCLUDE "scripts/SeafoamIslandsB2F.asm"
-INCLUDE "data/mapObjects/SeafoamIslandsB2F.asm"
+INCLUDE "data/maps/objects/SeafoamIslandsB2F.asm"
 SeafoamIslandsB2F_Blocks: INCBIN "maps/SeafoamIslandsB2F.blk"
 
-INCLUDE "data/mapHeaders/SeafoamIslandsB3F.asm"
+INCLUDE "data/maps/headers/SeafoamIslandsB3F.asm"
 INCLUDE "scripts/SeafoamIslandsB3F.asm"
-INCLUDE "data/mapObjects/SeafoamIslandsB3F.asm"
+INCLUDE "data/maps/objects/SeafoamIslandsB3F.asm"
 SeafoamIslandsB3F_Blocks: INCBIN "maps/SeafoamIslandsB3F.blk"
 
-INCLUDE "data/mapHeaders/SeafoamIslandsB4F.asm"
+INCLUDE "data/maps/headers/SeafoamIslandsB4F.asm"
 INCLUDE "scripts/SeafoamIslandsB4F.asm"
-INCLUDE "data/mapObjects/SeafoamIslandsB4F.asm"
+INCLUDE "data/maps/objects/SeafoamIslandsB4F.asm"
 SeafoamIslandsB4F_Blocks: INCBIN "maps/SeafoamIslandsB4F.blk"
 
 
 SECTION "Maps 7", ROMX
 
-INCLUDE "data/mapHeaders/Route7.asm"
-INCLUDE "data/mapObjects/Route7.asm"
+INCLUDE "data/maps/headers/Route7.asm"
+INCLUDE "data/maps/objects/Route7.asm"
 Route7_Blocks: INCBIN "maps/Route7.blk"
 
 CeladonPokecenter_Blocks:
@@ -418,203 +418,203 @@ SECTION "Maps 8", ROMX
 
 INCLUDE "scripts/Route7.asm"
 
-INCLUDE "data/mapHeaders/RedsHouse1F.asm"
+INCLUDE "data/maps/headers/RedsHouse1F.asm"
 INCLUDE "scripts/RedsHouse1F.asm"
-INCLUDE "data/mapObjects/RedsHouse1F.asm"
+INCLUDE "data/maps/objects/RedsHouse1F.asm"
 RedsHouse1F_Blocks: INCBIN "maps/RedsHouse1F.blk"
 
-INCLUDE "data/mapHeaders/CeladonMart3F.asm"
+INCLUDE "data/maps/headers/CeladonMart3F.asm"
 INCLUDE "scripts/CeladonMart3F.asm"
-INCLUDE "data/mapObjects/CeladonMart3F.asm"
+INCLUDE "data/maps/objects/CeladonMart3F.asm"
 CeladonMart3F_Blocks: INCBIN "maps/CeladonMart3F.blk"
 
-INCLUDE "data/mapHeaders/CeladonMart4F.asm"
+INCLUDE "data/maps/headers/CeladonMart4F.asm"
 INCLUDE "scripts/CeladonMart4F.asm"
-INCLUDE "data/mapObjects/CeladonMart4F.asm"
+INCLUDE "data/maps/objects/CeladonMart4F.asm"
 CeladonMart4F_Blocks: INCBIN "maps/CeladonMart4F.blk"
 
-INCLUDE "data/mapHeaders/CeladonMartRoof.asm"
+INCLUDE "data/maps/headers/CeladonMartRoof.asm"
 INCLUDE "scripts/CeladonMartRoof.asm"
-INCLUDE "data/mapObjects/CeladonMartRoof.asm"
+INCLUDE "data/maps/objects/CeladonMartRoof.asm"
 CeladonMartRoof_Blocks: INCBIN "maps/CeladonMartRoof.blk"
 
-INCLUDE "data/mapHeaders/CeladonMartElevator.asm"
+INCLUDE "data/maps/headers/CeladonMartElevator.asm"
 INCLUDE "scripts/CeladonMartElevator.asm"
-INCLUDE "data/mapObjects/CeladonMartElevator.asm"
+INCLUDE "data/maps/objects/CeladonMartElevator.asm"
 CeladonMartElevator_Blocks: INCBIN "maps/CeladonMartElevator.blk"
 
-INCLUDE "data/mapHeaders/CeladonMansion1F.asm"
+INCLUDE "data/maps/headers/CeladonMansion1F.asm"
 INCLUDE "scripts/CeladonMansion1F.asm"
-INCLUDE "data/mapObjects/CeladonMansion1F.asm"
+INCLUDE "data/maps/objects/CeladonMansion1F.asm"
 CeladonMansion1F_Blocks: INCBIN "maps/CeladonMansion1F.blk"
 
-INCLUDE "data/mapHeaders/CeladonMansion2F.asm"
+INCLUDE "data/maps/headers/CeladonMansion2F.asm"
 INCLUDE "scripts/CeladonMansion2F.asm"
-INCLUDE "data/mapObjects/CeladonMansion2F.asm"
+INCLUDE "data/maps/objects/CeladonMansion2F.asm"
 CeladonMansion2F_Blocks: INCBIN "maps/CeladonMansion2F.blk"
 
-INCLUDE "data/mapHeaders/CeladonMansion3F.asm"
+INCLUDE "data/maps/headers/CeladonMansion3F.asm"
 INCLUDE "scripts/CeladonMansion3F.asm"
-INCLUDE "data/mapObjects/CeladonMansion3F.asm"
+INCLUDE "data/maps/objects/CeladonMansion3F.asm"
 CeladonMansion3F_Blocks: INCBIN "maps/CeladonMansion3F.blk"
 
-INCLUDE "data/mapHeaders/CeladonMansionRoof.asm"
+INCLUDE "data/maps/headers/CeladonMansionRoof.asm"
 INCLUDE "scripts/CeladonMansionRoof.asm"
-INCLUDE "data/mapObjects/CeladonMansionRoof.asm"
+INCLUDE "data/maps/objects/CeladonMansionRoof.asm"
 CeladonMansionRoof_Blocks: INCBIN "maps/CeladonMansionRoof.blk"
 
-INCLUDE "data/mapHeaders/CeladonPokecenter.asm"
+INCLUDE "data/maps/headers/CeladonPokecenter.asm"
 INCLUDE "scripts/CeladonPokecenter.asm"
-INCLUDE "data/mapObjects/CeladonPokecenter.asm"
+INCLUDE "data/maps/objects/CeladonPokecenter.asm"
 
-INCLUDE "data/mapHeaders/CeladonGym.asm"
+INCLUDE "data/maps/headers/CeladonGym.asm"
 INCLUDE "scripts/CeladonGym.asm"
-INCLUDE "data/mapObjects/CeladonGym.asm"
+INCLUDE "data/maps/objects/CeladonGym.asm"
 CeladonGym_Blocks: INCBIN "maps/CeladonGym.blk"
 
-INCLUDE "data/mapHeaders/GameCorner.asm"
+INCLUDE "data/maps/headers/GameCorner.asm"
 INCLUDE "scripts/GameCorner.asm"
-INCLUDE "data/mapObjects/GameCorner.asm"
+INCLUDE "data/maps/objects/GameCorner.asm"
 GameCorner_Blocks: INCBIN "maps/GameCorner.blk"
 
-INCLUDE "data/mapHeaders/CeladonMart5F.asm"
+INCLUDE "data/maps/headers/CeladonMart5F.asm"
 INCLUDE "scripts/CeladonMart5F.asm"
-INCLUDE "data/mapObjects/CeladonMart5F.asm"
+INCLUDE "data/maps/objects/CeladonMart5F.asm"
 CeladonMart5F_Blocks: INCBIN "maps/CeladonMart5F.blk"
 
-INCLUDE "data/mapHeaders/GameCornerPrizeRoom.asm"
+INCLUDE "data/maps/headers/GameCornerPrizeRoom.asm"
 INCLUDE "scripts/GameCornerPrizeRoom.asm"
-INCLUDE "data/mapObjects/GameCornerPrizeRoom.asm"
+INCLUDE "data/maps/objects/GameCornerPrizeRoom.asm"
 GameCornerPrizeRoom_Blocks: INCBIN "maps/GameCornerPrizeRoom.blk"
 
-INCLUDE "data/mapHeaders/CeladonDiner.asm"
+INCLUDE "data/maps/headers/CeladonDiner.asm"
 INCLUDE "scripts/CeladonDiner.asm"
-INCLUDE "data/mapObjects/CeladonDiner.asm"
+INCLUDE "data/maps/objects/CeladonDiner.asm"
 CeladonDiner_Blocks: INCBIN "maps/CeladonDiner.blk"
 
-INCLUDE "data/mapHeaders/CeladonChiefHouse.asm"
+INCLUDE "data/maps/headers/CeladonChiefHouse.asm"
 INCLUDE "scripts/CeladonChiefHouse.asm"
-INCLUDE "data/mapObjects/CeladonChiefHouse.asm"
+INCLUDE "data/maps/objects/CeladonChiefHouse.asm"
 CeladonChiefHouse_Blocks: INCBIN "maps/CeladonChiefHouse.blk"
 
-INCLUDE "data/mapHeaders/CeladonHotel.asm"
+INCLUDE "data/maps/headers/CeladonHotel.asm"
 INCLUDE "scripts/CeladonHotel.asm"
-INCLUDE "data/mapObjects/CeladonHotel.asm"
+INCLUDE "data/maps/objects/CeladonHotel.asm"
 CeladonHotel_Blocks: INCBIN "maps/CeladonHotel.blk"
 
-INCLUDE "data/mapHeaders/MtMoonPokecenter.asm"
+INCLUDE "data/maps/headers/MtMoonPokecenter.asm"
 INCLUDE "scripts/MtMoonPokecenter.asm"
-INCLUDE "data/mapObjects/MtMoonPokecenter.asm"
+INCLUDE "data/maps/objects/MtMoonPokecenter.asm"
 
-INCLUDE "data/mapHeaders/RockTunnelPokecenter.asm"
+INCLUDE "data/maps/headers/RockTunnelPokecenter.asm"
 INCLUDE "scripts/RockTunnelPokecenter.asm"
-INCLUDE "data/mapObjects/RockTunnelPokecenter.asm"
+INCLUDE "data/maps/objects/RockTunnelPokecenter.asm"
 
-INCLUDE "data/mapHeaders/Route11Gate1F.asm"
+INCLUDE "data/maps/headers/Route11Gate1F.asm"
 INCLUDE "scripts/Route11Gate1F.asm"
-INCLUDE "data/mapObjects/Route11Gate1F.asm"
+INCLUDE "data/maps/objects/Route11Gate1F.asm"
 
-INCLUDE "data/mapHeaders/Route11Gate2F.asm"
+INCLUDE "data/maps/headers/Route11Gate2F.asm"
 INCLUDE "scripts/Route11Gate2F.asm"
-INCLUDE "data/mapObjects/Route11Gate2F.asm"
+INCLUDE "data/maps/objects/Route11Gate2F.asm"
 
-INCLUDE "data/mapHeaders/Route12Gate1F.asm"
+INCLUDE "data/maps/headers/Route12Gate1F.asm"
 INCLUDE "scripts/Route12Gate1F.asm"
-INCLUDE "data/mapObjects/Route12Gate1F.asm"
+INCLUDE "data/maps/objects/Route12Gate1F.asm"
 Route12Gate1F_Blocks: INCBIN "maps/Route12Gate1F.blk"
 
-INCLUDE "data/mapHeaders/Route12Gate2F.asm"
+INCLUDE "data/maps/headers/Route12Gate2F.asm"
 INCLUDE "scripts/Route12Gate2F.asm"
-INCLUDE "data/mapObjects/Route12Gate2F.asm"
+INCLUDE "data/maps/objects/Route12Gate2F.asm"
 
-INCLUDE "data/mapHeaders/Route15Gate1F.asm"
+INCLUDE "data/maps/headers/Route15Gate1F.asm"
 INCLUDE "scripts/Route15Gate1F.asm"
-INCLUDE "data/mapObjects/Route15Gate1F.asm"
+INCLUDE "data/maps/objects/Route15Gate1F.asm"
 
-INCLUDE "data/mapHeaders/Route15Gate2F.asm"
+INCLUDE "data/maps/headers/Route15Gate2F.asm"
 INCLUDE "scripts/Route15Gate2F.asm"
-INCLUDE "data/mapObjects/Route15Gate2F.asm"
+INCLUDE "data/maps/objects/Route15Gate2F.asm"
 
-INCLUDE "data/mapHeaders/Route16Gate1F.asm"
+INCLUDE "data/maps/headers/Route16Gate1F.asm"
 INCLUDE "scripts/Route16Gate1F.asm"
-INCLUDE "data/mapObjects/Route16Gate1F.asm"
+INCLUDE "data/maps/objects/Route16Gate1F.asm"
 Route16Gate1F_Blocks: INCBIN "maps/Route16Gate1F.blk"
 
-INCLUDE "data/mapHeaders/Route16Gate2F.asm"
+INCLUDE "data/maps/headers/Route16Gate2F.asm"
 INCLUDE "scripts/Route16Gate2F.asm"
-INCLUDE "data/mapObjects/Route16Gate2F.asm"
+INCLUDE "data/maps/objects/Route16Gate2F.asm"
 
-INCLUDE "data/mapHeaders/Route18Gate1F.asm"
+INCLUDE "data/maps/headers/Route18Gate1F.asm"
 INCLUDE "scripts/Route18Gate1F.asm"
-INCLUDE "data/mapObjects/Route18Gate1F.asm"
+INCLUDE "data/maps/objects/Route18Gate1F.asm"
 
-INCLUDE "data/mapHeaders/Route18Gate2F.asm"
+INCLUDE "data/maps/headers/Route18Gate2F.asm"
 INCLUDE "scripts/Route18Gate2F.asm"
-INCLUDE "data/mapObjects/Route18Gate2F.asm"
+INCLUDE "data/maps/objects/Route18Gate2F.asm"
 
-INCLUDE "data/mapHeaders/MtMoon1F.asm"
+INCLUDE "data/maps/headers/MtMoon1F.asm"
 INCLUDE "scripts/MtMoon1F.asm"
-INCLUDE "data/mapObjects/MtMoon1F.asm"
+INCLUDE "data/maps/objects/MtMoon1F.asm"
 MtMoon1F_Blocks: INCBIN "maps/MtMoon1F.blk"
 
-INCLUDE "data/mapHeaders/MtMoonB2F.asm"
+INCLUDE "data/maps/headers/MtMoonB2F.asm"
 INCLUDE "scripts/MtMoonB2F.asm"
-INCLUDE "data/mapObjects/MtMoonB2F.asm"
+INCLUDE "data/maps/objects/MtMoonB2F.asm"
 MtMoonB2F_Blocks: INCBIN "maps/MtMoonB2F.blk"
 
-INCLUDE "data/mapHeaders/SafariZoneWest.asm"
+INCLUDE "data/maps/headers/SafariZoneWest.asm"
 INCLUDE "scripts/SafariZoneWest.asm"
-INCLUDE "data/mapObjects/SafariZoneWest.asm"
+INCLUDE "data/maps/objects/SafariZoneWest.asm"
 SafariZoneWest_Blocks: INCBIN "maps/SafariZoneWest.blk"
 
-INCLUDE "data/mapHeaders/SafariZoneSecretHouse.asm"
+INCLUDE "data/maps/headers/SafariZoneSecretHouse.asm"
 INCLUDE "scripts/SafariZoneSecretHouse.asm"
-INCLUDE "data/mapObjects/SafariZoneSecretHouse.asm"
+INCLUDE "data/maps/objects/SafariZoneSecretHouse.asm"
 SafariZoneSecretHouse_Blocks: INCBIN "maps/SafariZoneSecretHouse.blk"
 
 
 SECTION "Maps 9", ROMX
 
-INCLUDE "data/mapHeaders/TradeCenter.asm"
+INCLUDE "data/maps/headers/TradeCenter.asm"
 INCLUDE "scripts/TradeCenter.asm"
-INCLUDE "data/mapObjects/TradeCenter.asm"
+INCLUDE "data/maps/objects/TradeCenter.asm"
 TradeCenter_Blocks: INCBIN "maps/TradeCenter.blk"
 
-INCLUDE "data/mapHeaders/Colosseum.asm"
+INCLUDE "data/maps/headers/Colosseum.asm"
 INCLUDE "scripts/Colosseum.asm"
-INCLUDE "data/mapObjects/Colosseum.asm"
+INCLUDE "data/maps/objects/Colosseum.asm"
 Colosseum_Blocks: INCBIN "maps/Colosseum.blk"
 
 
 SECTION "Maps 10", ROMX
 
-INCLUDE "data/mapHeaders/Route22.asm"
-INCLUDE "data/mapObjects/Route22.asm"
+INCLUDE "data/maps/headers/Route22.asm"
+INCLUDE "data/maps/objects/Route22.asm"
 Route22_Blocks: INCBIN "maps/Route22.blk"
 
-INCLUDE "data/mapHeaders/Route20.asm"
-INCLUDE "data/mapObjects/Route20.asm"
+INCLUDE "data/maps/headers/Route20.asm"
+INCLUDE "data/maps/objects/Route20.asm"
 Route20_Blocks: INCBIN "maps/Route20.blk"
 
-INCLUDE "data/mapHeaders/Route23.asm"
-INCLUDE "data/mapObjects/Route23.asm"
+INCLUDE "data/maps/headers/Route23.asm"
+INCLUDE "data/maps/objects/Route23.asm"
 Route23_Blocks: INCBIN "maps/Route23.blk"
 
-INCLUDE "data/mapHeaders/Route24.asm"
-INCLUDE "data/mapObjects/Route24.asm"
+INCLUDE "data/maps/headers/Route24.asm"
+INCLUDE "data/maps/objects/Route24.asm"
 Route24_Blocks: INCBIN "maps/Route24.blk"
 
-INCLUDE "data/mapHeaders/Route25.asm"
-INCLUDE "data/mapObjects/Route25.asm"
+INCLUDE "data/maps/headers/Route25.asm"
+INCLUDE "data/maps/objects/Route25.asm"
 Route25_Blocks: INCBIN "maps/Route25.blk"
 
-INCLUDE "data/mapHeaders/IndigoPlateau.asm"
+INCLUDE "data/maps/headers/IndigoPlateau.asm"
 INCLUDE "scripts/IndigoPlateau.asm"
-INCLUDE "data/mapObjects/IndigoPlateau.asm"
+INCLUDE "data/maps/objects/IndigoPlateau.asm"
 IndigoPlateau_Blocks: INCBIN "maps/IndigoPlateau.blk"
 
-INCLUDE "data/mapHeaders/SaffronCity.asm"
-INCLUDE "data/mapObjects/SaffronCity.asm"
+INCLUDE "data/maps/headers/SaffronCity.asm"
+INCLUDE "data/maps/objects/SaffronCity.asm"
 SaffronCity_Blocks: INCBIN "maps/SaffronCity.blk"
 INCLUDE "scripts/SaffronCity.asm"
 
@@ -624,77 +624,77 @@ INCLUDE "scripts/Route23.asm"
 INCLUDE "scripts/Route24.asm"
 INCLUDE "scripts/Route25.asm"
 
-INCLUDE "data/mapHeaders/VictoryRoad2F.asm"
+INCLUDE "data/maps/headers/VictoryRoad2F.asm"
 INCLUDE "scripts/VictoryRoad2F.asm"
-INCLUDE "data/mapObjects/VictoryRoad2F.asm"
+INCLUDE "data/maps/objects/VictoryRoad2F.asm"
 VictoryRoad2F_Blocks: INCBIN "maps/VictoryRoad2F.blk"
 
-INCLUDE "data/mapHeaders/MtMoonB1F.asm"
+INCLUDE "data/maps/headers/MtMoonB1F.asm"
 INCLUDE "scripts/MtMoonB1F.asm"
-INCLUDE "data/mapObjects/MtMoonB1F.asm"
+INCLUDE "data/maps/objects/MtMoonB1F.asm"
 MtMoonB1F_Blocks: INCBIN "maps/MtMoonB1F.blk"
 
-INCLUDE "data/mapHeaders/SilphCo7F.asm"
+INCLUDE "data/maps/headers/SilphCo7F.asm"
 INCLUDE "scripts/SilphCo7F.asm"
-INCLUDE "data/mapObjects/SilphCo7F.asm"
+INCLUDE "data/maps/objects/SilphCo7F.asm"
 SilphCo7F_Blocks: INCBIN "maps/SilphCo7F.blk"
 
-INCLUDE "data/mapHeaders/PokemonMansion2F.asm"
+INCLUDE "data/maps/headers/PokemonMansion2F.asm"
 INCLUDE "scripts/PokemonMansion2F.asm"
-INCLUDE "data/mapObjects/PokemonMansion2F.asm"
+INCLUDE "data/maps/objects/PokemonMansion2F.asm"
 PokemonMansion2F_Blocks: INCBIN "maps/PokemonMansion2F.blk"
 
-INCLUDE "data/mapHeaders/PokemonMansion3F.asm"
+INCLUDE "data/maps/headers/PokemonMansion3F.asm"
 INCLUDE "scripts/PokemonMansion3F.asm"
-INCLUDE "data/mapObjects/PokemonMansion3F.asm"
+INCLUDE "data/maps/objects/PokemonMansion3F.asm"
 PokemonMansion3F_Blocks: INCBIN "maps/PokemonMansion3F.blk"
 
-INCLUDE "data/mapHeaders/PokemonMansionB1F.asm"
+INCLUDE "data/maps/headers/PokemonMansionB1F.asm"
 INCLUDE "scripts/PokemonMansionB1F.asm"
-INCLUDE "data/mapObjects/PokemonMansionB1F.asm"
+INCLUDE "data/maps/objects/PokemonMansionB1F.asm"
 PokemonMansionB1F_Blocks: INCBIN "maps/PokemonMansionB1F.blk"
 
 
 SECTION "Maps 11", ROMX
 
-INCLUDE "data/mapHeaders/Route2.asm"
-INCLUDE "data/mapObjects/Route2.asm"
+INCLUDE "data/maps/headers/Route2.asm"
+INCLUDE "data/maps/objects/Route2.asm"
 Route2_Blocks: INCBIN "maps/Route2.blk"
 
-INCLUDE "data/mapHeaders/Route3.asm"
-INCLUDE "data/mapObjects/Route3.asm"
+INCLUDE "data/maps/headers/Route3.asm"
+INCLUDE "data/maps/objects/Route3.asm"
 Route3_Blocks: INCBIN "maps/Route3.blk"
 
-INCLUDE "data/mapHeaders/Route4.asm"
-INCLUDE "data/mapObjects/Route4.asm"
+INCLUDE "data/maps/headers/Route4.asm"
+INCLUDE "data/maps/objects/Route4.asm"
 Route4_Blocks: INCBIN "maps/Route4.blk"
 
-INCLUDE "data/mapHeaders/Route5.asm"
-INCLUDE "data/mapObjects/Route5.asm"
+INCLUDE "data/maps/headers/Route5.asm"
+INCLUDE "data/maps/objects/Route5.asm"
 Route5_Blocks: INCBIN "maps/Route5.blk"
 
-INCLUDE "data/mapHeaders/Route9.asm"
-INCLUDE "data/mapObjects/Route9.asm"
+INCLUDE "data/maps/headers/Route9.asm"
+INCLUDE "data/maps/objects/Route9.asm"
 Route9_Blocks: INCBIN "maps/Route9.blk"
 
-INCLUDE "data/mapHeaders/Route13.asm"
-INCLUDE "data/mapObjects/Route13.asm"
+INCLUDE "data/maps/headers/Route13.asm"
+INCLUDE "data/maps/objects/Route13.asm"
 Route13_Blocks: INCBIN "maps/Route13.blk"
 
-INCLUDE "data/mapHeaders/Route14.asm"
-INCLUDE "data/mapObjects/Route14.asm"
+INCLUDE "data/maps/headers/Route14.asm"
+INCLUDE "data/maps/objects/Route14.asm"
 Route14_Blocks: INCBIN "maps/Route14.blk"
 
-INCLUDE "data/mapHeaders/Route17.asm"
-INCLUDE "data/mapObjects/Route17.asm"
+INCLUDE "data/maps/headers/Route17.asm"
+INCLUDE "data/maps/objects/Route17.asm"
 Route17_Blocks: INCBIN "maps/Route17.blk"
 
-INCLUDE "data/mapHeaders/Route19.asm"
-INCLUDE "data/mapObjects/Route19.asm"
+INCLUDE "data/maps/headers/Route19.asm"
+INCLUDE "data/maps/objects/Route19.asm"
 Route19_Blocks: INCBIN "maps/Route19.blk"
 
-INCLUDE "data/mapHeaders/Route21.asm"
-INCLUDE "data/mapObjects/Route21.asm"
+INCLUDE "data/maps/headers/Route21.asm"
+INCLUDE "data/maps/objects/Route21.asm"
 Route21_Blocks: INCBIN "maps/Route21.blk"
 
 VermilionOldRodHouse_Blocks:
@@ -717,65 +717,65 @@ INCLUDE "scripts/Route17.asm"
 INCLUDE "scripts/Route19.asm"
 INCLUDE "scripts/Route21.asm"
 
-INCLUDE "data/mapHeaders/VermilionOldRodHouse.asm"
+INCLUDE "data/maps/headers/VermilionOldRodHouse.asm"
 INCLUDE "scripts/VermilionOldRodHouse.asm"
-INCLUDE "data/mapObjects/VermilionOldRodHouse.asm"
+INCLUDE "data/maps/objects/VermilionOldRodHouse.asm"
 
-INCLUDE "data/mapHeaders/CeladonMart2F.asm"
+INCLUDE "data/maps/headers/CeladonMart2F.asm"
 INCLUDE "scripts/CeladonMart2F.asm"
-INCLUDE "data/mapObjects/CeladonMart2F.asm"
+INCLUDE "data/maps/objects/CeladonMart2F.asm"
 CeladonMart2F_Blocks: INCBIN "maps/CeladonMart2F.blk"
 
-INCLUDE "data/mapHeaders/FuchsiaGoodRodHouse.asm"
+INCLUDE "data/maps/headers/FuchsiaGoodRodHouse.asm"
 INCLUDE "scripts/FuchsiaGoodRodHouse.asm"
-INCLUDE "data/mapObjects/FuchsiaGoodRodHouse.asm"
+INCLUDE "data/maps/objects/FuchsiaGoodRodHouse.asm"
 
-INCLUDE "data/mapHeaders/Daycare.asm"
+INCLUDE "data/maps/headers/Daycare.asm"
 INCLUDE "scripts/Daycare.asm"
-INCLUDE "data/mapObjects/Daycare.asm"
+INCLUDE "data/maps/objects/Daycare.asm"
 
-INCLUDE "data/mapHeaders/Route12SuperRodHouse.asm"
+INCLUDE "data/maps/headers/Route12SuperRodHouse.asm"
 INCLUDE "scripts/Route12SuperRodHouse.asm"
-INCLUDE "data/mapObjects/Route12SuperRodHouse.asm"
+INCLUDE "data/maps/objects/Route12SuperRodHouse.asm"
 
-INCLUDE "data/mapHeaders/SilphCo8F.asm"
+INCLUDE "data/maps/headers/SilphCo8F.asm"
 INCLUDE "scripts/SilphCo8F.asm"
-INCLUDE "data/mapObjects/SilphCo8F.asm"
+INCLUDE "data/maps/objects/SilphCo8F.asm"
 SilphCo8F_Blocks: INCBIN "maps/SilphCo8F.blk"
 
 
 SECTION "Maps 13", ROMX
 
-INCLUDE "data/mapHeaders/Route6.asm"
-INCLUDE "data/mapObjects/Route6.asm"
+INCLUDE "data/maps/headers/Route6.asm"
+INCLUDE "data/maps/objects/Route6.asm"
 Route6_Blocks: INCBIN "maps/Route6.blk"
 
-INCLUDE "data/mapHeaders/Route8.asm"
-INCLUDE "data/mapObjects/Route8.asm"
+INCLUDE "data/maps/headers/Route8.asm"
+INCLUDE "data/maps/objects/Route8.asm"
 Route8_Blocks: INCBIN "maps/Route8.blk"
 
-INCLUDE "data/mapHeaders/Route10.asm"
-INCLUDE "data/mapObjects/Route10.asm"
+INCLUDE "data/maps/headers/Route10.asm"
+INCLUDE "data/maps/objects/Route10.asm"
 Route10_Blocks: INCBIN "maps/Route10.blk"
 
-INCLUDE "data/mapHeaders/Route11.asm"
-INCLUDE "data/mapObjects/Route11.asm"
+INCLUDE "data/maps/headers/Route11.asm"
+INCLUDE "data/maps/objects/Route11.asm"
 Route11_Blocks: INCBIN "maps/Route11.blk"
 
-INCLUDE "data/mapHeaders/Route12.asm"
-INCLUDE "data/mapObjects/Route12.asm"
+INCLUDE "data/maps/headers/Route12.asm"
+INCLUDE "data/maps/objects/Route12.asm"
 Route12_Blocks: INCBIN "maps/Route12.blk"
 
-INCLUDE "data/mapHeaders/Route15.asm"
-INCLUDE "data/mapObjects/Route15.asm"
+INCLUDE "data/maps/headers/Route15.asm"
+INCLUDE "data/maps/objects/Route15.asm"
 Route15_Blocks: INCBIN "maps/Route15.blk"
 
-INCLUDE "data/mapHeaders/Route16.asm"
-INCLUDE "data/mapObjects/Route16.asm"
+INCLUDE "data/maps/headers/Route16.asm"
+INCLUDE "data/maps/objects/Route16.asm"
 Route16_Blocks: INCBIN "maps/Route16.blk"
 
-INCLUDE "data/mapHeaders/Route18.asm"
-INCLUDE "data/mapObjects/Route18.asm"
+INCLUDE "data/maps/headers/Route18.asm"
+INCLUDE "data/maps/objects/Route18.asm"
 Route18_Blocks: INCBIN "maps/Route18.blk"
 
 	INCBIN "maps/UnusedPokecenterCopy.blk"
@@ -792,34 +792,34 @@ INCLUDE "scripts/Route15.asm"
 INCLUDE "scripts/Route16.asm"
 INCLUDE "scripts/Route18.asm"
 
-INCLUDE "data/mapHeaders/PokemonFanClub.asm"
+INCLUDE "data/maps/headers/PokemonFanClub.asm"
 INCLUDE "scripts/PokemonFanClub.asm"
-INCLUDE "data/mapObjects/PokemonFanClub.asm"
+INCLUDE "data/maps/objects/PokemonFanClub.asm"
 PokemonFanClub_Blocks: INCBIN "maps/PokemonFanClub.blk"
 
-INCLUDE "data/mapHeaders/SilphCo2F.asm"
+INCLUDE "data/maps/headers/SilphCo2F.asm"
 INCLUDE "scripts/SilphCo2F.asm"
-INCLUDE "data/mapObjects/SilphCo2F.asm"
+INCLUDE "data/maps/objects/SilphCo2F.asm"
 SilphCo2F_Blocks: INCBIN "maps/SilphCo2F.blk"
 
-INCLUDE "data/mapHeaders/SilphCo3F.asm"
+INCLUDE "data/maps/headers/SilphCo3F.asm"
 INCLUDE "scripts/SilphCo3F.asm"
-INCLUDE "data/mapObjects/SilphCo3F.asm"
+INCLUDE "data/maps/objects/SilphCo3F.asm"
 SilphCo3F_Blocks: INCBIN "maps/SilphCo3F.blk"
 
-INCLUDE "data/mapHeaders/SilphCo10F.asm"
+INCLUDE "data/maps/headers/SilphCo10F.asm"
 INCLUDE "scripts/SilphCo10F.asm"
-INCLUDE "data/mapObjects/SilphCo10F.asm"
+INCLUDE "data/maps/objects/SilphCo10F.asm"
 SilphCo10F_Blocks: INCBIN "maps/SilphCo10F.blk"
 
-INCLUDE "data/mapHeaders/LancesRoom.asm"
+INCLUDE "data/maps/headers/LancesRoom.asm"
 INCLUDE "scripts/LancesRoom.asm"
-INCLUDE "data/mapObjects/LancesRoom.asm"
+INCLUDE "data/maps/objects/LancesRoom.asm"
 LancesRoom_Blocks: INCBIN "maps/LancesRoom.blk"
 
-INCLUDE "data/mapHeaders/HallOfFame.asm"
+INCLUDE "data/maps/headers/HallOfFame.asm"
 INCLUDE "scripts/HallOfFame.asm"
-INCLUDE "data/mapObjects/HallOfFame.asm"
+INCLUDE "data/maps/objects/HallOfFame.asm"
 HallOfFame_Blocks: INCBIN "maps/HallOfFame.blk"
 
 
@@ -851,128 +851,128 @@ Route2Gate_Blocks:
 ViridianForestSouthGate_Blocks:
 ViridianForestNorthGate_Blocks: INCBIN "maps/ViridianForestNorthGate.blk"
 
-INCLUDE "data/mapHeaders/RedsHouse2F.asm"
+INCLUDE "data/maps/headers/RedsHouse2F.asm"
 INCLUDE "scripts/RedsHouse2F.asm"
-INCLUDE "data/mapObjects/RedsHouse2F.asm"
+INCLUDE "data/maps/objects/RedsHouse2F.asm"
 
 
 SECTION "Maps 16", ROMX
 
-INCLUDE "data/mapHeaders/Museum1F.asm"
+INCLUDE "data/maps/headers/Museum1F.asm"
 INCLUDE "scripts/Museum1F.asm"
-INCLUDE "data/mapObjects/Museum1F.asm"
+INCLUDE "data/maps/objects/Museum1F.asm"
 
-INCLUDE "data/mapHeaders/Museum2F.asm"
+INCLUDE "data/maps/headers/Museum2F.asm"
 INCLUDE "scripts/Museum2F.asm"
-INCLUDE "data/mapObjects/Museum2F.asm"
+INCLUDE "data/maps/objects/Museum2F.asm"
 
-INCLUDE "data/mapHeaders/PewterGym.asm"
+INCLUDE "data/maps/headers/PewterGym.asm"
 INCLUDE "scripts/PewterGym.asm"
-INCLUDE "data/mapObjects/PewterGym.asm"
+INCLUDE "data/maps/objects/PewterGym.asm"
 PewterGym_Blocks: INCBIN "maps/PewterGym.blk"
 
-INCLUDE "data/mapHeaders/PewterPokecenter.asm"
+INCLUDE "data/maps/headers/PewterPokecenter.asm"
 INCLUDE "scripts/PewterPokecenter.asm"
-INCLUDE "data/mapObjects/PewterPokecenter.asm"
+INCLUDE "data/maps/objects/PewterPokecenter.asm"
 
-INCLUDE "data/mapHeaders/CeruleanPokecenter.asm"
+INCLUDE "data/maps/headers/CeruleanPokecenter.asm"
 INCLUDE "scripts/CeruleanPokecenter.asm"
-INCLUDE "data/mapObjects/CeruleanPokecenter.asm"
+INCLUDE "data/maps/objects/CeruleanPokecenter.asm"
 CeruleanPokecenter_Blocks: INCBIN "maps/CeruleanPokecenter.blk"
 
-INCLUDE "data/mapHeaders/CeruleanGym.asm"
+INCLUDE "data/maps/headers/CeruleanGym.asm"
 INCLUDE "scripts/CeruleanGym.asm"
-INCLUDE "data/mapObjects/CeruleanGym.asm"
+INCLUDE "data/maps/objects/CeruleanGym.asm"
 CeruleanGym_Blocks: INCBIN "maps/CeruleanGym.blk"
 
-INCLUDE "data/mapHeaders/CeruleanMart.asm"
+INCLUDE "data/maps/headers/CeruleanMart.asm"
 INCLUDE "scripts/CeruleanMart.asm"
-INCLUDE "data/mapObjects/CeruleanMart.asm"
+INCLUDE "data/maps/objects/CeruleanMart.asm"
 
-INCLUDE "data/mapHeaders/LavenderPokecenter.asm"
+INCLUDE "data/maps/headers/LavenderPokecenter.asm"
 INCLUDE "scripts/LavenderPokecenter.asm"
-INCLUDE "data/mapObjects/LavenderPokecenter.asm"
+INCLUDE "data/maps/objects/LavenderPokecenter.asm"
 
-INCLUDE "data/mapHeaders/LavenderMart.asm"
+INCLUDE "data/maps/headers/LavenderMart.asm"
 INCLUDE "scripts/LavenderMart.asm"
-INCLUDE "data/mapObjects/LavenderMart.asm"
+INCLUDE "data/maps/objects/LavenderMart.asm"
 
-INCLUDE "data/mapHeaders/VermilionPokecenter.asm"
+INCLUDE "data/maps/headers/VermilionPokecenter.asm"
 INCLUDE "scripts/VermilionPokecenter.asm"
-INCLUDE "data/mapObjects/VermilionPokecenter.asm"
+INCLUDE "data/maps/objects/VermilionPokecenter.asm"
 
-INCLUDE "data/mapHeaders/VermilionMart.asm"
+INCLUDE "data/maps/headers/VermilionMart.asm"
 INCLUDE "scripts/VermilionMart.asm"
-INCLUDE "data/mapObjects/VermilionMart.asm"
+INCLUDE "data/maps/objects/VermilionMart.asm"
 
-INCLUDE "data/mapHeaders/VermilionGym.asm"
+INCLUDE "data/maps/headers/VermilionGym.asm"
 INCLUDE "scripts/VermilionGym.asm"
-INCLUDE "data/mapObjects/VermilionGym.asm"
+INCLUDE "data/maps/objects/VermilionGym.asm"
 VermilionGym_Blocks: INCBIN "maps/VermilionGym.blk"
 
-INCLUDE "data/mapHeaders/CopycatsHouse2F.asm"
+INCLUDE "data/maps/headers/CopycatsHouse2F.asm"
 INCLUDE "scripts/CopycatsHouse2F.asm"
-INCLUDE "data/mapObjects/CopycatsHouse2F.asm"
+INCLUDE "data/maps/objects/CopycatsHouse2F.asm"
 
-INCLUDE "data/mapHeaders/FightingDojo.asm"
+INCLUDE "data/maps/headers/FightingDojo.asm"
 INCLUDE "scripts/FightingDojo.asm"
-INCLUDE "data/mapObjects/FightingDojo.asm"
+INCLUDE "data/maps/objects/FightingDojo.asm"
 FightingDojo_Blocks: INCBIN "maps/FightingDojo.blk"
 
-INCLUDE "data/mapHeaders/SaffronGym.asm"
+INCLUDE "data/maps/headers/SaffronGym.asm"
 INCLUDE "scripts/SaffronGym.asm"
-INCLUDE "data/mapObjects/SaffronGym.asm"
+INCLUDE "data/maps/objects/SaffronGym.asm"
 SaffronGym_Blocks: INCBIN "maps/SaffronGym.blk"
 
-INCLUDE "data/mapHeaders/SaffronMart.asm"
+INCLUDE "data/maps/headers/SaffronMart.asm"
 INCLUDE "scripts/SaffronMart.asm"
-INCLUDE "data/mapObjects/SaffronMart.asm"
+INCLUDE "data/maps/objects/SaffronMart.asm"
 
-INCLUDE "data/mapHeaders/SilphCo1F.asm"
+INCLUDE "data/maps/headers/SilphCo1F.asm"
 INCLUDE "scripts/SilphCo1F.asm"
-INCLUDE "data/mapObjects/SilphCo1F.asm"
+INCLUDE "data/maps/objects/SilphCo1F.asm"
 SilphCo1F_Blocks: INCBIN "maps/SilphCo1F.blk"
 
-INCLUDE "data/mapHeaders/SaffronPokecenter.asm"
+INCLUDE "data/maps/headers/SaffronPokecenter.asm"
 INCLUDE "scripts/SaffronPokecenter.asm"
-INCLUDE "data/mapObjects/SaffronPokecenter.asm"
+INCLUDE "data/maps/objects/SaffronPokecenter.asm"
 
-INCLUDE "data/mapHeaders/ViridianForestNorthGate.asm"
+INCLUDE "data/maps/headers/ViridianForestNorthGate.asm"
 INCLUDE "scripts/ViridianForestNorthGate.asm"
-INCLUDE "data/mapObjects/ViridianForestNorthGate.asm"
+INCLUDE "data/maps/objects/ViridianForestNorthGate.asm"
 
-INCLUDE "data/mapHeaders/Route2Gate.asm"
+INCLUDE "data/maps/headers/Route2Gate.asm"
 INCLUDE "scripts/Route2Gate.asm"
-INCLUDE "data/mapObjects/Route2Gate.asm"
+INCLUDE "data/maps/objects/Route2Gate.asm"
 
-INCLUDE "data/mapHeaders/ViridianForestSouthGate.asm"
+INCLUDE "data/maps/headers/ViridianForestSouthGate.asm"
 INCLUDE "scripts/ViridianForestSouthGate.asm"
-INCLUDE "data/mapObjects/ViridianForestSouthGate.asm"
+INCLUDE "data/maps/objects/ViridianForestSouthGate.asm"
 
-INCLUDE "data/mapHeaders/UndergroundPathRoute5.asm"
+INCLUDE "data/maps/headers/UndergroundPathRoute5.asm"
 INCLUDE "scripts/UndergroundPathRoute5.asm"
-INCLUDE "data/mapObjects/UndergroundPathRoute5.asm"
+INCLUDE "data/maps/objects/UndergroundPathRoute5.asm"
 
-INCLUDE "data/mapHeaders/UndergroundPathRoute6.asm"
+INCLUDE "data/maps/headers/UndergroundPathRoute6.asm"
 INCLUDE "scripts/UndergroundPathRoute6.asm"
-INCLUDE "data/mapObjects/UndergroundPathRoute6.asm"
+INCLUDE "data/maps/objects/UndergroundPathRoute6.asm"
 
-INCLUDE "data/mapHeaders/UndergroundPathRoute7.asm"
+INCLUDE "data/maps/headers/UndergroundPathRoute7.asm"
 INCLUDE "scripts/UndergroundPathRoute7.asm"
-INCLUDE "data/mapObjects/UndergroundPathRoute7.asm"
+INCLUDE "data/maps/objects/UndergroundPathRoute7.asm"
 
-INCLUDE "data/mapHeaders/UndergroundPathRoute7Copy.asm"
+INCLUDE "data/maps/headers/UndergroundPathRoute7Copy.asm"
 INCLUDE "scripts/UndergroundPathRoute7Copy.asm"
-INCLUDE "data/mapObjects/UndergroundPathRoute7Copy.asm"
+INCLUDE "data/maps/objects/UndergroundPathRoute7Copy.asm"
 
-INCLUDE "data/mapHeaders/SilphCo9F.asm"
+INCLUDE "data/maps/headers/SilphCo9F.asm"
 INCLUDE "scripts/SilphCo9F.asm"
-INCLUDE "data/mapObjects/SilphCo9F.asm"
+INCLUDE "data/maps/objects/SilphCo9F.asm"
 SilphCo9F_Blocks: INCBIN "maps/SilphCo9F.blk"
 
-INCLUDE "data/mapHeaders/VictoryRoad1F.asm"
+INCLUDE "data/maps/headers/VictoryRoad1F.asm"
 INCLUDE "scripts/VictoryRoad1F.asm"
-INCLUDE "data/mapObjects/VictoryRoad1F.asm"
+INCLUDE "data/maps/objects/VictoryRoad1F.asm"
 VictoryRoad1F_Blocks: INCBIN "maps/VictoryRoad1F.blk"
 
 
@@ -987,114 +987,114 @@ UndergroundPathWestEast_Blocks: INCBIN "maps/UndergroundPathWestEast.blk"
 SSAnneB1FRooms_Blocks:
 SSAnne2FRooms_Blocks: INCBIN "maps/SSAnne2FRooms.blk"
 
-INCLUDE "data/mapHeaders/PokemonTower1F.asm"
+INCLUDE "data/maps/headers/PokemonTower1F.asm"
 INCLUDE "scripts/PokemonTower1F.asm"
-INCLUDE "data/mapObjects/PokemonTower1F.asm"
+INCLUDE "data/maps/objects/PokemonTower1F.asm"
 PokemonTower1F_Blocks: INCBIN "maps/PokemonTower1F.blk"
 
-INCLUDE "data/mapHeaders/PokemonTower2F.asm"
+INCLUDE "data/maps/headers/PokemonTower2F.asm"
 INCLUDE "scripts/PokemonTower2F.asm"
-INCLUDE "data/mapObjects/PokemonTower2F.asm"
+INCLUDE "data/maps/objects/PokemonTower2F.asm"
 PokemonTower2F_Blocks: INCBIN "maps/PokemonTower2F.blk"
 
-INCLUDE "data/mapHeaders/PokemonTower3F.asm"
+INCLUDE "data/maps/headers/PokemonTower3F.asm"
 INCLUDE "scripts/PokemonTower3F.asm"
-INCLUDE "data/mapObjects/PokemonTower3F.asm"
+INCLUDE "data/maps/objects/PokemonTower3F.asm"
 PokemonTower3F_Blocks: INCBIN "maps/PokemonTower3F.blk"
 
-INCLUDE "data/mapHeaders/PokemonTower4F.asm"
+INCLUDE "data/maps/headers/PokemonTower4F.asm"
 INCLUDE "scripts/PokemonTower4F.asm"
-INCLUDE "data/mapObjects/PokemonTower4F.asm"
+INCLUDE "data/maps/objects/PokemonTower4F.asm"
 PokemonTower4F_Blocks: INCBIN "maps/PokemonTower4F.blk"
 
-INCLUDE "data/mapHeaders/PokemonTower5F.asm"
+INCLUDE "data/maps/headers/PokemonTower5F.asm"
 INCLUDE "scripts/PokemonTower5F.asm"
-INCLUDE "data/mapObjects/PokemonTower5F.asm"
+INCLUDE "data/maps/objects/PokemonTower5F.asm"
 PokemonTower5F_Blocks: INCBIN "maps/PokemonTower5F.blk"
 
-INCLUDE "data/mapHeaders/PokemonTower6F.asm"
+INCLUDE "data/maps/headers/PokemonTower6F.asm"
 INCLUDE "scripts/PokemonTower6F.asm"
-INCLUDE "data/mapObjects/PokemonTower6F.asm"
+INCLUDE "data/maps/objects/PokemonTower6F.asm"
 PokemonTower6F_Blocks: INCBIN "maps/PokemonTower6F.blk"
 
 	INCBIN "maps/UnusedEmptyMap.blk"
 
-INCLUDE "data/mapHeaders/PokemonTower7F.asm"
+INCLUDE "data/maps/headers/PokemonTower7F.asm"
 INCLUDE "scripts/PokemonTower7F.asm"
-INCLUDE "data/mapObjects/PokemonTower7F.asm"
+INCLUDE "data/maps/objects/PokemonTower7F.asm"
 PokemonTower7F_Blocks: INCBIN "maps/PokemonTower7F.blk"
 
-INCLUDE "data/mapHeaders/CeladonMart1F.asm"
+INCLUDE "data/maps/headers/CeladonMart1F.asm"
 INCLUDE "scripts/CeladonMart1F.asm"
-INCLUDE "data/mapObjects/CeladonMart1F.asm"
+INCLUDE "data/maps/objects/CeladonMart1F.asm"
 CeladonMart1F_Blocks: INCBIN "maps/CeladonMart1F.blk"
 
 
 SECTION "Maps 18", ROMX
 
-INCLUDE "data/mapHeaders/ViridianForest.asm"
+INCLUDE "data/maps/headers/ViridianForest.asm"
 INCLUDE "scripts/ViridianForest.asm"
-INCLUDE "data/mapObjects/ViridianForest.asm"
+INCLUDE "data/maps/objects/ViridianForest.asm"
 
-INCLUDE "data/mapHeaders/SSAnne1F.asm"
+INCLUDE "data/maps/headers/SSAnne1F.asm"
 INCLUDE "scripts/SSAnne1F.asm"
-INCLUDE "data/mapObjects/SSAnne1F.asm"
+INCLUDE "data/maps/objects/SSAnne1F.asm"
 SSAnne1F_Blocks: INCBIN "maps/SSAnne1F.blk"
 
-INCLUDE "data/mapHeaders/SSAnne2F.asm"
+INCLUDE "data/maps/headers/SSAnne2F.asm"
 INCLUDE "scripts/SSAnne2F.asm"
-INCLUDE "data/mapObjects/SSAnne2F.asm"
+INCLUDE "data/maps/objects/SSAnne2F.asm"
 SSAnne2F_Blocks: INCBIN "maps/SSAnne2F.blk"
 
-INCLUDE "data/mapHeaders/SSAnneB1F.asm"
+INCLUDE "data/maps/headers/SSAnneB1F.asm"
 INCLUDE "scripts/SSAnneB1F.asm"
-INCLUDE "data/mapObjects/SSAnneB1F.asm"
+INCLUDE "data/maps/objects/SSAnneB1F.asm"
 SSAnneB1F_Blocks: INCBIN "maps/SSAnneB1F.blk"
 
-INCLUDE "data/mapHeaders/SSAnneBow.asm"
+INCLUDE "data/maps/headers/SSAnneBow.asm"
 INCLUDE "scripts/SSAnneBow.asm"
-INCLUDE "data/mapObjects/SSAnneBow.asm"
+INCLUDE "data/maps/objects/SSAnneBow.asm"
 SSAnneBow_Blocks: INCBIN "maps/SSAnneBow.blk"
 
-INCLUDE "data/mapHeaders/SSAnneKitchen.asm"
+INCLUDE "data/maps/headers/SSAnneKitchen.asm"
 INCLUDE "scripts/SSAnneKitchen.asm"
-INCLUDE "data/mapObjects/SSAnneKitchen.asm"
+INCLUDE "data/maps/objects/SSAnneKitchen.asm"
 SSAnneKitchen_Blocks: INCBIN "maps/SSAnneKitchen.blk"
 
-INCLUDE "data/mapHeaders/SSAnneCaptainsRoom.asm"
+INCLUDE "data/maps/headers/SSAnneCaptainsRoom.asm"
 INCLUDE "scripts/SSAnneCaptainsRoom.asm"
-INCLUDE "data/mapObjects/SSAnneCaptainsRoom.asm"
+INCLUDE "data/maps/objects/SSAnneCaptainsRoom.asm"
 SSAnneCaptainsRoom_Blocks: INCBIN "maps/SSAnneCaptainsRoom.blk"
 
-INCLUDE "data/mapHeaders/SSAnne1FRooms.asm"
+INCLUDE "data/maps/headers/SSAnne1FRooms.asm"
 INCLUDE "scripts/SSAnne1FRooms.asm"
-INCLUDE "data/mapObjects/SSAnne1FRooms.asm"
+INCLUDE "data/maps/objects/SSAnne1FRooms.asm"
 SSAnne1FRooms_Blocks: INCBIN "maps/SSAnne1FRooms.blk"
 
-INCLUDE "data/mapHeaders/SSAnne2FRooms.asm"
+INCLUDE "data/maps/headers/SSAnne2FRooms.asm"
 INCLUDE "scripts/SSAnne2FRooms.asm"
-INCLUDE "data/mapObjects/SSAnne2FRooms.asm"
+INCLUDE "data/maps/objects/SSAnne2FRooms.asm"
 
-INCLUDE "data/mapHeaders/SSAnneB1FRooms.asm"
+INCLUDE "data/maps/headers/SSAnneB1FRooms.asm"
 INCLUDE "scripts/SSAnneB1FRooms.asm"
-INCLUDE "data/mapObjects/SSAnneB1FRooms.asm"
+INCLUDE "data/maps/objects/SSAnneB1FRooms.asm"
 
-INCLUDE "data/mapHeaders/UndergroundPathNorthSouth.asm"
+INCLUDE "data/maps/headers/UndergroundPathNorthSouth.asm"
 INCLUDE "scripts/UndergroundPathNorthSouth.asm"
-INCLUDE "data/mapObjects/UndergroundPathNorthSouth.asm"
+INCLUDE "data/maps/objects/UndergroundPathNorthSouth.asm"
 
-INCLUDE "data/mapHeaders/UndergroundPathWestEast.asm"
+INCLUDE "data/maps/headers/UndergroundPathWestEast.asm"
 INCLUDE "scripts/UndergroundPathWestEast.asm"
-INCLUDE "data/mapObjects/UndergroundPathWestEast.asm"
+INCLUDE "data/maps/objects/UndergroundPathWestEast.asm"
 
-INCLUDE "data/mapHeaders/DiglettsCave.asm"
+INCLUDE "data/maps/headers/DiglettsCave.asm"
 INCLUDE "scripts/DiglettsCave.asm"
-INCLUDE "data/mapObjects/DiglettsCave.asm"
+INCLUDE "data/maps/objects/DiglettsCave.asm"
 DiglettsCave_Blocks: INCBIN "maps/DiglettsCave.blk"
 
-INCLUDE "data/mapHeaders/SilphCo11F.asm"
+INCLUDE "data/maps/headers/SilphCo11F.asm"
 INCLUDE "scripts/SilphCo11F.asm"
-INCLUDE "data/mapObjects/SilphCo11F.asm"
+INCLUDE "data/maps/objects/SilphCo11F.asm"
 SilphCo11F_Blocks: INCBIN "maps/SilphCo11F.blk"
 
 
@@ -1117,108 +1117,108 @@ SECTION "Maps 20", ROMX
 
 INCLUDE "scripts/CeruleanCity_2.asm"
 
-INCLUDE "data/mapHeaders/ViridianGym.asm"
+INCLUDE "data/maps/headers/ViridianGym.asm"
 INCLUDE "scripts/ViridianGym.asm"
-INCLUDE "data/mapObjects/ViridianGym.asm"
+INCLUDE "data/maps/objects/ViridianGym.asm"
 ViridianGym_Blocks: INCBIN "maps/ViridianGym.blk"
 
-INCLUDE "data/mapHeaders/PewterMart.asm"
+INCLUDE "data/maps/headers/PewterMart.asm"
 INCLUDE "scripts/PewterMart.asm"
-INCLUDE "data/mapObjects/PewterMart.asm"
+INCLUDE "data/maps/objects/PewterMart.asm"
 
-INCLUDE "data/mapHeaders/CeruleanCave1F.asm"
+INCLUDE "data/maps/headers/CeruleanCave1F.asm"
 INCLUDE "scripts/CeruleanCave1F.asm"
-INCLUDE "data/mapObjects/CeruleanCave1F.asm"
+INCLUDE "data/maps/objects/CeruleanCave1F.asm"
 CeruleanCave1F_Blocks: INCBIN "maps/CeruleanCave1F.blk"
 
-INCLUDE "data/mapHeaders/CeruleanBadgeHouse.asm"
+INCLUDE "data/maps/headers/CeruleanBadgeHouse.asm"
 INCLUDE "scripts/CeruleanBadgeHouse.asm"
-INCLUDE "data/mapObjects/CeruleanBadgeHouse.asm"
+INCLUDE "data/maps/objects/CeruleanBadgeHouse.asm"
 
 
 SECTION "Maps 21", ROMX
 
-INCLUDE "data/mapHeaders/FuchsiaBillsGrandpasHouse.asm"
+INCLUDE "data/maps/headers/FuchsiaBillsGrandpasHouse.asm"
 INCLUDE "scripts/FuchsiaBillsGrandpasHouse.asm"
-INCLUDE "data/mapObjects/FuchsiaBillsGrandpasHouse.asm"
+INCLUDE "data/maps/objects/FuchsiaBillsGrandpasHouse.asm"
 
-INCLUDE "data/mapHeaders/FuchsiaPokecenter.asm"
+INCLUDE "data/maps/headers/FuchsiaPokecenter.asm"
 INCLUDE "scripts/FuchsiaPokecenter.asm"
-INCLUDE "data/mapObjects/FuchsiaPokecenter.asm"
+INCLUDE "data/maps/objects/FuchsiaPokecenter.asm"
 
-INCLUDE "data/mapHeaders/WardensHouse.asm"
+INCLUDE "data/maps/headers/WardensHouse.asm"
 INCLUDE "scripts/WardensHouse.asm"
-INCLUDE "data/mapObjects/WardensHouse.asm"
+INCLUDE "data/maps/objects/WardensHouse.asm"
 WardensHouse_Blocks: INCBIN "maps/WardensHouse.blk"
 
-INCLUDE "data/mapHeaders/SafariZoneGate.asm"
+INCLUDE "data/maps/headers/SafariZoneGate.asm"
 INCLUDE "scripts/SafariZoneGate.asm"
-INCLUDE "data/mapObjects/SafariZoneGate.asm"
+INCLUDE "data/maps/objects/SafariZoneGate.asm"
 SafariZoneGate_Blocks: INCBIN "maps/SafariZoneGate.blk"
 
-INCLUDE "data/mapHeaders/FuchsiaGym.asm"
+INCLUDE "data/maps/headers/FuchsiaGym.asm"
 INCLUDE "scripts/FuchsiaGym.asm"
-INCLUDE "data/mapObjects/FuchsiaGym.asm"
+INCLUDE "data/maps/objects/FuchsiaGym.asm"
 FuchsiaGym_Blocks: INCBIN "maps/FuchsiaGym.blk"
 
-INCLUDE "data/mapHeaders/FuchsiaMeetingRoom.asm"
+INCLUDE "data/maps/headers/FuchsiaMeetingRoom.asm"
 INCLUDE "scripts/FuchsiaMeetingRoom.asm"
-INCLUDE "data/mapObjects/FuchsiaMeetingRoom.asm"
+INCLUDE "data/maps/objects/FuchsiaMeetingRoom.asm"
 FuchsiaMeetingRoom_Blocks: INCBIN "maps/FuchsiaMeetingRoom.blk"
 
-INCLUDE "data/mapHeaders/CinnabarGym.asm"
+INCLUDE "data/maps/headers/CinnabarGym.asm"
 INCLUDE "scripts/CinnabarGym.asm"
-INCLUDE "data/mapObjects/CinnabarGym.asm"
+INCLUDE "data/maps/objects/CinnabarGym.asm"
 CinnabarGym_Blocks: INCBIN "maps/CinnabarGym.blk"
 
-INCLUDE "data/mapHeaders/CinnabarLab.asm"
+INCLUDE "data/maps/headers/CinnabarLab.asm"
 INCLUDE "scripts/CinnabarLab.asm"
-INCLUDE "data/mapObjects/CinnabarLab.asm"
+INCLUDE "data/maps/objects/CinnabarLab.asm"
 CinnabarLab_Blocks: INCBIN "maps/CinnabarLab.blk"
 
-INCLUDE "data/mapHeaders/CinnabarLabTradeRoom.asm"
+INCLUDE "data/maps/headers/CinnabarLabTradeRoom.asm"
 INCLUDE "scripts/CinnabarLabTradeRoom.asm"
-INCLUDE "data/mapObjects/CinnabarLabTradeRoom.asm"
+INCLUDE "data/maps/objects/CinnabarLabTradeRoom.asm"
 CinnabarLabTradeRoom_Blocks: INCBIN "maps/CinnabarLabTradeRoom.blk"
 
-INCLUDE "data/mapHeaders/CinnabarLabMetronomeRoom.asm"
+INCLUDE "data/maps/headers/CinnabarLabMetronomeRoom.asm"
 INCLUDE "scripts/CinnabarLabMetronomeRoom.asm"
-INCLUDE "data/mapObjects/CinnabarLabMetronomeRoom.asm"
+INCLUDE "data/maps/objects/CinnabarLabMetronomeRoom.asm"
 CinnabarLabMetronomeRoom_Blocks: INCBIN "maps/CinnabarLabMetronomeRoom.blk"
 
-INCLUDE "data/mapHeaders/CinnabarLabFossilRoom.asm"
+INCLUDE "data/maps/headers/CinnabarLabFossilRoom.asm"
 INCLUDE "scripts/CinnabarLabFossilRoom.asm"
-INCLUDE "data/mapObjects/CinnabarLabFossilRoom.asm"
+INCLUDE "data/maps/objects/CinnabarLabFossilRoom.asm"
 CinnabarLabFossilRoom_Blocks: INCBIN "maps/CinnabarLabFossilRoom.blk"
 
-INCLUDE "data/mapHeaders/CinnabarPokecenter.asm"
+INCLUDE "data/maps/headers/CinnabarPokecenter.asm"
 INCLUDE "scripts/CinnabarPokecenter.asm"
-INCLUDE "data/mapObjects/CinnabarPokecenter.asm"
+INCLUDE "data/maps/objects/CinnabarPokecenter.asm"
 
-INCLUDE "data/mapHeaders/CinnabarMart.asm"
+INCLUDE "data/maps/headers/CinnabarMart.asm"
 INCLUDE "scripts/CinnabarMart.asm"
-INCLUDE "data/mapObjects/CinnabarMart.asm"
+INCLUDE "data/maps/objects/CinnabarMart.asm"
 
-INCLUDE "data/mapHeaders/CopycatsHouse1F.asm"
+INCLUDE "data/maps/headers/CopycatsHouse1F.asm"
 INCLUDE "scripts/CopycatsHouse1F.asm"
-INCLUDE "data/mapObjects/CopycatsHouse1F.asm"
+INCLUDE "data/maps/objects/CopycatsHouse1F.asm"
 
-INCLUDE "data/mapHeaders/ChampionsRoom.asm"
+INCLUDE "data/maps/headers/ChampionsRoom.asm"
 INCLUDE "scripts/ChampionsRoom.asm"
-INCLUDE "data/mapObjects/ChampionsRoom.asm"
+INCLUDE "data/maps/objects/ChampionsRoom.asm"
 ChampionsRoom_Blocks: INCBIN "maps/ChampionsRoom.blk"
 
-INCLUDE "data/mapHeaders/LoreleisRoom.asm"
+INCLUDE "data/maps/headers/LoreleisRoom.asm"
 INCLUDE "scripts/LoreleisRoom.asm"
-INCLUDE "data/mapObjects/LoreleisRoom.asm"
+INCLUDE "data/maps/objects/LoreleisRoom.asm"
 LoreleisRoom_Blocks: INCBIN "maps/LoreleisRoom.blk"
 
-INCLUDE "data/mapHeaders/BrunosRoom.asm"
+INCLUDE "data/maps/headers/BrunosRoom.asm"
 INCLUDE "scripts/BrunosRoom.asm"
-INCLUDE "data/mapObjects/BrunosRoom.asm"
+INCLUDE "data/maps/objects/BrunosRoom.asm"
 BrunosRoom_Blocks: INCBIN "maps/BrunosRoom.blk"
 
-INCLUDE "data/mapHeaders/AgathasRoom.asm"
+INCLUDE "data/maps/headers/AgathasRoom.asm"
 INCLUDE "scripts/AgathasRoom.asm"
-INCLUDE "data/mapObjects/AgathasRoom.asm"
+INCLUDE "data/maps/objects/AgathasRoom.asm"
 AgathasRoom_Blocks: INCBIN "maps/AgathasRoom.blk"