mirror of
https://github.com/zeldaret/tww.git
synced 2026-08-19 05:22:39 -04:00
Added enums for all used event/tmp bits/regs (#893)
This commit is contained in:
+13
-3
@@ -1238,7 +1238,7 @@ cPhs_State phase_0(dScnPly_ply_c* i_this) {
|
||||
} else {
|
||||
l_lkDemoAnmCommand = NULL;
|
||||
|
||||
s32 darcIdx = dComIfGs_isEventBit(0x2D01) ? 1 : 0;
|
||||
s32 darcIdx = dComIfGs_isEventBit(dSv_event_flag_c::UNK_2D01) ? 1 : 0;
|
||||
if (darcIdx != dComIfGp_getLkDemoAnmNo()) {
|
||||
if (dComIfGp_getLkDemoAnmNo() >= 0) {
|
||||
dComIfGp_getLkDemoAnmArchive()->unmount();
|
||||
@@ -1364,7 +1364,7 @@ cPhs_State phase_4(dScnPly_ply_c* i_this) {
|
||||
mDoGph_gInf_c::offFade();
|
||||
|
||||
stage_stag_info_class* stag_info = dComIfGp_getStageStagInfo();
|
||||
if (stag_info != NULL && dStage_stagInfo_GetSTType(stag_info) == dStageType_FF1_e && dComIfGs_isEventBit(0x0801)) {
|
||||
if (stag_info != NULL && dStage_stagInfo_GetSTType(stag_info) == dStageType_FF1_e && dComIfGs_isEventBit(dSv_event_flag_c::UNK_0801)) {
|
||||
dComIfGs_setSelectEquip(0, dItem_NONE_e);
|
||||
dComIfGp_setSelectEquip(0, dItem_NONE_e);
|
||||
dComIfGs_offCollect(0, 0);
|
||||
@@ -1408,7 +1408,17 @@ cPhs_State phase_4(dScnPly_ply_c* i_this) {
|
||||
dScnPly_ply_c::pauseTimer = 0;
|
||||
dScnPly_ply_c::nextPauseTimer = 0;
|
||||
|
||||
if (((strcmp(dComIfGp_getStartStageName(), "Hyrule") == 0 || strcmp(dComIfGp_getStartStageName(), "Hyroom") == 0 || strcmp(dComIfGp_getStartStageName(), "kenroom") == 0) && !dComIfGs_isEventBit(0x3802)) || dComIfGp_getStartStageName()[0] == 'X') {
|
||||
if (
|
||||
(
|
||||
(
|
||||
strcmp(dComIfGp_getStartStageName(), "Hyrule") == 0 ||
|
||||
strcmp(dComIfGp_getStartStageName(), "Hyroom") == 0 ||
|
||||
strcmp(dComIfGp_getStartStageName(), "kenroom") == 0
|
||||
) &&
|
||||
!dComIfGs_isEventBit(dSv_event_flag_c::COLORS_IN_HYRULE)
|
||||
) ||
|
||||
dComIfGp_getStartStageName()[0] == 'X'
|
||||
) {
|
||||
mDoGph_gInf_c::onMonotone();
|
||||
|
||||
bool hy8 = strcmp(dComIfGp_getStartStageName(), "Hyrule") == 0 && dComIfGp_getStartStageLayer() == 8;
|
||||
|
||||
Reference in New Issue
Block a user