From 486a3abf6b9904bbef7219ea66023ba6ac2bb886 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 1 Nov 2019 13:55:39 -0400 Subject: Finish splitting data_835B488 --- data/data_835B488.s | 359 ---------------------------------------------------- data/mon_markings.s | 31 +++++ data/region_map.s | 333 ++++++++++++++++++++++++++++++++++++++++++++++++ ld_script.txt | 4 +- 4 files changed, 366 insertions(+), 361 deletions(-) delete mode 100644 data/data_835B488.s create mode 100644 data/mon_markings.s create mode 100644 data/region_map.s diff --git a/data/data_835B488.s b/data/data_835B488.s deleted file mode 100644 index 1aa8ac3bb..000000000 --- a/data/data_835B488.s +++ /dev/null @@ -1,359 +0,0 @@ -#include "constants/maps.h" -#include "constants/species.h" - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2 - -gUnknown_83EE008:: @ 83EE008 - .incbin "baserom.gba", 0x3EE008, 0x20 - -gUnknown_83EE028:: @ 83EE028 - .incbin "baserom.gba", 0x3EE028, 0x808 - -gUnknown_83EE830:: @ 83EE830 - .incbin "baserom.gba", 0x3EE830, 0x8 - -gUnknown_83EE838:: @ 83EE838 - .incbin "baserom.gba", 0x3EE838, 0x58 - -gUnknown_83EE890:: @ 83EE890 - .incbin "baserom.gba", 0x3EE890, 0x38 - -gUnknown_83EE8C8:: @ 83EE8C8 - .incbin "baserom.gba", 0x3EE8C8, 0x8 - -gUnknown_83EE8D0:: @ 83EE8D0 - .incbin "baserom.gba", 0x3EE8D0, 0x88 - -gUnknown_83EE958:: @ 83EE958 - .incbin "baserom.gba", 0x3EE958, 0x40 - - .section .rodata.83EEC98 - - .include "data/text/map_section_names.inc" - -gUnknown_83EF23C:: @ 83EF23C - .incbin "baserom.gba", 0x3EF23C, 0x1E - -gUnknown_83EF25A:: @ 83EF25A - .incbin "baserom.gba", 0x3EF25A, 0x2 - -gUnknown_83EF25C:: @ 83EF25C - .incbin "baserom.gba", 0x3EF25C, 0x20 - -gUnknown_83EF27C:: @ 83EF27C - .incbin "baserom.gba", 0x3EF27C, 0x20 - -gUnknown_83EF29C:: @ 83EF29C - .incbin "baserom.gba", 0x3EF29C, 0x20 - -gUnknown_83EF2BC:: @ 83EF2BC - .incbin "baserom.gba", 0x3EF2BC, 0x20 - -gUnknown_83EF2DC:: @ 83EF2DC - .incbin "baserom.gba", 0x3EF2DC, 0x40 - -gUnknown_83EF31C:: @ 83EF31C - .incbin "baserom.gba", 0x3EF31C, 0x68 - -gUnknown_83EF384:: @ 83EF384 - .incbin "baserom.gba", 0x3EF384, 0x20 - -gUnknown_83EF3A4:: @ 83EF3A4 - .incbin "baserom.gba", 0x3EF3A4, 0x20 - -gUnknown_83EF3C4:: @ 83EF3C4 - .incbin "baserom.gba", 0x3EF3C4, 0x8C - -gUnknown_83EF450:: @ 83EF450 - .incbin "baserom.gba", 0x3EF450, 0x90 - -gUnknown_83EF4E0:: @ 83EF4E0 - .incbin "baserom.gba", 0x3EF4E0, 0x44 - -gUnknown_83EF524:: @ 83EF524 - .incbin "baserom.gba", 0x3EF524, 0x78 - -gUnknown_83EF59C:: @ 83EF59C - .incbin "baserom.gba", 0x3EF59C, 0x80 - -gUnknown_83EF61C:: @ 83EF61C - .incbin "baserom.gba", 0x3EF61C, 0xD14 - -gUnknown_83F0330:: @ 83F0330 - .incbin "baserom.gba", 0x3F0330, 0x250 - -gUnknown_83F0580:: @ 83F0580 - .incbin "baserom.gba", 0x3F0580, 0x31C - -gUnknown_83F089C:: @ 83F089C - .incbin "baserom.gba", 0x3F089C, 0x260 - -gUnknown_83F0AFC:: @ 83F0AFC - .incbin "baserom.gba", 0x3F0AFC, 0x110 - -gUnknown_83F0C0C:: @ 83F0C0C - .incbin "baserom.gba", 0x3F0C0C, 0xE4 - -gUnknown_83F0CF0:: @ 83F0CF0 - .incbin "baserom.gba", 0x3F0CF0, 0x11C - -gUnknown_83F0E0C:: @ 83F0E0C - .incbin "baserom.gba", 0x3F0E0C, 0x110 - -gUnknown_83F0F1C:: @ 83F0F1C - .incbin "baserom.gba", 0x3F0F1C, 0x168 - -gUnknown_83F1084:: @ 83F1084 - .incbin "baserom.gba", 0x3F1084, 0x10C - -gUnknown_83F1190:: @ 83F1190 - .incbin "baserom.gba", 0x3F1190, 0x13C - -gUnknown_83F12CC:: @ 83F12CC - .incbin "baserom.gba", 0x3F12CC, 0x120 - -gUnknown_83F13EC:: @ 83F13EC - .incbin "baserom.gba", 0x3F13EC, 0x164 - -gUnknown_83F1550:: @ 83F1550 - .incbin "baserom.gba", 0x3F1550, 0xF0 - -gUnknown_83F1640:: @ 83F1640 - .incbin "baserom.gba", 0x3F1640, 0xF8 - -gUnknown_83F1738:: @ 83F1738 - .incbin "baserom.gba", 0x3F1738, 0xCC - -gUnknown_83F1804:: @ 83F1804 - .incbin "baserom.gba", 0x3F1804, 0xD4 - -gUnknown_83F18D8:: @ 83F18D8 - .incbin "baserom.gba", 0x3F18D8, 0x30 - -gUnknown_83F1908:: @ 83F1908 - .incbin "baserom.gba", 0x3F1908, 0x70 - -gUnknown_83F1978:: @ 83F1978 - .incbin "baserom.gba", 0x3F1978, 0x28 - -gUnknown_83F19A0:: @ 83F19A0 - .incbin "baserom.gba", 0x3F19A0, 0xB0 - -gUnknown_83F1A50:: @ 83F1A50 - .incbin "baserom.gba", 0x3F1A50, 0x10 - -gUnknown_83F1A60:: @ 83F1A60 - .incbin "baserom.gba", 0x3F1A60, 0x30 - -gUnknown_83F1A90:: @ 83F1A90 - .incbin "baserom.gba", 0x3F1A90, 0x4 - -gUnknown_83F1A94:: @ 83F1A94 - .incbin "baserom.gba", 0x3F1A94, 0x8 - -gUnknown_83F1A9C:: @ 83F1A9C - .incbin "baserom.gba", 0x3F1A9C, 0x8 - -gUnknown_83F1AA4:: @ 83F1AA4 - .incbin "baserom.gba", 0x3F1AA4, 0x5C - -gUnknown_83F1B00:: @ 83F1B00 - .incbin "baserom.gba", 0x3F1B00, 0xC - -gUnknown_83F1B0C:: @ 83F1B0C - .incbin "baserom.gba", 0x3F1B0C, 0x8 - -gUnknown_83F1B14:: @ 83F1B14 - .incbin "baserom.gba", 0x3F1B14, 0x8 - -gUnknown_83F1B1C:: @ 83F1B1C - .incbin "baserom.gba", 0x3F1B1C, 0x8 - -gUnknown_83F1B24:: @ 83F1B24 - .incbin "baserom.gba", 0x3F1B24, 0x14 - -gUnknown_83F1B38:: @ 83F1B38 - .incbin "baserom.gba", 0x3F1B38, 0x4 - -gUnknown_83F1B3C:: @ 83F1B3C - .incbin "baserom.gba", 0x3F1B3C, 0xE4 - -gUnknown_83F1C20:: @ 83F1C20 - .incbin "baserom.gba", 0x3F1C20, 0x10 - -gUnknown_83F1C30:: @ 83F1C30 - .incbin "baserom.gba", 0x3F1C30, 0x4 - -gUnknown_83F1C34:: @ 83F1C34 - .incbin "baserom.gba", 0x3F1C34, 0x8 - -gUnknown_83F1C3C:: @ 83F1C3C - .incbin "baserom.gba", 0x3F1C3C, 0x14 - -gUnknown_83F1C50:: @ 83F1C50 - .incbin "baserom.gba", 0x3F1C50, 0x4 - -gUnknown_83F1C54:: @ 83F1C54 - .incbin "baserom.gba", 0x3F1C54, 0x10 - -gUnknown_83F1C64:: @ 83F1C64 - .incbin "baserom.gba", 0x3F1C64, 0x4 - -gUnknown_83F1C68:: @ 83F1C68 - .incbin "baserom.gba", 0x3F1C68, 0x8 - -gUnknown_83F1C70:: @ 83F1C70 - .incbin "baserom.gba", 0x3F1C70, 0x24 - -gUnknown_83F1C94:: @ 83F1C94 - .incbin "baserom.gba", 0x3F1C94, 0x4 - -gUnknown_83F1C98:: @ 83F1C98 - .incbin "baserom.gba", 0x3F1C98, 0x8 - -gUnknown_83F1CA0:: @ 83F1CA0 - .incbin "baserom.gba", 0x3F1CA0, 0x4 - -gUnknown_83F1CA4:: @ 83F1CA4 - .incbin "baserom.gba", 0x3F1CA4, 0x4 - -gUnknown_83F1CA8:: @ 83F1CA8 - .incbin "baserom.gba", 0x3F1CA8, 0x4 - -gUnknown_83F1CAC:: @ 83F1CAC - .4byte gMapSecName_PalletTown - .4byte gMapSecName_ViridianCity - .4byte gMapSecName_PewterCity - .4byte gMapSecName_CeruleanCity - .4byte gMapSecName_LavenderTown - .4byte gMapSecName_VermilionCity - .4byte gMapSecName_CeladonCity - .4byte gMapSecName_FuchsiaCity - .4byte gMapSecName_CinnabarIsland - .4byte gMapSecName_IndigoPlateau - .4byte gMapSecName_SaffronCity - .4byte gMapSecName_Route4 - .4byte gMapSecName_Route10 - .4byte gMapSecName_Route1 - .4byte gMapSecName_Route2 - .4byte gMapSecName_Route3 - .4byte gMapSecName_Route4_2 - .4byte gMapSecName_Route5 - .4byte gMapSecName_Route6 - .4byte gMapSecName_Route7 - .4byte gMapSecName_Route8 - .4byte gMapSecName_Route9 - .4byte gMapSecName_Route10_2 - .4byte gMapSecName_Route11 - .4byte gMapSecName_Route12 - .4byte gMapSecName_Route13 - .4byte gMapSecName_Route14 - .4byte gMapSecName_Route15 - .4byte gMapSecName_Route16 - .4byte gMapSecName_Route17 - .4byte gMapSecName_Route18 - .4byte gMapSecName_Route19 - .4byte gMapSecName_Route20 - .4byte gMapSecName_Route21 - .4byte gMapSecName_Route22 - .4byte gMapSecName_Route23 - .4byte gMapSecName_Route24 - .4byte gMapSecName_Route25 - .4byte gMapSecName_ViridianForest - .4byte gMapSecName_MtMoon - .4byte gMapSecName_SSAnne - .4byte gMapSecName_UndergroundPath - .4byte gMapSecName_UndergroundPath_2 - .4byte gMapSecName_DiglettsCave - .4byte gMapSecName_VictoryRoad - .4byte gMapSecName_RocketHideout - .4byte gMapSecName_SilphCo - .4byte gMapSecName_PokemonMansion - .4byte gMapSecName_SafariZone - .4byte gMapSecName_PokemonLeague - .4byte gMapSecName_RockTunnel - .4byte gMapSecName_SeafoamIslands - .4byte gMapSecName_PokemonTower - .4byte gMapSecName_CeruleanCave - .4byte gMapSecName_PowerPlant - .4byte gMapSecName_OneIsland - .4byte gMapSecName_TwoIsland - .4byte gMapSecName_ThreeIsland - .4byte gMapSecName_FourIsland - .4byte gMapSecName_FiveIsland - .4byte gMapSecName_SevenIsland - .4byte gMapSecName_SixIsland - .4byte gMapSecName_KindleRoad - .4byte gMapSecName_TreasureBeach - .4byte gMapSecName_CapeBrink - .4byte gMapSecName_BondBridge - .4byte gMapSecName_ThreeIslePort - .4byte gMapSecName_SeviiIsle6 - .4byte gMapSecName_SeviiIsle7 - .4byte gMapSecName_SeviiIsle8 - .4byte gMapSecName_SeviiIsle9 - .4byte gMapSecName_ResortGorgeous - .4byte gMapSecName_WaterLabyrinth - .4byte gMapSecName_FiveIsleMeadow - .4byte gMapSecName_MemorialPillar - .4byte gMapSecName_OutcastIsland - .4byte gMapSecName_GreenPath - .4byte gMapSecName_WaterPath - .4byte gMapSecName_RuinValley - .4byte gMapSecName_TrainerTower - .4byte gMapSecName_CanyonEntrance - .4byte gMapSecName_SevaultCanyon - .4byte gMapSecName_TanobyRuins - .4byte gMapSecName_SeviiIsle22 - .4byte gMapSecName_SeviiIsle23 - .4byte gMapSecName_SeviiIsle24 - .4byte gMapSecName_NavelRock - .4byte gMapSecName_MtEmber - .4byte gMapSecName_BerryForest - .4byte gMapSecName_IcefallCave - .4byte gMapSecName_RocketWarehouse - .4byte gMapSecName_TrainerTower_2 - .4byte gMapSecName_DottedHole - .4byte gMapSecName_LostCave - .4byte gMapSecName_PatternBush - .4byte gMapSecName_AlteringCave - .4byte gMapSecName_TanobyChambers - .4byte gMapSecName_ThreeIslePath - .4byte gMapSecName_TanobyKey - .4byte gMapSecName_BirthIsland - .4byte gMapSecName_MoneanChamber - .4byte gMapSecName_LiptooChamber - .4byte gMapSecName_WeepthChamber - .4byte gMapSecName_DilfordChamber - .4byte gMapSecName_ScufibChamber - .4byte gMapSecName_RixyChamber - .4byte gMapSecName_ViapoisChamber - .4byte gMapSecName_EmberSpa - .4byte gMapSecName_CeladonDept - -gUnknown_83F1E60:: @ 83F1E60 - .incbin "baserom.gba", 0x3F1E60, 0x318 - -gUnknown_83F2178:: @ 83F2178 - .incbin "baserom.gba", 0x3F2178, 0x318 - -gUnknown_83F2490:: @ 83F2490 - .incbin "baserom.gba", 0x3F2490, 0x294 - -gUnknown_83F2724:: @ 83F2724 - .incbin "baserom.gba", 0x3F2724, 0x294 - -gUnknown_83F29B8:: @ 83F29B8 - .incbin "baserom.gba", 0x3F29B8, 0x294 - -gUnknown_83F2C4C:: @ 83F2C4C - .incbin "baserom.gba", 0x3F2C4C, 0x294 - -gUnknown_83F2EE0:: @ 83F2EE0 - .incbin "baserom.gba", 0x3F2EE0, 0x144 - -gUnknown_83F3024:: @ 83F3024 - .incbin "baserom.gba", 0x3F3024, 0x2580 diff --git a/data/mon_markings.s b/data/mon_markings.s new file mode 100644 index 000000000..ff9529e50 --- /dev/null +++ b/data/mon_markings.s @@ -0,0 +1,31 @@ +#include "constants/maps.h" +#include "constants/species.h" + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + .align 2 + +gUnknown_83EE008:: @ 83EE008 + .incbin "baserom.gba", 0x3EE008, 0x20 + +gUnknown_83EE028:: @ 83EE028 + .incbin "baserom.gba", 0x3EE028, 0x808 + +gUnknown_83EE830:: @ 83EE830 + .incbin "baserom.gba", 0x3EE830, 0x8 + +gUnknown_83EE838:: @ 83EE838 + .incbin "baserom.gba", 0x3EE838, 0x58 + +gUnknown_83EE890:: @ 83EE890 + .incbin "baserom.gba", 0x3EE890, 0x38 + +gUnknown_83EE8C8:: @ 83EE8C8 + .incbin "baserom.gba", 0x3EE8C8, 0x8 + +gUnknown_83EE8D0:: @ 83EE8D0 + .incbin "baserom.gba", 0x3EE8D0, 0x88 + +gUnknown_83EE958:: @ 83EE958 + .incbin "baserom.gba", 0x3EE958, 0x40 diff --git a/data/region_map.s b/data/region_map.s new file mode 100644 index 000000000..610b09357 --- /dev/null +++ b/data/region_map.s @@ -0,0 +1,333 @@ +#include "constants/maps.h" +#include "constants/species.h" + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + .align 2 + + .include "data/text/map_section_names.inc" + +gUnknown_83EF23C:: @ 83EF23C + .incbin "baserom.gba", 0x3EF23C, 0x1E + +gUnknown_83EF25A:: @ 83EF25A + .incbin "baserom.gba", 0x3EF25A, 0x2 + +gUnknown_83EF25C:: @ 83EF25C + .incbin "baserom.gba", 0x3EF25C, 0x20 + +gUnknown_83EF27C:: @ 83EF27C + .incbin "baserom.gba", 0x3EF27C, 0x20 + +gUnknown_83EF29C:: @ 83EF29C + .incbin "baserom.gba", 0x3EF29C, 0x20 + +gUnknown_83EF2BC:: @ 83EF2BC + .incbin "baserom.gba", 0x3EF2BC, 0x20 + +gUnknown_83EF2DC:: @ 83EF2DC + .incbin "baserom.gba", 0x3EF2DC, 0x40 + +gUnknown_83EF31C:: @ 83EF31C + .incbin "baserom.gba", 0x3EF31C, 0x68 + +gUnknown_83EF384:: @ 83EF384 + .incbin "baserom.gba", 0x3EF384, 0x20 + +gUnknown_83EF3A4:: @ 83EF3A4 + .incbin "baserom.gba", 0x3EF3A4, 0x20 + +gUnknown_83EF3C4:: @ 83EF3C4 + .incbin "baserom.gba", 0x3EF3C4, 0x8C + +gUnknown_83EF450:: @ 83EF450 + .incbin "baserom.gba", 0x3EF450, 0x90 + +gUnknown_83EF4E0:: @ 83EF4E0 + .incbin "baserom.gba", 0x3EF4E0, 0x44 + +gUnknown_83EF524:: @ 83EF524 + .incbin "baserom.gba", 0x3EF524, 0x78 + +gUnknown_83EF59C:: @ 83EF59C + .incbin "baserom.gba", 0x3EF59C, 0x80 + +gUnknown_83EF61C:: @ 83EF61C + .incbin "baserom.gba", 0x3EF61C, 0xD14 + +gUnknown_83F0330:: @ 83F0330 + .incbin "baserom.gba", 0x3F0330, 0x250 + +gUnknown_83F0580:: @ 83F0580 + .incbin "baserom.gba", 0x3F0580, 0x31C + +gUnknown_83F089C:: @ 83F089C + .incbin "baserom.gba", 0x3F089C, 0x260 + +gUnknown_83F0AFC:: @ 83F0AFC + .incbin "baserom.gba", 0x3F0AFC, 0x110 + +gUnknown_83F0C0C:: @ 83F0C0C + .incbin "baserom.gba", 0x3F0C0C, 0xE4 + +gUnknown_83F0CF0:: @ 83F0CF0 + .incbin "baserom.gba", 0x3F0CF0, 0x11C + +gUnknown_83F0E0C:: @ 83F0E0C + .incbin "baserom.gba", 0x3F0E0C, 0x110 + +gUnknown_83F0F1C:: @ 83F0F1C + .incbin "baserom.gba", 0x3F0F1C, 0x168 + +gUnknown_83F1084:: @ 83F1084 + .incbin "baserom.gba", 0x3F1084, 0x10C + +gUnknown_83F1190:: @ 83F1190 + .incbin "baserom.gba", 0x3F1190, 0x13C + +gUnknown_83F12CC:: @ 83F12CC + .incbin "baserom.gba", 0x3F12CC, 0x120 + +gUnknown_83F13EC:: @ 83F13EC + .incbin "baserom.gba", 0x3F13EC, 0x164 + +gUnknown_83F1550:: @ 83F1550 + .incbin "baserom.gba", 0x3F1550, 0xF0 + +gUnknown_83F1640:: @ 83F1640 + .incbin "baserom.gba", 0x3F1640, 0xF8 + +gUnknown_83F1738:: @ 83F1738 + .incbin "baserom.gba", 0x3F1738, 0xCC + +gUnknown_83F1804:: @ 83F1804 + .incbin "baserom.gba", 0x3F1804, 0xD4 + +gUnknown_83F18D8:: @ 83F18D8 + .incbin "baserom.gba", 0x3F18D8, 0x30 + +gUnknown_83F1908:: @ 83F1908 + .incbin "baserom.gba", 0x3F1908, 0x70 + +gUnknown_83F1978:: @ 83F1978 + .incbin "baserom.gba", 0x3F1978, 0x28 + +gUnknown_83F19A0:: @ 83F19A0 + .incbin "baserom.gba", 0x3F19A0, 0xB0 + +gUnknown_83F1A50:: @ 83F1A50 + .incbin "baserom.gba", 0x3F1A50, 0x10 + +gUnknown_83F1A60:: @ 83F1A60 + .incbin "baserom.gba", 0x3F1A60, 0x30 + +gUnknown_83F1A90:: @ 83F1A90 + .incbin "baserom.gba", 0x3F1A90, 0x4 + +gUnknown_83F1A94:: @ 83F1A94 + .incbin "baserom.gba", 0x3F1A94, 0x8 + +gUnknown_83F1A9C:: @ 83F1A9C + .incbin "baserom.gba", 0x3F1A9C, 0x8 + +gUnknown_83F1AA4:: @ 83F1AA4 + .incbin "baserom.gba", 0x3F1AA4, 0x5C + +gUnknown_83F1B00:: @ 83F1B00 + .incbin "baserom.gba", 0x3F1B00, 0xC + +gUnknown_83F1B0C:: @ 83F1B0C + .incbin "baserom.gba", 0x3F1B0C, 0x8 + +gUnknown_83F1B14:: @ 83F1B14 + .incbin "baserom.gba", 0x3F1B14, 0x8 + +gUnknown_83F1B1C:: @ 83F1B1C + .incbin "baserom.gba", 0x3F1B1C, 0x8 + +gUnknown_83F1B24:: @ 83F1B24 + .incbin "baserom.gba", 0x3F1B24, 0x14 + +gUnknown_83F1B38:: @ 83F1B38 + .incbin "baserom.gba", 0x3F1B38, 0x4 + +gUnknown_83F1B3C:: @ 83F1B3C + .incbin "baserom.gba", 0x3F1B3C, 0xE4 + +gUnknown_83F1C20:: @ 83F1C20 + .incbin "baserom.gba", 0x3F1C20, 0x10 + +gUnknown_83F1C30:: @ 83F1C30 + .incbin "baserom.gba", 0x3F1C30, 0x4 + +gUnknown_83F1C34:: @ 83F1C34 + .incbin "baserom.gba", 0x3F1C34, 0x8 + +gUnknown_83F1C3C:: @ 83F1C3C + .incbin "baserom.gba", 0x3F1C3C, 0x14 + +gUnknown_83F1C50:: @ 83F1C50 + .incbin "baserom.gba", 0x3F1C50, 0x4 + +gUnknown_83F1C54:: @ 83F1C54 + .incbin "baserom.gba", 0x3F1C54, 0x10 + +gUnknown_83F1C64:: @ 83F1C64 + .incbin "baserom.gba", 0x3F1C64, 0x4 + +gUnknown_83F1C68:: @ 83F1C68 + .incbin "baserom.gba", 0x3F1C68, 0x8 + +gUnknown_83F1C70:: @ 83F1C70 + .incbin "baserom.gba", 0x3F1C70, 0x24 + +gUnknown_83F1C94:: @ 83F1C94 + .incbin "baserom.gba", 0x3F1C94, 0x4 + +gUnknown_83F1C98:: @ 83F1C98 + .incbin "baserom.gba", 0x3F1C98, 0x8 + +gUnknown_83F1CA0:: @ 83F1CA0 + .incbin "baserom.gba", 0x3F1CA0, 0x4 + +gUnknown_83F1CA4:: @ 83F1CA4 + .incbin "baserom.gba", 0x3F1CA4, 0x4 + +gUnknown_83F1CA8:: @ 83F1CA8 + .incbin "baserom.gba", 0x3F1CA8, 0x4 + +gUnknown_83F1CAC:: @ 83F1CAC + .4byte gMapSecName_PalletTown + .4byte gMapSecName_ViridianCity + .4byte gMapSecName_PewterCity + .4byte gMapSecName_CeruleanCity + .4byte gMapSecName_LavenderTown + .4byte gMapSecName_VermilionCity + .4byte gMapSecName_CeladonCity + .4byte gMapSecName_FuchsiaCity + .4byte gMapSecName_CinnabarIsland + .4byte gMapSecName_IndigoPlateau + .4byte gMapSecName_SaffronCity + .4byte gMapSecName_Route4 + .4byte gMapSecName_Route10 + .4byte gMapSecName_Route1 + .4byte gMapSecName_Route2 + .4byte gMapSecName_Route3 + .4byte gMapSecName_Route4_2 + .4byte gMapSecName_Route5 + .4byte gMapSecName_Route6 + .4byte gMapSecName_Route7 + .4byte gMapSecName_Route8 + .4byte gMapSecName_Route9 + .4byte gMapSecName_Route10_2 + .4byte gMapSecName_Route11 + .4byte gMapSecName_Route12 + .4byte gMapSecName_Route13 + .4byte gMapSecName_Route14 + .4byte gMapSecName_Route15 + .4byte gMapSecName_Route16 + .4byte gMapSecName_Route17 + .4byte gMapSecName_Route18 + .4byte gMapSecName_Route19 + .4byte gMapSecName_Route20 + .4byte gMapSecName_Route21 + .4byte gMapSecName_Route22 + .4byte gMapSecName_Route23 + .4byte gMapSecName_Route24 + .4byte gMapSecName_Route25 + .4byte gMapSecName_ViridianForest + .4byte gMapSecName_MtMoon + .4byte gMapSecName_SSAnne + .4byte gMapSecName_UndergroundPath + .4byte gMapSecName_UndergroundPath_2 + .4byte gMapSecName_DiglettsCave + .4byte gMapSecName_VictoryRoad + .4byte gMapSecName_RocketHideout + .4byte gMapSecName_SilphCo + .4byte gMapSecName_PokemonMansion + .4byte gMapSecName_SafariZone + .4byte gMapSecName_PokemonLeague + .4byte gMapSecName_RockTunnel + .4byte gMapSecName_SeafoamIslands + .4byte gMapSecName_PokemonTower + .4byte gMapSecName_CeruleanCave + .4byte gMapSecName_PowerPlant + .4byte gMapSecName_OneIsland + .4byte gMapSecName_TwoIsland + .4byte gMapSecName_ThreeIsland + .4byte gMapSecName_FourIsland + .4byte gMapSecName_FiveIsland + .4byte gMapSecName_SevenIsland + .4byte gMapSecName_SixIsland + .4byte gMapSecName_KindleRoad + .4byte gMapSecName_TreasureBeach + .4byte gMapSecName_CapeBrink + .4byte gMapSecName_BondBridge + .4byte gMapSecName_ThreeIslePort + .4byte gMapSecName_SeviiIsle6 + .4byte gMapSecName_SeviiIsle7 + .4byte gMapSecName_SeviiIsle8 + .4byte gMapSecName_SeviiIsle9 + .4byte gMapSecName_ResortGorgeous + .4byte gMapSecName_WaterLabyrinth + .4byte gMapSecName_FiveIsleMeadow + .4byte gMapSecName_MemorialPillar + .4byte gMapSecName_OutcastIsland + .4byte gMapSecName_GreenPath + .4byte gMapSecName_WaterPath + .4byte gMapSecName_RuinValley + .4byte gMapSecName_TrainerTower + .4byte gMapSecName_CanyonEntrance + .4byte gMapSecName_SevaultCanyon + .4byte gMapSecName_TanobyRuins + .4byte gMapSecName_SeviiIsle22 + .4byte gMapSecName_SeviiIsle23 + .4byte gMapSecName_SeviiIsle24 + .4byte gMapSecName_NavelRock + .4byte gMapSecName_MtEmber + .4byte gMapSecName_BerryForest + .4byte gMapSecName_IcefallCave + .4byte gMapSecName_RocketWarehouse + .4byte gMapSecName_TrainerTower_2 + .4byte gMapSecName_DottedHole + .4byte gMapSecName_LostCave + .4byte gMapSecName_PatternBush + .4byte gMapSecName_AlteringCave + .4byte gMapSecName_TanobyChambers + .4byte gMapSecName_ThreeIslePath + .4byte gMapSecName_TanobyKey + .4byte gMapSecName_BirthIsland + .4byte gMapSecName_MoneanChamber + .4byte gMapSecName_LiptooChamber + .4byte gMapSecName_WeepthChamber + .4byte gMapSecName_DilfordChamber + .4byte gMapSecName_ScufibChamber + .4byte gMapSecName_RixyChamber + .4byte gMapSecName_ViapoisChamber + .4byte gMapSecName_EmberSpa + .4byte gMapSecName_CeladonDept + +gUnknown_83F1E60:: @ 83F1E60 + .incbin "baserom.gba", 0x3F1E60, 0x318 + +gUnknown_83F2178:: @ 83F2178 + .incbin "baserom.gba", 0x3F2178, 0x318 + +gUnknown_83F2490:: @ 83F2490 + .incbin "baserom.gba", 0x3F2490, 0x294 + +gUnknown_83F2724:: @ 83F2724 + .incbin "baserom.gba", 0x3F2724, 0x294 + +gUnknown_83F29B8:: @ 83F29B8 + .incbin "baserom.gba", 0x3F29B8, 0x294 + +gUnknown_83F2C4C:: @ 83F2C4C + .incbin "baserom.gba", 0x3F2C4C, 0x294 + +gUnknown_83F2EE0:: @ 83F2EE0 + .incbin "baserom.gba", 0x3F2EE0, 0x144 + +gUnknown_83F3024:: @ 83F3024 + .incbin "baserom.gba", 0x3F3024, 0x2580 diff --git a/ld_script.txt b/ld_script.txt index fe033340e..02bf0d371 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -461,10 +461,10 @@ SECTIONS { src/battle_intro.o(.rodata); data/bike.o(.rodata); src/easy_chat.o(.rodata); - data/data_835B488.o(.rodata); + data/mon_markings.o(.rodata); src/mail.o(.rodata); src/heal_location.o(.rodata); - data/data_835B488.o(.rodata.83EEC98); + data/region_map.o(.rodata); src/battle_ai_script_commands.o(.rodata); data/data_83F5738.o(.rodata); src/field_specials.o(.rodata); -- cgit v1.2.3