Changed `rodata` to `data`

include/common.h

@@ -554,13 +554,13 @@ extern Gfx* PTR_DISPLAY_LIST;
 
 extern Gfx DISPLAY_LIST_8018FC80[];
 
-extern const Vp obVpMinResolution;
-extern const Vp obVpMaxResolution;
+extern Vp obVpMinResolution;
+extern Vp obVpMaxResolution;
 
-extern const Gfx obDlSetupMinResolution[];
-extern const Gfx obDlSetupMaxResolution[];
+extern Gfx obDlSetupMinResolution[];
+extern Gfx obDlSetupMaxResolution[];
 
-extern const Lights2 LIGHTS_801869A0;
+extern Lights2 LIGHTS_801869A0;
 
 extern SomethingMusic __MAYBE_SONG_800EB0B0;
 extern SomethingMusic __MAYBE_SONG_800EB100;

splat.yaml

@@ -390,7 +390,6 @@ segments:
       - [0x49820, asm, "segment_obdata/ob_hardy_thrill"]
       - [0x49A30, asm, "segment_obdata/ob_worthless_drawer"]
       - [0x4D5C0, asm, "segment_obdata/ob_blessed_magic"]
-      # - [0x4EF10, c, "ob_pumped_books"]
       - [0x4EF10, asm, "segment_obdata/ob_pumped_books"]
       - [0x514B0, asm, "segment_obdata/ob_squeamish_mask"]
       - [0x564D0, asm, "segment_obdata/ob_empty_quill"]
@@ -400,38 +399,40 @@ segments:
       - [0x5C060, asm, "segment_obdata/ob_hallowed_class"]
       - [0x5C1D0, asm, "segment_obdata/ob_driven_channel"]
 
-      - [0x5C210, .rodata, "segment_obdata/vpres"]
-      - [0x5C280, .rodata, "gfx/dpfillrect"]
-      - [0x5C510, .rodata, "gfx/dpfilltex"]
-      - [0x5C8A0, .rodata, "gfx/ob_mutual_ball"]
-      - [0x5CAD0, .rodata, "gfx/ob_thick_bikes"]
-      - [0x5CB60, .rodata, "gfx/ob_hospitable_friends"]
-      - [0x5CC00, .rodata, "gfx/ob_broad_badge"]
-      - [0x5CC90, rodata]
-      - [0x5CCD0, rodata]
-      - [0x5CD20, rodata]
-      - [0x5CD70, rodata]
-      - [0x5CEF0, rodata]
-      - [0x5CF00, rodata]
-      - [0x5CF20, rodata]
-      - [0x5CF30, rodata]
-      - [0x5D560, rodata]
-      - [0x613B0, rodata]
-      - [0x647F0, rodata, "segment_obdata/ob_hard_hands"]
-      - [0x650A0, rodata]
-      - [0x650B0, rodata]
-      - [0x65220, rodata]
-      - [0x65230, rodata]
-      - [0x65260, rodata]
-      - [0x65280, rodata]
-      - [0x652A0, rodata]
-      - [0x65970, rodata]
-      - [0x659E0, rodata]
-      - [0x65B00, rodata]
-      - [0x65B80, rodata]
-      - [0x65C10, rodata]
-      - [0x65C50, rodata]
-      - [0x65CC0, rodata, "segment_obdata/ob_empty_quill"]
+      - [0x5C210, .data, "segment_obdata/vpres"]
+      - [0x5C280, .data, "gfx/dpfillrect"]
+      - [0x5C510, .data, "gfx/dpfilltex"]
+      - [0x5C8A0, .data, "gfx/ob_mutual_ball"]
+      - [0x5CAD0, .data, "gfx/ob_thick_bikes"]
+      - [0x5CB60, .data, "gfx/ob_hospitable_friends"]
+      - [0x5CC00, .data, "gfx/ob_broad_badge"]
+      - [0x5CC90, .data, "gfx/ob_just_ducks"]
+      - [0x5CCD0, .data, "gfx/ob_aspiring_shade"]
+      - [0x5CD20, .data, "gfx/ob_exciting_skirt"]
+      - [0x5CD70, .data, "gfx/ob_shy_yak"]
+      - [0x5CE70, data, "data/strategy"]
+      - [0x5CEF0, data]
+      - [0x5CF00, data]
+      - [0x5CF20, data]
+      - [0x5CF30, data]
+      - [0x5D560, data]
+      - [0x613B0, data]
+      - [0x647F0, data, "segment_obdata/ob_hard_hands"]
+      - [0x650A0, data]
+      - [0x650B0, data]
+      - [0x65220, data]
+      - [0x65230, data]
+      - [0x65260, data]
+      - [0x65280, data]
+      - [0x652A0, data]
+      - [0x65970, data]
+      - [0x659E0, data]
+      - [0x65B00, data]
+      - [0x65B80, data]
+      - [0x65C10, data]
+      - [0x65C50, data]
+      - [0x65CC0, data, "segment_obdata/ob_empty_quill"]
+      
       - [0x65D60, rodata, "segment_obdata/ob_blushing_ship"]
       - [0x65DD0, rodata]
       - [0x66310, rodata]
