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

10
src/overlays/actors/ovl_En_Go2/z_en_go2.c
View file

@ -572,7 +572,11 @@ s16 EnGo2_UpdateTalkStateGoronDmtBiggoron(PlayState* play, EnGo2* this) {
u8 dialogState = this->dialogState;
switch (EnGo2_GetDialogState(this, play)) {
#if OOT_VERSION < PAL_1_0
case TEXT_STATE_CLOSING:
#else
case TEXT_STATE_DONE:
#endif
if (this->actor.textId == 0x305E) {
if (!gSaveContext.save.info.playerData.bgsFlag) {
EnGo2_GetItem(this, play, GI_SWORD_BIGGORON);
@ -1790,7 +1794,9 @@ void EnGo2_ReverseRolling(EnGo2* this, PlayState* play) {
void EnGo2_SetupGetItem(EnGo2* this, PlayState* play) {
if (Actor_HasParent(&this->actor, play)) {
#if OOT_VERSION >= PAL_1_0
this->actor.parent = NULL;
#endif
this->actionFunc = EnGo2_SetGetItem;
} else {
Actor_OfferGetItem(&this->actor, play, this->getItemId, this->actor.xzDistToPlayer + 1.0f,
@ -1980,9 +1986,13 @@ void EnGo2_Update(Actor* thisx, PlayState* play) {
EnGo2_RollForward(this);
Actor_UpdateBgCheckInfo(play, &this->actor, this->collider.dim.height * 0.5f, this->collider.dim.radius * 0.6f,
0.0f, UPDBGCHECKINFO_FLAG_0 | UPDBGCHECKINFO_FLAG_2);
#if OOT_VERSION < PAL_1_0
func_80A44AB0(this, play);
#else
if (this->interactInfo.talkState == NPC_TALK_STATE_IDLE) {
func_80A44AB0(this, play);
}
#endif
this->actionFunc(this, play);
if (this->unk_211 == true) {
func_80034F54(play, this->unk_226, this->unk_24A, 18);