PSP NO3 EntityTransparentWater Decomp/Codeshare (Xeeynamo#2567)

Nothing special here, no code changes needed, just some light file
shuffling.

Author: bismurphy

config/splat.pspeu.stno3.yaml

@@ -49,7 +49,9 @@ segments:
       - [0x13C8, c, no3/e_heartroom]
       - [0x19A0, c, no3/entrance_weights]
       - [0x22C0, c, no3/e_cavern_door]
-      - [0x2C60, c, no3_psp/2C60]
+      - [0x2C60, c, no3/e_transparent_water]
+      - [0x3050, c, no3/e_background_bushes_trees]
+      - [0x3958, c, no3_psp/working_on]
       - [0x1AA80, c, no3_psp/e_particles]
       - [0x1F830, c, no3_psp/e_misc]
       - [0x21CC8, c, no3_psp/collision]
@@ -61,11 +63,15 @@ segments:
       - [0x347E0, data]
       - [0x5E430, .data, no3/e_castle_door]
       - [0x5E530, .data, no3/e_cavern_door]
-      - [0x5E540, data]
+      - [0x5E540, .data, no3/e_transparent_water]
+      - [0x5E580, .data, no3/e_background_bushes_trees]
+      - [0x5E630, data]
       - [0x61600, .rodata, no3/e_castle_door]
-      - [0x61618, .rodata, no3_psp/2C60] # EntityPushAlucard
+      - [0x61618, .rodata, no3_psp/working_on] # EntityPushAlucard
       - [0x61810, .rodata, no3_psp/e_particles]
       - [0x61880, .rodata, no3_psp/e_misc]
       - [0x618A8, .rodata, no3_psp/collision]
-      - {type: bss, vram: 0x9298F80}
-  - [0x61900]
+      - [0x61900, bss, 61900]
+      - [0x61BB0, .bss, no3/e_background_bushes_trees]
+      - [0x61BC0, bss, 61BC0]
+  - [0x62280]

config/splat.us.stno3.yaml

@@ -50,7 +50,7 @@ segments:
       - [0xE90, data]
       - [0xEA0, .data, entrance_stage_entities]
       - [0x1044, .data, e_castle_door]
-      - [0x1140, .data, entrance_stage_entities_2]
+      - [0x1140, .data, e_background_bushes_trees]
       - [0x123C, .data, entrance_stage_entities_3]
       - [0x13A8, data]
       - [0x1ACC, .data, cutscene]
@@ -164,7 +164,8 @@ segments:
       - [0x37A64, c, e_breakable]
       - [0x37B98, c, entrance_stage_entities]
       - [0x38564, c, e_castle_door]
-      - [0x38A74, c, entrance_stage_entities_2]
+      - [0x38A74, c, e_background_bushes_trees]
+      - [0x39198, c, e_transparent_water]
       - [0x394F0, c, e_cavern_door]
       - [0x39C44, c, entrance_weights]
       - [0x3A348, c, entrance_stage_entities_3]

config/splat.us.stnp3.yaml

@@ -45,7 +45,7 @@ segments:
       - [0xE18, .data, e_breakable]
       - [0xE78, .data, entrance_stage_entities]
       - [0xF0C, .data, e_castle_door]
-      - [0x1008, .data, entrance_stage_entities_2]
+      - [0x1008, .data, e_background_bushes_trees]
       - [0x1104, .data, entrance_stage_entities_3]
       - [0x122C, data]
       - [0x1300, data]
@@ -165,7 +165,8 @@ segments:
       - [0x326FC, c, e_breakable]
       - [0x32830, c, entrance_stage_entities]
       - [0x32F30, c, e_castle_door]
-      - [0x332A8, c, entrance_stage_entities_2]
+      - [0x332A8, c, e_background_bushes_trees]
+      - [0x339CC, c, e_transparent_water]
       - [0x33D24, c, e_cavern_door]
       - [0x344B4, c, entrance_weights]
       - [0x34BE8, c, entrance_stage_entities_3]

src/st/entrance_stage_entities_2.h renamed to src/st/e_background_bushes_trees.h

@@ -8,18 +8,16 @@ static u8 bush_uvwh[] = {
 // Seems to be used when continuing a bush from one of the above starts?
 static u8 bush_uvwh_cont[] = {
     UVWH(0x80, 0x80, 0x38, 0x42), UVWH(0x80, 0x80, 0x2C, 0x34)};
-// clang-format off
-static s16 bush_unk_data[] = {0, 20, 0, 32, 1, 32, 0, 8, 2, 20, 1, 16, 0xFFFF, 0,
-                           3, 63, 0xFFFF, 0,
-                           4, 64, 4, 96, 0xFFFF, 0,
-                           5, 80, 5, 96, 5, 32, 0xFFFF, 0};
-// clang-format on
+static s16 bush_unk_1[] = {0, 20, 0, 32, 1, 32, 0, 8, 2, 20, 1, 16, 0xFFFF, 0};
+static s16 bush_unk_2[] = {3, 63, 0xFFFF, 0};
+static s16 bush_unk_3[] = {4, 64, 4, 96, 0xFFFF, 0};
+static s16 bush_unk_4[] = {5, 80, 5, 96, 5, 32, 0xFFFF, 0};
 // VZ, Priority, Clut, and an X value. 4 such sets.
 static s16 bush_render_data[] = {
     0x00C0, 0x005E, 0x0017, 0x0080, 0x0200, 0x005B, 0x0014, 0x003F,
     0x0140, 0x005D, 0x003C, 0x00A0, 0x01C0, 0x005C, 0x003C, 0x00D0};
-static s16* bush_unk_starts[] = {&bush_unk_data[0], &bush_unk_data[14],
-                                 &bush_unk_data[18], &bush_unk_data[24]};
+static s16* bush_unk_starts[] = {
+    bush_unk_1, bush_unk_2, bush_unk_3, bush_unk_4};
 static s16 backgroundTreePositions[][2] = {
     {0x200, 0}, {0x280, 12}, {0x300, 4}, {0x380, 16}};
 static u16 backgroundTreeCluts[] = {0x15, 0x46, 0x47, 0x48};
@@ -40,9 +38,9 @@ void EntityBackgroundBushes(Entity* self) {
     s32 yOffset;
     s16 xPos;
     s16 yPos;
-    s32 rotTransXYResult;
-    s32 unused1; // return args for rottranspers
-    s32 unused2; // we don't use them.
+    long rotTransXYResult;
+    long unused1; // return args for rottranspers
+    long unused2; // we don't use them.
     VECTOR trans;
     MATRIX m;
 
@@ -217,105 +215,3 @@ void EntityBackgroundTrees(Entity* self) {
         prim = prim->next;
     }
 }
-
-static u8 transWaterCluts[] = {
-    0x24, 0x1A, 0x21, 0x1A, 0x2B, 0x1B, 0x22, 0x1B, 0x2C, 0x1C, 0x23,
-    0x1C, 0x2D, 0x1D, 0x24, 0x1D, 0x2E, 0x1E, 0x25, 0x1E, 0x2F, 0x1F,
-    0x26, 0x1F, 0x56, 0x20, 0x21, 0x20, 0xFF, 0x00, 0x00, 0x00};
-static u8 transWaterUV[] = {
-    UVWH(0xA1, 0x01, 0x26, 0x3E), UVWH(0xC9, 0x01, 0x26, 0x3E),
-    UVWH(0xA1, 0x41, 0x26, 0x3E)};
-static u8 transWaterAnim[] = {10, 0, 10, 1, 10, 2, 10, 1, 0, 0, 0, 0};
-// Transparent water plane that can be seen in the merman room
-void EntityTransparentWater(Entity* self) {
-    Primitive* prim;
-    s32 primIndex;
-    u32 selfY;
-    s32 uCoord;
-    s32 vCoord;
-    u8* uvPtr;
-    u8* clutIdx;
-    s32 prim_xPos;
-
-    switch (self->step) {
-    case 0:
-        InitializeEntity(g_EInitInteractable);
-        self->ext.transparentWater.unk80 = 4;
-        primIndex = g_api.AllocPrimitives(PRIM_GT4, 16);
-        if (primIndex == -1) {
-            DestroyEntity(self);
-            return;
-        }
-        self->flags |= FLAG_HAS_PRIMS;
-        self->primIndex = primIndex;
-        prim = &g_PrimBuf[primIndex];
-        self->ext.transparentWater.prim = prim;
-        while (prim != NULL) {
-            prim->tpage = 0xF;
-            prim->clut = 0x18;
-            prim->priority = 0xB0;
-            prim->drawMode = DRAW_HIDE;
-            prim = prim->next;
-        }
-        break;
-
-    case 1:
-        clutIdx = &transWaterCluts[0];
-        while (*clutIdx != 0xFF) {
-            g_ClutIds[clutIdx[0]] = g_ClutIds[clutIdx[2] + 0x200];
-            clutIdx += 4;
-        }
-
-        if (!--self->ext.transparentWater.unk80) {
-            self->ext.transparentWater.unk80 = 4;
-            self->step++;
-        }
-        break;
-
-    case 2:
-        clutIdx = &transWaterCluts[0];
-        while (*clutIdx != 0xFF) {
-            g_ClutIds[clutIdx[0]] = g_ClutIds[clutIdx[3] + 0x200];
-            clutIdx += 4;
-        }
-
-        if (!--self->ext.transparentWater.unk80) {
-            self->ext.transparentWater.unk80 = 4;
-            self->step--;
-        }
-        break;
-    }
-
-    AnimateEntity(transWaterAnim, self);
-
-    prim_xPos = -1 * g_Tilemap.scrollX.i.hi % 38;
-    prim_xPos += 304;
-    if (self->params) {
-        prim_xPos = 96;
-    }
-
-    uvPtr = transWaterUV;
-    uvPtr += 4 * self->animCurFrame;
-    uCoord = uvPtr[0];
-    vCoord = uvPtr[1];
-    selfY = self->posY.i.hi;
-    prim = self->ext.transparentWater.prim;
-    while (prim_xPos > 0) {
-        prim->u0 = prim->u2 = uCoord;
-        prim->u1 = prim->u3 = uCoord + 0x26;
-        prim->v0 = prim->v1 = vCoord;
-        prim->v2 = prim->v3 = vCoord + 0x3E;
-        prim->x1 = prim->x3 = prim_xPos;
-        prim_xPos -= 0x26;
-        prim->x0 = prim->x2 = prim_xPos;
-        prim->y0 = prim->y1 = selfY;
-        prim->y2 = prim->y3 = selfY + 0x3E;
-        prim->drawMode = DRAW_TPAGE2 | DRAW_TPAGE | DRAW_UNK02 | DRAW_TRANSP;
-        prim = prim->next;
-    }
-
-    while (prim != NULL) {
-        prim->drawMode = DRAW_HIDE;
-        prim = prim->next;
-    }
-}

src/st/e_transparent_water.h

@@ -0,0 +1,104 @@
+// SPDX-License-Identifier: AGPL-3.0-or-later
+#define UVWH(u, v, w, h) u, v, w, h
+
+static u8 transWaterCluts[] = {
+    0x24, 0x1A, 0x21, 0x1A, 0x2B, 0x1B, 0x22, 0x1B, 0x2C, 0x1C, 0x23,
+    0x1C, 0x2D, 0x1D, 0x24, 0x1D, 0x2E, 0x1E, 0x25, 0x1E, 0x2F, 0x1F,
+    0x26, 0x1F, 0x56, 0x20, 0x21, 0x20, 0xFF, 0x00, 0x00, 0x00};
+static u8 transWaterUV[] = {
+    UVWH(0xA1, 0x01, 0x26, 0x3E), UVWH(0xC9, 0x01, 0x26, 0x3E),
+    UVWH(0xA1, 0x41, 0x26, 0x3E)};
+static u8 transWaterAnim[] = {10, 0, 10, 1, 10, 2, 10, 1, 0, 0, 0, 0};
+// Transparent water plane that can be seen in the merman room
+void EntityTransparentWater(Entity* self) {
+    Primitive* prim;
+    s32 primIndex;
+    u32 selfY;
+    s32 uCoord;
+    s32 vCoord;
+    u8* uvPtr;
+    u8* clutIdx;
+    s32 prim_xPos;
+
+    switch (self->step) {
+    case 0:
+        InitializeEntity(g_EInitInteractable);
+        self->ext.transparentWater.unk80 = 4;
+        primIndex = g_api.AllocPrimitives(PRIM_GT4, 16);
+        if (primIndex == -1) {
+            DestroyEntity(self);
+            return;
+        }
+        self->flags |= FLAG_HAS_PRIMS;
+        self->primIndex = primIndex;
+        prim = &g_PrimBuf[primIndex];
+        self->ext.transparentWater.prim = prim;
+        while (prim != NULL) {
+            prim->tpage = 0xF;
+            prim->clut = 0x18;
+            prim->priority = 0xB0;
+            prim->drawMode = DRAW_HIDE;
+            prim = prim->next;
+        }
+        break;
+
+    case 1:
+        clutIdx = &transWaterCluts[0];
+        while (*clutIdx != 0xFF) {
+            g_ClutIds[clutIdx[0]] = g_ClutIds[clutIdx[2] + 0x200];
+            clutIdx += 4;
+        }
+
+        if (!--self->ext.transparentWater.unk80) {
+            self->ext.transparentWater.unk80 = 4;
+            self->step++;
+        }
+        break;
+
+    case 2:
+        clutIdx = &transWaterCluts[0];
+        while (*clutIdx != 0xFF) {
+            g_ClutIds[clutIdx[0]] = g_ClutIds[clutIdx[3] + 0x200];
+            clutIdx += 4;
+        }
+
+        if (!--self->ext.transparentWater.unk80) {
+            self->ext.transparentWater.unk80 = 4;
+            self->step--;
+        }
+        break;
+    }
+
+    AnimateEntity(transWaterAnim, self);
+
+    prim_xPos = -1 * g_Tilemap.scrollX.i.hi % 38;
+    prim_xPos += 304;
+    if (self->params) {
+        prim_xPos = 96;
+    }
+
+    uvPtr = transWaterUV;
+    uvPtr += 4 * self->animCurFrame;
+    uCoord = uvPtr[0];
+    vCoord = uvPtr[1];
+    selfY = self->posY.i.hi;
+    prim = self->ext.transparentWater.prim;
+    while (prim_xPos > 0) {
+        prim->u0 = prim->u2 = uCoord;
+        prim->u1 = prim->u3 = uCoord + 0x26;
+        prim->v0 = prim->v1 = vCoord;
+        prim->v2 = prim->v3 = vCoord + 0x3E;
+        prim->x1 = prim->x3 = prim_xPos;
+        prim_xPos -= 0x26;
+        prim->x0 = prim->x2 = prim_xPos;
+        prim->y0 = prim->y1 = selfY;
+        prim->y2 = prim->y3 = selfY + 0x3E;
+        prim->drawMode = DRAW_TPAGE2 | DRAW_TPAGE | DRAW_UNK02 | DRAW_TRANSP;
+        prim = prim->next;
+    }
+
+    while (prim != NULL) {
+        prim->drawMode = DRAW_HIDE;
+        prim = prim->next;
+    }
+}

src/st/no3/entrance_stage_entities_2.c renamed to src/st/no3/e_background_bushes_trees.c

@@ -1,4 +1,4 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
 #include "no3.h"
 
-#include "../entrance_stage_entities_2.h"
+#include "../e_background_bushes_trees.h"

src/st/no3/e_transparent_water.c

@@ -0,0 +1,4 @@
+// SPDX-License-Identifier: AGPL-3.0-or-later
+#include "no3.h"
+
+#include "../e_transparent_water.h"