From 8e5451997741a70edf39d7840074f262005b0988 Mon Sep 17 00:00:00 2001 From: Leonid Kapitonov Date: Sat, 7 Dec 2024 20:27:42 +0100 Subject: `ac_house_goki` OK (#229) * prepare unknown size * move `.data` to the C side * remove redundant headers * aHG_actor_ct OK * func_80A83770_jp OK (rename to `aHG_actor_dt`) * aHG_actor_move OK - fix `mCoBG_CheckResult` description and comments - extend `MyRoomClip` and fix offsets in comments * func_80A83780_jp OK * func_80A83930_jp OK * func_80A83994_jp OK * func_80A83A00_jp OK * func_80A8401C_jp OK * func_80A8409C_jp OK (rename to `aHG_setup_action`) * aHG_actor_draw OK * func_80A83D4C_jp OK * func_80A83A24_jp OK * name HG models * put static HG data into the functions * func_80A837C4_jp OK * add notes and clean up a bit * apply a suggestion by @hensldm * remove ASM pragmas * extract assets --- src/objects/act_house_goki/act_house_goki.c | 10 ++++++++++ src/objects/act_house_goki/act_house_goki.h | 13 +++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 src/objects/act_house_goki/act_house_goki.c create mode 100644 src/objects/act_house_goki/act_house_goki.h (limited to 'src/objects') diff --git a/src/objects/act_house_goki/act_house_goki.c b/src/objects/act_house_goki/act_house_goki.c new file mode 100644 index 0000000..028ab05 --- /dev/null +++ b/src/objects/act_house_goki/act_house_goki.c @@ -0,0 +1,10 @@ +#include "act_house_goki.h" + +#include "assets/jp/objects/act_house_goki/act_house_goki_vtx_1.vtx.inc.c" +#include "assets/jp/objects/act_house_goki/act_house_goki_vtx_2.vtx.inc.c" +#include "assets/jp/objects/act_house_goki/act_house_goki_model_1.gfx.inc.c" +#include "assets/jp/objects/act_house_goki/act_house_goki_model_2.gfx.inc.c" +#include "assets/jp/objects/act_house_goki/act_house_goki_pal.palette.inc.c" +u8 act_house_goki_tex[] = { +#include "assets/jp/objects/act_house_goki/act_house_goki_tex.ci4.inc.c" +}; diff --git a/src/objects/act_house_goki/act_house_goki.h b/src/objects/act_house_goki/act_house_goki.h new file mode 100644 index 0000000..f04e01b --- /dev/null +++ b/src/objects/act_house_goki/act_house_goki.h @@ -0,0 +1,13 @@ +#ifndef OBJECT_ACT_HOUSE_GOKI_H +#define OBJECT_ACT_HOUSE_GOKI_H + +#include "gbi.h" + +extern Vtx act_house_goki_vtx_1[]; +extern Vtx act_house_goki_vtx_2[]; +extern Gfx act_house_goki_model_1[]; +extern Gfx act_house_goki_model_2[]; +extern u16 act_house_goki_pal[]; +extern u8 act_house_goki_tex[]; + +#endif -- cgit v1.2.3