From e5305b98875caf5c5eba974e75cee95b909e6606 Mon Sep 17 00:00:00 2001 From: Cuyler36 Date: Sun, 25 Feb 2024 13:28:18 -0500 Subject: [PATCH] Fix building ac_reserve --- src/ac_reserve.c | 19 +++++++++++++++++-- src/ac_reserve_move.c_inc | 18 ++---------------- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/src/ac_reserve.c b/src/ac_reserve.c index cda8088c..38b3abe9 100644 --- a/src/ac_reserve.c +++ b/src/ac_reserve.c @@ -12,7 +12,7 @@ ACTOR_PROFILE Reserve_Profile = { mAc_PROFILE_RESERVE, ACTOR_PART_ITEM, ACTOR_STATE_TA_SET, - 0x5810, // include name later + 0x5810, // include name later ACTOR_OBJ_BANK_KEEP, sizeof(RESERVE_ACTOR), aRSV_actor_ct, @@ -41,5 +41,20 @@ static void aRSV_actor_ct(ACTOR* actor, GAME* game) { aRSV_set_bgOffset(actor, 1); } +extern Vtx reserve_shadow_v[]; +extern Gfx reserve_shadow_model[]; +extern Vtx obj_attention_shadow_v[]; +extern Gfx obj_attention_shadowT_model[]; + +static u8 aRSV_shadow_vtx_fix_flg_table[] = { TRUE, FALSE, FALSE, TRUE }; + +static bIT_ShadowData_c aRSV_shadow_data = { + 4, aRSV_shadow_vtx_fix_flg_table, 60.0f, reserve_shadow_v, reserve_shadow_model, +}; + +static bIT_ShadowData_c aRSV_kappa_shadow_data = { + 4, aRSV_shadow_vtx_fix_flg_table, 60.0f, obj_attention_shadow_v, obj_attention_shadowT_model, +}; + +#include "../src/ac_reserve_move.c_inc" #include "../src/ac_reserve_draw.c_inc" -#include "../src/ac_reserve_move.c_inc" \ No newline at end of file diff --git a/src/ac_reserve_move.c_inc b/src/ac_reserve_move.c_inc index 7ac695ee..0646af05 100644 --- a/src/ac_reserve_move.c_inc +++ b/src/ac_reserve_move.c_inc @@ -1,19 +1,5 @@ -extern Vtx reserve_shadow_v[]; -extern Gfx reserve_shadow_model[]; -extern Vtx obj_attention_shadow_v[]; -extern Gfx obj_attention_shadowT_model[]; - -u8 aRSV_shadow_vtx_fix_flg_table[] = {TRUE, FALSE, FALSE, TRUE}; - -bIT_ShadowData_c aRSV_shadow_data = { - 4, aRSV_shadow_vtx_fix_flg_table, 60.0f, reserve_shadow_v, reserve_shadow_model, -}; - -bIT_ShadowData_c aRSV_kappa_shadow_data = { - 4, aRSV_shadow_vtx_fix_flg_table, 60.0f, obj_attention_shadow_v, obj_attention_shadowT_model, -}; - -static void aRSV_set_bgOffset(ACTOR*, int) {} +static void aRSV_set_bgOffset(ACTOR*, int) { +} static void aRSV_set_talk_info(ACTOR* actor) { RESERVE_ACTOR* reserve = (RESERVE_ACTOR*)actor;