From d633cfbaa403c462c9e14c1185561383aa10bbbf Mon Sep 17 00:00:00 2001 From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com> Date: Wed, 10 Jul 2024 01:50:43 +0100 Subject: [PATCH] Like 40 new maps The aim was simply to make the rom build with EVERY currently posited map in it. This adds EVERYTHING. Ground rules; - All temp maps are 10x10 cave tileset goons with nothing in them - Connections are NOT done - Fishgroups and music are likely incorrect and/or unfinished - No wild data This is extremely achievable, as numerous unreferenced maps are unused in the block and script banks. Makes doing this a cinch! All of this basically means: You can get creative now and start brainstorming what to do with all these maps. Get them fleshed out, connected, and...not being nothing. It's like ordering in a bunch of blank canvasses. Go nuts! --- constants/landmark_constants.asm | 36 +-- constants/map_constants.asm | 116 +++++++++- constants/scgb_constants.asm | 8 + data/maps/attributes.asm | 88 +++++++- data/maps/blocks.asm | 349 ++++++++++++++++++----------- data/maps/landmarks.asm | 24 +- data/maps/maps.asm | 134 ++++++++++- data/maps/outdoor_sprites.asm | 18 ++ data/maps/roofs.asm | 12 +- data/maps/scripts.asm | 72 ++++++ data/maps/sgb_roof_pal_inds.asm | 8 + gfx/sgb/predef.pal | 8 + gfx/tilesets/roofs.pal | 25 +++ maps/#Placeholder.ablk | Bin 0 -> 100 bytes maps/AlteringCave.ablk | Bin 0 -> 100 bytes maps/AlteringCave.asm | 17 ++ maps/BerryForest.ablk | Bin 0 -> 100 bytes maps/BerryForest.asm | 17 ++ maps/BillsGarden.ablk | Bin 0 -> 100 bytes maps/BillsGarden.asm | 17 ++ maps/BondBridge.ablk | Bin 0 -> 100 bytes maps/BondBridge.asm | 17 ++ maps/BrunswickGlade.ablk | Bin 0 -> 100 bytes maps/BrunswickGlade.asm | 17 ++ maps/BrunswickGrotto.ablk | Bin 0 -> 100 bytes maps/BrunswickGrotto.asm | 17 ++ maps/BrunswickTrail.ablk | Bin 0 -> 100 bytes maps/BrunswickTrail.asm | 17 ++ maps/CanyonEntrance.ablk | Bin 0 -> 100 bytes maps/CanyonEntrance.asm | 17 ++ maps/CapeBrink.ablk | Bin 0 -> 100 bytes maps/CapeBrink.asm | 17 ++ maps/CeladonUniversityInside.ablk | Bin 0 -> 100 bytes maps/CeladonUniversityInside.asm | 17 ++ maps/CeladonUniversityOutside.ablk | Bin 0 -> 100 bytes maps/CeladonUniversityOutside.asm | 17 ++ maps/CelesteHill.ablk | Bin 0 -> 100 bytes maps/CelesteHill.asm | 17 ++ maps/CelesteHillCave.ablk | Bin 0 -> 100 bytes maps/CelesteHillCave.asm | 17 ++ maps/CitrineCity.ablk | Bin 0 -> 100 bytes maps/CitrineCity.asm | 17 ++ maps/CliffCave.asm | 11 +- maps/CliffEdgeGate.ablk | Bin 0 -> 100 bytes maps/CliffEdgeGate.asm | 17 ++ maps/DottedHole.ablk | Bin 0 -> 100 bytes maps/DottedHole.asm | 17 ++ maps/EmbeddedTower.ablk | Bin 0 -> 100 bytes maps/EmbeddedTower.asm | 17 ++ maps/FarawayIslandInside.ablk | Bin 0 -> 100 bytes maps/FarawayIslandInside.asm | 17 ++ maps/FarawayIslandOutside.ablk | Bin 0 -> 100 bytes maps/FarawayIslandOutside.asm | 17 ++ maps/FiveIsland.ablk | Bin 0 -> 100 bytes maps/FiveIsland.asm | 17 ++ maps/FiveIslandMeadow.ablk | Bin 0 -> 100 bytes maps/FiveIslandMeadow.asm | 17 ++ maps/FourIsland.ablk | Bin 0 -> 100 bytes maps/FourIsland.asm | 17 ++ maps/GarnetCavern1F.ablk | Bin 0 -> 100 bytes maps/GarnetCavern1F.asm | 17 ++ maps/GarnetCavern2F.ablk | Bin 0 -> 100 bytes maps/GarnetCavern2F.asm | 17 ++ maps/GarnetCavernB1F.ablk | Bin 0 -> 100 bytes maps/GarnetCavernB1F.asm | 17 ++ maps/GreenPath.ablk | Bin 0 -> 100 bytes maps/GreenPath.asm | 17 ++ maps/IcefallCave1F.ablk | Bin 0 -> 100 bytes maps/IcefallCave1F.asm | 17 ++ maps/IcefallCaveB1F.ablk | Bin 0 -> 100 bytes maps/IcefallCaveB1F.asm | 17 ++ maps/IcefallCaveBack.ablk | Bin 0 -> 100 bytes maps/IcefallCaveBack.asm | 17 ++ maps/IcefallCaveEntrance.ablk | Bin 0 -> 100 bytes maps/IcefallCaveEntrance.asm | 17 ++ maps/JohtoSafariZone.ablk | Bin 0 -> 100 bytes maps/JohtoSafariZone.asm | 17 ++ maps/JohtoSafariZoneGate.ablk | Bin 0 -> 100 bytes maps/JohtoSafariZoneGate.asm | 17 ++ maps/KindleRoad.ablk | Bin 0 -> 100 bytes maps/KindleRoad.asm | 17 ++ maps/LavenderCrypt.ablk | Bin 0 -> 100 bytes maps/LavenderCrypt.asm | 17 ++ maps/LostCave.ablk | Bin 0 -> 100 bytes maps/LostCave.asm | 17 ++ maps/MemorialPillar.ablk | Bin 0 -> 100 bytes maps/MemorialPillar.asm | 17 ++ maps/MtEmberExterior.ablk | Bin 0 -> 100 bytes maps/MtEmberExterior.asm | 17 ++ maps/MtEmberHiddenPath.ablk | Bin 0 -> 100 bytes maps/MtEmberHiddenPath.asm | 17 ++ maps/MtEmberInterior.ablk | Bin 0 -> 100 bytes maps/MtEmberInterior.asm | 17 ++ maps/MtEmberSummit.ablk | Bin 0 -> 100 bytes maps/MtEmberSummit.asm | 17 ++ maps/MtMoonCrater.ablk | Bin 0 -> 100 bytes maps/MtMoonCrater.asm | 17 ++ maps/MtMoonCraterDepths.ablk | Bin 0 -> 100 bytes maps/MtMoonCraterDepths.asm | 17 ++ maps/NavalRock1F.ablk | Bin 0 -> 100 bytes maps/NavalRock1F.asm | 17 ++ maps/NavalRock2F.ablk | Bin 0 -> 100 bytes maps/NavalRock2F.asm | 17 ++ maps/NavalRockB1F.ablk | Bin 0 -> 100 bytes maps/NavalRockB1F.asm | 17 ++ maps/NavalRockExterior.ablk | Bin 0 -> 100 bytes maps/NavalRockExterior.asm | 17 ++ maps/OneIsland.ablk | Bin 0 -> 100 bytes maps/OneIsland.asm | 17 ++ maps/OutcastIsland.ablk | Bin 0 -> 100 bytes maps/OutcastIsland.asm | 17 ++ maps/PatternBush.ablk | Bin 0 -> 100 bytes maps/PatternBush.asm | 17 ++ maps/ResortGorgeous.ablk | Bin 0 -> 100 bytes maps/ResortGorgeous.asm | 17 ++ maps/Route47.ablk | Bin 0 -> 100 bytes maps/Route47.asm | 17 ++ maps/Route48.ablk | Bin 0 -> 100 bytes maps/Route48.asm | 18 ++ maps/RuinValley.ablk | Bin 0 -> 100 bytes maps/RuinValley.asm | 17 ++ maps/SeafoamIslands1F.ablk | Bin 0 -> 100 bytes maps/SeafoamIslands1F.asm | 17 ++ maps/SeafoamIslandsB1F.ablk | Bin 0 -> 100 bytes maps/SeafoamIslandsB1F.asm | 17 ++ maps/SeafoamIslandsB2F.ablk | Bin 0 -> 100 bytes maps/SeafoamIslandsB2F.asm | 17 ++ maps/SeafoamIslandsB3F.ablk | Bin 0 -> 100 bytes maps/SeafoamIslandsB3F.asm | 17 ++ maps/SeafoamIslandsB4F.ablk | Bin 0 -> 100 bytes maps/SeafoamIslandsB4F.asm | 17 ++ maps/SevaultCanyon.ablk | Bin 0 -> 100 bytes maps/SevaultCanyon.asm | 17 ++ maps/SevenIsland.ablk | Bin 0 -> 100 bytes maps/SevenIsland.asm | 17 ++ maps/SinjohRuinsExterior.ablk | Bin 0 -> 100 bytes maps/SinjohRuinsExterior.asm | 17 ++ maps/SinjohRuinsInterior.ablk | Bin 0 -> 100 bytes maps/SinjohRuinsInterior.asm | 17 ++ maps/SixIsland.ablk | Bin 0 -> 100 bytes maps/SixIsland.asm | 17 ++ maps/TanobyChambers.ablk | Bin 0 -> 100 bytes maps/TanobyChambers.asm | 17 ++ maps/TanobyRuins.ablk | Bin 0 -> 100 bytes maps/TanobyRuins.asm | 17 ++ maps/ThreeIsland.ablk | Bin 0 -> 100 bytes maps/ThreeIsland.asm | 17 ++ maps/ThreeIslandPort.ablk | Bin 0 -> 100 bytes maps/ThreeIslandPort.asm | 17 ++ maps/TreasureBeach.ablk | Bin 0 -> 100 bytes maps/TreasureBeach.asm | 17 ++ maps/TwoIsland.ablk | Bin 0 -> 100 bytes maps/TwoIsland.asm | 17 ++ maps/UnderwaterTunnel.ablk | Bin 0 -> 100 bytes maps/UnderwaterTunnel.asm | 17 ++ maps/WaterLabyrinth.ablk | Bin 0 -> 100 bytes maps/WaterLabyrinth.asm | 17 ++ maps/WaterPath.ablk | Bin 0 -> 100 bytes maps/WaterPath.asm | 17 ++ 159 files changed, 1962 insertions(+), 172 deletions(-) create mode 100644 maps/#Placeholder.ablk create mode 100644 maps/AlteringCave.ablk create mode 100644 maps/AlteringCave.asm create mode 100644 maps/BerryForest.ablk create mode 100644 maps/BerryForest.asm create mode 100644 maps/BillsGarden.ablk create mode 100644 maps/BillsGarden.asm create mode 100644 maps/BondBridge.ablk create mode 100644 maps/BondBridge.asm create mode 100644 maps/BrunswickGlade.ablk create mode 100644 maps/BrunswickGlade.asm create mode 100644 maps/BrunswickGrotto.ablk create mode 100644 maps/BrunswickGrotto.asm create mode 100644 maps/BrunswickTrail.ablk create mode 100644 maps/BrunswickTrail.asm create mode 100644 maps/CanyonEntrance.ablk create mode 100644 maps/CanyonEntrance.asm create mode 100644 maps/CapeBrink.ablk create mode 100644 maps/CapeBrink.asm create mode 100644 maps/CeladonUniversityInside.ablk create mode 100644 maps/CeladonUniversityInside.asm create mode 100644 maps/CeladonUniversityOutside.ablk create mode 100644 maps/CeladonUniversityOutside.asm create mode 100644 maps/CelesteHill.ablk create mode 100644 maps/CelesteHill.asm create mode 100644 maps/CelesteHillCave.ablk create mode 100644 maps/CelesteHillCave.asm create mode 100644 maps/CitrineCity.ablk create mode 100644 maps/CitrineCity.asm create mode 100644 maps/CliffEdgeGate.ablk create mode 100644 maps/CliffEdgeGate.asm create mode 100644 maps/DottedHole.ablk create mode 100644 maps/DottedHole.asm create mode 100644 maps/EmbeddedTower.ablk create mode 100644 maps/EmbeddedTower.asm create mode 100644 maps/FarawayIslandInside.ablk create mode 100644 maps/FarawayIslandInside.asm create mode 100644 maps/FarawayIslandOutside.ablk create mode 100644 maps/FarawayIslandOutside.asm create mode 100644 maps/FiveIsland.ablk create mode 100644 maps/FiveIsland.asm create mode 100644 maps/FiveIslandMeadow.ablk create mode 100644 maps/FiveIslandMeadow.asm create mode 100644 maps/FourIsland.ablk create mode 100644 maps/FourIsland.asm create mode 100644 maps/GarnetCavern1F.ablk create mode 100644 maps/GarnetCavern1F.asm create mode 100644 maps/GarnetCavern2F.ablk create mode 100644 maps/GarnetCavern2F.asm create mode 100644 maps/GarnetCavernB1F.ablk create mode 100644 maps/GarnetCavernB1F.asm create mode 100644 maps/GreenPath.ablk create mode 100644 maps/GreenPath.asm create mode 100644 maps/IcefallCave1F.ablk create mode 100644 maps/IcefallCave1F.asm create mode 100644 maps/IcefallCaveB1F.ablk create mode 100644 maps/IcefallCaveB1F.asm create mode 100644 maps/IcefallCaveBack.ablk create mode 100644 maps/IcefallCaveBack.asm create mode 100644 maps/IcefallCaveEntrance.ablk create mode 100644 maps/IcefallCaveEntrance.asm create mode 100644 maps/JohtoSafariZone.ablk create mode 100644 maps/JohtoSafariZone.asm create mode 100644 maps/JohtoSafariZoneGate.ablk create mode 100644 maps/JohtoSafariZoneGate.asm create mode 100644 maps/KindleRoad.ablk create mode 100644 maps/KindleRoad.asm create mode 100644 maps/LavenderCrypt.ablk create mode 100644 maps/LavenderCrypt.asm create mode 100644 maps/LostCave.ablk create mode 100644 maps/LostCave.asm create mode 100644 maps/MemorialPillar.ablk create mode 100644 maps/MemorialPillar.asm create mode 100644 maps/MtEmberExterior.ablk create mode 100644 maps/MtEmberExterior.asm create mode 100644 maps/MtEmberHiddenPath.ablk create mode 100644 maps/MtEmberHiddenPath.asm create mode 100644 maps/MtEmberInterior.ablk create mode 100644 maps/MtEmberInterior.asm create mode 100644 maps/MtEmberSummit.ablk create mode 100644 maps/MtEmberSummit.asm create mode 100644 maps/MtMoonCrater.ablk create mode 100644 maps/MtMoonCrater.asm create mode 100644 maps/MtMoonCraterDepths.ablk create mode 100644 maps/MtMoonCraterDepths.asm create mode 100644 maps/NavalRock1F.ablk create mode 100644 maps/NavalRock1F.asm create mode 100644 maps/NavalRock2F.ablk create mode 100644 maps/NavalRock2F.asm create mode 100644 maps/NavalRockB1F.ablk create mode 100644 maps/NavalRockB1F.asm create mode 100644 maps/NavalRockExterior.ablk create mode 100644 maps/NavalRockExterior.asm create mode 100644 maps/OneIsland.ablk create mode 100644 maps/OneIsland.asm create mode 100644 maps/OutcastIsland.ablk create mode 100644 maps/OutcastIsland.asm create mode 100644 maps/PatternBush.ablk create mode 100644 maps/PatternBush.asm create mode 100644 maps/ResortGorgeous.ablk create mode 100644 maps/ResortGorgeous.asm create mode 100644 maps/Route47.ablk create mode 100644 maps/Route47.asm create mode 100644 maps/Route48.ablk create mode 100644 maps/Route48.asm create mode 100644 maps/RuinValley.ablk create mode 100644 maps/RuinValley.asm create mode 100644 maps/SeafoamIslands1F.ablk create mode 100644 maps/SeafoamIslands1F.asm create mode 100644 maps/SeafoamIslandsB1F.ablk create mode 100644 maps/SeafoamIslandsB1F.asm create mode 100644 maps/SeafoamIslandsB2F.ablk create mode 100644 maps/SeafoamIslandsB2F.asm create mode 100644 maps/SeafoamIslandsB3F.ablk create mode 100644 maps/SeafoamIslandsB3F.asm create mode 100644 maps/SeafoamIslandsB4F.ablk create mode 100644 maps/SeafoamIslandsB4F.asm create mode 100644 maps/SevaultCanyon.ablk create mode 100644 maps/SevaultCanyon.asm create mode 100644 maps/SevenIsland.ablk create mode 100644 maps/SevenIsland.asm create mode 100644 maps/SinjohRuinsExterior.ablk create mode 100644 maps/SinjohRuinsExterior.asm create mode 100644 maps/SinjohRuinsInterior.ablk create mode 100644 maps/SinjohRuinsInterior.asm create mode 100644 maps/SixIsland.ablk create mode 100644 maps/SixIsland.asm create mode 100644 maps/TanobyChambers.ablk create mode 100644 maps/TanobyChambers.asm create mode 100644 maps/TanobyRuins.ablk create mode 100644 maps/TanobyRuins.asm create mode 100644 maps/ThreeIsland.ablk create mode 100644 maps/ThreeIsland.asm create mode 100644 maps/ThreeIslandPort.ablk create mode 100644 maps/ThreeIslandPort.asm create mode 100644 maps/TreasureBeach.ablk create mode 100644 maps/TreasureBeach.asm create mode 100644 maps/TwoIsland.ablk create mode 100644 maps/TwoIsland.asm create mode 100644 maps/UnderwaterTunnel.ablk create mode 100644 maps/UnderwaterTunnel.asm create mode 100644 maps/WaterLabyrinth.ablk create mode 100644 maps/WaterLabyrinth.asm create mode 100644 maps/WaterPath.ablk create mode 100644 maps/WaterPath.asm diff --git a/constants/landmark_constants.asm b/constants/landmark_constants.asm index 2c92c0b..38e6570 100644 --- a/constants/landmark_constants.asm +++ b/constants/landmark_constants.asm @@ -36,9 +36,9 @@ const LANDMARK_WHIRL_ISLANDS ; 1f const LANDMARK_ROUTE_41 ; 20 const LANDMARK_CIANWOOD_CITY ; 21 - ;const LANDMARK_ROUTE_47 - ;const LANDMARK_ROUTE_48 - ;const LANDMARK_SAFARI_ZONE + const LANDMARK_ROUTE_47 + const LANDMARK_ROUTE_48 + const LANDMARK_JOHTO_SAFARI_ZONE const LANDMARK_ROUTE_42 ; 22 const LANDMARK_MT_MORTAR ; 23 const LANDMARK_MAHOGANY_TOWN ; 24 @@ -61,13 +61,13 @@ DEF KANTO_LANDMARK EQU const_value const LANDMARK_PEWTER_CITY ; 33 const LANDMARK_ROUTE_3 ; 34 const LANDMARK_MT_MOON ; 35 - ;const LANDMARK_MT_MOON_CRATER + const LANDMARK_MT_MOON_CRATER const LANDMARK_ROUTE_4 ; 36 const LANDMARK_CERULEAN_CITY ; 37 const LANDMARK_CERULEAN_CAVE const LANDMARK_ROUTE_24 ; 38 const LANDMARK_ROUTE_25 ; 39 - ;const LANDMARK_BILLS_GARDEN + const LANDMARK_BILLS_GARDEN ;const LANDMARK_BILLS_LIGHTHOUSE const LANDMARK_ROUTE_5 ; 3a const LANDMARK_UNDERGROUND_PATH ; 3b @@ -79,13 +79,13 @@ DEF KANTO_LANDMARK EQU const_value const LANDMARK_ROUTE_8 ; 40 const LANDMARK_ROUTE_9 ; 41 const LANDMARK_ROCK_TUNNEL ; 42 - ;const LANDMARK_UNDERWATER_TUNNEL + const LANDMARK_UNDERWATER_TUNNEL const LANDMARK_ROUTE_10 ; 43 const LANDMARK_POWER_PLANT ; 44 const LANDMARK_LAVENDER_TOWN ; 45 const LANDMARK_LAV_RADIO_TOWER ; 46 const LANDMARK_CELADON_CITY ; 47 - ;const LANDMARK_CELADON_UNIVERSITY + const LANDMARK_CELADON_UNIVERSITY const LANDMARK_SAFFRON_CITY ; 48 const LANDMARK_ROUTE_11 ; 49 const LANDMARK_ROUTE_12 ; 4a @@ -96,7 +96,7 @@ DEF KANTO_LANDMARK EQU const_value const LANDMARK_ROUTE_17 ; 4f const LANDMARK_ROUTE_18 ; 50 const LANDMARK_FUCHSIA_CITY ; 51 - ;const LANDMARK_SAFARI_ZONE + const LANDMARK_KANTO_SAFARI_ZONE const LANDMARK_ROUTE_19 ; 52 const LANDMARK_ROUTE_20 ; 53 const LANDMARK_SEAFOAM_ISLANDS ; 54 @@ -107,18 +107,24 @@ DEF KANTO_LANDMARK EQU const_value const LANDMARK_VICTORY_ROAD ; 58 const LANDMARK_ROUTE_23 ; 59 const LANDMARK_INDIGO_PLATEAU ; 5a - ;const LANDMARK_CITRINE_CITY - ;const LANDMARK_BRUNSWICK_TRAIL - ;const LANDMARK_BRUNSWICK_GROTTO - ;const LANDMARK_GARNET_CAVERN - ;const LANDMARK_CELESTE_HILL_CAVE - ;const LANDMARK_CELESTE_HILL + const LANDMARK_CITRINE_CITY + const LANDMARK_BRUNSWICK_TRAIL + const LANDMARK_BRUNSWICK_GROTTO + const LANDMARK_GARNET_CAVERN + const LANDMARK_CELESTE_HILL_CAVE + const LANDMARK_CELESTE_HILL const LANDMARK_ROUTE_26 ; 5b const LANDMARK_ROUTE_27 ; 5c const LANDMARK_TOHJO_FALLS ; 5d const LANDMARK_ROUTE_28 ; 5e const LANDMARK_FAST_SHIP ; 5f - ;const LANDMARK_ONE_ISLAND + const LANDMARK_ONE_ISLAND + const LANDMARK_TWO_ISLAND + const LANDMARK_THREE_ISLAND + const LANDMARK_FOUR_ISLAND + const LANDMARK_FIVE_ISLAND + const LANDMARK_SIX_ISLAND + const LANDMARK_SEVEN_ISLAND DEF NIHON_LANDMARK EQU const_value const LANDMARK_SILENT_HILLS const LANDMARK_DEBUG_ROOM diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 9199954..da70807 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -191,6 +191,11 @@ ENDM map_const ROUTE_20, 30, 9 ; 6 map_const ROUTE_21, 10, 18 ; 7 map_const CINNABAR_ISLAND, 10, 9 ; 8 + map_const SEAFOAM_ISLANDS_1F, 10, 10 ; 9 + map_const SEAFOAM_ISLANDS_B1F, 10, 10 ; 10 + map_const SEAFOAM_ISLANDS_B2F, 10, 10 ; 11 + map_const SEAFOAM_ISLANDS_B3F, 10, 10 ; 12 + map_const SEAFOAM_ISLANDS_B4F, 10, 10 ; 13 endgroup newgroup CERULEAN ; 7 @@ -211,9 +216,11 @@ ENDM map_const ROUTE_24, 10, 9 ; 15 map_const ROUTE_25, 30, 9 ; 16 map_const CERULEAN_CITY, 20, 18 ; 17 - map_const CERULEAN_CAVE_1F, 17, 12 - map_const CERULEAN_CAVE_2F, 17, 11 - map_const CERULEAN_CAVE_B1F, 17, 11 + map_const CERULEAN_CAVE_1F, 17, 12 ; 18 + map_const CERULEAN_CAVE_2F, 17, 11 ; 19 + map_const CERULEAN_CAVE_B1F, 17, 11 ; 20 + map_const UNDERWATER_TUNNEL, 10, 10 ; 21 + map_const BILLS_GARDEN, 10, 10 ; 22 endgroup newgroup AZALEA ; 8 @@ -337,6 +344,8 @@ ENDM map_const MOUNT_MOON_SQUARE, 15, 9 ; 10 map_const MOUNT_MOON_GIFT_SHOP, 4, 4 ; 11 map_const TIN_TOWER_ROOF, 10, 9 ; 12 + map_const MT_MOON_CRATER, 10, 10 ; 13 + map_const MT_MOON_CRATER_DEPTHS, 10, 10 ; 14 endgroup newgroup INDIGO ; 16 @@ -381,6 +390,7 @@ ENDM map_const LAV_RADIO_TOWER_1F, 10, 4 ; 12 map_const ROUTE_8_SAFFRON_GATE, 5, 4 ; 13 map_const ROUTE_12_SUPER_ROD_HOUSE, 4, 4 ; 14 + map_const LAVENDER_CRYPT, 10, 10 ; 15 endgroup newgroup SILVER ; 19 @@ -428,6 +438,8 @@ ENDM map_const ROUTE_16_GATE, 5, 4 ; 24 map_const ROUTE_7_SAFFRON_GATE, 5, 4 ; 25 map_const ROUTE_17_ROUTE_18_GATE, 5, 4 ; 26 + map_const CELADON_UNIVERSITY_OUTSIDE, 10, 10 ; 27 + map_const CELADON_UNIVERSITY_INSIDE, 10, 10 ; 28 endgroup newgroup CIANWOOD ; 22 @@ -447,7 +459,13 @@ ENDM map_const BATTLE_TOWER_HALLWAY, 11, 2 ; 14 map_const ROUTE_40_BATTLE_TOWER_GATE, 5, 4 ; 15 map_const BATTLE_TOWER_OUTSIDE, 10, 14 ; 16 - map_const CLIFF_CAVE, 19, 16 ; 17 + map_const ROUTE_47, 10, 10 ; 17 + map_const CLIFF_CAVE, 19, 16 ; 18 + map_const CLIFF_EDGE_GATE, 10, 10 ; 19 + map_const ROUTE_48, 10, 10 ; 20 + map_const EMBEDDED_TOWER, 10, 10 ; 21 + map_const JOHTO_SAFARI_ZONE_GATE, 10, 10 ; 22 + map_const JOHTO_SAFARI_ZONE, 10, 10 ; 23 endgroup newgroup VIRIDIAN ; 23 @@ -517,7 +535,87 @@ ENDM map_const ROUTE_31_VIOLET_GATE, 5, 4 ; 11 endgroup - newgroup SILENT_HILLS ; 27 + newgroup CITRINE ; 27 + ; This doesn't have all the maps, just the bones + map_const CITRINE_CITY, 10, 10 ; 1 + map_const BRUNSWICK_TRAIL, 10, 10 ; 2 + map_const BRUNSWICK_GLADE, 10, 10 ; 3 + map_const BRUNSWICK_GROTTO, 10, 10 ; 4 + map_const GARNET_CAVERN_1F, 10, 10 ; 5 + map_const GARNET_CAVERN_2F, 10, 10 ; 6 + map_const GARNET_CAVERN_B1F, 10, 10 ; 7 + map_const CELESTE_HILL, 10, 10 ; 8 + map_const CELESTE_HILL_CAVE, 10, 10 ; 9 + endgroup + + ; Like Citrine, this doesn't have all the houses yet... + ; But it is almost mindblowing how uninspiring the total maps are. + ; Look at the other groups! Not that much more! + newgroup ONE_ISLAND ; 28 + map_const FARAWAY_ISLAND_OUTSIDE, 10, 10 ; 1 + map_const FARAWAY_ISLAND_INSIDE, 10, 10 ; 2 + map_const ONE_ISLAND, 10, 10 ; 3 + map_const TREASURE_BEACH, 10, 10 ; 4 + map_const KINDLE_ROAD, 10, 10 ; 5 + map_const MT_EMBER_EXTERIOR, 10, 10 ; 6 + map_const MT_EMBER_INTERIOR, 10, 10 ; 7 + map_const MT_EMBER_SUMMIT, 10, 10 ; 8 + map_const MT_EMBER_HIDDEN_PATH, 10, 10 ; 9 + endgroup + + newgroup TWO_ISLAND ; 29 + map_const TWO_ISLAND, 10, 10 ; 1 + map_const CAPE_BRINK, 10, 10 ; 2 + endgroup + + newgroup THREE_ISLAND ; 30 + map_const THREE_ISLAND_PORT, 10, 10 ; 1 + map_const THREE_ISLAND, 10, 10 ; 2 + map_const BOND_BRIDGE, 10, 10 ; 3 + map_const BERRY_FOREST, 10, 10 ; 4 + endgroup + + newgroup FOUR_ISLAND ; 31 + map_const FOUR_ISLAND, 10, 10 ; 1 + map_const ICEFALL_CAVE_ENTRANCE, 10, 10 ; 2 + map_const ICEFALL_CAVE_1F, 10, 10 ; 3 + map_const ICEFALL_CAVE_B1F, 10, 10 ; 4 + map_const ICEFALL_CAVE_BACK, 10, 10 ; 5 + endgroup + + newgroup FIVE_ISLAND ; 32 + map_const FIVE_ISLAND, 10, 10 ; 1 + map_const FIVE_ISLAND_MEADOW, 10, 10 ; 2 + map_const MEMORIAL_PILLAR, 10, 10 ; 3 + map_const WATER_LABYRINTH, 10, 10 ; 4 + map_const RESORT_GORGEOUS, 10, 10 ; 5 + map_const LOST_CAVE, 10, 10 ; 7 Programming this as one map. Not wasting precious space on this awful map... + endgroup + + newgroup SIX_ISLAND ; 33 + map_const SIX_ISLAND, 10, 10 ; 1 + map_const WATER_PATH, 10, 10 ; 2 + map_const RUIN_VALLEY, 10, 10 ; 3 + map_const DOTTED_HOLE, 10, 10 ; 4 + map_const GREEN_PATH, 10, 10 ; 5 + map_const PATTERN_BUSH, 10, 10 ; 6 + map_const OUTCAST_ISLAND, 10, 10 ; 7 + map_const ALTERING_CAVE, 10, 10 ; 8 + endgroup + + newgroup SEVEN_ISLAND ; 34 + map_const SEVEN_ISLAND, 10, 10 ; 1 + map_const CANYON_ENTRANCE, 10, 10 ; 2 + map_const SEVAULT_CANYON, 10, 10 ; 3 + map_const TANOBY_RUINS, 10, 10 ; 4 + map_const TANOBY_CHAMBERS, 10, 10 ; 5 + map_const NAVAL_ROCK_EXTERIOR, 10, 10 ; 6 + map_const NAVAL_ROCK_1F, 10, 10 ; 7 + map_const NAVAL_ROCK_2F, 10, 10 ; 8 + map_const NAVAL_ROCK_B1F, 10, 10 ; 9 + endgroup + + newgroup SILENT_HILLS ; 35 map_const SILENT_HILLS, 10, 10 ; 1 map_const DEBUG_ROOM, 20, 20 ; 2 map_const ROUTE_49, 15, 9 ; 3 @@ -526,11 +624,13 @@ ENDM map_const SILENT_HILLS_POKECENTER_1F, 10, 4 ; 6 map_const SILVERS_HOUSE, 5, 5 ; 7 map_const CALS_HOUSE_1F, 5, 4 ; 8 - map_const CALS_HOUSE_2F, 5, 4 ; 8 + map_const CALS_HOUSE_2F, 5, 4 ; 9 + map_const SINJOH_RUINS_EXTERIOR, 10, 10 ; 10 + map_const SINJOH_RUINS_INTERIOR, 10, 10 ; 10 endgroup - newgroup BLUE_FOREST ; 28 + newgroup BLUE_FOREST ; 36 map_const BLUE_FOREST, 20, 18 ; 1 endgroup -DEF NUM_MAP_GROUPS EQU const_value ; 27 +DEF NUM_MAP_GROUPS EQU const_value ; 36 diff --git a/constants/scgb_constants.asm b/constants/scgb_constants.asm index 7749fdc..afccd55 100644 --- a/constants/scgb_constants.asm +++ b/constants/scgb_constants.asm @@ -71,6 +71,14 @@ DEF SCGB_DEFAULT EQU $ff const PREDEFPAL_LAKE_OF_RAGE const PREDEFPAL_SILVER_CAVE const PREDEFPAL_DUNGEONS + const PREDEFPAL_CITRINE + const PREDEFPAL_ONE_ISLAND + const PREDEFPAL_TWO_ISLAND + const PREDEFPAL_THREE_ISLAND + const PREDEFPAL_FOUR_ISLAND + const PREDEFPAL_FIVE_ISLAND + const PREDEFPAL_SIX_ISLAND + const PREDEFPAL_SEVEN_ISLAND const PREDEFPAL_SILENT_HILLS const PREDEFPAL_BLUE_FOREST const PREDEFPAL_NITE diff --git a/data/maps/attributes.asm b/data/maps/attributes.asm index fc6391b..f42146d 100644 --- a/data/maps/attributes.asm +++ b/data/maps/attributes.asm @@ -721,10 +721,96 @@ ENDM map_attributes CeruleanCave2F, CERULEAN_CAVE_2F, $00, 0 map_attributes CeruleanCaveB1F, CERULEAN_CAVE_B1F, $00, 0 map_attributes DebugRoom, DEBUG_ROOM, $05, 0 ; Debug Room :V - map_attributes CliffCave, CLIFF_CAVE, $00, 0 + + ; WIP Maps (need to be connected later) + map_attributes Route47, ROUTE_47, $00, 0 ; Bank 1 + map_attributes CliffCave, CLIFF_CAVE, $00, 0 ; Bank 1 + map_attributes CliffEdgeGate, CLIFF_EDGE_GATE, $00, 0 ; Bank 1 + map_attributes EmbeddedTower, EMBEDDED_TOWER, $00, 0 ; Bank 1 + map_attributes Route48, ROUTE_48, $00, 0 ; Bank 1 + map_attributes JohtoSafariZoneGate, JOHTO_SAFARI_ZONE_GATE, $00, 0 ; Bank 1 + map_attributes JohtoSafariZone, JOHTO_SAFARI_ZONE, $00, 0 ; Bank 1 + map_attributes LavenderCrypt, LAVENDER_CRYPT, $00, 0 ; Bank 1 + map_attributes UnderwaterTunnel, UNDERWATER_TUNNEL, $00, 0 ; Bank 1 + map_attributes BillsGarden, BILLS_GARDEN, $00, 0 ; Bank 1 + map_attributes CeladonUniversityOutside, CELADON_UNIVERSITY_OUTSIDE, $00, 0 ; Bank 1 + map_attributes CeladonUniversityInside, CELADON_UNIVERSITY_INSIDE, $00, 0 ; Bank 1 + map_attributes MtMoonCrater, MT_MOON_CRATER, $00, 0 ; Bank 1 + map_attributes MtMoonCraterDepths, MT_MOON_CRATER_DEPTHS, $00, 0 ; Bank 1 + map_attributes SeafoamIslands1F, SEAFOAM_ISLANDS_1F, $00, 0 ; Bank 1 + map_attributes SeafoamIslandsB1F, SEAFOAM_ISLANDS_B1F, $00, 0 ; Bank 1 + map_attributes SeafoamIslandsB2F, SEAFOAM_ISLANDS_B2F, $00, 0 ; Bank 1 + map_attributes SeafoamIslandsB3F, SEAFOAM_ISLANDS_B3F, $00, 0 ; Bank 1 + map_attributes SeafoamIslandsB4F, SEAFOAM_ISLANDS_B4F, $00, 0 ; Bank 1 + + ; Citrine City Maps + map_attributes CitrineCity, CITRINE_CITY, $00, 0 ; Bank 2 + map_attributes BrunswickTrail, BRUNSWICK_TRAIL, $00, 0 ; Bank 2 + map_attributes BrunswickGlade, BRUNSWICK_GLADE, $00, 0 ; Bank 2 + map_attributes BrunswickGrotto, BRUNSWICK_GROTTO, $00, 0 ; Bank 2 + map_attributes GarnetCavern1F, GARNET_CAVERN_1F, $00, 0 ; Bank 2 + map_attributes GarnetCavern2F, GARNET_CAVERN_1F, $00, 0 ; Bank 2 + map_attributes GarnetCavernB1F, GARNET_CAVERN_1F, $00, 0 ; Bank 2 + map_attributes CelesteHill, CELESTE_HILL, $00, 0 ; Bank 2 + map_attributes CelesteHillCave, CELESTE_HILL_CAVE, $00, 0 ; Bank 2 + + ; Sevii Island Sizzle Reel + map_attributes FarawayIslandOutside, FARAWAY_ISLAND_OUTSIDE, $00, 0 ; Bank 2 + map_attributes FarawayIslandInside, FARAWAY_ISLAND_INSIDE, $00, 0 ; Bank 2 + map_attributes OneIsland, ONE_ISLAND, $00, 0 ; Bank 2 + map_attributes TreasureBeach, TREASURE_BEACH, $00, 0 ; Bank 2 + map_attributes KindleRoad, KINDLE_ROAD, $00, 0 ; Bank 2 + map_attributes MtEmberExterior, MT_EMBER_EXTERIOR, $00, 0 ; Bank 2 + map_attributes MtEmberInterior, MT_EMBER_INTERIOR, $00, 0 ; Bank 2 + map_attributes MtEmberSummit, MT_EMBER_SUMMIT, $00, 0 ; Bank 2 + map_attributes MtEmberHiddenPath, MT_EMBER_HIDDEN_PATH, $00, 0 ; Bank 2 + + map_attributes TwoIsland, TWO_ISLAND, $00, 0 ; Bank 2 + map_attributes CapeBrink, CAPE_BRINK, $00, 0 ; Bank 2 + + map_attributes ThreeIslandPort, THREE_ISLAND_PORT, $00, 0 ; Bank 2 + map_attributes ThreeIsland, THREE_ISLAND, $00, 0 ; Bank 3 + map_attributes BondBridge, BOND_BRIDGE, $00, 0 ; Bank 3 + map_attributes BerryForest, BERRY_FOREST, $00, 0 ; Bank 3 + + map_attributes FourIsland, FOUR_ISLAND, $00, 0 ; Bank 3 + map_attributes IcefallCaveEntrance, ICEFALL_CAVE_ENTRANCE, $00, 0 ; Bank 3 + map_attributes IcefallCave1F, ICEFALL_CAVE_1F, $00, 0 ; Bank 3 + map_attributes IcefallCaveB1F, ICEFALL_CAVE_B1F, $00, 0 ; Bank 3 + map_attributes IcefallCaveBack, ICEFALL_CAVE_BACK, $00, 0 ; Bank 3 + + map_attributes FiveIsland, FIVE_ISLAND, $00, 0 + map_attributes FiveIslandMeadow, FIVE_ISLAND_MEADOW, $00, 0 + map_attributes MemorialPillar, MEMORIAL_PILLAR, $00, 0 + map_attributes WaterLabyrinth, WATER_LABYRINTH, $00, 0 + map_attributes ResortGorgeous, RESORT_GORGEOUS, $00, 0 + map_attributes LostCave, LOST_CAVE, $00, 0 + + map_attributes SixIsland, SIX_ISLAND, $00, 0 + map_attributes WaterPath, WATER_PATH, $00, 0 + map_attributes RuinValley, RUIN_VALLEY, $00, 0 + map_attributes DottedHole, DOTTED_HOLE, $00, 0 + map_attributes GreenPath, GREEN_PATH, $00, 0 + map_attributes PatternBush, PATTERN_BUSH, $00, 0 + map_attributes OutcastIsland, OUTCAST_ISLAND, $00, 0 + map_attributes AlteringCave, ALTERING_CAVE, $00, 0 + + map_attributes SevenIsland, SEVEN_ISLAND, $00, 0 + map_attributes CanyonEntrance, CANYON_ENTRANCE, $00, 0 + map_attributes SevaultCanyon, SEVAULT_CANYON, $00, 0 + map_attributes TanobyRuins, TANOBY_RUINS, $00, 0 + map_attributes TanobyChambers, TANOBY_CHAMBERS, $00, 0 + map_attributes NavalRockExterior, NAVAL_ROCK_EXTERIOR, $00, 0 + map_attributes NavalRock1F, NAVAL_ROCK_1F, $00, 0 + map_attributes NavalRock2F, NAVAL_ROCK_2F, $00, 0 + map_attributes NavalRockB1F, NAVAL_ROCK_B1F, $00, 0 + + ; Nihon map_attributes BlueForest, BLUE_FOREST, $00, 0 ; this is on its own for now. add connections later. map_attributes QuietCave, QUIET_CAVE, $76, 0 map_attributes SilentHillsPokecenter1F, SILENT_HILLS_POKECENTER_1F, $00, 0 map_attributes SilversHouse, SILVERS_HOUSE, $00, 0 map_attributes CalsHouse1F, CALS_HOUSE_1F, $00, 0 map_attributes CalsHouse2F, CALS_HOUSE_2F, $00, 0 + map_attributes SinjohRuinsExterior, SINJOH_RUINS_EXTERIOR, $00, 0 + map_attributes SinjohRuinsInterior, SINJOH_RUINS_EXTERIOR, $00, 0 diff --git a/data/maps/blocks.asm b/data/maps/blocks.asm index 1624f57..6a3e2d1 100644 --- a/data/maps/blocks.asm +++ b/data/maps/blocks.asm @@ -15,9 +15,6 @@ Route44_Blocks: Route28_Blocks: INCBIN "maps/Route28.ablk" -BetaPlayersHouse2F_Blocks: ; unreferenced - INCBIN "maps/unused/BetaPlayersHouse2F.ablk" - CeladonCity_Blocks: INCBIN "maps/CeladonCity.ablk" @@ -30,27 +27,15 @@ Route2_Blocks: ElmsHouse_Blocks: INCBIN "maps/ElmsHouse.ablk" -BetaSproutTower1_Blocks: ; unreferenced - INCBIN "maps/unused/BetaSproutTower1.ablk" - Route11_Blocks: INCBIN "maps/Route11.ablk" -BetaSproutTower5_Blocks: ; unreferenced - INCBIN "maps/unused/BetaSproutTower5.ablk" - Route15_Blocks: INCBIN "maps/Route15.ablk" -BetaSproutTower9_Blocks: ; unreferenced - INCBIN "maps/unused/BetaSproutTower9.ablk" - Route19_Blocks: INCBIN "maps/Route19.ablk" -BetaBlackthornCity_Blocks: ; unreferenced - INCBIN "maps/unused/BetaBlackthornCity.ablk" - Route10South_Blocks: INCBIN "maps/Route10South.ablk" @@ -94,9 +79,6 @@ Route25_Blocks: Route24_Blocks: INCBIN "maps/Route24.ablk" -BetaVioletCity_Blocks: ; unreferenced - INCBIN "maps/unused/BetaVioletCity.ablk" - Route3_Blocks: INCBIN "maps/Route3.ablk" @@ -106,24 +88,12 @@ PewterCity_Blocks: BetaSilverCaveOutside_Blocks: ; unreferenced INCBIN "maps/unused/BetaSilverCaveOutside.ablk" -BetaSproutTower2_Blocks: ; unreferenced - INCBIN "maps/unused/BetaSproutTower2.ablk" - Route12_Blocks: INCBIN "maps/Route12.ablk" -BetaGoldenrodCity_Blocks: ; unreferenced - INCBIN "maps/unused/BetaGoldenrodCity.ablk" - Route20_Blocks: INCBIN "maps/Route20.ablk" -BetaSproutTower6_Blocks: ; unreferenced - INCBIN "maps/unused/BetaSproutTower6.ablk" - -BetaPokecenter_Blocks: ; unreferenced - INCBIN "maps/unused/BetaPokecenter.ablk" - Route30_Blocks: INCBIN "maps/Route30.ablk" @@ -145,9 +115,6 @@ FuchsiaCity_Blocks: Route38_Blocks: INCBIN "maps/Route38.ablk" -BetaCianwoodCity_Blocks: ; unreferenced - INCBIN "maps/unused/BetaCianwoodCity.ablk" - OlivineTimsHouse_Blocks: OlivineHouseBeta_Blocks: OlivinePunishmentSpeechHouse_Blocks: @@ -217,12 +184,6 @@ ViridianForestViridianGate_Blocks: ViridianForestPewterGate_Blocks: INCBIN "maps/NorthSouthGate.ablk" -BetaEcruteakCity_Blocks: ; unreferenced - INCBIN "maps/unused/BetaEcruteakCity.ablk" - -BetaCherrygroveCity_Blocks: ; unreferenced - INCBIN "maps/unused/BetaCherrygroveCity.ablk" - CinnabarIsland_Blocks: INCBIN "maps/CinnabarIsland.ablk" @@ -232,9 +193,6 @@ Route4_Blocks: Route8_Blocks: INCBIN "maps/Route8.ablk" -BetaSproutTower3_Blocks: ; unreferenced - INCBIN "maps/unused/BetaSproutTower3.ablk" - ViridianCity_Blocks: INCBIN "maps/ViridianCity.ablk" @@ -244,15 +202,9 @@ Route13_Blocks: Route21_Blocks: INCBIN "maps/Route21.ablk" -BetaSproutTower7_Blocks: ; unreferenced - INCBIN "maps/unused/BetaSproutTower7.ablk" - Route17_Blocks: INCBIN "maps/Route17.ablk" -BetaMahoganyTown_Blocks: ; unreferenced - INCBIN "maps/unused/BetaMahoganyTown.ablk" - Route31_Blocks: INCBIN "maps/Route31.ablk" @@ -284,18 +236,9 @@ Route17Route18Gate_Blocks: Route31VioletGate_Blocks: INCBIN "maps/EastWestGate.ablk" -BetaAzaleaTown_Blocks: ; unreferenced - INCBIN "maps/unused/BetaAzaleaTown.ablk" - VermilionCity_Blocks: INCBIN "maps/VermilionCity.ablk" -BetaOlivineCity_Blocks: ; unreferenced - INCBIN "maps/unused/BetaOlivineCity.ablk" - -BetaNewBarkTown_Blocks: ; unreferenced - INCBIN "maps/unused/BetaNewBarkTown.ablk" - ElmsLab_Blocks: INCBIN "maps/ElmsLab.ablk" @@ -314,15 +257,65 @@ Route9_Blocks: Route22_Blocks: INCBIN "maps/Route22.ablk" +Route47_Blocks: + INCBIN "maps/Route47.ablk" + +CliffEdgeGate_Blocks: + INCBIN "maps/CliffEdgeGate.ablk" + +EmbeddedTower_Blocks: + INCBIN "maps/EmbeddedTower.ablk" + +Route48_Blocks: + INCBIN "maps/Route48.ablk" + +JohtoSafariZoneGate_Blocks: + INCBIN "maps/JohtoSafariZoneGate.ablk" + +JohtoSafariZone_Blocks: + INCBIN "maps/JohtoSafariZone.ablk" + +LavenderCrypt_Blocks: + INCBIN "maps/LavenderCrypt.ablk" + +UnderwaterTunnel_Blocks: + INCBIN "maps/UnderwaterTunnel.ablk" + +BillsGarden_Blocks: + INCBIN "maps/BillsGarden.ablk" + +CeladonUniversityOutside_Blocks: + INCBIN "maps/CeladonUniversityOutside.ablk" + +CeladonUniversityInside_Blocks: + INCBIN "maps/CeladonUniversityInside.ablk" + +MtMoonCrater_Blocks: + INCBIN "maps/MtMoonCrater.ablk" + +MtMoonCraterDepths_Blocks: + INCBIN "maps/MtMoonCraterDepths.ablk" + +SeafoamIslands1F_Blocks: + INCBIN "maps/SeafoamIslands1F.ablk" + +SeafoamIslandsB1F_Blocks: + INCBIN "maps/SeafoamIslandsB1F.ablk" + +SeafoamIslandsB2F_Blocks: + INCBIN "maps/SeafoamIslandsB2F.ablk" + +SeafoamIslandsB3F_Blocks: + INCBIN "maps/SeafoamIslandsB3F.ablk" + +SeafoamIslandsB4F_Blocks: + INCBIN "maps/SeafoamIslandsB4F.ablk" SECTION "Map Blocks 2", ROMX Route14_Blocks: INCBIN "maps/Route14.ablk" -BetaSproutTower8_Blocks: ; unreferenced - INCBIN "maps/unused/BetaSproutTower8.ablk" - OlivineMart_Blocks: EcruteakMart_Blocks: BlackthornMart_Blocks: @@ -342,9 +335,6 @@ LakeOfRageMart_Blocks: Route10North_Blocks: INCBIN "maps/Route10North.ablk" -BetaLakeOfRage_Blocks: ; unreferenced - INCBIN "maps/unused/BetaLakeOfRage.ablk" - OlivinePokecenter1F_Blocks: MahoganyPokecenter1F_Blocks: EcruteakPokecenter1F_Blocks: @@ -368,18 +358,6 @@ BetaPewterMuseumOfScience2F_Blocks: ; unreferenced EarlsPokemonAcademy_Blocks: INCBIN "maps/EarlsPokemonAcademy.ablk" -BetaCinnabarPokemonLabHallway_Blocks: ; unreferenced - INCBIN "maps/unused/BetaCinnabarPokemonLabHallway.ablk" - -BetaCinnabarPokemonLabRoom1_Blocks: ; unreferenced - INCBIN "maps/unused/BetaCinnabarPokemonLabRoom1.ablk" - -BetaCinnabarPokemonLabRoom2_Blocks: ; unreferenced - INCBIN "maps/unused/BetaCinnabarPokemonLabRoom2.ablk" - -BetaCinnabarPokemonLabRoom3_Blocks: ; unreferenced - INCBIN "maps/unused/BetaCinnabarPokemonLabRoom3.ablk" - GoldenrodDeptStore1F_Blocks: CeladonDeptStore1F_Blocks: INCBIN "maps/DeptStore1F.ablk" @@ -420,9 +398,6 @@ CeladonMansion3F_Blocks: CeladonMansionRoof_Blocks: INCBIN "maps/CeladonMansionRoof.ablk" -BetaHouse_Blocks: ; unreferenced - INCBIN "maps/unused/BetaHouse.ablk" - CeladonGameCorner_Blocks: INCBIN "maps/CeladonGameCorner.ablk" @@ -442,9 +417,6 @@ VioletNicknameSpeechHouse_Blocks: VioletKylesHouse_Blocks: INCBIN "maps/House2.ablk" -BetaUnionCave_Blocks: ; unreferenced - INCBIN "maps/unused/BetaUnionCave.ablk" - UnionCaveB1F_Blocks: INCBIN "maps/UnionCaveB1F.ablk" @@ -462,9 +434,6 @@ Route5UndergroundPathEntrance_Blocks: Route6UndergroundPathEntrance_Blocks: INCBIN "maps/UndergroundPathEntrance.ablk" -BetaCapsuleHouse_Blocks: ; unreferenced - INCBIN "maps/unused/BetaCapsuleHouse.ablk" - KurtsHouse_Blocks: INCBIN "maps/KurtsHouse.ablk" @@ -474,9 +443,6 @@ GoldenrodMagnetTrainStation_Blocks: RuinsOfAlphOutside_Blocks: INCBIN "maps/RuinsOfAlphOutside.ablk" -BetaRuinsOfAlphUnsolvedPuzzleRoom_Blocks: ; unreferenced - INCBIN "maps/unused/BetaRuinsOfAlphUnsolvedPuzzleRoom.ablk" - RuinsOfAlphInnerChamber_Blocks: INCBIN "maps/RuinsOfAlphInnerChamber.ablk" @@ -489,21 +455,12 @@ RuinsOfAlphAerodactylChamber_Blocks: SproutTower1F_Blocks: INCBIN "maps/SproutTower1F.ablk" -BetaSproutTowerCutOut1_Blocks: ; unreferenced - INCBIN "maps/unused/BetaSproutTowerCutOut1.ablk" - SproutTower2F_Blocks: INCBIN "maps/SproutTower2F.ablk" -BetaSproutTowerCutOut2_Blocks: ; unreferenced - INCBIN "maps/unused/BetaSproutTowerCutOut2.ablk" - SproutTower3F_Blocks: INCBIN "maps/SproutTower3F.ablk" -BetaSproutTowerCutOut3_Blocks: ; unreferenced - INCBIN "maps/unused/BetaSproutTowerCutOut3.ablk" - RadioTower1F_Blocks: INCBIN "maps/RadioTower1F.ablk" @@ -579,9 +536,6 @@ GoldenrodDeptStoreB1F_Blocks: GoldenrodUndergroundWarehouse_Blocks: INCBIN "maps/GoldenrodUndergroundWarehouse.ablk" -BetaElevator_Blocks: ; unreferenced - INCBIN "maps/unused/BetaElevator.ablk" - TinTower1F_Blocks: INCBIN "maps/TinTower1F.ablk" @@ -618,9 +572,6 @@ BurnedTower1F_Blocks: BurnedTowerB1F_Blocks: INCBIN "maps/BurnedTowerB1F.ablk" -BetaCaveTestMap_Blocks: ; unreferenced - INCBIN "maps/unused/BetaCaveTestMap.ablk" - MountMortar1FOutside_Blocks: INCBIN "maps/MountMortar1FOutside.ablk" @@ -681,18 +632,6 @@ SilverCaveRoom2_Blocks: SilverCaveRoom3_Blocks: INCBIN "maps/SilverCaveRoom3.ablk" -BetaRocketHideoutB2F_Blocks: ; unreferenced - INCBIN "maps/unused/BetaRocketHideoutB2F.ablk" - -BetaRocketHideoutB1F_Blocks: ; unreferenced - INCBIN "maps/unused/BetaRocketHideoutB1F.ablk" - -BetaRocketHideout1F_Blocks: ; unreferenced - INCBIN "maps/unused/BetaRocketHideout1F.ablk" - -BetaRocketHideoutB3F_Blocks: ; unreferenced - INCBIN "maps/unused/BetaRocketHideoutB3F.ablk" - MahoganyMart1F_Blocks: MountMoonGiftShop_Blocks: INCBIN "maps/GiftShop.ablk" @@ -706,9 +645,6 @@ TeamRocketBaseB2F_Blocks: TeamRocketBaseB3F_Blocks: INCBIN "maps/TeamRocketBaseB3F.ablk" -BetaRoute23_Blocks: ; unreferenced - INCBIN "maps/unused/BetaRoute23.ablk" - IndigoPlateauPokecenter1F_Blocks: INCBIN "maps/IndigoPlateauPokecenter1F.ablk" @@ -742,9 +678,6 @@ MahoganyGym_Blocks: OlivineGym_Blocks: INCBIN "maps/OlivineGym.ablk" -BetaUnknownGym_Blocks: ; unreferenced - INCBIN "maps/unused/BetaUnknownGym.ablk" - CianwoodGym_Blocks: INCBIN "maps/CianwoodGym.ablk" @@ -772,12 +705,41 @@ OlivineLighthouse5F_Blocks: OlivineLighthouse6F_Blocks: INCBIN "maps/OlivineLighthouse6F.ablk" +FarawayIslandOutside_Blocks: + INCBIN "maps/FarawayIslandOutside.ablk" + +FarawayIslandInside_Blocks: + INCBIN "maps/FarawayIslandInside.ablk" + +OneIsland_Blocks: + INCBIN "maps/OneIsland.ablk" + +TreasureBeach_Blocks: + INCBIN "maps/TreasureBeach.ablk" + +KindleRoad_Blocks: + INCBIN "maps/KindleRoad.ablk" + +MtEmberExterior_Blocks: + INCBIN "maps/MtEmberExterior.ablk" + +MtEmberInterior_Blocks: + INCBIN "maps/MtEmberInterior.ablk" + +MtEmberSummit_Blocks: + INCBIN "maps/MtEmberSummit.ablk" + +MtEmberHiddenPath_Blocks: + INCBIN "maps/MtEmberHiddenPath.ablk" + +TwoIsland_Blocks: + INCBIN "maps/TwoIsland.ablk" + +CapeBrink_Blocks: + INCBIN "maps/CapeBrink.ablk" SECTION "Map Blocks 3", ROMX -BetaSlowpokeWell1F_Blocks: ; unreferenced - INCBIN "maps/unused/BetaSlowpokeWell1F.ablk" - SlowpokeWellB1F_Blocks: INCBIN "maps/SlowpokeWellB1F.ablk" @@ -820,9 +782,6 @@ FastShip1F_Blocks: FastShipB1F_Blocks: INCBIN "maps/FastShipB1F.ablk" -BetaFastShipInsideCutOut_Blocks: ; unreferenced - INCBIN "maps/unused/BetaFastShipInsideCutOut.ablk" - FastShipCabins_NNW_NNE_NE_Blocks: INCBIN "maps/FastShipCabins_NNW_NNE_NE.ablk" @@ -909,15 +868,9 @@ PewterGym_Blocks: CeladonGym_Blocks: INCBIN "maps/CeladonGym.ablk" -BetaCeladonMansion1F_Blocks: ; unreferenced - INCBIN "maps/unused/BetaCeladonMansion1F.ablk" - CeladonCafe_Blocks: INCBIN "maps/CeladonCafe.ablk" -BetaCeladonMansion2F_Blocks: ; unreferenced - INCBIN "maps/unused/BetaCeladonMansion2F.ablk" - RockTunnel1F_Blocks: INCBIN "maps/RockTunnel1F.ablk" @@ -1036,9 +989,6 @@ BattleTowerElevator_Blocks: BattleTowerOutside_Blocks: INCBIN "maps/BattleTowerOutside.ablk" -BetaBlank_Blocks: ; unreferenced - INCBIN "maps/unused/BetaBlank.ablk" - GoldenrodDeptStoreRoof_Blocks: INCBIN "maps/GoldenrodDeptStoreRoof.ablk" @@ -1116,3 +1066,132 @@ SilversHouse_Blocks: CalsHouse2F_Blocks: INCBIN "maps/CalsHouse2F.ablk" + +ThreeIsland_Blocks: + INCBIN "maps/ThreeIsland.ablk" + +BondBridge_Blocks: + INCBIN "maps/BondBridge.ablk" + +BerryForest_Blocks: + INCBIN "maps/BerryForest.ablk" + +FourIsland_Blocks: + INCBIN "maps/FourIsland.ablk" + +IcefallCaveEntrance_Blocks: + INCBIN "maps/IcefallCaveEntrance.ablk" + +IcefallCave1F_Blocks: + INCBIN "maps/IcefallCave1F.ablk" + +IcefallCaveB1F_Blocks: + INCBIN "maps/IcefallCaveB1F.ablk" + +IcefallCaveBack_Blocks: + INCBIN "maps/IcefallCaveBack.ablk" + +FiveIsland_Blocks: + INCBIN "maps/FiveIsland.ablk" + +FiveIslandMeadow_Blocks: + INCBIN "maps/FiveIslandMeadow.ablk" + +MemorialPillar_Blocks: + INCBIN "maps/MemorialPillar.ablk" + +WaterLabyrinth_Blocks: + INCBIN "maps/WaterLabyrinth.ablk" + +ResortGorgeous_Blocks: + INCBIN "maps/ResortGorgeous.ablk" + +LostCave_Blocks: + INCBIN "maps/LostCave.ablk" + +SixIsland_Blocks: + INCBIN "maps/SixIsland.ablk" + +WaterPath_Blocks: + INCBIN "maps/WaterPath.ablk" + +RuinValley_Blocks: + INCBIN "maps/RuinValley.ablk" + +DottedHole_Blocks: + INCBIN "maps/DottedHole.ablk" + +GreenPath_Blocks: + INCBIN "maps/GreenPath.ablk" + +PatternBush_Blocks: + INCBIN "maps/PatternBush.ablk" + +OutcastIsland_Blocks: + INCBIN "maps/OutcastIsland.ablk" + +SevenIsland_Blocks: + INCBIN "maps/SevenIsland.ablk" + +CanyonEntrance_Blocks: + INCBIN "maps/CanyonEntrance.ablk" + +SevaultCanyon_Blocks: + INCBIN "maps/SevaultCanyon.ablk" + +TanobyRuins_Blocks: + INCBIN "maps/TanobyRuins.ablk" + +TanobyChambers_Blocks: + INCBIN "maps/TanobyChambers.ablk" + +NavalRockExterior_Blocks: + INCBIN "maps/NavalRockExterior.ablk" + +NavalRock1F_Blocks: + INCBIN "maps/NavalRock1F.ablk" + +NavalRockB1F_Blocks: + INCBIN "maps/NavalRockB1F.ablk" + +NavalRock2F_Blocks: + INCBIN "maps/NavalRock2F.ablk" + +CitrineCity_Blocks: + INCBIN "maps/CitrineCity.ablk" + +BrunswickTrail_Blocks: + INCBIN "maps/BrunswickTrail.ablk" + +BrunswickGlade_Blocks: + INCBIN "maps/BrunswickGlade.ablk" + +BrunswickGrotto_Blocks: + INCBIN "maps/BrunswickGrotto.ablk" + +GarnetCavern1F_Blocks: + INCBIN "maps/GarnetCavern1F.ablk" + +GarnetCavernB1F_Blocks: + INCBIN "maps/GarnetCavernB1F.ablk" + +GarnetCavern2F_Blocks: + INCBIN "maps/GarnetCavern2F.ablk" + +CelesteHill_Blocks: + INCBIN "maps/CelesteHill.ablk" + +CelesteHillCave_Blocks: + INCBIN "maps/CelesteHillCave.ablk" + +AlteringCave_Blocks: + INCBIN "maps/AlteringCave.ablk" + +ThreeIslandPort_Blocks: + INCBIN "maps/ThreeIslandPort.ablk" + +SinjohRuinsExterior_Blocks: + INCBIN "maps/SinjohRuinsExterior.ablk" + +SinjohRuinsInterior_Blocks: + INCBIN "maps/SinjohRuinsInterior.ablk" diff --git a/data/maps/landmarks.asm b/data/maps/landmarks.asm index 4c91e3c..e29a498 100644 --- a/data/maps/landmarks.asm +++ b/data/maps/landmarks.asm @@ -42,6 +42,9 @@ Landmarks: landmark 28, 92, WhirlIslandsName landmark 28, 100, Route41Name landmark 20, 100, CianwoodCityName + landmark 0, 0, UnknownName ; Route 47 + landmark 0, 0, UnknownName ; Route 48 + landmark 0, 0, UnknownName ; Johto Safari Zone landmark 92, 44, Route42Name landmark 84, 44, MtMortarName landmark 108, 44, MahoganyTownName @@ -64,11 +67,13 @@ Landmarks: landmark 52, 52, PewterCityName landmark 64, 52, Route3Name landmark 76, 52, MtMoonName + landmark 0, 0, UnknownName ; Mt. Moon Crater landmark 88, 52, Route4Name landmark 100, 52, CeruleanCityName landmark 108, 52, CeruleanCaveName landmark 100, 44, Route24Name landmark 108, 36, Route25Name + landmark 0, 0, UnknownName ; Bill's Garden landmark 100, 60, Route5Name landmark 108, 76, UndergroundName landmark 100, 76, Route6Name @@ -78,11 +83,13 @@ Landmarks: landmark 116, 68, Route8Name landmark 116, 52, Route9Name landmark 132, 52, RockTunnelName + landmark 0, 0, UnknownName ; Underwater Tunnel landmark 132, 56, Route10Name landmark 132, 60, PowerPlantName landmark 132, 68, LavenderTownName landmark 140, 68, LavRadioTowerName landmark 76, 68, CeladonCityName + landmark 0, 0, UnknownName ; Celadon University landmark 100, 68, SaffronCityName landmark 116, 84, Route11Name landmark 132, 80, Route12Name @@ -93,6 +100,7 @@ Landmarks: landmark 68, 92, Route17Name landmark 80, 116, Route18Name landmark 92, 116, FuchsiaCityName + landmark 0, 0, UnknownName ; Kanto Safari Zone landmark 92, 128, Route19Name landmark 76, 132, Route20Name landmark 68, 132, SeafoamIslandsName @@ -102,14 +110,28 @@ Landmarks: landmark 28, 52, VictoryRoadName landmark 28, 44, Route23Name landmark 28, 36, IndigoPlateauName + landmark 0, 0, UnknownName ; Citrine City + landmark 0, 0, UnknownName ; Brunswick Trail + landmark 0, 0, UnknownName ; Brunswick Grotto + landmark 0, 0, UnknownName ; Garnet Cavern + landmark 0, 0, UnknownName ; Celeste Hill Cave + landmark 0, 0, UnknownName ; Celeste Hill landmark 28, 92, Route26Name landmark 20, 100, Route27Name landmark 12, 100, TohjoFallsName landmark 20, 68, Route28Name landmark 140, 116, FastShipName + ; Sevii stuff + landmark 0, 0, UnknownName ; One Island + landmark 0, 0, UnknownName ; Two Island + landmark 0, 0, UnknownName ; Three Island + landmark 0, 0, UnknownName ; Four Island + landmark 0, 0, UnknownName ; Five Island + landmark 0, 0, UnknownName ; Six Island + landmark 0, 0, UnknownName ; Seven Island assert_table_length NIHON_LANDMARK landmark 92, 108, SilentHillsName - landmark 20, 28, UnknownName + landmark 20, 28, UnknownName ; Debug Room landmark 91, 108, Route49Name ; probably not correct landmark 91, 108, QuietCaveName ; probably not correct landmark 140, 60, BlueForestName diff --git a/data/maps/maps.asm b/data/maps/maps.asm index 6ab95bc..0f76801 100644 --- a/data/maps/maps.asm +++ b/data/maps/maps.asm @@ -43,8 +43,16 @@ MapGroupPointers:: dw MapGroup_NewBark ; 24 dw MapGroup_Saffron ; 25 dw MapGroup_Cherrygrove ; 26 - dw MapGroup_SilentHills ; 27 - dw MapGroup_BlueForest ; 28 + dw MapGroup_Citrine ; 27 + dw MapGroup_OneIsland ; 28 + dw MapGroup_TwoIsland ; 29 + dw MapGroup_ThreeIsland ; 30 + dw MapGroup_FourIsland ; 31 + dw MapGroup_FiveIsland ; 32 + dw MapGroup_SixIsland ; 33 + dw MapGroup_SevenIsland ; 34 + dw MapGroup_SilentHills ; 35 + dw MapGroup_BlueForest ; 36 assert_table_length NUM_MAP_GROUPS MapGroup_Olivine: @@ -166,8 +174,8 @@ MapGroup_Dungeons: map UndergroundPath, TILESET_UNDERGROUND, GATE, LANDMARK_UNDERGROUND_PATH, MUSIC_MT_MOON, FALSE, PALETTE_NITE, FISHGROUP_SHORE map RockTunnel1F, TILESET_DARK_CAVE, CAVE, LANDMARK_ROCK_TUNNEL, MUSIC_MT_MOON, TRUE, PALETTE_DARK, FISHGROUP_SHORE map RockTunnelB1F, TILESET_DARK_CAVE, CAVE, LANDMARK_ROCK_TUNNEL, MUSIC_MT_MOON, TRUE, PALETTE_DARK, FISHGROUP_SHORE - map SafariZoneFuchsiaGateBeta, TILESET_GATE, INDOOR, LANDMARK_FUCHSIA_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map SafariZoneBeta, TILESET_PARK, CAVE, LANDMARK_FUCHSIA_CITY, MUSIC_EVOLUTION, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map SafariZoneFuchsiaGateBeta, TILESET_GATE, INDOOR, LANDMARK_KANTO_SAFARI_ZONE, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map SafariZoneBeta, TILESET_PARK, CAVE, LANDMARK_KANTO_SAFARI_ZONE, MUSIC_EVOLUTION, FALSE, PALETTE_AUTO, FISHGROUP_SHORE map VictoryRoad, TILESET_CAVE, CAVE, LANDMARK_VICTORY_ROAD, MUSIC_VICTORY_ROAD, TRUE, PALETTE_NITE, FISHGROUP_SHORE assert_table_length NUM_DUNGEONS_MAPS @@ -209,6 +217,11 @@ MapGroup_Cinnabar: map Route20, TILESET_KANTO, ROUTE, LANDMARK_ROUTE_20, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN map Route21, TILESET_KANTO, ROUTE, LANDMARK_ROUTE_21, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN map CinnabarIsland, TILESET_KANTO, TOWN, LANDMARK_CINNABAR_ISLAND, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN + map SeafoamIslands1F, TILESET_CAVE, INDOOR, LANDMARK_SEAFOAM_ISLANDS, MUSIC_DARK_CAVE, TRUE, PALETTE_DAY, FISHGROUP_OCEAN + map SeafoamIslandsB1F, TILESET_CAVE, INDOOR, LANDMARK_SEAFOAM_ISLANDS, MUSIC_DARK_CAVE, TRUE, PALETTE_DAY, FISHGROUP_OCEAN + map SeafoamIslandsB2F, TILESET_CAVE, INDOOR, LANDMARK_SEAFOAM_ISLANDS, MUSIC_DARK_CAVE, TRUE, PALETTE_DAY, FISHGROUP_OCEAN + map SeafoamIslandsB3F, TILESET_CAVE, INDOOR, LANDMARK_SEAFOAM_ISLANDS, MUSIC_DARK_CAVE, TRUE, PALETTE_DAY, FISHGROUP_OCEAN + map SeafoamIslandsB4F, TILESET_CAVE, INDOOR, LANDMARK_SEAFOAM_ISLANDS, MUSIC_DARK_CAVE, TRUE, PALETTE_DAY, FISHGROUP_OCEAN assert_table_length NUM_CINNABAR_MAPS MapGroup_Cerulean: @@ -233,6 +246,8 @@ MapGroup_Cerulean: map CeruleanCave1F, TILESET_CAVE, CAVE, LANDMARK_CERULEAN_CAVE, MUSIC_LIGHTHOUSE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE map CeruleanCave2F, TILESET_CAVE, CAVE, LANDMARK_CERULEAN_CAVE, MUSIC_LIGHTHOUSE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE map CeruleanCaveB1F, TILESET_CAVE, CAVE, LANDMARK_CERULEAN_CAVE, MUSIC_LIGHTHOUSE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map UnderwaterTunnel, TILESET_CAVE, INDOOR, LANDMARK_UNDERWATER_TUNNEL, MUSIC_DARK_CAVE, TRUE, PALETTE_DAY, FISHGROUP_OCEAN + map BillsGarden, TILESET_CAVE, ROUTE, LANDMARK_BILLS_GARDEN, MUSIC_ROUTE_26, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN ; will have own fishgroup soontm assert_table_length NUM_CERULEAN_MAPS MapGroup_Azalea: @@ -364,6 +379,8 @@ MapGroup_FastShip: map MountMoonSquare, TILESET_KANTO, ROUTE, LANDMARK_MT_MOON, MUSIC_MT_MOON_SQUARE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE map MountMoonGiftShop, TILESET_TRADITIONAL_HOUSE, INDOOR, LANDMARK_MT_MOON, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map TinTowerRoof, TILESET_TOWER, ROUTE, LANDMARK_TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map MtMoonCrater, TILESET_CAVE, INDOOR, LANDMARK_MT_MOON_CRATER, MUSIC_MT_MOON, TRUE, PALETTE_AUTO, FISHGROUP_OCEAN ; fishgroup prolly custom + map MtMoonCraterDepths, TILESET_CAVE, INDOOR, LANDMARK_MT_MOON_CRATER, MUSIC_MT_MOON, TRUE, PALETTE_AUTO, FISHGROUP_OCEAN ; fishgroup prolly custom assert_table_length NUM_FAST_SHIP_MAPS MapGroup_Indigo: @@ -411,6 +428,7 @@ MapGroup_Lavender: map LavRadioTower1F, TILESET_RADIO_TOWER, INDOOR, LANDMARK_LAV_RADIO_TOWER, MUSIC_LAVENDER_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE map Route8SaffronGate, TILESET_GATE, GATE, LANDMARK_ROUTE_8, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE map Route12SuperRodHouse, TILESET_HOUSE, INDOOR, LANDMARK_ROUTE_12, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map LavenderCrypt, TILESET_CAVE, INDOOR, LANDMARK_LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, TRUE, PALETTE_DAY, FISHGROUP_NONE assert_table_length NUM_LAVENDER_MAPS MapGroup_Silver: @@ -461,6 +479,8 @@ MapGroup_Celadon: map Route16Gate, TILESET_GATE, GATE, LANDMARK_ROUTE_16, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE map Route7SaffronGate, TILESET_GATE, GATE, LANDMARK_ROUTE_7, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE map Route17Route18Gate, TILESET_GATE, GATE, LANDMARK_ROUTE_17, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map CeladonUniversityOutside, TILESET_CAVE, TOWN, LANDMARK_CELADON_UNIVERSITY, MUSIC_CELADON_CITY, FALSE, PALETTE_AUTO, FISHGROUP_NONE ; prolly has one + map CeladonUniversityInside, TILESET_CAVE, TOWN, LANDMARK_CELADON_UNIVERSITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_NONE assert_table_length NUM_CELADON_MAPS MapGroup_Cianwood: @@ -481,7 +501,13 @@ MapGroup_Cianwood: map BattleTowerHallway, TILESET_BATTLE_TOWER_INSIDE, INDOOR, LANDMARK_BATTLE_TOWER, MUSIC_BATTLE_TOWER_THEME, TRUE, PALETTE_DAY, FISHGROUP_SHORE map Route40BattleTowerGate, TILESET_GATE, GATE, LANDMARK_BATTLE_TOWER, MUSIC_ROUTE_36, FALSE, PALETTE_DAY, FISHGROUP_SHORE map BattleTowerOutside, TILESET_BATTLE_TOWER_OUTSIDE, ROUTE, LANDMARK_BATTLE_TOWER, MUSIC_BATTLE_TOWER_THEME, FALSE, PALETTE_AUTO, FISHGROUP_SHORE - map CliffCave, TILESET_CAVE, CAVE, LANDMARK_CIANWOOD_CITY, MUSIC_UNION_CAVE, TRUE, PALETTE_NITE, FISHGROUP_SHORE + map Route47, TILESET_JOHTO, ROUTE, LANDMARK_ROUTE_47, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN + map CliffCave, TILESET_CAVE, CAVE, LANDMARK_ROUTE_47, MUSIC_UNION_CAVE, TRUE, PALETTE_NITE, FISHGROUP_SHORE + map CliffEdgeGate, TILESET_CAVE, CAVE, LANDMARK_ROUTE_47, MUSIC_UNION_CAVE, TRUE, PALETTE_NITE, FISHGROUP_SHORE + map Route48, TILESET_JOHTO, ROUTE, LANDMARK_ROUTE_48, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN + map EmbeddedTower, TILESET_CAVE, CAVE, LANDMARK_ROUTE_48, MUSIC_UNION_CAVE, TRUE, PALETTE_NITE, FISHGROUP_SHORE + map JohtoSafariZoneGate, TILESET_GATE, GATE, LANDMARK_JOHTO_SAFARI_ZONE, MUSIC_ROUTE_36, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map JohtoSafariZone, TILESET_JOHTO, ROUTE, LANDMARK_JOHTO_SAFARI_ZONE, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN ; Extremely temporary! assert_table_length NUM_CIANWOOD_MAPS MapGroup_Viridian: @@ -499,9 +525,9 @@ MapGroup_Viridian: map Route2NuggetHouse, TILESET_HOUSE, INDOOR, LANDMARK_ROUTE_2, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map Route2Gate, TILESET_GATE, GATE, LANDMARK_ROUTE_2, MUSIC_ROUTE_2, FALSE, PALETTE_DAY, FISHGROUP_SHORE map VictoryRoadGate, TILESET_GATE, GATE, LANDMARK_ROUTE_26, MUSIC_INDIGO_PLATEAU, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map ViridianForest, TILESET_FOREST_KANTO, CAVE, LANDMARK_VIRIDIAN_FOREST, MUSIC_ROUTE_2, FALSE, PALETTE_AUTO, FISHGROUP_SHORE ; MUSIC_ROUTE_2 is the viridian forest remix - map ViridianForestViridianGate, TILESET_GATE, GATE, LANDMARK_ROUTE_2, MUSIC_ROUTE_2, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map ViridianForestPewterGate, TILESET_GATE, GATE, LANDMARK_ROUTE_2, MUSIC_ROUTE_2, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map ViridianForest, TILESET_FOREST_KANTO, CAVE, LANDMARK_VIRIDIAN_FOREST, MUSIC_ROUTE_2, FALSE, PALETTE_AUTO, FISHGROUP_SHORE ; MUSIC_ROUTE_2 is the viridian forest remix + map ViridianForestViridianGate, TILESET_GATE, GATE, LANDMARK_ROUTE_2, MUSIC_ROUTE_2, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map ViridianForestPewterGate, TILESET_GATE, GATE, LANDMARK_ROUTE_2, MUSIC_ROUTE_2, FALSE, PALETTE_DAY, FISHGROUP_SHORE assert_table_length NUM_VIRIDIAN_MAPS MapGroup_NewBark: @@ -555,6 +581,96 @@ MapGroup_Cherrygrove: map Route31VioletGate, TILESET_GATE, GATE, LANDMARK_ROUTE_31, MUSIC_ROUTE_30, FALSE, PALETTE_DAY, FISHGROUP_SHORE assert_table_length NUM_CHERRYGROVE_MAPS +; Sevii Sizzle Reel +; Music and fishgroups are almost definitely incorrect for 90% of things, I just do not care enough to get it right. +; At the time of writing (11 PM Paris time 9/7/24) my main aim is to make the ROM build, proving the map stuff is even possible as-is. +; If you expect me to give a fuck about the Sevii Islands for more than an hour, you have another thing coming. +; Eyes on the prize here, JEPpers. +; ~ Plague von Karma on 3 glasses of coke +MapGroup_Citrine: ; 27 + table_width MAP_LENGTH, MapGroup_Citrine + map CitrineCity, TILESET_CAVE, TOWN, LANDMARK_CITRINE_CITY, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map BrunswickTrail, TILESET_CAVE, ROUTE, LANDMARK_BRUNSWICK_TRAIL, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map BrunswickGlade, TILESET_CAVE, CAVE, LANDMARK_BRUNSWICK_TRAIL, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_AUTO, FISHGROUP_SHORE + map BrunswickGrotto, TILESET_CAVE, CAVE, LANDMARK_BRUNSWICK_GROTTO, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_AUTO, FISHGROUP_SHORE + map GarnetCavern1F, TILESET_CAVE, CAVE, LANDMARK_GARNET_CAVERN, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map GarnetCavern2F, TILESET_CAVE, CAVE, LANDMARK_GARNET_CAVERN, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map GarnetCavernB1F, TILESET_CAVE, CAVE, LANDMARK_GARNET_CAVERN, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map CelesteHill, TILESET_CAVE, CAVE, LANDMARK_CELESTE_HILL, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map CelesteHillCave, TILESET_CAVE, CAVE, LANDMARK_CELESTE_HILL_CAVE, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE + assert_table_length NUM_CITRINE_MAPS + +MapGroup_OneIsland: ; 28 + table_width MAP_LENGTH, MapGroup_OneIsland + map FarawayIslandOutside, TILESET_CAVE, ROUTE, LANDMARK_ONE_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map FarawayIslandInside, TILESET_CAVE, CAVE, LANDMARK_ONE_ISLAND, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_AUTO, FISHGROUP_SHORE + map OneIsland, TILESET_CAVE, TOWN, LANDMARK_ONE_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map TreasureBeach, TILESET_CAVE, ROUTE, LANDMARK_ONE_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map KindleRoad, TILESET_CAVE, ROUTE, LANDMARK_ONE_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map MtEmberExterior, TILESET_CAVE, CAVE, LANDMARK_ONE_ISLAND, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_AUTO, FISHGROUP_SHORE + map MtEmberInterior, TILESET_CAVE, CAVE, LANDMARK_ONE_ISLAND, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map MtEmberSummit, TILESET_CAVE, CAVE, LANDMARK_ONE_ISLAND, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_AUTO, FISHGROUP_SHORE + map MtEmberHiddenPath, TILESET_CAVE, CAVE, LANDMARK_ONE_ISLAND, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE + assert_table_length NUM_ONE_ISLAND_MAPS + +MapGroup_TwoIsland: ; 29 + table_width MAP_LENGTH, MapGroup_TwoIsland + map TwoIsland, TILESET_CAVE, TOWN, LANDMARK_TWO_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map CapeBrink, TILESET_CAVE, ROUTE, LANDMARK_TWO_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + assert_table_length NUM_TWO_ISLAND_MAPS + +MapGroup_ThreeIsland: ; 30 + table_width MAP_LENGTH, MapGroup_ThreeIsland + map ThreeIslandPort, TILESET_GATE, GATE, LANDMARK_THREE_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map ThreeIsland, TILESET_CAVE, TOWN, LANDMARK_THREE_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map BondBridge, TILESET_CAVE, ROUTE, LANDMARK_THREE_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map BerryForest, TILESET_CAVE, CAVE, LANDMARK_THREE_ISLAND, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_AUTO, FISHGROUP_SHORE + assert_table_length NUM_THREE_ISLAND_MAPS + +MapGroup_FourIsland: ; 31 + table_width MAP_LENGTH, MapGroup_FourIsland + map FourIsland, TILESET_CAVE, TOWN, LANDMARK_FOUR_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map IcefallCaveEntrance, TILESET_CAVE, CAVE, LANDMARK_FOUR_ISLAND, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map IcefallCave1F, TILESET_CAVE, CAVE, LANDMARK_FOUR_ISLAND, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map IcefallCaveB1F, TILESET_CAVE, CAVE, LANDMARK_FOUR_ISLAND, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map IcefallCaveBack, TILESET_CAVE, CAVE, LANDMARK_FOUR_ISLAND, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE + assert_table_length NUM_FOUR_ISLAND_MAPS + +MapGroup_FiveIsland: ; 32 + table_width MAP_LENGTH, MapGroup_FiveIsland + map FiveIsland, TILESET_CAVE, TOWN, LANDMARK_FIVE_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map FiveIslandMeadow, TILESET_CAVE, ROUTE, LANDMARK_FIVE_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map MemorialPillar, TILESET_CAVE, ROUTE, LANDMARK_FIVE_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map WaterLabyrinth, TILESET_CAVE, ROUTE, LANDMARK_FIVE_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map ResortGorgeous, TILESET_CAVE, ROUTE, LANDMARK_FIVE_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map LostCave, TILESET_CAVE, CAVE, LANDMARK_FIVE_ISLAND, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE + assert_table_length NUM_FIVE_ISLAND_MAPS + +MapGroup_SixIsland: ; 33 + table_width MAP_LENGTH, MapGroup_SixIsland + map SixIsland, TILESET_CAVE, TOWN, LANDMARK_SIX_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map WaterPath, TILESET_CAVE, ROUTE, LANDMARK_SIX_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map RuinValley, TILESET_CAVE, ROUTE, LANDMARK_SIX_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map DottedHole, TILESET_CAVE, CAVE, LANDMARK_SIX_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map GreenPath, TILESET_CAVE, ROUTE, LANDMARK_SIX_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map PatternBush, TILESET_CAVE, CAVE, LANDMARK_SIX_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map OutcastIsland, TILESET_CAVE, ROUTE, LANDMARK_SIX_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map AlteringCave, TILESET_CAVE, CAVE, LANDMARK_FIVE_ISLAND, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE + assert_table_length NUM_SIX_ISLAND_MAPS + +MapGroup_SevenIsland: ; 34 + table_width MAP_LENGTH, MapGroup_SevenIsland + map SevenIsland, TILESET_CAVE, TOWN, LANDMARK_SEVEN_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map CanyonEntrance, TILESET_CAVE, ROUTE, LANDMARK_SIX_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map SevaultCanyon, TILESET_CAVE, ROUTE, LANDMARK_SIX_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map TanobyRuins, TILESET_CAVE, ROUTE, LANDMARK_SIX_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map TanobyChambers, TILESET_CAVE, CAVE, LANDMARK_SIX_ISLAND, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map NavalRockExterior, TILESET_CAVE, CAVE, LANDMARK_SIX_ISLAND, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map NavalRock1F, TILESET_CAVE, CAVE, LANDMARK_SIX_ISLAND, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map NavalRock2F, TILESET_CAVE, CAVE, LANDMARK_SIX_ISLAND, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map NavalRockB1F, TILESET_CAVE, CAVE, LANDMARK_SIX_ISLAND, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE + assert_table_length NUM_SEVEN_ISLAND_MAPS + MapGroup_SilentHills: table_width MAP_LENGTH, MapGroup_SilentHills map SilentHills, TILESET_NIHON_01, TOWN, LANDMARK_SILENT_HILLS, MUSIC_NIHON_TOWN_01, TRUE, PALETTE_AUTO, FISHGROUP_SHORE @@ -566,6 +682,8 @@ MapGroup_SilentHills: map SilversHouse, TILESET_PLAYERS_HOUSE, INDOOR, LANDMARK_SILENT_HILLS, MUSIC_NIHON_TOWN_01, FALSE, PALETTE_DAY, FISHGROUP_SHORE map CalsHouse1F, TILESET_PLAYERS_HOUSE, INDOOR, LANDMARK_SILENT_HILLS, MUSIC_NIHON_TOWN_01, FALSE, PALETTE_DAY, FISHGROUP_SHORE map CalsHouse2F, TILESET_PLAYERS_HOUSE, INDOOR, LANDMARK_SILENT_HILLS, MUSIC_NIHON_TOWN_01, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map SinjohRuinsExterior, TILESET_CAVE, CAVE, LANDMARK_SILENT_HILLS, MUSIC_SINJOH_RUINS, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map SinjohRuinsInterior, TILESET_CAVE, CAVE, LANDMARK_SILENT_HILLS, MUSIC_SINJOH_RUINS, TRUE, PALETTE_DAY, FISHGROUP_SHORE assert_table_length NUM_SILENT_HILLS_MAPS MapGroup_BlueForest: diff --git a/data/maps/outdoor_sprites.asm b/data/maps/outdoor_sprites.asm index 74cce4e..89e910b 100644 --- a/data/maps/outdoor_sprites.asm +++ b/data/maps/outdoor_sprites.asm @@ -30,10 +30,28 @@ OutdoorSprites: dw NewBarkGroupSprites dw SaffronGroupSprites dw CherrygroveGroupSprites + dw CitrineGroupSprites + dw OneIslandGroupSprites + dw TwoIslandGroupSprites + dw ThreeIslandGroupSprites + dw FourIslandGroupSprites + dw FiveIslandGroupSprites + dw SixIslandGroupSprites + dw SevenIslandGroupSprites dw SilentHillsGroupSprites dw BlueForestGroupSprites assert_table_length NUM_MAP_GROUPS +; Since these areas aren't done yet, their outdoor sprites will just use Pallet's. +; Change as apt later. Right now, it's a space-saver. +CitrineGroupSprites: +OneIslandGroupSprites: +TwoIslandGroupSprites: +ThreeIslandGroupSprites: +FourIslandGroupSprites: +FiveIslandGroupSprites: +SixIslandGroupSprites: +SevenIslandGroupSprites: PalletGroupSprites: db SPRITE_SUICUNE db SPRITE_SILVER_TROPHY diff --git a/data/maps/roofs.asm b/data/maps/roofs.asm index 569e251..bd021b3 100644 --- a/data/maps/roofs.asm +++ b/data/maps/roofs.asm @@ -38,8 +38,16 @@ MapGroupRoofs: db ROOF_NEW_BARK ; 24 (New Bark) db -1 ; 25 db ROOF_NEW_BARK ; 26 (Cherrygrove) - db ROOF_NEW_BARK ; 27 (Silent Hills) - db ROOF_NEW_BARK ; 28 (Blue Forest) + db ROOF_GOLDENROD ; 27 (Citrine) + db ROOF_NEW_BARK ; 28 (One Island) + db ROOF_VIOLET ; 29 (Two Island) + db ROOF_VIOLET ; 30 (Three Island) + db ROOF_VIOLET ; 31 (Four Island) + db ROOF_VIOLET ; 32 (Five Island) + db ROOF_VIOLET ; 33 (Six Island) + db ROOF_VIOLET ; 34 (Seven Island) + db ROOF_NEW_BARK ; 35 (Silent Hills) + db ROOF_NEW_BARK ; 36 (Blue Forest) assert_table_length NUM_MAP_GROUPS + 1 Roofs: diff --git a/data/maps/scripts.asm b/data/maps/scripts.asm index f97b9c3..64813c6 100644 --- a/data/maps/scripts.asm +++ b/data/maps/scripts.asm @@ -513,3 +513,75 @@ INCLUDE "maps/NihonPokecenter2F.asm" INCLUDE "maps/KantoPokecenter2F.asm" INCLUDE "maps/CalsHouse1F.asm" INCLUDE "maps/CalsHouse2F.asm" +INCLUDE "maps/CliffEdgeGate.asm" +INCLUDE "maps/EmbeddedTower.asm" +INCLUDE "maps/Route48.asm" +INCLUDE "maps/JohtoSafariZoneGate.asm" +INCLUDE "maps/JohtoSafariZone.asm" +INCLUDE "maps/LavenderCrypt.asm" +INCLUDE "maps/UnderwaterTunnel.asm" +INCLUDE "maps/BillsGarden.asm" +INCLUDE "maps/CeladonUniversityOutside.asm" +INCLUDE "maps/CeladonUniversityInside.asm" +INCLUDE "maps/MtMoonCrater.asm" +INCLUDE "maps/MtMoonCraterDepths.asm" +INCLUDE "maps/SeafoamIslands1F.asm" +INCLUDE "maps/SeafoamIslandsB1F.asm" +INCLUDE "maps/SeafoamIslandsB2F.asm" +INCLUDE "maps/SeafoamIslandsB3F.asm" +INCLUDE "maps/SeafoamIslandsB4F.asm" +INCLUDE "maps/FarawayIslandOutside.asm" +INCLUDE "maps/FarawayIslandInside.asm" +INCLUDE "maps/OneIsland.asm" +INCLUDE "maps/TreasureBeach.asm" +INCLUDE "maps/KindleRoad.asm" +INCLUDE "maps/MtEmberExterior.asm" +INCLUDE "maps/MtEmberInterior.asm" +INCLUDE "maps/MtEmberSummit.asm" +INCLUDE "maps/MtEmberHiddenPath.asm" +INCLUDE "maps/TwoIsland.asm" +INCLUDE "maps/CapeBrink.asm" +INCLUDE "maps/Route47.asm" +INCLUDE "maps/ThreeIsland.asm" +INCLUDE "maps/BondBridge.asm" +INCLUDE "maps/BerryForest.asm" +INCLUDE "maps/FourIsland.asm" +INCLUDE "maps/IcefallCaveEntrance.asm" +INCLUDE "maps/IcefallCave1F.asm" +INCLUDE "maps/IcefallCaveB1F.asm" +INCLUDE "maps/IcefallCaveBack.asm" +INCLUDE "maps/FiveIsland.asm" +INCLUDE "maps/FiveIslandMeadow.asm" +INCLUDE "maps/MemorialPillar.asm" +INCLUDE "maps/WaterLabyrinth.asm" +INCLUDE "maps/ResortGorgeous.asm" +INCLUDE "maps/LostCave.asm" +INCLUDE "maps/SixIsland.asm" +INCLUDE "maps/WaterPath.asm" +INCLUDE "maps/RuinValley.asm" +INCLUDE "maps/DottedHole.asm" +INCLUDE "maps/GreenPath.asm" +INCLUDE "maps/PatternBush.asm" +INCLUDE "maps/OutcastIsland.asm" +INCLUDE "maps/SevenIsland.asm" +INCLUDE "maps/CanyonEntrance.asm" +INCLUDE "maps/SevaultCanyon.asm" +INCLUDE "maps/TanobyRuins.asm" +INCLUDE "maps/TanobyChambers.asm" +INCLUDE "maps/NavalRockExterior.asm" +INCLUDE "maps/NavalRock1F.asm" +INCLUDE "maps/NavalRockB1F.asm" +INCLUDE "maps/NavalRock2F.asm" +INCLUDE "maps/CitrineCity.asm" +INCLUDE "maps/BrunswickTrail.asm" +INCLUDE "maps/BrunswickGrotto.asm" +INCLUDE "maps/BrunswickGlade.asm" +INCLUDE "maps/GarnetCavern1F.asm" +INCLUDE "maps/GarnetCavernB1F.asm" +INCLUDE "maps/GarnetCavern2F.asm" +INCLUDE "maps/CelesteHill.asm" +INCLUDE "maps/CelesteHillCave.asm" +INCLUDE "maps/ThreeIslandPort.asm" +INCLUDE "maps/AlteringCave.asm" +INCLUDE "maps/SinjohRuinsExterior.asm" +INCLUDE "maps/SinjohRuinsInterior.asm" diff --git a/data/maps/sgb_roof_pal_inds.asm b/data/maps/sgb_roof_pal_inds.asm index 78ebbca..7ba9ae0 100644 --- a/data/maps/sgb_roof_pal_inds.asm +++ b/data/maps/sgb_roof_pal_inds.asm @@ -30,6 +30,14 @@ MapGroupRoofSGBPalInds: db PREDEFPAL_NEW_BARK db PREDEFPAL_SAFFRON db PREDEFPAL_CHERRYGROVE + db PREDEFPAL_CITRINE + db PREDEFPAL_ONE_ISLAND + db PREDEFPAL_TWO_ISLAND + db PREDEFPAL_THREE_ISLAND + db PREDEFPAL_FOUR_ISLAND + db PREDEFPAL_FIVE_ISLAND + db PREDEFPAL_SIX_ISLAND + db PREDEFPAL_SEVEN_ISLAND db PREDEFPAL_SILENT_HILLS db PREDEFPAL_BLUE_FOREST assert_table_length NUM_MAP_GROUPS + 1 diff --git a/gfx/sgb/predef.pal b/gfx/sgb/predef.pal index 05dd7a3..152047f 100644 --- a/gfx/sgb/predef.pal +++ b/gfx/sgb/predef.pal @@ -24,6 +24,14 @@ RGB 31,31,31, 26,26,26, 15,20,31, 00,00,00 ; PREDEFPAL_SILVER_CAVE RGB 31,31,31, 21,14,09, 15,20,20, 00,00,00 ; PREDEFPAL_DUNGEONS RGB 31,31,31, 12,28,22, 15,20,20, 00,00,00 ; PREDEFPAL_SILENT_HILLS + RGB 31,31,31, 29,26,18, 15,20,31, 00,00,00 ; PREDEFPAL_CITRINE (temp) + RGB 31,31,31, 29,26,18, 15,20,31, 00,00,00 ; PREDEFPAL_ONE_ISLAND (temp) + RGB 31,31,31, 29,26,18, 15,20,31, 00,00,00 ; PREDEFPAL_TWO_ISLAND (temp) + RGB 31,31,31, 29,26,18, 15,20,31, 00,00,00 ; PREDEFPAL_THREE_ISLAND (temp) + RGB 31,31,31, 29,26,18, 15,20,31, 00,00,00 ; PREDEFPAL_FOUR_ISLAND (temp) + RGB 31,31,31, 29,26,18, 15,20,31, 00,00,00 ; PREDEFPAL_FIVE_ISLAND (temp) + RGB 31,31,31, 29,26,18, 15,20,31, 00,00,00 ; PREDEFPAL_SIX_ISLAND (temp) + RGB 31,31,31, 29,26,18, 15,20,31, 00,00,00 ; PREDEFPAL_SEVEN_ISLAND (temp) RGB 31,31,31, 18,14,31, 15,20,20, 00,00,00 ; PREDEFPAL_BLUE_FOREST RGB 31,31,31, 12,28,22, 15,20,20, 00,00,00 ; PREDEFPAL_NITE RGB 31,31,31, 07,07,07, 02,03,03, 00,00,00 ; PREDEFPAL_BLACKOUT diff --git a/gfx/tilesets/roofs.pal b/gfx/tilesets/roofs.pal index c101bc8..5a14e7a 100644 --- a/gfx/tilesets/roofs.pal +++ b/gfx/tilesets/roofs.pal @@ -106,6 +106,31 @@ RGB 31,14,28, 31,05,21 ; morn/day RGB 14,07,17, 13,00,08 ; nite +; These're all temporary shush + RGB 31,31,31, 29,26,18 + RGB 15,20,31, 00,00,00 ; PREDEFPAL_CITRINE (temp) + + RGB 31,31,31, 29,26,18 + RGB 15,20,31, 00,00,00 ; PREDEFPAL_ONE_ISLAND (temp) + + RGB 31,31,31, 29,26,18 + RGB 15,20,31, 00,00,00 ; PREDEFPAL_TWO_ISLAND (temp) + + RGB 31,31,31, 29,26,18 + RGB 15,20,31, 00,00,00 ; PREDEFPAL_THREE_ISLAND (temp) + + RGB 31,31,31, 29,26,18 + RGB 15,20,31, 00,00,00 ; PREDEFPAL_FOUR_ISLAND (temp) + + RGB 31,31,31, 29,26,18 + RGB 15,20,31, 00,00,00 ; PREDEFPAL_FIVE_ISLAND (temp) + + RGB 31,31,31, 29,26,18 + RGB 15,20,31, 00,00,00 ; PREDEFPAL_SIX_ISLAND (temp) + + RGB 31,31,31, 29,26,18 + RGB 15,20,31, 00,00,00 ; PREDEFPAL_SEVEN_ISLAND (temp) + ; group 27 (Silent Hills) RGB 09,31,23, 10,22,22 ; morn/day RGB 03,15,17, 02,10,15 ; nite diff --git a/maps/#Placeholder.ablk b/maps/#Placeholder.ablk new file mode 100644 index 0000000000000000000000000000000000000000..eeb576070df6ab6d3f9dfdf278414e6c3f3ca6b7 GIT binary patch literal 100 LcmZQzpgjNp0Av6G literal 0 HcmV?d00001 diff --git a/maps/AlteringCave.ablk b/maps/AlteringCave.ablk new file mode 100644 index 0000000000000000000000000000000000000000..eeb576070df6ab6d3f9dfdf278414e6c3f3ca6b7 GIT binary patch literal 100 LcmZQzpgjNp0Av6G literal 0 HcmV?d00001 diff --git a/maps/AlteringCave.asm b/maps/AlteringCave.asm new file mode 100644 index 0000000..bc6a99f --- /dev/null +++ b/maps/AlteringCave.asm @@ -0,0 +1,17 @@ + object_const_def + +AlteringCave_MapScripts: + def_scene_scripts + + def_callbacks + +AlteringCave_MapEvents: + db 0, 0 ; filler + + def_warp_events + + def_coord_events + + def_bg_events + + def_object_events \ No newline at end of file diff --git a/maps/BerryForest.ablk b/maps/BerryForest.ablk new file mode 100644 index 0000000000000000000000000000000000000000..eeb576070df6ab6d3f9dfdf278414e6c3f3ca6b7 GIT binary patch literal 100 LcmZQzpgjNp0Av6G literal 0 HcmV?d00001 diff --git a/maps/BerryForest.asm b/maps/BerryForest.asm new file mode 100644 index 0000000..3c8a42b --- /dev/null +++ b/maps/BerryForest.asm @@ -0,0 +1,17 @@ + object_const_def + +BerryForest_MapScripts: + def_scene_scripts + + def_callbacks + +BerryForest_MapEvents: + db 0, 0 ; filler + + def_warp_events + + def_coord_events + + def_bg_events + + def_object_events \ No newline at end of file diff --git a/maps/BillsGarden.ablk b/maps/BillsGarden.ablk new file mode 100644 index 0000000000000000000000000000000000000000..eeb576070df6ab6d3f9dfdf278414e6c3f3ca6b7 GIT binary patch literal 100 LcmZQzpgjNp0Av6G literal 0 HcmV?d00001 diff --git a/maps/BillsGarden.asm b/maps/BillsGarden.asm new file mode 100644 index 0000000..93348f3 --- /dev/null +++ b/maps/BillsGarden.asm @@ -0,0 +1,17 @@ + object_const_def + +BillsGarden_MapScripts: + def_scene_scripts + + def_callbacks + +BillsGarden_MapEvents: + db 0, 0 ; filler + + def_warp_events + + def_coord_events + + def_bg_events + + def_object_events \ No newline at end of file diff --git a/maps/BondBridge.ablk b/maps/BondBridge.ablk new file mode 100644 index 0000000000000000000000000000000000000000..eeb576070df6ab6d3f9dfdf278414e6c3f3ca6b7 GIT binary patch literal 100 LcmZQzpgjNp0Av6G literal 0 HcmV?d00001 diff --git a/maps/BondBridge.asm b/maps/BondBridge.asm new file mode 100644 index 0000000..fe7e227 --- /dev/null +++ b/maps/BondBridge.asm @@ -0,0 +1,17 @@ + object_const_def + +BondBridge_MapScripts: + def_scene_scripts + + def_callbacks + +BondBridge_MapEvents: + db 0, 0 ; filler + + def_warp_events + + def_coord_events + + def_bg_events + + def_object_events \ No newline at end of file diff --git a/maps/BrunswickGlade.ablk b/maps/BrunswickGlade.ablk new file mode 100644 index 0000000000000000000000000000000000000000..eeb576070df6ab6d3f9dfdf278414e6c3f3ca6b7 GIT binary patch literal 100 LcmZQzpgjNp0Av6G literal 0 HcmV?d00001 diff --git a/maps/BrunswickGlade.asm b/maps/BrunswickGlade.asm new file mode 100644 index 0000000..70489e0 --- /dev/null +++ b/maps/BrunswickGlade.asm @@ -0,0 +1,17 @@ + object_const_def + +BrunswickGlade_MapScripts: + def_scene_scripts + + def_callbacks + +BrunswickGlade_MapEvents: + db 0, 0 ; filler + + def_warp_events + + def_coord_events + + def_bg_events + + def_object_events \ No newline at end of file diff --git a/maps/BrunswickGrotto.ablk b/maps/BrunswickGrotto.ablk new file mode 100644 index 0000000000000000000000000000000000000000..eeb576070df6ab6d3f9dfdf278414e6c3f3ca6b7 GIT binary patch literal 100 LcmZQzpgjNp0Av6G literal 0 HcmV?d00001 diff --git a/maps/BrunswickGrotto.asm b/maps/BrunswickGrotto.asm new file mode 100644 index 0000000..f46a48a --- /dev/null +++ b/maps/BrunswickGrotto.asm @@ -0,0 +1,17 @@ + object_const_def + +BrunswickGrotto_MapScripts: + def_scene_scripts + + def_callbacks + +BrunswickGrotto_MapEvents: + db 0, 0 ; filler + + def_warp_events + + def_coord_events + + def_bg_events + + def_object_events \ No newline at end of file diff --git a/maps/BrunswickTrail.ablk b/maps/BrunswickTrail.ablk new file mode 100644 index 0000000000000000000000000000000000000000..eeb576070df6ab6d3f9dfdf278414e6c3f3ca6b7 GIT binary patch literal 100 LcmZQzpgjNp0Av6G literal 0 HcmV?d00001 diff --git a/maps/BrunswickTrail.asm b/maps/BrunswickTrail.asm new file mode 100644 index 0000000..474d909 --- /dev/null +++ b/maps/BrunswickTrail.asm @@ -0,0 +1,17 @@ + object_const_def + +BrunswickTrail_MapScripts: + def_scene_scripts + + def_callbacks + +BrunswickTrail_MapEvents: + db 0, 0 ; filler + + def_warp_events + + def_coord_events + + def_bg_events + + def_object_events \ No newline at end of file diff --git a/maps/CanyonEntrance.ablk b/maps/CanyonEntrance.ablk new file mode 100644 index 0000000000000000000000000000000000000000..eeb576070df6ab6d3f9dfdf278414e6c3f3ca6b7 GIT binary patch literal 100 LcmZQzpgjNp0Av6G literal 0 HcmV?d00001 diff --git a/maps/CanyonEntrance.asm b/maps/CanyonEntrance.asm new file mode 100644 index 0000000..f6bc2ca --- /dev/null +++ b/maps/CanyonEntrance.asm @@ -0,0 +1,17 @@ + object_const_def + +CanyonEntrance_MapScripts: + def_scene_scripts + + def_callbacks + +CanyonEntrance_MapEvents: + db 0, 0 ; filler + + def_warp_events + + def_coord_events + + def_bg_events + + def_object_events \ No newline at end of file diff --git a/maps/CapeBrink.ablk b/maps/CapeBrink.ablk new file mode 100644 index 0000000000000000000000000000000000000000..eeb576070df6ab6d3f9dfdf278414e6c3f3ca6b7 GIT binary patch literal 100 LcmZQzpgjNp0Av6G literal 0 HcmV?d00001 diff --git a/maps/CapeBrink.asm b/maps/CapeBrink.asm new file mode 100644 index 0000000..f20a37f --- /dev/null +++ b/maps/CapeBrink.asm @@ -0,0 +1,17 @@ + object_const_def + +CapeBrink_MapScripts: + def_scene_scripts + + def_callbacks + +CapeBrink_MapEvents: + db 0, 0 ; filler + + def_warp_events + + def_coord_events + + def_bg_events + + def_object_events \ No newline at end of file diff --git a/maps/CeladonUniversityInside.ablk b/maps/CeladonUniversityInside.ablk new file mode 100644 index 0000000000000000000000000000000000000000..eeb576070df6ab6d3f9dfdf278414e6c3f3ca6b7 GIT binary patch literal 100 LcmZQzpgjNp0Av6G literal 0 HcmV?d00001 diff --git a/maps/CeladonUniversityInside.asm b/maps/CeladonUniversityInside.asm new file mode 100644 index 0000000..c7dc316 --- /dev/null +++ b/maps/CeladonUniversityInside.asm @@ -0,0 +1,17 @@ + object_const_def + +CeladonUniversityInside_MapScripts: + def_scene_scripts + + def_callbacks + +CeladonUniversityInside_MapEvents: + db 0, 0 ; filler + + def_warp_events + + def_coord_events + + def_bg_events + + def_object_events \ No newline at end of file diff --git a/maps/CeladonUniversityOutside.ablk b/maps/CeladonUniversityOutside.ablk new file mode 100644 index 0000000000000000000000000000000000000000..eeb576070df6ab6d3f9dfdf278414e6c3f3ca6b7 GIT binary patch literal 100 LcmZQzpgjNp0Av6G literal 0 HcmV?d00001 diff --git a/maps/CeladonUniversityOutside.asm b/maps/CeladonUniversityOutside.asm new file mode 100644 index 0000000..87ad836 --- /dev/null +++ b/maps/CeladonUniversityOutside.asm @@ -0,0 +1,17 @@ + object_const_def + +CeladonUniversityOutside_MapScripts: + def_scene_scripts + + def_callbacks + +CeladonUniversityOutside_MapEvents: + db 0, 0 ; filler + + def_warp_events + + def_coord_events + + def_bg_events + + def_object_events \ No newline at end of file diff --git a/maps/CelesteHill.ablk b/maps/CelesteHill.ablk new file mode 100644 index 0000000000000000000000000000000000000000..eeb576070df6ab6d3f9dfdf278414e6c3f3ca6b7 GIT binary patch literal 100 LcmZQzpgjNp0Av6G literal 0 HcmV?d00001 diff --git a/maps/CelesteHill.asm b/maps/CelesteHill.asm new file mode 100644 index 0000000..6c5da87 --- /dev/null +++ b/maps/CelesteHill.asm @@ -0,0 +1,17 @@ + object_const_def + +CelesteHill_MapScripts: + def_scene_scripts + + def_callbacks + +CelesteHill_MapEvents: + db 0, 0 ; filler + + def_warp_events + + def_coord_events + + def_bg_events + + def_object_events \ No newline at end of file diff --git a/maps/CelesteHillCave.ablk b/maps/CelesteHillCave.ablk new file mode 100644 index 0000000000000000000000000000000000000000..eeb576070df6ab6d3f9dfdf278414e6c3f3ca6b7 GIT binary patch literal 100 LcmZQzpgjNp0Av6G literal 0 HcmV?d00001 diff --git a/maps/CelesteHillCave.asm b/maps/CelesteHillCave.asm new file mode 100644 index 0000000..5e215e7 --- /dev/null +++ b/maps/CelesteHillCave.asm @@ -0,0 +1,17 @@ + object_const_def + +CelesteHillCave_MapScripts: + def_scene_scripts + + def_callbacks + +CelesteHillCave_MapEvents: + db 0, 0 ; filler + + def_warp_events + + def_coord_events + + def_bg_events + + def_object_events \ No newline at end of file diff --git a/maps/CitrineCity.ablk b/maps/CitrineCity.ablk new file mode 100644 index 0000000000000000000000000000000000000000..eeb576070df6ab6d3f9dfdf278414e6c3f3ca6b7 GIT binary patch literal 100 LcmZQzpgjNp0Av6G literal 0 HcmV?d00001 diff --git a/maps/CitrineCity.asm b/maps/CitrineCity.asm new file mode 100644 index 0000000..3e528e9 --- /dev/null +++ b/maps/CitrineCity.asm @@ -0,0 +1,17 @@ + object_const_def + +CitrineCity_MapScripts: + def_scene_scripts + + def_callbacks + +CitrineCity_MapEvents: + db 0, 0 ; filler + + def_warp_events + + def_coord_events + + def_bg_events + + def_object_events \ No newline at end of file diff --git a/maps/CliffCave.asm b/maps/CliffCave.asm index 13edc43..537c84e 100644 --- a/maps/CliffCave.asm +++ b/maps/CliffCave.asm @@ -21,8 +21,15 @@ CliffCaveMan: end CliffCaveManText: - text "Comment to be" - line "written." + text "I remember a" + line "friend talking" + cont "about a strange" + cont "#MON in UNION" + cont "CAVE." + + para "It was red, and" + line "bobbed a flaming" + cont "rock on its nose!" done CliffCaveRock: diff --git a/maps/CliffEdgeGate.ablk b/maps/CliffEdgeGate.ablk new file mode 100644 index 0000000000000000000000000000000000000000..eeb576070df6ab6d3f9dfdf278414e6c3f3ca6b7 GIT binary patch literal 100 LcmZQzpgjNp0Av6G literal 0 HcmV?d00001 diff --git a/maps/CliffEdgeGate.asm b/maps/CliffEdgeGate.asm new file mode 100644 index 0000000..3088b1e --- /dev/null +++ b/maps/CliffEdgeGate.asm @@ -0,0 +1,17 @@ + object_const_def + +CliffEdgeGate_MapScripts: + def_scene_scripts + + def_callbacks + +CliffEdgeGate_MapEvents: + db 0, 0 ; filler + + def_warp_events + + def_coord_events + + def_bg_events + + def_object_events \ No newline at end of file diff --git a/maps/DottedHole.ablk b/maps/DottedHole.ablk new file mode 100644 index 0000000000000000000000000000000000000000..eeb576070df6ab6d3f9dfdf278414e6c3f3ca6b7 GIT binary patch literal 100 LcmZQzpgjNp0Av6G literal 0 HcmV?d00001 diff --git a/maps/DottedHole.asm b/maps/DottedHole.asm new file mode 100644 index 0000000..721f0ce --- /dev/null +++ b/maps/DottedHole.asm @@ -0,0 +1,17 @@ + object_const_def + +DottedHole_MapScripts: + def_scene_scripts + + def_callbacks + +DottedHole_MapEvents: + db 0, 0 ; filler + + def_warp_events + + def_coord_events + + def_bg_events + + def_object_events \ No newline at end of file diff --git a/maps/EmbeddedTower.ablk b/maps/EmbeddedTower.ablk new file mode 100644 index 0000000000000000000000000000000000000000..eeb576070df6ab6d3f9dfdf278414e6c3f3ca6b7 GIT binary patch literal 100 LcmZQzpgjNp0Av6G literal 0 HcmV?d00001 diff --git a/maps/EmbeddedTower.asm b/maps/EmbeddedTower.asm new file mode 100644 index 0000000..a5db0b6 --- /dev/null +++ b/maps/EmbeddedTower.asm @@ -0,0 +1,17 @@ + object_const_def + +EmbeddedTower_MapScripts: + def_scene_scripts + + def_callbacks + +EmbeddedTower_MapEvents: + db 0, 0 ; filler + + def_warp_events + + def_coord_events + + def_bg_events + + def_object_events \ No newline at end of file diff --git a/maps/FarawayIslandInside.ablk b/maps/FarawayIslandInside.ablk new file mode 100644 index 0000000000000000000000000000000000000000..eeb576070df6ab6d3f9dfdf278414e6c3f3ca6b7 GIT binary patch literal 100 LcmZQzpgjNp0Av6G literal 0 HcmV?d00001 diff --git a/maps/FarawayIslandInside.asm b/maps/FarawayIslandInside.asm new file mode 100644 index 0000000..b4fba68 --- /dev/null +++ b/maps/FarawayIslandInside.asm @@ -0,0 +1,17 @@ + object_const_def + +FarawayIslandInside_MapScripts: + def_scene_scripts + + def_callbacks + +FarawayIslandInside_MapEvents: + db 0, 0 ; filler + + def_warp_events + + def_coord_events + + def_bg_events + + def_object_events \ No newline at end of file diff --git a/maps/FarawayIslandOutside.ablk b/maps/FarawayIslandOutside.ablk new file mode 100644 index 0000000000000000000000000000000000000000..eeb576070df6ab6d3f9dfdf278414e6c3f3ca6b7 GIT binary patch literal 100 LcmZQzpgjNp0Av6G literal 0 HcmV?d00001 diff --git a/maps/FarawayIslandOutside.asm b/maps/FarawayIslandOutside.asm new file mode 100644 index 0000000..e02d5e8 --- /dev/null +++ b/maps/FarawayIslandOutside.asm @@ -0,0 +1,17 @@ + object_const_def + +FarawayIslandOutside_MapScripts: + def_scene_scripts + + def_callbacks + +FarawayIslandOutside_MapEvents: + db 0, 0 ; filler + + def_warp_events + + def_coord_events + + def_bg_events + + def_object_events \ No newline at end of file diff --git a/maps/FiveIsland.ablk b/maps/FiveIsland.ablk new file mode 100644 index 0000000000000000000000000000000000000000..eeb576070df6ab6d3f9dfdf278414e6c3f3ca6b7 GIT binary patch literal 100 LcmZQzpgjNp0Av6G literal 0 HcmV?d00001 diff --git a/maps/FiveIsland.asm b/maps/FiveIsland.asm new file mode 100644 index 0000000..f8b9370 --- /dev/null +++ b/maps/FiveIsland.asm @@ -0,0 +1,17 @@ + object_const_def + +FiveIsland_MapScripts: + def_scene_scripts + + def_callbacks + +FiveIsland_MapEvents: + db 0, 0 ; filler + + def_warp_events + + def_coord_events + + def_bg_events + + def_object_events \ No newline at end of file diff --git a/maps/FiveIslandMeadow.ablk b/maps/FiveIslandMeadow.ablk new file mode 100644 index 0000000000000000000000000000000000000000..eeb576070df6ab6d3f9dfdf278414e6c3f3ca6b7 GIT binary patch literal 100 LcmZQzpgjNp0Av6G literal 0 HcmV?d00001 diff --git a/maps/FiveIslandMeadow.asm b/maps/FiveIslandMeadow.asm new file mode 100644 index 0000000..685fae9 --- /dev/null +++ b/maps/FiveIslandMeadow.asm @@ -0,0 +1,17 @@ + object_const_def + +FiveIslandMeadow_MapScripts: + def_scene_scripts + + def_callbacks + +FiveIslandMeadow_MapEvents: + db 0, 0 ; filler + + def_warp_events + + def_coord_events + + def_bg_events + + def_object_events \ No newline at end of file diff --git a/maps/FourIsland.ablk b/maps/FourIsland.ablk new file mode 100644 index 0000000000000000000000000000000000000000..eeb576070df6ab6d3f9dfdf278414e6c3f3ca6b7 GIT binary patch literal 100 LcmZQzpgjNp0Av6G literal 0 HcmV?d00001 diff --git a/maps/FourIsland.asm b/maps/FourIsland.asm new file mode 100644 index 0000000..107dd53 --- /dev/null +++ b/maps/FourIsland.asm @@ -0,0 +1,17 @@ + object_const_def + +FourIsland_MapScripts: + def_scene_scripts + + def_callbacks + +FourIsland_MapEvents: + db 0, 0 ; filler + + def_warp_events + + def_coord_events + + def_bg_events + + def_object_events \ No newline at end of file diff --git a/maps/GarnetCavern1F.ablk b/maps/GarnetCavern1F.ablk new file mode 100644 index 0000000000000000000000000000000000000000..eeb576070df6ab6d3f9dfdf278414e6c3f3ca6b7 GIT binary patch literal 100 LcmZQzpgjNp0Av6G literal 0 HcmV?d00001 diff --git a/maps/GarnetCavern1F.asm b/maps/GarnetCavern1F.asm new file mode 100644 index 0000000..40d23cc --- /dev/null +++ b/maps/GarnetCavern1F.asm @@ -0,0 +1,17 @@ + object_const_def + +GarnetCavern1F_MapScripts: + def_scene_scripts + + def_callbacks + +GarnetCavern1F_MapEvents: + db 0, 0 ; filler + + def_warp_events + + def_coord_events + + def_bg_events + + def_object_events \ No newline at end of file diff --git a/maps/GarnetCavern2F.ablk b/maps/GarnetCavern2F.ablk new file mode 100644 index 0000000000000000000000000000000000000000..eeb576070df6ab6d3f9dfdf278414e6c3f3ca6b7 GIT binary patch literal 100 LcmZQzpgjNp0Av6G literal 0 HcmV?d00001 diff --git a/maps/GarnetCavern2F.asm b/maps/GarnetCavern2F.asm new file mode 100644 index 0000000..b9e4909 --- /dev/null +++ b/maps/GarnetCavern2F.asm @@ -0,0 +1,17 @@ + object_const_def + +GarnetCavern2F_MapScripts: + def_scene_scripts + + def_callbacks + +GarnetCavern2F_MapEvents: + db 0, 0 ; filler + + def_warp_events + + def_coord_events + + def_bg_events + + def_object_events \ No newline at end of file diff --git a/maps/GarnetCavernB1F.ablk b/maps/GarnetCavernB1F.ablk new file mode 100644 index 0000000000000000000000000000000000000000..eeb576070df6ab6d3f9dfdf278414e6c3f3ca6b7 GIT binary patch literal 100 LcmZQzpgjNp0Av6G literal 0 HcmV?d00001 diff --git a/maps/GarnetCavernB1F.asm b/maps/GarnetCavernB1F.asm new file mode 100644 index 0000000..9af0688 --- /dev/null +++ b/maps/GarnetCavernB1F.asm @@ -0,0 +1,17 @@ + object_const_def + +GarnetCavernB1F_MapScripts: + def_scene_scripts + + def_callbacks + +GarnetCavernB1F_MapEvents: + db 0, 0 ; filler + + def_warp_events + + def_coord_events + + def_bg_events + + def_object_events \ No newline at end of file diff --git a/maps/GreenPath.ablk b/maps/GreenPath.ablk new file mode 100644 index 0000000000000000000000000000000000000000..eeb576070df6ab6d3f9dfdf278414e6c3f3ca6b7 GIT binary patch literal 100 LcmZQzpgjNp0Av6G literal 0 HcmV?d00001 diff --git a/maps/GreenPath.asm b/maps/GreenPath.asm new file mode 100644 index 0000000..a710636 --- /dev/null +++ b/maps/GreenPath.asm @@ -0,0 +1,17 @@ + object_const_def + +GreenPath_MapScripts: + def_scene_scripts + + def_callbacks + +GreenPath_MapEvents: + db 0, 0 ; filler + + def_warp_events + + def_coord_events + + def_bg_events + + def_object_events \ No newline at end of file diff --git a/maps/IcefallCave1F.ablk b/maps/IcefallCave1F.ablk new file mode 100644 index 0000000000000000000000000000000000000000..eeb576070df6ab6d3f9dfdf278414e6c3f3ca6b7 GIT binary patch literal 100 LcmZQzpgjNp0Av6G literal 0 HcmV?d00001 diff --git a/maps/IcefallCave1F.asm b/maps/IcefallCave1F.asm new file mode 100644 index 0000000..2479d9d --- /dev/null +++ b/maps/IcefallCave1F.asm @@ -0,0 +1,17 @@ + object_const_def + +IcefallCave1F_MapScripts: + def_scene_scripts + + def_callbacks + +IcefallCave1F_MapEvents: + db 0, 0 ; filler + + def_warp_events + + def_coord_events + + def_bg_events + + def_object_events \ No newline at end of file diff --git a/maps/IcefallCaveB1F.ablk b/maps/IcefallCaveB1F.ablk new file mode 100644 index 0000000000000000000000000000000000000000..eeb576070df6ab6d3f9dfdf278414e6c3f3ca6b7 GIT binary patch literal 100 LcmZQzpgjNp0Av6G literal 0 HcmV?d00001 diff --git a/maps/IcefallCaveB1F.asm b/maps/IcefallCaveB1F.asm new file mode 100644 index 0000000..0af98ba --- /dev/null +++ b/maps/IcefallCaveB1F.asm @@ -0,0 +1,17 @@ + object_const_def + +IcefallCaveB1F_MapScripts: + def_scene_scripts + + def_callbacks + +IcefallCaveB1F_MapEvents: + db 0, 0 ; filler + + def_warp_events + + def_coord_events + + def_bg_events + + def_object_events \ No newline at end of file diff --git a/maps/IcefallCaveBack.ablk b/maps/IcefallCaveBack.ablk new file mode 100644 index 0000000000000000000000000000000000000000..eeb576070df6ab6d3f9dfdf278414e6c3f3ca6b7 GIT binary patch literal 100 LcmZQzpgjNp0Av6G literal 0 HcmV?d00001 diff --git a/maps/IcefallCaveBack.asm b/maps/IcefallCaveBack.asm new file mode 100644 index 0000000..48092b6 --- /dev/null +++ b/maps/IcefallCaveBack.asm @@ -0,0 +1,17 @@ + object_const_def + +IcefallCaveBack_MapScripts: + def_scene_scripts + + def_callbacks + +IcefallCaveBack_MapEvents: + db 0, 0 ; filler + + def_warp_events + + def_coord_events + + def_bg_events + + def_object_events \ No newline at end of file diff --git a/maps/IcefallCaveEntrance.ablk b/maps/IcefallCaveEntrance.ablk new file mode 100644 index 0000000000000000000000000000000000000000..eeb576070df6ab6d3f9dfdf278414e6c3f3ca6b7 GIT binary patch literal 100 LcmZQzpgjNp0Av6G literal 0 HcmV?d00001 diff --git a/maps/IcefallCaveEntrance.asm b/maps/IcefallCaveEntrance.asm new file mode 100644 index 0000000..0415c12 --- /dev/null +++ b/maps/IcefallCaveEntrance.asm @@ -0,0 +1,17 @@ + object_const_def + +IcefallCaveEntrance_MapScripts: + def_scene_scripts + + def_callbacks + +IcefallCaveEntrance_MapEvents: + db 0, 0 ; filler + + def_warp_events + + def_coord_events + + def_bg_events + + def_object_events \ No newline at end of file diff --git a/maps/JohtoSafariZone.ablk b/maps/JohtoSafariZone.ablk new file mode 100644 index 0000000000000000000000000000000000000000..eeb576070df6ab6d3f9dfdf278414e6c3f3ca6b7 GIT binary patch literal 100 LcmZQzpgjNp0Av6G literal 0 HcmV?d00001 diff --git a/maps/JohtoSafariZone.asm b/maps/JohtoSafariZone.asm new file mode 100644 index 0000000..1a8ccf3 --- /dev/null +++ b/maps/JohtoSafariZone.asm @@ -0,0 +1,17 @@ + object_const_def + +JohtoSafariZone_MapScripts: + def_scene_scripts + + def_callbacks + +JohtoSafariZone_MapEvents: + db 0, 0 ; filler + + def_warp_events + + def_coord_events + + def_bg_events + + def_object_events \ No newline at end of file diff --git a/maps/JohtoSafariZoneGate.ablk b/maps/JohtoSafariZoneGate.ablk new file mode 100644 index 0000000000000000000000000000000000000000..eeb576070df6ab6d3f9dfdf278414e6c3f3ca6b7 GIT binary patch literal 100 LcmZQzpgjNp0Av6G literal 0 HcmV?d00001 diff --git a/maps/JohtoSafariZoneGate.asm b/maps/JohtoSafariZoneGate.asm new file mode 100644 index 0000000..1661207 --- /dev/null +++ b/maps/JohtoSafariZoneGate.asm @@ -0,0 +1,17 @@ + object_const_def + +JohtoSafariZoneGate_MapScripts: + def_scene_scripts + + def_callbacks + +JohtoSafariZoneGate_MapEvents: + db 0, 0 ; filler + + def_warp_events + + def_coord_events + + def_bg_events + + def_object_events \ No newline at end of file diff --git a/maps/KindleRoad.ablk b/maps/KindleRoad.ablk new file mode 100644 index 0000000000000000000000000000000000000000..eeb576070df6ab6d3f9dfdf278414e6c3f3ca6b7 GIT binary patch literal 100 LcmZQzpgjNp0Av6G literal 0 HcmV?d00001 diff --git a/maps/KindleRoad.asm b/maps/KindleRoad.asm new file mode 100644 index 0000000..111e8ff --- /dev/null +++ b/maps/KindleRoad.asm @@ -0,0 +1,17 @@ + object_const_def + +KindleRoad_MapScripts: + def_scene_scripts + + def_callbacks + +KindleRoad_MapEvents: + db 0, 0 ; filler + + def_warp_events + + def_coord_events + + def_bg_events + + def_object_events \ No newline at end of file diff --git a/maps/LavenderCrypt.ablk b/maps/LavenderCrypt.ablk new file mode 100644 index 0000000000000000000000000000000000000000..eeb576070df6ab6d3f9dfdf278414e6c3f3ca6b7 GIT binary patch literal 100 LcmZQzpgjNp0Av6G literal 0 HcmV?d00001 diff --git a/maps/LavenderCrypt.asm b/maps/LavenderCrypt.asm new file mode 100644 index 0000000..fa741a9 --- /dev/null +++ b/maps/LavenderCrypt.asm @@ -0,0 +1,17 @@ + object_const_def + +LavenderCrypt_MapScripts: + def_scene_scripts + + def_callbacks + +LavenderCrypt_MapEvents: + db 0, 0 ; filler + + def_warp_events + + def_coord_events + + def_bg_events + + def_object_events \ No newline at end of file diff --git a/maps/LostCave.ablk b/maps/LostCave.ablk new file mode 100644 index 0000000000000000000000000000000000000000..eeb576070df6ab6d3f9dfdf278414e6c3f3ca6b7 GIT binary patch literal 100 LcmZQzpgjNp0Av6G literal 0 HcmV?d00001 diff --git a/maps/LostCave.asm b/maps/LostCave.asm new file mode 100644 index 0000000..9c40bda --- /dev/null +++ b/maps/LostCave.asm @@ -0,0 +1,17 @@ + object_const_def + +LostCave_MapScripts: + def_scene_scripts + + def_callbacks + +LostCave_MapEvents: + db 0, 0 ; filler + + def_warp_events + + def_coord_events + + def_bg_events + + def_object_events \ No newline at end of file diff --git a/maps/MemorialPillar.ablk b/maps/MemorialPillar.ablk new file mode 100644 index 0000000000000000000000000000000000000000..eeb576070df6ab6d3f9dfdf278414e6c3f3ca6b7 GIT binary patch literal 100 LcmZQzpgjNp0Av6G literal 0 HcmV?d00001 diff --git a/maps/MemorialPillar.asm b/maps/MemorialPillar.asm new file mode 100644 index 0000000..36188b0 --- /dev/null +++ b/maps/MemorialPillar.asm @@ -0,0 +1,17 @@ + object_const_def + +MemorialPillar_MapScripts: + def_scene_scripts + + def_callbacks + +MemorialPillar_MapEvents: + db 0, 0 ; filler + + def_warp_events + + def_coord_events + + def_bg_events + + def_object_events \ No newline at end of file diff --git a/maps/MtEmberExterior.ablk b/maps/MtEmberExterior.ablk new file mode 100644 index 0000000000000000000000000000000000000000..eeb576070df6ab6d3f9dfdf278414e6c3f3ca6b7 GIT binary patch literal 100 LcmZQzpgjNp0Av6G literal 0 HcmV?d00001 diff --git a/maps/MtEmberExterior.asm b/maps/MtEmberExterior.asm new file mode 100644 index 0000000..4a8f531 --- /dev/null +++ b/maps/MtEmberExterior.asm @@ -0,0 +1,17 @@ + object_const_def + +MtEmberExterior_MapScripts: + def_scene_scripts + + def_callbacks + +MtEmberExterior_MapEvents: + db 0, 0 ; filler + + def_warp_events + + def_coord_events + + def_bg_events + + def_object_events \ No newline at end of file diff --git a/maps/MtEmberHiddenPath.ablk b/maps/MtEmberHiddenPath.ablk new file mode 100644 index 0000000000000000000000000000000000000000..eeb576070df6ab6d3f9dfdf278414e6c3f3ca6b7 GIT binary patch literal 100 LcmZQzpgjNp0Av6G literal 0 HcmV?d00001 diff --git a/maps/MtEmberHiddenPath.asm b/maps/MtEmberHiddenPath.asm new file mode 100644 index 0000000..3a5688b --- /dev/null +++ b/maps/MtEmberHiddenPath.asm @@ -0,0 +1,17 @@ + object_const_def + +MtEmberHiddenPath_MapScripts: + def_scene_scripts + + def_callbacks + +MtEmberHiddenPath_MapEvents: + db 0, 0 ; filler + + def_warp_events + + def_coord_events + + def_bg_events + + def_object_events \ No newline at end of file diff --git a/maps/MtEmberInterior.ablk b/maps/MtEmberInterior.ablk new file mode 100644 index 0000000000000000000000000000000000000000..eeb576070df6ab6d3f9dfdf278414e6c3f3ca6b7 GIT binary patch literal 100 LcmZQzpgjNp0Av6G literal 0 HcmV?d00001 diff --git a/maps/MtEmberInterior.asm b/maps/MtEmberInterior.asm new file mode 100644 index 0000000..11ac923 --- /dev/null +++ b/maps/MtEmberInterior.asm @@ -0,0 +1,17 @@ + object_const_def + +MtEmberInterior_MapScripts: + def_scene_scripts + + def_callbacks + +MtEmberInterior_MapEvents: + db 0, 0 ; filler + + def_warp_events + + def_coord_events + + def_bg_events + + def_object_events \ No newline at end of file diff --git a/maps/MtEmberSummit.ablk b/maps/MtEmberSummit.ablk new file mode 100644 index 0000000000000000000000000000000000000000..eeb576070df6ab6d3f9dfdf278414e6c3f3ca6b7 GIT binary patch literal 100 LcmZQzpgjNp0Av6G literal 0 HcmV?d00001 diff --git a/maps/MtEmberSummit.asm b/maps/MtEmberSummit.asm new file mode 100644 index 0000000..3821a8d --- /dev/null +++ b/maps/MtEmberSummit.asm @@ -0,0 +1,17 @@ + object_const_def + +MtEmberSummit_MapScripts: + def_scene_scripts + + def_callbacks + +MtEmberSummit_MapEvents: + db 0, 0 ; filler + + def_warp_events + + def_coord_events + + def_bg_events + + def_object_events \ No newline at end of file diff --git a/maps/MtMoonCrater.ablk b/maps/MtMoonCrater.ablk new file mode 100644 index 0000000000000000000000000000000000000000..eeb576070df6ab6d3f9dfdf278414e6c3f3ca6b7 GIT binary patch literal 100 LcmZQzpgjNp0Av6G literal 0 HcmV?d00001 diff --git a/maps/MtMoonCrater.asm b/maps/MtMoonCrater.asm new file mode 100644 index 0000000..c00a0dc --- /dev/null +++ b/maps/MtMoonCrater.asm @@ -0,0 +1,17 @@ + object_const_def + +MtMoonCrater_MapScripts: + def_scene_scripts + + def_callbacks + +MtMoonCrater_MapEvents: + db 0, 0 ; filler + + def_warp_events + + def_coord_events + + def_bg_events + + def_object_events \ No newline at end of file diff --git a/maps/MtMoonCraterDepths.ablk b/maps/MtMoonCraterDepths.ablk new file mode 100644 index 0000000000000000000000000000000000000000..eeb576070df6ab6d3f9dfdf278414e6c3f3ca6b7 GIT binary patch literal 100 LcmZQzpgjNp0Av6G literal 0 HcmV?d00001 diff --git a/maps/MtMoonCraterDepths.asm b/maps/MtMoonCraterDepths.asm new file mode 100644 index 0000000..fe76d3e --- /dev/null +++ b/maps/MtMoonCraterDepths.asm @@ -0,0 +1,17 @@ + object_const_def + +MtMoonCraterDepths_MapScripts: + def_scene_scripts + + def_callbacks + +MtMoonCraterDepths_MapEvents: + db 0, 0 ; filler + + def_warp_events + + def_coord_events + + def_bg_events + + def_object_events \ No newline at end of file diff --git a/maps/NavalRock1F.ablk b/maps/NavalRock1F.ablk new file mode 100644 index 0000000000000000000000000000000000000000..eeb576070df6ab6d3f9dfdf278414e6c3f3ca6b7 GIT binary patch literal 100 LcmZQzpgjNp0Av6G literal 0 HcmV?d00001 diff --git a/maps/NavalRock1F.asm b/maps/NavalRock1F.asm new file mode 100644 index 0000000..8d29628 --- /dev/null +++ b/maps/NavalRock1F.asm @@ -0,0 +1,17 @@ + object_const_def + +NavalRock1F_MapScripts: + def_scene_scripts + + def_callbacks + +NavalRock1F_MapEvents: + db 0, 0 ; filler + + def_warp_events + + def_coord_events + + def_bg_events + + def_object_events \ No newline at end of file diff --git a/maps/NavalRock2F.ablk b/maps/NavalRock2F.ablk new file mode 100644 index 0000000000000000000000000000000000000000..eeb576070df6ab6d3f9dfdf278414e6c3f3ca6b7 GIT binary patch literal 100 LcmZQzpgjNp0Av6G literal 0 HcmV?d00001 diff --git a/maps/NavalRock2F.asm b/maps/NavalRock2F.asm new file mode 100644 index 0000000..f726029 --- /dev/null +++ b/maps/NavalRock2F.asm @@ -0,0 +1,17 @@ + object_const_def + +NavalRock2F_MapScripts: + def_scene_scripts + + def_callbacks + +NavalRock2F_MapEvents: + db 0, 0 ; filler + + def_warp_events + + def_coord_events + + def_bg_events + + def_object_events \ No newline at end of file diff --git a/maps/NavalRockB1F.ablk b/maps/NavalRockB1F.ablk new file mode 100644 index 0000000000000000000000000000000000000000..eeb576070df6ab6d3f9dfdf278414e6c3f3ca6b7 GIT binary patch literal 100 LcmZQzpgjNp0Av6G literal 0 HcmV?d00001 diff --git a/maps/NavalRockB1F.asm b/maps/NavalRockB1F.asm new file mode 100644 index 0000000..04d2380 --- /dev/null +++ b/maps/NavalRockB1F.asm @@ -0,0 +1,17 @@ + object_const_def + +NavalRockB1F_MapScripts: + def_scene_scripts + + def_callbacks + +NavalRockB1F_MapEvents: + db 0, 0 ; filler + + def_warp_events + + def_coord_events + + def_bg_events + + def_object_events \ No newline at end of file diff --git a/maps/NavalRockExterior.ablk b/maps/NavalRockExterior.ablk new file mode 100644 index 0000000000000000000000000000000000000000..eeb576070df6ab6d3f9dfdf278414e6c3f3ca6b7 GIT binary patch literal 100 LcmZQzpgjNp0Av6G literal 0 HcmV?d00001 diff --git a/maps/NavalRockExterior.asm b/maps/NavalRockExterior.asm new file mode 100644 index 0000000..9d5a0de --- /dev/null +++ b/maps/NavalRockExterior.asm @@ -0,0 +1,17 @@ + object_const_def + +NavalRockExterior_MapScripts: + def_scene_scripts + + def_callbacks + +NavalRockExterior_MapEvents: + db 0, 0 ; filler + + def_warp_events + + def_coord_events + + def_bg_events + + def_object_events \ No newline at end of file diff --git a/maps/OneIsland.ablk b/maps/OneIsland.ablk new file mode 100644 index 0000000000000000000000000000000000000000..eeb576070df6ab6d3f9dfdf278414e6c3f3ca6b7 GIT binary patch literal 100 LcmZQzpgjNp0Av6G literal 0 HcmV?d00001 diff --git a/maps/OneIsland.asm b/maps/OneIsland.asm new file mode 100644 index 0000000..05826c8 --- /dev/null +++ b/maps/OneIsland.asm @@ -0,0 +1,17 @@ + object_const_def + +OneIsland_MapScripts: + def_scene_scripts + + def_callbacks + +OneIsland_MapEvents: + db 0, 0 ; filler + + def_warp_events + + def_coord_events + + def_bg_events + + def_object_events \ No newline at end of file diff --git a/maps/OutcastIsland.ablk b/maps/OutcastIsland.ablk new file mode 100644 index 0000000000000000000000000000000000000000..eeb576070df6ab6d3f9dfdf278414e6c3f3ca6b7 GIT binary patch literal 100 LcmZQzpgjNp0Av6G literal 0 HcmV?d00001 diff --git a/maps/OutcastIsland.asm b/maps/OutcastIsland.asm new file mode 100644 index 0000000..70d3369 --- /dev/null +++ b/maps/OutcastIsland.asm @@ -0,0 +1,17 @@ + object_const_def + +OutcastIsland_MapScripts: + def_scene_scripts + + def_callbacks + +OutcastIsland_MapEvents: + db 0, 0 ; filler + + def_warp_events + + def_coord_events + + def_bg_events + + def_object_events \ No newline at end of file diff --git a/maps/PatternBush.ablk b/maps/PatternBush.ablk new file mode 100644 index 0000000000000000000000000000000000000000..eeb576070df6ab6d3f9dfdf278414e6c3f3ca6b7 GIT binary patch literal 100 LcmZQzpgjNp0Av6G literal 0 HcmV?d00001 diff --git a/maps/PatternBush.asm b/maps/PatternBush.asm new file mode 100644 index 0000000..0f51d02 --- /dev/null +++ b/maps/PatternBush.asm @@ -0,0 +1,17 @@ + object_const_def + +PatternBush_MapScripts: + def_scene_scripts + + def_callbacks + +PatternBush_MapEvents: + db 0, 0 ; filler + + def_warp_events + + def_coord_events + + def_bg_events + + def_object_events \ No newline at end of file diff --git a/maps/ResortGorgeous.ablk b/maps/ResortGorgeous.ablk new file mode 100644 index 0000000000000000000000000000000000000000..eeb576070df6ab6d3f9dfdf278414e6c3f3ca6b7 GIT binary patch literal 100 LcmZQzpgjNp0Av6G literal 0 HcmV?d00001 diff --git a/maps/ResortGorgeous.asm b/maps/ResortGorgeous.asm new file mode 100644 index 0000000..34b8947 --- /dev/null +++ b/maps/ResortGorgeous.asm @@ -0,0 +1,17 @@ + object_const_def + +ResortGorgeous_MapScripts: + def_scene_scripts + + def_callbacks + +ResortGorgeous_MapEvents: + db 0, 0 ; filler + + def_warp_events + + def_coord_events + + def_bg_events + + def_object_events \ No newline at end of file diff --git a/maps/Route47.ablk b/maps/Route47.ablk new file mode 100644 index 0000000000000000000000000000000000000000..eeb576070df6ab6d3f9dfdf278414e6c3f3ca6b7 GIT binary patch literal 100 LcmZQzpgjNp0Av6G literal 0 HcmV?d00001 diff --git a/maps/Route47.asm b/maps/Route47.asm new file mode 100644 index 0000000..a854997 --- /dev/null +++ b/maps/Route47.asm @@ -0,0 +1,17 @@ + object_const_def + +Route47_MapScripts: + def_scene_scripts + + def_callbacks + +Route47_MapEvents: + db 0, 0 ; filler + + def_warp_events + + def_coord_events + + def_bg_events + + def_object_events \ No newline at end of file diff --git a/maps/Route48.ablk b/maps/Route48.ablk new file mode 100644 index 0000000000000000000000000000000000000000..eeb576070df6ab6d3f9dfdf278414e6c3f3ca6b7 GIT binary patch literal 100 LcmZQzpgjNp0Av6G literal 0 HcmV?d00001 diff --git a/maps/Route48.asm b/maps/Route48.asm new file mode 100644 index 0000000..6fe1c90 --- /dev/null +++ b/maps/Route48.asm @@ -0,0 +1,18 @@ + object_const_def + +Route48_MapScripts: + def_scene_scripts + + def_callbacks + +Route48_MapEvents: + db 0, 0 ; filler + + def_warp_events + warp_event 3, 22, DEBUG_ROOM, 1 + + def_coord_events + + def_bg_events + + def_object_events \ No newline at end of file diff --git a/maps/RuinValley.ablk b/maps/RuinValley.ablk new file mode 100644 index 0000000000000000000000000000000000000000..eeb576070df6ab6d3f9dfdf278414e6c3f3ca6b7 GIT binary patch literal 100 LcmZQzpgjNp0Av6G literal 0 HcmV?d00001 diff --git a/maps/RuinValley.asm b/maps/RuinValley.asm new file mode 100644 index 0000000..50589a2 --- /dev/null +++ b/maps/RuinValley.asm @@ -0,0 +1,17 @@ + object_const_def + +RuinValley_MapScripts: + def_scene_scripts + + def_callbacks + +RuinValley_MapEvents: + db 0, 0 ; filler + + def_warp_events + + def_coord_events + + def_bg_events + + def_object_events \ No newline at end of file diff --git a/maps/SeafoamIslands1F.ablk b/maps/SeafoamIslands1F.ablk new file mode 100644 index 0000000000000000000000000000000000000000..eeb576070df6ab6d3f9dfdf278414e6c3f3ca6b7 GIT binary patch literal 100 LcmZQzpgjNp0Av6G literal 0 HcmV?d00001 diff --git a/maps/SeafoamIslands1F.asm b/maps/SeafoamIslands1F.asm new file mode 100644 index 0000000..e2c7dfa --- /dev/null +++ b/maps/SeafoamIslands1F.asm @@ -0,0 +1,17 @@ + object_const_def + +SeafoamIslands1F_MapScripts: + def_scene_scripts + + def_callbacks + +SeafoamIslands1F_MapEvents: + db 0, 0 ; filler + + def_warp_events + + def_coord_events + + def_bg_events + + def_object_events \ No newline at end of file diff --git a/maps/SeafoamIslandsB1F.ablk b/maps/SeafoamIslandsB1F.ablk new file mode 100644 index 0000000000000000000000000000000000000000..eeb576070df6ab6d3f9dfdf278414e6c3f3ca6b7 GIT binary patch literal 100 LcmZQzpgjNp0Av6G literal 0 HcmV?d00001 diff --git a/maps/SeafoamIslandsB1F.asm b/maps/SeafoamIslandsB1F.asm new file mode 100644 index 0000000..cd0cee2 --- /dev/null +++ b/maps/SeafoamIslandsB1F.asm @@ -0,0 +1,17 @@ + object_const_def + +SeafoamIslandsB1F_MapScripts: + def_scene_scripts + + def_callbacks + +SeafoamIslandsB1F_MapEvents: + db 0, 0 ; filler + + def_warp_events + + def_coord_events + + def_bg_events + + def_object_events \ No newline at end of file diff --git a/maps/SeafoamIslandsB2F.ablk b/maps/SeafoamIslandsB2F.ablk new file mode 100644 index 0000000000000000000000000000000000000000..eeb576070df6ab6d3f9dfdf278414e6c3f3ca6b7 GIT binary patch literal 100 LcmZQzpgjNp0Av6G literal 0 HcmV?d00001 diff --git a/maps/SeafoamIslandsB2F.asm b/maps/SeafoamIslandsB2F.asm new file mode 100644 index 0000000..49eac2b --- /dev/null +++ b/maps/SeafoamIslandsB2F.asm @@ -0,0 +1,17 @@ + object_const_def + +SeafoamIslandsB2F_MapScripts: + def_scene_scripts + + def_callbacks + +SeafoamIslandsB2F_MapEvents: + db 0, 0 ; filler + + def_warp_events + + def_coord_events + + def_bg_events + + def_object_events \ No newline at end of file diff --git a/maps/SeafoamIslandsB3F.ablk b/maps/SeafoamIslandsB3F.ablk new file mode 100644 index 0000000000000000000000000000000000000000..eeb576070df6ab6d3f9dfdf278414e6c3f3ca6b7 GIT binary patch literal 100 LcmZQzpgjNp0Av6G literal 0 HcmV?d00001 diff --git a/maps/SeafoamIslandsB3F.asm b/maps/SeafoamIslandsB3F.asm new file mode 100644 index 0000000..0947c2b --- /dev/null +++ b/maps/SeafoamIslandsB3F.asm @@ -0,0 +1,17 @@ + object_const_def + +SeafoamIslandsB3F_MapScripts: + def_scene_scripts + + def_callbacks + +SeafoamIslandsB3F_MapEvents: + db 0, 0 ; filler + + def_warp_events + + def_coord_events + + def_bg_events + + def_object_events \ No newline at end of file diff --git a/maps/SeafoamIslandsB4F.ablk b/maps/SeafoamIslandsB4F.ablk new file mode 100644 index 0000000000000000000000000000000000000000..eeb576070df6ab6d3f9dfdf278414e6c3f3ca6b7 GIT binary patch literal 100 LcmZQzpgjNp0Av6G literal 0 HcmV?d00001 diff --git a/maps/SeafoamIslandsB4F.asm b/maps/SeafoamIslandsB4F.asm new file mode 100644 index 0000000..451a441 --- /dev/null +++ b/maps/SeafoamIslandsB4F.asm @@ -0,0 +1,17 @@ + object_const_def + +SeafoamIslandsB4F_MapScripts: + def_scene_scripts + + def_callbacks + +SeafoamIslandsB4F_MapEvents: + db 0, 0 ; filler + + def_warp_events + + def_coord_events + + def_bg_events + + def_object_events \ No newline at end of file diff --git a/maps/SevaultCanyon.ablk b/maps/SevaultCanyon.ablk new file mode 100644 index 0000000000000000000000000000000000000000..eeb576070df6ab6d3f9dfdf278414e6c3f3ca6b7 GIT binary patch literal 100 LcmZQzpgjNp0Av6G literal 0 HcmV?d00001 diff --git a/maps/SevaultCanyon.asm b/maps/SevaultCanyon.asm new file mode 100644 index 0000000..3bf0231 --- /dev/null +++ b/maps/SevaultCanyon.asm @@ -0,0 +1,17 @@ + object_const_def + +SevaultCanyon_MapScripts: + def_scene_scripts + + def_callbacks + +SevaultCanyon_MapEvents: + db 0, 0 ; filler + + def_warp_events + + def_coord_events + + def_bg_events + + def_object_events \ No newline at end of file diff --git a/maps/SevenIsland.ablk b/maps/SevenIsland.ablk new file mode 100644 index 0000000000000000000000000000000000000000..eeb576070df6ab6d3f9dfdf278414e6c3f3ca6b7 GIT binary patch literal 100 LcmZQzpgjNp0Av6G literal 0 HcmV?d00001 diff --git a/maps/SevenIsland.asm b/maps/SevenIsland.asm new file mode 100644 index 0000000..f7d977d --- /dev/null +++ b/maps/SevenIsland.asm @@ -0,0 +1,17 @@ + object_const_def + +SevenIsland_MapScripts: + def_scene_scripts + + def_callbacks + +SevenIsland_MapEvents: + db 0, 0 ; filler + + def_warp_events + + def_coord_events + + def_bg_events + + def_object_events \ No newline at end of file diff --git a/maps/SinjohRuinsExterior.ablk b/maps/SinjohRuinsExterior.ablk new file mode 100644 index 0000000000000000000000000000000000000000..eeb576070df6ab6d3f9dfdf278414e6c3f3ca6b7 GIT binary patch literal 100 LcmZQzpgjNp0Av6G literal 0 HcmV?d00001 diff --git a/maps/SinjohRuinsExterior.asm b/maps/SinjohRuinsExterior.asm new file mode 100644 index 0000000..25d7147 --- /dev/null +++ b/maps/SinjohRuinsExterior.asm @@ -0,0 +1,17 @@ + object_const_def + +SinjohRuinsExterior_MapScripts: + def_scene_scripts + + def_callbacks + +SinjohRuinsExterior_MapEvents: + db 0, 0 ; filler + + def_warp_events + + def_coord_events + + def_bg_events + + def_object_events \ No newline at end of file diff --git a/maps/SinjohRuinsInterior.ablk b/maps/SinjohRuinsInterior.ablk new file mode 100644 index 0000000000000000000000000000000000000000..eeb576070df6ab6d3f9dfdf278414e6c3f3ca6b7 GIT binary patch literal 100 LcmZQzpgjNp0Av6G literal 0 HcmV?d00001 diff --git a/maps/SinjohRuinsInterior.asm b/maps/SinjohRuinsInterior.asm new file mode 100644 index 0000000..5e7f715 --- /dev/null +++ b/maps/SinjohRuinsInterior.asm @@ -0,0 +1,17 @@ + object_const_def + +SinjohRuinsInterior_MapScripts: + def_scene_scripts + + def_callbacks + +SinjohRuinsInterior_MapEvents: + db 0, 0 ; filler + + def_warp_events + + def_coord_events + + def_bg_events + + def_object_events \ No newline at end of file diff --git a/maps/SixIsland.ablk b/maps/SixIsland.ablk new file mode 100644 index 0000000000000000000000000000000000000000..eeb576070df6ab6d3f9dfdf278414e6c3f3ca6b7 GIT binary patch literal 100 LcmZQzpgjNp0Av6G literal 0 HcmV?d00001 diff --git a/maps/SixIsland.asm b/maps/SixIsland.asm new file mode 100644 index 0000000..b5122cb --- /dev/null +++ b/maps/SixIsland.asm @@ -0,0 +1,17 @@ + object_const_def + +SixIsland_MapScripts: + def_scene_scripts + + def_callbacks + +SixIsland_MapEvents: + db 0, 0 ; filler + + def_warp_events + + def_coord_events + + def_bg_events + + def_object_events \ No newline at end of file diff --git a/maps/TanobyChambers.ablk b/maps/TanobyChambers.ablk new file mode 100644 index 0000000000000000000000000000000000000000..eeb576070df6ab6d3f9dfdf278414e6c3f3ca6b7 GIT binary patch literal 100 LcmZQzpgjNp0Av6G literal 0 HcmV?d00001 diff --git a/maps/TanobyChambers.asm b/maps/TanobyChambers.asm new file mode 100644 index 0000000..8359440 --- /dev/null +++ b/maps/TanobyChambers.asm @@ -0,0 +1,17 @@ + object_const_def + +TanobyChambers_MapScripts: + def_scene_scripts + + def_callbacks + +TanobyChambers_MapEvents: + db 0, 0 ; filler + + def_warp_events + + def_coord_events + + def_bg_events + + def_object_events \ No newline at end of file diff --git a/maps/TanobyRuins.ablk b/maps/TanobyRuins.ablk new file mode 100644 index 0000000000000000000000000000000000000000..eeb576070df6ab6d3f9dfdf278414e6c3f3ca6b7 GIT binary patch literal 100 LcmZQzpgjNp0Av6G literal 0 HcmV?d00001 diff --git a/maps/TanobyRuins.asm b/maps/TanobyRuins.asm new file mode 100644 index 0000000..59d1e2a --- /dev/null +++ b/maps/TanobyRuins.asm @@ -0,0 +1,17 @@ + object_const_def + +TanobyRuins_MapScripts: + def_scene_scripts + + def_callbacks + +TanobyRuins_MapEvents: + db 0, 0 ; filler + + def_warp_events + + def_coord_events + + def_bg_events + + def_object_events \ No newline at end of file diff --git a/maps/ThreeIsland.ablk b/maps/ThreeIsland.ablk new file mode 100644 index 0000000000000000000000000000000000000000..eeb576070df6ab6d3f9dfdf278414e6c3f3ca6b7 GIT binary patch literal 100 LcmZQzpgjNp0Av6G literal 0 HcmV?d00001 diff --git a/maps/ThreeIsland.asm b/maps/ThreeIsland.asm new file mode 100644 index 0000000..b2a8c33 --- /dev/null +++ b/maps/ThreeIsland.asm @@ -0,0 +1,17 @@ + object_const_def + +ThreeIsland_MapScripts: + def_scene_scripts + + def_callbacks + +ThreeIsland_MapEvents: + db 0, 0 ; filler + + def_warp_events + + def_coord_events + + def_bg_events + + def_object_events \ No newline at end of file diff --git a/maps/ThreeIslandPort.ablk b/maps/ThreeIslandPort.ablk new file mode 100644 index 0000000000000000000000000000000000000000..eeb576070df6ab6d3f9dfdf278414e6c3f3ca6b7 GIT binary patch literal 100 LcmZQzpgjNp0Av6G literal 0 HcmV?d00001 diff --git a/maps/ThreeIslandPort.asm b/maps/ThreeIslandPort.asm new file mode 100644 index 0000000..507d5a0 --- /dev/null +++ b/maps/ThreeIslandPort.asm @@ -0,0 +1,17 @@ + object_const_def + +ThreeIslandPort_MapScripts: + def_scene_scripts + + def_callbacks + +ThreeIslandPort_MapEvents: + db 0, 0 ; filler + + def_warp_events + + def_coord_events + + def_bg_events + + def_object_events \ No newline at end of file diff --git a/maps/TreasureBeach.ablk b/maps/TreasureBeach.ablk new file mode 100644 index 0000000000000000000000000000000000000000..eeb576070df6ab6d3f9dfdf278414e6c3f3ca6b7 GIT binary patch literal 100 LcmZQzpgjNp0Av6G literal 0 HcmV?d00001 diff --git a/maps/TreasureBeach.asm b/maps/TreasureBeach.asm new file mode 100644 index 0000000..507994c --- /dev/null +++ b/maps/TreasureBeach.asm @@ -0,0 +1,17 @@ + object_const_def + +TreasureBeach_MapScripts: + def_scene_scripts + + def_callbacks + +TreasureBeach_MapEvents: + db 0, 0 ; filler + + def_warp_events + + def_coord_events + + def_bg_events + + def_object_events \ No newline at end of file diff --git a/maps/TwoIsland.ablk b/maps/TwoIsland.ablk new file mode 100644 index 0000000000000000000000000000000000000000..eeb576070df6ab6d3f9dfdf278414e6c3f3ca6b7 GIT binary patch literal 100 LcmZQzpgjNp0Av6G literal 0 HcmV?d00001 diff --git a/maps/TwoIsland.asm b/maps/TwoIsland.asm new file mode 100644 index 0000000..b6e202c --- /dev/null +++ b/maps/TwoIsland.asm @@ -0,0 +1,17 @@ + object_const_def + +TwoIsland_MapScripts: + def_scene_scripts + + def_callbacks + +TwoIsland_MapEvents: + db 0, 0 ; filler + + def_warp_events + + def_coord_events + + def_bg_events + + def_object_events \ No newline at end of file diff --git a/maps/UnderwaterTunnel.ablk b/maps/UnderwaterTunnel.ablk new file mode 100644 index 0000000000000000000000000000000000000000..eeb576070df6ab6d3f9dfdf278414e6c3f3ca6b7 GIT binary patch literal 100 LcmZQzpgjNp0Av6G literal 0 HcmV?d00001 diff --git a/maps/UnderwaterTunnel.asm b/maps/UnderwaterTunnel.asm new file mode 100644 index 0000000..57c722a --- /dev/null +++ b/maps/UnderwaterTunnel.asm @@ -0,0 +1,17 @@ + object_const_def + +UnderwaterTunnel_MapScripts: + def_scene_scripts + + def_callbacks + +UnderwaterTunnel_MapEvents: + db 0, 0 ; filler + + def_warp_events + + def_coord_events + + def_bg_events + + def_object_events \ No newline at end of file diff --git a/maps/WaterLabyrinth.ablk b/maps/WaterLabyrinth.ablk new file mode 100644 index 0000000000000000000000000000000000000000..eeb576070df6ab6d3f9dfdf278414e6c3f3ca6b7 GIT binary patch literal 100 LcmZQzpgjNp0Av6G literal 0 HcmV?d00001 diff --git a/maps/WaterLabyrinth.asm b/maps/WaterLabyrinth.asm new file mode 100644 index 0000000..2822787 --- /dev/null +++ b/maps/WaterLabyrinth.asm @@ -0,0 +1,17 @@ + object_const_def + +WaterLabyrinth_MapScripts: + def_scene_scripts + + def_callbacks + +WaterLabyrinth_MapEvents: + db 0, 0 ; filler + + def_warp_events + + def_coord_events + + def_bg_events + + def_object_events \ No newline at end of file diff --git a/maps/WaterPath.ablk b/maps/WaterPath.ablk new file mode 100644 index 0000000000000000000000000000000000000000..eeb576070df6ab6d3f9dfdf278414e6c3f3ca6b7 GIT binary patch literal 100 LcmZQzpgjNp0Av6G literal 0 HcmV?d00001 diff --git a/maps/WaterPath.asm b/maps/WaterPath.asm new file mode 100644 index 0000000..823e089 --- /dev/null +++ b/maps/WaterPath.asm @@ -0,0 +1,17 @@ + object_const_def + +WaterPath_MapScripts: + def_scene_scripts + + def_callbacks + +WaterPath_MapEvents: + db 0, 0 ; filler + + def_warp_events + + def_coord_events + + def_bg_events + + def_object_events \ No newline at end of file