mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-06-03 18:06:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

ChkBit comments and enum work (#2571)

Browse Source 
* Jagar cleanup

* saru work

* e_fm work

* gob enum added

* gob cleanup

* gob anm enums

* dComIfGs_isEventBit comments added

* More bit work and besu enum work

* Maybe fixed the issue?
This commit is contained in:
Carco_21
2025-08-08 14:39:26 -04:00
committed by GitHub
parent 7df70ce3ca
commit 427643edd2
114 changed files with 2680 additions and 1153 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/d_menu_collect.cpp
+16 -2
View File
@@ -237,12 +237,19 @@ bool dMenu_Collect2D_c::isFishIconVisible() {
/* 801B061C-801B071C 1AAF5C 0100+00 2/2 0/0 0/0 .text isSkillIconVisible__17dMenu_Collect2D_cFv */
bool dMenu_Collect2D_c::isSkillIconVisible() {
/* dSv_event_flag_c::F_0338 - Secret techniques - Obtained 1 secret techinques - Shield attack */
if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[338]) ||
/* dSv_event_flag_c::F_0339 - Secret techniques - Obtained 2 secret techinques */
dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[339]) ||
/* dSv_event_flag_c::F_0340 - Secret techniques - Obtained 3 secret techinques */
dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[340]) ||
/* dSv_event_flag_c::F_0341 - Secret techniques - Obtained 4 secret techinques */
dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[341]) ||
/* dSv_event_flag_c::F_0342 - Secret techniques - Obtained 5 secret techinques */
dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[342]) ||
/* dSv_event_flag_c::F_0343 - Secret techniques - Obtained 6 secret techinques */
dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[343]) ||
/* dSv_event_flag_c::F_0344 - Secret techniques - Obtained 7 secret techinques */
dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[344]))
{
return true;
@@ -321,7 +328,9 @@ void dMenu_Collect2D_c::screenSet() {
field_0x22d[1][0] = 0;
field_0x22d[2][0] = 0;
field_0x22d[3][0] = dComIfGs_isItemFirstBit(0x28) ||
(dComIfGs_isItemFirstBit(0x3F) && !dComIfGs_isEventBit(0x302)) ?
(dComIfGs_isItemFirstBit(0x3F)
/* dSv_event_flag_c::F_0026 - Ordon Village - gave wooden sword to talo on 3rd day */
&& !dComIfGs_isEventBit(0x302)) ?
true :
false;
@@ -329,7 +338,9 @@ void dMenu_Collect2D_c::screenSet() {
if (dComIfGs_isItemFirstBit(0x28)) {
mpScreen->search('ken_00')->hide();
mpScreen->search('ken_01')->show();
} else if (dComIfGs_isItemFirstBit(0x3F) && !dComIfGs_isEventBit(0x302)) {
} else if (dComIfGs_isItemFirstBit(0x3F)
/* dSv_event_flag_c::F_0026 - Ordon Village - gave wooden sword to talo on 3rd day */
&& !dComIfGs_isEventBit(0x302)) {
mpScreen->search('ken_00')->show();
mpScreen->search('ken_01')->hide();
}
@@ -546,6 +557,7 @@ void dMenu_Collect2D_c::screenSet() {
field_0x1d8[5][3] = 0;
field_0x1d8[6][3] = 0;
field_0x1d8[0][4] = dMsgObject_getSmellTypeMessageID() + 0x100;
/* dSv_event_flag_c::F_0456 - Castle Town - First time meeting with Jovani */
if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[456])) {
field_0x1d8[1][4] = 0x12d8;
} else {
@@ -2556,7 +2568,9 @@ u8 dMenu_Collect3D_c::getMirrorNum() {
/* 801B7504-801B75E8 1B1E44 00E4+00 4/4 0/0 0/0 .text getMaskMdlVisible__17dMenu_Collect3D_cFv */
u8 dMenu_Collect3D_c::getMaskMdlVisible() {
if ((getCrystalNum() == 0 && getMirrorNum() == 0) ||
/* dSv_event_flag_c::M_071 - Cutscene - [cutscene: 20] Zant appears (during Midna's desperate hour) */
(dComIfGs_isEventBit(0xC01) && !dComIfGs_isCollectMirror(0)) ||
/* dSv_event_flag_c::F_0354 - Cutscene - [cutscene] Mirror complete */
(dComIfGs_isEventBit(0x2B08) && !dComIfGs_isCollectCrystal(3)))
{
return 0;