@@ -442,6 +443,49 @@ segments:
       - [0x66D00, rodata, "segment_obdata/ob_squeamish_mask"]
       - [0x66DA0, rodata, "segment_obdata/ob_utopian_queen"]
 
+      # - [0x5C210, .rodata, "segment_obdata/vpres"]
+      # - [0x5C280, .rodata, "gfx/dpfillrect"]
+      # - [0x5C510, .rodata, "gfx/dpfilltex"]
+      # - [0x5C8A0, .rodata, "gfx/ob_mutual_ball"]
+      # - [0x5CAD0, .rodata, "gfx/ob_thick_bikes"]
+      # - [0x5CB60, .rodata, "gfx/ob_hospitable_friends"]
+      # - [0x5CC00, .rodata, "gfx/ob_broad_badge"]
+      # - [0x5CC90, .rodata, "gfx/ob_just_ducks"]
+      # - [0x5CCD0, .rodata, "gfx/ob_aspiring_shade"]
+      # - [0x5CD20, .rodata, "gfx/ob_exciting_skirt"]
+      # - [0x5CD70, .rodata, "gfx/ob_shy_yak"]
+      # - [0x5CE70, .rodata, "data/strategy"]
+      # - [0x5CEF0, rodata]
+      # - [0x5CF00, rodata]
+      # - [0x5CF20, rodata]
+      # - [0x5CF30, rodata]
+      # - [0x5D560, rodata]
+      # - [0x613B0, rodata]
+      # - [0x647F0, rodata, "segment_obdata/ob_hard_hands"]
+      # - [0x650A0, rodata]
+      # - [0x650B0, rodata]
+      # - [0x65220, rodata]
+      # - [0x65230, rodata]
+      # - [0x65260, rodata]
+      # - [0x65280, rodata]
+      # - [0x652A0, rodata]
+      # - [0x65970, rodata]
+      # - [0x659E0, rodata]
+      # - [0x65B00, rodata]
+      # - [0x65B80, rodata]
+      # - [0x65C10, rodata]
+      # - [0x65C50, rodata]
+      # - [0x65CC0, rodata, "segment_obdata/ob_empty_quill"]
+      # - [0x65D60, rodata, "segment_obdata/ob_blushing_ship"]
+      # - [0x65DD0, rodata]
+      # - [0x66310, rodata]
+      # - [0x663C0, rodata]
+      # - [0x66570, rodata, "segment_obdata/ob_hunky_silver"]
+      # - [0x66B60, rodata, "segment_obdata/ob_worthless_drawer"]
+      # - [0x66B80, rodata, "segment_obdata/ob_pumped_books"]
+      # - [0x66D00, rodata, "segment_obdata/ob_squeamish_mask"]
+      # - [0x66DA0, rodata, "segment_obdata/ob_utopian_queen"]
+
       # - [0x5C210, data, "gfx/ob_deft_toys"]
       # - [0x5CE70, .data, "data/strategy"]
       # - [0x5CEF0, data]

src/data/strategy.c

@@ -4,22 +4,22 @@
 #include "str_decorate.h"
 
 /* 5CE70 80186F70 */
-char obStrategyNameAutonomous[] = DECORATE("Autonomous");
+char* const obStrategyNameAutonomous = DECORATE("Autonomous");
 
 /* 5CE80 80186F80 */
-char obStrategyNameAttackStrongest[] = DECORATE("Attack" NEWLINE INDENT "Strongest");
+char* const obStrategyNameAttackStrongest = DECORATE("Attack" NEWLINE INDENT "Strongest");
 
 /* 5CE94 80186F94 */
-char obStrategyNameAttackLeader[] = DECORATE("Attack" NEWLINE INDENT "Leader");
+char* const obStrategyNameAttackLeader = DECORATE("Attack" NEWLINE INDENT "Leader");
 
 /* 5CEA8 80186FA8 */
