mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-05-10 11:03:46 +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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/z64save.h
View file

@ -499,7 +499,7 @@ typedef enum LinkAge {
#define EVENTCHKINF_30 0x30 #define EVENTCHKINF_30 0x30
#define EVENTCHKINF_31 0x31 #define EVENTCHKINF_31 0x31
#define EVENTCHKINF_32 0x32 #define EVENTCHKINF_32 0x32
#define EVENTCHKINF_33 0x33 #define EVENTCHKINF_GAVE_LETTER_TO_KING_ZORA 0x33
#define EVENTCHKINF_37 0x37 #define EVENTCHKINF_37 0x37
#define EVENTCHKINF_38 0x38 #define EVENTCHKINF_38 0x38
#define EVENTCHKINF_39 0x39 #define EVENTCHKINF_39 0x39

4
src/code/z_actor.c
View file

@ -5381,7 +5381,7 @@ u32 func_80035BFC(PlayState* play, s16 arg1) {
case 53: case 53:
if (Flags_GetEventChkInf(EVENTCHKINF_37)) { if (Flags_GetEventChkInf(EVENTCHKINF_37)) {
retTextId = 0x402D; retTextId = 0x402D;
} else if (Flags_GetEventChkInf(EVENTCHKINF_33)) { } else if (Flags_GetEventChkInf(EVENTCHKINF_GAVE_LETTER_TO_KING_ZORA)) {
retTextId = 0x4010; retTextId = 0x4010;
} else if (Flags_GetEventChkInf(EVENTCHKINF_30)) { } else if (Flags_GetEventChkInf(EVENTCHKINF_30)) {
retTextId = 0x400F; retTextId = 0x400F;
@ -5727,7 +5727,7 @@ void func_80036E50(u16 textId, s16 arg1) {
return; return;
case 55: case 55:
if (textId == 0x401B) { if (textId == 0x401B) {
Flags_SetEventChkInf(EVENTCHKINF_33); Flags_SetEventChkInf(EVENTCHKINF_GAVE_LETTER_TO_KING_ZORA);
Flags_SetInfTable(INFTABLE_138); Flags_SetInfTable(INFTABLE_138);
} }
return; return;

2
src/elf_message/elf_message_field.c
View file

@ -11,7 +11,7 @@ QuestHintCmd gOverworldNaviQuestHints[] = {
QUEST_HINT_STRENGTH_UPG(CHECK, 0, true, 0x46), QUEST_HINT_STRENGTH_UPG(CHECK, 0, true, 0x46),
QUEST_HINT_FLAG(CHECK, EVENTCHKINF_25, false, 0x47), QUEST_HINT_FLAG(CHECK, EVENTCHKINF_25, false, 0x47),
QUEST_HINT_MAGIC(CHECK, false, 0x48), QUEST_HINT_MAGIC(CHECK, false, 0x48),
QUEST_HINT_FLAG(CHECK, EVENTCHKINF_33, false, 0x49), QUEST_HINT_FLAG(CHECK, EVENTCHKINF_GAVE_LETTER_TO_KING_ZORA, false, 0x49),
QUEST_HINT_FLAG(CHECK, EVENTCHKINF_37, false, 0x4A), QUEST_HINT_FLAG(CHECK, EVENTCHKINF_37, false, 0x4A),
QUEST_HINT_FLAG(CHECK, EVENTCHKINF_80, false, 0x4B), QUEST_HINT_FLAG(CHECK, EVENTCHKINF_80, false, 0x4B),
QUEST_HINT_FLAG(CHECK, EVENTCHKINF_43, false, 0x4C), QUEST_HINT_FLAG(CHECK, EVENTCHKINF_43, false, 0x4C),

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