From bfcbb8aadac071b6e3f8f34afe819d91e0fa20f3 Mon Sep 17 00:00:00 2001 From: CoderStig <79828759+CoderStig@users.noreply.github.com> Date: Mon, 6 Dec 2021 00:05:33 -0700 Subject: [PATCH] Decomped gfx in data_segment2.s (#83) * Decomped gfx in data_segment2.s --- data/data_segment2.s | 461 ----------------------------------- mk64.ld | 1 + src/data_segment2.inc.c | 524 ++++++++++++++++++++++++++++++++++++++++ undefined_syms.txt | 1 + 4 files changed, 526 insertions(+), 461 deletions(-) create mode 100644 src/data_segment2.inc.c diff --git a/data/data_segment2.s b/data/data_segment2.s index 5a58172aa..36a90fae1 100644 --- a/data/data_segment2.s +++ b/data/data_segment2.s @@ -3285,467 +3285,6 @@ glabel D_02007640 .word D_02006438, 0x00000032 .word 0x00000000, 0x00000000 -glabel D_02007650 -.word 0xe7000000, 0x00000000 -.word 0xba001402, 0x00000000 -.word 0xb900031d, 0x00552048 -.word 0xb6000000, 0x00020205 -.word 0xba001301, 0x00000000 -.word 0xbb000001, 0xffffffff -.word 0xfa000000, 0xffffffff -.word 0xfcffffff, 0xfffcf87c -.word 0xba000c02, 0x00002000 -.word 0xb9000002, 0x00000000 -.word 0xba000e02, 0x00000000 -.word 0xb8000000, 0x00000000 -glabel D_020076B0 -.word 0xe7000000, 0x00000000 -.word 0xb900031d, 0x00552078 -.word 0xfcffffff, 0xfffcf87c -.word 0xba001301, 0x00080000 -.word 0xb7000000, 0x00000001 -.word 0xb8000000, 0x00000000 -glabel D_020076E0 -.word 0xe7000000, 0x00000000 -.word 0xb6000000, 0x00000204 -.word 0xb900031d, 0x00504240 -.word 0xfcffffff, 0xfffcf279 -.word 0xb8000000, 0x00000000 - -glabel D_02007708 -.word 0xe7000000, 0x00000000 -.word 0xb900031d, 0x0f0a4000 -.word 0xfcffffff, 0xfffcf279 -.word 0xb8000000, 0x00000000 - -glabel D_02007728 -.word 0xe7000000, 0x00000000 -.word 0xb900031d, 0x00504240 -.word 0xfcffffff, 0xfffcf279 -.word 0xb8000000, 0x00000000 - -glabel D_02007748 -.word 0xe7000000, 0x00000000 -.word 0xb900031d, 0x00504240 -.word 0xfc11fe23, 0xfffff7fb -.word 0xb8000000, 0x00000000 - -glabel D_02007768 -.word 0xe7000000, 0x00000000 -.word 0xb900031d, 0x00504240 -.word 0xfc119623, 0xff2fffff -.word 0xb8000000, 0x00000000 - -glabel D_02007788 -.word 0xe7000000, 0x00000000 -.word 0xb900031d, 0x00504240 -.word 0xfc12fe25, 0xfffff3f9 -.word 0xb8000000, 0x00000000 - -glabel D_020077A8 -.word 0xe7000000, 0x00000000 -.word 0xbb000001, 0x80008000 -.word 0xb7000000, 0x00000204 -.word 0xb6000000, 0x00020000 -.word 0xba001301, 0x00080000 -.word 0xb8000000, 0x00000000 - -glabel D_020077D8 -.word 0xe7000000, 0x00000000 -.word 0xbb000000, 0x80008000 -.word 0xba001301, 0x00000000 -.word 0xb8000000, 0x00000000 - -glabel D_020077F8 -.word 0xe7000000, 0x00000000 -.word 0xb900031d, 0x00504240 -.word 0xfcff99ff, 0xff327f3f -.word 0xb8000000, 0x00000000 - -glabel D_02007818 -.word 0xe7000000, 0x00000000 -.word 0xb900031d, 0x00504240 -.word 0xfcff97ff, 0xff2e7f3f -.word 0xb8000000, 0x00000000 - -glabel D_02007838 -.word 0x0400081f, D_02007BB8 -.word 0x0404081f, D_02007BD8 -.word 0x06000000, 0x0d006940 -.word 0xb8000000, 0x00000000 - -glabel D_02007858 -.word 0x0400081f, D_02007BB8 -.word 0x0404081f, D_02007BF8 -.word 0x06000000, 0x0d006940 -.word 0xb8000000, 0x00000000 - -glabel D_02007878 -.word 0x0400081f, D_02007BB8 -.word 0x0404081f, D_02007C18 -.word 0x06000000, 0x0d006940 -.word 0xb8000000, 0x00000000 - -glabel D_02007898 -.word 0x0400081f, D_02007BB8 -.word 0x0404081f, D_02007C38 -.word 0x06000000, 0x0d006940 -.word 0xb8000000, 0x00000000 - -glabel D_020078B8 -.word 0x0400081f, D_02007BB8 -.word 0x0404081f, D_02007C58 -.word 0x06000000, 0x0d006940 -.word 0xb8000000, 0x00000000 - -glabel D_020078D8 -.word 0x0400081f, D_02007BB8 -.word 0x0404081f, D_02007C78 -.word 0x06000000, 0x0d006940 -.word 0xb8000000, 0x00000000 - -glabel D_020078F8 -.word 0x0400081f, D_02007BB8 -.word 0x0404081f, D_02007C98 -.word 0x06000000, 0x0d006940 -.word 0xb8000000, 0x00000000 - -glabel D_02007918 -.word 0x0400081f, D_02007BB8 -.word 0x0404081f, D_02007CB8 -.word 0x06000000, 0x0d006940 -.word 0xb8000000, 0x00000000 - -glabel D_02007938 -.word 0x0400081f, D_02007CD8 -.word 0x0404081f, D_02007CF8 -.word 0x06000000, 0x0d006940 -.word 0xb8000000, 0x00000000 - -glabel D_02007958 -.word 0x0400081f, D_02007CD8 -.word 0x0404081f, D_02007D18 -.word 0x06000000, 0x0d006940 -.word 0xb8000000, 0x00000000 - -glabel D_02007978 -.word 0x0400081f, D_02007CD8 -.word 0x0404081f, D_02007D38 -.word 0x06000000, 0x0d006940 -.word 0xb8000000, 0x00000000 - -glabel D_02007998 -.word 0x0400081f, D_02007CD8 -.word 0x0404081f, D_02007D58 -.word 0x06000000, 0x0d006940 -.word 0xb8000000, 0x00000000 - -glabel D_020079B8 -.word 0x0400081f, D_02007CD8 -.word 0x0404081f, D_02007D78 -.word 0x06000000, 0x0d006940 -.word 0xb8000000, 0x00000000 - -glabel D_020079D8 -.word 0x0400081f, D_02007CD8 -.word 0x0404081f, D_02007D98 -.word 0x06000000, 0x0d006940 -.word 0xb8000000, 0x00000000 - -glabel D_020079F8 -.word 0x0400081f, D_02007CD8 -.word 0x0404081f, D_02007DB8 -.word 0x06000000, 0x0d006940 -.word 0xb8000000, 0x00000000 - -glabel D_02007A18 -.word 0x0400081f, D_02007CD8 -.word 0x0404081f, D_02007DD8 -.word 0x06000000, 0x0d006940 -.word 0xb8000000, 0x00000000 - -glabel D_02007A38 -.word 0x0400081f, D_02007DF8 -.word 0x0404081f, D_02007E18 -.word 0x06000000, 0x0d006940 -.word 0xb8000000, 0x00000000 - -glabel D_02007A58 -.word 0x0400081f, D_02007DF8 -.word 0x0404081f, D_02007E38 -.word 0x06000000, 0x0d006940 -.word 0xb8000000, 0x00000000 - -glabel D_02007A78 -.word 0x0400081f, D_02007DF8 -.word 0x0404081f, D_02007E58 -.word 0x06000000, 0x0d006940 -.word 0xb8000000, 0x00000000 - -glabel D_02007A98 -.word 0x0400081f, D_02007DF8 -.word 0x0404081f, D_02007E78 -.word 0x06000000, 0x0d006940 -.word 0xb8000000, 0x00000000 - -glabel D_02007AB8 -.word 0x0400081f, D_02007DF8 -.word 0x0404081f, D_02007E98 -.word 0x06000000, 0x0d006940 -.word 0xb8000000, 0x00000000 - -glabel D_02007AD8 -.word 0x0400081f, D_02007DF8 -.word 0x0404081f, D_02007EB8 -.word 0x06000000, 0x0d006940 -.word 0xb8000000, 0x00000000 - -glabel D_02007AF8 -.word 0x0400081f, D_02007DF8 -.word 0x0404081f, D_02007ED8 -.word 0x06000000, 0x0d006940 -.word 0xb8000000, 0x00000000 - -glabel D_02007B18 -.word 0x0400081f, D_02007DF8 -.word 0x0404081f, D_02007EF8 -.word 0x06000000, 0x0d006940 -.word 0xb8000000, 0x00000000 -.word 0x00000000, 0x00000000 -.word 0x00000000, 0xffffffff -.word 0x00100000, 0x00000000 -.word 0x00000000, 0xffffffff -.word 0x00100010, 0x00000000 -.word 0x00000000, 0xffffffff -.word 0x00000010, 0x00000000 -.word 0x00000000, 0xffffffff -.word 0x0000fff8, 0x00000000 -.word 0x00000000, 0xffffffff -.word 0x0008fff8, 0x00000000 -.word 0x01c00000, 0xffffffff -.word 0x00080000, 0x00000000 -.word 0x01c001c0, 0xff0000ff -.word 0x00000000, 0x00000000 -.word 0x000001c0, 0xff0000ff - -glabel D_02007BB8 -.word 0x0000fff0, 0x00000000 -.word 0x00000000, 0xffffffff -.word 0x001afff0, 0x00000000 -.word 0x06400000, 0xffffffff - -glabel D_02007BD8 -.word 0x001a0000, 0x00000000 -.word 0x064003c0, 0x0000ffff -.word 0x00000000, 0x00000000 -.word 0x000003c0, 0x0000ffff - -glabel D_02007BF8 -.word 0x001a0000, 0x00000000 -.word 0x064003c0, 0x00ff00ff -.word 0x00000000, 0x00000000 -.word 0x000003c0, 0x00ff00ff - -glabel D_02007C18 -.word 0x001a0000, 0x00000000 -.word 0x064003c0, 0xff0000ff -.word 0x00000000, 0x00000000 -.word 0x000003c0, 0xff0000ff - -glabel D_02007C38 -.word 0x001a0000, 0x00000000 -.word 0x064003c0, 0xffff00ff -.word 0x00000000, 0x00000000 -.word 0x000003c0, 0xffff00ff - -glabel D_02007C58 -.word 0x001a0000, 0x00000000 -.word 0x064003c0, 0xff0000ff -.word 0x00000000, 0x00000000 -.word 0x000003c0, 0xff0000ff - -glabel D_02007C78 -.word 0x001a0000, 0x00000000 -.word 0x064003c0, 0xff0000ff -.word 0x00000000, 0x00000000 -.word 0x000003c0, 0xff0000ff - -glabel D_02007C98 -.word 0x001a0000, 0x00000000 -.word 0x064003c0, 0xff0000ff -.word 0x00000000, 0x00000000 -.word 0x000003c0, 0xff0000ff - -glabel D_02007CB8 -.word 0x001a0000, 0x00000000 -.word 0x064003c0, 0xff0000ff -.word 0x00000000, 0x00000000 -.word 0x000003c0, 0xff0000ff - -glabel D_02007CD8 -.word 0x0000fff0, 0x00000000 -.word 0x00000000, 0xffffffff -.word 0x0010fff0, 0x00000000 -.word 0x03c00000, 0xffffffff - -glabel D_02007CF8 -.word 0x00100000, 0x00000000 -.word 0x03c003c0, 0x0000ffff -.word 0x00000000, 0x00000000 -.word 0x000003c0, 0x0000ffff - -glabel D_02007D18 -.word 0x00100000, 0x00000000 -.word 0x03c003c0, 0x00ff00ff -.word 0x00000000, 0x00000000 -.word 0x000003c0, 0x00ff00ff - -glabel D_02007D38 -.word 0x00100000, 0x00000000 -.word 0x03c003c0, 0xff0000ff -.word 0x00000000, 0x00000000 -.word 0x000003c0, 0xff0000ff - -glabel D_02007D58 -.word 0x00100000, 0x00000000 -.word 0x03c003c0, 0xffff00ff -.word 0x00000000, 0x00000000 -.word 0x000003c0, 0xffff00ff - -glabel D_02007D78 -.word 0x00100000, 0x00000000 -.word 0x03c003c0, 0xff0000ff -.word 0x00000000, 0x00000000 -.word 0x000003c0, 0xff0000ff - -glabel D_02007D98 -.word 0x00100000, 0x00000000 -.word 0x03c003c0, 0xff0000ff -.word 0x00000000, 0x00000000 -.word 0x000003c0, 0xff0000ff - -glabel D_02007DB8 -.word 0x00100000, 0x00000000 -.word 0x03c003c0, 0xff0000ff -.word 0x00000000, 0x00000000 -.word 0x000003c0, 0xff0000ff - -glabel D_02007DD8 -.word 0x00100000, 0x00000000 -.word 0x03c003c0, 0xff0000ff -.word 0x00000000, 0x00000000 -.word 0x000003c0, 0xff0000ff - -glabel D_02007DF8 -.word 0x0000ffe0, 0x00000000 -.word 0x00000000, 0xffffffff -.word 0x001effe0, 0x00000000 -.word 0x07400000, 0xffffffff - -glabel D_02007E18 -.word 0x001e0000, 0x00000000 -.word 0x074007c0, 0x0000ffff -.word 0x00000000, 0x00000000 -.word 0x000007c0, 0x0000ffff - -glabel D_02007E38 -.word 0x001e0000, 0x00000000 -.word 0x074007c0, 0x00ff00ff -.word 0x00000000, 0x00000000 -.word 0x000007c0, 0x00ff00ff - -glabel D_02007E58 -.word 0x001e0000, 0x00000000 -.word 0x074007c0, 0xff0000ff -.word 0x00000000, 0x00000000 -.word 0x000007c0, 0xff0000ff - -glabel D_02007E78 -.word 0x001e0000, 0x00000000 -.word 0x074007c0, 0xffff00ff -.word 0x00000000, 0x00000000 -.word 0x000007c0, 0xffff00ff - -glabel D_02007E98 -.word 0x001e0000, 0x00000000 -.word 0x074007c0, 0xff0000ff -.word 0x00000000, 0x00000000 -.word 0x000007c0, 0xff0000ff - -glabel D_02007EB8 -.word 0x001e0000, 0x00000000 -.word 0x074007c0, 0xff0000ff -.word 0x00000000, 0x00000000 -.word 0x000007c0, 0xff0000ff - -glabel D_02007ED8 -.word 0x001e0000, 0x00000000 -.word 0x074007c0, 0xff0000ff -.word 0x00000000, 0x00000000 -.word 0x000007c0, 0xff0000ff - -glabel D_02007EF8 -.word 0x001e0000, 0x00000000 -.word 0x074007c0, 0xff0000ff -.word 0x00000000, 0x00000000 -.word 0x000007c0, 0xff0000ff - -glabel D_02007F18 -.word 0xe7000000, 0x00000000 -.word 0xba001301, 0x00000000 -.word 0xba000e02, 0x00000000 -.word 0xba000c02, 0x00002000 -.word 0xb900031d, 0x0f0a4000 -.word 0xb8000000, 0x00000000 - -glabel D_02007F48 -.word 0xe7000000, 0x00000000 -.word 0xba001301, 0x00080000 -.word 0xb8000000, 0x00000000 - -glabel D_02007F60 -.word 0xba001402, 0x00300000 -.word 0xb900031d, 0x0f0a4000 -.word 0xb6000000, 0x00022001 -.word 0xf7000000, 0x00010001 -.word 0xf64fc3bc, 0x00000000 -.word 0xb7000000, 0x00022001 -.word 0xb900031d, 0x00552078 -.word 0xba001402, 0x00000000 -.word 0xfcffffff, 0xfffe793c -.word 0xb7000000, 0x00022204 -.word 0xe7000000, 0x00000000 -.word 0x06000000, 0x060093f8 -.word 0xb8000000, 0x00000000 - -glabel D_02007FC8 -.word 0xba001301, 0x00080000 -.word 0xe7000000, 0x00000000 -.word 0xb7000000, 0x00022001 -.word 0xb900031d, 0x00552078 -.word 0xba001402, 0x00000000 -.word 0xfcffffff, 0xfffe793c -.word 0xb7000000, 0x00022204 -.word 0xb8000000, 0x00000000 - -glabel D_02008008 -.word 0xe7000000, 0x00000000 -.word 0xba001402, 0x00000000 -.word 0xb900031d, 0x00504240 -.word 0xfcffffff, 0xfffdf6fb -.word 0xb8000000, 0x00000000 - -glabel D_02008030 -.word 0xe7000000, 0x00000000 -.word 0xba001402, 0x00300000 -.word 0xb900031d, 0x0f0a4000 -.word 0xfcffffff, 0xfffcf279 -.word 0xb8000000, 0x00000000 - -glabel D_02008058 -.word 0xe7000000, 0x00000000 -.word 0xba001402, 0x00000000 -.word 0xb8000000, 0x00000000 diff --git a/mk64.ld b/mk64.ld index dd3484903..9f5a51942 100644 --- a/mk64.ld +++ b/mk64.ld @@ -381,6 +381,7 @@ SECTIONS BEGIN_SEG(data_segment2, 0x02000000) { BUILD_DIR/data/data_segment2.o(.data); + BUILD_DIR/src/data_segment2.inc.o(.data); } END_SEG(data_segment2) diff --git a/src/data_segment2.inc.c b/src/data_segment2.inc.c new file mode 100644 index 000000000..57dedb9b6 --- /dev/null +++ b/src/data_segment2.inc.c @@ -0,0 +1,524 @@ +#include +#include +#include +#include + +extern mk_Vtx_Flag D_02007BB8[]; +extern s32 D_800E84C0[]; +extern mk_Vtx_Flag D_02007BD8[]; +extern mk_Vtx_Flag D_02007BF8[]; +extern mk_Vtx_Flag D_02007C18[]; +extern mk_Vtx_Flag D_02007C38[]; +extern mk_Vtx_Flag D_02007C58[]; +extern mk_Vtx_Flag D_02007C78[]; +extern mk_Vtx_Flag D_02007C98[]; +extern mk_Vtx_Flag D_02007CB8[]; +extern mk_Vtx_Flag D_02007CD8[]; +extern mk_Vtx_Flag D_02007CF8[]; +extern mk_Vtx_Flag D_02007D18[]; +extern mk_Vtx_Flag D_02007D38[]; +extern mk_Vtx_Flag D_02007D58[]; +extern mk_Vtx_Flag D_02007D78[]; +extern mk_Vtx_Flag D_02007D98[]; +extern mk_Vtx_Flag D_02007DB8[]; +extern mk_Vtx_Flag D_02007DD8[]; +extern mk_Vtx_Flag D_02007DF8[]; +extern mk_Vtx_Flag D_02007E18[]; +extern mk_Vtx_Flag D_02007E38[]; +extern mk_Vtx_Flag D_02007E58[]; +extern mk_Vtx_Flag D_02007E78[]; +extern mk_Vtx_Flag D_02007E98[]; +extern mk_Vtx_Flag D_02007EB8[]; +extern mk_Vtx_Flag D_02007ED8[]; +extern mk_Vtx_Flag D_02007EF8[]; + +extern Gfx D_060093F8[]; + +extern Gfx D_0D006940[]; + +Gfx D_02007650[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_OPA_SURF, G_RM_AA_OPA_SURF2), + gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_LIGHTING | G_SHADING_SMOOTH), + gsDPSetTexturePersp(G_TP_NONE), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetPrimColor(0, 0, 0xFF, 0xFF, 0xFF, 0xFF), + gsDPSetCombineMode(G_CC_DECALRGB, G_CC_DECALRGB), + gsDPSetTextureFilter(G_TF_BILERP), + gsDPSetAlphaCompare(G_AC_NONE), + gsDPSetTextureLUT(G_TT_NONE), + gsSPEndDisplayList(), +}; + +Gfx D_020076B0[] = { + gsDPPipeSync(), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsDPSetCombineMode(G_CC_DECALRGB, G_CC_DECALRGB), + gsDPSetTexturePersp(G_TP_PERSP), + gsSPSetGeometryMode(G_ZBUFFER), + gsSPEndDisplayList(), +}; + +Gfx D_020076E0[] = { + gsDPPipeSync(), + gsSPClearGeometryMode(G_SHADE | G_SHADING_SMOOTH), + gsDPSetRenderMode(G_RM_XLU_SURF, G_RM_XLU_SURF2), + gsDPSetCombineMode(G_CC_DECALRGBA, G_CC_DECALRGBA), + gsSPEndDisplayList(), +}; + +Gfx D_02007708[] = { + gsDPPipeSync(), + gsDPSetRenderMode(G_RM_OPA_SURF, G_RM_OPA_SURF2), + gsDPSetCombineMode(G_CC_DECALRGBA, G_CC_DECALRGBA), + gsSPEndDisplayList(), +}; + +Gfx D_02007728[] = { + gsDPPipeSync(), + gsDPSetRenderMode(G_RM_XLU_SURF, G_RM_XLU_SURF2), + gsDPSetCombineMode(G_CC_DECALRGBA, G_CC_DECALRGBA), + gsSPEndDisplayList(), +}; + +Gfx D_02007748[] = { + gsDPPipeSync(), + gsDPSetRenderMode(G_RM_XLU_SURF, G_RM_XLU_SURF2), + gsDPSetCombineMode(G_CC_MODULATEI_PRIM, G_CC_MODULATEI_PRIM), + gsSPEndDisplayList(), +}; + +Gfx D_02007768[] = { + gsDPPipeSync(), + gsDPSetRenderMode(G_RM_XLU_SURF, G_RM_XLU_SURF2), + gsDPSetCombineMode(G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM), + gsSPEndDisplayList(), +}; + +Gfx D_02007788[] = { + gsDPPipeSync(), + gsDPSetRenderMode(G_RM_XLU_SURF, G_RM_XLU_SURF2), + gsDPSetCombineLERP(TEXEL0, 0, ENVIRONMENT, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, ENVIRONMENT, 0, 0, 0, 0, TEXEL0), + gsSPEndDisplayList(), +}; + +Gfx D_020077A8[] = { + gsDPPipeSync(), + gsSPTexture(0x8000, 0x8000, 0, G_TX_RENDERTILE, G_ON), + gsSPSetGeometryMode(G_SHADE | G_SHADING_SMOOTH), + gsSPClearGeometryMode(G_LIGHTING), + gsDPSetTexturePersp(G_TP_PERSP), + gsSPEndDisplayList(), +}; + +Gfx D_020077D8[] = { + gsDPPipeSync(), + gsSPTexture(0x8000, 0x8000, 0, G_TX_RENDERTILE, G_OFF), + gsDPSetTexturePersp(G_TP_NONE), + gsSPEndDisplayList(), +}; + +Gfx D_020077F8[] = { + gsDPPipeSync(), + gsDPSetRenderMode(G_RM_XLU_SURF, G_RM_XLU_SURF2), + gsDPSetCombineLERP(0, 0, 0, SHADE, TEXEL0, 0, SHADE, 0, 0, 0, 0, SHADE, TEXEL0, 0, SHADE, 0), + gsSPEndDisplayList(), +}; + +Gfx D_02007818[] = { + gsDPPipeSync(), + gsDPSetRenderMode(G_RM_XLU_SURF, G_RM_XLU_SURF2), + gsDPSetCombineLERP(0, 0, 0, SHADE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, SHADE, TEXEL0, 0, PRIMITIVE, 0), + gsSPEndDisplayList(), +}; + +Gfx D_02007838[] = { + gsSPVertex(D_02007BB8, 2, 0), + gsSPVertex(D_02007BD8, 2, 2), + gsSPDisplayList(D_0D006940), + gsSPEndDisplayList(), +}; + +Gfx D_02007858[] = { + gsSPVertex(D_02007BB8, 2, 0), + gsSPVertex(D_02007BF8, 2, 2), + gsSPDisplayList(D_0D006940), + gsSPEndDisplayList(), +}; + +Gfx D_02007878[] = { + gsSPVertex(D_02007BB8, 2, 0), + gsSPVertex(D_02007C18, 2, 2), + gsSPDisplayList(D_0D006940), + gsSPEndDisplayList(), +}; + +Gfx D_02007898[] = { + gsSPVertex(D_02007BB8, 2, 0), + gsSPVertex(D_02007C38, 2, 2), + gsSPDisplayList(D_0D006940), + gsSPEndDisplayList(), +}; + +Gfx D_020078B8[] = { + gsSPVertex(D_02007BB8, 2, 0), + gsSPVertex(D_02007C58, 2, 2), + gsSPDisplayList(D_0D006940), + gsSPEndDisplayList(), +}; + +Gfx D_020078D8[] = { + gsSPVertex(D_02007BB8, 2, 0), + gsSPVertex(D_02007C78, 2, 2), + gsSPDisplayList(D_0D006940), + gsSPEndDisplayList(), +}; + +Gfx D_020078F8[] = { + gsSPVertex(D_02007BB8, 2, 0), + gsSPVertex(D_02007C98, 2, 2), + gsSPDisplayList(D_0D006940), + gsSPEndDisplayList(), +}; + +Gfx D_02007918[] = { + gsSPVertex(D_02007BB8, 2, 0), + gsSPVertex(D_02007CB8, 2, 2), + gsSPDisplayList(D_0D006940), + gsSPEndDisplayList(), +}; + +Gfx D_02007938[] = { + gsSPVertex(D_02007CD8, 2, 0), + gsSPVertex(D_02007CF8, 2, 2), + gsSPDisplayList(D_0D006940), + gsSPEndDisplayList(), +}; + +Gfx D_02007958[] = { + gsSPVertex(D_02007CD8, 2, 0), + gsSPVertex(D_02007D18, 2, 2), + gsSPDisplayList(D_0D006940), + gsSPEndDisplayList(), +}; + +Gfx D_02007978[] = { + gsSPVertex(D_02007CD8, 2, 0), + gsSPVertex(D_02007D38, 2, 2), + gsSPDisplayList(D_0D006940), + gsSPEndDisplayList(), +}; + +Gfx D_02007998[] = { + gsSPVertex(D_02007CD8, 2, 0), + gsSPVertex(D_02007D58, 2, 2), + gsSPDisplayList(D_0D006940), + gsSPEndDisplayList(), +}; + +Gfx D_020079B8[] = { + gsSPVertex(D_02007CD8, 2, 0), + gsSPVertex(D_02007D78, 2, 2), + gsSPDisplayList(D_0D006940), + gsSPEndDisplayList(), +}; + +Gfx D_020079D8[] = { + gsSPVertex(D_02007CD8, 2, 0), + gsSPVertex(D_02007D98, 2, 2), + gsSPDisplayList(D_0D006940), + gsSPEndDisplayList(), +}; + +Gfx D_020079F8[] = { + gsSPVertex(D_02007CD8, 2, 0), + gsSPVertex(D_02007DB8, 2, 2), + gsSPDisplayList(D_0D006940), + gsSPEndDisplayList(), +}; + +Gfx D_02007A18[] = { + gsSPVertex(D_02007CD8, 2, 0), + gsSPVertex(D_02007DD8, 2, 2), + gsSPDisplayList(D_0D006940), + gsSPEndDisplayList(), +}; + +Gfx D_02007A38[] = { + gsSPVertex(D_02007DF8, 2, 0), + gsSPVertex(D_02007E18, 2, 2), + gsSPDisplayList(D_0D006940), + gsSPEndDisplayList(), +}; + +Gfx D_02007A58[] = { + gsSPVertex(D_02007DF8, 2, 0), + gsSPVertex(D_02007E38, 2, 2), + gsSPDisplayList(D_0D006940), + gsSPEndDisplayList(), +}; + +Gfx D_02007A78[] = { + gsSPVertex(D_02007DF8, 2, 0), + gsSPVertex(D_02007E58, 2, 2), + gsSPDisplayList(D_0D006940), + gsSPEndDisplayList(), +}; + +Gfx D_02007A98[] = { + gsSPVertex(D_02007DF8, 2, 0), + gsSPVertex(D_02007E78, 2, 2), + gsSPDisplayList(D_0D006940), + gsSPEndDisplayList(), +}; + +Gfx D_02007AB8[] = { + gsSPVertex(D_02007DF8, 2, 0), + gsSPVertex(D_02007E98, 2, 2), + gsSPDisplayList(D_0D006940), + gsSPEndDisplayList(), +}; + +Gfx D_02007AD8[] = { + gsSPVertex(D_02007DF8, 2, 0), + gsSPVertex(D_02007EB8, 2, 2), + gsSPDisplayList(D_0D006940), + gsSPEndDisplayList(), +}; + +Gfx D_02007AF8[] = { + gsSPVertex(D_02007DF8, 2, 0), + gsSPVertex(D_02007ED8, 2, 2), + gsSPDisplayList(D_0D006940), + gsSPEndDisplayList(), +}; + +Gfx D_02007B18[] = { + gsSPVertex(D_02007DF8, 2, 0), + gsSPVertex(D_02007EF8, 2, 2), + gsSPDisplayList(D_0D006940), + gsSPEndDisplayList(), +}; + +// gfx data? +UNUSED s32 D_02007B38[] = { +0x00000000, 0x00000000, + 0x00000000, 0xffffffff, + 0x00100000, 0x00000000, + 0x00000000, 0xffffffff, + 0x00100010, 0x00000000, + 0x00000000, 0xffffffff, + 0x00000010, 0x00000000, + 0x00000000, 0xffffffff, + 0x0000fff8, 0x00000000, + 0x00000000, 0xffffffff, + 0x0008fff8, 0x00000000, + 0x01c00000, 0xffffffff, + 0x00080000, 0x00000000, + 0x01c001c0, 0xff0000ff, + 0x00000000, 0x00000000, + 0x000001c0, 0xff0000ff, + +}; + +// Todo: Place all theces vertices in a single array +// Access the correct vertex using sym[value] +mk_Vtx_Flag D_02007BB8[] = { + {{0, 65520, 0}, {0, 0}, {0, 0}, {0xff, 0xff, 0xff, 0xff}}, + {{26, 65520, 0}, {0, 1600}, {0, 0}, {0xff, 0xff, 0xff, 0xff}}, +}; + +mk_Vtx_Flag D_02007BD8[] = { + {{26, 0, 0}, {0, 1600}, {3, 192}, {0x00, 0x00, 0xff, 0xff}}, + {{0, 0, 0}, {0, 0}, {3, 192}, {0x00, 0x00, 0xff, 0xff}}, +}; + +mk_Vtx_Flag D_02007BF8[] = { + {{26, 0, 0}, {0, 1600}, {3, 192}, {0x00, 0xff, 0x00, 0xff}}, + {{0, 0, 0}, {0, 0}, {3, 192}, {0x00, 0xff, 0x00, 0xff}}, +}; + +mk_Vtx_Flag D_02007C18[] = { + {{26, 0, 0}, {0, 1600}, {3, 192}, {0xff, 0x00, 0x00, 0xff}}, + {{0, 0, 0}, {0, 0}, {3, 192}, {0xff, 0x00, 0x00, 0xff}}, +}; + +mk_Vtx_Flag D_02007C38[] = { + {{26, 0, 0}, {0, 1600}, {3, 192}, {0xff, 0xff, 0x00, 0xff}}, + {{0, 0, 0}, {0, 0}, {3, 192}, {0xff, 0xff, 0x00, 0xff}}, +}; + +mk_Vtx_Flag D_02007C58[] = { + {{26, 0, 0}, {0, 1600}, {3, 192}, {0xff, 0x00, 0x00, 0xff}}, + {{0, 0, 0}, {0, 0}, {3, 192}, {0xff, 0x00, 0x00, 0xff}}, +}; + +mk_Vtx_Flag D_02007C78[] = { + {{26, 0, 0}, {0, 1600}, {3, 192}, {0xff, 0x00, 0x00, 0xff}}, + {{0, 0, 0}, {0, 0}, {3, 192}, {0xff, 0x00, 0x00, 0xff}}, +}; + +mk_Vtx_Flag D_02007C98[] = { + {{26, 0, 0}, {0, 1600}, {3, 192}, {0xff, 0x00, 0x00, 0xff}}, + {{0, 0, 0}, {0, 0}, {3, 192}, {0xff, 0x00, 0x00, 0xff}}, +}; + +mk_Vtx_Flag D_02007CB8[] = { + {{26, 0, 0}, {0, 1600}, {3, 192}, {0xff, 0x00, 0x00, 0xff}}, + {{0, 0, 0}, {0, 0}, {3, 192}, {0xff, 0x00, 0x00, 0xff}}, +}; + +mk_Vtx_Flag D_02007CD8[] = { + {{0, 65520, 0}, {0, 0}, {0, 0}, {0xff, 0xff, 0xff, 0xff}}, + {{16, 65520, 0}, {0, 960}, {0, 0}, {0xff, 0xff, 0xff, 0xff}}, +}; + +mk_Vtx_Flag D_02007CF8[] = { + {{16, 0, 0}, {0, 960}, {3, 192}, {0x00, 0x00, 0xff, 0xff}}, + {{0, 0, 0}, {0, 0}, {3, 192}, {0x00, 0x00, 0xff, 0xff}}, +}; + +mk_Vtx_Flag D_02007D18[] = { + {{16, 0, 0}, {0, 960}, {3, 192}, {0x00, 0xff, 0x00, 0xff}}, + {{0, 0, 0}, {0, 0}, {3, 192}, {0x00, 0xff, 0x00, 0xff}}, +}; + +mk_Vtx_Flag D_02007D38[] = { + {{16, 0, 0}, {0, 960}, {3, 192}, {0xff, 0x00, 0x00, 0xff}}, + {{0, 0, 0}, {0, 0}, {3, 192}, {0xff, 0x00, 0x00, 0xff}}, +}; + +mk_Vtx_Flag D_02007D58[] = { + {{16, 0, 0}, {0, 960}, {3, 192}, {0xff, 0xff, 0x00, 0xff}}, + {{0, 0, 0}, {0, 0}, {3, 192}, {0xff, 0xff, 0x00, 0xff}}, +}; + +mk_Vtx_Flag D_02007D78[] = { + {{16, 0, 0}, {0, 960}, {3, 192}, {0xff, 0x00, 0x00, 0xff}}, + {{0, 0, 0}, {0, 0}, {3, 192}, {0xff, 0x00, 0x00, 0xff}}, +}; + +mk_Vtx_Flag D_02007D98[] = { + {{16, 0, 0}, {0, 960}, {3, 192}, {0xff, 0x00, 0x00, 0xff}}, + {{0, 0, 0}, {0, 0}, {3, 192}, {0xff, 0x00, 0x00, 0xff}}, +}; + +mk_Vtx_Flag D_02007DB8[] = { + {{16, 0, 0}, {0, 960}, {3, 192}, {0xff, 0x00, 0x00, 0xff}}, + {{0, 0, 0}, {0, 0}, {3, 192}, {0xff, 0x00, 0x00, 0xff}}, +}; + +mk_Vtx_Flag D_02007DD8[] = { + {{16, 0, 0}, {0, 960}, {3, 192}, {0xff, 0x00, 0x00, 0xff}}, + {{0, 0, 0}, {0, 0}, {3, 192}, {0xff, 0x00, 0x00, 0xff}}, +}; + +mk_Vtx_Flag D_02007DF8[] = { + {{0, 65504, 0}, {0, 0}, {0, 0}, {0xff, 0xff, 0xff, 0xff}}, + {{30, 65504, 0}, {0, 1856}, {0, 0}, {0xff, 0xff, 0xff, 0xff}}, +}; + +mk_Vtx_Flag D_02007E18[] = { + {{30, 0, 0}, {0, 1856}, {7, 192}, {0x00, 0x00, 0xff, 0xff}}, + {{0, 0, 0}, {0, 0}, {7, 192}, {0x00, 0x00, 0xff, 0xff}}, +}; + +mk_Vtx_Flag D_02007E38[] = { + {{30, 0, 0}, {0, 1856}, {7, 192}, {0x00, 0xff, 0x00, 0xff}}, + {{0, 0, 0}, {0, 0}, {7, 192}, {0x00, 0xff, 0x00, 0xff}}, +}; + +mk_Vtx_Flag D_02007E58[] = { + {{30, 0, 0}, {0, 1856}, {7, 192}, {0xff, 0x00, 0x00, 0xff}}, + {{0, 0, 0}, {0, 0}, {7, 192}, {0xff, 0x00, 0x00, 0xff}}, +}; + +mk_Vtx_Flag D_02007E78[] = { + {{30, 0, 0}, {0, 1856}, {7, 192}, {0xff, 0xff, 0x00, 0xff}}, + {{0, 0, 0}, {0, 0}, {7, 192}, {0xff, 0xff, 0x00, 0xff}}, +}; + +mk_Vtx_Flag D_02007E98[] = { + {{30, 0, 0}, {0, 1856}, {7, 192}, {0xff, 0x00, 0x00, 0xff}}, + {{0, 0, 0}, {0, 0}, {7, 192}, {0xff, 0x00, 0x00, 0xff}}, +}; + +mk_Vtx_Flag D_02007EB8[] = { + {{30, 0, 0}, {0, 1856}, {7, 192}, {0xff, 0x00, 0x00, 0xff}}, + {{0, 0, 0}, {0, 0}, {7, 192}, {0xff, 0x00, 0x00, 0xff}}, +}; + +mk_Vtx_Flag D_02007ED8[] = { + {{30, 0, 0}, {0, 1856}, {7, 192}, {0xff, 0x00, 0x00, 0xff}}, + {{0, 0, 0}, {0, 0}, {7, 192}, {0xff, 0x00, 0x00, 0xff}}, +}; + +mk_Vtx_Flag D_02007EF8[] = { + {{30, 0, 0}, {0, 1856}, {7, 192}, {0xff, 0x00, 0x00, 0xff}}, + {{0, 0, 0}, {0, 0}, {7, 192}, {0xff, 0x00, 0x00, 0xff}}, +}; + +Gfx D_02007F18[] = { + gsDPPipeSync(), + gsDPSetTexturePersp(G_TP_NONE), + gsDPSetTextureLUT(G_TT_NONE), + gsDPSetTextureFilter(G_TF_BILERP), + gsDPSetRenderMode(G_RM_OPA_SURF, G_RM_OPA_SURF2), + gsSPEndDisplayList(), +}; + +Gfx D_02007F48[] = { + gsDPPipeSync(), + gsDPSetTexturePersp(G_TP_PERSP), + gsSPEndDisplayList(), +}; + +Gfx D_02007F60[] = { + gsDPSetCycleType(G_CYC_FILL), + gsDPSetRenderMode(G_RM_OPA_SURF, G_RM_OPA_SURF2), + gsSPClearGeometryMode(G_ZBUFFER | G_CULL_BACK | G_LIGHTING), + gsDPSetFillColor(0x00010001), + gsDPFillRectangle(0, 0, 319, 239), + gsSPSetGeometryMode(G_ZBUFFER | G_CULL_BACK | G_LIGHTING), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE), + gsSPSetGeometryMode(G_SHADE | G_CULL_BACK | G_LIGHTING | G_SHADING_SMOOTH), + gsDPPipeSync(), + gsSPDisplayList(D_060093F8), + gsSPEndDisplayList(), +}; + +Gfx D_02007FC8[] = { + gsDPSetTexturePersp(G_TP_PERSP), + gsDPPipeSync(), + gsSPSetGeometryMode(G_ZBUFFER | G_CULL_BACK | G_LIGHTING), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE), + gsSPSetGeometryMode(G_SHADE | G_CULL_BACK | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), +}; + +Gfx D_02008008[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_XLU_SURF, G_RM_XLU_SURF2), + gsDPSetCombineMode(G_CC_PRIMITIVE, G_CC_PRIMITIVE), + gsSPEndDisplayList(), +}; + +Gfx D_02008030[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_FILL), + gsDPSetRenderMode(G_RM_OPA_SURF, G_RM_OPA_SURF2), + gsDPSetCombineMode(G_CC_DECALRGBA, G_CC_DECALRGBA), + gsSPEndDisplayList(), +}; + +Gfx D_02008058[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPEndDisplayList(), +}; \ No newline at end of file diff --git a/undefined_syms.txt b/undefined_syms.txt index 57d499da8..401bb33ce 100644 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -141,6 +141,7 @@ D_06009330 = 0x06009330; D_06009348 = 0x06009348; D_06009370 = 0x06009370; D_060093D8 = 0x060093D8; +D_060093F8 = 0x060093F8; D_06009410 = 0x06009410; D_06009498 = 0x06009498; D_06009518 = 0x06009518;