izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Obj_Comb (#632)

Browse Source 
* Obj_Comb

* PR
This commit is contained in:
Maide
2022-02-28 02:29:56 +00:00
committed by GitHub
parent bb6b580a6b
commit 84e13ff2a0
5 changed files with 528 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions.h
+1 -1
View File
@@ -1503,7 +1503,7 @@ s16 ActorCutscene_GetCurrentIndex(void);
ActorCutscene* ActorCutscene_GetCutscene(s16 index);
s16 ActorCutscene_GetAdditionalCutscene(s16 index);
s16 ActorCutscene_GetLength(s16 index);
// void func_800F2138(void);
s32 func_800F2138(s8 arg0);
s32 func_800F2178(s16 arg0);
s16 ActorCutscene_GetCurrentCamera(s16 index);
// void func_800F21CC(void);
spec
+1 -2
View File
@@ -2126,8 +2126,7 @@ beginseg
name "ovl_Obj_Comb"
compress
include "build/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.o"
include "build/data/ovl_Obj_Comb/ovl_Obj_Comb.data.o"
include "build/data/ovl_Obj_Comb/ovl_Obj_Comb.reloc.o"
include "build/src/overlays/actors/ovl_Obj_Comb/ovl_Obj_Comb_reloc.o"
endseg
beginseg
src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c
+504 -35
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_Obj_Comb/z_obj_comb.h
+22 -1
View File
@@ -7,10 +7,31 @@ struct ObjComb;
typedef void (*ObjCombActionFunc)(struct ObjComb*, GlobalContext*);
#define OBJCOMB_GET_F(thisx) ((thisx)->params & 0xF)
#define OBJCOMB_GET_10(thisx) (((thisx)->params >> 4) & 0x1)
#define OBJCOMB_GET_1F(thisx) ((thisx)->params & 0x1F)
#define OBJCOMB_GET_3F(thisx) ((thisx)->params & 0x3F)
#define OBJCOMB_GET_80(thisx) (((thisx)->params >> 7) & 0x1)
#define OBJCOMB_GET_7F00(thisx) (((thisx)->params >> 0x8) & 0x7F)
#define OBJCOMB_GET_8000(thisx) (((thisx)->params >> 0xE) & 2)
typedef struct ObjComb {
/* 0x0000 */ Actor actor;
/* 0x0144 */ ObjCombActionFunc actionFunc;
/* 0x0148 */ char unk_148[0x74];
/* 0x0148 */ ColliderJntSph collider;
/* 0x0168 */ ColliderJntSphElement colliderElement;
/* 0x01A8 */ s16 unk_1A8;
/* 0x01AA */ s16 unk_1AA;
/* 0x01AC */ s16 unk_1AC;
/* 0x01AE */ s16 unk_1AE;
/* 0x01B0 */ s16 unk_1B0;
/* 0x01B2 */ s8 unk_1B2;
/* 0x01B3 */ s8 unk_1B3;
/* 0x01B4 */ s8 unk_1B4;
/* 0x01B5 */ s8 unk_1B5;
/* 0x01B6 */ s8 unk_1B6;
/* 0x01B7 */ s8 unk_1B7;
/* 0x01B8 */ s8 unk_1B8;
} ObjComb; // size = 0x1BC
extern const ActorInit Obj_Comb_InitVars;
undefined_syms.txt
-5
View File
@@ -2009,11 +2009,6 @@ D_06002358 = 0x06002358;
D_06000D10 = 0x06000D10;
D_06000F00 = 0x06000F00;
// ovl_Obj_Comb
D_06000CB0 = 0x06000CB0;
D_06001040 = 0x06001040;
// ovl_Obj_Danpeilift
D_06000180 = 0x06000180;