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

Link obj_flower files

Browse Source
This commit is contained in:
Cuyler36
2024-03-16 18:56:48 -04:00
parent db36242471
commit 3c590642ca
5 changed files with 143 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/assets.yml
+18
View File
@@ -335,6 +335,24 @@ config/rel.yml:
addrs: [0x806E00C0, 0x806E00E0]
type: pal16
# flowers
flower/obj_flower_tex:
addrs: [0x8074FE80, 0x80750680]
flower/obj_flower_a_v:
addrs: [0x80750680, 0x80750700]
type: vtx
flower/obj_flower_b_v:
addrs: [0x80750700, 0x80750780]
type: vtx
flower/obj_flower_c_v:
addrs: [0x80750780, 0x80750800]
type: vtx
flower/obj_flower_leaf_tex:
addrs: [0x807508C0, 0x807510C0]
flower/obj_flower_leaf_v:
addrs: [0x807510C0, 0x80751100]
type: vtx
# dataobj.obj item names
itemName_paper:
addrs: [0x808BF660, 0x808C0660]
config/rel_disasm_overrides.yml
+1
View File
@@ -13,3 +13,4 @@ symbol_aligns:
0x81297E80: 32 # .bss msg.o
0x81296140: 32 # .bss m_island.o
0x80904700: 32 # rom_myhome1_floor_v
0x80751140: 32 # dataobject.obj/.data/obj_zassou_tex
config/rel_slices.yml
+4
View File
@@ -1000,6 +1000,10 @@ ac_weather_fine.c:
# dataobject.obj files
data/field/bg/flower/obj_flower.c:
.data: [0x8074FE80, 0x807508C0]
data/field/bg/flower/obj_flower_leaf.c:
.data: [0x807508C0, 0x80751140]
data/combi/data_combi.c:
.data: [0x8080DD80, 0x8080E628]
data/item/item_name.c:
src/data/field/bg/flower/obj_flower.c
+90
View File
@@ -0,0 +1,90 @@
#include "libforest/gbi_extensions.h"
// clang-format off
static u8 obj_flower_tex[] ATTRIBUTE_ALIGN(32) = {
#include "assets/flower/obj_flower_tex.inc"
};
static Vtx obj_flower_a_v[] = {
#include "assets/flower/obj_flower_a_v.inc"
};
static Vtx obj_flower_b_v[] = {
#include "assets/flower/obj_flower_b_v.inc"
};
static Vtx obj_flower_c_v[] = {
#include "assets/flower/obj_flower_c_v.inc"
};
extern Gfx obj_flower_aT_mat_model[] = {
gsSPTexture(0, 0, 0, 0, G_ON),
gsDPLoadTextureBlock_4b_Dolphin(obj_flower_tex, G_IM_FMT_CI, 128, 32, 0, GX_CLAMP, GX_REPEAT, 0, 0),
gsSPEndDisplayList(),
};
extern Gfx obj_flower_bT_mat_model[] = {
gsSPTexture(0, 0, 0, 0, G_ON),
gsDPLoadTextureBlock_4b_Dolphin(obj_flower_tex, G_IM_FMT_CI, 128, 32, 1, GX_CLAMP, GX_REPEAT, 0, 0),
gsSPEndDisplayList(),
};
extern Gfx obj_flower_cT_mat_model[] = {
gsSPTexture(0, 0, 0, 0, G_ON),
gsDPLoadTextureBlock_4b_Dolphin(obj_flower_tex, G_IM_FMT_CI, 128, 32, 2, GX_CLAMP, GX_REPEAT, 0, 0),
gsSPEndDisplayList(),
};
extern Gfx obj_flower_aT_gfx_model[] = {
gsSPVertex(&obj_flower_a_v[0], 8, 0),
gsSPNTrianglesInit_5b(
4, // tri count
0, 1, 2, // tri0
0, 2, 3, // tri1
4, 5, 6 // tri2
),
gsSPNTriangles_5b(
4, 6, 7, // tri0
0, 0, 0, // tri1
0, 0, 0, // tri2
0, 0, 0 // tri3
),
gsSPEndDisplayList(),
};
extern Gfx obj_flower_bT_gfx_model[] = {
gsSPVertex(&obj_flower_b_v[0], 8, 0),
gsSPNTrianglesInit_5b(
4, // tri count
0, 1, 2, // tri0
0, 2, 3, // tri1
4, 5, 6 // tri2
),
gsSPNTriangles_5b(
4, 6, 7, // tri0
0, 0, 0, // tri1
0, 0, 0, // tri2
0, 0, 0 // tri3
),
gsSPEndDisplayList(),
};
extern Gfx obj_flower_cT_gfx_model[] = {
gsSPVertex(&obj_flower_c_v[0], 8, 0),
gsSPNTrianglesInit_5b(
4, // tri count
0, 1, 2, // tri0
0, 2, 3, // tri1
4, 5, 6 // tri2
),
gsSPNTriangles_5b(
4, 6, 7, // tri0
0, 0, 0, // tri1
0, 0, 0, // tri2
0, 0, 0 // tri3
),
gsSPEndDisplayList(),
};
// clang-format on
src/data/field/bg/flower/obj_flower_leaf.c
+30
View File
@@ -0,0 +1,30 @@
#include "libforest/gbi_extensions.h"
// clang-format off
static u8 obj_flower_tex[] ATTRIBUTE_ALIGN(32) = {
#include "assets/flower/obj_flower_leaf_tex.inc"
};
static Vtx obj_flower_leaf_v[] = {
#include "assets/flower/obj_flower_leaf_v.inc"
};
extern Gfx obj_flower_leafT_mat_model[] = {
gsSPTexture(0, 0, 0, 0, G_ON),
gsDPLoadTextureBlock_4b_Dolphin(obj_flower_tex, G_IM_FMT_CI, 128, 32, 0, GX_CLAMP, GX_REPEAT, 0, 0),
gsSPEndDisplayList(),
};
extern Gfx obj_flower_leafT_gfx_model[] = {
gsSPVertex(&obj_flower_leaf_v[0], 4, 0),
gsSPNTrianglesInit_5b(
2, // tri count
0, 1, 2, // tri0
0, 2, 3, // tri1
0, 0, 0 // tri2
),
gsSPEndDisplayList(),
};
// clang-format on