mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-02-04 19:24:28 +00:00
Code Issues Projects Releases Wiki Activity

[iQue] Match z_fishing (#2445)

Browse source
This commit is contained in:
cadmic 2025-01-27 23:36:07 -08:00 • committed by GitHub
parent ac70cf8fb7
commit 748859595a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 190 additions and 205 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/z64player.h
View file

@ -931,7 +931,7 @@ typedef struct Player {
/* 0x0854 */ f32 unk_854; /* 0x0854 */ f32 unk_854;
/* 0x0858 */ f32 unk_858; /* 0x0858 */ f32 unk_858;
/* 0x085C */ f32 unk_85C; // stick length among other things /* 0x085C */ f32 unk_85C; // stick length among other things (TODO: probably part of an "fwork" array)
/* 0x0860 */ s16 unk_860; // stick flame timer among other things /* 0x0860 */ s16 unk_860; // stick flame timer among other things
/* 0x0862 */ s8 unk_862; // get item draw ID + 1 /* 0x0862 */ s8 unk_862; // get item draw ID + 1
/* 0x0864 */ f32 unk_864; /* 0x0864 */ f32 unk_864;

383
src/overlays/actors/ovl_Fishing/z_fishing.c
View file

File diff suppressed because it is too large Load diff

10
src/overlays/actors/ovl_Fishing/z_fishing.h
View file

@ -20,12 +20,12 @@ typedef struct Fishing {
/* 0x015A */ s16 fishStateNext; /* 0x015A */ s16 fishStateNext;
/* 0x015C */ s16 stateAndTimer; // fish use as timer that's AND'd, owner as talking state /* 0x015C */ s16 stateAndTimer; // fish use as timer that's AND'd, owner as talking state
/* 0x015E */ s16 unk_15E; /* 0x015E */ s16 unk_15E;
/* 0x0160 */ s16 unk_160; // fish use as rotateX, owner as index of eye texture /* 0x0160 */ s16 unk_160; // fish use as rotateX, owner as index of eye texture (TODO: probably part of a "work" array)
/* 0x0162 */ s16 unk_162; // fish use as rotateY, owner as index of eye texture /* 0x0162 */ s16 unk_162; // fish use as rotateY, owner as index of eye texture (TODO: probably part of a "work" array)
/* 0x0164 */ s16 unk_164; // fish use as rotateZ, owner as rotation of head /* 0x0164 */ s16 unk_164; // fish use as rotateZ, owner as rotation of head (TODO: probably part of a "work" array)
/* 0x0166 */ Vec3s rotationTarget; /* 0x0166 */ Vec3s rotationTarget;
/* 0x016C */ s16 fishLimb23RotYDelta; /* 0x016C */ s16 fishLimb23RotYDelta;
/* 0x016E */ s16 unk_16E; /* 0x016E */ s16 unk_16E; // (TODO: probably part of a "work" array)
/* 0x0170 */ s16 fishLimbDRotZDelta; /* 0x0170 */ s16 fishLimbDRotZDelta;
/* 0x0172 */ s16 fishLimbEFRotYDelta; /* 0x0172 */ s16 fishLimbEFRotYDelta;
/* 0x0174 */ s16 fishLimb89RotYDelta; /* 0x0174 */ s16 fishLimb89RotYDelta;
@ -38,7 +38,7 @@ typedef struct Fishing {
/* 0x0190 */ f32 unk_190; // fishLimbRotPhaseStep target /* 0x0190 */ f32 unk_190; // fishLimbRotPhaseStep target
/* 0x0194 */ f32 unk_194; // fishLimbRotPhaseMag target /* 0x0194 */ f32 unk_194; // fishLimbRotPhaseMag target
/* 0x0198 */ f32 fishLimbRotPhaseStep; /* 0x0198 */ f32 fishLimbRotPhaseStep;
/* 0x019C */ f32 fishLimbRotPhaseMag; /* 0x019C */ f32 fishLimbRotPhaseMag; // (TODO: probably part of an "fwork" array)
/* 0x01A0 */ s16 bumpTimer; // set when hitting a wall. /* 0x01A0 */ s16 bumpTimer; // set when hitting a wall.
/* 0x01A2 */ s16 unk_1A2; // "scared" timer? /* 0x01A2 */ s16 unk_1A2; // "scared" timer?
/* 0x01A4 */ s16 unk_1A4; // "scared" timer? set at same time as above /* 0x01A4 */ s16 unk_1A4; // "scared" timer? set at same time as above