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

Added enums for all used event/tmp bits/regs (#893)

Browse Source
This commit is contained in:
LagoLunatic
2025-09-19 15:06:44 -04:00
committed by GitHub
parent 8af44daa2e
commit 5dbb7e875e
110 changed files with 1906 additions and 1178 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_npc_bmsw.cpp
+27 -27
View File
@@ -188,7 +188,7 @@ static BOOL nodeCallBackArm(J3DNode* node, int calcTiming) {
/* 00000550-000006F4 .text daNpc_Bmsw_getGameEndMsg__Fs */
static u32 daNpc_Bmsw_getGameEndMsg(short rupees) {
u8 reg_val = dComIfGs_getEventReg(0xC203);
u8 reg_val = dComIfGs_getEventReg(dSv_event_flag_c::UNK_C203);
u32 msgNo;
switch (reg_val) {
case 0:
@@ -226,15 +226,15 @@ static u32 daNpc_Bmsw_getGameEndMsg(short rupees) {
break;
case 3:
default:
if (dComIfGs_isEventBit(dSv_evtBit_c::UNK_2701)) {
if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_2701)) {
if (rupees == 0) {
msgNo = 0x1A69;
} else if (rupees == 1) {
msgNo = 0x1A6A;
} else if (rupees <= dComIfGs_getEventReg(0x8AFF)) {
} else if (rupees <= dComIfGs_getEventReg(dSv_event_flag_c::UNK_8AFF)) {
msgNo = 0x1A6B;
} else {
dComIfGs_setEventReg(0x8AFF, rupees);
dComIfGs_setEventReg(dSv_event_flag_c::UNK_8AFF, rupees);
msgNo = 0x1A6D;
}
} else {
@@ -400,7 +400,7 @@ u16 daNpc_Bmsw_c::next_msgStatus(unsigned long* currMsgNo) {
break;
case 0x1A2E:
if (mpCurrMsg->mSelectNum == 0) {
dComIfGs_onEventBit(dSv_evtBit_c::UNK_1A01);
dComIfGs_onEventBit(dSv_event_flag_c::UNK_1A01);
*currMsgNo = 0x1A31;
} else if (mpCurrMsg->mSelectNum == 1) {
if (dComIfGs_isStageBossEnemy(dSv_save_c::STAGE_DRC)) {
@@ -418,7 +418,7 @@ u16 daNpc_Bmsw_c::next_msgStatus(unsigned long* currMsgNo) {
}
break;
case 0x1A34:
if (!dComIfGs_isEventBit(dSv_evtBit_c::UNK_1A01)) {
if (!dComIfGs_isEventBit(dSv_event_flag_c::UNK_1A01)) {
*currMsgNo = 0x1A32;
} else {
*currMsgNo = 0x1A42;
@@ -426,25 +426,25 @@ u16 daNpc_Bmsw_c::next_msgStatus(unsigned long* currMsgNo) {
break;
case 0x1A38:
(*currMsgNo)++;
dComIfGs_setEventReg(0xC203, 1);
dComIfGs_setEventReg(dSv_event_flag_c::UNK_C203, 1);
break;
case 0x1A3D:
if (mpCurrMsg->mSelectNum == 0) {
dComIfGs_onEventBit(dSv_evtBit_c::UNK_1A01);
dComIfGs_onEventBit(dSv_event_flag_c::UNK_1A01);
*currMsgNo = 0x1A31;
} else {
*currMsgNo = 0x1A3E;
}
break;
case 0x1A4D:
dComIfGs_setEventReg(0xC203, 2);
dComIfGs_setEventReg(dSv_event_flag_c::UNK_C203, 2);
// fallthrough
case 0x1A51:
case 0x1A53:
*currMsgNo = 0x1A4E;
break;
case 0x1A58:
dComIfGs_setEventReg(0xC203, 3);
dComIfGs_setEventReg(dSv_event_flag_c::UNK_C203, 3);
(*currMsgNo)++;
break;
case 0x1A5E:
@@ -518,22 +518,22 @@ u32 daNpc_Bmsw_c::getMsg() {
if (field_0x9C0 != fpcM_ERROR_PROCESS_ID_e) {
field_0x9C0 = fpcM_ERROR_PROCESS_ID_e;
} else {
if (dComIfGs_isEventBit(dSv_evtBit_c::UNK_2701)) {
if (!dComIfGs_isTmpBit(800)) {
dComIfGs_onTmpBit(800);
if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_2701)) {
if (!dComIfGs_isTmpBit(dSv_event_tmp_flag_c::UNK_0320)) {
dComIfGs_onTmpBit(dSv_event_tmp_flag_c::UNK_0320);
msg = 0x1A63;
} else {
msg = 0x1A66;
}
} else {
if (!dComIfGs_isEventBit(dSv_evtBit_c::UNK_1A02)) {
dComIfGs_onEventBit(dSv_evtBit_c::UNK_1A02);
if (!dComIfGs_isEventBit(dSv_event_flag_c::UNK_1A02)) {
dComIfGs_onEventBit(dSv_event_flag_c::UNK_1A02);
msg = 0x1A2D;
} else {
if (!dComIfGs_isEventBit(dSv_evtBit_c::UNK_1A01)) {
if (!dComIfGs_isEventBit(dSv_event_flag_c::UNK_1A01)) {
msg = 0x1A3D;
} else {
u8 reg = dComIfGs_getEventReg(0xC203);
u8 reg = dComIfGs_getEventReg(dSv_event_flag_c::UNK_C203);
switch (reg) {
case 0:
msg = 0x1A3F;
@@ -606,7 +606,7 @@ BOOL daNpc_Bmsw_c::CreateInit() {
mpMorfHand->calc();
dKy_tevstr_init(&field_0x6E0, home.roomNo, 0xFF);
if (dComIfGs_isEventBit(dSv_evtBit_c::UNK_2701)) {
if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_2701)) {
field_0x9E0 = fopAcM_createChild(
"Btsw",
fopAcM_GetID(this),
@@ -672,7 +672,7 @@ void daNpc_Bmsw_c::lookBack() {
vec = current.pos;
vec.y = eyePos.y;
} else {
if (dComIfGs_isEventBit(dSv_evtBit_c::UNK_2701) && field_0x9E0 != fpcM_ERROR_PROCESS_ID_e) {
if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_2701) && field_0x9E0 != fpcM_ERROR_PROCESS_ID_e) {
fopAc_ac_c* ac = fopAcM_SearchByID(field_0x9E0);
if (ac != NULL) {
vec2 = ac->eyePos;
@@ -705,7 +705,7 @@ void daNpc_Bmsw_c::wait01() {
field_0x9D7 = 2;
}
if (!dComIfGs_isEventBit(dSv_evtBit_c::UNK_2701)) {
if (!dComIfGs_isEventBit(dSv_event_flag_c::UNK_2701)) {
if (mpMorf->checkFrame(mpMorf->getEndFrame() - 1.0f)) {
if (--field_0x9D6 <= 0) {
if (field_0x9D5 == 5) {
@@ -745,7 +745,7 @@ void daNpc_Bmsw_c::talk01() {
field_0x9DA = 1;
dComIfGp_event_reset();
if (!dComIfGs_isEventBit(dSv_evtBit_c::UNK_2701)) {
if (!dComIfGs_isEventBit(dSv_event_flag_c::UNK_2701)) {
setAnm(0);
} else {
setAnm(1);
@@ -764,7 +764,7 @@ BOOL daNpc_Bmsw_c::wait_action(void*) {
if (mActionStatus == ACTION_STARTING) {
field_0x9DA = 1;
field_0x9D6 = 1;
if (!dComIfGs_isEventBit(dSv_evtBit_c::UNK_2701)) {
if (!dComIfGs_isEventBit(dSv_event_flag_c::UNK_2701)) {
setAnm(FALSE);
} else {
setAnm(TRUE);
@@ -809,7 +809,7 @@ BOOL daNpc_Bmsw_c::checkNextMailThrowOK() {
/* 00001C70-00001DA4 .text setGameGetRupee__12daNpc_Bmsw_cFs */
void daNpc_Bmsw_c::setGameGetRupee(short rupees) {
u8 reg_val = dComIfGs_getEventReg(0xC203);
u8 reg_val = dComIfGs_getEventReg(dSv_event_flag_c::UNK_C203);
switch (reg_val) {
case 0:
if (rupees < 10) {
@@ -839,7 +839,7 @@ void daNpc_Bmsw_c::setGameGetRupee(short rupees) {
break;
case 3:
default:
if (dComIfGs_isEventBit(dSv_evtBit_c::UNK_2701)) {
if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_2701)) {
field_0x960 = rupees;
} else {
field_0x960 = rupees * 3;
@@ -888,7 +888,7 @@ BOOL daNpc_Bmsw_c::shiwake_game_action(void*) {
field_0x9B1 = 0;
if (!eventInfo.checkCommandDemoAccrpt()) {
if (!dComIfGs_isEventBit(dSv_evtBit_c::UNK_2701)) {
if (!dComIfGs_isEventBit(dSv_event_flag_c::UNK_2701)) {
field_0x9D8 = dComIfGp_evmng_getEventIdx("SHIWAKEGAME");
} else {
field_0x9D8 = dComIfGp_evmng_getEventIdx("SHIWAKEGAME2");
@@ -1133,8 +1133,8 @@ static BOOL CallbackCreateHeap(fopAc_ac_c* i_this) {
cPhs_State daNpc_Bmsw_c::_create() {
fopAcM_SetupActor(this, daNpc_Bmsw_c);
u8 reg_val = dComIfGs_getEventReg(0xC203);
if (reg_val >= 3 && !dComIfGs_isEventBit(dSv_evtBit_c::UNK_2701)) {
u8 reg_val = dComIfGs_getEventReg(dSv_event_flag_c::UNK_C203);
if (reg_val >= 3 && !dComIfGs_isEventBit(dSv_event_flag_c::UNK_2701)) {
fopAcM_create(
"Btsw",
fopAcM_GetParam(this),