falso
/
mm
mirror of https://github.com/zeldaret/mm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Obj_Iceblock (#367) 

* Obj_Iceblock

* PR

* PR

* Object

* Undef
This commit is contained in:
Maide 2021-12-27 01:40:25 +00:00 committed by GitHub
parent d3e8ea9e5a
commit ba4f676f4e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 1594 additions and 163 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/functions.h
View File

@ -666,7 +666,7 @@ void func_800B3030(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f*
// void EffectSsDeadDs_Spawn(UNK_TYPE4 uParm1, Vec3f* pzParm2, Vec3f* pzParm3, Vec3f* pzParm4, UNK_TYPE2 param_5, UNK_TYPE2 param_6, UNK_TYPE2 param_7, UNK_TYPE4 param_8);
// void func_800B31BC(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE2 param_5, UNK_TYPE4 param_6);
void EffectSsIceSmoke_Spawn(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 scale);
// void EffectSsIceBlock_Spawn(UNK_TYPE4 uParm1, Vec3f* pzParm2, Vec3f* pzParm3, Vec3f* pzParm4, UNK_TYPE2 param_5);
void EffectSsIceBlock_Spawn(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 scale);
void FlagSet_Update(GameState* gameState);
void FlagSet_Draw(GameState* gameState);
void Overlay_LoadGameState(GameStateOverlay* gameState);

5
spec
View File

@ -2707,8 +2707,11 @@ beginseg
name "ovl_Obj_Iceblock"
compress
include "build/src/overlays/actors/ovl_Obj_Iceblock/z_obj_iceblock.o"
include "build/data/ovl_Obj_Iceblock/ovl_Obj_Iceblock.data.o"
#ifdef NON_MATCHING
include "build/src/overlays/actors/ovl_Obj_Iceblock/ovl_Obj_Iceblock_reloc.o"
#else
include "build/data/ovl_Obj_Iceblock/ovl_Obj_Iceblock.reloc.o"
#endif
endseg
beginseg

1672
src/overlays/actors/ovl_Obj_Iceblock/z_obj_iceblock.c
View File

File diff suppressed because it is too large Load Diff

70
src/overlays/actors/ovl_Obj_Iceblock/z_obj_iceblock.h
View File

@ -6,12 +6,76 @@
struct ObjIceblock;
typedef void (*ObjIceblockActionFunc)(struct ObjIceblock*, GlobalContext*);
typedef void (*ObjIceblockUnkFunc)(struct ObjIceblock*, GlobalContext*);
#define OBJICEBLOCK_GET_2(thisx) (((thisx)->params >> 1) & 1)
#define OBJICEBLOCK_GET_1(thisx) ((thisx)->params & 1)
typedef struct {
/* 0x00 */ s16 unk_00;
/* 0x02 */ s16 unk_02;
/* 0x04 */ f32 unk_04;
/* 0x08 */ f32 unk_08;
/* 0x0C */ f32 unk_0C;
} ObjIceBlockUnkStruct; // size = 0x10
typedef struct {
/* 0x00 */ CollisionPoly* unk_00;
/* 0x04 */ f32 unk_04;
/* 0x08 */ s32 unk_08;
/* 0x0C */ f32 unk_0C;
} ObjIceBlockUnkStruct2; // size = 0x10
typedef struct {
f32 unk_00;
f32 unk_04;
} ObjIceBlockUnkStruct3; // size = 0x8
typedef struct {
/* 0x00 */ f32 unk_00;
/* 0x04 */ f32 unk_04;
/* 0x08 */ f32 unk_08;
/* 0x0C */ s16 unk_0C;
/* 0x0E */ s16 unk_0E;
/* 0x10 */ s16 unk_10;
/* 0x12 */ s16 unk_12;
/* 0x14 */ s16 unk_14;
/* 0x14 */ s16 unk_16;
/* 0x18 */ s16 unk_18;
/* 0x1C */ f32 unk_1C;
/* 0x20 */ s16 unk_20;
/* 0x22 */ s16 unk_22;
} ObjIceBlockUnkStruct4; // size = 0x24
typedef struct ObjIceblock {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0x64];
/* 0x0000 */ DynaPolyActor dyna;
/* 0x015C */ ColliderCylinder collider;
/* 0x01A8 */ ObjIceblockActionFunc actionFunc;
/* 0x01AC */ char unk_1AC[0x10C];
/* 0x01AC */ ObjIceblockUnkFunc unkFunc;
/* 0x01B0 */ s32 unk_1B0;
/* 0x01B4 */ ObjIceBlockUnkStruct unk_1B4[4];
/* 0x01F4 */ ObjIceBlockUnkStruct2 unk_1F4[5];
/* 0x0244 */ f32 unk_244;
/* 0x0248 */ Vec3f unk_248;
/* 0x0254 */ Vec3s unk_254;
/* 0x025C */ f32 unk_25C;
/* 0x0260 */ f32 unk_260;
/* 0x0264 */ f32* unk_264;
/* 0x0268 */ f32 unk_268;
/* 0x026C */ s16 unk_26C;
/* 0x026E */ s16 unk_26E[4];
/* 0x0276 */ s16 unk_276;
/* 0x0278 */ s16 unk_278;
/* 0x027C */ ObjIceBlockUnkStruct4 unk_27C;
/* 0x02A0 */ s16 unk_2A0;
/* 0x02A2 */ s16 unk_2A2;
/* 0x02A4 */ f32 unk_2A4;
/* 0x02A8 */ f32 unk_2A8;
/* 0x02AC */ s16 unk_2AC;
/* 0x02AE */ s16 unk_2AE;
/* 0x02B0 */ s8 unk_2B0;
/* 0x02B1 */ s8 unk_2B1;
/* 0x02B4 */ f32 unk_2B4;
} ObjIceblock; // size = 0x2B8
extern const ActorInit Obj_Iceblock_InitVars;

8
undefined_syms.txt
View File

@ -4262,14 +4262,6 @@ D_06000C74 = 0x06000C74;
D_06000EC0 = 0x06000EC0;
D_06001888 = 0x06001888;
// ovl_Obj_Iceblock
D_060001A0 = 0x060001A0;
D_06000328 = 0x06000328;
D_06000438 = 0x06000438;
D_060007F0 = 0x060007F0;
D_060009D0 = 0x060009D0;
// ovl_Obj_Jgame_Light
D_060003A0 = 0x060003A0;