mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-08-16 13:37:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'rando-next' into trade_quest_shuffle

Browse Source
This commit is contained in:
lilDavid
2022-08-09 20:40:00 -05:00
committed by GitHub
parent 12d45685b9 1aeefa3c7e
commit aef77a0913
98 changed files with 1960 additions and 816 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soh/include/z64effect.h
+2 -2
View File
@@ -25,7 +25,7 @@ typedef struct {
/* 0x0C */ Vec3f position;
/* 0x18 */ Vec3s unkVelocity;
/* 0x1E */ Vec3s unkPosition;
/* 0x24 */ s32 epoch;
/* 0x24 */ u32 epoch;
} EffectSparkElement; // size = 0x28
typedef struct {
@@ -118,7 +118,7 @@ typedef struct {
/* 0x10 */ f32 startX;
/* 0x14 */ s16 yaw;
/* 0x16 */ s16 pitch;
/* 0x18 */ s32 epoch;
/* 0x18 */ u32 epoch;
} EffectShieldParticleElement; // size = 0x1C
typedef struct {
soh/include/z64player.h
+3 -1
View File
@@ -374,6 +374,7 @@ typedef enum {
FLAG_SCENE_TREASURE,
FLAG_SCENE_CLEAR,
FLAG_SCENE_COLLECTIBLE,
FLAG_COW_MILKED
} FlagType;
typedef struct {
@@ -637,6 +638,7 @@ typedef struct Player {
/* 0x0A88 */ Vec3f unk_A88; // previous body part 0 position
/* 0x0A89 */ bool pendingIceTrap;
/* 0x0A95 */ PendingFlag pendingFlag;
} Player; // size = 0xAA1
/* 0x0AA1 */ u8 boomerangQuickRecall; // Has the player pressed the boomerang button while it's in the air still?
} Player; // size = 0xAA2
#endif