moved strings + decompile simple store functions

1 files changed, 21 insertions, 15 deletions

diff --git a/src/d/map/d_map.cpp b/src/d/map/d_map.cpp
index 5486f66dd7..5f04dd65dc 100644
--- a/src/d/map/d_map.cpp
+++ b/src/d/map/d_map.cpp
@@ -386,7 +386,7 @@ SECTION_RODATA static u8 const l_iconSize[68] = {
     0xD7, 0x0A, 0x3D, 0xA3, 0xD7, 0x0A, 0x3D, 0xA3, 0xD7, 0x0A, 0x3D, 0xA3, 0xD7, 0x0A,
     0x3D, 0xA3, 0xD7, 0x0A, 0x3D, 0xA3, 0xD7, 0x0A, 0x3D, 0xA3, 0xD7, 0x0A,
 };
-COMPILER_STRIP_GATE(80378E48, &l_iconSize);
+COMPILER_STRIP_GATE(0x80378E48, &l_iconSize);
 
 /* 800284BC-800284D0 022DFC 0014+00 2/0 0/0 0/0 .text            getIconSize__15renderingAmap_cCFUc
  */
@@ -654,7 +654,7 @@ SECTION_RODATA static u8 const l_dungeon_offColor[36] = {
     0x04, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00,
     0x1C, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x24, 0x00, 0x00, 0x00,
 };
-COMPILER_STRIP_GATE(80378E8C, &l_dungeon_offColor);
+COMPILER_STRIP_GATE(0x80378E8C, &l_dungeon_offColor);
 #pragma pop
 
 /* 80378EB0-80378ED4 005510 0024+00 0/1 0/0 0/0 .rodata          l_dungeon_onColor$3938 */
@@ -665,7 +665,7 @@ SECTION_RODATA static u8 const l_dungeon_onColor[36] = {
     0x04, 0x00, 0x00, 0x00, 0x34, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00,
     0x3C, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x44, 0x00, 0x00, 0x00,
 };
-COMPILER_STRIP_GATE(80378EB0, &l_dungeon_onColor);
+COMPILER_STRIP_GATE(0x80378EB0, &l_dungeon_onColor);
 #pragma pop
 
 /* 80378ED4-80378EF8 005534 0024+00 0/1 0/0 0/0 .rodata          l_dungeon_stayColor$3939 */
@@ -676,7 +676,7 @@ SECTION_RODATA static u8 const l_dungeon_stayColor[36] = {
     0x04, 0x00, 0x00, 0x00, 0x54, 0x00, 0x00, 0x00, 0x58, 0x00, 0x00, 0x00,
     0x5C, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00,
 };
-COMPILER_STRIP_GATE(80378ED4, &l_dungeon_stayColor);
+COMPILER_STRIP_GATE(0x80378ED4, &l_dungeon_stayColor);
 #pragma pop
 
 /* 80028DF4-80028EE4 023734 00F0+00 1/0 0/0 0/0 .text            getColor__6dMap_cFi */
@@ -735,7 +735,7 @@ asm void renderingAmap_c::getLineColor(int param_0, int param_1) {
 SECTION_RODATA static u8 const colorTable[16] = {
     0xBC, 0x00, 0x00, 0x00, 0xC0, 0x00, 0x00, 0x00, 0xC4, 0x00, 0x00, 0x00, 0xC8, 0x00, 0x00, 0x00,
 };
-COMPILER_STRIP_GATE(80378EF8, &colorTable);
+COMPILER_STRIP_GATE(0x80378EF8, &colorTable);
 
 /* 80028FB4-80029038 0238F4 0084+00 2/0 0/0 0/0 .text getDecoLineColor__15renderingAmap_cFii */
 #pragma push
@@ -823,7 +823,7 @@ SECTION_RODATA static u8 const l_stayType[28] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
-COMPILER_STRIP_GATE(80378F08, &l_stayType);
+COMPILER_STRIP_GATE(0x80378F08, &l_stayType);
 
 /* 80029160-80029190 023AA0 0030+00 7/7 0/0 0/0 .text            getStayType__15renderingAmap_cCFv
  */
@@ -930,6 +930,12 @@ asm void dMap_c::resCopy() {
 #pragma pop
 
 /* ############################################################################################## */
+/* 80378F24-80378F24 005584 0000+00 0/0 0/0 0/0 .rodata          @stringBase0 */
+#pragma push
+#pragma force_active on
+SECTION_DEAD static char const* const stringBase_80378F24 = "Always";
+#pragma pop
+
 /* 803A6F6C-803A6F88 -00001 001C+00 1/1 0/0 0/0 .data            @4694 */
 SECTION_DATA static void* lit_4694[7] = {
     (void*)(((char*)_move__6dMap_cFffif) + 0x350), (void*)(((char*)_move__6dMap_cFffif) + 0x388),
@@ -1190,6 +1196,14 @@ asm void dMap_c::isDrawRoomIcon(int param_0, int param_1) const {
 #pragma pop
 
 /* ############################################################################################## */
+/* 80378F24-80378F24 005584 0000+00 0/0 0/0 0/0 .rodata          @stringBase0 */
+#pragma push
+#pragma force_active on
+SECTION_DEAD static char const* const stringBase_80378F2B = "F_SP121";
+/* @stringBase0 padding */
+SECTION_DEAD static char const* const pad_80378F33 = "\0\0\0\0";
+#pragma pop
+
 /* 80451CEC-80451CF0 0002EC 0004+00 1/1 0/0 0/0 .sdata2          @4688 */
 SECTION_SDATA2 static f32 lit_4688 = -3710.0f;
 
@@ -1425,12 +1439,4 @@ asm renderingDAmap_c::~renderingDAmap_c() {
 }
 #pragma pop
 
-/* 80378F24-80378F38 005584 000F+05 2/2 0/0 0/0 .rodata          @stringBase0 */
-#pragma push
-#pragma force_active on
-#pragma section ".dead"
-SECTION_DEAD static char const* const stringBase_80378F24 = "Always";
-SECTION_DEAD static char const* const stringBase_80378F2B = "F_SP121";
-/* @stringBase0 padding */
-SECTION_DEAD static char const* const pad_80378F33 = "\0\0\0\0";
-#pragma pop
+/* 80378F24-80378F24 005584 0000+00 0/0 0/0 0/0 .rodata          @stringBase0 */