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_Spinyroll (2 non-matching) (#635)

Browse Source 
* Obj_Spinyroll

* syms

* PR

* PR

* PR
This commit is contained in:
Maide
2022-03-24 21:49:47 -03:00
committed by GitHub
parent ad25a1dc47
commit 47ef03494b
4 changed files with 667 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spec
+4 -1
View File
@@ -2619,8 +2619,11 @@ beginseg
name "ovl_Obj_Spinyroll"
compress
include "build/src/overlays/actors/ovl_Obj_Spinyroll/z_obj_spinyroll.o"
include "build/data/ovl_Obj_Spinyroll/ovl_Obj_Spinyroll.data.o"
#ifdef NON_MATCHING
include "build/src/overlays/actors/ovl_Obj_Spinyroll/ovl_Obj_Spinyroll_reloc.o"
#else
include "build/data/ovl_Obj_Spinyroll/ovl_Obj_Spinyroll.reloc.o"
#endif
endseg
beginseg
src/overlays/actors/ovl_Obj_Spinyroll/z_obj_spinyroll.c
+618 -58
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_Obj_Spinyroll/z_obj_spinyroll.h
+45 -3
View File
@@ -6,12 +6,54 @@
struct ObjSpinyroll;
typedef void (*ObjSpinyrollActionFunc)(struct ObjSpinyroll*, GlobalContext*);
typedef s32 (*ObjSpinyrollColFunc)(CollisionContext*, f32*, CollisionPoly**, s32*, Vec3f*, struct ObjSpinyroll*);
#define OBJSPINYROLL_GET_7F(thisx) ((thisx)->params & 0x7F)
#define OBJSPINYROLL_GET_380(thisx) (((thisx)->params >> 7) & 7)
#define OBJSPINYROLL_GET_1C00(thisx) (((thisx)->params >> 0xA) & 7)
#define OBJSPINYROLL_GET_C000(thisx) (((thisx)->params >> 0xE) & 3)
#define OBJSPINYROLL_GET_7F_7F 0x7F
#define OBJSPINYROLL_GET_C000_0 0
#define OBJSPINYROLL_GET_C000_1 1
typedef struct {
/* 0x00 */ f32 unk_00;
/* 0x04 */ CollisionPoly* unk_04;
/* 0x08 */ s32 bgId;
} ObjSpinyrollSubStruct; // size = 0xC
typedef struct {
/* 0x00 */ ObjSpinyrollSubStruct unk_00[10];
} ObjSpinyrollStruct; // size = 0x78
typedef struct {
/* 0x00 */ ObjSpinyrollStruct unk_00[2];
/* 0xF0 */ ObjSpinyrollStruct* unk_F0;
/* 0xF4 */ s32 unk_F4;
} ObjSpinyrollStruct2; // size = 0xF8?
typedef struct ObjSpinyroll {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0x35C];
/* 0x0000 */ DynaPolyActor dyna;
/* 0x015C */ ColliderTris collider;
/* 0x017C */ ColliderTrisElement colliderElements[6];
/* 0x03A4 */ ObjSpinyrollStruct2 unk_3A4;
///* 0x0494 */ ObjSpinyrollStruct* unk_494; // alternative testing
///* 0x0498 */ s32 unk_498;
/* 0x049C */ s32 unk_49C;
/* 0x04A0 */ ObjSpinyrollActionFunc actionFunc;
/* 0x04A4 */ char unk_4A4[0x40];
/* 0x04A4 */ f32 unk_4A4;
/* 0x04A8 */ s32 unk_4A8;
/* 0x04AC */ Vec3f unk_4AC[2];
/* 0x04C4 */ Vec3f unk_4C4;
/* 0x04D0 */ f32 unk_4D0;
/* 0x04D4 */ f32 unk_4D4;
/* 0x04D8 */ s16 unk_4D8;
/* 0x04DA */ s16 unk_4DA;
/* 0x04DC */ s16 unk_4DC;
/* 0x04DE */ s16 unk_4DE;
/* 0x04E0 */ s16 unk_4E0;
/* 0x04E2 */ s16 unk_4E2;
} ObjSpinyroll; // size = 0x4E4
extern const ActorInit Obj_Spinyroll_InitVars;
undefined_syms.txt
-5
View File
@@ -1974,11 +1974,6 @@ D_060011E0 = 0x060011E0;
D_06001C00 = 0x06001C00;
// ovl_Obj_Spinyroll
D_06000460 = 0x06000460;
D_06000E68 = 0x06000E68;
// ovl_Obj_Takaraya_Wall
D_06000B70 = 0x06000B70;