-char obStrategyNameAttackWeakest[] = DECORATE("Attack" NEWLINE INDENT "Weakest");
+char* const obStrategyNameAttackWeakest = DECORATE("Attack" NEWLINE INDENT "Weakest");
 
 /* 5CEBC 80186FBC */
-u8 D_80186FBC[] = { 0x07, 0x02, 0x06, 0x03, 0x05, 0x04, 0x01, 0x00 };
+const u8 D_80186FBC[] = { 0x07, 0x02, 0x06, 0x03, 0x05, 0x04, 0x01, 0x00 };
 
 /* 5CEC4 80186FC4 */
-char* obStrategyName[] = {
+char* const obStrategyName[] = {
     obStrategyNameAutonomous,
     obStrategyNameAttackStrongest,
     obStrategyNameAttackLeader,

src/gfx/dpfillrect.c

@@ -3,7 +3,7 @@
 #include "common.h"
 
 /* 5C280 80186380 */
-const Gfx DP_FILL_RECT_639x479[] = {
+Gfx DP_FILL_RECT_639x479[] = {
     gsDPPipeSync(), 
     gsDPPipeSync(), 
     gsDPFillRectangle(0, 0, 639, 29),

src/gfx/dpfilltex.c

@@ -3,7 +3,7 @@
 #include "common.h"
 
 /* 5C510 80186610 */
-const Gfx DL_DRAW_TEX_2560x1920[] = {
+Gfx DL_DRAW_TEX_2560x1920[] = {
     gsSPNoOp(),
     gsDPPipeSync(),
     gsSPTextureRectangle(0, 0, qu102(640), qu102(30), G_TX_RENDERTILE, 0, 0, 0, 0),

src/gfx/ob_aspiring_shade.c

@@ -0,0 +1,17 @@
+#include <ultra64.h>
+
+#include "common.h"
+
+/* 5CCD0 80186DD0 */
+Gfx DISPLAY_LIST_80186DD0[] = {
+    gsDPPipeSync(),
+    gsDPPipeSync(),
+    gsDPSetCycleType(G_CYC_1CYCLE),
+    gsDPPipeSync(),
+    gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK),
+    gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2),
+    gsDPSetCombineMode(G_CC_PRIMITIVE, G_CC_PRIMITIVE),
+    gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_OFF),
+    gsDPPipeSync(),
+    gsSPEndDisplayList(),
+};

src/gfx/ob_broad_badge.c

@@ -3,7 +3,7 @@
 #include "common.h"
 
 /* 5CC00 80186D00 */
-const Gfx DISPLAY_LIST_80186D00[] = {
+Gfx DISPLAY_LIST_80186D00[] = {
     gsDPPipeSync(),
     gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_OFF),
     gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG |

src/gfx/ob_exciting_skirt.c

@@ -0,0 +1,17 @@
+#include <ultra64.h>
+
+#include "common.h"
+
+/* 5CD20 80186E20 */
+Gfx DISPLAY_LIST_80186E20[] = {
+    gsDPPipeSync(),
+    gsDPPipeSync(),
+    gsDPSetCycleType(G_CYC_1CYCLE),
+    gsDPPipeSync(),
+    gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_SHADING_SMOOTH),
+    gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2),
+    gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
+    gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_OFF),
+    gsDPPipeSync(),
+    gsSPEndDisplayList(),
+};

src/gfx/ob_hospitable_friends.c

@@ -3,7 +3,7 @@
 #include "common.h"
 
 /* 5CB60 80186C60 */
-const Gfx DISPLAY_LIST_80186C60[] = {
+Gfx DISPLAY_LIST_80186C60[] = {
     gsDPPipeSync(),
     gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_OFF),
     gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG |

src/gfx/ob_just_ducks.c

@@ -0,0 +1,15 @@
+#include <ultra64.h>
+
+#include "common.h"
+
+/* 5CC90 80186D90 */
+Gfx DISPLAY_LIST_80186D90[] = {
+    gsDPPipeSync(),
+    gsDPSetTextureFilter(G_TF_BILERP),
+    gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
+    gsDPSetRenderMode(G_RM_OPA_SURF, G_RM_OPA_SURF2),
+    gsDPSetAlphaCompare(G_AC_NONE),
+    gsDPSetTexturePersp(G_TP_PERSP),
+    gsDPPipeSync(),
+    gsSPEndDisplayList(),
+};

src/gfx/ob_mutual_ball.c

@@ -3,7 +3,7 @@
 #include "common.h"
 
 /* 5C8A0 801869A0 */
-const Lights2 LIGHTS_801869A0 = gdSPDefLights2(
+Lights2 LIGHTS_801869A0 = gdSPDefLights2(
     // ar, ag, ab
     5, 5, 5,
     // r1, g1, b1
@@ -17,7 +17,7 @@ const Lights2 LIGHTS_801869A0 = gdSPDefLights2(
 );
 
 /* 5C8C8 801869C8 */
-const Gfx DISPLAY_LIST_801869C8[] = {
+Gfx DISPLAY_LIST_801869C8[] = {
     gsDPPipeSync(),
     gsDPPipeSync(),
     gsDPSetCycleType(G_CYC_1CYCLE),

src/gfx/ob_shy_yak.c

@@ -0,0 +1,55 @@
+#include <ultra64.h>
+
+#include "common.h"
+
+/* 5CD70 80186E70 */
+Gfx DISPLAY_LIST_80186E70[] = {
+    gsDPPipeSync(),
+    gsDPSetEnvColor(0x00, 0x00, 0x00, 0x00),
+    gsDPSetPrimColor(0, 0, 0x00, 0x00, 0x00, 0x00),
+    gsDPSetBlendColor(0x00, 0x00, 0x00, 0x00),
+    gsDPSetFogColor(0x00, 0x00, 0x00, 0x00),
+    gsDPSetFillColor(0x00000000),
+    gsDPSetPrimDepth(0, 0),
+    gsDPSetConvert(0, 0, 0, 0, 0, 0),
+    gsDPSetKeyR(0x00, 0x00, 0),
+    gsDPSetKeyGB(0x00, 0x00, 0, 0x00, 0x00, 0),
+    gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
+    gsDPPipeSync(),
+    gsDPSetScissor(G_SC_NON_INTERLACE, 0, 0, 319, 239),
+    gsDPPipeSync(),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_RENDERTILE, 0,
+                G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD,
+                G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, 1, 0,
+                G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD,
+                G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, 2, 0,
+                G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD,
+                G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, 3, 0,
+                G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD,
+                G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, 4, 0,
+                G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD,
+                G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, 5, 0,
+                G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD,
+                G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, 6, 0,
+                G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD,
+                G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0,
+                G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD,
+                G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
+    gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0, 0),
+    gsDPSetTileSize(1, 0, 0, 0, 0),
+    gsDPSetTileSize(2, 0, 0, 0, 0),
+    gsDPSetTileSize(3, 0, 0, 0, 0),
+    gsDPSetTileSize(4, 0, 0, 0, 0),
+    gsDPSetTileSize(5, 0, 0, 0, 0),
+    gsDPSetTileSize(6, 0, 0, 0, 0),
+    gsDPSetTileSize(G_TX_LOADTILE, 0, 0, 0, 0),
+    gsDPPipeSync(),
+    gsSPEndDisplayList(),
+};

src/gfx/ob_thick_bikes.c

@@ -3,7 +3,7 @@
 #include "common.h"
 
 /* 5CAD0 80186BD0 */
-const Gfx DISPLAY_LIST_80186BD0[] = {
+Gfx DISPLAY_LIST_80186BD0[] = {
     gsDPPipeSync(),
     gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_OFF),
     gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG |

src/segment_obdata/vpres.c

@@ -3,19 +3,19 @@
 #include "common.h"
 
 /* 5C210 80186310 */
-const Vp obVpMinResolution = {
+Vp obVpMinResolution = {
     (SCREEN_WIDTH_MIN / 2) * 4, (SCREEN_HEIGHT_MIN / 2) * 4, 511, 0,
     (SCREEN_WIDTH_MIN / 2) * 4, (SCREEN_HEIGHT_MIN / 2) * 4, 511, 0
 };
 
 /* 5C220 80186320 */
-const Vp obVpMaxResolution = {
+Vp obVpMaxResolution = {
     (SCREEN_WIDTH_MAX / 2) * 4, (SCREEN_HEIGHT_MAX / 2) * 4, 511, 0,
     (SCREEN_WIDTH_MAX / 2) * 4, (SCREEN_HEIGHT_MAX / 2) * 4, 511, 0
 };
 
 /* 5C230 80186330 */
-const Gfx obDlSetupMinResolution[] = {
+Gfx obDlSetupMinResolution[] = {
     gsSPViewport(&obVpMinResolution),
     gsDPPipeSync(),
     gsDPSetScissor(
@@ -28,7 +28,7 @@ const Gfx obDlSetupMinResolution[] = {
 };
 
 // /* 5C258 80186358 */
-const Gfx obDlSetupMaxResolution[] = {
+Gfx obDlSetupMaxResolution[] = {
     gsSPViewport(&obVpMaxResolution),
     gsDPPipeSync(),
     gsDPSetScissor(