Shuffles: use ObjectExtension system for rando object identity (#5603)

This commit is contained in:
Philip Dubé
2025-06-26 05:00:53 +00:00
committed by GitHub
parent 1d24edaa92
commit 9e686ae6f6
14 changed files with 142 additions and 105 deletions

View File

@@ -42,9 +42,6 @@ typedef struct EnElf {
/* 0x02C7 */ u8 unk_2C7;
/* 0x02C8 */ EnElfUnkFunc func_2C8;
/* 0x02CC */ EnElfActionFunc actionFunc;
// #region SOH [Randomizer]
/* */ FairyIdentity sohFairyIdentity;
// #endregion
} EnElf; // size = 0x02D0
typedef enum {

View File

@@ -20,7 +20,6 @@ typedef struct EnKusa {
/* 0x0150 */ ColliderCylinder collider;
/* 0x019C */ s16 timer;
/* 0x019E */ s8 objBankIndex;
/* */ GrassIdentity grassIdentity;
} EnKusa; // size = 0x01A0
#endif

View File

@@ -15,7 +15,6 @@ typedef struct ObjComb {
/* 0x0170 */ ColliderJntSphElement colliderItems[1];
/* 0x01B0 */ s16 unk_1B0;
/* 0x01B2 */ s16 unk_1B2;
/* */ BeehiveIdentity beehiveIdentity;
} ObjComb; // size = 0x01B4
void ObjComb_Break(ObjComb* objComb, PlayState* play);

View File

@@ -12,7 +12,6 @@ typedef struct ObjKibako {
/* 0x0000 */ Actor actor;
/* 0x014C */ ObjKibakoActionFunc actionFunc;
/* 0x0150 */ ColliderCylinder collider;
/* */ SmallCrateIdentity smallCrateIdentity;
} ObjKibako; // size = 0x019C
#endif

View File

@@ -13,7 +13,6 @@ typedef struct ObjKibako2 {
/* 0x0164 */ ColliderCylinder collider;
/* 0x01B0 */ ObjKibako2ActionFunc actionFunc;
/* 0x01B4 */ s16 collectibleFlag;
/* */ CrateIdentity crateIdentity;
} ObjKibako2; // size = 0x01B8
#endif

View File

@@ -13,7 +13,6 @@ typedef struct ObjTsubo {
/* 0x014C */ ObjTsuboActionFunc actionFunc;
/* 0x0150 */ ColliderCylinder collider;
/* 0x019C */ s8 objTsuboBankIndex;
/* */ PotIdentity potIdentity;
} ObjTsubo; // size = 0x01A0
#endif