mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-15 04:14:34 +00:00
Code Issues Projects Releases Wiki Activity

En_Fr Frogs 47 of 48 func decomped (#576)

Browse source 
* En_Fr 47 of 48 func decomped

* EnFr more cleanup

* uncommented out EnFr_Update

* more cleanup

* added format document

* Update src/overlays/actors/ovl_En_Fr/z_en_fr.c

Null Pointers

Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Fr/z_en_fr.c

Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Fr/z_en_fr.c

Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Fr/z_en_fr.c

Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Fr/z_en_fr.c

Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Fr/z_en_fr.c

Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Fr/z_en_fr.c

Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Fr/z_en_fr.c

Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>

* feedback from pr

* more cleanup

* more pr feedback

* more cleaning and updates

* remove data.s

* review 2

* review

* missed one

Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>
Co-authored-by: fig <fig02srl@gmail.com>
This commit is contained in:
engineer124 2021-02-03 07:17:51 +11:00 • committed by GitHub
parent d1a9775926
commit cce6880bc0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
57 changed files with 1111 additions and 2816 deletions
Download patch file Download diff file Expand all files Collapse all files

1082
src/overlays/actors/ovl_En_Fr/z_en_fr.c
View file

File diff suppressed because it is too large Load diff

60
src/overlays/actors/ovl_En_Fr/z_en_fr.h
View file

@ -6,9 +6,67 @@
struct EnFr;
typedef void (*EnFrActionFunc)(struct EnFr*, GlobalContext*);
typedef void (*EnFrBlinkFunc)(struct EnFr*);
typedef enum {
/* 00 */ FROG_YELLOW, // Middle
/* 01 */ FROG_BLUE, // Front Left
/* 02 */ FROG_RED, // Front Right
/* 03 */ FROG_PURPLE, // Back Left
/* 04 */ FROG_WHITE // Back Right
} FrogType;
typedef enum {
/* 00 */ FROG_ZL,
/* 01 */ FROG_EPONA,
/* 02 */ FROG_SARIA,
/* 03 */ FROG_SUNS,
/* 04 */ FROG_SOT,
/* 05 */ FROG_STORMS,
/* 06 */ FROG_CHOIR_SONG,
/* 07 */ FROG_NO_SONG
} FrogSongType;
typedef struct EnFr {
/* 0x0000 */ Actor actor;
/* 0x014C */ char unk_14C[0x278];
/* 0x014C */ SkelAnime skelAnime; // Frog Skeleton
/* 0x0190 */ Vec3s jointTable[24];
/* 0x0220 */ Vec3s morphTable[24];
/* 0x02B0 */ SkelAnime skelAnimeButterfly; // Butterfly Skeleton above Frog during Frog Song
/* 0x02F4 */ Vec3s jointTableButterfly[8];
/* 0x0324 */ Vec3s morphTableButterfly[8];
/* 0x0354 */ EnFrActionFunc actionFunc;
/* 0x0358 */ LightNode* lightNode; // Frogs light up during the Frog Song, specifically the frog with the next note.
/* 0x035C */ LightInfo lightInfo;
/* 0x036A */ s8 objBankIndex;
/* 0x036C */ s32 jumpCounter; // cyclic clock used to time celebratory frog jumps every 4 frames when child song is played.
/* 0x0370 */ s32 blinkTimer; // blinking timer
/* 0x0374 */ EnFrBlinkFunc blinkFunc; // unique case of using a function pointer for blinking
/* 0x0378 */ u8 eyeTexIndex; // index for blinking graphics
/* 0x0379 */ u8 isJumpingUp; // Conditional for jumping up from the log back onto the log
/* 0x037A */ u8 isBelowWaterSurfaceCurrent; // Used for diving effects
/* 0x037B */ u8 isBelowWaterSurfacePrevious;
/* 0x037C */ u8 isDeactivating; // Related to debugging (osSyncPrintf)
/* 0x037D */ u8 isActive; // Each Frog grows when their specific song is played.
/* 0x037E */ u8 growingScaleIndex; // Target Scale Level 0-3 while growing (3 highest smooth)
/* 0x037F */ u8 isGrowing; // While growing, the frog will switch between its larger size and its original size every frame
/* 0x0380 */ u8 ocarinaNoteIndex; // Related to unk_381
/* 0x0381 */ u8 ocarinaNote; // Ocarina Note to Play for Frogs 2. Related to globalCtx->msgCtx.unk_E410
/* 0x0382 */ u8 songIndex; // Song index 1-7 (6 songs + custom HP Song): 5 = sos, 6 = all songs
/* 0x0383 */ u8 isJumpingToFrogSong; // Conditional:
/* 0x0384 */ char unk_384[0x02];
/* 0x0386 */ s16 frogSongTimer; // timer #2 for frogs 2 HP
/* 0x0388 */ s32 reward; // Prize for completing a song
/* 0x038C */ Vec3f posLogSpot; // Where the frog goes when activated
/* 0x0398 */ f32 xzDistToLogSpot; // z position or axis
/* 0x039C */ f32 unusedFloat; // Unused float, only set to zero.
/* 0x03A0 */ f32 scale; //scale
/* 0x03A4 */ Actor* unusedButterflyActor; // unused pointer to Actor. Likely intended for butterfly
/* 0x03A8 */ u8 isButterflyDrawn; // isButterflyDrawn
/* 0x03AA */ s16 xyAngleButterfly; // Butterfly Travels along random angles in the x-y plane
/* 0x03AC */ Vec3f posButterfly; // Position/Coordinates of the Butterfly
/* 0x03B8 */ Vec3f posButterflyLight; // Used in Lights_PointNoGlowSetInfo()
} EnFr; // size = 0x03C4
extern const ActorInit En_Fr_InitVars;

2
src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c
View file

@ -99,7 +99,7 @@ void func_80A8F320(EnKakasi* this, GlobalContext* globalCtx, s16 arg) {
s16 phi_v0;
s16 currentFrame;
phi_v0 = globalCtx->msgCtx.unk_E410[0];
phi_v0 = globalCtx->msgCtx.unk_E410;
if (arg != 0) {
if (this->unk_19C[3] == 0) {
this->unk_19C[3] = (s16)Rand_ZeroFloat(10.99f) + 30;

2
src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c
View file

@ -102,7 +102,7 @@ void func_80A90EBC(EnKakasi3* this, GlobalContext* globalCtx, s32 arg) {
s16 currentFrame;
s16 phi_v0;
phi_v0 = globalCtx->msgCtx.unk_E410[0];
phi_v0 = globalCtx->msgCtx.unk_E410;
if (arg != 0) {
if (this->unk_19C[3] == 0) {
this->unk_19C[3] = (s16)Rand_ZeroFloat(10.99f) + 30;