Data support

include/variables.h

@@ -49,8 +49,6 @@ extern s16* D_80151328;
 extern s16 D_8010CD10;
 extern s16 D_8010CD12;
 extern s32 D_801595A0;
-extern char gCloudyFlowerFieldsBg[]; // "fla_bg"
-extern char gSunnyFlowerFieldsBg[];  // "flb_bg"
 extern BackgroundHeader gBackgroundImage;
 extern s8 D_8014F12F;
 

papermario.ld

@@ -210,6 +210,8 @@ SECTIONS
         build/src/code_de740_len_23f0.o(.text);
         build/src/code_e0b30_len_b80.o(.text);
         build/bin/code_E16B0.o(.data);
+        build/src/code_dc470_len_14c0.o(.data);
+        build/bin/code_E5830.o(.data);
     }
 
     /* 0x802C3000 E79B0-FEE30 (len 17480) */

src/code_dc470_len_14c0.c

@@ -1,5 +1,9 @@
 #include "common.h"
 
+char gCloudyFlowerFieldsBg[] = "fla_bg";
+char gSunnyFlowerFieldsBg[] = "flb_bg";
+s8 D_8014F12F = 0;
+
 void load_map_bg(char* optAssetName) {
     UNK_PTR compressedData;
     u32 assetSize;

tools/n64splat

@@ -1 +1 @@
-Subproject commit 976e90983e073b575a85294afcab39494012221c
+Subproject commit 1a525eafd798840e3b1d8bb7d543aa26d3014a3d

tools/splat.yaml

@@ -219,6 +219,8 @@ segments:
     - [0xde740, "c", "code_de740_len_23f0"]
     - [0xe0b30, "c", "code_e0b30_len_b80"]
     - [0xe16b0, "bin"]
+    - [0xE5820, ".data", "code_dc470_len_14c0"]
+    - [0xE5830, "bin"]
   - name: code
     type: code
     start: 0xE79B0

undefined_syms.txt

@@ -60,9 +60,6 @@ D_00316D90 = 0x00316D90;
 D_00316F30 = 0x00316F30;
 
 D_8010D000 = 0x8010D000;
-gCloudyFlowerFieldsBg = 0x8014F120;
-gSunnyFlowerFieldsBg = 0x8014F128;
-D_8014F12F = 0x8014F12F;
 D_8014F140 = 0x8014F140;
 D_80151308 = 0x80151308;
 D_80151328 = 0x80151328;