mirror of
https://github.com/zeldaret/tww.git
synced 2026-08-18 21:18:23 -04:00
Added enums for all used event/tmp bits/regs (#893)
This commit is contained in:
+18
-18
@@ -542,7 +542,7 @@ int daAgb_c::uploadMessageSend() {
|
||||
mUploadAction = UpAct_UNKB;
|
||||
field_0x664 = 60;
|
||||
|
||||
dComIfGs_onEventBit(0x1A20);
|
||||
dComIfGs_onEventBit(dSv_event_flag_c::UNK_1A20);
|
||||
dComIfGp_particle_set(dPa_name::ID_COMMON_02E7, ¤t.pos, NULL, NULL, 255, &field_0x684);
|
||||
|
||||
JKRHeap::free(l_gbaCommand->getMemAddress(), NULL);
|
||||
@@ -812,16 +812,16 @@ void daAgb_c::FlagsRecv() {
|
||||
field_0x632 = BigLittleChange(mGbaFlg.field_0x6) >> 0x10;
|
||||
field_0x67a = mGbaFlg.field_0x2.m2;
|
||||
|
||||
if (!dComIfGs_isEventBit(0x1708) && mGbaFlg.field_0x2.m3) {
|
||||
dComIfGs_onEventBit(0x1708);
|
||||
if (!dComIfGs_isEventBit(dSv_event_flag_c::UNK_1708) && mGbaFlg.field_0x2.m3) {
|
||||
dComIfGs_onEventBit(dSv_event_flag_c::UNK_1708);
|
||||
}
|
||||
|
||||
if (!dComIfGs_isEventBit(0x1A10) && mGbaFlg.field_0x2.m4) {
|
||||
dComIfGs_onEventBit(0x1A10);
|
||||
if (!dComIfGs_isEventBit(dSv_event_flag_c::UNLOCK_TINGLE_BALLOON_DISCOUNT) && mGbaFlg.field_0x2.m4) {
|
||||
dComIfGs_onEventBit(dSv_event_flag_c::UNLOCK_TINGLE_BALLOON_DISCOUNT);
|
||||
}
|
||||
|
||||
if (!dComIfGs_isEventBit(0x1A08) && mGbaFlg.field_0x2.m5) {
|
||||
dComIfGs_onEventBit(0x1A08);
|
||||
if (!dComIfGs_isEventBit(dSv_event_flag_c::UNLOCK_TING_DISCOUNT) && mGbaFlg.field_0x2.m5) {
|
||||
dComIfGs_onEventBit(dSv_event_flag_c::UNLOCK_TING_DISCOUNT);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -872,7 +872,7 @@ void daAgb_c::GbaItemUse() {
|
||||
var_r28 = 0xA;
|
||||
} else if (temp_f1 < 70.0) {
|
||||
var_r28 = 0xD;
|
||||
} else if (dComIfGs_isEventBit(0x2E08)) {
|
||||
} else if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_2E08)) {
|
||||
var_r28 = 0xC;
|
||||
} else {
|
||||
var_r28 = 0xD;
|
||||
@@ -1157,11 +1157,11 @@ void daAgb_c::FlagsSend(u32 stage_type) {
|
||||
mFlags.field_0x6_3 = dKy_getdaytime_hour();
|
||||
mFlags.field_0x7_2 = dKy_getdaytime_minute();
|
||||
mFlags.field_0x8_1 = dComIfGs_getLife();
|
||||
mFlags.field_0xa_1 = dComIfGs_isEventBit(0x1708);
|
||||
mFlags.field_0x7_1 = dComIfGs_isEventBit(dSv_evtBit_c::UNLOCK_TINGLE_BALLOON_DISCOUNT);
|
||||
mFlags.field_0x7_0 = dComIfGs_isEventBit(dSv_evtBit_c::UNLOCK_TING_DISCOUNT);
|
||||
mFlags.field_0xa_1 = dComIfGs_isEventBit(dSv_event_flag_c::UNK_1708);
|
||||
mFlags.field_0x7_1 = dComIfGs_isEventBit(dSv_event_flag_c::UNLOCK_TINGLE_BALLOON_DISCOUNT);
|
||||
mFlags.field_0x7_0 = dComIfGs_isEventBit(dSv_event_flag_c::UNLOCK_TING_DISCOUNT);
|
||||
|
||||
if (!dComIfGs_isEventBit(dSv_evtBit_c::MET_KORL) || dComIfGs_isEventBit(0x1E80)) {
|
||||
if (!dComIfGs_isEventBit(dSv_event_flag_c::MET_KORL) || dComIfGs_isEventBit(dSv_event_flag_c::UNK_1E80)) {
|
||||
mFlags.field_0x9_7 = 0;
|
||||
mFlags.field_0x9_6 = 0;
|
||||
mFlags.field_0x9_5 = 0;
|
||||
@@ -1179,24 +1179,24 @@ void daAgb_c::FlagsSend(u32 stage_type) {
|
||||
mFlags.field_0x9_5 = 0;
|
||||
}
|
||||
|
||||
if (dComIfGs_isEventBit(0x3920)) {
|
||||
mFlags.field_0x9_4 = !dComIfGs_isEventBit(dSv_evtBit_c::PLACED_DINS_PEARL);
|
||||
mFlags.field_0x9_3 = !dComIfGs_isEventBit(dSv_evtBit_c::PLACED_FARORES_PEARL);
|
||||
mFlags.field_0x9_2 = !dComIfGs_isEventBit(dSv_evtBit_c::PLACED_NAYRUS_PEARL);
|
||||
if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_3920)) {
|
||||
mFlags.field_0x9_4 = !dComIfGs_isEventBit(dSv_event_flag_c::PLACED_DINS_PEARL);
|
||||
mFlags.field_0x9_3 = !dComIfGs_isEventBit(dSv_event_flag_c::PLACED_FARORES_PEARL);
|
||||
mFlags.field_0x9_2 = !dComIfGs_isEventBit(dSv_event_flag_c::PLACED_NAYRUS_PEARL);
|
||||
} else {
|
||||
mFlags.field_0x9_4 = 0;
|
||||
mFlags.field_0x9_3 = 0;
|
||||
mFlags.field_0x9_2 = 0;
|
||||
}
|
||||
|
||||
if (dComIfGs_isEventBit(0x1820)) {
|
||||
if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_1820)) {
|
||||
mFlags.field_0x9_1 = !dComIfGs_isStageBossEnemy(dSv_save_c::STAGE_WT);
|
||||
mFlags.field_0x9_0 = !dComIfGs_isStageBossEnemy(dSv_save_c::STAGE_ET);
|
||||
} else {
|
||||
mFlags.field_0x9_1 = 0;
|
||||
mFlags.field_0x9_0 = 0;
|
||||
}
|
||||
mFlags.field_0xa_3 = dComIfGs_isEventBit(0x1E40);
|
||||
mFlags.field_0xa_3 = dComIfGs_isEventBit(dSv_event_flag_c::UNK_1E40);
|
||||
mFlags.field_0xa_0 = mIsFree;
|
||||
mFlags.field_0xb_7 = getFollowTarget();
|
||||
if (stage_type == dStageType_MINIBOSS_e) {
|
||||
|
||||
Reference in New Issue
Block a user