mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-06-07 17:11:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge 9940856683 into 484abb1d39

Browse source
This commit is contained in:
Jordan Longstaff 2025-06-08 00:27:23 +09:00 • committed by GitHub
commit 9319642d01
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 135 additions and 84 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/save.h
View file

@ -843,7 +843,7 @@ typedef enum LinkAge {
#define INFTABLE_138 0x138
#define INFTABLE_139 0x139
#define INFTABLE_140 0x140
#define INFTABLE_141 0x141
#define INFTABLE_MET_RUTO_FIRST_TIME 0x141
#define INFTABLE_142 0x142
#define INFTABLE_143 0x143
#define INFTABLE_144 0x144

213
src/overlays/actors/ovl_En_Ru1/z_en_ru1.c
View file

@ -44,14 +44,14 @@ void func_80AEC17C(EnRu1* this, PlayState* play);
void func_80AEC1D4(EnRu1* this, PlayState* play);
void func_80AEC244(EnRu1* this, PlayState* play);
void func_80AEC2C0(EnRu1* this, PlayState* play);
void func_80AECA94(EnRu1* this, PlayState* play);
void func_80AECAB4(EnRu1* this, PlayState* play);
void func_80AECAD4(EnRu1* this, PlayState* play);
void func_80AECB18(EnRu1* this, PlayState* play);
void func_80AECB60(EnRu1* this, PlayState* play);
void func_80AECBB8(EnRu1* this, PlayState* play);
void func_80AECC1C(EnRu1* this, PlayState* play);
void func_80AECC84(EnRu1* this, PlayState* play);
void EnRu1_FirstEncounterRangeCheck(EnRu1* this, PlayState* play);
void EnRu1_FirstEncounterInitPosition(EnRu1* this, PlayState* play);
void EnRu1_FirstEncounterFacingLink(EnRu1* this, PlayState* play);
void EnRu1_TurningAround(EnRu1* this, PlayState* play);
void EnRu1_WalkingAwayAccel(EnRu1* this, PlayState* play);
void EnRu1_WalkingAwayConstant(EnRu1* this, PlayState* play);
void EnRu1_FallingDownHole(EnRu1* this, PlayState* play);
void EnRu1_FirstEncounterEnd(EnRu1* this, PlayState* play);
void func_80AED304(EnRu1* this, PlayState* play);
void func_80AED324(EnRu1* this, PlayState* play);
void func_80AED344(EnRu1* this, PlayState* play);
@ -154,13 +154,52 @@ static s32 sUnused = 0;
static u32 D_80AF1938 = 0;
static EnRu1ActionFunc sActionFuncs[] = {
func_80AEC0B4, func_80AEC100, func_80AEC130, func_80AEC17C, func_80AEC1D4, func_80AEC244, func_80AEC2C0,
func_80AECA94, func_80AECAB4, func_80AECAD4, func_80AECB18, func_80AECB60, func_80AECBB8, func_80AECC1C,
func_80AECC84, func_80AED304, func_80AED324, func_80AED344, func_80AED374, func_80AED3A4, func_80AED3E0,
func_80AED414, func_80AEF29C, func_80AEF2AC, func_80AEF2D0, func_80AEF354, func_80AEF3A8, func_80AEEBD4,
func_80AEEC5C, func_80AEECF0, func_80AEED58, func_80AEEDCC, func_80AEEE34, func_80AEEE9C, func_80AEEF08,
func_80AEEF5C, func_80AEF9D8, func_80AEFA2C, func_80AEFAAC, func_80AEFB04, func_80AEFB68, func_80AEFCE8,
func_80AEFBC8, func_80AEFC24, func_80AEFECC, func_80AEFF40,
func_80AEC0B4,
func_80AEC100,
func_80AEC130,
func_80AEC17C,
func_80AEC1D4,
func_80AEC244,
func_80AEC2C0,
EnRu1_FirstEncounterRangeCheck,
EnRu1_FirstEncounterInitPosition,
EnRu1_FirstEncounterFacingLink,
EnRu1_TurningAround,
EnRu1_WalkingAwayAccel,
EnRu1_WalkingAwayConstant,
EnRu1_FallingDownHole,
EnRu1_FirstEncounterEnd,
func_80AED304,
func_80AED324,
func_80AED344,
func_80AED374,
func_80AED3A4,
func_80AED3E0,
func_80AED414,
func_80AEF29C,
func_80AEF2AC,
func_80AEF2D0,
func_80AEF354,
func_80AEF3A8,
func_80AEEBD4,
func_80AEEC5C,
func_80AEECF0,
func_80AEED58,
func_80AEEDCC,
func_80AEEE34,
func_80AEEE9C,
func_80AEEF08,
func_80AEEF5C,
func_80AEF9D8,
func_80AEFA2C,
func_80AEFAAC,
func_80AEFB04,
func_80AEFB68,
func_80AEFCE8,
func_80AEFBC8,
func_80AEFC24,
func_80AEFECC,
func_80AEFF40,
};
static EnRu1PreLimbDrawFunc sPreLimbDrawFuncs[] = {
@ -805,7 +844,7 @@ void func_80AEC2C0(EnRu1* this, PlayState* play) {
}
void EnRu1_InitInJabuJabuHolesRoom(EnRu1* this, PlayState* play) {
if (!GET_INFTABLE(INFTABLE_141)) {
if (!GET_INFTABLE(INFTABLE_MET_RUTO_FIRST_TIME)) {
EnRu1_AnimationChange(this, &gRutoChildWait2Anim, ANIMMODE_LOOP, 0, false);
this->action = 7;
EnRu1_SetMouth(this, ENRU1_MOUTH_FROWNING);
@ -829,11 +868,14 @@ void EnRu1_InitInJabuJabuHolesRoom(EnRu1* this, PlayState* play) {
}
}
void func_80AEC40C(EnRu1* this) {
f32 unk_26C = this->unk_26C;
/**
* Accelerates Ruto forward as she starts to walk away. This lasts for eight frames.
*/
void EnRu1_AccelerateAway(EnRu1* this) {
f32 walkingFrame = this->walkingFrame;
if (unk_26C < 8.0f) {
this->actor.speed = (((kREG(3) * 0.01f) + 2.7f) / 8.0f) * unk_26C;
if (walkingFrame < 8.0f) {
this->actor.speed = (((kREG(3) * 0.01f) + 2.7f) / 8.0f) * walkingFrame;
} else {
this->actor.speed = (kREG(3) * 0.01f) + 2.7f;
}
@ -841,19 +883,25 @@ void func_80AEC40C(EnRu1* this) {
Actor_MoveXZGravity(&this->actor);
}
void func_80AEC4CC(EnRu1* this) {
/**
* Moves Ruto forward at a constant speed walking away from Link.
*/
void EnRu1_MoveForwardConstant(EnRu1* this) {
this->actor.velocity.y = -1.0f;
Actor_MoveXZGravity(&this->actor);
}
void func_80AEC4F4(EnRu1* this) {
/**
* Accelerate's Ruto's actor downward as she falls down the hole.
*/
void EnRu1_AccelerateDownHole(EnRu1* this) {
f32* speedXZ = &this->actor.speed;
f32* unk_26C = &this->unk_26C;
f32* walkingFrame = &this->walkingFrame;
if (this->unk_26C < 8.0f) {
*unk_26C += 1.0f;
*speedXZ *= (8.0f - *unk_26C) / 8.0f;
this->actor.velocity.y = -*unk_26C * (((kREG(4) * 0.01f) + 13.0f) / 8.0f);
if (this->walkingFrame < 8.0f) {
*walkingFrame += 1.0f;
*speedXZ *= (8.0f - *walkingFrame) / 8.0f;
this->actor.velocity.y = -*walkingFrame * (((kREG(4) * 0.01f) + 13.0f) / 8.0f);
} else {
*speedXZ = 0.0f;
this->actor.velocity.y = -((kREG(4) * 0.01f) + 13.0f);
@ -861,7 +909,7 @@ void func_80AEC4F4(EnRu1* this) {
Actor_MoveXZGravity(&this->actor);
}
s32 func_80AEC5FC(EnRu1* this, PlayState* play) {
s32 EnRu1_IsPlayerInRangeForFirstEncounter(EnRu1* this, PlayState* play) {
Player* player = GET_PLAYER(play);
f32 thisPosZ = this->actor.world.pos.z;
f32 playerPosZ = player->actor.world.pos.z;
@ -872,35 +920,38 @@ s32 func_80AEC5FC(EnRu1* this, PlayState* play) {
return false;
}
void func_80AEC650(EnRu1* this) {
void EnRu1_PlayStepSoundEffect(EnRu1* this) {
s32 pad[2];
if (this->unk_280 == 0) {
if (this->isFalling == 0) {
if (Animation_OnFrame(&this->skelAnime, 2.0f) || Animation_OnFrame(&this->skelAnime, 7.0f)) {
Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_PL_WALK_GROUND + SURFACE_SFX_OFFSET_JABU);
}
}
}
void func_80AEC6B0(EnRu1* this) {
void EnRu1_PlayFallingSoundEffects(EnRu1* this) {
Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_EV_FALL_DOWN_DIRT);
Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_VO_RT_FALL);
}
void func_80AEC6E4(EnRu1* this, PlayState* play) {
if ((func_80AEAFA0(play, 4, 3)) && (this->unk_280 == 0)) {
/**
* Checks if Ruto is standing over the Jabu Jabu hole and initiates her reaction to falling.
*/
void EnRu1_RespondToFalling(EnRu1* this, PlayState* play) {
if ((func_80AEAFA0(play, 4, 3)) && (this->isFalling == 0)) {
Animation_Change(&this->skelAnime, &gRutoChildBringArmsUpAnim, 1.0f, 0,
Animation_GetLastFrame(&gRutoChildBringArmsUpAnim), ANIMMODE_ONCE, -8.0f);
this->unk_280 = 1;
func_80AEC6B0(this);
this->isFalling = 1;
EnRu1_PlayFallingSoundEffects(this);
}
}
void func_80AEC780(EnRu1* this, PlayState* play) {
void EnRu1_CheckStartFirstEncounter(EnRu1* this, PlayState* play) {
s32 pad;
Player* player = GET_PLAYER(play);
if ((func_80AEC5FC(this, play)) && (!Play_InCsMode(play)) &&
if ((EnRu1_IsPlayerInRangeForFirstEncounter(this, play)) && (!Play_InCsMode(play)) &&
(!(player->stateFlags1 & (PLAYER_STATE1_13 | PLAYER_STATE1_14 | PLAYER_STATE1_21))) &&
(player->actor.bgCheckFlags & BGCHECKFLAG_GROUND)) {
@ -911,7 +962,7 @@ void func_80AEC780(EnRu1* this, PlayState* play) {
}
}
void func_80AEC81C(EnRu1* this, PlayState* play) {
void EnRu1_SetupPositionForFirstEncounter(EnRu1* this, PlayState* play) {
CsCmdActorCue* cue;
s16 newRotY;
@ -928,7 +979,7 @@ void func_80AEC81C(EnRu1* this, PlayState* play) {
}
}
void func_80AEC8B8(EnRu1* this, PlayState* play) {
void EnRu1_CheckTurnAround(EnRu1* this, PlayState* play) {
if (func_80AEAFA0(play, 3, 3)) {
Animation_Change(&this->skelAnime, &gRutoChildTurnAroundAnim, 1.0f, 0,
Animation_GetLastFrame(&gRutoChildTurnAroundAnim), ANIMMODE_ONCE, -8.0f);
@ -936,96 +987,96 @@ void func_80AEC8B8(EnRu1* this, PlayState* play) {
}
}
void func_80AEC93C(EnRu1* this, UNK_TYPE arg1) {
if (arg1 != 0) {
void EnRu1_StartWalkingAway(EnRu1* this, s32 doneTurning) {
if (doneTurning) {
Animation_Change(&this->skelAnime, &gRutoChildWalkAnim, 1.0f, 0, Animation_GetLastFrame(&gRutoChildWalkAnim),
ANIMMODE_LOOP, -8.0f);
this->actor.world.rot.y += 0x8000;
this->action = 0xB;
this->unk_26C = 0.0f;
this->walkingFrame = 0.0f;
}
}
void func_80AEC9C4(EnRu1* this) {
this->unk_26C += 1.0f;
if (this->unk_26C >= 8.0f) {
void EnRu1_AdvanceWalkingAway(EnRu1* this) {
this->walkingFrame += 1.0f;
if (this->walkingFrame >= 8.0f) {
this->action = 12;
this->unk_26C = 0.0f;
this->walkingFrame = 0.0f;
this->actor.velocity.y = -1.0f;
}
}
void func_80AECA18(EnRu1* this) {
void EnRu1_CheckStartFalling(EnRu1* this) {
if (!(this->actor.bgCheckFlags & BGCHECKFLAG_GROUND)) {
s32 pad;
this->action = 13;
this->unk_26C = 0.0f;
this->walkingFrame = 0.0f;
this->actor.velocity.y = 0.0f;
}
}
void func_80AECA44(EnRu1* this, PlayState* play) {
void EnRu1_FinishFirstEncounter(EnRu1* this, PlayState* play) {
if (func_80AEAFA0(play, 5, 3)) {
SET_INFTABLE(INFTABLE_141);
SET_INFTABLE(INFTABLE_MET_RUTO_FIRST_TIME);
this->action = 14;
}
}
void func_80AECA94(EnRu1* this, PlayState* play) {
func_80AEC780(this, play);
void EnRu1_FirstEncounterRangeCheck(EnRu1* this, PlayState* play) {
EnRu1_CheckStartFirstEncounter(this, play);
}
void func_80AECAB4(EnRu1* this, PlayState* play) {
func_80AEC81C(this, play);
void EnRu1_FirstEncounterInitPosition(EnRu1* this, PlayState* play) {
EnRu1_SetupPositionForFirstEncounter(this, play);
}
void func_80AECAD4(EnRu1* this, PlayState* play) {
void EnRu1_FirstEncounterFacingLink(EnRu1* this, PlayState* play) {
EnRu1_UpdateSkelAnime(this);
EnRu1_UpdateEyes(this);
func_80AEAECC(this, play);
func_80AEC8B8(this, play);
EnRu1_CheckTurnAround(this, play);
}
void func_80AECB18(EnRu1* this, PlayState* play) {
s32 something;
void EnRu1_TurningAround(EnRu1* this, PlayState* play) {
s32 doneAnim;
something = EnRu1_UpdateSkelAnime(this);
doneAnim = EnRu1_UpdateSkelAnime(this);
EnRu1_UpdateEyes(this);
func_80AEAECC(this, play);
func_80AEC93C(this, something);
EnRu1_StartWalkingAway(this, doneAnim);
}
void func_80AECB60(EnRu1* this, PlayState* play) {
func_80AEC40C(this);
void EnRu1_WalkingAwayAccel(EnRu1* this, PlayState* play) {
EnRu1_AccelerateAway(this);
EnRu1_UpdateSkelAnime(this);
EnRu1_UpdateEyes(this);
func_80AEAECC(this, play);
func_80AEC650(this);
func_80AEC9C4(this);
EnRu1_PlayStepSoundEffect(this);
EnRu1_AdvanceWalkingAway(this);
}
void func_80AECBB8(EnRu1* this, PlayState* play) {
func_80AEC4CC(this);
func_80AEC6E4(this, play);
void EnRu1_WalkingAwayConstant(EnRu1* this, PlayState* play) {
EnRu1_MoveForwardConstant(this);
EnRu1_RespondToFalling(this, play);
EnRu1_UpdateSkelAnime(this);
EnRu1_UpdateEyes(this);
func_80AEAECC(this, play);
func_80AEC650(this);
func_80AECA18(this);
EnRu1_PlayStepSoundEffect(this);
EnRu1_CheckStartFalling(this);
}
void func_80AECC1C(EnRu1* this, PlayState* play) {
func_80AEC4F4(this);
func_80AEC6E4(this, play);
void EnRu1_FallingDownHole(EnRu1* this, PlayState* play) {
EnRu1_AccelerateDownHole(this);
EnRu1_RespondToFalling(this, play);
EnRu1_UpdateSkelAnime(this);
EnRu1_UpdateEyes(this);
func_80AEAECC(this, play);
func_80AEC650(this);
func_80AECA44(this, play);
EnRu1_PlayStepSoundEffect(this);
EnRu1_FinishFirstEncounter(this, play);
}
void func_80AECC84(EnRu1* this, PlayState* play) {
void EnRu1_FirstEncounterEnd(EnRu1* this, PlayState* play) {
if (play->csCtx.state == CS_STATE_IDLE) {
Actor_Kill(&this->actor);
}
@ -1095,8 +1146,8 @@ s32 func_80AECF6C(EnRu1* this, PlayState* play) {
f32 temp2;
s32 pad2[5];
this->unk_26C += 1.0f;
if ((player->actor.speed == 0.0f) && (this->unk_26C >= 3.0f)) {
this->walkingFrame += 1.0f;
if ((player->actor.speed == 0.0f) && (this->walkingFrame >= 3.0f)) {
otherPlayer = GET_PLAYER(play);
player->actor.world.pos.x = otherPlayer->unk_450.x;
player->actor.world.pos.y = otherPlayer->unk_450.y;
@ -1151,7 +1202,7 @@ void func_80AED110(EnRu1* this) {
void func_80AED154(EnRu1* this, PlayState* play) {
if (func_80AED084(this, WARP_BLUE_RUTO_STATE_ENTERED)) {
this->action = 0x13;
this->unk_26C = 0.0f;
this->walkingFrame = 0.0f;
func_80AECEB4(this, play);
}
}
@ -1216,7 +1267,7 @@ void func_80AED414(EnRu1* this, PlayState* play) {
}
void EnRu1_InitInJabuJabuBasement(EnRu1* this, PlayState* play) {
if (GET_INFTABLE(INFTABLE_141) && !GET_INFTABLE(INFTABLE_145) && !GET_INFTABLE(INFTABLE_140) &&
if (GET_INFTABLE(INFTABLE_MET_RUTO_FIRST_TIME) && !GET_INFTABLE(INFTABLE_145) && !GET_INFTABLE(INFTABLE_140) &&
!GET_INFTABLE(INFTABLE_147)) {
if (!func_80AEB020(this, play)) {
s8 actorRoom;
@ -1668,7 +1719,7 @@ s32 func_80AEE6D0(EnRu1* this, PlayState* play) {
Animation_GetLastFrame(&gRutoChildSquirmAnim), ANIMMODE_LOOP, -8.0f);
func_80AED600(this);
this->action = 34;
this->unk_26C = 0.0f;
this->walkingFrame = 0.0f;
play->csCtx.script = gRutoFoundSapphireCs;
gSaveContext.cutsceneTrigger = 1;
}
@ -2263,7 +2314,7 @@ void func_80AEFF40(EnRu1* this, PlayState* play) {
void EnRu1_InitBesideDoorSwitch(EnRu1* this, PlayState* play) {
s8 actorRoom;
if (GET_INFTABLE(INFTABLE_141) && GET_INFTABLE(INFTABLE_140) && !GET_INFTABLE(INFTABLE_145) &&
if (GET_INFTABLE(INFTABLE_MET_RUTO_FIRST_TIME) && GET_INFTABLE(INFTABLE_140) && !GET_INFTABLE(INFTABLE_145) &&
(!(func_80AEB020(this, play)))) {
EnRu1_AnimationChange(this, &gRutoChildWait2Anim, ANIMMODE_LOOP, 0, false);
actorRoom = this->actor.room;

4
src/overlays/actors/ovl_En_Ru1/z_en_ru1.h
View file

@ -26,12 +26,12 @@ typedef struct EnRu1 {
/* 0x0260 */ s16 mouth;
/* 0x0264 */ s32 action;
/* 0x0268 */ s32 drawConfig;
/* 0x026C */ f32 unk_26C;
/* 0x026C */ f32 walkingFrame;
/* 0x0270 */ f32 unk_270;
/* 0x0274 */ char unk_274[0x4];
/* 0x0278 */ DoorWarp1* blueWarp;
/* 0x027C */ f32 unk_27C;
/* 0x0280 */ s32 unk_280;
/* 0x0280 */ s32 isFalling;
/* 0x0284 */ s8 roomNum1;
/* 0x0285 */ s8 roomNum2;
/* 0x0286 */ s8 roomNum3;