extract sTransCircleDL and sTransWipeDL

2025-05-11 11:33:48 +00:00 · 2025-02-10 22:29:49 +01:00 · 2025-02-10 22:29:49 +01:00 · 15692565fe
commit 15692565fe
parent 0824c9898a
18 changed files with 30 additions and 87 deletions
--- a/assets/xml/code/fbdemo_circle.xml
+++ b/assets/xml/code/fbdemo_circle.xml
@ -7,7 +7,6 @@
        <Array Name="sTransCircleVtx" Count="34" Offset="0x1000">
            <Vtx/>
        </Array>
-        <!-- ZAPD isn't finding symbols correctly, instead finding them much later in `code`-->
-        <!--<DList Name="sTransCircleDL" Offset="0x1220"/>-->
+        <DList Name="sTransCircleDL" Offset="0x1220"/>
    </File>
 </Root>
--- a/assets/xml/code/fbdemo_wipe1.xml
+++ b/assets/xml/code/fbdemo_wipe1.xml
@ -4,7 +4,6 @@
            <Vtx/>
        </Array>
        <Texture Name="sTransWipeTex" OutName="trans_wipe" Format="i4" Width="64" Height="64" Offset="0x190"/>
-        <!-- ZAPD isn't finding symbols correctly, instead finding them much later in `code`-->
-        <!-- <DList Name="sTransWipeDL" Offset="0x990"/> -->
+        <DList Name="sTransWipeDL" Offset="0x990"/>
    </File>
 </Root>
--- a/baseroms/gc-eu-mq-dbg/config.yml
+++ b/baseroms/gc-eu-mq-dbg/config.yml
@ -64,7 +64,7 @@ assets:
 - name: code/fbdemo_circle
  xml_path: assets/xml/code/fbdemo_circle.xml
  start_offset: 0x10ED48
-  end_offset: 0x10FF68
+  end_offset: 0x110038
 - name: code/fbdemo_triforce
  xml_path: assets/xml/code/fbdemo_triforce.xml
  start_offset: 0x10E1D0
@ -72,7 +72,7 @@ assets:
 - name: code/fbdemo_wipe1
  xml_path: assets/xml/code/fbdemo_wipe1.xml
  start_offset: 0x10E2A0
-  end_offset: 0x10EC30
+  end_offset: 0x10ED28
 - name: misc/link_animetion
  xml_path: assets/xml/misc/link_animetion.xml
 - name: misc/z_select_static
--- a/baseroms/gc-eu-mq/config.yml
+++ b/baseroms/gc-eu-mq/config.yml
@ -56,7 +56,7 @@ assets:
 - name: code/fbdemo_circle
  xml_path: assets/xml/code/fbdemo_circle.xml
  start_offset: 0xE90A8
-  end_offset: 0xEA2C8
+  end_offset: 0xEA398
 - name: code/fbdemo_triforce
  xml_path: assets/xml/code/fbdemo_triforce.xml
  start_offset: 0xE8530
@ -64,7 +64,7 @@ assets:
 - name: code/fbdemo_wipe1
  xml_path: assets/xml/code/fbdemo_wipe1.xml
  start_offset: 0xE8600
-  end_offset: 0xE8F90
+  end_offset: 0xE9088
 - name: misc/link_animetion
  xml_path: assets/xml/misc/link_animetion.xml
 - name: misc/z_select_static
--- a/baseroms/gc-eu/config.yml
+++ b/baseroms/gc-eu/config.yml
@ -56,7 +56,7 @@ assets:
 - name: code/fbdemo_circle
  xml_path: assets/xml/code/fbdemo_circle.xml
  start_offset: 0xE90C8
-  end_offset: 0xEA2E8
+  end_offset: 0xEA3B8
 - name: code/fbdemo_triforce
  xml_path: assets/xml/code/fbdemo_triforce.xml
  start_offset: 0xE8550
@ -64,7 +64,7 @@ assets:
 - name: code/fbdemo_wipe1
  xml_path: assets/xml/code/fbdemo_wipe1.xml
  start_offset: 0xE8620
-  end_offset: 0xE8FB0
+  end_offset: 0xE90A8
 - name: misc/link_animetion
  xml_path: assets/xml/misc/link_animetion.xml
 - name: misc/z_select_static
--- a/baseroms/gc-jp-ce/config.yml
+++ b/baseroms/gc-jp-ce/config.yml
@ -55,7 +55,7 @@ assets:
 - name: code/fbdemo_circle
  xml_path: assets/xml/code/fbdemo_circle.xml
  start_offset: 0xEB768
-  end_offset: 0xEC988
+  end_offset: 0xECA58
 - name: code/fbdemo_triforce
  xml_path: assets/xml/code/fbdemo_triforce.xml
  start_offset: 0xEABF0
