TTYD: Fix crashes with GX_CULL_ALL

This shouldn't exist.
magcius · Jan 12, 2025 · 60a0705 · 60a0705
1 parent 575ed97
commit 60a0705
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/PaperMarioTTYD/AnimGroup.ts b/src/PaperMarioTTYD/AnimGroup.ts
@@ -353,7 +353,7 @@ export function parse(buffer: ArrayBufferSlice): AnimGroup {
         const dispMode = view.getUint32(shapeIdx + 0xA0);
 
         const cullModeRaw = view.getUint32(shapeIdx + 0xA4);
-        const cullModeTable: GX.CullMode[] = [GX.CullMode.BACK, GX.CullMode.FRONT, GX.CullMode.ALL, GX.CullMode.NONE];
+        const cullModeTable: GX.CullMode[] = [GX.CullMode.BACK, GX.CullMode.FRONT, GX.CullMode.NONE, GX.CullMode.NONE];
         const cullMode = cullModeTable[cullModeRaw];
 
         const shape: AnimGroupData_Shape = { name, vtxArrays, draws, dispMode, cullMode };

diff --git a/src/PaperMarioTTYD/world.ts b/src/PaperMarioTTYD/world.ts
@@ -749,7 +749,7 @@ export function parse(buffer: ArrayBufferSlice): TTYDWorld {
         computeModelMatrixSRT(modelMatrix, scaleX, scaleY, scaleZ, rotationX, rotationY, rotationZ, translationX, translationY, translationZ);
 
         const drawModeStructOffs = mainDataOffs + view.getUint32(offs + 0x58);
-        const cullModes: GX.CullMode[] = [GX.CullMode.FRONT, GX.CullMode.BACK, GX.CullMode.ALL, GX.CullMode.NONE];
+        const cullModes: GX.CullMode[] = [GX.CullMode.FRONT, GX.CullMode.BACK, GX.CullMode.NONE, GX.CullMode.NONE];
         const cullMode: GX.CullMode = cullModes[view.getUint8(drawModeStructOffs + 0x01)];
 
         const drawModeFlags: DrawModeFlags = view.getUint8(drawModeStructOffs + 0x02);