mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-05 01:19:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add enum for pearls/symbols

Browse Source
This commit is contained in:
LagoLunatic
2026-07-23 22:07:02 -04:00
parent 4efda6f355
commit af1c8e261e
18 changed files with 53 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/d_com_inf_game.h
+7
View File
@@ -1657,6 +1657,13 @@ inline void dComIfGs_onTriforce(u8 i_no) {
g_dComIfG_gameInfo.save.getPlayer().getCollect().onTriforce(i_no);
}
// Goddess pearls (aka "god symbols").
enum dSymbolIndex_e {
/* 0x0 */ dSymbol_NAYRU_e,
/* 0x1 */ dSymbol_DIN_e,
/* 0x2 */ dSymbol_FARORE_e,
};
inline BOOL dComIfGs_isSymbol(u8 i_no) {
return g_dComIfG_gameInfo.save.getPlayer().getCollect().isSymbol(i_no);
}
src/d/actor/d_a_agb.cpp
+2 -2
View File
@@ -1162,11 +1162,11 @@ void daAgb_c::FlagsSend(u32 stage_type) {
mFlags.field_0x9_7 = 0;
mFlags.field_0x9_6 = 0;
mFlags.field_0x9_5 = 0;
} else if (dComIfGs_isSymbol(2)) {
} else if (dComIfGs_isSymbol(dSymbol_FARORE_e)) {
mFlags.field_0x9_7 = 0;
mFlags.field_0x9_6 = 0;
mFlags.field_0x9_5 = 1;
} else if (dComIfGs_isSymbol(1)) {
} else if (dComIfGs_isSymbol(dSymbol_DIN_e)) {
mFlags.field_0x9_7 = 0;
mFlags.field_0x9_6 = 1;
mFlags.field_0x9_5 = 0;
src/d/actor/d_a_agbsw0.cpp
+3 -3
View File
@@ -1707,7 +1707,7 @@ BOOL daAgbsw0_c::MoveCheck(s16 conditionNo) {
break;
case 2:
if(dComIfGs_isSymbol(0)) {
if(dComIfGs_isSymbol(dSymbol_NAYRU_e)) {
return FALSE;
}
@@ -1994,13 +1994,13 @@ BOOL daAgbsw0_c::MoveCheck(s16 conditionNo) {
break;
case 0x2F:
if(dComIfGs_isSymbol(1) && !dComIfGs_isEventBit(dSv_event_flag_c::UNLOCK_TING_DISCOUNT)) {
if(dComIfGs_isSymbol(dSymbol_DIN_e) && !dComIfGs_isEventBit(dSv_event_flag_c::UNLOCK_TING_DISCOUNT)) {
return FALSE;
}
break;
case 0x30:
if(dComIfGs_isSymbol(1) && !dComIfGs_isEventBit(dSv_event_flag_c::UNLOCK_TINGLE_BALLOON_DISCOUNT)) {
if(dComIfGs_isSymbol(dSymbol_DIN_e) && !dComIfGs_isEventBit(dSv_event_flag_c::UNLOCK_TINGLE_BALLOON_DISCOUNT)) {
return FALSE;
}
src/d/actor/d_a_knob00.cpp
+2 -2
View File
@@ -286,7 +286,7 @@ void daKnob00_c::openEnd() {
BOOL daKnob00_c::chkException() {
switch (home.angle.z) {
case 0x6A6:
if (dComIfGs_isSymbol(0)) {
if (dComIfGs_isSymbol(dSymbol_NAYRU_e)) {
return 1;
}
@@ -318,7 +318,7 @@ BOOL daKnob00_c::chkException() {
break;
case 0x6AA:
if (!dComIfGs_isSymbol(1)) {
if (!dComIfGs_isSymbol(dSymbol_DIN_e)) {
return 1;
}
src/d/actor/d_a_kytag05.cpp
+1 -1
View File
@@ -122,7 +122,7 @@ static BOOL daKytag05_Delete(kytag05_class*) {
static cPhs_State daKytag05_Create(fopAc_ac_c* i_this) {
fopAcM_ct_Retail(i_this, kytag05_class);
kytag05_class *a_this = (kytag05_class*)i_this;
if (dComIfGs_isSymbol(1) != 0) {
if (dComIfGs_isSymbol(dSymbol_DIN_e)) {
return cPhs_STOP_e;
}
src/d/actor/d_a_kytag06.cpp
+1 -1
View File
@@ -62,7 +62,7 @@ static cPhs_State daKytag06_Create(fopAc_ac_c* i_this) {
kytag06_class* a_this = (kytag06_class*)i_this;
cPhs_State phase_state;
if(dComIfGs_isSymbol(0)) {
if(dComIfGs_isSymbol(dSymbol_NAYRU_e)) {
phase_state = cPhs_ERROR_e;
} else {
fopAcM_ct_Demo(i_this, kytag06_class);
src/d/actor/d_a_npc_bm1.cpp
+9 -10
View File
@@ -512,29 +512,29 @@ bool daNpc_Bm1_c::chk_appCnd() {
case 0:
return TRUE;
case 1:
if (!dComIfGs_isSymbol(1)) {
if (!dComIfGs_isSymbol(dSymbol_DIN_e)) {
return TRUE;
}
break;
case 2:
if (dComIfGs_isSymbol(1)) {
if (dComIfGs_isSymbol(dSymbol_DIN_e)) {
return !dComIfGs_isEventBit(dSv_event_flag_c::UNK_1A80);
}
break;
case 3:
if (!dComIfGs_isSymbol(1)) {
if (!dComIfGs_isSymbol(dSymbol_DIN_e)) {
return FALSE;
}
if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_1A80)) {
return dKy_daynight_check() == 0;
return dKy_daynight_check() == dKy_TIME_DAY_e;
}
break;
case 4:
if (!dComIfGs_isSymbol(1)) {
if (!dComIfGs_isSymbol(dSymbol_DIN_e)) {
return FALSE;
}
if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_1A80)) {
return dKy_daynight_check() == 1;
return dKy_daynight_check() == dKy_TIME_NIGHT_e;
}
break;
}
@@ -571,8 +571,7 @@ bool daNpc_Bm1_c::init_PST_2() {
/* 00000C0C-00000CB8 .text init_PST_3__11daNpc_Bm1_cFv */
bool daNpc_Bm1_c::init_PST_3() {
bool result;
result = dComIfGs_isSymbol(1) == 0;
bool result = dComIfGs_isSymbol(dSymbol_DIN_e) == 0;
if (result) {
result = dComIfGs_isEventBit(dSv_event_flag_c::UNK_1102) != 0;
if (result) {
@@ -1505,7 +1504,7 @@ u32 daNpc_Bm1_c::getMsg_PST_3() {
/* 00002B40-00002BE8 .text getMsg_SKT_0__11daNpc_Bm1_cFv */
u32 daNpc_Bm1_c::getMsg_SKT_0() {
if (dComIfGs_isSymbol(1)) {
if (dComIfGs_isSymbol(dSymbol_DIN_e)) {
if (!dComIfGs_isEventBit(dSv_event_flag_c::UNK_1A80)) {
return 0x186B;
} else if (!dComIfGs_isEventBit(dSv_event_flag_c::UNK_1820)) {
@@ -1519,7 +1518,7 @@ u32 daNpc_Bm1_c::getMsg_SKT_0() {
/* 00002BE8-00002C90 .text getMsg_KKT_0__11daNpc_Bm1_cFv */
u32 daNpc_Bm1_c::getMsg_KKT_0() {
if (dComIfGs_isSymbol(1)) {
if (dComIfGs_isSymbol(dSymbol_DIN_e)) {
if (!dComIfGs_isEventBit(dSv_event_flag_c::UNK_1A80)) {
return 0x186F;
} else if (!dComIfGs_isEventBit(dSv_event_flag_c::UNK_1820)) {
src/d/actor/d_a_npc_btsw.cpp
+1 -1
View File
@@ -358,7 +358,7 @@ u16 daNpc_Btsw_c::next_msgStatus(u32* currMsgNo) {
*currMsgNo = 0x1AA7;
} else if (dLetter_isNoSend(dSv_event_flag_c::LETTER_BAITOS_MOM)) {
*currMsgNo = 0x1AAB;
} else if (!dComIfGs_isSymbol(1)) {
} else if (!dComIfGs_isSymbol(dSymbol_DIN_e)) {
*currMsgNo = 0x1AB4;
} else if (!dLetter_isRead(dSv_event_flag_c::LETTER_BAITOS_MOM)) {
*currMsgNo = 0x1AAD;
src/d/actor/d_a_npc_people.cpp
+1 -1
View File
@@ -6595,7 +6595,7 @@ u16 daNpcPeople_c::next_msgStatus(u32* pMsgNo) {
if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_1808)) {
m734 = l_msg_uw1_done_gp1_arasoi;
}
else if(dComIfGs_isSymbol(0)) {
else if(dComIfGs_isSymbol(dSymbol_NAYRU_e)) {
m734 = l_msg_uw1_get_pearl1;
}
else if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_1E10)) {
src/d/actor/d_a_obj_eayogn.cpp
+1 -1
View File
@@ -87,7 +87,7 @@ bool daObjEayogn_c::_delete() {
/* 00000330-00000360 .text check_ev_bit__13daObjEayogn_cCFv */
BOOL daObjEayogn_c::check_ev_bit() const {
return dComIfGs_isSymbol(1);
return dComIfGs_isSymbol(dSymbol_DIN_e);
}
/* 00000360-000003E8 .text init_mtx__13daObjEayogn_cFv */
src/d/actor/d_a_obj_quake.cpp
+1 -1
View File
@@ -28,7 +28,7 @@ daObjQuake_HIO_c::daObjQuake_HIO_c() {
cPhs_State daObjQuake_c::_create() {
fopAcM_ct(this, daObjQuake_c);
if (dComIfGs_isSymbol(1)) {
if (dComIfGs_isSymbol(dSymbol_DIN_e)) {
return cPhs_STOP_e;
}
src/d/actor/d_a_obj_rcloud.cpp
+1 -1
View File
@@ -97,7 +97,7 @@ cPhs_State daObjRcloud_c::_create() {
}
break;
case 1:
if (dComIfGs_isSymbol(0) == 0) {
if (!dComIfGs_isSymbol(dSymbol_NAYRU_e)) {
phase = dComIfG_resLoad(&mPhase, l_arcname);
mResourceLoadedFlag = 1;
}
src/d/actor/d_a_obj_toripost.cpp
+2 -2
View File
@@ -858,7 +858,7 @@ void daObjTpost_c::modeProc(daObjTpost_c::Proc_e proc, int newMode) {
/* 00001758-000018CC .text _execute__12daObjTpost_cFv */
bool daObjTpost_c::_execute() {
if(dComIfGs_isSymbol(1)) {
if(dComIfGs_isSymbol(dSymbol_DIN_e)) {
mNumReadable = getReadableLetterNum();
}
else {
@@ -914,7 +914,7 @@ bool daObjTpost_c::_draw() {
/* 00001980-00001BA4 .text createInit__12daObjTpost_cFv */
void daObjTpost_c::createInit() {
if(dComIfGs_isSymbol(2)) {
if(dComIfGs_isSymbol(dSymbol_FARORE_e)) {
dLetter_autoStock(dSv_event_flag_c::LETTER_KOMALIS_FATHER);
}
src/d/actor/d_a_ship.cpp
+7 -7
View File
@@ -345,10 +345,10 @@ BOOL daShip_c::checkForceMessage() {
if (dComIfGs_isGetItem(1, 0) && !dComIfGs_isEventBit(dSv_event_flag_c::UNK_0908)) {
mNextMessageNo = 0x5E0;
}
else if (dComIfGs_isSymbol(1) && !dComIfGs_isEventBit(dSv_event_flag_c::UNK_0A80)) {
else if (dComIfGs_isSymbol(dSymbol_DIN_e) && !dComIfGs_isEventBit(dSv_event_flag_c::UNK_0A80)) {
mNextMessageNo = 0x5EC;
}
else if (dComIfGs_isSymbol(2) && !dComIfGs_isEventBit(dSv_event_flag_c::UNK_0A08)) {
else if (dComIfGs_isSymbol(dSymbol_FARORE_e) && !dComIfGs_isEventBit(dSv_event_flag_c::UNK_0A08)) {
mNextMessageNo = 0x5F6;
}
else if (dComIfGs_isEventBit(dSv_event_flag_c::ENDLESS_NIGHT) && !dComIfGs_isEventBit(dSv_event_flag_c::UNK_0A01)) {
@@ -357,7 +357,7 @@ BOOL daShip_c::checkForceMessage() {
else if (dComIfGs_checkGetItem(dItemNo_BOMB_BAG_e) && !dComIfGs_isEventBit(dSv_event_flag_c::UNK_1F02)) {
mNextMessageNo = 0x624;
}
else if (dComIfGs_isSymbol(0) && !dComIfGs_isEventBit(dSv_event_flag_c::UNK_2F20)) {
else if (dComIfGs_isSymbol(dSymbol_NAYRU_e) && !dComIfGs_isEventBit(dSv_event_flag_c::UNK_2F20)) {
mNextMessageNo = 0xD5A;
}
else if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_2D10) && !daPy_getPlayerActorClass()->checkMasterSwordEquip()) {
@@ -495,7 +495,7 @@ void daShip_c::setInitMessage() {
else if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_2F20)) {
mNextMessageNo = 0xd62;
}
else if (dComIfGs_isSymbol(0)) {
else if (dComIfGs_isSymbol(dSymbol_NAYRU_e)) {
mNextMessageNo = 0xd5a;
}
else if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_1940)) {
@@ -557,7 +557,7 @@ void daShip_c::setInitMessage() {
}
}
else if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_0A20)) {
if (dComIfGs_isSymbol(2)) {
if (dComIfGs_isSymbol(dSymbol_FARORE_e)) {
mNextMessageNo = 0x5f6;
}
else {
@@ -584,7 +584,7 @@ void daShip_c::setInitMessage() {
}
}
else if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_0902)) {
if (dComIfGs_isSymbol(1)) {
if (dComIfGs_isSymbol(dSymbol_DIN_e)) {
mNextMessageNo = 0x5ec;
}
else {
@@ -1019,7 +1019,7 @@ BOOL daShip_c::checkOutRange() {
if (bVar5) {
if (
(pathIndex == 0 && dComIfGs_isEventBit(dSv_event_flag_c::UNK_0902)) ||
(pathIndex == 1 && dComIfGs_isSymbol(2)) ||
(pathIndex == 1 && dComIfGs_isSymbol(dSymbol_FARORE_e)) ||
(pathIndex == 2 && daPy_getPlayerActorClass()->checkMasterSwordEquip())
) {
path = dPath_GetNextRoomPath(path, -1);
src/d/actor/d_a_ykgr.cpp
+1 -1
View File
@@ -134,7 +134,7 @@ cPhs_State daYkgr_c::_create() {
m_path = NULL;
}
if (strcmp(dComIfGp_getStartStageName(), "Adanmae") == 0 && dComIfGs_isSymbol(1)) {
if (strcmp(dComIfGp_getStartStageName(), "Adanmae") == 0 && dComIfGs_isSymbol(dSymbol_DIN_e)) {
return cPhs_STOP_e;
}
src/d/d_com_inf_game.cpp
+6 -6
View File
@@ -971,17 +971,17 @@ u8 dComIfGs_checkGetItem(u8 i_itemNo) {
}
break;
case dItemNo_PEARL_NAYRU_e:
if (dComIfGs_isSymbol(0)) {
if (dComIfGs_isSymbol(dSymbol_NAYRU_e)) {
get_item = 1;
}
break;
case dItemNo_PEARL_DIN_e:
if (dComIfGs_isSymbol(1)) {
if (dComIfGs_isSymbol(dSymbol_DIN_e)) {
get_item = 1;
}
break;
case dItemNo_PEARL_FARORE_e:
if (dComIfGs_isSymbol(2)) {
if (dComIfGs_isSymbol(dSymbol_FARORE_e)) {
get_item = 1;
}
break;
@@ -1095,17 +1095,17 @@ u8 dComIfGs_checkGetItemNum(u8 i_itemNo) {
}
break;
case dItemNo_PEARL_NAYRU_e:
if (dComIfGs_isSymbol(0)) {
if (dComIfGs_isSymbol(dSymbol_NAYRU_e)) {
get_item = 1;
}
break;
case dItemNo_PEARL_DIN_e:
if (dComIfGs_isSymbol(1)) {
if (dComIfGs_isSymbol(dSymbol_DIN_e)) {
get_item = 1;
}
break;
case dItemNo_PEARL_FARORE_e:
if (dComIfGs_isSymbol(2)) {
if (dComIfGs_isSymbol(dSymbol_FARORE_e)) {
get_item = 1;
}
break;
src/d/d_item.cpp
+6 -6
View File
@@ -1069,17 +1069,17 @@ void item_func_triforce8() {
/* 800C43D8-800C4408 .text item_func_pearl1__Fv */
void item_func_pearl1() {
dComIfGs_onSymbol(0);
dComIfGs_onSymbol(dSymbol_NAYRU_e);
}
/* 800C4408-800C4438 .text item_func_pearl2__Fv */
void item_func_pearl2() {
dComIfGs_onSymbol(1);
dComIfGs_onSymbol(dSymbol_DIN_e);
}
/* 800C4438-800C4468 .text item_func_pearl3__Fv */
void item_func_pearl3() {
dComIfGs_onSymbol(2);
dComIfGs_onSymbol(dSymbol_FARORE_e);
}
/* 800C4468-800C446C .text item_func_knowledge_tf__Fv */
@@ -2433,17 +2433,17 @@ int item_getcheck_func_triforce8() {
/* 800C7010-800C7040 .text item_getcheck_func_pearl1__Fv */
int item_getcheck_func_pearl1() {
return dComIfGs_isSymbol(0);
return dComIfGs_isSymbol(dSymbol_NAYRU_e);
}
/* 800C7040-800C7070 .text item_getcheck_func_pearl2__Fv */
int item_getcheck_func_pearl2() {
return dComIfGs_isSymbol(1);
return dComIfGs_isSymbol(dSymbol_DIN_e);
}
/* 800C7070-800C70A0 .text item_getcheck_func_pearl3__Fv */
int item_getcheck_func_pearl3() {
return dComIfGs_isSymbol(2);
return dComIfGs_isSymbol(dSymbol_FARORE_e);
}
/* 800C70A0-800C70D0 .text item_getcheck_func_tact_song1__Fv */
src/d/d_kankyo.cpp
+1 -1
View File
@@ -3159,7 +3159,7 @@ void dKy_arrowcol_chg_move() {
/* 80196764-801967C4 .text dKy_checkEventNightStop__Fv */
BOOL dKy_checkEventNightStop() {
if (dComIfGs_isEventBit(dSv_event_flag_c::ENDLESS_NIGHT) && !dComIfGs_isSymbol(0)) {
if (dComIfGs_isEventBit(dSv_event_flag_c::ENDLESS_NIGHT) && !dComIfGs_isSymbol(dSymbol_NAYRU_e)) {
return true;
}