@ -63,7 +63,7 @@ assets:
 - name: code/fbdemo_wipe1
  xml_path: assets/xml/code/fbdemo_wipe1.xml
  start_offset: 0xEACC0
-  end_offset: 0xEB650
+  end_offset: 0xEB748
 - name: misc/link_animetion
  xml_path: assets/xml/misc/link_animetion.xml
 - name: misc/z_select_static
--- a/baseroms/gc-jp-mq/config.yml
+++ b/baseroms/gc-jp-mq/config.yml
@ -55,7 +55,7 @@ assets:
 - name: code/fbdemo_circle
  xml_path: assets/xml/code/fbdemo_circle.xml
  start_offset: 0xEB768
-  end_offset: 0xEC988
+  end_offset: 0xECA58
 - name: code/fbdemo_triforce
  xml_path: assets/xml/code/fbdemo_triforce.xml
  start_offset: 0xEABF0
@ -63,7 +63,7 @@ assets:
 - name: code/fbdemo_wipe1
  xml_path: assets/xml/code/fbdemo_wipe1.xml
  start_offset: 0xEACC0
-  end_offset: 0xEB650
+  end_offset: 0xEB748
 - name: misc/link_animetion
  xml_path: assets/xml/misc/link_animetion.xml
 - name: misc/z_select_static
--- a/baseroms/gc-jp/config.yml
+++ b/baseroms/gc-jp/config.yml
@ -55,7 +55,7 @@ assets:
 - name: code/fbdemo_circle
  xml_path: assets/xml/code/fbdemo_circle.xml
  start_offset: 0xEB788
-  end_offset: 0xEC9A8
+  end_offset: 0xECA78
 - name: code/fbdemo_triforce
  xml_path: assets/xml/code/fbdemo_triforce.xml
  start_offset: 0xEAC10
@ -63,7 +63,7 @@ assets:
 - name: code/fbdemo_wipe1
  xml_path: assets/xml/code/fbdemo_wipe1.xml
  start_offset: 0xEACE0
-  end_offset: 0xEB670
+  end_offset: 0xEB768
 - name: misc/link_animetion
  xml_path: assets/xml/misc/link_animetion.xml
 - name: misc/z_select_static
--- a/baseroms/gc-us-mq/config.yml
+++ b/baseroms/gc-us-mq/config.yml
@ -55,7 +55,7 @@ assets:
 - name: code/fbdemo_circle
  xml_path: assets/xml/code/fbdemo_circle.xml
  start_offset: 0xEB748
-  end_offset: 0xEC968
+  end_offset: 0xECA38
 - name: code/fbdemo_triforce
  xml_path: assets/xml/code/fbdemo_triforce.xml
  start_offset: 0xEABD0
@ -63,7 +63,7 @@ assets:
 - name: code/fbdemo_wipe1
  xml_path: assets/xml/code/fbdemo_wipe1.xml
  start_offset: 0xEACA0
-  end_offset: 0xEB630
+  end_offset: 0xEB728
 - name: misc/link_animetion
  xml_path: assets/xml/misc/link_animetion.xml
 - name: misc/z_select_static
--- a/baseroms/gc-us/config.yml
+++ b/baseroms/gc-us/config.yml
@ -55,7 +55,7 @@ assets:
 - name: code/fbdemo_circle
  xml_path: assets/xml/code/fbdemo_circle.xml
  start_offset: 0xEB768
-  end_offset: 0xEC988
+  end_offset: 0xECA58
 - name: code/fbdemo_triforce
  xml_path: assets/xml/code/fbdemo_triforce.xml
  start_offset: 0xEABF0
@ -63,7 +63,7 @@ assets:
 - name: code/fbdemo_wipe1
  xml_path: assets/xml/code/fbdemo_wipe1.xml
  start_offset: 0xEACC0
-  end_offset: 0xEB650
+  end_offset: 0xEB748
 - name: misc/link_animetion
  xml_path: assets/xml/misc/link_animetion.xml
 - name: misc/z_select_static
--- a/baseroms/ique-cn/config.yml
+++ b/baseroms/ique-cn/config.yml
@ -55,7 +55,7 @@ assets:
 - name: code/fbdemo_circle
  xml_path: assets/xml/code/fbdemo_circle.xml
  start_offset: 0xEBD88
-  end_offset: 0xECFA8
+  end_offset: 0xED078
 - name: code/fbdemo_triforce
  xml_path: assets/xml/code/fbdemo_triforce.xml
  start_offset: 0xEB210
@ -63,7 +63,7 @@ assets:
 - name: code/fbdemo_wipe1
  xml_path: assets/xml/code/fbdemo_wipe1.xml
  start_offset: 0xEB2E0
-  end_offset: 0xEBC70
+  end_offset: 0xEBD68
 - name: misc/link_animetion
  xml_path: assets/xml/misc/link_animetion.xml
 - name: misc/z_select_static
