From 7f426967efd07046bfbe791ed4e64808ae5a26e2 Mon Sep 17 00:00:00 2001 From: inspectredc <78732756+inspectredc@users.noreply.github.com> Date: Tue, 16 Apr 2024 00:19:43 +0100 Subject: ac_ball OK and documented (#173) * ac_ball OK * hopefully format * address warnings * Apply suggestions from code review Co-authored-by: emilybrooks * suggestions pt2 --------- Co-authored-by: emilybrooks --- src/objects/act_ball_b/act_ball_b.c | 9 +++++++++ src/objects/act_ball_b/act_ball_b.h | 12 ++++++++++++ src/objects/act_ball_d/act_ball_d.c | 15 +++++++++++++++ src/objects/act_ball_d/act_ball_d.h | 14 ++++++++++++++ src/objects/act_ball_s/act_ball_s.c | 9 +++++++++ src/objects/act_ball_s/act_ball_s.h | 12 ++++++++++++ 6 files changed, 71 insertions(+) create mode 100644 src/objects/act_ball_b/act_ball_b.c create mode 100644 src/objects/act_ball_b/act_ball_b.h create mode 100644 src/objects/act_ball_d/act_ball_d.c create mode 100644 src/objects/act_ball_d/act_ball_d.h create mode 100644 src/objects/act_ball_s/act_ball_s.c create mode 100644 src/objects/act_ball_s/act_ball_s.h (limited to 'src/objects') diff --git a/src/objects/act_ball_b/act_ball_b.c b/src/objects/act_ball_b/act_ball_b.c new file mode 100644 index 0000000..595a7f5 --- /dev/null +++ b/src/objects/act_ball_b/act_ball_b.c @@ -0,0 +1,9 @@ +#include "act_ball_b.h" + +#include "assets/jp/objects/act_ball_b/act_ball_b_v.vtx.inc.c" +#include "assets/jp/objects/act_ball_b/act_ball_b_modelT.gfx.inc.c" +#include "assets/jp/objects/act_ball_b/act_ball_b_model.gfx.inc.c" +#include "assets/jp/objects/act_ball_b/act_ball_b_pal.palette.inc.c" +u8 act_ball_b_1_tex[] = { +#include "assets/jp/objects/act_ball_b/act_ball_b_1_tex.ci4.inc.c" +}; diff --git a/src/objects/act_ball_b/act_ball_b.h b/src/objects/act_ball_b/act_ball_b.h new file mode 100644 index 0000000..f583673 --- /dev/null +++ b/src/objects/act_ball_b/act_ball_b.h @@ -0,0 +1,12 @@ +#ifndef OBJECT_ACT_BALL_B_H +#define OBJECT_ACT_BALL_B_H + +#include "gbi.h" + +extern Vtx act_ball_b_v[]; +extern Gfx act_ball_b_modelT[]; +extern Gfx act_ball_b_model[]; +extern u16 act_ball_b_pal[]; +extern u8 act_ball_b_1_tex[]; + +#endif diff --git a/src/objects/act_ball_d/act_ball_d.c b/src/objects/act_ball_d/act_ball_d.c new file mode 100644 index 0000000..fe9284c --- /dev/null +++ b/src/objects/act_ball_d/act_ball_d.c @@ -0,0 +1,15 @@ +#include "act_ball_d.h" + +#include "assets/jp/objects/act_ball_d/act_ball_d_v.vtx.inc.c" +#include "assets/jp/objects/act_ball_d/act_ball_d_modelT.gfx.inc.c" +#include "assets/jp/objects/act_ball_d/act_ball_d_model.gfx.inc.c" +#include "assets/jp/objects/act_ball_d/act_ball_d_pal.palette.inc.c" +u8 act_ball_d_1_tex[] = { +#include "assets/jp/objects/act_ball_d/act_ball_d_1_tex.ci4.inc.c" +}; +u8 act_ball_d_2_tex[] = { +#include "assets/jp/objects/act_ball_d/act_ball_d_2_tex.ci4.inc.c" +}; +u8 act_ball_d_3_tex[] = { +#include "assets/jp/objects/act_ball_d/act_ball_d_3_tex.ci4.inc.c" +}; diff --git a/src/objects/act_ball_d/act_ball_d.h b/src/objects/act_ball_d/act_ball_d.h new file mode 100644 index 0000000..46ff2ac --- /dev/null +++ b/src/objects/act_ball_d/act_ball_d.h @@ -0,0 +1,14 @@ +#ifndef OBJECT_ACT_BALL_D_H +#define OBJECT_ACT_BALL_D_H + +#include "gbi.h" + +extern Vtx act_ball_d_v[]; +extern Gfx act_ball_d_modelT[]; +extern Gfx act_ball_d_model[]; +extern u16 act_ball_d_pal[]; +extern u8 act_ball_d_1_tex[]; +extern u8 act_ball_d_2_tex[]; +extern u8 act_ball_d_3_tex[]; + +#endif diff --git a/src/objects/act_ball_s/act_ball_s.c b/src/objects/act_ball_s/act_ball_s.c new file mode 100644 index 0000000..3aa2e73 --- /dev/null +++ b/src/objects/act_ball_s/act_ball_s.c @@ -0,0 +1,9 @@ +#include "act_ball_s.h" + +#include "assets/jp/objects/act_ball_s/act_ball_s_v.vtx.inc.c" +#include "assets/jp/objects/act_ball_s/act_ball_s_modelT.gfx.inc.c" +#include "assets/jp/objects/act_ball_s/act_ball_s_model.gfx.inc.c" +#include "assets/jp/objects/act_ball_s/act_ball_s_pal.palette.inc.c" +u8 act_ball_s_5_tex[] = { +#include "assets/jp/objects/act_ball_s/act_ball_s_5_tex.ci4.inc.c" +}; diff --git a/src/objects/act_ball_s/act_ball_s.h b/src/objects/act_ball_s/act_ball_s.h new file mode 100644 index 0000000..914e424 --- /dev/null +++ b/src/objects/act_ball_s/act_ball_s.h @@ -0,0 +1,12 @@ +#ifndef OBJECT_ACT_BALL_S_H +#define OBJECT_ACT_BALL_S_H + +#include "gbi.h" + +extern Vtx act_ball_s_v[]; +extern Gfx act_ball_s_modelT[]; +extern Gfx act_ball_s_model[]; +extern u16 act_ball_s_pal[]; +extern u8 act_ball_s_5_tex[]; + +#endif -- cgit v1.2.3