summaryrefslogtreecommitdiff
path: root/src/code
diff options
context:
space:
mode:
authorDragorn421 <Dragorn421@users.noreply.github.com>2022-04-29 20:19:48 +0200
committerGitHub <noreply@github.com>2022-04-29 14:19:48 -0400
commit6336df5fcd26f664bc040540394ff612561a5bad (patch)
treebc752b5a7f859ecb8512952afc480da5688dcbaa /src/code
parent16790bc253c5b52b140938ef831bb699f7927d58 (diff)
Defines for `SaveContext` flags (`eventChkInf`, `itemGetInf`, `infTable`, `eventInf`) (#1094)
* script-assisted `itemGetInf` flags * comment near non-trivial `itemGetInf` usage * Run formatter * Try something with the itemgetinf flags that can't use the packed value * Add defines for `eventChkInf` (direct access) * Add defines for `eventChkInf` (access through `Flags_GetEventChkInf`) * Add defines for `eventChkInf` (access through `Flags_SetEventChkInf`) * Add defines for `infTable` (direct access) * Add defines for `infTable` (used by `Flags_GetInfTable`) * Add defines for `infTable` (used by `Flags_SetInfTable`) * Add defines for `eventInf` * parenthesis cleanup near `GET_EVENTCHKINF` usage * parenthesis cleanup near `GET_ITEMGETINF` usage * parenthesis cleanup near `GET_INFTABLE` usage * fixup one `eventInf` usage * parenthesis cleanup near `GET_EVENTINF` usage * parenthesis cleanup near `Flags_GetEventChkInf` usage * slight `z64save.h` formatting improvement * Improve itemGetInf flags in z_bg_dy_yoseizo * Questionable improvement in z_en_ge2 * Questionable improvement in z_en_daiku * Questionable improvement in z_en_mu * Run formatter * Parentheses around `gSaveContext` macros arguments * Move individual flags define to the end of z64save.h, and improve comments separating the groups
Diffstat (limited to 'src/code')
-rw-r--r--src/code/code_80097A00.c2
-rw-r--r--src/code/z_actor.c448
-rw-r--r--src/code/z_demo.c123
-rw-r--r--src/code/z_elf_message.c8
-rw-r--r--src/code/z_game_over.c2
-rw-r--r--src/code/z_horse.c32
-rw-r--r--src/code/z_kankyo.c10
-rw-r--r--src/code/z_map_data.c22
-rw-r--r--src/code/z_map_exp.c15
-rw-r--r--src/code/z_message_PAL.c12
-rw-r--r--src/code/z_parameter.c48
-rw-r--r--src/code/z_play.c2
-rw-r--r--src/code/z_scene_table.c4
-rw-r--r--src/code/z_sram.c12
14 files changed, 397 insertions, 343 deletions
diff --git a/src/code/code_80097A00.c b/src/code/code_80097A00.c
index 26f1cb9e9..f60924fbb 100644
--- a/src/code/code_80097A00.c
+++ b/src/code/code_80097A00.c
@@ -208,7 +208,7 @@ u8 Inventory_DeleteEquipment(GlobalContext* globalCtx, s16 equipment) {
if (equipment == EQUIP_SWORD) {
gSaveContext.equips.buttonItems[0] = ITEM_NONE;
- gSaveContext.infTable[29] = 1;
+ gSaveContext.infTable[INFTABLE_1DX_INDEX] = 1;
}
Player_SetEquipmentData(globalCtx, player);
diff --git a/src/code/z_actor.c b/src/code/z_actor.c
index f56105179..c5cc77421 100644
--- a/src/code/z_actor.c
+++ b/src/code/z_actor.c
@@ -4199,28 +4199,28 @@ void func_80035B18(GlobalContext* globalCtx, Actor* actor, u16 textId) {
* Tests if event_chk_inf flag is set.
*/
s32 Flags_GetEventChkInf(s32 flag) {
- return gSaveContext.eventChkInf[flag >> 4] & (1 << (flag & 0xF));
+ return GET_EVENTCHKINF(flag);
}
/**
* Sets event_chk_inf flag.
*/
void Flags_SetEventChkInf(s32 flag) {
- gSaveContext.eventChkInf[flag >> 4] |= (1 << (flag & 0xF));
+ SET_EVENTCHKINF(flag);
}
/**
* Tests if "inf_table flag is set.
*/
s32 Flags_GetInfTable(s32 flag) {
- return gSaveContext.infTable[flag >> 4] & (1 << (flag & 0xF));
+ return GET_INFTABLE(flag);
}
/**
* Sets "inf_table" flag.
*/
void Flags_SetInfTable(s32 flag) {
- gSaveContext.infTable[flag >> 4] |= (1 << (flag & 0xF));
+ SET_INFTABLE(flag);
}
u32 func_80035BFC(GlobalContext* globalCtx, s16 arg1) {
@@ -4228,22 +4228,22 @@ u32 func_80035BFC(GlobalContext* globalCtx, s16 arg1) {
switch (arg1) {
case 0:
- if (Flags_GetEventChkInf(0x9)) {
- if (Flags_GetInfTable(0x5)) {
+ if (Flags_GetEventChkInf(EVENTCHKINF_09)) {
+ if (Flags_GetInfTable(INFTABLE_05)) {
retTextId = 0x1048;
} else {
retTextId = 0x1047;
}
} else {
- if (Flags_GetEventChkInf(0x2)) {
- if (Flags_GetInfTable(0x3)) {
+ if (Flags_GetEventChkInf(EVENTCHKINF_02)) {
+ if (Flags_GetInfTable(INFTABLE_03)) {
retTextId = 0x1032;
} else {
retTextId = 0x1031;
}
} else {
- if (Flags_GetInfTable(0x0)) {
- if (Flags_GetInfTable(0x1)) {
+ if (Flags_GetInfTable(INFTABLE_00)) {
+ if (Flags_GetInfTable(INFTABLE_01)) {
retTextId = 0x1003;
} else {
retTextId = 0x1002;
@@ -4256,21 +4256,21 @@ u32 func_80035BFC(GlobalContext* globalCtx, s16 arg1) {
break;
case 1:
if (!LINK_IS_ADULT) {
- if (Flags_GetEventChkInf(0x9)) {
- if (Flags_GetInfTable(0x10)) {
+ if (Flags_GetEventChkInf(EVENTCHKINF_09)) {
+ if (Flags_GetInfTable(INFTABLE_10)) {
retTextId = 0x1046;
} else {
retTextId = 0x1045;
}
} else {
- if (Flags_GetEventChkInf(0x3)) {
- if (Flags_GetInfTable(0xE)) {
+ if (Flags_GetEventChkInf(EVENTCHKINF_03)) {
+ if (Flags_GetInfTable(INFTABLE_0E)) {
retTextId = 0x1034;
} else {
retTextId = 0x1033;
}
} else {
- if (Flags_GetInfTable(0xC)) {
+ if (Flags_GetInfTable(INFTABLE_0C)) {
retTextId = 0x1030;
} else {
retTextId = 0x102F;
@@ -4278,21 +4278,21 @@ u32 func_80035BFC(GlobalContext* globalCtx, s16 arg1) {
}
}
} else {
- if (Flags_GetEventChkInf(0x5C)) {
- if (Flags_GetInfTable(0x19)) {
+ if (Flags_GetEventChkInf(EVENTCHKINF_5C)) {
+ if (Flags_GetInfTable(INFTABLE_19)) {
retTextId = 0x1071;
} else {
retTextId = 0x1070;
}
} else {
- if (Flags_GetEventChkInf(0xB)) {
- if (Flags_GetInfTable(0x17)) {
+ if (Flags_GetEventChkInf(EVENTCHKINF_0B)) {
+ if (Flags_GetInfTable(INFTABLE_17)) {
retTextId = 0x1068;
} else {
retTextId = 0x1067;
}
} else {
- if (Flags_GetInfTable(0x15)) {
+ if (Flags_GetInfTable(INFTABLE_15)) {
retTextId = 0x1061;
} else {
retTextId = 0x1060;
@@ -4303,15 +4303,15 @@ u32 func_80035BFC(GlobalContext* globalCtx, s16 arg1) {
break;
case 2:
if (!LINK_IS_ADULT) {
- if (Flags_GetEventChkInf(0x9)) {
+ if (Flags_GetEventChkInf(EVENTCHKINF_09)) {
retTextId = 0x1042;
} else {
retTextId = 0x1004;
}
} else {
- if (Flags_GetEventChkInf(0x5C)) {
+ if (Flags_GetEventChkInf(EVENTCHKINF_5C)) {
retTextId = 0x1072;
- } else if (Flags_GetInfTable(0x41)) {
+ } else if (Flags_GetInfTable(INFTABLE_41)) {
retTextId = 0x1055;
} else {
retTextId = 0x1056;
@@ -4320,17 +4320,17 @@ u32 func_80035BFC(GlobalContext* globalCtx, s16 arg1) {
break;
case 3:
if (!LINK_IS_ADULT) {
- if (Flags_GetEventChkInf(0x9)) {
+ if (Flags_GetEventChkInf(EVENTCHKINF_09)) {
retTextId = 0x1043;
} else {
- if (Flags_GetInfTable(0x1E)) {
+ if (Flags_GetInfTable(INFTABLE_1E)) {
retTextId = 0x1006;
} else {
retTextId = 0x1005;
}
}
} else {
- if (Flags_GetEventChkInf(0x5C)) {
+ if (Flags_GetEventChkInf(EVENTCHKINF_5C)) {
retTextId = 0x1073;
} else {
retTextId = 0x105A;
@@ -4339,15 +4339,15 @@ u32 func_80035BFC(GlobalContext* globalCtx, s16 arg1) {
break;
case 4:
if (!LINK_IS_ADULT) {
- if (Flags_GetEventChkInf(0x9)) {
+ if (Flags_GetEventChkInf(EVENTCHKINF_09)) {
retTextId = 0x1042;
} else {
retTextId = 0x1007;
}
} else {
- if (Flags_GetEventChkInf(0x5C)) {
+ if (Flags_GetEventChkInf(EVENTCHKINF_5C)) {
retTextId = 0x1072;
- } else if (Flags_GetInfTable(0x47)) {
+ } else if (Flags_GetInfTable(INFTABLE_47)) {
retTextId = 0x105E;
} else {
retTextId = 0x105D;
@@ -4356,15 +4356,15 @@ u32 func_80035BFC(GlobalContext* globalCtx, s16 arg1) {
break;
case 5:
if (!LINK_IS_ADULT) {
- if (Flags_GetEventChkInf(0x9)) {
+ if (Flags_GetEventChkInf(EVENTCHKINF_09)) {
retTextId = 0x1044;
- } else if (Flags_GetInfTable(0x22)) {
+ } else if (Flags_GetInfTable(INFTABLE_22)) {
retTextId = 0x1009;
} else {
retTextId = 0x1008;
}
} else {
- if (Flags_GetEventChkInf(0x5C)) {
+ if (Flags_GetEventChkInf(EVENTCHKINF_5C)) {
retTextId = 0x1075;
} else {
retTextId = 0x105B;
@@ -4373,15 +4373,15 @@ u32 func_80035BFC(GlobalContext* globalCtx, s16 arg1) {
break;
case 6:
if (!LINK_IS_ADULT) {
- if (Flags_GetEventChkInf(0x9)) {
+ if (Flags_GetEventChkInf(EVENTCHKINF_09)) {
retTextId = 0x1042;
- } else if (Flags_GetInfTable(0x24)) {
+ } else if (Flags_GetInfTable(INFTABLE_24)) {
retTextId = 0x100B;
} else {
retTextId = 0x100A;
}
} else {
- if (Flags_GetEventChkInf(0x5C)) {
+ if (Flags_GetEventChkInf(EVENTCHKINF_5C)) {
retTextId = 0x1056;
} else {
retTextId = 0x105F;
@@ -4390,15 +4390,15 @@ u32 func_80035BFC(GlobalContext* globalCtx, s16 arg1) {
break;
case 7:
if (!LINK_IS_ADULT) {
- if (Flags_GetEventChkInf(0x9)) {
+ if (Flags_GetEventChkInf(EVENTCHKINF_09)) {
retTextId = 0x1043;
- } else if (Flags_GetInfTable(0x26)) {
+ } else if (Flags_GetInfTable(INFTABLE_26)) {
retTextId = 0x100D;
} else {
retTextId = 0x100C;
}
} else {
- if (Flags_GetEventChkInf(0x5C)) {
+ if (Flags_GetEventChkInf(EVENTCHKINF_5C)) {
retTextId = 0x1057;
} else {
retTextId = 0x1057;
@@ -4407,17 +4407,17 @@ u32 func_80035BFC(GlobalContext* globalCtx, s16 arg1) {
break;
case 8:
if (!LINK_IS_ADULT) {
- if (Flags_GetEventChkInf(0x9)) {
+ if (Flags_GetEventChkInf(EVENTCHKINF_09)) {
retTextId = 0x1043;
- } else if (Flags_GetInfTable(0x28)) {
+ } else if (Flags_GetInfTable(INFTABLE_28)) {
retTextId = 0x1019;
} else {
retTextId = 0x100E;
}
} else {
- if (Flags_GetEventChkInf(0x5C)) {
+ if (Flags_GetEventChkInf(EVENTCHKINF_5C)) {
retTextId = 0x1077;
- } else if (Flags_GetInfTable(0x51)) {
+ } else if (Flags_GetInfTable(INFTABLE_51)) {
retTextId = 0x1058;
} else {
retTextId = 0x1059;
@@ -4426,13 +4426,13 @@ u32 func_80035BFC(GlobalContext* globalCtx, s16 arg1) {
break;
case 9:
if (!LINK_IS_ADULT) {
- if (Flags_GetEventChkInf(0x9)) {
+ if (Flags_GetEventChkInf(EVENTCHKINF_09)) {
retTextId = 0x1049;
} else {
retTextId = 0x1035;
}
} else {
- if (Flags_GetEventChkInf(0x5C)) {
+ if (Flags_GetEventChkInf(EVENTCHKINF_5C)) {
retTextId = 0x1079;
} else {
retTextId = 0x104E;
@@ -4441,15 +4441,15 @@ u32 func_80035BFC(GlobalContext* globalCtx, s16 arg1) {
break;
case 10:
if (!LINK_IS_ADULT) {
- if (Flags_GetEventChkInf(0x9)) {
+ if (Flags_GetEventChkInf(EVENTCHKINF_09)) {
retTextId = 0x104A;
} else {
retTextId = 0x1038;
}
} else {
- if (Flags_GetEventChkInf(0x5C)) {
+ if (Flags_GetEventChkInf(EVENTCHKINF_5C)) {
retTextId = 0x1079;
- } else if (Flags_GetInfTable(0x59)) {
+ } else if (Flags_GetInfTable(INFTABLE_59)) {
retTextId = 0x1050;
} else {
retTextId = 0x104F;
@@ -4458,13 +4458,13 @@ u32 func_80035BFC(GlobalContext* globalCtx, s16 arg1) {
break;
case 11:
if (!LINK_IS_ADULT) {
- if (Flags_GetEventChkInf(0x9)) {
+ if (Flags_GetEventChkInf(EVENTCHKINF_09)) {
retTextId = 0x104B;
} else {
retTextId = 0x103C;
}
} else {
- if (Flags_GetEventChkInf(0x5C)) {
+ if (Flags_GetEventChkInf(EVENTCHKINF_5C)) {
retTextId = 0x107B;
} else {
retTextId = 0x1051;
@@ -4473,13 +4473,13 @@ u32 func_80035BFC(GlobalContext* globalCtx, s16 arg1) {
break;
case 12:
if (!LINK_IS_ADULT) {
- if (Flags_GetEventChkInf(0x9)) {
+ if (Flags_GetEventChkInf(EVENTCHKINF_09)) {
retTextId = 0x104C;
} else {
retTextId = 0x103D;
}
} else {
- if (Flags_GetEventChkInf(0x5C)) {
+ if (Flags_GetEventChkInf(EVENTCHKINF_5C)) {
retTextId = 0x107C;
} else {
retTextId = 0x1052;
@@ -4488,15 +4488,15 @@ u32 func_80035BFC(GlobalContext* globalCtx, s16 arg1) {
break;
case 13:
if (!LINK_IS_ADULT) {
- if (Flags_GetEventChkInf(0x9)) {
+ if (Flags_GetEventChkInf(EVENTCHKINF_09)) {
retTextId = 0x104D;
} else {
retTextId = 0x103E;
}
} else {
- if (Flags_GetEventChkInf(0x5C)) {
+ if (Flags_GetEventChkInf(EVENTCHKINF_5C)) {
retTextId = 0x106E;
- } else if (Flags_GetInfTable(0x61)) {
+ } else if (Flags_GetInfTable(INFTABLE_61)) {
retTextId = 0x1053;
} else {
retTextId = 0x1054;
@@ -4504,9 +4504,9 @@ u32 func_80035BFC(GlobalContext* globalCtx, s16 arg1) {
}
break;
case 15:
- if (Flags_GetEventChkInf(0x5C)) {
+ if (Flags_GetEventChkInf(EVENTCHKINF_5C)) {
retTextId = 0x1078;
- } else if (Flags_GetInfTable(0x66)) {
+ } else if (Flags_GetInfTable(INFTABLE_66)) {
retTextId = 0x1066;
} else {
retTextId = 0x1062;
@@ -4515,7 +4515,7 @@ u32 func_80035BFC(GlobalContext* globalCtx, s16 arg1) {
case 16:
if (globalCtx->sceneNum == SCENE_SPOT15) {
retTextId = 0x7002;
- } else if (Flags_GetInfTable(0x6A)) {
+ } else if (Flags_GetInfTable(INFTABLE_6A)) {
retTextId = 0x7004;
} else if ((gSaveContext.dayTime >= 0x4000) && (gSaveContext.dayTime < 0xC556)) {
retTextId = 0x7002;
@@ -4524,8 +4524,9 @@ u32 func_80035BFC(GlobalContext* globalCtx, s16 arg1) {
}
break;
case 17:
- if (Flags_GetEventChkInf(0x9) && Flags_GetEventChkInf(0x25) && Flags_GetEventChkInf(0x37)) {
- if (Flags_GetInfTable(0x6C)) {
+ if (Flags_GetEventChkInf(EVENTCHKINF_09) && Flags_GetEventChkInf(EVENTCHKINF_25) &&
+ Flags_GetEventChkInf(EVENTCHKINF_37)) {
+ if (Flags_GetInfTable(INFTABLE_6C)) {
retTextId = 0x7008;
} else {
retTextId = 0x7007;
@@ -4538,11 +4539,12 @@ u32 func_80035BFC(GlobalContext* globalCtx, s16 arg1) {
retTextId = 0x702D;
break;
case 18:
- if (Flags_GetEventChkInf(0x9) && Flags_GetEventChkInf(0x25) && Flags_GetEventChkInf(0x37)) {
+ if (Flags_GetEventChkInf(EVENTCHKINF_09) && Flags_GetEventChkInf(EVENTCHKINF_25) &&
+ Flags_GetEventChkInf(EVENTCHKINF_37)) {
retTextId = 0x7006;
} else {
- if (Flags_GetEventChkInf(0x12)) {
- if (Flags_GetInfTable(0x71)) {
+ if (Flags_GetEventChkInf(EVENTCHKINF_12)) {
+ if (Flags_GetInfTable(INFTABLE_71)) {
retTextId = 0x7072;
} else {
retTextId = 0x7071;
@@ -4554,50 +4556,54 @@ u32 func_80035BFC(GlobalContext* globalCtx, s16 arg1) {
break;
case 20:
case 21:
- if (Flags_GetEventChkInf(0x42)) {
+ if (Flags_GetEventChkInf(EVENTCHKINF_42)) {
retTextId = 0x2012;
- } else if (Flags_GetEventChkInf(0x41)) {
- if (Flags_GetInfTable(0x76)) {
+ } else if (Flags_GetEventChkInf(EVENTCHKINF_41)) {
+ if (Flags_GetInfTable(INFTABLE_76)) {
retTextId = 0x2011;
} else {
retTextId = 0x2010;
}
- } else if (Flags_GetEventChkInf(0x40)) {
+ } else if (Flags_GetEventChkInf(EVENTCHKINF_40)) {
retTextId = 0x200F;
} else {
retTextId = 0x200E;
}
break;
case 24:
- if (Flags_GetEventChkInf(0x9) && Flags_GetEventChkInf(0x25) && Flags_GetEventChkInf(0x37)) {
+ if (Flags_GetEventChkInf(EVENTCHKINF_09) && Flags_GetEventChkInf(EVENTCHKINF_25) &&
+ Flags_GetEventChkInf(EVENTCHKINF_37)) {
retTextId = 0x7044;
} else {
retTextId = 0x7015;
}
break;
case 25:
- if (Flags_GetEventChkInf(0x9) && Flags_GetEventChkInf(0x25) && Flags_GetEventChkInf(0x37)) {
+ if (Flags_GetEventChkInf(EVENTCHKINF_09) && Flags_GetEventChkInf(EVENTCHKINF_25) &&
+ Flags_GetEventChkInf(EVENTCHKINF_37)) {
retTextId = 0x7045;
} else {
- Flags_GetInfTable(0xC2);
+ Flags_GetInfTable(INFTABLE_C2);
retTextId = 0x7016;
}
break;
case 26:
- if (Flags_GetEventChkInf(0x9) && Flags_GetEventChkInf(0x25) && Flags_GetEventChkInf(0x37)) {
+ if (Flags_GetEventChkInf(EVENTCHKINF_09) && Flags_GetEventChkInf(EVENTCHKINF_25) &&
+ Flags_GetEventChkInf(EVENTCHKINF_37)) {
retTextId = 0x7046;
} else {
- Flags_GetInfTable(0xC2);
+ Flags_GetInfTable(INFTABLE_C2);
retTextId = 0x7018;
}
break;
case 27:
- if (Flags_GetEventChkInf(0x9) && Flags_GetEventChkInf(0x25) && Flags_GetEventChkInf(0x37)) {
+ if (Flags_GetEventChkInf(EVENTCHKINF_09) && Flags_GetEventChkInf(EVENTCHKINF_25) &&
+ Flags_GetEventChkInf(EVENTCHKINF_37)) {
retTextId = 0x7047;
- } else if (Flags_GetEventChkInf(0x14)) {
+ } else if (Flags_GetEventChkInf(EVENTCHKINF_14)) {
retTextId = 0x701A;
- } else if (Flags_GetEventChkInf(0x11)) {
- if (Flags_GetInfTable(0xC6)) {
+ } else if (Flags_GetEventChkInf(EVENTCHKINF_11)) {
+ if (Flags_GetInfTable(INFTABLE_C6)) {
retTextId = 0x701C;
} else {
retTextId = 0x701B;
@@ -4607,59 +4613,65 @@ u32 func_80035BFC(GlobalContext* globalCtx, s16 arg1) {
}
break;
case 28:
- if (Flags_GetEventChkInf(0x9) && Flags_GetEventChkInf(0x25) && Flags_GetEventChkInf(0x37)) {
+ if (Flags_GetEventChkInf(EVENTCHKINF_09) && Flags_GetEventChkInf(EVENTCHKINF_25) &&
+ Flags_GetEventChkInf(EVENTCHKINF_37)) {
retTextId = 0x7048;
} else {
- Flags_GetInfTable(0xCA);
+ Flags_GetInfTable(INFTABLE_CA);
retTextId = 0x701D;
}
break;
case 29:
- if (Flags_GetEventChkInf(0x9) && Flags_GetEventChkInf(0x25) && Flags_GetEventChkInf(0x37)) {
+ if (Flags_GetEventChkInf(EVENTCHKINF_09) && Flags_GetEventChkInf(EVENTCHKINF_25) &&
+ Flags_GetEventChkInf(EVENTCHKINF_37)) {
retTextId = 0x7049;
} else {
- Flags_GetInfTable(0xCC);
+ Flags_GetInfTable(INFTABLE_CC);
retTextId = 0x701F;
}
break;
case 30:
- if (Flags_GetEventChkInf(0x9) && Flags_GetEventChkInf(0x25) && Flags_GetEventChkInf(0x37)) {
+ if (Flags_GetEventChkInf(EVENTCHKINF_09) && Flags_GetEventChkInf(EVENTCHKINF_25) &&
+ Flags_GetEventChkInf(EVENTCHKINF_37)) {
retTextId = 0x704A;
} else {
- Flags_GetInfTable(0xCE);
+ Flags_GetInfTable(INFTABLE_CE);
retTextId = 0x7021;
}
break;
case 31:
- if (Flags_GetEventChkInf(0x9) && Flags_GetEventChkInf(0x25) && Flags_GetEventChkInf(0x37)) {
+ if (Flags_GetEventChkInf(EVENTCHKINF_09) && Flags_GetEventChkInf(EVENTCHKINF_25) &&
+ Flags_GetEventChkInf(EVENTCHKINF_37)) {
retTextId = 0x704B;
} else {
- Flags_GetInfTable(0xD0);
+ Flags_GetInfTable(INFTABLE_D0);
retTextId = 0x7023;
}
break;
case 32:
- if (Flags_GetEventChkInf(0x9) && Flags_GetEventChkInf(0x25) && Flags_GetEventChkInf(0x37)) {
+ if (Flags_GetEventChkInf(EVENTCHKINF_09) && Flags_GetEventChkInf(EVENTCHKINF_25) &&
+ Flags_GetEventChkInf(EVENTCHKINF_37)) {
retTextId = 0x704C;
} else {
- Flags_GetInfTable(0xD2);
+ Flags_GetInfTable(INFTABLE_D2);
retTextId = 0x7025;
}
break;
case 33:
- if (Flags_GetEventChkInf(0x9) && Flags_GetEventChkInf(0x25) && Flags_GetEventChkInf(0x37)) {
+ if (Flags_GetEventChkInf(EVENTCHKINF_09) && Flags_GetEventChkInf(EVENTCHKINF_25) &&
+ Flags_GetEventChkInf(EVENTCHKINF_37)) {
retTextId = 0x704D;
} else {
- Flags_GetInfTable(0xD4);
+ Flags_GetInfTable(INFTABLE_D4);
retTextId = 0x7027;
}
break;
case 34:
- Flags_GetInfTable(0xD6);
+ Flags_GetInfTable(INFTABLE_D6);
retTextId = 0x403C;
break;
case 35:
- if (Flags_GetInfTable(0xD8)) {
+ if (Flags_GetInfTable(INFTABLE_D8)) {
retTextId = 0x5029;
} else {
retTextId = 0x5028;
@@ -4670,17 +4682,17 @@ u32 func_80035BFC(GlobalContext* globalCtx, s16 arg1) {
break;
case 38:
if (!LINK_IS_ADULT) {
- if (Flags_GetEventChkInf(0x25)) {
+ if (Flags_GetEventChkInf(EVENTCHKINF_25)) {
retTextId = 0x3027;
- } else if (Flags_GetEventChkInf(0x23)) {
+ } else if (Flags_GetEventChkInf(EVENTCHKINF_23)) {
retTextId = 0x3021;
- } else if (Flags_GetInfTable(0xE0)) {
+ } else if (Flags_GetInfTable(INFTABLE_E0)) {
retTextId = 0x302A;
} else {
retTextId = 0x3008;
}
} else {
- if (Flags_GetEventChkInf(0x20)) {
+ if (Flags_GetEventChkInf(EVENTCHKINF_20)) {
retTextId = 0x4043;
} else {
retTextId = 0x302A;
@@ -4689,15 +4701,15 @@ u32 func_80035BFC(GlobalContext* globalCtx, s16 arg1) {
break;
case 39:
if (!LINK_IS_ADULT) {
- if (Flags_GetEventChkInf(0x25)) {
+ if (Flags_GetEventChkInf(EVENTCHKINF_25)) {
retTextId = 0x3027;
- } else if (Flags_GetEventChkInf(0x23)) {
+ } else if (Flags_GetEventChkInf(EVENTCHKINF_23)) {
retTextId = 0x3026;
} else {
retTextId = 0x3009;
}
} else {
- if (Flags_GetEventChkInf(0x2A)) {
+ if (Flags_GetEventChkInf(EVENTCHKINF_2A)) {
retTextId = 0x4043;
} else {
retTextId = 0x302A;
@@ -4706,17 +4718,17 @@ u32 func_80035BFC(GlobalContext* globalCtx, s16 arg1) {
break;
case 40:
if (!LINK_IS_ADULT) {
- if (Flags_GetEventChkInf(0x25)) {
+ if (Flags_GetEventChkInf(EVENTCHKINF_25)) {
retTextId = 0x3027;
- } else if (Flags_GetEventChkInf(0x23)) {
+ } else if (Flags_GetEventChkInf(EVENTCHKINF_23)) {
retTextId = 0x3026;
- } else if (Flags_GetInfTable(0xEB)) {
+ } else if (Flags_GetInfTable(INFTABLE_EB)) {
retTextId = 0x302B;
} else {
retTextId = 0x300A;
}
} else {
- if (Flags_GetEventChkInf(0x2B)) {
+ if (Flags_GetEventChkInf(EVENTCHKINF_2B)) {
retTextId = 0x4043;
} else {
retTextId = 0x302A;
@@ -4725,15 +4737,15 @@ u32 func_80035BFC(GlobalContext* globalCtx, s16 arg1) {
break;
case 41:
if (!LINK_IS_ADULT) {
- if (Flags_GetEventChkInf(0x25)) {
+ if (Flags_GetEventChkInf(EVENTCHKINF_25)) {
retTextId = 0x3027;
- } else if (Flags_GetInfTable(0xF0)) {
+ } else if (Flags_GetInfTable(INFTABLE_F0)) {
retTextId = 0x3015;
} else {
retTextId = 0x3014;
}
} else {
- if (Flags_GetEventChkInf(0x2C)) {
+ if (Flags_GetEventChkInf(EVENTCHKINF_2C)) {
retTextId = 0x4043;
} else {
retTextId = 0x302A;
@@ -4742,15 +4754,15 @@ u32 func_80035BFC(GlobalContext* globalCtx, s16 arg1) {
break;
case 42:
if (!LINK_IS_ADULT) {
- if (Flags_GetEventChkInf(0x25)) {
+ if (Flags_GetEventChkInf(EVENTCHKINF_25)) {
retTextId = 0x3027;
- } else if (Flags_GetInfTable(0xF4)) {
+ } else if (Flags_GetInfTable(INFTABLE_F4)) {
retTextId = 0x3017;
} else {
retTextId = 0x3016;
}
} else {
- if (Flags_GetEventChkInf(0x2C)) {
+ if (Flags_GetEventChkInf(EVENTCHKINF_2C)) {
retTextId = 0x4043;
} else {
retTextId = 0x302A;
@@ -4759,15 +4771,15 @@ u32 func_80035BFC(GlobalContext* globalCtx, s16 arg1) {
break;
case 43:
if (!LINK_IS_ADULT) {
- if (Flags_GetEventChkInf(0x25)) {
+ if (Flags_GetEventChkInf(EVENTCHKINF_25)) {
retTextId = 0x3027;
- } else if (Flags_GetInfTable(0xF8)) {
+ } else if (Flags_GetInfTable(INFTABLE_F8)) {
retTextId = 0x3019;
} else {
retTextId = 0x3018;
}
} else {
- if (Flags_GetEventChkInf(0x2D)) {
+ if (Flags_GetEventChkInf(EVENTCHKINF_2D)) {
retTextId = 0x4043;
} else {
retTextId = 0x302A;
@@ -4775,28 +4787,28 @@ u32 func_80035BFC(GlobalContext* globalCtx, s16 arg1) {
}
break;
case 48:
- if (Flags_GetEventChkInf(0x25)) {
+ if (Flags_GetEventChkInf(EVENTCHKINF_25)) {
retTextId = 0x3029;
- } else if (Flags_GetEventChkInf(0x20) && Flags_GetEventChkInf(0x21)) {
+ } else if (Flags_GetEventChkInf(EVENTCHKINF_20) && Flags_GetEventChkInf(EVENTCHKINF_21)) {
retTextId = 0x301B;
} else {
retTextId = 0x301A;
}
break;
case 49:
- if (Flags_GetEventChkInf(0x37)) {
+ if (Flags_GetEventChkInf(EVENTCHKINF_37)) {
retTextId = 0x402D;
- } else if (Flags_GetEventChkInf(0x30)) {
+ } else if (Flags_GetEventChkInf(EVENTCHKINF_30)) {
retTextId = 0x4007;
} else {
retTextId = 0x4006;
}
break;
case 50:
- if (Flags_GetEventChkInf(0x37)) {
+ if (Flags_GetEventChkInf(EVENTCHKINF_37)) {
retTextId = 0x402E;
- } else if (Flags_GetEventChkInf(0x30)) {
- if (Flags_GetInfTable(0x124)) {
+ } else if (Flags_GetEventChkInf(EVENTCHKINF_30)) {
+ if (Flags_GetInfTable(INFTABLE_124)) {
retTextId = 0x4009;
} else {
retTextId = 0x4008;
@@ -4806,44 +4818,44 @@ u32 func_80035BFC(GlobalContext* globalCtx, s16 arg1) {
}
break;
case 51:
- if (Flags_GetEventChkInf(0x37)) {
+ if (Flags_GetEventChkInf(EVENTCHKINF_37)) {
retTextId = 0x402D;
- } else if (Flags_GetEventChkInf(0x31)) {
- if (Flags_GetInfTable(0x12A)) {
+ } else if (Flags_GetEventChkInf(EVENTCHKINF_31)) {
+ if (Flags_GetInfTable(INFTABLE_12A)) {
retTextId = 0x400B;
} else {
retTextId = 0x402F;
}
- } else if (Flags_GetEventChkInf(0x30)) {
+ } else if (Flags_GetEventChkInf(EVENTCHKINF_30)) {
retTextId = 0x400A;
} else {
retTextId = 0x4006;
}
break;
case 52:
- if (Flags_GetEventChkInf(0x37)) {
+ if (Flags_GetEventChkInf(EVENTCHKINF_37)) {
retTextId = 0x402E;
- } else if (Flags_GetEventChkInf(0x30)) {
+ } else if (Flags_GetEventChkInf(EVENTCHKINF_30)) {
retTextId = 0x400C;
} else {
retTextId = 0x4006;
}
break;
case 53:
- if (Flags_GetEventChkInf(0x37)) {
+ if (Flags_GetEventChkInf(EVENTCHKINF_37)) {
retTextId = 0x402D;
- } else if (Flags_GetEventChkInf(0x33)) {
+ } else if (Flags_GetEventChkInf(EVENTCHKINF_33)) {
retTextId = 0x4010;
- } else if (Flags_GetEventChkInf(0x30)) {
+ } else if (Flags_GetEventChkInf(EVENTCHKINF_30)) {
retTextId = 0x400F;
} else {
retTextId = 0x4006;
}
break;
case 54:
- if (Flags_GetEventChkInf(0x37)) {
+ if (Flags_GetEventChkInf(EVENTCHKINF_37)) {
retTextId = 0x402E;
- } else if (Flags_GetEventChkInf(0x30)) {
+ } else if (Flags_GetEventChkInf(EVENTCHKINF_30)) {
retTextId = 0x4011;
} else {
retTextId = 0x4006;
@@ -4851,10 +4863,10 @@ u32 func_80035BFC(GlobalContext* globalCtx, s16 arg1) {
break;
case 55:
if (!LINK_IS_ADULT) {
- if (Flags_GetEventChkInf(0x37)) {
+ if (Flags_GetEventChkInf(EVENTCHKINF_37)) {
retTextId = 0x402B;
- } else if (Flags_GetEventChkInf(0x31)) {
- if (Flags_GetInfTable(0x138)) {
+ } else if (Flags_GetEventChkInf(EVENTCHKINF_31)) {
+ if (Flags_GetInfTable(INFTABLE_138)) {
retTextId = 0x401C;
} else {
retTextId = 0x401B;
@@ -4876,7 +4888,7 @@ u32 func_80035BFC(GlobalContext* globalCtx, s16 arg1) {
retTextId = 0x5012;
break;
case 61:
- if (Flags_GetInfTable(0x166)) {
+ if (Flags_GetInfTable(INFTABLE_166)) {
retTextId = 0x5001;
} else {
retTextId = 0x5000;
@@ -4886,23 +4898,23 @@ u32 func_80035BFC(GlobalContext* globalCtx, s16 arg1) {
retTextId = 0x5012;
break;
case 63:
- if (Flags_GetInfTable(0x16A)) {
+ if (Flags_GetInfTable(INFTABLE_16A)) {
retTextId = 0x5001;
} else {
retTextId = 0x5000;
}
break;
case 71:
- if (Flags_GetEventChkInf(0x16)) {
+ if (Flags_GetEventChkInf(EVENTCHKINF_16)) {
retTextId = 0x2049;
- } else if (Flags_GetEventChkInf(0x15)) {
+ } else if (Flags_GetEventChkInf(EVENTCHKINF_15)) {
retTextId = 0x2048;
- } else if (Flags_GetEventChkInf(0x14)) {
+ } else if (Flags_GetEventChkInf(EVENTCHKINF_14)) {
retTextId = 0x2047;
- } else if (Flags_GetEventChkInf(0x12) && !Flags_GetEventChkInf(0x14)) {
+ } else if (Flags_GetEventChkInf(EVENTCHKINF_12) && !Flags_GetEventChkInf(EVENTCHKINF_14)) {
retTextId = 0x2044;
- } else if (Flags_GetEventChkInf(0x10)) {
- if (Flags_GetEventChkInf(0x11)) {
+ } else if (Flags_GetEventChkInf(EVENTCHKINF_10)) {
+ if (Flags_GetEventChkInf(EVENTCHKINF_11)) {
retTextId = 0x2043;
} else {
retTextId = 0x2042;
@@ -4913,18 +4925,18 @@ u32 func_80035BFC(GlobalContext* globalCtx, s16 arg1) {
break;
case 72:
if (!LINK_IS_ADULT) {
- if (Flags_GetEventChkInf(0x14)) {
+ if (Flags_GetEventChkInf(EVENTCHKINF_14)) {
retTextId = 0x2040;
- } else if (Flags_GetInfTable(0x94)) {
+ } else if (Flags_GetInfTable(INFTABLE_94)) {
retTextId = 0x2040;
} else {
retTextId = 0x203F;
}
} else {
- if (!Flags_GetEventChkInf(0x18)) {
+ if (!Flags_GetEventChkInf(EVENTCHKINF_18)) {
if (!IS_DAY) {
retTextId = 0x204E;
- } else if (Flags_GetInfTable(0x9A)) {
+ } else if (Flags_GetInfTable(INFTABLE_9A)) {
retTextId = 0x2031;
} else {
retTextId = 0x2030;
@@ -4948,204 +4960,204 @@ void func_80036E50(u16 textId, s16 arg1) {
case 0:
switch (textId) {
case 0x1001:
- Flags_SetInfTable(0x0);
+ Flags_SetInfTable(INFTABLE_00);
return;
case 0x1002:
- Flags_SetInfTable(0x1);
+ Flags_SetInfTable(INFTABLE_01);
return;
case 0x1031:
- Flags_SetEventChkInf(0x3);
- Flags_SetInfTable(0x3);
+ Flags_SetEventChkInf(EVENTCHKINF_03);
+ Flags_SetInfTable(INFTABLE_03);
return;
case 0x1047:
- Flags_SetInfTable(0x5);
+ Flags_SetInfTable(INFTABLE_05);
return;
}
return;
case 1:
switch (textId) {
case 0x102F:
- Flags_SetEventChkInf(0x2);
- Flags_SetInfTable(0xC);
+ Flags_SetEventChkInf(EVENTCHKINF_02);
+ Flags_SetInfTable(INFTABLE_0C);
return;
case 0x1033:
Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
&gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
- Flags_SetEventChkInf(0x4);
- Flags_SetInfTable(0xE);
+ Flags_SetEventChkInf(EVENTCHKINF_04);
+ Flags_SetInfTable(INFTABLE_0E);
return;
case 0x1045:
- Flags_SetInfTable(0x10);
+ Flags_SetInfTable(INFTABLE_10);
return;
case 0x1060:
- Flags_SetInfTable(0x15);
+ Flags_SetInfTable(INFTABLE_15);
return;
case 0x1067:
- Flags_SetEventChkInf(0xA);
- Flags_SetInfTable(0x17);
+ Flags_SetEventChkInf(EVENTCHKINF_0A);
+ Flags_SetInfTable(INFTABLE_17);
return;
case 0x1070:
- Flags_SetInfTable(0x19);
+ Flags_SetInfTable(INFTABLE_19);
return;
}
return;
case 2:
if (textId == 0x1056) {
- Flags_SetInfTable(0x41);
+ Flags_SetInfTable(INFTABLE_41);
}
return;
case 3:
if (textId == 0x1005) {
- Flags_SetInfTable(0x1E);
+ Flags_SetInfTable(INFTABLE_1E);
}
return;
case 4:
if (textId == 0x105D) {
- Flags_SetInfTable(0x47);
+ Flags_SetInfTable(INFTABLE_47);
}
return;
case 5:
if (textId == 0x1008) {
- Flags_SetInfTable(0x22);
+ Flags_SetInfTable(INFTABLE_22);
}
return;
case 6:
if (textId == 0x100A) {
- Flags_SetInfTable(0x24);
+ Flags_SetInfTable(INFTABLE_24);
}
return;
case 7:
if (textId == 0x100C) {
- Flags_SetInfTable(0x26);
+ Flags_SetInfTable(INFTABLE_26);
}
return;
case 8:
if (textId == 0x100E) {
- Flags_SetInfTable(0x28);
+ Flags_SetInfTable(INFTABLE_28);
}
if (textId == 0x1059) {
- Flags_SetInfTable(0x51);
+ Flags_SetInfTable(INFTABLE_51);
}
return;
case 10:
if (textId == 0x104F) {
- Flags_SetInfTable(0x59);
+ Flags_SetInfTable(INFTABLE_59);
}
return;
case 13:
if (textId == 0x1054) {
- Flags_SetInfTable(0x61);
+ Flags_SetInfTable(INFTABLE_61);
}
return;
case 15:
if (textId == 0x1062) {
- Flags_SetInfTable(0x66);
+ Flags_SetInfTable(INFTABLE_66);
}
return;
case 16:
if (textId == 0x7002) {
- Flags_SetInfTable(0x6A);
+ Flags_SetInfTable(INFTABLE_6A);
}
if (textId == 0x7003) {
- Flags_SetInfTable(0x6A);
+ Flags_SetInfTable(INFTABLE_6A);
}
return;
case 17:
if (textId == 0x7007) {
- Flags_SetInfTable(0x6C);
+ Flags_SetInfTable(INFTABLE_6C);
}
return;
case 18:
if (textId == 0x7071) {
- Flags_SetInfTable(0x71);
+ Flags_SetInfTable(INFTABLE_71);
}
return;
case 20:
case 21:
if (textId == 0x2010) {
- Flags_SetInfTable(0x76);
+ Flags_SetInfTable(INFTABLE_76);
}
return;
case 25:
if (textId == 0x7016) {
- Flags_SetInfTable(0xC2);
+ Flags_SetInfTable(INFTABLE_C2);
}
return;
case 26:
if (textId == 0x7018) {
- Flags_SetInfTable(0xC4);
+ Flags_SetInfTable(INFTABLE_C4);
}
return;
case 28:
if (textId == 0x701D) {
- Flags_SetInfTable(0xCA);
+ Flags_SetInfTable(INFTABLE_CA);
}
return;
case 29:
if (textId == 0x701F) {
- Flags_SetInfTable(0xCC);
+ Flags_SetInfTable(INFTABLE_CC);
}
return;
case 30:
if (textId == 0x7021) {
- Flags_SetInfTable(0xCE);
+ Flags_SetInfTable(INFTABLE_CE);
}
return;
case 31:
if (textId == 0x7023) {
- Flags_SetInfTable(0xD0);
+ Flags_SetInfTable(INFTABLE_D0);
}
return;
case 32:
if (textId == 0x7025) {
- Flags_SetInfTable(0xD2);
+ Flags_SetInfTable(INFTABLE_D2);
}
return;
case 33:
if (textId == 0x7027) {
- Flags_SetInfTable(0xD4);
+ Flags_SetInfTable(INFTABLE_D4);
}
return;
case 34:
if (textId == 0x403C) {
- Flags_SetInfTable(0xD6);
+ Flags_SetInfTable(INFTABLE_D6);
}
return;
case 35:
if (textId == 0x5028) {
- Flags_SetInfTable(0xD8);
+ Flags_SetInfTable(INFTABLE_D8);
}
return;
case 38:
if (textId == 0x3008) {
- Flags_SetInfTable(0xE0);
+ Flags_SetInfTable(INFTABLE_E0);
}
return;
case 40:
if (textId == 0x300B) {
- Flags_SetInfTable(0xEB);
+ Flags_SetInfTable(INFTABLE_EB);
}
return;
case 41:
if (textId == 0x3014) {
- Flags_SetInfTable(0xF0);
+ Flags_SetInfTable(INFTABLE_F0);
}
return;
case 42:
if (textId == 0x3016) {
- Flags_SetInfTable(0xF4);
+ Flags_SetInfTable(INFTABLE_F4);
}
return;
case 43:
if (textId == 0x3018) {
- Flags_SetEventChkInf(0x20);
- Flags_SetInfTable(0xF8);
+ Flags_SetEventChkInf(EVENTCHKINF_20);
+ Flags_SetInfTable(INFTABLE_F8);
}
return;
case 48:
if (textId == 0x3020) {
- Flags_SetEventChkInf(0x22);
- Flags_SetInfTable(0x113);
+ Flags_SetEventChkInf(EVENTCHKINF_22);
+ Flags_SetInfTable(INFTABLE_113);
}
return;
case 49:
@@ -5153,56 +5165,56 @@ void func_80036E50(u16 textId, s16 arg1) {
case 53:
case 54:
if (textId == 0x4006) {
- Flags_SetEventChkInf(0x30);
+ Flags_SetEventChkInf(EVENTCHKINF_30);
}
return;
case 50:
if (textId == 0x4006) {
- Flags_SetEventChkInf(0x30);
+ Flags_SetEventChkInf(EVENTCHKINF_30);
}
if (textId == 0x4008) {
- Flags_SetInfTable(0x124);
+ Flags_SetInfTable(INFTABLE_124);
}
return;
case 51:
if (textId == 0x4006) {
- Flags_SetEventChkInf(0x30);
+ Flags_SetEventChkInf(EVENTCHKINF_30);
}
if (textId == 0x400A) {
- Flags_SetEventChkInf(0x32);
+ Flags_SetEventChkInf(EVENTCHKINF_32);
}
if (textId == 0x402F) {
- Flags_SetInfTable(0x12A);
+ Flags_SetInfTable(INFTABLE_12A);
}
return;
case 55:
if (textId == 0x401B) {
- Flags_SetEventChkInf(0x33);
- Flags_SetInfTable(0x138);
+ Flags_SetEventChkInf(EVENTCHKINF_33);
+ Flags_SetInfTable(INFTABLE_138);
}
return;
case 61:
if (textId == 0x5000) {
- Flags_SetInfTable(0x166);
+ Flags_SetInfTable(INFTABLE_166);
}
return;
case 63:
if (textId == 0x5013) {
- Flags_SetInfTable(0x16A);
+ Flags_SetInfTable(INFTABLE_16A);
}
return;
case 71:
if (textId == 0x2041) {
- Flags_SetEventChkInf(0x10);
+ Flags_SetEventChkInf(EVENTCHKINF_10);
}
if (textId == 0x2044) {
- Flags_SetEventChkInf(0x12);
+ Flags_SetEventChkInf(EVENTCHKINF_12);
}
if (textId == 0x2047) {
- Flags_SetEventChkInf(0x15);
+ Flags_SetEventChkInf(EVENTCHKINF_15);
}
if (textId == 0x2048) {
- Flags_SetEventChkInf(0x16);
+ Flags_SetEventChkInf(EVENTCHKINF_16);
}
return;
case 72:
@@ -5217,14 +5229,14 @@ s32 func_800374E0(GlobalContext* globalCtx, Actor* actor, u16 textId) {
switch (textId) {
case 0x1035:
if (msgCtx->choiceIndex == 0) {
- if (Flags_GetInfTable(0x2A)) {
+ if (Flags_GetInfTable(INFTABLE_2A)) {
func_80035B18(globalCtx, actor, 0x1036);
} else {
func_80035B18(globalCtx, actor, 0x1041);
}
}
if (msgCtx->choiceIndex == 1) {
- if (Flags_GetInfTable(0x2B)) {
+ if (Flags_GetInfTable(INFTABLE_2B)) {
func_80035B18(globalCtx, actor, 0x1037);
} else {
func_80035B18(globalCtx, actor, 0x1041);
@@ -5234,21 +5246,21 @@ s32 func_800374E0(GlobalContext* globalCtx, Actor* actor, u16 textId) {
break;
case 0x1038:
if (msgCtx->choiceIndex == 0) {
- if (Flags_GetInfTable(0x2E)) {
+ if (Flags_GetInfTable(INFTABLE_2E)) {
func_80035B18(globalCtx, actor, 0x1039);
} else {
func_80035B18(globalCtx, actor, 0x1041);
}
}
if (msgCtx->choiceIndex == 1) {
- if (Flags_GetInfTable(0x2F)) {
+ if (Flags_GetInfTable(INFTABLE_2F)) {
func_80035B18(globalCtx, actor, 0x103A);
} else {
func_80035B18(globalCtx, actor, 0x1041);
}
}
if (msgCtx->choiceIndex == 2) {
- if (Flags_GetInfTable(0x30)) {
+ if (Flags_GetInfTable(INFTABLE_30)) {
func_80035B18(globalCtx, actor, 0x103B);
} else {
func_80035B18(globalCtx, actor, 0x1041);
@@ -5269,25 +5281,25 @@ s32 func_800374E0(GlobalContext* globalCtx, Actor* actor, u16 textId) {
if (msgCtx->choiceTextId == 0x1035) {
if (msgCtx->choiceIndex == 0) {
func_80035B18(globalCtx, actor, 0x1036);
- Flags_SetInfTable(0x2A);
+ Flags_SetInfTable(INFTABLE_2A);
}
if (msgCtx->choiceIndex == 1) {
func_80035B18(globalCtx, actor, 0x1037);
- Flags_SetInfTable(0x2B);
+ Flags_SetInfTable(INFTABLE_2B);
}
}
if (msgCtx->choiceTextId == 0x1038) {
if (msgCtx->choiceIndex == 0) {
func_80035B18(globalCtx, actor, 0x1039);
- Flags_SetInfTable(0x2E);
+ Flags_SetInfTable(INFTABLE_2E);
}
if (msgCtx->choiceIndex == 1) {
func_80035B18(globalCtx, actor, 0x103A);
- Flags_SetInfTable(0x2F);
+ Flags_SetInfTable(INFTABLE_2F);
}
if (msgCtx->choiceIndex == 2) {
func_80035B18(globalCtx, actor, 0x103B);
- Flags_SetInfTable(0x30);
+ Flags_SetInfTable(INFTABLE_30);
}
}
ret = 0;
@@ -5314,7 +5326,7 @@ s32 func_800374E0(GlobalContext* globalCtx, Actor* actor, u16 textId) {
if (msgCtx->choiceIndex == 1) {
func_80035B18(globalCtx, actor, 0x2032);
}
- Flags_SetInfTable(0x9A);
+ Flags_SetInfTable(INFTABLE_9A);
ret = 0;
break;
case 0x2036:
@@ -5344,7 +5356,7 @@ s32 func_800374E0(GlobalContext* globalCtx, Actor* actor, u16 textId) {
ret = 0;
break;
case 0x2043:
- if (Flags_GetEventChkInf(0x12)) {
+ if (Flags_GetEventChkInf(EVENTCHKINF_12)) {
break;
}
func_80035B18(globalCtx, actor, 0x2044);
@@ -5354,7 +5366,7 @@ s32 func_800374E0(GlobalContext* globalCtx, Actor* actor, u16 textId) {
break;
case 0x300A:
if (msgCtx->choiceIndex == 0) {
- if (Flags_GetEventChkInf(0x22)) {
+ if (Flags_GetEventChkInf(EVENTCHKINF_22)) {
func_80035B18(globalCtx, actor, 0x300B);
} else {
func_80035B18(globalCtx, actor, 0x300C);
@@ -5370,7 +5382,7 @@ s32 func_800374E0(GlobalContext* globalCtx, Actor* actor, u16 textId) {
func_80035B18(globalCtx, actor, 0x301D);
}
if (msgCtx->choiceIndex == 1) {
- if (Flags_GetInfTable(0x113)) {
+ if (Flags_GetInfTable(INFTABLE_113)) {
func_80035B18(globalCtx, actor, 0x301F);
} else {
func_80035B18(globalCtx, actor, 0x301E);
diff --git a/src/code/z_demo.c b/src/code/z_demo.c
index 1be67364b..2922a34d8 100644
--- a/src/code/z_demo.c
+++ b/src/code/z_demo.c
@@ -52,40 +52,40 @@ CutsceneStateHandler sCsStateHandlers2[] = {
u8 sTitleCsState = 0;
EntranceCutscene sEntranceCutsceneTable[] = {
- { 0x0185, 2, 0xA0, gHyruleFieldIntroCs },
- { 0x013D, 2, 0xA1, gDMTIntroCs },
- { 0x00DB, 2, 0xA3, gKakarikoVillageIntroCs },
- { 0x0108, 2, 0xA4, gZorasDomainIntroCs },
- { 0x0138, 1, 0xA5, gHyruleCastleIntroCs },
- { 0x014D, 2, 0xA6, gGoronCityIntroCs },
- { 0x0053, 2, 0xA7, gTempleOfTimeIntroCs },
- { 0x0000, 2, 0xA8, gDekuTreeIntroCs },
- { 0x028A, 0, 0x18, gHyruleFieldSouthEponaJumpCs },
- { 0x0292, 0, 0x18, gHyruleFieldEastEponaJumpCs },
- { 0x028E, 0, 0x18, gHyruleFieldWestEponaJumpCs },
- { 0x0476, 0, 0x18, gHyruleFieldGateEponaJumpCs },
- { 0x050F, 1, 0xA9, gHyruleFieldGetOoTCs },
- { 0x0102, 2, 0xB1, gLakeHyliaIntroCs },
- { 0x0117, 2, 0xB2, gGerudoValleyIntroCs },
- { 0x0129, 2, 0xB3, gGerudoFortressIntroCs },
- { 0x0157, 2, 0xB4, gLonLonRanchIntroCs },
- { 0x0028, 2, 0xB5, gJabuJabuIntroCs },
- { 0x00E4, 2, 0xB6, gGraveyardIntroCs },
- { 0x0225, 2, 0xB7, gZorasFountainIntroCs },
- { 0x0123, 2, 0xB8, gDesertColossusIntroCs },
- { 0x0147, 2, 0xB9, gDeathMountainCraterIntroCs },
- { 0x0138, 0, 0xBA, gGanonsCastleIntroCs },
- { 0x0574, 2, 0x5A, gSunSongGraveSunSongTeachPart2Cs },
- { 0x0538, 2, 0xBB, gForestBarrierCs },
- { 0x053C, 2, 0xBC, gWaterBarrierCs },
- { 0x0540, 2, 0xBD, gShadowBarrierCs },
- { 0x0544, 2, 0xBE, gFireBarrierCs },
- { 0x0548, 2, 0xBF, gLightBarrierCs },
- { 0x054C, 2, 0xAD, gSpiritBarrierCs },
- { 0x008D, 0, 0xC0, gSpiritBossNabooruKnuckleIntroCs },
- { 0x03B4, 0, 0xC7, gGerudoFortressFirstCaptureCs },
- { 0x0246, 2, 0xB9, gDeathMountainCraterIntroCs },
- { 0x05E8, 2, 0xC6, gKokiriForestDekuSproutCs },
+ { 0x0185, 2, EVENTCHKINF_A0, gHyruleFieldIntroCs },
+ { 0x013D, 2, EVENTCHKINF_A1, gDMTIntroCs },
+ { 0x00DB, 2, EVENTCHKINF_A3, gKakarikoVillageIntroCs },
+ { 0x0108, 2, EVENTCHKINF_A4, gZorasDomainIntroCs },
+ { 0x0138, 1, EVENTCHKINF_A5, gHyruleCastleIntroCs },
+ { 0x014D, 2, EVENTCHKINF_A6, gGoronCityIntroCs },
+ { 0x0053, 2, EVENTCHKINF_A7, gTempleOfTimeIntroCs },
+ { 0x0000, 2, EVENTCHKINF_A8, gDekuTreeIntroCs },
+ { 0x028A, 0, EVENTCHKINF_18, gHyruleFieldSouthEponaJumpCs },
+ { 0x0292, 0, EVENTCHKINF_18, gHyruleFieldEastEponaJumpCs },
+ { 0x028E, 0, EVENTCHKINF_18, gHyruleFieldWestEponaJumpCs },
+ { 0x0476, 0, EVENTCHKINF_18, gHyruleFieldGateEponaJumpCs },
+ { 0x050F, 1, EVENTCHKINF_A9, gHyruleFieldGetOoTCs },
+ { 0x0102, 2, EVENTCHKINF_B1, gLakeHyliaIntroCs },
+ { 0x0117, 2, EVENTCHKINF_B2, gGerudoValleyIntroCs },
+ { 0x0129, 2, EVENTCHKINF_B3, gGerudoFortressIntroCs },
+ { 0x0157, 2, EVENTCHKINF_B4, gLonLonRanchIntroCs },
+ { 0x0028, 2, EVENTCHKINF_B5, gJabuJabuIntroCs },
+ { 0x00E4, 2, EVENTCHKINF_B6, gGraveyardIntroCs },
+ { 0x0225, 2, EVENTCHKINF_B7, gZorasFountainIntroCs },
+ { 0x0123, 2, EVENTCHKINF_B8, gDesertColossusIntroCs },
+ { 0x0147, 2, EVENTCHKINF_B9, gDeathMountainCraterIntroCs },
+ { 0x0138, 0, EVENTCHKINF_BA, gGanonsCastleIntroCs },
+ { 0x0574, 2, EVENTCHKINF_5A, gSunSongGraveSunSongTeachPart2Cs },
+ { 0x0538, 2, EVENTCHKINF_BB, gForestBarrierCs },
+ { 0x053C, 2, EVENTCHKINF_BC, gWaterBarrierCs },
+ { 0x0540, 2, EVENTCHKINF_BD, gShadowBarrierCs },
+ { 0x0544, 2, EVENTCHKINF_BE, gFireBarrierCs },
+ { 0x0548, 2, EVENTCHKINF_BF, gLightBarrierCs },
+ { 0x054C, 2, EVENTCHKINF_AD, gSpiritBarrierCs },
+ { 0x008D, 0, EVENTCHKINF_C0, gSpiritBossNabooruKnuckleIntroCs },
+ { 0x03B4, 0, EVENTCHKINF_C7, gGerudoFortressFirstCaptureCs },
+ { 0x0246, 2, EVENTCHKINF_B9, gDeathMountainCraterIntroCs },
+ { 0x05E8, 2, EVENTCHKINF_C6, gKokiriForestDekuSproutCs },
};
// Unused, seems to be an early list of dungeon entrance cutscene locations
@@ -336,13 +336,13 @@ void func_80064824(GlobalContext* globalCtx, CutsceneContext* csCtx, CsCmdBase*
}
break;
case 19:
- gSaveContext.eventChkInf[6] |= 0x0020;
+ SET_EVENTCHKINF(EVENTCHKINF_65);
break;
case 20:
- gSaveContext.eventChkInf[6] |= 0x0080;
+ SET_EVENTCHKINF(EVENTCHKINF_67);
break;
case 21:
- gSaveContext.eventChkInf[6] |= 0x0200;
+ SET_EVENTCHKINF(EVENTCHKINF_69);
break;
case 22:
D_801614B0.r = 255;
@@ -561,8 +561,8 @@ void Cutscene_Command_Terminator(GlobalContext* globalCtx, CutsceneContext* csCt
case 8:
gSaveContext.fw.set = 0;
gSaveContext.respawn[RESPAWN_MODE_TOP].data = 0;
- if (!(gSaveContext.eventChkInf[4] & 0x20)) {
- gSaveContext.eventChkInf[4] |= 0x20;
+ if (!GET_EVENTCHKINF(EVENTCHKINF_45)) {
+ SET_EVENTCHKINF(EVENTCHKINF_45);
globalCtx->nextEntranceIndex = 0x00A0;
globalCtx->transitionTrigger = TRANS_TRIGGER_START;
gSaveContext.cutsceneIndex = 0xFFF3;
@@ -634,7 +634,7 @@ void Cutscene_Command_Terminator(GlobalContext* globalCtx, CutsceneContext* csCt
globalCtx->transitionType = TRANS_TYPE_FADE_WHITE;
break;
case 18:
- gSaveContext.eventChkInf[4] |= 0x8000;
+ SET_EVENTCHKINF(EVENTCHKINF_4F);
globalCtx->nextEntranceIndex = 0x0324;
globalCtx->transitionTrigger = TRANS_TRIGGER_START;
globalCtx->transitionType = TRANS_TYPE_FADE_BLACK;
@@ -779,14 +779,14 @@ void Cutscene_Command_Terminator(GlobalContext* globalCtx, CutsceneContext* csCt
globalCtx->transitionType = TRANS_TYPE_FADE_WHITE_INSTANT;
break;
case 46:
- gSaveContext.eventChkInf[4] |= 0x8000;
+ SET_EVENTCHKINF(EVENTCHKINF_4F);
globalCtx->nextEntranceIndex = 0x0324;
globalCtx->transitionTrigger = TRANS_TRIGGER_START;
globalCtx->transitionType = TRANS_TYPE_FADE_BLACK_FAST;
break;
case 47:
Item_Give(globalCtx, ITEM_SONG_NOCTURNE);
- gSaveContext.eventChkInf[5] |= 0x10;
+ SET_EVENTCHKINF(EVENTCHKINF_54);
globalCtx->nextEntranceIndex = 0x00DB;
globalCtx->transitionTrigger = TRANS_TRIGGER_START;
gSaveContext.cutsceneIndex = 0xFFF1;
@@ -1014,8 +1014,8 @@ void Cutscene_Command_Terminator(GlobalContext* globalCtx, CutsceneContext* csCt
globalCtx->transitionType = TRANS_TYPE_FADE_WHITE;
break;
case 95:
- if ((gSaveContext.eventChkInf[4] & 0x100) && (gSaveContext.eventChkInf[4] & 0x200) &&
- (gSaveContext.eventChkInf[4] & 0x400)) {
+ if (GET_EVENTCHKINF(EVENTCHKINF_48) && GET_EVENTCHKINF(EVENTCHKINF_49) &&
+ GET_EVENTCHKINF(EVENTCHKINF_4A)) {
globalCtx->nextEntranceIndex = 0x0053;
globalCtx->transitionTrigger = TRANS_TRIGGER_START;
gSaveContext.cutsceneIndex = 0xFFF3;
@@ -1048,7 +1048,7 @@ void Cutscene_Command_Terminator(GlobalContext* globalCtx, CutsceneContext* csCt
gSaveContext.cutsceneIndex = 0xFFF1;
globalCtx->transitionType = TRANS_TYPE_FADE_WHITE_FAST;
} else {
- gSaveContext.eventChkInf[12] |= 0x100;
+ SET_EVENTCHKINF(EVENTCHKINF_C8);
globalCtx->nextEntranceIndex = 0x0610;
globalCtx->transitionTrigger = TRANS_TRIGGER_START;
globalCtx->transitionType = TRANS_TYPE_FADE_WHITE;
@@ -1170,8 +1170,9 @@ void Cutscene_Command_Terminator(GlobalContext* globalCtx, CutsceneContext* csCt
globalCtx->transitionType = TRANS_TYPE_FADE_BLACK;
break;
case 113:
- if (Flags_GetEventChkInf(0xBB) && Flags_GetEventChkInf(0xBC) && Flags_GetEventChkInf(0xBD) &&
- Flags_GetEventChkInf(0xBE) && Flags_GetEventChkInf(0xBF) && Flags_GetEventChkInf(0xAD)) {
+ if (Flags_GetEventChkInf(EVENTCHKINF_BB) && Flags_GetEventChkInf(EVENTCHKINF_BC) &&
+ Flags_GetEventChkInf(EVENTCHKINF_BD) && Flags_GetEventChkInf(EVENTCHKINF_BE) &&
+ Flags_GetEventChkInf(EVENTCHKINF_BF) && Flags_GetEventChkInf(EVENTCHKINF_AD)) {
globalCtx->csCtx.segment = SEGMENTED_TO_VIRTUAL(gTowerBarrierCs);
globalCtx->csCtx.frames = 0;
gSaveContext.cutsceneTrigger = 1;
@@ -1194,7 +1195,7 @@ void Cutscene_Command_Terminator(GlobalContext* globalCtx, CutsceneContext* csCt
gSaveContext.nextTransitionType = TRANS_TYPE_FADE_BLACK;
break;
case 116:
- if (gSaveContext.eventChkInf[12] & 0x100) {
+ if (GET_EVENTCHKINF(EVENTCHKINF_C8)) {
globalCtx->nextEntranceIndex = 0x0580;
globalCtx->transitionTrigger = TRANS_TRIGGER_START;
globalCtx->transitionType = TRANS_TYPE_FADE_WHITE;
@@ -2060,7 +2061,7 @@ void Cutscene_HandleEntranceTriggers(GlobalContext* globalCtx) {
}
if ((gSaveContext.entranceIndex == entranceCutscene->entrance) &&
- (!Flags_GetEventChkInf(entranceCutscene->flag) || (entranceCutscene->flag == 0x18)) &&
+ (!Flags_GetEventChkInf(entranceCutscene->flag) || (entranceCutscene->flag == EVENTCHKINF_18)) &&
(gSaveContext.cutsceneIndex < 0xFFF0) && ((u8)gSaveContext.linkAge == requiredAge) &&
(gSaveContext.respawnFlag <= 0)) {
Flags_SetEventChkInf(entranceCutscene->flag);
@@ -2076,29 +2077,29 @@ void Cutscene_HandleConditionalTriggers(GlobalContext* globalCtx) {
osSyncPrintf("\ngame_info.mode=[%d] restart_flag", ((void)0, gSaveContext.respawnFlag));
if ((gSaveContext.gameMode == 0) && (gSaveContext.respawnFlag <= 0) && (gSaveContext.cutsceneIndex < 0xFFF0)) {
- if ((gSaveContext.entranceIndex == 0x01E1) && !Flags_GetEventChkInf(0xAC)) {
- Flags_SetEventChkInf(0xAC);
+ if ((gSaveContext.entranceIndex == 0x01E1) && !Flags_GetEventChkInf(EVENTCHKINF_AC)) {
+ Flags_SetEventChkInf(EVENTCHKINF_AC);
gSaveContext.entranceIndex = 0x0123;
gSaveContext.cutsceneIndex = 0xFFF0;
- } else if ((gSaveContext.entranceIndex == 0x00DB) && LINK_IS_ADULT && (gSaveContext.eventChkInf[4] & 0x0100) &&
- (gSaveContext.eventChkInf[4] & 0x0200) && (gSaveContext.eventChkInf[4] & 0x0400) &&
- !Flags_GetEventChkInf(0xAA)) {
- Flags_SetEventChkInf(0xAA);
+ } else if ((gSaveContext.entranceIndex == 0x00DB) && LINK_IS_ADULT && GET_EVENTCHKINF(EVENTCHKINF_48) &&
+ GET_EVENTCHKINF(EVENTCHKINF_49) && GET_EVENTCHKINF(EVENTCHKINF_4A) &&
+ !Flags_GetEventChkInf(EVENTCHKINF_AA)) {
+ Flags_SetEventChkInf(EVENTCHKINF_AA);
gSaveContext.cutsceneIndex = 0xFFF0;
- } else if ((gSaveContext.entranceIndex == 0x05E0) && !Flags_GetEventChkInf(0xC1)) {
- Flags_SetEventChkInf(0xC1);
+ } else if ((gSaveContext.entranceIndex == 0x05E0) && !Flags_GetEventChkInf(EVENTCHKINF_C1)) {
+ Flags_SetEventChkInf(EVENTCHKINF_C1);
Item_Give(globalCtx, ITEM_OCARINA_FAIRY);
gSaveContext.entranceIndex = 0x011E;
gSaveContext.cutsceneIndex = 0xFFF0;
} else if (CHECK_QUEST_ITEM(QUEST_MEDALLION_SPIRIT) && CHECK_QUEST_ITEM(QUEST_MEDALLION_SHADOW) &&
- LINK_IS_ADULT && !Flags_GetEventChkInf(0xC4) &&
+ LINK_IS_ADULT && !Flags_GetEventChkInf(EVENTCHKINF_C4) &&
(gEntranceTable[((void)0, gSaveContext.entranceIndex)].scene == SCENE_TOKINOMA)) {
- Flags_SetEventChkInf(0xC4);
+ Flags_SetEventChkInf(EVENTCHKINF_C4);
gSaveContext.entranceIndex = 0x0053;
gSaveContext.cutsceneIndex = 0xFFF8;
- } else if (!Flags_GetEventChkInf(0xC7) &&
+ } else if (!Flags_GetEventChkInf(EVENTCHKINF_C7) &&
(gEntranceTable[((void)0, gSaveContext.entranceIndex)].scene == SCENE_GANON_DEMO)) {
- Flags_SetEventChkInf(0xC7);
+ Flags_SetEventChkInf(EVENTCHKINF_C7);
gSaveContext.entranceIndex = 0x0517;
gSaveContext.cutsceneIndex = 0xFFF0;
}
diff --git a/src/code/z_elf_message.c b/src/code/z_elf_message.c
index 370fe8d41..aef42a3ef 100644
--- a/src/code/z_elf_message.c
+++ b/src/code/z_elf_message.c
@@ -3,11 +3,11 @@
ElfMessage sChildSariaMsgs[] = {
ELF_MSG_STRENGTH_UPG(SKIP, 3, false, 0),
- ELF_MSG_FLAG(CHECK, 0x61, false, 0x37), /* eventChkInf[3] & 0x80 */
+ ELF_MSG_FLAG(CHECK, 0x61, false, EVENTCHKINF_37),
ELF_MSG_END(0x64),
- ELF_MSG_FLAG(CHECK, 0x62, false, 0x25), /* eventChkInf[2] & 0x20 */
- ELF_MSG_FLAG(CHECK, 0x63, false, 0x37), /* eventChkInf[3] & 0x80 */
- ELF_MSG_FLAG(CHECK, 0x65, false, 0x43), /* eventChkInf[4] & 0x8 */
+ ELF_MSG_FLAG(CHECK, 0x62, false, EVENTCHKINF_25),
+ ELF_MSG_FLAG(CHECK, 0x63, false, EVENTCHKINF_37),
+ ELF_MSG_FLAG(CHECK, 0x65, false, EVENTCHKINF_43),
ELF_MSG_MEDALLION(CHECK, 0x66, false, ITEM_MEDALLION_FOREST),
ELF_MSG_MEDALLION(CHECK, 0x66, false, ITEM_MEDALLION_FIRE),
ELF_MSG_MEDALLION(CHECK, 0x66, false, ITEM_MEDALLION_WATER),
diff --git a/src/code/z_game_over.c b/src/code/z_game_over.c
index 3605c5bd6..e66b66e64 100644
--- a/src/code/z_game_over.c
+++ b/src/code/z_game_over.c
@@ -30,7 +30,7 @@ void GameOver_Update(GlobalContext* globalCtx) {
gSaveContext.timer1State = 0;
gSaveContext.timer2State = 0;
- gSaveContext.eventInf[1] &= ~1;
+ CLEAR_EVENTINF(EVENTINF_10);
// search inventory for spoiling items and revert if necessary
for (i = 0; i < ARRAY_COUNT(gSpoilingItems); i++) {
diff --git a/src/code/z_horse.c b/src/code/z_horse.c
index 3a2870116..28fd9a904 100644
--- a/src/code/z_horse.c
+++ b/src/code/z_horse.c
@@ -47,7 +47,7 @@ void func_8006D0EC(GlobalContext* globalCtx, Player* player) {
{ SCENE_SPOT20, 928, 0, -2280, 0, 2 },
};
- if ((AREG(6) != 0) && (Flags_GetEventChkInf(0x18) || (DREG(1) != 0))) {
+ if ((AREG(6) != 0) && (Flags_GetEventChkInf(EVENTCHKINF_18) || (DREG(1) != 0))) {
player->rideActor = Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_HORSE, player->actor.world.pos.x,
player->actor.world.pos.y, player->actor.world.pos.z, player->actor.shape.rot.x,
player->actor.shape.rot.y, player->actor.shape.rot.z, 9);
@@ -67,15 +67,15 @@ void func_8006D0EC(GlobalContext* globalCtx, Player* player) {
horseActor =
Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_HORSE, 3586.0f, 1413.0f, -402.0f, 0, 0x4000, 0, 1);
horseActor->room = -1;
- } else if ((gSaveContext.entranceIndex == 1230) && (gSaveContext.eventChkInf[1] & 0x100)) {
+ } else if ((gSaveContext.entranceIndex == 1230) && GET_EVENTCHKINF(EVENTCHKINF_18)) {
Actor* horseActor =
Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_HORSE, -25.0f, 0.0f, -1600.0f, 0, -0x4000, 0, 1);
ASSERT(horseActor != NULL, "horse_actor != NULL", "../z_horse.c", 389);
} else if ((globalCtx->sceneNum == gSaveContext.horseData.scene) &&
- (Flags_GetEventChkInf(0x18) != 0 || DREG(1) != 0)) {
+ (Flags_GetEventChkInf(EVENTCHKINF_18) || DREG(1) != 0)) {
// "Set by existence of horse %d %d %d"
- osSyncPrintf("馬存在によるセット %d %d %d\n", gSaveContext.horseData.scene, Flags_GetEventChkInf(0x18),
- DREG(1));
+ osSyncPrintf("馬存在によるセット %d %d %d\n", gSaveContext.horseData.scene,
+ Flags_GetEventChkInf(EVENTCHKINF_18), DREG(1));
if (func_8006CFC0(gSaveContext.horseData.scene)) {
Actor* horseActor = Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_HORSE,
@@ -92,11 +92,11 @@ void func_8006D0EC(GlobalContext* globalCtx, Player* player) {
osSyncPrintf(VT_RST);
func_8006D074(globalCtx);
}
- } else if ((globalCtx->sceneNum == SCENE_SPOT20) && !Flags_GetEventChkInf(0x18) && (DREG(1) == 0)) {
+ } else if ((globalCtx->sceneNum == SCENE_SPOT20) && !Flags_GetEventChkInf(EVENTCHKINF_18) && (DREG(1) == 0)) {
Actor* horseActor =
Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_HORSE, 0.0f, 0.0f, -500.0f, 0, 0, 0, 1);
ASSERT(horseActor != NULL, "horse_actor != NULL", "../z_horse.c", 443);
- } else if (Flags_GetEventChkInf(0x18) || (DREG(1) != 0)) {
+ } else if (Flags_GetEventChkInf(EVENTCHKINF_18) || (DREG(1) != 0)) {
for (i = 0; i < ARRAY_COUNT(horseSpawns); i++) {
HorseSpawn* horseSpawn = &horseSpawns[i];
if (horseSpawn->scene == globalCtx->sceneNum) {
@@ -111,7 +111,7 @@ void func_8006D0EC(GlobalContext* globalCtx, Player* player) {
break;
}
}
- } else if (!Flags_GetEventChkInf(0x18)) {
+ } else if (!Flags_GetEventChkInf(EVENTCHKINF_18)) {
if ((DREG(1) == 0) && (globalCtx->sceneNum == SCENE_SOUKO) && !IS_DAY) {
Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_HORSE, 0.0f, 0.0f, -60.0f, 0, 0x7360, 0, 1);
}
@@ -158,8 +158,11 @@ void func_8006D684(GlobalContext* globalCtx, Player* player) {
Actor_MountHorse(globalCtx, player, player->rideActor);
func_8002DE74(globalCtx, player);
gSaveContext.horseData.scene = globalCtx->sceneNum;
- } else if ((globalCtx->sceneNum == SCENE_SPOT20) && ((gSaveContext.eventInf[0] & 0xF) == 6) &&
- (Flags_GetEventChkInf(0x18) == 0) && (DREG(1) == 0)) {
+ } else if ((globalCtx->sceneNum == SCENE_SPOT20) &&
+ ((gSaveContext.eventInf[EVENTINF_0X_INDEX] &
+ (EVENTINF_00_MASK | EVENTINF_01_MASK | EVENTINF_02_MASK | EVENTINF_03_MASK)) ==
+ (EVENTINF_01_MASK | EVENTINF_02_MASK)) &&
+ !Flags_GetEventChkInf(EVENTCHKINF_18) && (DREG(1) == 0)) {
player->rideActor =
Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_HORSE, 894.0f, 0.0f, -2084.0f, 0, -0x7FFF, 0, 5);
ASSERT(player->rideActor != NULL, "player->ride.actor != NULL", "../z_horse.c", 582);
@@ -200,7 +203,7 @@ void func_8006D684(GlobalContext* globalCtx, Player* player) {
Vec3f sp54;
s32 temp = 0;
- if (((gSaveContext.eventInf[0] & 0x10) >> 4) && D_8011F9B8[i].type == 6) {
+ if ((GET_EVENTINF(EVENTINF_04) >> EVENTINF_04_SHIFT) && D_8011F9B8[i].type == 6) {
temp = 0x8000;
}
@@ -249,8 +252,11 @@ void func_8006DC68(GlobalContext* globalCtx, Player* player) {
((gSaveContext.entranceIndex == 0x028A || gSaveContext.entranceIndex == 0x028E ||
gSaveContext.entranceIndex == 0x0292 || gSaveContext.entranceIndex == 0x0476) &&
(gSaveContext.respawnFlag == 0)) ||
- ((globalCtx->sceneNum == SCENE_SPOT20) && ((gSaveContext.eventInf[0] & 0xF) == 6) &&
- !Flags_GetEventChkInf(0x18) && (DREG(1) == 0))) {
+ ((globalCtx->sceneNum == SCENE_SPOT20) &&
+ ((gSaveContext.eventInf[EVENTINF_0X_INDEX] &
+ (EVENTINF_00_MASK | EVENTINF_01_MASK | EVENTINF_02_MASK | EVENTINF_03_MASK)) ==
+ (EVENTINF_01_MASK | EVENTINF_02_MASK)) &&
+ !Flags_GetEventChkInf(EVENTCHKINF_18) && (DREG(1) == 0))) {
func_8006D684(globalCtx, player);
} else {
func_8006D0EC(globalCtx, player);
diff --git a/src/code/z_kankyo.c b/src/code/z_kankyo.c
index f77df0e07..d160cb3ac 100644
--- a/src/code/z_kankyo.c
+++ b/src/code/z_kankyo.c
@@ -2443,19 +2443,19 @@ void Environment_WarpSongLeave(GlobalContext* globalCtx) {
switch (globalCtx->nextEntranceIndex) {
case 0x147:
- Flags_SetEventChkInf(0xB9);
+ Flags_SetEventChkInf(EVENTCHKINF_B9);
break;
case 0x0102:
- Flags_SetEventChkInf(0xB1);
+ Flags_SetEventChkInf(EVENTCHKINF_B1);
break;
case 0x0123:
- Flags_SetEventChkInf(0xB8);
+ Flags_SetEventChkInf(EVENTCHKINF_B8);
break;
case 0x00E4:
- Flags_SetEventChkInf(0xB6);
+ Flags_SetEventChkInf(EVENTCHKINF_B6);
break;
case 0x0053:
- Flags_SetEventChkInf(0xA7);
+ Flags_SetEventChkInf(EVENTCHKINF_A7);
break;
case 0x00FC:
break;
diff --git a/src/code/z_map_data.c b/src/code/z_map_data.c
index 3ee22c7a0..881950c6d 100644
--- a/src/code/z_map_data.c
+++ b/src/code/z_map_data.c
@@ -239,8 +239,26 @@ static s16 sOwEntranceIconPosY[24] = {
};
static u16 sOwEntranceFlag[20] = {
- 0xFFFF, 0x0008, 0x0007, 0xFFFF, 0x0000, 0x0003, 0x0005, 0xFFFF, 0x0002, 0xFFFF,
- 0xFFFF, 0x0006, 0x000B, 0xFFFF, 0xFFFF, 0x0001, 0x0004, 0xFFFF, 0xFFFF, 0x000D,
+ 0xFFFF,
+ INFTABLE_1A8_SHIFT,
+ INFTABLE_1A7_SHIFT,
+ 0xFFFF,
+ INFTABLE_1A0_SHIFT,
+ INFTABLE_1A3_SHIFT,
+ INFTABLE_1A5_SHIFT,
+ 0xFFFF,
+ INFTABLE_1A2_SHIFT,
+ 0xFFFF,
+ 0xFFFF,
+ INFTABLE_1A6_SHIFT,
+ INFTABLE_1AB_SHIFT,
+ 0xFFFF,
+ 0xFFFF,
+ INFTABLE_1A1_SHIFT,
+ INFTABLE_1A4_SHIFT,
+ 0xFFFF,
+ 0xFFFF,
+ INFTABLE_1AD_SHIFT,
};
static f32 sFloorCoordY[10][8] = {
diff --git a/src/code/z_map_exp.c b/src/code/z_map_exp.c
index f4423a63f..b79182f75 100644
--- a/src/code/z_map_exp.c
+++ b/src/code/z_map_exp.c
@@ -118,11 +118,16 @@ void Map_InitData(GlobalContext* globalCtx, s16 room) {
extendedMapIndex = 0x15;
}
} else if (globalCtx->sceneNum == SCENE_SPOT09) {
- if ((LINK_AGE_IN_YEARS == YEARS_ADULT) && !((gSaveContext.eventChkInf[9] & 0xF) == 0xF)) {
+ if ((LINK_AGE_IN_YEARS == YEARS_ADULT) &&
+ !CHECK_FLAG_ALL(gSaveContext.eventChkInf[EVENTCHKINF_90_91_92_93_INDEX],
+ EVENTCHKINF_90_MASK | EVENTCHKINF_91_MASK | EVENTCHKINF_92_MASK |
+ EVENTCHKINF_93_MASK)) {
extendedMapIndex = 0x16;
}
} else if (globalCtx->sceneNum == SCENE_SPOT12) {
- if ((gSaveContext.eventChkInf[9] & 0xF) == 0xF) {
+ if (CHECK_FLAG_ALL(gSaveContext.eventChkInf[EVENTCHKINF_90_91_92_93_INDEX],
+ EVENTCHKINF_90_MASK | EVENTCHKINF_91_MASK | EVENTCHKINF_92_MASK |
+ EVENTCHKINF_93_MASK)) {
extendedMapIndex = 0x17;
}
}
@@ -455,7 +460,8 @@ void Minimap_Draw(GlobalContext* globalCtx) {
(LINK_AGE_IN_YEARS != YEARS_ADULT)) {
if ((gMapData->owEntranceFlag[sEntranceIconMapIndex] == 0xFFFF) ||
((gMapData->owEntranceFlag[sEntranceIconMapIndex] != 0xFFFF) &&
- (gSaveContext.infTable[26] & gBitFlags[gMapData->owEntranceFlag[mapIndex]]))) {
+ (gSaveContext.infTable[INFTABLE_1AX_INDEX] &
+ gBitFlags[gMapData->owEntranceFlag[mapIndex]]))) {
gDPLoadTextureBlock(OVERLAY_DISP++, gMapDungeonEntranceIconTex, G_IM_FMT_RGBA, G_IM_SIZ_16b,
8, 8, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP,
@@ -470,7 +476,8 @@ void Minimap_Draw(GlobalContext* globalCtx) {
}
}
- if ((globalCtx->sceneNum == SCENE_SPOT08) && (gSaveContext.infTable[26] & gBitFlags[9])) {
+ if ((globalCtx->sceneNum == SCENE_SPOT08) &&
+ (gSaveContext.infTable[INFTABLE_1AX_INDEX] & gBitFlags[INFTABLE_1A9_SHIFT])) {
gDPLoadTextureBlock(OVERLAY_DISP++, gMapDungeonEntranceIconTex, G_IM_FMT_RGBA, G_IM_SIZ_16b, 8,
8, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
diff --git a/src/code/z_message_PAL.c b/src/code/z_message_PAL.c
index 36d573304..efe15ab70 100644
--- a/src/code/z_message_PAL.c
+++ b/src/code/z_message_PAL.c
@@ -1605,7 +1605,7 @@ void Message_OpenText(GlobalContext* globalCtx, u16 textId) {
textId += (gSaveContext.inventory.questItems & 0xF0000000 & 0xF0000000) >> QUEST_HEART_PIECE_COUNT;
} else if (msgCtx->textId == 0xC && CHECK_OWNED_EQUIP(EQUIP_SWORD, 2)) {
textId = 0xB; // Traded Giant's Knife for Biggoron Sword
- } else if (msgCtx->textId == 0xB4 && (gSaveContext.eventChkInf[9] & 0x40)) {
+ } else if (msgCtx->textId == 0xB4 && GET_EVENTCHKINF(EVENTCHKINF_96)) {
textId = 0xB5; // Destroyed Gold Skulltula
}
// Ocarina Staff + Dialog
@@ -2456,7 +2456,9 @@ void Message_DrawMain(GlobalContext* globalCtx, Gfx** p) {
if (msgCtx->disableWarpSongs || interfaceCtx->restrictions.warpSongs == 3) {
Message_StartTextbox(globalCtx, 0x88C, NULL); // "You can't warp here!"
globalCtx->msgCtx.ocarinaMode = OCARINA_MODE_04;
- } else if ((gSaveContext.eventInf[0] & 0xF) != 1) {
+ } else if ((gSaveContext.eventInf[EVENTINF_0X_INDEX] &
+ (EVENTINF_00_MASK | EVENTINF_01_MASK | EVENTINF_02_MASK | EVENTINF_03_MASK)) !=
+ EVENTINF_00_MASK) {
Message_StartTextbox(globalCtx, msgCtx->lastPlayedSong + 0x88D,
NULL); // "Warp to [place name]?"
globalCtx->msgCtx.ocarinaMode = OCARINA_MODE_01;
@@ -3217,8 +3219,10 @@ void Message_Update(GlobalContext* globalCtx) {
if (Message_ShouldAdvance(globalCtx)) {
osSyncPrintf("OCARINA_MODE=%d -> ", globalCtx->msgCtx.ocarinaMode);
globalCtx->msgCtx.ocarinaMode = (msgCtx->choiceIndex == 0) ? OCARINA_MODE_02 : OCARINA_MODE_04;
- osSyncPrintf("InRaceSeq=%d(%d) OCARINA_MODE=%d --> ", gSaveContext.eventInf[0] & 0xF, 1,
- globalCtx->msgCtx.ocarinaMode);
+ osSyncPrintf("InRaceSeq=%d(%d) OCARINA_MODE=%d --> ",
+ gSaveContext.eventInf[EVENTINF_0X_INDEX] &
+ (EVENTINF_00_MASK | EVENTINF_01_MASK | EVENTINF_02_MASK | EVENTINF_03_MASK),
+ 1, globalCtx->msgCtx.ocarinaMode);
Message_CloseTextbox(globalCtx);
osSyncPrintf("OCARINA_MODE=%d\n", globalCtx->msgCtx.ocarinaMode);
}
diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c
index 8c64eca08..24fc5e83d 100644
--- a/src/code/z_parameter.c
+++ b/src/code/z_parameter.c
@@ -768,7 +768,9 @@ void func_80083108(GlobalContext* globalCtx) {
gSaveContext.unk_13EA = 0;
Interface_ChangeAlpha(50);
}
- } else if ((gSaveContext.eventInf[0] & 0xF) == 1) {
+ } else if ((gSaveContext.eventInf[EVENTINF_0X_INDEX] &
+ (EVENTINF_00_MASK | EVENTINF_01_MASK | EVENTINF_02_MASK | EVENTINF_03_MASK)) ==
+ EVENTINF_00_MASK) {
if (player->stateFlags1 & PLAYER_STATE1_23) {
if ((gSaveContext.equips.buttonItems[0] != ITEM_NONE) &&
(gSaveContext.equips.buttonItems[0] != ITEM_BOW)) {
@@ -828,7 +830,8 @@ void func_80083108(GlobalContext* globalCtx) {
(gSaveContext.equips.buttonItems[0] == ITEM_BOW) ||
(gSaveContext.equips.buttonItems[0] == ITEM_BOMBCHU) ||
(gSaveContext.equips.buttonItems[0] == ITEM_NONE)) {
- if ((gSaveContext.equips.buttonItems[0] != ITEM_NONE) || (gSaveContext.infTable[29] == 0)) {
+ if ((gSaveContext.equips.buttonItems[0] != ITEM_NONE) ||
+ (gSaveContext.infTable[INFTABLE_1DX_INDEX] == 0)) {
gSaveContext.equips.buttonItems[0] = gSaveContext.buttonStatus[0];
sp28 = true;
@@ -851,7 +854,8 @@ void func_80083108(GlobalContext* globalCtx) {
(gSaveContext.equips.buttonItems[0] == ITEM_BOW) ||
(gSaveContext.equips.buttonItems[0] == ITEM_BOMBCHU) ||
(gSaveContext.equips.buttonItems[0] == ITEM_NONE)) {
- if ((gSaveContext.equips.buttonItems[0] != ITEM_NONE) || (gSaveContext.infTable[29] == 0)) {
+ if ((gSaveContext.equips.buttonItems[0] != ITEM_NONE) ||
+ (gSaveContext.infTable[INFTABLE_1DX_INDEX] == 0)) {
gSaveContext.equips.buttonItems[0] = gSaveContext.buttonStatus[0];
sp28 = true;
@@ -1303,7 +1307,7 @@ void func_80084BF4(GlobalContext* globalCtx, u16 flag) {
Interface_LoadItemIcon1(globalCtx, 0);
}
} else if (gSaveContext.equips.buttonItems[0] == ITEM_NONE) {
- if ((gSaveContext.equips.buttonItems[0] != ITEM_NONE) || (gSaveContext.infTable[29] == 0)) {
+ if ((gSaveContext.equips.buttonItems[0] != ITEM_NONE) || (gSaveContext.infTable[INFTABLE_1DX_INDEX] == 0)) {
gSaveContext.equips.buttonItems[0] = gSaveContext.buttonStatus[0];
Interface_LoadItemIcon1(globalCtx, 0);
}
@@ -1636,8 +1640,8 @@ u8 Item_Give(GlobalContext* globalCtx, u8 item) {
AMMO(ITEM_SLINGSHOT) = CUR_CAPACITY(UPG_BULLET_BAG);
}
- if (!(gSaveContext.itemGetInf[1] & 8)) {
- gSaveContext.itemGetInf[1] |= 8;
+ if (!GET_ITEMGETINF(ITEMGETINF_13)) {
+ SET_ITEMGETINF(ITEMGETINF_13);
return ITEM_NONE;
}
@@ -1649,8 +1653,8 @@ u8 Item_Give(GlobalContext* globalCtx, u8 item) {
AMMO(ITEM_SLINGSHOT) = CUR_CAPACITY(UPG_BULLET_BAG);
}
- if (!(gSaveContext.itemGetInf[1] & 8)) {
- gSaveContext.itemGetInf[1] |= 8;
+ if (!GET_ITEMGETINF(ITEMGETINF_13)) {
+ SET_ITEMGETINF(ITEMGETINF_13);
return ITEM_NONE;
}
@@ -1695,8 +1699,8 @@ u8 Item_Give(GlobalContext* globalCtx, u8 item) {
func_80087708(globalCtx, 12, 5);
- if (!(gSaveContext.infTable[25] & 0x100)) {
- gSaveContext.infTable[25] |= 0x100;
+ if (!GET_INFTABLE(INFTABLE_198)) {
+ SET_INFTABLE(INFTABLE_198);
return ITEM_NONE;
}
@@ -1708,8 +1712,8 @@ u8 Item_Give(GlobalContext* globalCtx, u8 item) {
func_80087708(globalCtx, 24, 5);
- if (!(gSaveContext.infTable[25] & 0x100)) {
- gSaveContext.infTable[25] |= 0x100;
+ if (!GET_INFTABLE(INFTABLE_198)) {
+ SET_INFTABLE(INFTABLE_198);
return ITEM_NONE;
}
@@ -1770,7 +1774,7 @@ u8 Item_Give(GlobalContext* globalCtx, u8 item) {
}
} else if ((item >= ITEM_WEIRD_EGG) && (item <= ITEM_CLAIM_CHECK)) {
if (item == ITEM_SAW) {
- gSaveContext.itemGetInf[1] |= 0x8000;
+ SET_ITEMGETINF(ITEMGETINF_1F);
}
temp = INV_CONTENT(item);
@@ -1875,7 +1879,7 @@ u8 Item_CheckObtainability(u8 item) {
} else if (item == ITEM_LONGSHOT) {
return ITEM_NONE;
} else if ((item == ITEM_SEEDS) || (item == ITEM_SEEDS_30)) {
- if (!(gSaveContext.itemGetInf[1] & 0x8)) {
+ if (!GET_ITEMGETINF(ITEMGETINF_13)) {
return ITEM_NONE;
} else {
return ITEM_SEEDS;
@@ -1890,8 +1894,8 @@ u8 Item_CheckObtainability(u8 item) {
return ITEM_HEART;
} else if ((item == ITEM_MAGIC_SMALL) || (item == ITEM_MAGIC_LARGE)) {
// "Magic Pot Get_Inf_Table( 25, 0x0100)=%d"
- osSyncPrintf("魔法の壷 Get_Inf_Table( 25, 0x0100)=%d\n", gSaveContext.infTable[25] & 0x100);
- if (!(gSaveContext.infTable[25] & 0x100)) {
+ osSyncPrintf("魔法の壷 Get_Inf_Table( 25, 0x0100)=%d\n", GET_INFTABLE(INFTABLE_198));
+ if (!GET_INFTABLE(INFTABLE_198)) {
return ITEM_NONE;
} else {
return item;
@@ -2639,7 +2643,7 @@ void func_80088AA0(s16 arg0) {
void func_80088AF0(GlobalContext* globalCtx) {
if (gSaveContext.timer2State != 0) {
- if (gSaveContext.eventInf[1] & 1) {
+ if (GET_EVENTINF(EVENTINF_10)) {
gSaveContext.timer2Value = 239;
} else {
gSaveContext.timer2Value = 1;
@@ -3408,8 +3412,10 @@ void Interface_Draw(GlobalContext* globalCtx) {
// Revert any spoiling trade quest items
for (svar1 = 0; svar1 < ARRAY_COUNT(gSpoilingItems); svar1++) {
if (INV_CONTENT(ITEM_TRADE_ADULT) == gSpoilingItems[svar1]) {
- gSaveContext.eventInf[0] &= 0x7F80;
- osSyncPrintf("EVENT_INF=%x\n", gSaveContext.eventInf[0]);
+ gSaveContext.eventInf[EVENTINF_0X_INDEX] &=
+ (u16) ~(EVENTINF_00_MASK | EVENTINF_01_MASK | EVENTINF_02_MASK | EVENTINF_03_MASK |
+ EVENTINF_04_MASK | EVENTINF_05_MASK | EVENTINF_06_MASK | EVENTINF_0F_MASK);
+ osSyncPrintf("EVENT_INF=%x\n", gSaveContext.eventInf[EVENTINF_0X_INDEX]);
globalCtx->nextEntranceIndex = spoilingItemEntrances[svar1];
INV_CONTENT(gSpoilingItemReverts[svar1]) = gSpoilingItemReverts[svar1];
@@ -3719,10 +3725,10 @@ void Interface_Draw(GlobalContext* globalCtx) {
}
} else {
gSaveContext.timer2Value++;
- if (gSaveContext.eventInf[1] & 1) {
+ if (GET_EVENTINF(EVENTINF_10)) {
if (gSaveContext.timer2Value == 240) {
Message_StartTextbox(globalCtx, 0x6083, NULL);
- gSaveContext.eventInf[1] &= ~1;
+ CLEAR_EVENTINF(EVENTINF_10);
gSaveContext.timer2State = 0;
}
}
diff --git a/src/code/z_play.c b/src/code/z_play.c
index 03f7f8b74..b5afd0e22 100644
--- a/src/code/z_play.c
+++ b/src/code/z_play.c
@@ -292,7 +292,7 @@ void Gameplay_Init(GameState* thisx) {
}
} else if ((gEntranceTable[((void)0, gSaveContext.entranceIndex)].scene == SCENE_SPOT04) && LINK_IS_ADULT &&
gSaveContext.sceneSetupIndex < 4) {
- gSaveContext.sceneSetupIndex = (gSaveContext.eventChkInf[4] & 0x100) ? 3 : 2;
+ gSaveContext.sceneSetupIndex = GET_EVENTCHKINF(EVENTCHKINF_48) ? 3 : 2;
}
Gameplay_SpawnScene(
diff --git a/src/code/z_scene_table.c b/src/code/z_scene_table.c
index ee2da46e7..7db9f9392 100644
--- a/src/code/z_scene_table.c
+++ b/src/code/z_scene_table.c
@@ -2846,7 +2846,7 @@ void func_8009E0B8(GlobalContext* globalCtx) {
spA3 = 255 - (u8)globalCtx->roomCtx.unk_74[0];
} else if (gSaveContext.sceneSetupIndex == 6) {
spA0 = globalCtx->roomCtx.unk_74[0] + 500;
- } else if (((gSaveContext.sceneSetupIndex < 4) || LINK_IS_ADULT) && (gSaveContext.eventChkInf[0] & 0x80)) {
+ } else if (((gSaveContext.sceneSetupIndex < 4) || LINK_IS_ADULT) && GET_EVENTCHKINF(EVENTCHKINF_07)) {
spA0 = 2150;
}
@@ -2874,7 +2874,7 @@ void func_8009E54C(GlobalContext* globalCtx) {
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 7058);
- if ((gSaveContext.sceneSetupIndex > 3) || (LINK_IS_ADULT && !(gSaveContext.eventChkInf[6] & 0x200))) {
+ if ((gSaveContext.sceneSetupIndex > 3) || (LINK_IS_ADULT && !GET_EVENTCHKINF(EVENTCHKINF_69))) {
globalCtx->roomCtx.unk_74[0] = 87;
}
diff --git a/src/code/z_sram.c b/src/code/z_sram.c
index f2844a88a..c898a701a 100644
--- a/src/code/z_sram.c
+++ b/src/code/z_sram.c
@@ -175,7 +175,7 @@ void Sram_InitNewSave(void) {
gSaveContext.horseData.pos.z = 5497;
gSaveContext.horseData.angle = -0x6AD9;
gSaveContext.magicLevel = 0;
- gSaveContext.infTable[29] = 1;
+ gSaveContext.infTable[INFTABLE_1DX_INDEX] = 1;
gSaveContext.sceneFlags[5].swch = 0x40000000;
}
@@ -265,8 +265,8 @@ void Sram_InitDebugSave(void) {
gSaveContext.horseData.angle = -0x6AD9;
gSaveContext.infTable[0] |= 0x5009;
gSaveContext.eventChkInf[0] |= 0x123F;
- gSaveContext.eventChkInf[8] |= 1;
- gSaveContext.eventChkInf[12] |= 0x10;
+ SET_EVENTCHKINF(EVENTCHKINF_80);
+ SET_EVENTCHKINF(EVENTCHKINF_C4);
if (LINK_AGE_IN_YEARS == YEARS_CHILD) {
gSaveContext.equips.buttonItems[0] = ITEM_SWORD_KOKIRI;
@@ -408,9 +408,9 @@ void Sram_OpenSave(SramContext* sramCtx) {
}
// if zelda cutscene has been watched but lullaby was not obtained, restore cutscene and take away letter
- if ((gSaveContext.eventChkInf[4] & 1) && !CHECK_QUEST_ITEM(QUEST_SONG_LULLABY)) {
- i = gSaveContext.eventChkInf[4] & ~1;
- gSaveContext.eventChkInf[4] = i;
+ if (GET_EVENTCHKINF(EVENTCHKINF_40) && !CHECK_QUEST_ITEM(QUEST_SONG_LULLABY)) {
+ i = gSaveContext.eventChkInf[EVENTCHKINF_40_INDEX] & ~EVENTCHKINF_40_MASK;
+ gSaveContext.eventChkInf[EVENTCHKINF_40_INDEX] = i;
INV_CONTENT(ITEM_LETTER_ZELDA) = ITEM_CHICKEN;
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-03 19:33:00 +0000