--- a/baseroms/ntsc-1.0/config.yml
+++ b/baseroms/ntsc-1.0/config.yml
@ -58,7 +58,7 @@ assets:
 - name: code/fbdemo_circle
  xml_path: assets/xml/code/fbdemo_circle.xml
  start_offset: 0xEC0A8
-  end_offset: 0xED2C8
+  end_offset: 0xED398
 - name: code/fbdemo_triforce
  xml_path: assets/xml/code/fbdemo_triforce.xml
  start_offset: 0xEB530
@ -66,7 +66,7 @@ assets:
 - name: code/fbdemo_wipe1
  xml_path: assets/xml/code/fbdemo_wipe1.xml
  start_offset: 0xEB600
-  end_offset: 0xEBF90
+  end_offset: 0xEC088
 - name: n64dd/error_textures
  xml_path: assets/xml/n64dd/error_textures.xml
  start_offset: 0xC160
--- a/baseroms/ntsc-1.1/config.yml
+++ b/baseroms/ntsc-1.1/config.yml
@ -58,7 +58,7 @@ assets:
 - name: code/fbdemo_circle
  xml_path: assets/xml/code/fbdemo_circle.xml
  start_offset: 0xEC268
-  end_offset: 0xED488
+  end_offset: 0xED558
 - name: code/fbdemo_triforce
  xml_path: assets/xml/code/fbdemo_triforce.xml
  start_offset: 0xEB6F0
@ -66,7 +66,7 @@ assets:
 - name: code/fbdemo_wipe1
  xml_path: assets/xml/code/fbdemo_wipe1.xml
  start_offset: 0xEB7C0
-  end_offset: 0xEC150
+  end_offset: 0xEC248
 - name: n64dd/error_textures
  xml_path: assets/xml/n64dd/error_textures.xml
  start_offset: 0xC140
--- a/baseroms/ntsc-1.2/config.yml
+++ b/baseroms/ntsc-1.2/config.yml
@ -58,7 +58,7 @@ assets:
 - name: code/fbdemo_circle
  xml_path: assets/xml/code/fbdemo_circle.xml
  start_offset: 0xEC0B8
-  end_offset: 0xED2D8
+  end_offset: 0xED3A8
 - name: code/fbdemo_triforce
  xml_path: assets/xml/code/fbdemo_triforce.xml
  start_offset: 0xEB540
@ -66,7 +66,7 @@ assets:
 - name: code/fbdemo_wipe1
  xml_path: assets/xml/code/fbdemo_wipe1.xml
  start_offset: 0xEB610
-  end_offset: 0xEBFA0
+  end_offset: 0xEC098
 - name: n64dd/error_textures
  xml_path: assets/xml/n64dd/error_textures.xml
  start_offset: 0xC120
--- a/baseroms/pal-1.0/config.yml
+++ b/baseroms/pal-1.0/config.yml
@ -64,7 +64,7 @@ assets:
 - name: code/fbdemo_circle
  xml_path: assets/xml/code/fbdemo_circle.xml
  start_offset: 0xE99C8
-  end_offset: 0xEABE8
+  end_offset: 0xEACB8
 - name: code/fbdemo_triforce
  xml_path: assets/xml/code/fbdemo_triforce.xml
  start_offset: 0xE8E50
@ -72,7 +72,7 @@ assets:
 - name: code/fbdemo_wipe1
  xml_path: assets/xml/code/fbdemo_wipe1.xml
  start_offset: 0xE8F20
-  end_offset: 0xE98B0
+  end_offset: 0xE99A8
 - name: n64dd/error_textures
  xml_path: assets/xml/n64dd/error_textures.xml
  start_offset: 0xC0E0
--- a/baseroms/pal-1.1/config.yml
+++ b/baseroms/pal-1.1/config.yml
@ -64,7 +64,7 @@ assets:
 - name: code/fbdemo_circle
  xml_path: assets/xml/code/fbdemo_circle.xml
  start_offset: 0xE9A08
-  end_offset: 0xEAC28
+  end_offset: 0xEACF8
 - name: code/fbdemo_triforce
  xml_path: assets/xml/code/fbdemo_triforce.xml
  start_offset: 0xE8E90
@ -72,7 +72,7 @@ assets:
 - name: code/fbdemo_wipe1
  xml_path: assets/xml/code/fbdemo_wipe1.xml
  start_offset: 0xE8F60
-  end_offset: 0xE98F0
+  end_offset: 0xE99E8
 - name: n64dd/error_textures
  xml_path: assets/xml/n64dd/error_textures.xml
  start_offset: 0xC0E0
