mirror/ac-decomp
1
0
Fork 0
mirror of https://github.com/ACreTeam/ac-decomp synced 2026-05-23 06:34:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

link act_ball_d

Browse Source
This commit is contained in:
roeming
2025-07-17 20:51:44 -04:00
parent 1e565e0ea0
commit b4ee53d390
5 changed files with 150 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/GAFE01_00/config.yml
+28 -1
View File
@@ -25394,4 +25394,31 @@ modules:
binary: assets/act_ball_b_v.bin
header: assets/act_ball_b_v.inc
header_type: none
custom_type: vtx
custom_type: vtx
- symbol: act_ball_d_v
binary: assets/act_ball_d_v.bin
header: assets/act_ball_d_v.inc
header_type: none
custom_type: vtx
- symbol: act_ball_d_pal
binary: assets/act_ball_d_pal.bin
header: assets/act_ball_d_pal.inc
header_type: none
custom_type: pal16
- symbol: act_ball_d_1_tex
binary: assets/act_ball_d_1_tex.bin
header: assets/act_ball_d_1_tex.inc
header_type: raw
- symbol: act_ball_d_2_tex
binary: assets/act_ball_d_2_tex.bin
header: assets/act_ball_d_2_tex.inc
header_type: raw
- symbol: act_ball_d_3_tex
binary: assets/act_ball_d_3_tex.bin
header: assets/act_ball_d_3_tex.inc
header_type: raw
config/GAFE01_00/foresta/splits.txt
+1 -1
View File
@@ -3681,7 +3681,7 @@ data/scene/buggy.c:
data/model/act_ball_b.c:
.data start:0x0009FC28 end:0x0009FFD8
data/dataobject/dataobject_9FFD8:
data/model/act_ball_d.c:
.data start:0x0009FFD8 end:0x000A0738
data/dataobject/dataobject_A0738:
configure.py
+1
View File
@@ -2635,6 +2635,7 @@ config.libs = [
Object(Matching, "data/model/act_ant_anim.c"),
Object(Matching, "data/model/glider.c"),
Object(Matching, "data/model/act_ball_b.c"),
Object(Matching, "data/model/act_ball_d.c"),
],
),
]
src/data/model/act_ball_d.c
+111
View File
@@ -0,0 +1,111 @@
#include "libforest/gbi_extensions.h"
#include "PR/gbi.h"
#include "evw_anime.h"
u16 act_ball_d_pal[] = {
#include "assets/act_ball_d_pal.inc"
};
u8 act_ball_d_1_tex[] = {
#include "assets/act_ball_d_1_tex.inc"
};
u8 act_ball_d_2_tex[] = {
#include "assets/act_ball_d_2_tex.inc"
};
u8 act_ball_d_3_tex[] = {
#include "assets/act_ball_d_3_tex.inc"
};
Vtx act_ball_d_v[] = {
#include "assets/act_ball_d_v.inc"
};
Gfx act_ball_d_model[] = {
gsSPTexture(65535, 65535, 0, G_TX_RENDERTILE, G_ON),
gsDPPipeSync(),
gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2),
gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED),
gsDPSetTextureLUT(G_TT_RGBA16),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, act_ball_d_pal),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_4b, 0, 496, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadTLUTCmd(G_TX_LOADTILE, 15),
gsDPPipeSync(),
gsDPSetTextureImage(G_IM_FMT_CI, G_IM_SIZ_16b, 1, act_ball_d_3_tex),
gsDPSetTile(G_IM_FMT_CI, G_IM_SIZ_16b, 0, 0, G_TX_LOADTILE, 0, G_TX_MIRROR | G_TX_WRAP, 4, G_TX_NOLOD,
G_TX_MIRROR | G_TX_WRAP, 4, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 63, 2048),
gsDPPipeSync(),
gsDPSetTile(G_IM_FMT_CI, G_IM_SIZ_4b, 1, 0, G_TX_RENDERTILE, 15, G_TX_MIRROR | G_TX_WRAP, 4, G_TX_NOLOD,
G_TX_MIRROR | G_TX_WRAP, 4, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 60, 60),
gsDPSetPrimColor(0, 128, 255, 255, 255, 255),
gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH),
gsSPVertex(act_ball_d_v, 18, 0),
gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0),
gsSP2Triangles(1, 4, 3, 0, 1, 5, 4, 0),
gsSP2Triangles(4, 6, 3, 0, 4, 7, 6, 0),
gsSP2Triangles(6, 2, 3, 0, 6, 8, 2, 0),
gsSP2Triangles(9, 10, 11, 0, 10, 12, 11, 0),
gsSP2Triangles(10, 13, 12, 0, 10, 14, 13, 0),
gsSP2Triangles(13, 15, 12, 0, 13, 16, 15, 0),
gsSP2Triangles(15, 11, 12, 0, 15, 17, 11, 0),
gsDPPipeSync(),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, act_ball_d_pal),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_4b, 0, 496, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadTLUTCmd(G_TX_LOADTILE, 15),
gsDPPipeSync(),
gsDPSetTextureImage(G_IM_FMT_CI, G_IM_SIZ_16b, 1, act_ball_d_2_tex),
gsDPSetTile(G_IM_FMT_CI, G_IM_SIZ_16b, 0, 0, G_TX_LOADTILE, 0, G_TX_MIRROR | G_TX_WRAP, 4, G_TX_NOLOD,
G_TX_MIRROR | G_TX_WRAP, 4, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 63, 2048),
gsDPPipeSync(),
gsDPSetTile(G_IM_FMT_CI, G_IM_SIZ_4b, 1, 0, G_TX_RENDERTILE, 15, G_TX_MIRROR | G_TX_WRAP, 4, G_TX_NOLOD,
G_TX_MIRROR | G_TX_WRAP, 4, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 60, 60),
gsSPVertex(&act_ball_d_v[18], 18, 0),
gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0),
gsSP2Triangles(1, 4, 3, 0, 1, 5, 4, 0),
gsSP2Triangles(4, 6, 3, 0, 4, 7, 6, 0),
gsSP2Triangles(6, 2, 3, 0, 6, 8, 2, 0),
gsSP2Triangles(9, 10, 11, 0, 10, 12, 11, 0),
gsSP2Triangles(10, 13, 12, 0, 10, 14, 13, 0),
gsSP2Triangles(13, 15, 12, 0, 13, 16, 15, 0),
gsSP2Triangles(15, 11, 12, 0, 15, 17, 11, 0),
gsDPPipeSync(),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, act_ball_d_pal),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_4b, 0, 496, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadTLUTCmd(G_TX_LOADTILE, 15),
gsDPPipeSync(),
gsDPSetTextureImage(G_IM_FMT_CI, G_IM_SIZ_16b, 1, act_ball_d_1_tex),
gsDPSetTile(G_IM_FMT_CI, G_IM_SIZ_16b, 0, 0, G_TX_LOADTILE, 0, G_TX_MIRROR | G_TX_WRAP, 4, G_TX_NOLOD,
G_TX_MIRROR | G_TX_WRAP, 4, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 63, 2048),
gsDPPipeSync(),
gsDPSetTile(G_IM_FMT_CI, G_IM_SIZ_4b, 1, 0, G_TX_RENDERTILE, 15, G_TX_MIRROR | G_TX_WRAP, 4, G_TX_NOLOD,
G_TX_MIRROR | G_TX_WRAP, 4, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 60, 60),
gsSPVertex(&act_ball_d_v[36], 18, 0),
gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0),
gsSP2Triangles(3, 4, 2, 0, 4, 5, 2, 0),
gsSP2Triangles(1, 6, 3, 0, 1, 7, 6, 0),
gsSP2Triangles(6, 4, 3, 0, 6, 8, 4, 0),
gsSP2Triangles(9, 10, 11, 0, 10, 12, 11, 0),
gsSP2Triangles(12, 13, 11, 0, 13, 14, 11, 0),
gsSP2Triangles(10, 15, 12, 0, 10, 16, 15, 0),
gsSP2Triangles(15, 13, 12, 0, 15, 17, 13, 0),
gsSPEndDisplayList()
};
tools/converters/assetdis.py
+9 -5
View File
@@ -153,12 +153,16 @@ def lookup_bins_and_symbols(lines: list[str], name: str):
data_lines = lines[begin_ind+1:end_ind]
for line in data_lines:
data = line.split(".4byte ")[1]
try:
out_bin.extend(int(data, 16).to_bytes(4, 'big'))
except Exception as e:
if ".4byte" in line:
data = line.split(".4byte ")[1]
try:
out_bin.extend(int(data, 16).to_bytes(4, 'big'))
except Exception as e:
out_bin.extend(b'\0\0\0\0')
out_symbols.append(data)
elif ".rel" in line:
out_bin.extend(b'\0\0\0\0')
out_symbols.append(data)
out_symbols.append(f"&{line.split(".rel ")[1].split(",")[0]}[xxx]")
return out_bin, out_symbols