mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-08-17 21:03:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

z_object_switch OK (#527)

Browse Source 
* z_obj_switch all functions attempted

* z_obj_switch OK

* Document z_obj_switch

* update gameplay_dangeon_keep references

* pr changes implemented

* fix warnings

* pr suggestions, name all functions
This commit is contained in:
mzxrules
2022-03-10 05:49:11 -05:00
committed by GitHub
parent 6ed7b0849c
commit f1560614d6
7 changed files with 1056 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c
+931 -91
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_Obj_Switch/z_obj_switch.h
+52 -4
View File
@@ -5,7 +5,26 @@
struct ObjSwitch;
typedef void (*ObjSwitchActionFunc)(struct ObjSwitch*, GlobalContext*);
typedef void (*ObjSwitchActionFunc)(struct ObjSwitch* this, GlobalContext* globalCtx);
typedef void (*ObjSwitchDrawFunc)(struct ObjSwitch* this, GlobalContext* globalCtx);
typedef void (*ObjSwitchSetupActionFunc)(struct ObjSwitch* this);
typedef enum {
/* 0 */ OBJSWITCH_TYPE_FLOOR,
/* 1 */ OBJSWITCH_TYPE_FLOOR_RUSTY, // Unused, incomplete implementation
/* 2 */ OBJSWITCH_TYPE_EYE,
/* 3 */ OBJSWITCH_TYPE_CRYSTAL,
/* 4 */ OBJSWITCH_TYPE_CRYSTAL_TARGETABLE,
/* 5 */ OBJSWITCH_TYPE_FLOOR_LARGE
} ObjSwitchType;
typedef enum {
/* 0 */ OBJSWITCH_SUBTYPE_ONCE, // Set Switch Flag when activated, stays activated
/* 1 */ OBJSWITCH_SUBTYPE_TOGGLE, // Toggle Switch Flag when activated
/* 2 */ OBJSWITCH_SUBTYPE_RESET, // Floor type only, set switch flag when pressed, unset when released
/* 3 */ OBJSWITCH_SUBTYPE_RESET_INVERTED, // Floor type only, set switch flag when not pressed, unset when pressed
/* 4 */ OBJSWITCH_SUBTYPE_SYNC // Crystal type only, syncronizes all crystal fl
} ObjSwitchSubType;
#define OBJSWITCH_GET_33(thisx) ((thisx)->params & 0x33)
#define OBJSWITCH_GET_7F00(thisx) (((thisx)->params >> 8) & 0x7F)
@@ -14,12 +33,41 @@ typedef void (*ObjSwitchActionFunc)(struct ObjSwitch*, GlobalContext*);
#define OBJSWITCH_INVERSE_BLUE 0x30
typedef struct ObjSwitch {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0x18];
/* 0x0000 */ DynaPolyActor dyna;
/* 0x015C */ ObjSwitchActionFunc actionFunc;
/* 0x0160 */ char unk_160[0xF8];
/* 0x0160 */ s16 floorSwitchReleaseTimer;
/* 0x0162 */ s16 disableCrystalSwitchTimer;
/* 0x0164 */ s8 eyeTexIndex;
/* 0x0165 */ s8 sfxTimer;
/* 0x0168 */ s32 crystalAnimTimer;
/* 0x016C */ Color_RGB8 color;
/* 0x016F */ u8 collisionFlags;
/* 0x0170 */ s8 floorSwitchPlayerSnapState;
/* 0x0171 */ s8 nextSwitchFlagState;
/* 0x0172 */ s8 isPlayingCutscene;
/* 0x0174 */ ObjSwitchSetupActionFunc setupFunc;
union {
struct {
/* 0x0178 */ ColliderJntSph colliderJntSph;
/* 0x0198 */ ColliderJntSphElement colliderJntSphElements[1];
};
struct {
/* 0x0178 */ ColliderTris colliderTris;
/* 0x0198 */ ColliderTrisElement colliderTrisElements[2];
};
};
/* 0x0250 */ f32 floorSwitchUpScale;
/* 0x0254 */ f32 floorSwitchDownScale;
} ObjSwitch; // size = 0x258
extern const ActorInit Obj_Switch_InitVars;
#define OBJ_SWITCH_GET_TYPE(thisx) ((thisx)->params&7)
#define OBJ_SWITCH_GET_SUBTYPE(thisx) ((thisx)->params >> 4 & 7)
#define OBJ_SWITCH_GET_SWITCH_FLAG(thisx) ((thisx)->params >> 8 & 0x7F)
#define OBJ_SWITCH_IS_FROZEN(thisx) ((thisx)->params >> 7 & 1)
#define OBJ_SWITCH_UNSET_FROZEN(thisx) ((thisx)->params &= ~(1 << 7))
#define OBJ_SWITCH_IS_INVISIBLE(thisx) ((thisx)->params >> 3 & 1)
#define OBJ_SWITCH_GET_COLOR_ID(thisx) ((thisx)->home.rot.z&1)
#endif // Z_OBJ_SWITCH_H