mirror/ac-decomp
1
0
Fork 0
mirror of https://github.com/ACreTeam/ac-decomp synced 2026-08-04 16:49:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

fixing wrong gsSPDisplayList(0x8000000)

Browse Source
This commit is contained in:
roeming
2025-07-19 09:43:04 -04:00
parent d0995d42ca
commit 0b15b46fa7
4 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/data/model/act_ant.c
+1 -1
View File
@@ -17,7 +17,7 @@ Gfx act_antT_model[] = {
gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_REPEAT, GX_REPEAT, 0, 0),
gsDPSetTextureImage_Dolphin(G_IM_FMT_I, G_IM_SIZ_4b, 32, 32, act_ant_tex),
gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 1, 15, GX_REPEAT, GX_REPEAT, 0, 0),
gsSPDisplayList(0x8000000),
gsSPDisplayList(anime_1_txt),
gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR |
G_SHADING_SMOOTH),
gsSPVertex(act_ant_v, 11, 0),
src/data/model/act_bee.c
+3 -3
View File
@@ -19,7 +19,7 @@ Gfx act_bee_C_model[] = {
gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_REPEAT, GX_REPEAT, 15, 15),
gsDPSetTextureImage_Dolphin(G_IM_FMT_I, G_IM_SIZ_4b, 32, 32, act_bee_tex_txt),
gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 1, 15, GX_REPEAT, GX_REPEAT, 15, 15),
gsSPDisplayList(0x8000000),
gsSPDisplayList(anime_1_txt),
gsSPMatrix(anime_6_txt + 0x40, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW),
gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_SHADING_SMOOTH),
gsSPVertex(act_bee_v, 5, 0),
@@ -41,7 +41,7 @@ Gfx act_bee_B_model[] = {
gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_REPEAT, GX_REPEAT, 15, 15),
gsDPSetTextureImage_Dolphin(G_IM_FMT_I, G_IM_SIZ_4b, 32, 32, act_bee_tex_txt),
gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 1, 15, GX_REPEAT, GX_REPEAT, 15, 15),
gsSPDisplayList(0x8000000),
gsSPDisplayList(anime_1_txt),
gsSPMatrix(anime_6_txt, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW),
gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_SHADING_SMOOTH),
gsSPVertex(&act_bee_v[26], 5, 0),
@@ -61,7 +61,7 @@ Gfx act_bee_A_model[] = {
gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_REPEAT, GX_REPEAT, 15, 15),
gsDPSetTextureImage_Dolphin(G_IM_FMT_I, G_IM_SIZ_4b, 32, 32, act_bee_tex_txt),
gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 1, 15, GX_REPEAT, GX_REPEAT, 15, 15),
gsSPDisplayList(0x8000000),
gsSPDisplayList(anime_1_txt),
gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_SHADING_SMOOTH),
gsSPVertex(&act_bee_v[46], 12, 0),
gsSPNTrianglesInit_5b(15, 0, 1, 2, 0, 3, 4, 0, 4, 1),
src/data/model/f_honeycomb.c
+5 -2
View File
@@ -36,5 +36,8 @@ Gfx obj_f_honeycombT_mat_model[] = {
gsSPEndDisplayList()
};
Gfx obj_f_honeycombT_gfx_model[] = { gsSPVertex(obj_f_honeycomb_v, 4, 0), gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
gsSPEndDisplayList() };
Gfx obj_f_honeycombT_gfx_model[] = {
gsSPVertex(obj_f_honeycomb_v, 4, 0),
gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
gsSPEndDisplayList(),
};
tools/converters/gfxdis.py
+2 -2
View File
@@ -1650,9 +1650,9 @@ def gfx_gsDPSetTile_Dolphin(data):
def gfx_dl(data):
if extract_data_upper(data, 16, 8) == 0:
return gf_call("gsSPDisplayList", data, B2A(0, 32, DL, hex))
return gf_call("gsSPDisplayList", data, GFX_SYMBOL)
else:
return gf_call("gsSPBranchList", data, B2A(0, 32, DL, hex))
return gf_call("gsSPBranchList", data, GFX_SYMBOL)
def gfx_gsSPEndDisplayList(data):