mirror/ac-decomp
1
0
Fork 0
mirror of https://github.com/ACreTeam/ac-decomp synced 2026-07-07 12:03:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #256 from Cuyler36:fix_ac_reserve

Browse Source 
Fix building ac_reserve
This commit is contained in:
Cuyler36
2024-02-25 13:28:48 -05:00
committed by GitHub
parent ab3b4d8414 e5305b9887
commit 1ccb931ca9
2 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ac_reserve.c
+17 -2
View File
@@ -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"
src/ac_reserve_move.c_inc
+2 -16
View File
@@ -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;