mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot synced 2026-08-22 14:50:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

Document EnIn (AKA the hard-working Ingo) (#2778)

Browse Source 
* Document `EnIn` (AKA the hard-working Ingo)

* Fix variable references

* Revert switch

* Rename race outcome functions for clarity

* Apply suggestions
This commit is contained in:
Jordan Longstaff
2026-08-19 08:03:48 -04:00
committed by GitHub
parent e8d2d26431
commit 58d06849af
6 changed files with 235 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/xml/objects/object_in.xml
+16 -16
View File
@@ -1,9 +1,9 @@
<Root>
<File Name="object_in" Segment="6">
<Animation Name="object_in_Anim_0003B4" Offset="0x3B4"/>
<Animation Name="object_in_Anim_000CB0" Offset="0xCB0"/>
<Animation Name="object_in_Anim_001BE0" Offset="0x1BE0"/>
<Animation Name="object_in_Anim_001CC0" Offset="0x1CC0"/>
<Animation Name="gIngoRunningAnim" Offset="0x3B4"/>
<Animation Name="gIngoGloatingAnim" Offset="0xCB0"/>
<Animation Name="gIngoLosingAnim" Offset="0x1BE0"/>
<Animation Name="gIngoStandingAnim" Offset="0x1CC0"/>
<Texture Name="gIngoTLUT" Format="rgba16" Width="16" Height="16" Offset="0x1CD0"/>
<Texture Name="gIngoSkinGradientTLUT" Format="rgba16" Width="16" Height="16" Offset="0x1ED0"/>
<Texture Name="gIngoUnusedEyeTex" Format="rgba16" Width="32" Height="32" Offset="0x2150"/>
@@ -238,18 +238,18 @@
<Skeleton Name="gIngoSkel" Type="Flex" LimbType="Standard" LimbNone="INGO_LIMB_NONE" LimbMax="INGO_LIMB_MAX" EnumName="IngoLimb" Offset="0x13B88"/>
<Animation Name="object_in_Anim_013C6C" Offset="0x13C6C"/>
<Animation Name="object_in_Anim_013D60" Offset="0x13D60"/>
<Animation Name="object_in_Anim_01431C" Offset="0x1431C"/>
<Animation Name="object_in_Anim_014CA8" Offset="0x14CA8"/>
<Animation Name="object_in_Anim_0151C8" Offset="0x151C8"/>
<Animation Name="object_in_Anim_015814" Offset="0x15814"/>
<Animation Name="object_in_Anim_015DF0" Offset="0x15DF0"/>
<Animation Name="object_in_Anim_01646C" Offset="0x1646C"/>
<Animation Name="object_in_Anim_016B3C" Offset="0x16B3C"/>
<Animation Name="object_in_Anim_0175D0" Offset="0x175D0"/>
<Animation Name="object_in_Anim_017B58" Offset="0x17B58"/>
<Animation Name="object_in_Anim_018C38" Offset="0x18C38"/>
<Animation Name="gIngoStandingFootForwardAnim" Offset="0x13C6C"/>
<Animation Name="gIngoSleepingAnim" Offset="0x13D60"/>
<Animation Name="gIngoObedientAnim" Offset="0x1431C"/>
<Animation Name="gIngoWorkingAnim" Offset="0x14CA8"/>
<Animation Name="gIngoHorsebackSlowRideAnim" Offset="0x151C8"/>
<Animation Name="gIngoHorsebackLashingFastAnim" Offset="0x15814"/>
<Animation Name="gIngoHorsebackSittingForwardAnim" Offset="0x15DF0"/>
<Animation Name="gIngoHorsebackLashingSlowAnim" Offset="0x1646C"/>
<Animation Name="gIngoHorsebackRearingAnim" Offset="0x16B3C"/>
<Animation Name="gIngoHorsebackKickingAnim" Offset="0x175D0"/>
<Animation Name="gIngoHorsebackSittingUprightAnim" Offset="0x17B58"/>
<Animation Name="gIngoHorsebackWhoopingAnim" Offset="0x18C38"/>
<!-- No idea what these are -->
<Blob Name="gIngoBlob_0020D0" Size="0x80" Offset="0x20D0"/>
include/save.h
+3 -3
View File
@@ -833,9 +833,9 @@ typedef enum LinkAge {
#define INFTABLE_TALKED_TO_ADULT_MALON_AFTER_SONG 0x8C
#define INFTABLE_8D 0x8D // unreachable flag in EnMa2
#define INFTABLE_PLAYED_SONG_FOR_ADULT_MALON 0x8E
#define INFTABLE_94 0x94
#define INFTABLE_97 0x97
#define INFTABLE_9A 0x9A
#define INFTABLE_INGO_TALKED_TO_CHILD_LINK_BEFORE_TALON_RETURNED 0x94
#define INFTABLE_INGO_TALKED_TO_CHILD_LINK_AFTER_TALON_RETURNED 0x97
#define INFTABLE_INGO_TALKED_TO_ADULT_LINK 0x9A
#define INFTABLE_A2 0xA2
#define INFTABLE_AB 0xAB
#define INFTABLE_B0 0xB0
src/code/z_actor.c
+3 -3
View File
@@ -5628,7 +5628,7 @@ u32 func_80035BFC(PlayState* play, s16 arg1) {
if (!LINK_IS_ADULT) {
if (Flags_GetEventChkInf(EVENTCHKINF_TALON_RETURNED_FROM_CASTLE)) {
retTextId = 0x2040;
} else if (Flags_GetInfTable(INFTABLE_94)) {
} else if (Flags_GetInfTable(INFTABLE_INGO_TALKED_TO_CHILD_LINK_BEFORE_TALON_RETURNED)) {
retTextId = 0x2040;
} else {
retTextId = 0x203F;
@@ -5637,7 +5637,7 @@ u32 func_80035BFC(PlayState* play, s16 arg1) {
if (!Flags_GetEventChkInf(EVENTCHKINF_EPONA_OBTAINED)) {
if (!IS_DAY) {
retTextId = 0x204E;
} else if (Flags_GetInfTable(INFTABLE_9A)) {
} else if (Flags_GetInfTable(INFTABLE_INGO_TALKED_TO_ADULT_LINK)) {
retTextId = 0x2031;
} else {
retTextId = 0x2030;
@@ -6024,7 +6024,7 @@ s32 func_800374E0(PlayState* play, Actor* actor, u16 textId) {
if (msgCtx->choiceIndex == 1) {
func_80035B18(play, actor, 0x2032);
}
Flags_SetInfTable(INFTABLE_9A);
Flags_SetInfTable(INFTABLE_INGO_TALKED_TO_ADULT_LINK);
ret = 0;
break;
case 0x2035:
src/overlays/actors/ovl_En_Horse/z_en_horse.c
+23 -15
View File
@@ -37,6 +37,8 @@
#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED
#define INGO_FLAG_LASHING (1 << 0)
typedef void (*EnHorseCsFunc)(EnHorse*, PlayState*, CsCmdActorCue*);
typedef void (*EnHorseActionFunc)(EnHorse*, PlayState*);
@@ -399,9 +401,14 @@ static InitChainEntry sInitChain[] = {
static u8 sResetNoInput[] = { 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0 };
static s32 sIdleAnimIds[] = { 1, 3, 0, 3, 1, 0 };
static s32 sIdleAnimIds[] = { ENHORSE_ANIM_WHINNEY, ENHORSE_ANIM_REARING, ENHORSE_ANIM_IDLE,
ENHORSE_ANIM_REARING, ENHORSE_ANIM_WHINNEY, ENHORSE_ANIM_IDLE };
static s16 sIngoAnimations[] = { 7, 6, 2, 2, 1, 1, 0, 0, 0, 0 };
static s16 sIngoAnimations[] = { ENIN_HORSE_ANIM_WHOOPING, ENIN_HORSE_ANIM_SITTING_UPRIGHT,
ENIN_HORSE_ANIM_REARING, ENIN_HORSE_ANIM_REARING,
ENIN_HORSE_ANIM_SITTING_FORWARD, ENIN_HORSE_ANIM_SITTING_FORWARD,
ENIN_HORSE_ANIM_SLOW_RIDE, ENIN_HORSE_ANIM_SLOW_RIDE,
ENIN_HORSE_ANIM_SLOW_RIDE, ENIN_HORSE_ANIM_SLOW_RIDE };
void EnHorse_CsMoveInit(EnHorse* this, PlayState* play, CsCmdActorCue* cue);
void EnHorse_CsJumpInit(EnHorse* this, PlayState* play, CsCmdActorCue* cue);
@@ -609,7 +616,7 @@ void EnHorse_UpdateIngoRaceInfo(EnHorse* this, PlayState* play, RaceInfo* raceIn
} else {
this->actor.speed -= 0.47f;
}
this->ingoRaceFlags |= 1;
this->ingoRaceFlags |= INGO_FLAG_LASHING;
return;
}
@@ -618,7 +625,7 @@ void EnHorse_UpdateIngoRaceInfo(EnHorse* this, PlayState* play, RaceInfo* raceIn
} else {
this->actor.speed -= 0.4f;
}
this->ingoRaceFlags &= ~0x1;
this->ingoRaceFlags &= ~INGO_FLAG_LASHING;
}
void EnHorse_PlayWalkingSfx(EnHorse* this) {
@@ -2011,18 +2018,19 @@ void EnHorse_InitIngoHorse(EnHorse* this) {
}
}
void EnHorse_SetIngoAnimation(s32 index, f32 curFrame, s32 arg2, s16* animIdxOut, f32* curFrameOut) {
void EnHorse_SetIngoAnimation(s32 index, f32 curFrame, s32 isLashing, s16* animIdxOut, f32* curFrameOut) {
*animIdxOut = sIngoAnimations[index];
*curFrameOut = curFrame;
if ((index == 3) || (index == 7) || (index == 8) || (index == 4)) {
if ((index == ENHORSE_ANIM_REARING) || (index == ENHORSE_ANIM_LOW_JUMP) || (index == ENHORSE_ANIM_HIGH_JUMP) ||
(index == ENHORSE_ANIM_WALK)) {
*curFrameOut = 0.0f;
}
if (arg2 == 1) {
if (index == 5) {
*animIdxOut = 4;
if (isLashing == INGO_FLAG_LASHING) {
if (index == ENHORSE_ANIM_TROT) {
*animIdxOut = ENIN_HORSE_ANIM_LASHING_SLOW;
*curFrameOut = curFrame;
} else if (index == 6) {
*animIdxOut = 3;
} else if (index == ENHORSE_ANIM_GALLOP) {
*animIdxOut = ENIN_HORSE_ANIM_LASHING_FAST;
*curFrameOut = curFrame;
}
}
@@ -2113,13 +2121,13 @@ void EnHorse_UpdateIngoRace(EnHorse* this, PlayState* play) {
}
if (this->stateFlags & ENHORSE_INGO_WON) {
((EnIn*)this->rider)->animationIdx = 7;
((EnIn*)this->rider)->unk_1E0 = 0;
((EnIn*)this->rider)->horsebackAnimationIdx = ENIN_HORSE_ANIM_WHOOPING;
((EnIn*)this->rider)->horsebackAnimFrame = 0;
return;
}
EnHorse_SetIngoAnimation(this->animationIdx, this->skin.skelAnime.curFrame, this->ingoRaceFlags & 1,
&((EnIn*)this->rider)->animationIdx, &((EnIn*)this->rider)->unk_1E0);
EnHorse_SetIngoAnimation(this->animationIdx, this->skin.skelAnime.curFrame, this->ingoRaceFlags & INGO_FLAG_LASHING,
&((EnIn*)this->rider)->horsebackAnimationIdx, &((EnIn*)this->rider)->horsebackAnimFrame);
}
void EnHorse_CsMoveInit(EnHorse* this, PlayState* play, CsCmdActorCue* cue) {
src/overlays/actors/ovl_En_In/z_en_in.c
+171 -162
View File
@@ -30,19 +30,19 @@ void EnIn_Update(Actor* thisx, PlayState* play);
void EnIn_Draw(Actor* thisx, PlayState* play);
void EnIn_WaitForObject(EnIn* this, PlayState* play);
void func_80A7A304(EnIn* this, PlayState* play);
void func_80A7A4C8(EnIn* this, PlayState* play);
void func_80A7A568(EnIn* this, PlayState* play);
void func_80A7A848(EnIn* this, PlayState* play);
void func_80A7ABD4(EnIn* this, PlayState* play);
void func_80A7AEF0(EnIn* this, PlayState* play);
void func_80A7B018(EnIn* this, PlayState* play);
void func_80A7B024(EnIn* this, PlayState* play);
void func_80A7AE84(EnIn* this, PlayState* play);
void func_80A7A770(EnIn* this, PlayState* play);
void func_80A7A940(EnIn* this, PlayState* play);
void func_80A7AA40(EnIn* this, PlayState* play);
void func_80A7A4BC(EnIn* this, PlayState* play);
void EnIn_Racing(EnIn* this, PlayState* play);
void EnIn_StartRentalPeriod(EnIn* this, PlayState* play);
void EnIn_RentalPeriod(EnIn* this, PlayState* play);
void EnIn_OfferingRematch(EnIn* this, PlayState* play);
void EnIn_ClosingGate(EnIn* this, PlayState* play);
void EnIn_GuardingGate(EnIn* this, PlayState* play);
void EnIn_PlayerEscapesRanch(EnIn* this, PlayState* play);
void EnIn_EndRentalPeriod(EnIn* this, PlayState* play);
void EnIn_FinishClosingGate(EnIn* this, PlayState* play);
void EnIn_PlayerLostRace(EnIn* this, PlayState* play);
void EnIn_PlayerWonFirstRace(EnIn* this, PlayState* play);
void EnIn_PlayerWonSecondRace(EnIn* this, PlayState* play);
void EnIn_Idle(EnIn* this, PlayState* play);
ActorProfile En_In_Profile = {
/**/ ACTOR_EN_IN,
@@ -79,37 +79,43 @@ static ColliderCylinderInit sCylinderInit = {
static CollisionCheckInfoInit2 sColChkInfoInit = { 0, 0, 0, 0, MASS_IMMOVABLE };
typedef enum EnInAnimation {
/* 0 */ ENIN_ANIM_0,
/* 1 */ ENIN_ANIM_1,
/* 2 */ ENIN_ANIM_2,
/* 3 */ ENIN_ANIM_3,
/* 4 */ ENIN_ANIM_4,
/* 5 */ ENIN_ANIM_5,
/* 6 */ ENIN_ANIM_6,
/* 7 */ ENIN_ANIM_7,
/* 8 */ ENIN_ANIM_8,
/* 9 */ ENIN_ANIM_9
/* 0 */ ENIN_ANIM_STANDING,
/* 1 */ ENIN_ANIM_STANDING_MORPH,
/* 2 */ ENIN_ANIM_STANDING_FOOT_FORWARD,
/* 3 */ ENIN_ANIM_STANDING_FOOT_FORWARD_MORPH,
/* 4 */ ENIN_ANIM_GLOATING,
/* 5 */ ENIN_ANIM_RUNNING,
/* 6 */ ENIN_ANIM_LOSING,
/* 7 */ ENIN_ANIM_SLEEPING,
/* 8 */ ENIN_ANIM_OBEDIENT,
/* 9 */ ENIN_ANIM_WORKING
} EnInAnimation;
typedef enum EnInStartMode {
/* 0 */ ENIN_START_MODE_0,
/* 1 */ ENIN_START_MODE_1,
/* 2 */ ENIN_START_MODE_2,
/* 3 */ ENIN_START_MODE_3,
/* 4 */ ENIN_START_MODE_4
/* 0 */ ENIN_START_MODE_NULL,
/* 1 */ ENIN_START_MODE_WORKING,
/* 2 */ ENIN_START_MODE_RUNNING_RANCH,
/* 3 */ ENIN_START_MODE_SLEEPING,
/* 4 */ ENIN_START_MODE_OBEDIENT
} EnInStartMode;
static AnimationFrameCountInfo sAnimationInfo[] = {
{ &object_in_Anim_001CC0, 1.0f, ANIMMODE_LOOP, 0.0f }, { &object_in_Anim_001CC0, 1.0f, ANIMMODE_LOOP, -10.0f },
{ &object_in_Anim_013C6C, 1.0f, ANIMMODE_LOOP, 0.0f }, { &object_in_Anim_013C6C, 1.0f, ANIMMODE_LOOP, -10.0f },
{ &object_in_Anim_000CB0, 1.0f, ANIMMODE_LOOP, 0.0f }, { &object_in_Anim_0003B4, 1.0f, ANIMMODE_LOOP, -10.0f },
{ &object_in_Anim_001BE0, 1.0f, ANIMMODE_LOOP, 0.0f }, { &object_in_Anim_013D60, 1.0f, ANIMMODE_LOOP, 0.0f },
{ &object_in_Anim_01431C, 1.0f, ANIMMODE_LOOP, 0.0f }, { &object_in_Anim_014CA8, 1.0f, ANIMMODE_LOOP, 0.0f },
{ &gIngoStandingAnim, 1.0f, ANIMMODE_LOOP, 0.0f },
{ &gIngoStandingAnim, 1.0f, ANIMMODE_LOOP, -10.0f },
{ &gIngoStandingFootForwardAnim, 1.0f, ANIMMODE_LOOP, 0.0f },
{ &gIngoStandingFootForwardAnim, 1.0f, ANIMMODE_LOOP, -10.0f },
{ &gIngoGloatingAnim, 1.0f, ANIMMODE_LOOP, 0.0f },
{ &gIngoRunningAnim, 1.0f, ANIMMODE_LOOP, -10.0f },
{ &gIngoLosingAnim, 1.0f, ANIMMODE_LOOP, 0.0f },
{ &gIngoSleepingAnim, 1.0f, ANIMMODE_LOOP, 0.0f },
{ &gIngoObedientAnim, 1.0f, ANIMMODE_LOOP, 0.0f },
{ &gIngoWorkingAnim, 1.0f, ANIMMODE_LOOP, 0.0f },
};
static AnimationHeader* D_80A7B918[] = {
&object_in_Anim_0151C8, &object_in_Anim_015DF0, &object_in_Anim_016B3C, &object_in_Anim_015814,
&object_in_Anim_01646C, &object_in_Anim_0175D0, &object_in_Anim_017B58, &object_in_Anim_018C38,
static AnimationHeader* sHorsebackAnimations[] = {
&gIngoHorsebackSlowRideAnim, &gIngoHorsebackSittingForwardAnim, &gIngoHorsebackRearingAnim,
&gIngoHorsebackLashingFastAnim, &gIngoHorsebackLashingSlowAnim, &gIngoHorsebackKickingAnim,
&gIngoHorsebackSittingUprightAnim, &gIngoHorsebackWhoopingAnim,
};
static Gfx* sAdultEraDLs[] = {
@@ -137,13 +143,13 @@ static Gfx* sAdultEraDLs[] = {
u16 EnIn_GetTextIdChild(PlayState* play) {
if (GET_EVENTCHKINF(EVENTCHKINF_TALON_RETURNED_FROM_CASTLE)) {
if (GET_INFTABLE(INFTABLE_97)) {
if (GET_INFTABLE(INFTABLE_INGO_TALKED_TO_CHILD_LINK_AFTER_TALON_RETURNED)) {
return 0x2046;
} else {
return 0x2045;
}
}
if (GET_INFTABLE(INFTABLE_94)) {
if (GET_INFTABLE(INFTABLE_INGO_TALKED_TO_CHILD_LINK_BEFORE_TALON_RETURNED)) {
return 0x2040;
} else {
return 0x203F;
@@ -196,7 +202,7 @@ u16 EnIn_GetTextIdAdult(PlayState* play) {
return 0x205B;
case INGO_RACE_STATE_RACING:
default:
if (GET_INFTABLE(INFTABLE_9A)) {
if (GET_INFTABLE(INFTABLE_INGO_TALKED_TO_ADULT_LINK)) {
// Pay to Ride
return 0x2031;
} else {
@@ -224,14 +230,14 @@ s16 EnIn_UpdateTalkStateOnClosing(PlayState* play, Actor* thisx) {
switch (thisx->textId) {
case 0x2045:
SET_INFTABLE(INFTABLE_97);
SET_INFTABLE(INFTABLE_INGO_TALKED_TO_CHILD_LINK_AFTER_TALON_RETURNED);
break;
case 0x203E:
talkState = NPC_TALK_STATE_ACTION;
break;
case 0x203F:
SET_EVENTCHKINF(EVENTCHKINF_11);
SET_INFTABLE(INFTABLE_94);
SET_INFTABLE(INFTABLE_INGO_TALKED_TO_CHILD_LINK_BEFORE_TALON_RETURNED);
break;
}
return talkState;
@@ -252,7 +258,7 @@ s16 EnIn_UpdateTalkStateOnChoice(PlayState* play, Actor* thisx) {
this->actor.textId = 0x2034;
}
Message_ContinueTextbox(play, this->actor.textId);
SET_INFTABLE(INFTABLE_9A);
SET_INFTABLE(INFTABLE_INGO_TALKED_TO_ADULT_LINK);
break;
case 0x2034:
if (play->msgCtx.choiceIndex == 1) {
@@ -289,7 +295,7 @@ s16 EnIn_UpdateTalkStateOnChoice(PlayState* play, Actor* thisx) {
SET_EVENTINF_INGO_RACE_STATE(INGO_RACE_STATE_OFFER_RENTAL);
CLEAR_EVENTINF(EVENTINF_INGO_RACE_LOST_ONCE);
CLEAR_EVENTINF(EVENTINF_INGO_RACE_SECOND_RACE);
this->actionFunc = func_80A7A4C8;
this->actionFunc = EnIn_StartRentalPeriod;
}
break;
}
@@ -343,20 +349,20 @@ s16 EnIn_UpdateTalkState(PlayState* play, Actor* thisx) {
return talkState;
}
void func_80A795C8(EnIn* this, PlayState* play) {
void EnIn_UpdateTracking(EnIn* this, PlayState* play) {
Player* player = GET_PLAYER(play);
s16 trackingMode;
if (this->skelAnime.animation == &object_in_Anim_0003B4 || this->skelAnime.animation == &object_in_Anim_001BE0 ||
this->skelAnime.animation == &object_in_Anim_013D60) {
if (this->skelAnime.animation == &gIngoRunningAnim || this->skelAnime.animation == &gIngoLosingAnim ||
this->skelAnime.animation == &gIngoSleepingAnim) {
trackingMode = NPC_TRACKING_NONE;
} else {
trackingMode = NPC_TRACKING_PLAYER_AUTO_TURN;
}
if (this->actionFunc == func_80A7A568) {
if (this->actionFunc == EnIn_RentalPeriod) {
trackingMode = NPC_TRACKING_FULL_BODY;
}
if (this->actionFunc == func_80A7B024) {
if (this->actionFunc == EnIn_EndRentalPeriod) {
this->interactInfo.trackPos = play->view.eye;
this->interactInfo.yOffset = 60.0f;
} else {
@@ -366,7 +372,7 @@ void func_80A795C8(EnIn* this, PlayState* play) {
Npc_TrackPoint(&this->actor, &this->interactInfo, 1, trackingMode);
}
void func_80A79690(SkelAnime* skelAnime, EnIn* this, PlayState* play) {
void EnIn_Stagger(SkelAnime* skelAnime, EnIn* this, PlayState* play) {
if (skelAnime->baseTransl.y < skelAnime->jointTable[0].y) {
skelAnime->movementFlags |= ANIM_FLAG_UPDATE_XZ | ANIM_FLAG_UPDATE_Y;
AnimTaskQueue_AddActorMovement(play, &this->actor, skelAnime, 1.0f);
@@ -379,52 +385,52 @@ void EnIn_ChangeAnim(EnIn* this, s32 index) {
sAnimationInfo[index].morphFrames);
}
s32 func_80A7975C(EnIn* this, PlayState* play) {
s32 EnIn_StartingRace(EnIn* this, PlayState* play) {
if (this->actor.params != 1 || this->actor.shape.rot.z != 1 || !LINK_IS_ADULT) {
return 0;
return false;
}
this->animationIdx = 1;
this->horsebackAnimationIdx = ENIN_HORSE_ANIM_SITTING_FORWARD;
this->collider.base.ocFlags1 &= ~OC1_ON;
Animation_Change(&this->skelAnime, D_80A7B918[this->animationIdx], 1.0f, 0.0f,
Animation_GetLastFrame(D_80A7B918[this->animationIdx]), 2, 0.0f);
this->actionFunc = func_80A7A304;
return 1;
Animation_Change(&this->skelAnime, sHorsebackAnimations[this->horsebackAnimationIdx], 1.0f, 0.0f,
Animation_GetLastFrame(sHorsebackAnimations[this->horsebackAnimationIdx]), ANIMMODE_ONCE, 0.0f);
this->actionFunc = EnIn_Racing;
return true;
}
s32 EnIn_GetStartMode(EnIn* this, PlayState* play) {
if (play->sceneId == SCENE_LON_LON_RANCH && LINK_IS_CHILD && IS_DAY && this->actor.shape.rot.z == 1 &&
!GET_EVENTCHKINF(EVENTCHKINF_TALON_RETURNED_FROM_CASTLE)) {
return ENIN_START_MODE_1;
return ENIN_START_MODE_WORKING;
}
if (play->sceneId == SCENE_STABLE && LINK_IS_CHILD && IS_DAY && this->actor.shape.rot.z == 3 &&
GET_EVENTCHKINF(EVENTCHKINF_TALON_RETURNED_FROM_CASTLE)) {
return ENIN_START_MODE_1;
return ENIN_START_MODE_WORKING;
}
if (play->sceneId == SCENE_STABLE && LINK_IS_CHILD && IS_NIGHT) {
if ((this->actor.shape.rot.z == 2) && !GET_EVENTCHKINF(EVENTCHKINF_TALON_RETURNED_FROM_CASTLE)) {
return ENIN_START_MODE_1;
return ENIN_START_MODE_WORKING;
}
if ((this->actor.shape.rot.z == 4) && GET_EVENTCHKINF(EVENTCHKINF_TALON_RETURNED_FROM_CASTLE)) {
return ENIN_START_MODE_1;
return ENIN_START_MODE_WORKING;
}
}
if (play->sceneId == SCENE_LON_LON_RANCH && LINK_IS_ADULT && IS_DAY) {
if ((this->actor.shape.rot.z == 5) && !GET_EVENTCHKINF(EVENTCHKINF_EPONA_OBTAINED)) {
return ENIN_START_MODE_2;
return ENIN_START_MODE_RUNNING_RANCH;
}
if ((this->actor.shape.rot.z == 7) && GET_EVENTCHKINF(EVENTCHKINF_EPONA_OBTAINED)) {
return ENIN_START_MODE_4;
return ENIN_START_MODE_OBEDIENT;
}
}
if (play->sceneId == SCENE_LON_LON_BUILDINGS && LINK_IS_ADULT && IS_NIGHT) {
if (this->actor.shape.rot.z == 6 && !GET_EVENTCHKINF(EVENTCHKINF_EPONA_OBTAINED)) {
return ENIN_START_MODE_3;
return ENIN_START_MODE_SLEEPING;
}
if (this->actor.shape.rot.z == 8 && GET_EVENTCHKINF(EVENTCHKINF_EPONA_OBTAINED)) {
return ENIN_START_MODE_3;
return ENIN_START_MODE_SLEEPING;
}
}
return ENIN_START_MODE_0;
return ENIN_START_MODE_NULL;
}
void EnIn_UpdateEyes(EnIn* this) {
@@ -439,20 +445,20 @@ void EnIn_UpdateEyes(EnIn* this) {
}
}
void func_80A79AB4(EnIn* this, PlayState* play) {
void EnIn_Fidget(EnIn* this, PlayState* play) {
s32 i;
u32 f = 0;
if (this->skelAnime.animation != &object_in_Anim_014CA8) {
if (this->skelAnime.animation != &gIngoWorkingAnim) {
f = play->gameplayFrames;
}
for (i = 0; i < ARRAY_COUNT(this->unk_330); i++) {
this->unk_330[i].y = (2068 + 50 * i) * f;
this->unk_330[i].z = (2368 + 50 * i) * f;
for (i = 0; i < ARRAY_COUNT(this->fidgetVec); i++) {
this->fidgetVec[i].y = (FIDGET_FREQ_Y + FIDGET_FREQ_LIMB * i) * f;
this->fidgetVec[i].z = (FIDGET_FREQ_Z + FIDGET_FREQ_LIMB * i) * f;
}
}
void func_80A79BAC(EnIn* this, PlayState* play, s32 index, u32 transitionType) {
void EnIn_StartTransition(EnIn* this, PlayState* play, s32 index, u32 transitionType) {
s16 entrances[] = { ENTR_LON_LON_RANCH_8, ENTR_LON_LON_RANCH_6, ENTR_LON_LON_RANCH_0 };
play->nextEntranceIndex = entrances[index];
@@ -469,7 +475,7 @@ void func_80A79BAC(EnIn* this, PlayState* play, s32 index, u32 transitionType) {
gSaveContext.timerState = TIMER_STATE_OFF;
}
void func_80A79C78(EnIn* this, PlayState* play) {
void EnIn_RentalTimeExpired(EnIn* this, PlayState* play) {
Player* player = GET_PLAYER(play);
Vec3f subCamAt;
Vec3f subCamEye;
@@ -503,7 +509,7 @@ void func_80A79C78(EnIn* this, PlayState* play) {
Interface_ChangeHudVisibilityMode(HUD_VISIBILITY_NOTHING_ALT);
}
static s32 D_80A7B998 = 0;
static s32 sIsObedient = false;
void EnIn_Init(Actor* thisx, PlayState* play) {
EnIn* this = (EnIn*)thisx;
@@ -518,9 +524,9 @@ void EnIn_Init(Actor* thisx, PlayState* play) {
}
respawnPos = respawn->pos;
// hardcoded coords for lon lon entrance
if (D_80A7B998 == 0 && respawnPos.x == 1107.0f && respawnPos.y == 0.0f && respawnPos.z == -3740.0f) {
if (!sIsObedient && respawnPos.x == 1107.0f && respawnPos.y == 0.0f && respawnPos.z == -3740.0f) {
gSaveContext.eventInf[EVENTINF_INDEX_HORSES] = 0;
D_80A7B998 = 1;
sIsObedient = true;
}
this->actionFunc = EnIn_WaitForObject;
}
@@ -544,36 +550,36 @@ void EnIn_WaitForObject(EnIn* this, PlayState* play) {
Collider_InitCylinder(play, &this->collider);
Collider_SetCylinder(play, &this->collider, &this->actor, &sCylinderInit);
CollisionCheck_SetInfo2(&this->actor.colChkInfo, NULL, &sColChkInfoInit);
if (func_80A7975C(this, play)) {
if (EnIn_StartingRace(this, play)) {
WRITE_EVENTINF_INGO_RACE_0F(0);
return;
}
Actor_SetScale(&this->actor, 0.01f);
this->actor.attentionRangeType = ATTENTION_RANGE_6;
this->interactInfo.talkState = NPC_TALK_STATE_IDLE;
this->actionFunc = func_80A7A4BC;
this->actionFunc = EnIn_Idle;
switch (EnIn_GetStartMode(this, play)) {
case ENIN_START_MODE_1:
EnIn_ChangeAnim(this, ENIN_ANIM_9);
this->actionFunc = func_80A7A4BC;
case ENIN_START_MODE_WORKING:
EnIn_ChangeAnim(this, ENIN_ANIM_WORKING);
this->actionFunc = EnIn_Idle;
break;
case ENIN_START_MODE_3:
EnIn_ChangeAnim(this, ENIN_ANIM_7);
this->actionFunc = func_80A7A4BC;
case ENIN_START_MODE_SLEEPING:
EnIn_ChangeAnim(this, ENIN_ANIM_SLEEPING);
this->actionFunc = EnIn_Idle;
if (!GET_EVENTCHKINF(EVENTCHKINF_EPONA_OBTAINED)) {
this->actor.params = 5;
}
break;
case ENIN_START_MODE_4:
EnIn_ChangeAnim(this, ENIN_ANIM_8);
case ENIN_START_MODE_OBEDIENT:
EnIn_ChangeAnim(this, ENIN_ANIM_OBEDIENT);
this->eyeIndex = 3;
this->actionFunc = func_80A7A4BC;
this->actionFunc = EnIn_Idle;
break;
case ENIN_START_MODE_0:
case ENIN_START_MODE_NULL:
Actor_Kill(&this->actor);
break;
default: // ENIN_START_MODE_2
default: // ENIN_START_MODE_RUNNING_RANCH
switch (GET_EVENTINF_INGO_RACE_STATE()) {
case INGO_RACE_STATE_OFFER_RENTAL:
case INGO_RACE_STATE_RACING:
@@ -603,71 +609,74 @@ void EnIn_WaitForObject(EnIn* this, PlayState* play) {
switch (GET_EVENTINF_INGO_RACE_STATE()) {
case INGO_RACE_STATE_OFFER_RENTAL:
case INGO_RACE_STATE_RACING:
EnIn_ChangeAnim(this, ENIN_ANIM_2);
this->actionFunc = func_80A7A4C8;
EnIn_ChangeAnim(this, ENIN_ANIM_STANDING_FOOT_FORWARD);
this->actionFunc = EnIn_StartRentalPeriod;
gSaveContext.eventInf[EVENTINF_INDEX_HORSES] = 0;
break;
case INGO_RACE_STATE_HORSE_RENTAL_PERIOD:
this->actor.attentionRangeType = ATTENTION_RANGE_3;
EnIn_ChangeAnim(this, ENIN_ANIM_2);
this->actionFunc = func_80A7A568;
EnIn_ChangeAnim(this, ENIN_ANIM_STANDING_FOOT_FORWARD);
this->actionFunc = EnIn_RentalPeriod;
Interface_SetTimer(60);
break;
case INGO_RACE_STATE_PLAYER_LOSE:
EnIn_ChangeAnim(this, ENIN_ANIM_4);
this->actionFunc = func_80A7A770;
EnIn_ChangeAnim(this, ENIN_ANIM_GLOATING);
this->actionFunc = EnIn_PlayerLostRace;
break;
case INGO_RACE_STATE_FIRST_WIN:
EnIn_ChangeAnim(this, ENIN_ANIM_6);
this->unk_1EC = 8;
this->actionFunc = func_80A7A940;
EnIn_ChangeAnim(this, ENIN_ANIM_LOSING);
this->losingScreamTimer = 8;
this->actionFunc = EnIn_PlayerWonFirstRace;
break;
case INGO_RACE_STATE_TRAPPED_WIN_UNUSED:
case INGO_RACE_STATE_TRAPPED_WIN_EPONA:
this->actor.attentionRangeType = ATTENTION_RANGE_3;
EnIn_ChangeAnim(this, ENIN_ANIM_6);
this->unk_1EC = 8;
this->actionFunc = func_80A7AA40;
EnIn_ChangeAnim(this, ENIN_ANIM_LOSING);
this->losingScreamTimer = 8;
this->actionFunc = EnIn_PlayerWonSecondRace;
break;
case INGO_RACE_STATE_REMATCH:
EnIn_ChangeAnim(this, ENIN_ANIM_2);
this->actionFunc = func_80A7A848;
EnIn_ChangeAnim(this, ENIN_ANIM_STANDING_FOOT_FORWARD);
this->actionFunc = EnIn_OfferingRematch;
break;
}
}
}
}
void func_80A7A304(EnIn* this, PlayState* play) {
if (this->skelAnime.animation == &object_in_Anim_015814 || this->skelAnime.animation == &object_in_Anim_01646C) {
void EnIn_Racing(EnIn* this, PlayState* play) {
if (this->skelAnime.animation == &gIngoHorsebackLashingFastAnim ||
this->skelAnime.animation == &gIngoHorsebackLashingSlowAnim) {
if (this->skelAnime.curFrame == 8.0f) {
Audio_PlaySfxRandom(&this->actor.projectedPos, NA_SE_VO_IN_LASH_0,
NA_SE_VO_IN_LASH_1 - NA_SE_VO_IN_LASH_0 + 1);
}
}
if (this->skelAnime.animation == &object_in_Anim_018C38 && this->skelAnime.curFrame == 20.0f) {
if (this->skelAnime.animation == &gIngoHorsebackWhoopingAnim && this->skelAnime.curFrame == 20.0f) {
Actor_PlaySfx(&this->actor, NA_SE_VO_IN_CRY_0);
}
if (SkelAnime_Update(&this->skelAnime)) {
this->animationIdx %= 8;
this->unk_1E8 = this->animationIdx;
if (this->animationIdx == 3 || this->animationIdx == 4) {
this->horsebackAnimationIdx %= ENIN_HORSE_ANIM_MAX;
this->unusedAnimationIdx = this->horsebackAnimationIdx;
if (this->horsebackAnimationIdx == ENIN_HORSE_ANIM_LASHING_FAST ||
this->horsebackAnimationIdx == ENIN_HORSE_ANIM_LASHING_SLOW) {
SFX_PLAY_AT_POS(&this->actor.projectedPos, NA_SE_IT_LASH);
if (Rand_ZeroOne() < 0.3f) {
SFX_PLAY_AT_POS(&this->actor.projectedPos, NA_SE_IT_INGO_HORSE_NEIGH);
}
}
Animation_Change(&this->skelAnime, D_80A7B918[this->animationIdx], 1.0f, 0.0f,
Animation_GetLastFrame(D_80A7B918[this->animationIdx]), 2, -10.0f);
Animation_Change(&this->skelAnime, sHorsebackAnimations[this->horsebackAnimationIdx], 1.0f, 0.0f,
Animation_GetLastFrame(sHorsebackAnimations[this->horsebackAnimationIdx]), ANIMMODE_ONCE,
-10.0f);
}
}
void func_80A7A4BC(EnIn* this, PlayState* play) {
void EnIn_Idle(EnIn* this, PlayState* play) {
}
void func_80A7A4C8(EnIn* this, PlayState* play) {
void EnIn_StartRentalPeriod(EnIn* this, PlayState* play) {
if (this->interactInfo.talkState == NPC_TALK_STATE_ACTION) {
func_80A79BAC(this, play, 1, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST));
EnIn_StartTransition(this, play, 1, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST));
SET_EVENTINF_INGO_RACE_STATE(INGO_RACE_STATE_HORSE_RENTAL_PERIOD);
WRITE_EVENTINF_INGO_RACE_0F(1);
CLEAR_INFTABLE(INFTABLE_A2);
@@ -678,9 +687,9 @@ void func_80A7A4C8(EnIn* this, PlayState* play) {
}
}
void func_80A7A568(EnIn* this, PlayState* play) {
void EnIn_RentalPeriod(EnIn* this, PlayState* play) {
Player* player = GET_PLAYER(play);
s32 phi_a2;
s32 entranceIndex;
s32 transitionType;
if (!GET_EVENTCHKINF(EVENTCHKINF_1B) && (player->stateFlags1 & PLAYER_STATE1_23)) {
@@ -688,8 +697,8 @@ void func_80A7A568(EnIn* this, PlayState* play) {
}
if (gSaveContext.timerState == TIMER_STATE_STOP) {
SFX_PLAY_CENTERED(NA_SE_SY_FOUND);
func_80A79C78(this, play);
this->actionFunc = func_80A7B024;
EnIn_RentalTimeExpired(this, play);
this->actionFunc = EnIn_EndRentalPeriod;
gSaveContext.timerState = TIMER_STATE_OFF;
} else if (this->interactInfo.talkState == NPC_TALK_STATE_ACTION) {
if (play->msgCtx.choiceIndex == 0) {
@@ -701,7 +710,7 @@ void func_80A7A568(EnIn* this, PlayState* play) {
}
WRITE_EVENTINF_INGO_RACE_HORSETYPE(((EnHorse*)GET_PLAYER(play)->rideActor)->type);
SET_EVENTINF_INGO_RACE_STATE(INGO_RACE_STATE_RACING);
phi_a2 = 2;
entranceIndex = 2;
transitionType = TRANS_TYPE_FADE_BLACK;
} else {
SFX_PLAY_CENTERED(NA_SE_SY_FOUND);
@@ -712,10 +721,10 @@ void func_80A7A568(EnIn* this, PlayState* play) {
}
}
SET_EVENTINF_INGO_RACE_STATE(INGO_RACE_STATE_OFFER_RENTAL);
phi_a2 = 0;
entranceIndex = 0;
transitionType = TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST);
}
func_80A79BAC(this, play, phi_a2, transitionType);
EnIn_StartTransition(this, play, entranceIndex, transitionType);
play->msgCtx.stateTimer = 0;
WRITE_EVENTINF_INGO_RACE_0F(1);
play->msgCtx.msgMode = MSGMODE_TEXT_CLOSING;
@@ -723,14 +732,14 @@ void func_80A7A568(EnIn* this, PlayState* play) {
}
}
void func_80A7A770(EnIn* this, PlayState* play) {
void EnIn_PlayerLostRace(EnIn* this, PlayState* play) {
if (this->interactInfo.talkState == NPC_TALK_STATE_IDLE) {
this->actor.flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
} else if (this->interactInfo.talkState == NPC_TALK_STATE_ACTION) {
Rupees_ChangeBy(-50);
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
EnIn_ChangeAnim(this, ENIN_ANIM_3);
this->actionFunc = func_80A7A848;
EnIn_ChangeAnim(this, ENIN_ANIM_STANDING_FOOT_FORWARD_MORPH);
this->actionFunc = EnIn_OfferingRematch;
SET_EVENTINF_INGO_RACE_STATE(INGO_RACE_STATE_REMATCH);
this->interactInfo.talkState = NPC_TALK_STATE_IDLE;
SET_EVENTINF_INGO_RACE_FLAG(EVENTINF_INGO_RACE_LOST_ONCE);
@@ -741,14 +750,14 @@ void func_80A7A770(EnIn* this, PlayState* play) {
}
}
void func_80A7A848(EnIn* this, PlayState* play) {
void EnIn_OfferingRematch(EnIn* this, PlayState* play) {
if (this->interactInfo.talkState == NPC_TALK_STATE_ACTION) {
if ((play->msgCtx.choiceIndex == 0 && gSaveContext.save.info.playerData.rupees < 50) ||
play->msgCtx.choiceIndex == 1) {
SET_EVENTINF_INGO_RACE_STATE(INGO_RACE_STATE_OFFER_RENTAL);
this->actionFunc = func_80A7A4C8;
this->actionFunc = EnIn_StartRentalPeriod;
} else {
func_80A79BAC(this, play, 2, TRANS_TYPE_CIRCLE(TCA_STARBURST, TCC_BLACK, TCS_FAST));
EnIn_StartTransition(this, play, 2, TRANS_TYPE_CIRCLE(TCA_STARBURST, TCC_BLACK, TCS_FAST));
SET_EVENTINF_INGO_RACE_STATE(INGO_RACE_STATE_RACING);
WRITE_EVENTINF_INGO_RACE_0F(1);
play->msgCtx.stateTimer = 0;
@@ -760,20 +769,20 @@ void func_80A7A848(EnIn* this, PlayState* play) {
}
}
void func_80A7A940(EnIn* this, PlayState* play) {
void EnIn_PlayerWonFirstRace(EnIn* this, PlayState* play) {
if (this->interactInfo.talkState == NPC_TALK_STATE_IDLE) {
this->actor.flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
return;
}
if (this->unk_1EC != 0) {
this->unk_1EC--;
if (this->unk_1EC == 0) {
if (this->losingScreamTimer != 0) {
this->losingScreamTimer--;
if (this->losingScreamTimer == 0) {
Actor_PlaySfx(&this->actor, NA_SE_VO_IN_LOST);
}
}
if (this->interactInfo.talkState == NPC_TALK_STATE_ACTION) {
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
func_80A79BAC(this, play, 2, TRANS_TYPE_CIRCLE(TCA_STARBURST, TCC_BLACK, TCS_FAST));
EnIn_StartTransition(this, play, 2, TRANS_TYPE_CIRCLE(TCA_STARBURST, TCC_BLACK, TCS_FAST));
SET_EVENTINF_INGO_RACE_STATE(INGO_RACE_STATE_RACING);
WRITE_EVENTINF_INGO_RACE_0F(1);
play->msgCtx.stateTimer = 0;
@@ -783,7 +792,7 @@ void func_80A7A940(EnIn* this, PlayState* play) {
}
}
void func_80A7AA40(EnIn* this, PlayState* play) {
void EnIn_PlayerWonSecondRace(EnIn* this, PlayState* play) {
Vec3f zeroVec = { 0.0f, 0.0f, 0.0f };
Vec3f subCamAt;
Vec3f subCamEye;
@@ -819,10 +828,10 @@ void func_80A7AA40(EnIn* this, PlayState* play) {
play->csCtx.curFrame = 0;
Letterbox_SetSizeTarget(32);
Interface_ChangeHudVisibilityMode(HUD_VISIBILITY_NOTHING_ALT);
this->actionFunc = func_80A7ABD4;
this->actionFunc = EnIn_ClosingGate;
}
void func_80A7ABD4(EnIn* this, PlayState* play) {
void EnIn_ClosingGate(EnIn* this, PlayState* play) {
Player* player = GET_PLAYER(play);
Vec3f subCamAt;
Vec3f subCamEye;
@@ -832,9 +841,9 @@ void func_80A7ABD4(EnIn* this, PlayState* play) {
}
player->actor.freezeTimer = 10;
if (this->actor.textId == 0x203B) {
if (this->unk_1EC != 0) {
this->unk_1EC--;
if (this->unk_1EC == 0) {
if (this->losingScreamTimer != 0) {
this->losingScreamTimer--;
if (this->losingScreamTimer == 0) {
Actor_PlaySfx(&this->actor, NA_SE_VO_IN_LOST);
}
}
@@ -845,7 +854,7 @@ void func_80A7ABD4(EnIn* this, PlayState* play) {
this->actor.textId = 0x203C;
Message_StartTextbox(play, this->actor.textId, NULL);
this->interactInfo.talkState = NPC_TALK_STATE_TALKING;
EnIn_ChangeAnim(this, ENIN_ANIM_3);
EnIn_ChangeAnim(this, ENIN_ANIM_STANDING_FOOT_FORWARD_MORPH);
} else {
play->msgCtx.msgMode = MSGMODE_TEXT_CLOSING;
this->interactInfo.talkState = NPC_TALK_STATE_IDLE;
@@ -853,7 +862,7 @@ void func_80A7ABD4(EnIn* this, PlayState* play) {
}
} else {
if (play->csCtx.curFrame++ >= 50) {
this->actionFunc = func_80A7AE84;
this->actionFunc = EnIn_FinishClosingGate;
return;
}
if (play->csCtx.curFrame == 44) {
@@ -879,15 +888,15 @@ void func_80A7ABD4(EnIn* this, PlayState* play) {
}
}
void func_80A7AE84(EnIn* this, PlayState* play) {
void EnIn_FinishClosingGate(EnIn* this, PlayState* play) {
Play_ChangeCameraStatus(play, this->returnToCamId, CAM_STAT_ACTIVE);
Play_ClearCamera(play, this->subCamId);
Player_SetCsActionWithHaltedActors(play, &this->actor, PLAYER_CSACTION_7);
Interface_ChangeHudVisibilityMode(HUD_VISIBILITY_ALL);
this->actionFunc = func_80A7AEF0;
this->actionFunc = EnIn_GuardingGate;
}
void func_80A7AEF0(EnIn* this, PlayState* play) {
void EnIn_GuardingGate(EnIn* this, PlayState* play) {
Player* player = GET_PLAYER(play);
s32 yaw;
Vec3f pos = this->actor.world.pos;
@@ -899,7 +908,7 @@ void func_80A7AEF0(EnIn* this, PlayState* play) {
play->nextEntranceIndex = ENTR_HYRULE_FIELD_15;
play->transitionTrigger = TRANS_TRIGGER_START;
play->transitionType = TRANS_TYPE_FADE_WHITE_FAST;
this->actionFunc = func_80A7B018;
this->actionFunc = EnIn_PlayerEscapesRanch;
} else if (this->interactInfo.talkState == NPC_TALK_STATE_ACTION) {
play->msgCtx.stateTimer = 4;
play->msgCtx.msgMode = MSGMODE_TEXT_CLOSING;
@@ -907,10 +916,10 @@ void func_80A7AEF0(EnIn* this, PlayState* play) {
}
}
void func_80A7B018(EnIn* this, PlayState* play) {
void EnIn_PlayerEscapesRanch(EnIn* this, PlayState* play) {
}
void func_80A7B024(EnIn* this, PlayState* play) {
void EnIn_EndRentalPeriod(EnIn* this, PlayState* play) {
Player* player = GET_PLAYER(play);
if (player->rideActor != NULL) {
@@ -927,7 +936,7 @@ void func_80A7B024(EnIn* this, PlayState* play) {
SET_INFTABLE(INFTABLE_AB);
}
func_80A79BAC(this, play, 0, TRANS_TYPE_CIRCLE(TCA_STARBURST, TCC_BLACK, TCS_FAST));
EnIn_StartTransition(this, play, 0, TRANS_TYPE_CIRCLE(TCA_STARBURST, TCC_BLACK, TCS_FAST));
SET_EVENTINF_INGO_RACE_STATE(INGO_RACE_STATE_OFFER_RENTAL);
WRITE_EVENTINF_INGO_RACE_0F(1);
play->msgCtx.stateTimer = 4;
@@ -946,25 +955,25 @@ void EnIn_Update(Actor* thisx, PlayState* play) {
collider = &this->collider;
Collider_UpdateCylinder(&this->actor, collider);
CollisionCheck_SetOC(play, &play->colChkCtx, &collider->base);
if (this->actionFunc != func_80A7A304) {
if (this->actionFunc != EnIn_Racing) {
SkelAnime_Update(&this->skelAnime);
if (this->skelAnime.animation == &object_in_Anim_001BE0 &&
if (this->skelAnime.animation == &gIngoLosingAnim &&
GET_EVENTINF_INGO_RACE_STATE() != INGO_RACE_STATE_TRAPPED_WIN_EPONA) {
func_80A79690(&this->skelAnime, this, play);
EnIn_Stagger(&this->skelAnime, this, play);
}
Actor_UpdateBgCheckInfo(play, &this->actor, 0.0f, 0.0f, 0.0f, UPDBGCHECKINFO_FLAG_2);
}
EnIn_UpdateEyes(this);
this->actionFunc(this, play);
if (this->actionFunc != func_80A7A304) {
func_80A79AB4(this, play);
if (this->actionFunc != EnIn_Racing) {
EnIn_Fidget(this, play);
#if OOT_VERSION < PAL_1_0
Npc_UpdateTalking(play, &this->actor, &this->interactInfo.talkState,
((this->actor.attentionRangeType == 6) ? 80.0f : 320.0f) + this->collider.dim.radius,
EnIn_GetTextId, EnIn_UpdateTalkState);
if (this->interactInfo.talkState != NPC_TALK_STATE_IDLE) {
this->unk_1FA = this->unk_1F8;
this->unk_1F8 = Message_GetState(&play->msgCtx);
this->prevTextState = this->textState;
this->textState = Message_GetState(&play->msgCtx);
}
#else
if ((gSaveContext.subTimerSeconds < 6) && (gSaveContext.subTimerState != SUBTIMER_STATE_OFF) &&
@@ -975,12 +984,12 @@ void EnIn_Update(Actor* thisx, PlayState* play) {
((this->actor.attentionRangeType == 6) ? 80.0f : 320.0f) + this->collider.dim.radius,
EnIn_GetTextId, EnIn_UpdateTalkState);
if (this->interactInfo.talkState != NPC_TALK_STATE_IDLE) {
this->unk_1FA = this->unk_1F8;
this->unk_1F8 = Message_GetState(&play->msgCtx);
this->prevTextState = this->textState;
this->textState = Message_GetState(&play->msgCtx);
}
}
#endif
func_80A795C8(this, play);
EnIn_UpdateTracking(this, play);
}
}
@@ -1006,26 +1015,26 @@ s32 EnIn_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* po
Matrix_RotateY(BINANG_TO_RAD_ALT(limbRot.y), MTXMODE_APPLY);
}
if (limbIndex == INGO_LIMB_CHEST || limbIndex == INGO_LIMB_LEFT_SHOULDER || limbIndex == INGO_LIMB_RIGHT_SHOULDER) {
rot->y += Math_SinS(this->unk_330[limbIndex].y) * 200.0f;
rot->z += Math_CosS(this->unk_330[limbIndex].z) * 200.0f;
rot->y += Math_SinS(this->fidgetVec[limbIndex].y) * 200.0f;
rot->z += Math_CosS(this->fidgetVec[limbIndex].z) * 200.0f;
}
return 0;
}
void EnIn_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx) {
EnIn* this = (EnIn*)thisx;
Vec3f D_80A7B9A8 = { 1600.0, 0.0f, 0.0f };
Vec3f focusPos = { 1600.0, 0.0f, 0.0f };
OPEN_DISPS(play->state.gfxCtx, "../z_en_in.c", 2335);
if (limbIndex == INGO_LIMB_HEAD) {
Matrix_MultVec3f(&D_80A7B9A8, &this->actor.focus.pos);
Matrix_MultVec3f(&focusPos, &this->actor.focus.pos);
this->actor.focus.rot = this->actor.world.rot;
}
if (limbIndex == INGO_LIMB_LEFT_HAND && this->skelAnime.animation == &object_in_Anim_014CA8) {
if (limbIndex == INGO_LIMB_LEFT_HAND && this->skelAnime.animation == &gIngoWorkingAnim) {
gSPDisplayList(POLY_OPA_DISP++, gIngoChildEraBasketDL);
}
if (limbIndex == INGO_LIMB_RIGHT_HAND && this->skelAnime.animation == &object_in_Anim_014CA8) {
if (limbIndex == INGO_LIMB_RIGHT_HAND && this->skelAnime.animation == &gIngoWorkingAnim) {
gSPDisplayList(POLY_OPA_DISP++, gIngoChildEraPitchForkDL);
}
src/overlays/actors/ovl_En_In/z_en_in.h
+19 -7
View File
@@ -14,25 +14,37 @@ typedef struct EnIn {
/* 0x014C */ SkelAnime skelAnime;
/* 0x0190 */ EnInActionFunc actionFunc;
/* 0x0194 */ ColliderCylinder collider;
/* 0x01E0 */ f32 unk_1E0;
/* 0x01E0 */ f32 horsebackAnimFrame;
/* 0x01E4 */ s8 requiredObjectSlot;
/* 0x01E6 */ s16 animationIdx;
/* 0x01E8 */ s16 unk_1E8;
/* 0x01E6 */ s16 horsebackAnimationIdx;
/* 0x01E8 */ s16 unusedAnimationIdx;
/* 0x01EA */ s16 blinkTimer;
/* 0x01EC */ s16 unk_1EC;
/* 0x01EC */ s16 losingScreamTimer;
/* 0x01EE */ s16 eyeIndex;
/* 0x01F0 */ s16 subCamId;
/* 0x01F2 */ s16 returnToCamId;
/* 0x01F4 */ char unk_1F4[0x4];
/* 0x01F8 */ s16 unk_1F8;
/* 0x01FA */ s16 unk_1FA;
/* 0x01F8 */ s16 textState;
/* 0x01FA */ s16 prevTextState;
/* 0x01FC */ s16 unk_1FC;
/* 0x01FE */ Vec3s jointTable[INGO_LIMB_MAX];
/* 0x0276 */ Vec3s morphTable[INGO_LIMB_MAX];
/* 0x02F0 */ Vec3f subCamAtOffset;
/* 0x02FC */ Vec3f subCamEyeOffset;
/* 0x0308 */ NpcInteractInfo interactInfo;
/* 0x0330 */ Vec3s unk_330[INGO_LIMB_MAX];
/* 0x0330 */ Vec3s fidgetVec[INGO_LIMB_MAX];
} EnIn; // size = 0x03A8
typedef enum EnInHorseAnimation {
/* 0 */ ENIN_HORSE_ANIM_SLOW_RIDE,
/* 1 */ ENIN_HORSE_ANIM_SITTING_FORWARD,
/* 2 */ ENIN_HORSE_ANIM_REARING,
/* 3 */ ENIN_HORSE_ANIM_LASHING_FAST,
/* 4 */ ENIN_HORSE_ANIM_LASHING_SLOW,
/* 5 */ ENIN_HORSE_ANIM_KICKING,
/* 6 */ ENIN_HORSE_ANIM_SITTING_UPRIGHT,
/* 7 */ ENIN_HORSE_ANIM_WHOOPING,
/* 8 */ ENIN_HORSE_ANIM_MAX
} EnInHorseAnimation;
#endif