dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

split unused layout incbins, dump layouts table

Browse Source
This commit is contained in:
garak
2019-04-14 22:45:38 -04:00
parent 5f49353de4
commit f07d747e61
7 changed files with 1618 additions and 1053 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/overworld.s
+2 -2
View File
@@ -722,7 +722,7 @@ get_mapdata_header: @ 8055170
.align 2, 0
_08055180: .4byte gSaveBlock1Ptr
_08055184:
ldr r0, _08055194 @ =gUnknown_834EB8C
ldr r0, _08055194 @ =gMapLayouts
subs r1, 0x1
lsls r1, 2
adds r1, r0
@@ -731,7 +731,7 @@ _0805518E:
pop {r1}
bx r1
.align 2, 0
_08055194: .4byte gUnknown_834EB8C
_08055194: .4byte gMapLayouts
thumb_func_end get_mapdata_header
thumb_func_start warp_shift
asm/teachy_tv.s
+2 -2
View File
@@ -2273,7 +2273,7 @@ sub_815BD80: @ 815BD80
str r0, [sp, 0x4]
movs r0, 0
str r0, [sp, 0x10]
ldr r1, _0815BE1C @ =gUnknown_82E55CC
ldr r1, _0815BE1C @ =gMapData_82E55CC
mov r8, r1
movs r0, 0x80
lsls r0, 4
@@ -2339,7 +2339,7 @@ _0815BDF0:
ldrh r0, [r6]
b _0815BE34
.align 2, 0
_0815BE1C: .4byte gUnknown_82E55CC
_0815BE1C: .4byte gMapData_82E55CC
_0815BE20: .4byte 0x000003ff
_0815BE24:
adds r0, r3, 0x1
data/data.s
-1049
View File
File diff suppressed because it is too large Load Diff
data/layouts/layouts.inc
+1211
View File
File diff suppressed because it is too large Load Diff
data/layouts/layouts_table.inc
+385
View File
@@ -0,0 +1,385 @@
.align 2
gMapLayouts:: @ 834EB8C
.4byte gMapData_PalletTown_PlayersHouse_1F
.4byte gMapData_PalletTown_PlayersHouse_2F
.4byte gMapData_PalletTown_GarysHouse
.4byte gMapData_82D54D8
.4byte gMapData_PalletTown_ProfessorOaksLab
.4byte gMapData_Route16_House
.4byte gMapData_UnusedHouse_29_00
.4byte gMapData_SixIsland_PokemonCenter_1F
.4byte gMapData_SixIsland_PokemonCenter_2F
.4byte gMapData_SixIsland_Mart
.4byte gMapData_SevenIsland_SevaultCanyon_House
.4byte gMapData_CeruleanCity_Gym
.4byte gMapData_SixIsland_WaterPath_House1
.4byte gMapData_82D6144
.4byte gMapData_CeladonCity_Gym
.4byte gMapData_82D6490
.4byte gMapData_FiveIsland_ResortGorgeous_House
.4byte gMapData_82D6654
.4byte gMapData_82D672C
.4byte gMapData_FuchsiaCity_Gym
.4byte gMapData_SaffronCity_House3
.4byte NULL
.4byte NULL
.4byte gMapData_82D6C34
.4byte gMapData_VermilionCity_Gym
.4byte gMapData_CeruleanCity_BikeShop
.4byte gMapData_CeladonCity_GameCorner
.4byte gMapData_PewterCity_Gym
.4byte NULL
.4byte gMapData_FourIsland_LoreleisHouse
.4byte gMapData_ThreeIsland_House1
.4byte gMapData_82D75F0
.4byte gMapData_82D7674
.4byte gMapData_SaffronCity_Gym
.4byte gMapData_82D7CC8
.4byte gMapData_CinnabarIsland_Gym
.4byte gMapData_ViridianCity_Gym
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte gMapData_82D88C8
.4byte gMapData_UnknownMap_00_00
.4byte gMapData_UnknownMap_00_01
.4byte gMapData_UnknownMap_00_02
.4byte gMapData_UnknownMap_00_03
.4byte gMapData_FuchsiaCity_SafariZone_Entrance
.4byte gMapData_82D9B24
.4byte gMapData_82DA7C8
.4byte gMapData_82DB46C
.4byte gMapData_82DB4F0
.4byte NULL
.4byte gMapData_82DBBE0
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte gMapData_82DBDD8
.4byte gMapData_82DBFB8
.4byte gMapData_82DC4EC
.4byte gMapData_82DC60C
.4byte gMapData_82DC72C
.4byte gMapData_82DC84C
.4byte gMapData_82DCA70
.4byte gMapData_82DCB44
.4byte gMapData_82DCC40
.4byte gMapData_82DCCD4
.4byte gMapData_82DCD68
.4byte gMapData_82DCDFC
.4byte gMapData_82DCF00
.4byte gMapData_82DD004
.4byte NULL
.4byte gMapData_82DD0DC
.4byte gMapData_PalletTown
.4byte gMapData_ViridianCity
.4byte gMapData_PewterCity
.4byte gMapData_CeruleanCity
.4byte gMapData_LavenderTown
.4byte gMapData_VermilionCity
.4byte gMapData_CeladonCity
.4byte gMapData_FuchsiaCity
.4byte gMapData_CinnabarIsland
.4byte gMapData_IndigoPlateau_Exterior
.4byte gMapData_SaffronCity
.4byte gMapData_82E55CC
.4byte gMapData_Route2
.4byte gMapData_Route3
.4byte gMapData_Route4
.4byte gMapData_Route5
.4byte gMapData_Route6
.4byte gMapData_Route7
.4byte gMapData_Route8
.4byte gMapData_Route9
.4byte gMapData_Route10
.4byte gMapData_Route11
.4byte gMapData_Route12
.4byte gMapData_Route13
.4byte gMapData_Route14
.4byte gMapData_Route15
.4byte gMapData_Route16
.4byte gMapData_Route17
.4byte gMapData_Route18
.4byte gMapData_Route19
.4byte gMapData_Route20
.4byte gMapData_Route21_North
.4byte gMapData_Route22
.4byte gMapData_Route23
.4byte gMapData_Route24
.4byte gMapData_Route25
.4byte gMapData_MtMoon_1F
.4byte gMapData_MtMoon_B1F
.4byte gMapData_MtMoon_B2F
.4byte gMapData_ViridianForest
.4byte gMapData_SSAnne_Exterior
.4byte gMapData_SSAnne_1F_Corridor
.4byte gMapData_SSAnne_2F_Corridor
.4byte gMapData_SSAnne_3F_Corridor
.4byte gMapData_SSAnne_B1F_Corridor
.4byte gMapData_SSAnne_Deck
.4byte gMapData_DiglettsCave_B1F
.4byte gMapData_VictoryRoad_1F
.4byte gMapData_VictoryRoad_2F
.4byte gMapData_VictoryRoad_3F
.4byte gMapData_RocketHideout_B1F
.4byte gMapData_RocketHideout_B2F
.4byte gMapData_RocketHideout_B3F
.4byte gMapData_RocketHideout_B4F
.4byte gMapData_SilphCo_1F
.4byte gMapData_SilphCo_2F
.4byte gMapData_SilphCo_3F
.4byte gMapData_SilphCo_4F
.4byte gMapData_SilphCo_5F
.4byte gMapData_SilphCo_6F
.4byte gMapData_SilphCo_7F
.4byte gMapData_SilphCo_8F
.4byte gMapData_SilphCo_9F
.4byte gMapData_SilphCo_10F
.4byte gMapData_SilphCo_11F
.4byte gMapData_PokemonMansion_1F
.4byte gMapData_PokemonMansion_2F
.4byte gMapData_PokemonMansion_3F
.4byte gMapData_PokemonMansion_B1F
.4byte gMapData_SafariZone_Center
.4byte gMapData_SafariZone_East
.4byte gMapData_SafariZone_North
.4byte gMapData_SafariZone_West
.4byte gMapData_CeruleanCave_1F
.4byte gMapData_CeruleanCave_2F
.4byte gMapData_CeruleanCave_B1F
.4byte gMapData_RockTunnel_1F
.4byte gMapData_RockTunnel_B1F
.4byte gMapData_SeafoamIslands_1F
.4byte gMapData_SeafoamIslands_B1F
.4byte gMapData_SeafoamIslands_B2F
.4byte gMapData_SeafoamIslands_B3F
.4byte gMapData_SeafoamIslands_B4F
.4byte gMapData_PokemonTower_1F
.4byte gMapData_PokemonTower_2F
.4byte gMapData_PokemonTower_3F
.4byte gMapData_PokemonTower_4F
.4byte gMapData_PokemonTower_5F
.4byte gMapData_PokemonTower_6F
.4byte gMapData_PokemonTower_7F
.4byte gMapData_PowerPlant
.4byte gMapData_Route25_SeaCottage
.4byte gMapData_SSAnne_Kitchen
.4byte gMapData_SSAnne_CaptainsOffice
.4byte gMapData_UndergroundPath_EastEntrance
.4byte gMapData_UndergroundPath_EastWestTunnel
.4byte gMapData_UndergroundPath_NorthSouthTunnel
.4byte NULL
.4byte gMapData_Route12_NorthEntrance_1F
.4byte gMapData_SSAnne_1F_Room6
.4byte gMapData_SSAnne_B1F_Room5
.4byte gMapData_CeladonCity_DepartmentStore_Elevator
.4byte gMapData_PewterCity_Museum_1F
.4byte gMapData_PewterCity_Museum_2F
.4byte gMapData_CeruleanCity_House2
.4byte gMapData_CeruleanCity_House1
.4byte gMapData_CeladonCity_Condominiums_1F
.4byte gMapData_CeladonCity_Condominiums_2F
.4byte gMapData_CeladonCity_Condominiums_3F
.4byte gMapData_CeladonCity_Condominiums_Roof
.4byte gMapData_CeladonCity_Condominiums_RoofRoom
.4byte gMapData_CeladonCity_GameCorner_PrizeRoom
.4byte gMapData_CeladonCity_Restaurant
.4byte gMapData_CeladonCity_Hotel
.4byte gMapData_CeladonCity_DepartmentStore_1F
.4byte gMapData_CeladonCity_DepartmentStore_2F
.4byte gMapData_CeladonCity_DepartmentStore_3F
.4byte gMapData_CeladonCity_DepartmentStore_4F
.4byte gMapData_CeladonCity_DepartmentStore_5F
.4byte gMapData_CeladonCity_DepartmentStore_Roof
.4byte gMapData_SafariZone_Building4
.4byte gMapData_SafariZone_SecretHouse
.4byte gMapData_FuchsiaCity_ZooBuilding
.4byte gMapData_FuchsiaCity_Building1
.4byte gMapData_FuchsiaCity_House2
.4byte gMapData_CinnabarIsland_PokemonLab_Entrance
.4byte gMapData_CinnabarIsland_PokemonLab_Lounge
.4byte gMapData_CinnabarIsland_PokemonLab_ResearchRoom
.4byte gMapData_CinnabarIsland_PokemonLab_ExperimentRoom
.4byte gMapData_SaffronCity_Duplicate
.4byte gMapData_Route6_NorthEntrance
.4byte gMapData_Route8_WestEntrance
.4byte gMapData_DiglettsCave_NorthEntrance
.4byte gMapData_DiglettsCave_SouthEntrance
.4byte gMapData_IndigoPlateau_PokemonCenter_1F
.4byte gMapData_PokemonLeague_LoreleisRoom
.4byte gMapData_PokemonLeague_BrunosRoom
.4byte gMapData_PokemonLeague_AgathasRoom
.4byte gMapData_PokemonLeague_LancesRoom
.4byte gMapData_PokemonLeague_ChampionsRoom
.4byte gMapData_PokemonLeague_HallOfFame
.4byte gMapData_Route21_South
.4byte gMapData_Route18_EastEntrance_2F
.4byte gMapData_Route2_ViridianForest_NorthEntrance
.4byte gMapData_Route22_NorthEntrance
.4byte gMapData_Route16_NorthEntrance_1F
.4byte gMapData_Route18_EastEntrance_1F
.4byte gMapData_RocketHideout_Elevator
.4byte gMapData_SaffronCity_House1_1F
.4byte gMapData_SaffronCity_House1_2F
.4byte gMapData_SaffronCity_Dojo
.4byte gMapData_SilphCo_Elevator
.4byte gMapData_OneIsland
.4byte gMapData_TwoIsland
.4byte gMapData_ThreeIsland
.4byte gMapData_FourIsland
.4byte gMapData_FiveIsland
.4byte gMapData_SevenIsland
.4byte gMapData_SixIsland
.4byte gMapData_OneIsland_KindleRoad
.4byte gMapData_OneIsland_TreasureBeach
.4byte gMapData_TwoIsland_CapeBrink
.4byte gMapData_ThreeIsland_BondBridge
.4byte gMapData_ThreeIsland_Port
.4byte gMapData_UnknownMap_03_50
.4byte gMapData_UnknownMap_03_51
.4byte gMapData_UnknownMap_03_52
.4byte gMapData_UnknownMap_03_53
.4byte gMapData_FiveIsland_ResortGorgeous
.4byte gMapData_FiveIsland_WaterLabyrinth
.4byte gMapData_FiveIsland_Meadow
.4byte gMapData_FiveIsland_MemorialPillar
.4byte gMapData_SixIsland_OutcastIsland
.4byte gMapData_SixIsland_GreenPath
.4byte gMapData_SixIsland_WaterPath
.4byte gMapData_SixIsland_RuinValley
.4byte gMapData_SevenIsland_TrainerTower
.4byte gMapData_SevenIsland_SevaultCanyon_Entrance
.4byte gMapData_SevenIsland_SevaultCanyon
.4byte gMapData_SevenIsland_TanobyRuins
.4byte gMapData_833614C
.4byte gMapData_83377F0
.4byte gMapData_8338354
.4byte gMapData_8338738
.4byte gMapData_UnknownMap_00_04
.4byte gMapData_SaffronCity_PokemonTrainerFanClub
.4byte gMapData_8338B4C
.4byte gMapData_SevenIsland_House_Room2
.4byte gMapData_ViridianCity_House2
.4byte gMapData_8338E90
.4byte gMapData_833902C
.4byte gMapData_MtEmber_RubyPath_B4F
.4byte gMapData_ThreeIsland_BerryForest
.4byte gMapData_OneIsland_PokemonCenter_1F
.4byte gMapData_TwoIsland_JoyfulGameCorner
.4byte gMapData_VermilionCity_PokemonFanClub
.4byte gMapData_LavenderTown_VolunteerPokemonHouse
.4byte gMapData_Route5_PokemonDayCare
.4byte gMapData_ViridianCity_House1
.4byte gMapData_FourIsland_PokemonDayCare
.4byte gMapData_833B6EC
.4byte gMapData_833BE30
.4byte gMapData_MtEmber_Exterior
.4byte gMapData_MtEmber_Summit
.4byte gMapData_MtEmber_SummitPath_1F
.4byte gMapData_MtEmber_SummitPath_2F
.4byte gMapData_MtEmber_SummitPath_3F
.4byte gMapData_SSAnne_Kitchen3
.4byte gMapData_MtEmber_RubyPath_B1F
.4byte gMapData_MtEmber_RubyPath_B2F
.4byte gMapData_MtEmber_RubyPath_B3F
.4byte gMapData_MtEmber_RubyPath_B1F_Stairs
.4byte gMapData_MtEmber_RubyPath_B2F_Stairs
.4byte gMapData_MtEmber_RubyPath_B5F
.4byte gMapData_SSAnne_CaptainsOffice4
.4byte gMapData_FourIsland_IcefallCave_Entrance
.4byte gMapData_FourIsland_IcefallCave_1F
.4byte gMapData_SSAnne_CaptainsOffice2
.4byte gMapData_SSAnne_CaptainsOffice3
.4byte gMapData_SevenIsland_TrainerTower_Lobby
.4byte gMapData_SevenIsland_TrainerTower_1F
.4byte gMapData_SevenIsland_TrainerTower_2F
.4byte gMapData_SevenIsland_TrainerTower_3F
.4byte gMapData_SevenIsland_TrainerTower_4F
.4byte gMapData_SevenIsland_TrainerTower_5F
.4byte gMapData_SevenIsland_TrainerTower_6F
.4byte gMapData_SevenIsland_TrainerTower_7F
.4byte gMapData_SevenIsland_TrainerTower_8F
.4byte gMapData_SevenIsland_TrainerTower_Roof
.4byte gMapData_SevenIsland_TrainerTower_Elevator
.4byte gMapData_CeruleanCity_House5
.4byte gMapData_SSAnne_CaptainsOffice5
.4byte gMapData_SixIsland_DottedHole_B1F
.4byte gMapData_SixIsland_DottedHole_B2F
.4byte gMapData_SixIsland_DottedHole_B3F
.4byte gMapData_SSAnne_CaptainsOffice9
.4byte gMapData_SixIsland_DottedHole_SapphireRoom
.4byte gMapData_ThreeIsland_Harbor
.4byte gMapData_OneIsland_PokemonCenter_2F
.4byte gMapData_SSAnne_1F_Room11
.4byte gMapData_ThreeIsland_DunsparceTunnel
.4byte gMapData_83453C0
.4byte gMapData_FiveIsland_LostCave_Entrance
.4byte gMapData_FiveIsland_LostCave_Room1
.4byte gMapData_FiveIsland_LostCave_Room2
.4byte gMapData_FiveIsland_LostCave_Room3
.4byte gMapData_FiveIsland_LostCave_Room4
.4byte gMapData_FiveIsland_LostCave_Room5
.4byte gMapData_FiveIsland_LostCave_Room6
.4byte gMapData_FiveIsland_LostCave_Room7
.4byte gMapData_FiveIsland_LostCave_Room8
.4byte gMapData_FiveIsland_LostCave_Room9
.4byte gMapData_FiveIsland_LostCave_Room10
.4byte gMapData_FiveIsland_LostCave_Room11
.4byte gMapData_FiveIsland_LostCave_Room12
.4byte gMapData_FiveIsland_LostCave_Room13
.4byte gMapData_FiveIsland_LostCave_Room14
.4byte gMapData_SevenIsland_TanobyRuins_MoneanChamber
.4byte gMapData_SevenIsland_TanobyRuins_LiptooChamber
.4byte gMapData_SevenIsland_TanobyRuins_WeepthChamber
.4byte gMapData_SevenIsland_TanobyRuins_DilfordChamber
.4byte gMapData_SevenIsland_TanobyRuins_ScufibChamber
.4byte gMapData_SSAnne_1F_Room12
.4byte gMapData_SevenIsland_SeavaultCanyon_TanobyKey
.4byte gMapData_BirthIsland_Exterior
.4byte gMapData_NavelRock_Exterior
.4byte gMapData_NavelRock_1F
.4byte gMapData_NavelRock_Summit
.4byte gMapData_NavelRock_Base
.4byte gMapData_NavelRock_SummitPath_2F
.4byte gMapData_NavelRock_SummitPath_3F
.4byte gMapData_NavelRock_SummitPath_4F
.4byte gMapData_NavelRock_SummitPath_5F
.4byte gMapData_NavelRock_BasePath_B1F
.4byte gMapData_NavelRock_BasePath_B2F
.4byte gMapData_NavelRock_BasePath_B3F
.4byte gMapData_NavelRock_BasePath_B4F
.4byte gMapData_NavelRock_BasePath_B5F
.4byte gMapData_NavelRock_BasePath_B6F
.4byte gMapData_NavelRock_BasePath_B7F
.4byte gMapData_NavelRock_BasePath_B8F
.4byte gMapData_NavelRock_BasePath_B9F
.4byte gMapData_NavelRock_BasePath_B10F
.4byte gMapData_NavelRock_BasePath_B11F
.4byte gMapData_SevenIsland_TanobyRuins_RixyChamber
.4byte gMapData_SevenIsland_TanobyRuins_ViapoisChamber
.4byte gMapData_NavelRock_B1F
.4byte gMapData_NavelRock_Fork
.4byte gMapData_834BC2C
.4byte gMapData_834BEB4
.4byte gMapData_834C13C
.4byte gMapData_834C3C4
.4byte gMapData_834C64C
.4byte gMapData_834C8D4
.4byte gMapData_834CB5C
.4byte gMapData_834CDE4
.4byte gMapData_834D06C
.4byte gMapData_834D2F4
.4byte gMapData_834D57C
.4byte gMapData_834D804
.4byte gMapData_834DA8C
.4byte gMapData_834DD14
.4byte gMapData_834DF9C
.4byte gMapData_834E224
.4byte gMapData_SevenIsland_House_Room1
.4byte gMapData_OneIsland_KindleRoad_EmberSpa
data/maps.s
+17
View File
@@ -0,0 +1,17 @@
@#include "constants/layouts.h"
@#include "constants/map_types.h"
#include "constants/maps.h"
@#include "constants/weather.h"
@#include "constants/region_map_sections.h"
#include "constants/songs.h"
@#include "constants/weather.h"
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.include "data/layouts/layouts.inc"
.include "data/layouts/layouts_table.inc"
@ .include "data/maps/headers.inc"
.include "data/maps/groups.inc"
@ .include "data/maps/connections.inc"
ld_script.txt
+1
View File
@@ -367,6 +367,7 @@ SECTIONS {
src/util.o(.rodata);
src/daycare.o(.rodata);
data/data.o(.rodata.825EF0C);
data/maps.o(.rodata);
data/connections.o(.rodata);
src/fieldmap.o(.rodata);
src/metatile_behavior.o(.rodata);