mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-05-10 19:13:42 +00:00
Code Issues Projects Releases Wiki Activity

Rename EVENTCHKINF_02 (#2322)

Browse source 
* Rename EVENTCHKINF_02

* Rename to EVENTCHKINF_MIDO_DENIED_DEKU_TREE_ACCESS
This commit is contained in:
Jordan Longstaff 2024-12-07 17:01:21 -05:00 • committed by GitHub
parent 4d902dcd95
commit 6735eb25d6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/z64save.h
View file

@ -464,7 +464,7 @@ typedef enum LinkAge {
* SaveContext.eventChkInf * SaveContext.eventChkInf
*/ */
#define EVENTCHKINF_02 0x02 #define EVENTCHKINF_MIDO_DENIED_DEKU_TREE_ACCESS 0x02
#define EVENTCHKINF_03 0x03 #define EVENTCHKINF_03 0x03
#define EVENTCHKINF_04 0x04 #define EVENTCHKINF_04 0x04
#define EVENTCHKINF_05 0x05 #define EVENTCHKINF_05 0x05

4
src/code/z_actor.c
View file

@ -4770,7 +4770,7 @@ u32 func_80035BFC(PlayState* play, s16 arg1) {
retTextId = 0x1047; retTextId = 0x1047;
} }
} else { } else {
if (Flags_GetEventChkInf(EVENTCHKINF_02)) { if (Flags_GetEventChkInf(EVENTCHKINF_MIDO_DENIED_DEKU_TREE_ACCESS)) {
if (Flags_GetInfTable(INFTABLE_03)) { if (Flags_GetInfTable(INFTABLE_03)) {
retTextId = 0x1032; retTextId = 0x1032;
} else { } else {
@ -5514,7 +5514,7 @@ void func_80036E50(u16 textId, s16 arg1) {
case 1: case 1:
switch (textId) { switch (textId) {
case 0x102F: case 0x102F:
Flags_SetEventChkInf(EVENTCHKINF_02); Flags_SetEventChkInf(EVENTCHKINF_MIDO_DENIED_DEKU_TREE_ACCESS);
Flags_SetInfTable(INFTABLE_0C); Flags_SetInfTable(INFTABLE_0C);
return; return;
case 0x1033: case 0x1033:

2
src/overlays/actors/ovl_En_Md/z_en_md.c
View file

@ -480,7 +480,7 @@ s16 EnMd_UpdateTalkState(PlayState* play, Actor* thisx) {
SET_EVENTCHKINF(EVENTCHKINF_0F); SET_EVENTCHKINF(EVENTCHKINF_0F);
break; break;
case 0x102F: case 0x102F:
SET_EVENTCHKINF(EVENTCHKINF_02); SET_EVENTCHKINF(EVENTCHKINF_MIDO_DENIED_DEKU_TREE_ACCESS);
SET_INFTABLE(INFTABLE_0C); SET_INFTABLE(INFTABLE_0C);
break; break;
case 0x1060: case 0x1060:

2
src/overlays/actors/ovl_En_Sa/z_en_sa.c
View file

@ -155,7 +155,7 @@ u16 EnSa_GetTextId(PlayState* play, Actor* thisx) {
return 0x1047; return 0x1047;
} }
} }
if (GET_EVENTCHKINF(EVENTCHKINF_02)) { if (GET_EVENTCHKINF(EVENTCHKINF_MIDO_DENIED_DEKU_TREE_ACCESS)) {
this->unk_208 = 0; this->unk_208 = 0;
this->unk_209 = TEXT_STATE_NONE; this->unk_209 = TEXT_STATE_NONE;
if (GET_INFTABLE(INFTABLE_03)) { if (GET_INFTABLE(INFTABLE_03)) {