summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/region_map.s70
-rw-r--r--data/text/map_section_names.inc327
2 files changed, 63 insertions, 334 deletions
diff --git a/data/region_map.s b/data/region_map.s
index 5d28f9503..e2ba5e5ac 100644
--- a/data/region_map.s
+++ b/data/region_map.s
@@ -7,8 +7,6 @@
.section .rodata
.align 2
- .include "data/text/map_section_names.inc"
-
gUnknown_83EF23C:: @ 83EF23C gbapal
.incbin "graphics/region_map/unk_83EF23C.gbapal"
@@ -239,16 +237,74 @@ gUnknown_83F1A9C:: @ 83F1A9C
.4byte gUnknown_83F1A94
.4byte gUnknown_83F1A98
-gUnknown_83F1AA4:: @ 83F1AA4
- .byte 0x8f, 0x90, 0x91, 0x96, 0x97, 0x98, 0x99, 0x9a, 0xaf, 0xb0, 0xb9, 0xc3, 0xc5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+sSeviiMapsecs:: @ 83F1AA4
+ .byte MAPSEC_ONE_ISLAND
+ .byte MAPSEC_TWO_ISLAND
+ .byte MAPSEC_THREE_ISLAND
+ .byte MAPSEC_KINDLE_ROAD
+ .byte MAPSEC_TREASURE_BEACH
+ .byte MAPSEC_CAPE_BRINK
+ .byte MAPSEC_BOND_BRIDGE
+ .byte MAPSEC_THREE_ISLE_PORT
+ .byte MAPSEC_MT_EMBER
+ .byte MAPSEC_BERRY_FOREST
+ .byte MAPSEC_THREE_ISLE_PATH
+ .byte MAPSEC_EMBER_SPA
+ .byte MAPSEC_NONE
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- .byte 0x92, 0x93, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f, 0xa0, 0xa1, 0xa2, 0xae, 0xb1, 0xb2, 0xb5, 0xc5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte MAPSEC_FOUR_ISLAND
+ .byte MAPSEC_FIVE_ISLAND
+ .byte MAPSEC_SEVII_ISLE_6
+ .byte MAPSEC_SEVII_ISLE_7
+ .byte MAPSEC_SEVII_ISLE_8
+ .byte MAPSEC_SEVII_ISLE_9
+ .byte MAPSEC_RESORT_GORGEOUS
+ .byte MAPSEC_WATER_LABYRINTH
+ .byte MAPSEC_FIVE_ISLE_MEADOW
+ .byte MAPSEC_MEMORIAL_PILLAR
+ .byte MAPSEC_NAVEL_ROCK
+ .byte MAPSEC_ICEFALL_CAVE
+ .byte MAPSEC_ROCKET_WAREHOUSE
+ .byte MAPSEC_LOST_CAVE
+ .byte MAPSEC_NONE
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- .byte 0x94, 0x95, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xb3, 0xb4, 0xb6, 0xb7, 0xb8, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf, 0xc0, 0xc1, 0xc2, 0xc5, 0x00, 0x00
+ .byte MAPSEC_SEVEN_ISLAND
+ .byte MAPSEC_SIX_ISLAND
+ .byte MAPSEC_OUTCAST_ISLAND
+ .byte MAPSEC_GREEN_PATH
+ .byte MAPSEC_WATER_PATH
+ .byte MAPSEC_RUIN_VALLEY
+ .byte MAPSEC_TRAINER_TOWER
+ .byte MAPSEC_CANYON_ENTRANCE
+ .byte MAPSEC_SEVAULT_CANYON
+ .byte MAPSEC_TANOBY_RUINS
+ .byte MAPSEC_SEVII_ISLE_22
+ .byte MAPSEC_SEVII_ISLE_23
+ .byte MAPSEC_SEVII_ISLE_24
+ .byte MAPSEC_TRAINER_TOWER_2
+ .byte MAPSEC_DOTTED_HOLE
+ .byte MAPSEC_PATTERN_BUSH
+ .byte MAPSEC_ALTERING_CAVE
+ .byte MAPSEC_TANOBY_CHAMBERS
+ .byte MAPSEC_TANOBY_KEY
+ .byte MAPSEC_BIRTH_ISLAND
+ .byte MAPSEC_MONEAN_CHAMBER
+ .byte MAPSEC_LIPTOO_CHAMBER
+ .byte MAPSEC_WEEPTH_CHAMBER
+ .byte MAPSEC_DILFORD_CHAMBER
+ .byte MAPSEC_SCUFIB_CHAMBER
+ .byte MAPSEC_RIXY_CHAMBER
+ .byte MAPSEC_VIAPOIS_CHAMBER
+ .byte MAPSEC_NONE
+ .byte 0x00, 0x00
.align 2
gUnknown_83F1B00:: @ 83F1B00
- .byte 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01
+ .byte 1, 1, 1, 0
+ .byte 0, 0, 0, 0
+ .byte 0, 0, 0, 1
gUnknown_83F1B0C:: @ 83F1B0C
.2byte 0x0018, 0x0010, 0x0090, 0x0020
diff --git a/data/text/map_section_names.inc b/data/text/map_section_names.inc
deleted file mode 100644
index 070375510..000000000
--- a/data/text/map_section_names.inc
+++ /dev/null
@@ -1,327 +0,0 @@
-gMapSecName_PalletTown::
- .string "PALLET TOWN$"
-
-gMapSecName_ViridianCity::
- .string "VIRIDIAN CITY$"
-
-gMapSecName_PewterCity::
- .string "PEWTER CITY$"
-
-gMapSecName_CeruleanCity::
- .string "CERULEAN CITY$"
-
-gMapSecName_LavenderTown::
- .string "LAVENDER TOWN$"
-
-gMapSecName_VermilionCity::
- .string "VERMILION CITY$"
-
-gMapSecName_CeladonCity::
- .string "CELADON CITY$"
-
-gMapSecName_FuchsiaCity::
- .string "FUCHSIA CITY$"
-
-gMapSecName_CinnabarIsland::
- .string "CINNABAR ISLAND$"
-
-gMapSecName_IndigoPlateau::
- .string "INDIGO PLATEAU$"
-
-gMapSecName_SaffronCity::
- .string "SAFFRON CITY$"
-
-gMapSecName_Route4::
- .string "ROUTE 4$"
-
-gMapSecName_Route10::
- .string "ROUTE 10$"
-
-gMapSecName_Route1::
- .string "ROUTE 1$"
-
-gMapSecName_Route2::
- .string "ROUTE 2$"
-
-gMapSecName_Route3::
- .string "ROUTE 3$"
-
-gMapSecName_Route4_2::
- .string "ROUTE 4$"
-
-gMapSecName_Route5::
- .string "ROUTE 5$"
-
-gMapSecName_Route6::
- .string "ROUTE 6$"
-
-gMapSecName_Route7::
- .string "ROUTE 7$"
-
-gMapSecName_Route8::
- .string "ROUTE 8$"
-
-gMapSecName_Route9::
- .string "ROUTE 9$"
-
-gMapSecName_Route10_2::
- .string "ROUTE 10$"
-
-gMapSecName_Route11::
- .string "ROUTE 11$"
-
-gMapSecName_Route12::
- .string "ROUTE 12$"
-
-gMapSecName_Route13::
- .string "ROUTE 13$"
-
-gMapSecName_Route14::
- .string "ROUTE 14$"
-
-gMapSecName_Route15::
- .string "ROUTE 15$"
-
-gMapSecName_Route16::
- .string "ROUTE 16$"
-
-gMapSecName_Route17::
- .string "ROUTE 17$"
-
-gMapSecName_Route18::
- .string "ROUTE 18$"
-
-gMapSecName_Route19::
- .string "ROUTE 19$"
-
-gMapSecName_Route20::
- .string "ROUTE 20$"
-
-gMapSecName_Route21::
- .string "ROUTE 21$"
-
-gMapSecName_Route22::
- .string "ROUTE 22$"
-
-gMapSecName_Route23::
- .string "ROUTE 23$"
-
-gMapSecName_Route24::
- .string "ROUTE 24$"
-
-gMapSecName_Route25::
- .string "ROUTE 25$"
-
-gMapSecName_ViridianForest::
- .string "VIRIDIAN FOREST$"
-
-gMapSecName_MtMoon::
- .string "MT. MOON$"
-
-gMapSecName_SSAnne::
- .string "S.S. ANNE$"
-
-gMapSecName_UndergroundPath::
- .string "UNDERGROUND PATH$"
-
-gMapSecName_UndergroundPath_2::
- .string "UNDERGROUND PATH$"
-
-gMapSecName_DiglettsCave::
- .string "DIGLETT'S CAVE$"
-
-gMapSecName_VictoryRoad::
- .string "VICTORY ROAD$"
-
-gMapSecName_RocketHideout::
- .string "ROCKET HIDEOUT$"
-
-gMapSecName_SilphCo::
- .string "SILPH CO.$"
-
-gMapSecName_PokemonMansion::
- .string "POKéMON MANSION$"
-
-gMapSecName_SafariZone::
- .string "SAFARI ZONE$"
-
-gMapSecName_PokemonLeague::
- .string "POKéMON LEAGUE$"
-
-gMapSecName_RockTunnel::
- .string "ROCK TUNNEL$"
-
-gMapSecName_SeafoamIslands::
- .string "SEAFOAM ISLANDS$"
-
-gMapSecName_PokemonTower::
- .string "POKéMON TOWER$"
-
-gMapSecName_CeruleanCave::
- .string "CERULEAN CAVE$"
-
-gMapSecName_PowerPlant::
- .string "POWER PLANT$"
-
-gMapSecName_OneIsland::
- .string "ONE ISLAND$"
-
-gMapSecName_TwoIsland::
- .string "TWO ISLAND$"
-
-gMapSecName_ThreeIsland::
- .string "THREE ISLAND$"
-
-gMapSecName_FourIsland::
- .string "FOUR ISLAND$"
-
-gMapSecName_FiveIsland::
- .string "FIVE ISLAND$"
-
-gMapSecName_SevenIsland::
- .string "SEVEN ISLAND$"
-
-gMapSecName_SixIsland::
- .string "SIX ISLAND$"
-
-gMapSecName_KindleRoad::
- .string "KINDLE ROAD$"
-
-gMapSecName_TreasureBeach::
- .string "TREASURE BEACH$"
-
-gMapSecName_CapeBrink::
- .string "CAPE BRINK$"
-
-gMapSecName_BondBridge::
- .string "BOND BRIDGE$"
-
-gMapSecName_ThreeIslePort::
- .string "THREE ISLE PORT$"
-
-gMapSecName_SeviiIsle6::
- .string "SEVII ISLE 6$"
-
-gMapSecName_SeviiIsle7::
- .string "SEVII ISLE 7$"
-
-gMapSecName_SeviiIsle8::
- .string "SEVII ISLE 8$"
-
-gMapSecName_SeviiIsle9::
- .string "SEVII ISLE 9$"
-
-gMapSecName_ResortGorgeous::
- .string "RESORT GORGEOUS$"
-
-gMapSecName_WaterLabyrinth::
- .string "WATER LABYRINTH$"
-
-gMapSecName_FiveIsleMeadow::
- .string "FIVE ISLE MEADOW$"
-
-gMapSecName_MemorialPillar::
- .string "MEMORIAL PILLAR$"
-
-gMapSecName_OutcastIsland::
- .string "OUTCAST ISLAND$"
-
-gMapSecName_GreenPath::
- .string "GREEN PATH$"
-
-gMapSecName_WaterPath::
- .string "WATER PATH$"
-
-gMapSecName_RuinValley::
- .string "RUIN VALLEY$"
-
-gMapSecName_TrainerTower::
- .string "TRAINER TOWER$"
-
-gMapSecName_CanyonEntrance::
- .string "CANYON ENTRANCE$"
-
-gMapSecName_SevaultCanyon::
- .string "SEVAULT CANYON$"
-
-gMapSecName_TanobyRuins::
- .string "TANOBY RUINS$"
-
-gMapSecName_SeviiIsle22::
- .string "SEVII ISLE 22$"
-
-gMapSecName_SeviiIsle23::
- .string "SEVII ISLE 23$"
-
-gMapSecName_SeviiIsle24::
- .string "SEVII ISLE 24$"
-
-gMapSecName_NavelRock::
- .string "NAVEL ROCK$"
-
-gMapSecName_MtEmber::
- .string "MT. EMBER$"
-
-gMapSecName_BerryForest::
- .string "BERRY FOREST$"
-
-gMapSecName_IcefallCave::
- .string "ICEFALL CAVE$"
-
-gMapSecName_RocketWarehouse::
- .string "ROCKET WAREHOUSE$"
-
-gMapSecName_TrainerTower_2::
- .string "TRAINER TOWER$"
-
-gMapSecName_DottedHole::
- .string "DOTTED HOLE$"
-
-gMapSecName_LostCave::
- .string "LOST CAVE$"
-
-gMapSecName_PatternBush::
- .string "PATTERN BUSH$"
-
-gMapSecName_AlteringCave::
- .string "ALTERING CAVE$"
-
-gMapSecName_TanobyChambers::
- .string "TANOBY CHAMBERS$"
-
-gMapSecName_ThreeIslePath::
- .string "THREE ISLE PATH$"
-
-gMapSecName_TanobyKey::
- .string "TANOBY KEY$"
-
-gMapSecName_BirthIsland::
- .string "BIRTH ISLAND$"
-
-gMapSecName_MoneanChamber::
- .string "MONEAN CHAMBER$"
-
-gMapSecName_LiptooChamber::
- .string "LIPTOO CHAMBER$"
-
-gMapSecName_WeepthChamber::
- .string "WEEPTH CHAMBER$"
-
-gMapSecName_DilfordChamber::
- .string "DILFORD CHAMBER$"
-
-gMapSecName_ScufibChamber::
- .string "SCUFIB CHAMBER$"
-
-gMapSecName_RixyChamber::
- .string "RIXY CHAMBER$"
-
-gMapSecName_ViapoisChamber::
- .string "VIAPOIS CHAMBER$"
-
-gMapSecName_EmberSpa::
- .string "EMBER SPA$"
-
-gMapSecName_CeladonDept::
- .string "CELADON DEPT.$"
-
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-05 20:11:00 +0000