--- a/src/code/z_fbdemo_circle.c
+++ b/src/code/z_fbdemo_circle.c
@ -12,33 +12,6 @@ Gfx sTransCircleEmptyDL[] = {

 #include "assets/code/fbdemo_circle/code.c"

-Gfx sTransCircleDL[] = {
-    gsDPPipeSync(),
-    gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
-                          G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
-    gsSPSetGeometryMode(G_SHADE | G_SHADING_SMOOTH),
-    gsDPSetOtherMode(G_AD_DISABLE | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE |
-                         G_TD_CLAMP | G_TP_PERSP | G_CYC_1CYCLE | G_PM_NPRIMITIVE,
-                     G_AC_NONE | G_ZS_PIXEL | G_RM_XLU_SURF | G_RM_XLU_SURF2),
-    gsDPSetCombineMode(G_CC_BLENDPEDECALA, G_CC_BLENDPEDECALA),
-    gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
-    gsDPLoadTextureBlock(0x08000000, G_IM_FMT_I, G_IM_SIZ_8b, 16, 64, 0, G_TX_NOMIRROR | G_TX_WRAP,
-                         G_TX_NOMIRROR | G_TX_CLAMP, 4, 6, G_TX_NOLOD, G_TX_NOLOD),
-    gsSPDisplayList(0x09000000),
-    gsSPVertex(sTransCircleVtx, 32, 0),
-    gsSP2Triangles(0, 1, 2, 0, 1, 3, 4, 0),
-    gsSP2Triangles(3, 5, 6, 0, 5, 7, 8, 0),
-    gsSP2Triangles(7, 9, 10, 0, 9, 11, 12, 0),
-    gsSP2Triangles(11, 13, 14, 0, 13, 15, 16, 0),
-    gsSP2Triangles(15, 17, 18, 0, 17, 19, 20, 0),
-    gsSP2Triangles(19, 21, 22, 0, 21, 23, 24, 0),
-    gsSP2Triangles(23, 25, 26, 0, 25, 27, 28, 0),
-    gsSP1Triangle(27, 29, 30, 0),
-    gsSPVertex(&sTransCircleVtx[31], 3, 0),
-    gsSP1Triangle(0, 1, 2, 0),
-    gsSPEndDisplayList(),
-};
-
 void TransitionCircle_Start(void* thisx) {
    TransitionCircle* this = (TransitionCircle*)thisx;

--- a/src/code/z_fbdemo_wipe1.c
+++ b/src/code/z_fbdemo_wipe1.c
@ -7,34 +7,6 @@ typedef enum TransitionWipeDirection {

 #include "assets/code/fbdemo_wipe1/code.c"

-Gfx sTransWipeDL[] = {
-    gsDPPipeSync(),
-    gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
-                          G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
-    gsSPSetGeometryMode(G_ZBUFFER | G_SHADE | G_SHADING_SMOOTH),
-    gsDPSetOtherMode(G_AD_DISABLE | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE |
-                         G_TD_CLAMP | G_TP_PERSP | G_CYC_2CYCLE | G_PM_1PRIMITIVE,
-                     G_AC_NONE | G_ZS_PRIM | G_RM_PASS | G_RM_AA_ZB_TEX_EDGE2),
-    gsDPSetCombineLERP(TEXEL1, TEXEL0, PRIM_LOD_FRAC, TEXEL0, TEXEL1, TEXEL0, PRIM_LOD_FRAC, TEXEL0, COMBINED, 0,
-                       PRIMITIVE, 0, COMBINED, 0, PRIMITIVE, 0),
-    gsDPSetPrimDepth(0, 0),
-    gsDPLoadTextureBlock_4b(sTransWipeTex, G_IM_FMT_I, 64, 64, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 6,
-                            6, 11, G_TX_NOLOD),
-    gsDPLoadMultiBlock_4b(sTransWipeTex, 0x0100, 1, G_IM_FMT_I, 64, 64, 0, G_TX_NOMIRROR | G_TX_WRAP,
-                          G_TX_MIRROR | G_TX_WRAP, 6, 6, 11, 1),
-    gsDPSetTextureLUT(G_TT_NONE),
-    gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
-    gsSPDisplayList(0x08000000),
-    gsSPVertex(sTransWipeVtx, 25, 0),
-    gsSP2Triangles(0, 1, 2, 0, 1, 3, 4, 0),
-    gsSP2Triangles(5, 6, 7, 0, 6, 8, 9, 0),
-    gsSP2Triangles(8, 10, 11, 0, 10, 12, 13, 0),
-    gsSP2Triangles(12, 14, 15, 0, 14, 16, 17, 0),
-    gsSP2Triangles(16, 18, 19, 0, 18, 20, 21, 0),
-    gsSP2Triangles(20, 22, 23, 0, 22, 0, 24, 0),
-    gsSPEndDisplayList(),
-};
-
 // unused.
 Gfx sTransWipeSyncDL[] = {
    gsDPPipeSync(),