mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-12 01:40:47 +00:00
Code Issues Projects Releases Wiki Activity

Renamed EVENTCHKINF_33 (#2326)

Browse source 
* Renamed EVENTCHKINF_33

* Rename: Gave letter to King Zora
This commit is contained in:
Jordan Longstaff 2024-12-09 23:53:41 -05:00 • committed by GitHub
parent b76fe9d0b8
commit c21c3fe3da
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/overlays/actors/ovl_En_Kz/z_en_kz.c
View file

@ -74,7 +74,7 @@ u16 EnKz_GetTextIdChild(PlayState* play, EnKz* this) {
if (CHECK_QUEST_ITEM(QUEST_ZORA_SAPPHIRE)) {
return 0x402B;
} else if (GET_EVENTCHKINF(EVENTCHKINF_33)) {
} else if (GET_EVENTCHKINF(EVENTCHKINF_GAVE_LETTER_TO_KING_ZORA)) {
return 0x401C;
} else {
player->exchangeItemId = EXCH_ITEM_BOTTLE_RUTOS_LETTER;
@ -291,7 +291,7 @@ void func_80A9CB18(EnKz* this, PlayState* play) {
if (EnKz_UpdateTalking(play, &this->actor, &this->interactInfo.talkState, 340.0f, EnKz_GetTextId,
EnKz_UpdateTalkState)) {
if ((this->actor.textId == 0x401A) && !GET_EVENTCHKINF(EVENTCHKINF_33)) {
if ((this->actor.textId == 0x401A) && !GET_EVENTCHKINF(EVENTCHKINF_GAVE_LETTER_TO_KING_ZORA)) {
if (func_8002F368(play) == EXCH_ITEM_BOTTLE_RUTOS_LETTER) {
this->actor.textId = 0x401B;
this->sfxPlayed = false;
@ -389,7 +389,7 @@ void EnKz_Init(Actor* thisx, PlayState* play) {
this->interactInfo.talkState = NPC_TALK_STATE_IDLE;
Animation_ChangeByInfo(&this->skelanime, sAnimationInfo, ENKZ_ANIM_0);
if (GET_EVENTCHKINF(EVENTCHKINF_33)) {
if (GET_EVENTCHKINF(EVENTCHKINF_GAVE_LETTER_TO_KING_ZORA)) {
EnKz_SetMovedPos(this, play);
}
@ -455,7 +455,7 @@ void EnKz_Mweep(EnKz* this, PlayState* play) {
Animation_ChangeByInfo(&this->skelanime, sAnimationInfo, ENKZ_ANIM_1);
Inventory_ReplaceItem(play, ITEM_BOTTLE_RUTOS_LETTER, ITEM_BOTTLE_EMPTY);
EnKz_SetMovedPos(this, play);
SET_EVENTCHKINF(EVENTCHKINF_33);
SET_EVENTCHKINF(EVENTCHKINF_GAVE_LETTER_TO_KING_ZORA);
this->actor.speed = 0.0;
this->actionFunc = EnKz_StopMweep;
}

2
src/overlays/actors/ovl_En_Zo/z_en_zo.c
View file

@ -418,7 +418,7 @@ u16 EnZo_GetTextId(PlayState* play, Actor* thisx) {
return 0x402D;
}
if (GET_EVENTCHKINF(EVENTCHKINF_33)) {
if (GET_EVENTCHKINF(EVENTCHKINF_GAVE_LETTER_TO_KING_ZORA)) {
return 0x4010;
}
if (GET_EVENTCHKINF(EVENTCHKINF_30)) {