mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-21 14:31:17 +00:00
Code Issues Projects Releases Wiki Activity

[ntsc-1.0/1.1] Match actor changes introduced in PAL 1.0 (#2227)

Browse source
This commit is contained in:
cadmic 2024-09-25 20:11:38 -07:00 • committed by GitHub
parent 43c3971aaf
commit 19621c6a3f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
17 changed files with 202 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/overlays/actors/ovl_En_In/z_en_in.c
View file

@ -1,4 +1,5 @@
#include "z_en_in.h"
#include "versions.h"
#include "overlays/actors/ovl_En_Horse/z_en_horse.h"
#include "assets/objects/object_in/object_in.h"
@ -933,6 +934,15 @@ void EnIn_Update(Actor* thisx, PlayState* play) {
this->actionFunc(this, play);
if (this->actionFunc != func_80A7A304) {
func_80A79AB4(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);
}
#else
if ((gSaveContext.subTimerSeconds < 6) && (gSaveContext.subTimerState != SUBTIMER_STATE_OFF) &&
this->interactInfo.talkState == NPC_TALK_STATE_IDLE) {
if (Actor_TalkOfferAccepted(&this->actor, play)) {}
@ -945,6 +955,7 @@ void EnIn_Update(Actor* thisx, PlayState* play) {
this->unk_1F8 = Message_GetState(&play->msgCtx);
}
}
#endif
func_80A795C8(this, play);
}
}