mirror
/
tp
mirror of https://github.com/zeldaret/tp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

match debug for D_menu_fmap2_d (#2925) 

* menu_fmap2d debug progress

* match debug for d_menu_fmap2D

* fix broken function

* fix weird shield mismatch

* fix other shield mismatch

* fix suggestions

* fix func for wii version

* match func for all versions

* remove cast from saveBitLabels
This commit is contained in:
roeming 2025-12-07 20:09:47 -05:00 committed by GitHub
parent e82c27fd00
commit 07a4e6b052
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
28 changed files with 607 additions and 388 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/d/actor/d_a_npc_cdn3.h
View File

@ -223,7 +223,7 @@ public:
break;
}
/* dSv_event_flag_c::F_0281 - Shop - Malo Mart opens in Castle Town */
if (dComIfGs_isEventBit((u16)dSv_event_flag_c::saveBitLabels[281]) && uVar3 == 9) {
if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[281]) && uVar3 == 9) {
uVar3 = 0xb;
}
} else {
@ -257,7 +257,7 @@ public:
break;
}
/* dSv_event_flag_c::F_0281 - Shop - Malo Mart opens in Castle Town */
if (dComIfGs_isEventBit((u16)dSv_event_flag_c::saveBitLabels[281]) && uVar3 == 10) {
if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[281]) && uVar3 == 10) {
uVar3 = 12;
}
}

10
include/d/d_menu_fmap2D.h
View File

@ -14,7 +14,9 @@ class dMsgScrnExplain_c;
class dMenu_Fmap2DBack_c : public dDlst_base_c, public dMenuMapCommon_c {
public:
dMenu_Fmap2DBack_c();
void setRegionTexData(u8, ResTIMG*, f32, f32, f32, f32, f32, f32, f32, f32, f32);
void setRegionTexData(u8, f32, f32, f32, f32, f32, f32, f32, f32, f32);
void calcAllMapPos();
f32 calcAllMapScaleRate();
void calcAllMapPos2DFirst(f32, f32, f32*, f32*);
@ -142,8 +144,8 @@ public:
u8 getSpotCursor() { return mSpotCursor; }
u8 getSelectRegion() { return mSelectRegion; }
bool getAllPathShowFlag() { return mAllPathShowFlag; }
f32 getRegionOriginX(u8 i_region) { return mRegionOriginX[i_region]; }
f32 getRegionOriginZ(u8 i_region) { return mRegionOriginZ[i_region]; }
f32 getRegionOriginX(int i_region) { return mRegionOriginX[i_region]; }
f32 getRegionOriginZ(int i_region) { return mRegionOriginZ[i_region]; }
void setArrowAlpha(f32 i_alpha) { mArrowAlpha = i_alpha; }
void setSpotTextureFadeAlpha(f32 i_alpha) { mSpotTextureFadeAlpha = i_alpha; }
@ -155,8 +157,8 @@ public:
void onArrowDrawFlag() { mArrowDrawFlag = true; }
bool isArrowDrawFlag() { return mArrowDrawFlag; }
void onShowRegionFlag(int region_bit) { mRegionFlag |= ((1 << region_bit) & 0xFF); }
bool isShowRegionFlag(int region_bit) { return mRegionFlag & ((1 << region_bit) & 0xFF); }
void onShowRegionFlag(int region_bit) { mRegionFlag |= (u8)(1 << region_bit); }
BOOL isShowRegionFlag(int region_bit) { return mRegionFlag & (u8)(1 << region_bit) ? TRUE : FALSE; }
void mapBlink() {}

2
include/d/d_meter2_info.h
View File

@ -302,7 +302,7 @@ void dMeter2Info_set2DVibrationM();
void dMeter2Info_offUseButton(int pButton);
bool dMeter2Info_is2DActiveTouchArea();
u8 dMeter2Info_getRecieveLetterNum();
bool dMeter2Info_getPixel(f32 i_posX, f32 i_posY, f32 param_2, f32 param_3, f32 i_sizeX,
u8 dMeter2Info_getPixel(f32 i_posX, f32 i_posY, f32 param_2, f32 param_3, f32 i_sizeX,
f32 i_sizeY, struct ResTIMG const* i_resTimg);
const char* dMeter2Info_getPlusTextureName();
const char* dMeter2Info_getNumberTextureName(int i_num);

6
include/d/d_pane_class.h
View File

@ -34,7 +34,7 @@ public:
JGeometry::TBox2<f32>* getBounds(J2DPane*);
Vec getGlobalVtx(Mtx* param_0, u8 param_1, bool param_2, s16 param_3) {
return getGlobalVtx(getPanePtr(), param_0, param_1, param_2, param_3);
return getGlobalVtx(mPane, param_0, param_1, param_2, param_3);
}
Vec getGlobalVtxCenter(bool param_0, s16 param_1) {
@ -60,8 +60,8 @@ public:
f32 getPosX() { return getPanePtr()->getBounds().i.x; }
f32 getPosY() { return getPanePtr()->getBounds().i.y; }
f32 getSizeX() { return getPanePtr()->getWidth(); }
f32 getSizeY() { return getPanePtr()->getHeight(); }
f32 getSizeX() { return mPane->getWidth(); }
f32 getSizeY() { return mPane->getHeight(); }
f32 getRotateZ() { return getPanePtr()->getRotateZ(); }

7
include/d/d_save.h
View File

@ -1027,7 +1027,12 @@ public:
#if VERSION > VERSION_GCN_JPN
const
#endif
static u16 saveBitLabels[822];
#if PLATFORM_SHIELD
s16
#else
u16
#endif
static saveBitLabels[822];
};
class dSv_event_tmp_flag_c {

2
src/Z2AudioLib/Z2LinkMgr.cpp
View File

@ -317,7 +317,7 @@ JAISoundHandle* Z2CreatureLink::startLinkSoundLevel(JAISoundID soundID, u32 mapi
case Z2SE_AL_SNOBO_RIDE:
case Z2SE_AL_SNOBO_BREAK:
/* dSv_event_flag_c::F_0266 - Snowpeak Ruins - Snowpeak Ruins clear */
if (dComIfGs_isEventBit((u16)dSv_event_flag_c::saveBitLabels[266])
if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[266])
&& Z2GetSeqMgr()->getSubBgmID() != Z2BGM_SNOW_BOARD) {
volume = 0.0f;
volumeMoveSteps = 0;

2
src/d/actor/d_a_demo00.cpp
View File

@ -1089,7 +1089,7 @@ inline int daDemo00_c::execute() {
break;
}
case 1:
dComIfGs_onEventBit((u16)dSv_event_flag_c::saveBitLabels[sp0E]);
dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[sp0E]);
break;
case 2: {

2
src/d/actor/d_a_e_hp.cpp
View File

@ -730,7 +730,7 @@ void daE_HP_c::executeDead() {
field_0x784 = -1;
if (dComIfGs_getPohSpiritNum() == 20) {
dComIfGs_onEventBit((u16)dSv_event_flag_c::saveBitLabels[0x1c9]);
dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[0x1c9]);
}
movemode++;

2
src/d/actor/d_a_e_rdy.cpp
View File

@ -4277,7 +4277,7 @@ static int daE_RDY_Execute(e_rdy_class* i_this) {
}
}
if (i_this->field_0x5b8 == 12 && !dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[239] & 0xffff)) {
if (i_this->field_0x5b8 == 12 && !dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[239])) {
fopAcM_OffStatus(a_this, 0);
a_this->attention_info.flags = 0;
return 1;

2
src/d/actor/d_a_kago.cpp
View File

@ -522,7 +522,7 @@ void daKago_c::demo_skip(int param_0) {
setPlayerRideOn();
field_0x718 = field_0x71a = 0;
/* dSv_event_flag_c::M_051 - Main Event - Shadow Kargorok (?) (Large) event complete (Horse grass appears in various places) */
dComIfGs_onEventBit((u16)dSv_event_flag_c::saveBitLabels[84]);
dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[84]);
field_0x748 = 7;
field_0x74c = NULL;
break;

4
src/d/actor/d_a_kytag14.cpp
View File

@ -27,7 +27,7 @@ static int daKytag14_Execute(kytag14_class* i_this) {
}
if (i_this->mEventID1 != 0xFFFF) {
if (dComIfGs_isEventBit((u16)dSv_event_flag_c::saveBitLabels[i_this->mEventID1])) {
if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[i_this->mEventID1])) {
event1_set = true;
} else {
event1_set = false;
@ -35,7 +35,7 @@ static int daKytag14_Execute(kytag14_class* i_this) {
}
if (i_this->mEventID2 != 0xFFFF) {
if (!dComIfGs_isEventBit((u16)dSv_event_flag_c::saveBitLabels[i_this->mEventID2])) {
if (!dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[i_this->mEventID2])) {
event2_unset = true;
} else {
event2_unset = false;

14
src/d/actor/d_a_mg_rod.cpp
View File

@ -2570,7 +2570,7 @@ static void lure_catch(dmg_rod_class* i_this) {
}
if (i_this->play_cam_timer == 40) {
if (!dComIfGs_isEventBit((u16)dSv_event_flag_c::saveBitLabels[467])) {
if (!dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[467])) {
Z2GetAudioMgr()->subBgmStart(Z2BGM_FISHING_GET1);
} else if (fish_kind == 3) {
Z2GetAudioMgr()->subBgmStart(Z2BGM_FISHING_GET3);
@ -2582,7 +2582,7 @@ static void lure_catch(dmg_rod_class* i_this) {
} else if (i_this->play_cam_timer == 80) {
u8 sp8 = 1;
if (i_this->field_0x14c0 != 0) {
if (!dComIfGs_isEventBit((u16)dSv_event_flag_c::saveBitLabels[467])) {
if (!dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[467])) {
sp8 = 2;
} else if (fish_kind != 3) {
sp8 = 2;
@ -2609,7 +2609,7 @@ static void lure_catch(dmg_rod_class* i_this) {
data_80450C9A = 200;
}
dComIfGs_onEventBit((u16)dSv_event_flag_c::saveBitLabels[467]);
dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[467]);
static u16 catch_msgn_20[] = {0x02CE, 0x02D1, 0x02CF, 0x02D0};
static u16 catch_msgn_21[] = {0x02D2, 0x02D5, 0x02D3, 0x02D4};
@ -4921,7 +4921,7 @@ static void play_camera(dmg_rod_class* i_this) {
i_this->msgflow.init(actor, 0x2C9, 0, NULL);
henna->field_0x6ba = 50;
henna->field_0x7b8 = 0;
} else if (!dComIfGs_isEventBit((u16)dSv_event_flag_c::saveBitLabels[467])) {
} else if (!dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[467])) {
if (i_this->field_0x1470 == 0) {
sp174.x = -2800.0f;
sp174.z = 4608.0f;
@ -4998,11 +4998,11 @@ static void play_camera(dmg_rod_class* i_this) {
) {
int sp20 = 0;
int sp1C = 1;
if (dComIfGs_isEventBit((u16)dSv_event_flag_c::saveBitLabels[466])) {
if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[466])) {
sp20 = 1;
}
if (dComIfGs_isEventBit((u16)dSv_event_flag_c::saveBitLabels[469])) {
if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[469])) {
sp1C = 0;
}
@ -5195,7 +5195,7 @@ static void play_camera(dmg_rod_class* i_this) {
camera->mCamera.SetTrimSize(0);
i_this->play_cam_mode = 0;
i_this->field_0x146c = 30;
dComIfGs_offEventBit((u16)dSv_event_flag_c::saveBitLabels[466]);
dComIfGs_offEventBit(dSv_event_flag_c::saveBitLabels[466]);
i_this->field_0xf81 = 1;
}
}

6
src/d/actor/d_a_npc.cpp
View File

@ -2897,15 +2897,15 @@ u8 daNpcT_getDistTableIdx(int param_0, int param_1) {
}
void daNpcT_onEvtBit(u32 i_no) {
dComIfGs_onEventBit((u16)dSv_event_flag_c::saveBitLabels[i_no]);
dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[i_no]);
}
void daNpcT_offEvtBit(u32 i_no) {
dComIfGs_offEventBit((u16)dSv_event_flag_c::saveBitLabels[i_no]);
dComIfGs_offEventBit(dSv_event_flag_c::saveBitLabels[i_no]);
}
BOOL daNpcT_chkEvtBit(u32 i_no) {
return dComIfGs_isEventBit((u16)dSv_event_flag_c::saveBitLabels[i_no]);
return dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[i_no]);
}
void daNpcT_onTmpBit(u32 i_no) {

4
src/d/actor/d_a_npc4.cpp
View File

@ -1848,11 +1848,11 @@ s16 daNpcF_getGroundAngle(cBgS_PolyInfo* param_0, s16 param_1) {
}
BOOL daNpcF_chkEvtBit(u32 i_no) {
return dComIfGs_isEventBit((u16)dSv_event_flag_c::saveBitLabels[i_no]);
return dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[i_no]);
}
void daNpcF_onEvtBit(u32 i_no) {
dComIfGs_onEventBit((u16)dSv_event_flag_c::saveBitLabels[i_no]);
dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[i_no]);
}
BOOL daNpcF_chkTmpBit(u32 i_no) {

4
src/d/actor/d_a_npc_chat.cpp
View File

@ -2383,7 +2383,7 @@ int daNpcChat_c::getObjNum() {
}
// dSv_event_flag_c::F_0281 - Shop - Malo Mart opens in Castle Town
if (dComIfGs_isEventBit((u16)dSv_event_flag_c::saveBitLabels[281]) &&
if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[281]) &&
objNum == OBJ_CELEB_BAG_M) {
objNum = OBJ_MARO_BAG_M;
}
@ -2427,7 +2427,7 @@ int daNpcChat_c::getObjNum() {
}
// dSv_event_flag_c::F_0281 - Shop - Malo Mart opens in Castle Town
if (dComIfGs_isEventBit((u16)dSv_event_flag_c::saveBitLabels[281]) &&
if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[281]) &&
objNum == OBJ_CELEB_BAG_W) {
objNum = OBJ_MARO_BAG_W;
}

16
src/d/actor/d_a_npc_henna.cpp
View File

@ -379,7 +379,7 @@ static void henna_shop(npc_henna_class* i_this) {
}
cLib_addCalcAngleS2(&i_this->actor.current.angle.y, i_this->field_0x618, 2, unkInt1);
/* dSv_event_flag_c::F_0461 - Fishing Pond - First time entered fishing house */
if ((!dComIfGs_isEventBit((u16)dSv_event_flag_c::saveBitLabels[461]) || data_80450C9C != 0) &&
if ((!dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[461]) || data_80450C9C != 0) &&
i_this->field_0x7d7 == 0 && i_this->field_0x6a0 == 56 + TREG_S(7))
{
dComIfGp_event_reset();
@ -388,7 +388,7 @@ static void henna_shop(npc_henna_class* i_this) {
i_this->cam_mode = 60;
} else {
/* dSv_event_flag_c::F_0461 - Fishing Pond - First time entered fishing house */
dComIfGs_onEventBit((u16)dSv_event_flag_c::saveBitLabels[461]);
dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[461]);
i_this->cam_mode = 1;
}
i_this->field_0x7d7 = 1;
@ -890,9 +890,9 @@ static void demo_camera(npc_henna_class* i_this) {
i_this->cam_mode = 0;
}
/* dSv_event_flag_c::F_0463 - Fishing Pond - Reserved for fishing */
dComIfGs_offEventBit((u16)dSv_event_flag_c::saveBitLabels[0x1cf]);
dComIfGs_offEventBit(dSv_event_flag_c::saveBitLabels[0x1cf]);
/* dSv_event_flag_c::F_0464 - Fishing Pond - Reserved for fishing */
dComIfGs_offEventBit((u16)dSv_event_flag_c::saveBitLabels[0x1d0]);
dComIfGs_offEventBit(dSv_event_flag_c::saveBitLabels[0x1d0]);
}
}
@ -994,7 +994,7 @@ static void demo_camera_shop(npc_henna_class* i_this) {
if (!dComIfGp_event_runCheck()
/* dSv_event_flag_c::F_0465 - Fishing Pond - Reserved for fishing */
&& !dComIfGs_isEventBit((u16)dSv_event_flag_c::saveBitLabels[0x1d1]))
&& !dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[0x1d1]))
{
i_this->field_0x756++;
if (i_this->field_0x756 < 200) {
@ -2728,9 +2728,9 @@ static int daNpc_Henna_Create(fopAc_ac_c* i_this) {
}
}
/* dSv_event_flag_c::F_0463 - Fishing Pond - Reserved for fishing */
dComIfGs_offEventBit((u16)dSv_event_flag_c::saveBitLabels[0x1cf]);
dComIfGs_offEventBit(dSv_event_flag_c::saveBitLabels[0x1cf]);
/* dSv_event_flag_c::F_0464 - Fishing Pond - Reserved for fishing */
dComIfGs_offEventBit((u16)dSv_event_flag_c::saveBitLabels[0x1d0]);
dComIfGs_offEventBit(dSv_event_flag_c::saveBitLabels[0x1d0]);
a_this->field_0x618 = i_this->shape_angle.y = i_this->current.angle.y = newAngle;
lbl_82_bss_91 = dComIfGs_getEventReg(0xf63f);
daNpc_Henna_Execute(a_this);
@ -2775,7 +2775,7 @@ static int daNpc_Henna_Create(fopAc_ac_c* i_this) {
NULL, -1);
data_80450C99 = 0;
/* dSv_event_flag_c::F_0463 - Fishing Pond - Reserved for fishing */
if (!dComIfGs_isEventBit((u16)dSv_event_flag_c::saveBitLabels[0x1cf])) {
if (!dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[0x1cf])) {
a_this->field_0x70a = 4;
a_this->field_0x734 = 1;
} else {

8
src/d/actor/d_a_npc_ks.cpp
View File

@ -5818,7 +5818,7 @@ static int npc_ks_fsdemo(npc_ks_class* i_this) {
switch (i_this->mMode) {
case 0:
if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[0x220] & 0xFFFF)) {
if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[0x220])) {
i_this->mMode = 40;
} else {
fpcM_Search(s_fs_sub, i_this);
@ -6628,7 +6628,7 @@ static void kantera_sub(npc_ks_class* i_this) {
fopAcM_cancelCarryNow(a_this);
cLib_offBit<u32>(a_this->attention_info.flags, fopAc_AttnFlag_CARRY_e);
i_this->field_0xc17 = 0;
dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[0xE2] & 0xFFFF);
dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[0xE2]);
} else {
i_this->field_0xc04.x = -30715.0f + AREG_F(8);
i_this->field_0xc04.z = -17200.0f + AREG_F(9);
@ -7260,7 +7260,7 @@ static BOOL start_check(npc_ks_class* i_this) {
break;
case 21:
if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[0x20A] & 0xFFFF)) {
if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[0x20A])) {
rv = FALSE;
} else {
i_this->mActionID = 301;
@ -7268,7 +7268,7 @@ static BOOL start_check(npc_ks_class* i_this) {
break;
case 22:
if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[0x241] & 0xFFFF)) {
if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[0x241])) {
rv = FALSE;
} else {
i_this->mActionID = 302;

4
src/d/actor/d_a_obj_ihasi.cpp
View File

@ -83,7 +83,7 @@ static int daObj_Ihasi_Execute(obj_ihasi_class* i_this) {
dComIfG_Bgsp().Release(i_this->mpBgW);
i_this->mpBgW = NULL;
/* dSv_event_flag_c::M_050 - Main Event - Eldin Bridge disappears */
dComIfGs_onEventBit((u16)dSv_event_flag_c::saveBitLabels[0x53]);
dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[0x53]);
}
action(i_this);
@ -162,7 +162,7 @@ static int daObj_Ihasi_Create(fopAc_ac_c* i_actor) {
csXyz angle;
/* dSv_event_flag_c::M_050 - Main Event - Eldin Bridge disappears */
if (dComIfGs_isEventBit((u16)dSv_event_flag_c::saveBitLabels[0x53])) {
if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[0x53])) {
angle.set(0x0, -0x8000, 0x0);
pos.set(34750.0f, -300.0f, -44000.0f);

8
src/d/actor/d_a_obj_kamakiri.cpp
View File

@ -734,9 +734,9 @@ u8 daObjKAM_c::CreateChk() {
if (field_0x9c0 != 2) {
if (unkInt1 != 0) {
if (!dComIfGs_isEventBit(
(u16)dSv_event_flag_c::saveBitLabels[l_musiya_num[SEX_MALE]]) ||
dSv_event_flag_c::saveBitLabels[l_musiya_num[SEX_MALE]]) ||
!dComIfGs_isEventBit(
(u16)dSv_event_flag_c::saveBitLabels[l_musiya_num[SEX_FEMALE]]))
dSv_event_flag_c::saveBitLabels[l_musiya_num[SEX_FEMALE]]))
{
return 0;
}
@ -750,10 +750,10 @@ u8 daObjKAM_c::CreateChk() {
if (mSex == SEX_MALE &&
!dComIfGs_isEventBit(
(u16)dSv_event_flag_c::saveBitLabels[l_musiya_num[mSex]]) ||
dSv_event_flag_c::saveBitLabels[l_musiya_num[mSex]]) ||
mSex == SEX_FEMALE &&
!dComIfGs_isEventBit(
(u16)dSv_event_flag_c::saveBitLabels[l_musiya_num[mSex]]))
dSv_event_flag_c::saveBitLabels[l_musiya_num[mSex]]))
{
return 0;
}

8
src/d/actor/d_a_obj_katatsumuri.cpp
View File

@ -665,10 +665,10 @@ bool daObjKAT_c::CreateChk() {
}
if (field_0x808 != 2) {
if (uVar4) {
if (dComIfGs_isEventBit((u16)dSv_event_flag_c::saveBitLabels[l_musiya_num[SEX_MALE]]) ==
if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[l_musiya_num[SEX_MALE]]) ==
0 ||
dComIfGs_isEventBit(
(u16)dSv_event_flag_c::saveBitLabels[l_musiya_num[SEX_FEMALE]]) == 0)
dSv_event_flag_c::saveBitLabels[l_musiya_num[SEX_FEMALE]]) == 0)
{
return false;
}
@ -681,10 +681,10 @@ bool daObjKAT_c::CreateChk() {
}
if ((mSex == SEX_MALE &&
dComIfGs_isEventBit(
(u16)dSv_event_flag_c::saveBitLabels[l_musiya_num[mSex]]) == 0) ||
dSv_event_flag_c::saveBitLabels[l_musiya_num[mSex]]) == 0) ||
(mSex == SEX_FEMALE &&
dComIfGs_isEventBit(
(u16)dSv_event_flag_c::saveBitLabels[l_musiya_num[mSex]]) == 0))
dSv_event_flag_c::saveBitLabels[l_musiya_num[mSex]]) == 0))
{
return false;
}

2
src/d/actor/d_a_obj_volcbom.cpp
View File

@ -592,7 +592,7 @@ void daObjVolcBom_c::actionWait() {
if (checkTalkDistance()
/* dSv_event_flag_c::M_051 - Main Event - Shadow Kargorok (?) (Large) event complete
(Horse grass appears in various places) */
&& dComIfGs_isEventBit((u16)dSv_event_flag_c::saveBitLabels[84])) {
&& dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[84])) {
setAction(ACTION_ORDER_EVENT);
actionOrderEvent();
}

4
src/d/actor/d_a_scene_exit.cpp
View File

@ -22,12 +22,12 @@ int daScex_c::checkWork() {
}
u16 eventBit = getOffEventBit();
if (eventBit != 0x0FFF && dComIfGs_isEventBit((u16)dSv_event_flag_c::saveBitLabels[eventBit])) {
if (eventBit != 0x0FFF && dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[eventBit])) {
return 0;
}
eventBit = getOnEventBit();
if (eventBit != 0x0FFF && !dComIfGs_isEventBit((u16)dSv_event_flag_c::saveBitLabels[eventBit])) {
if (eventBit != 0x0FFF && !dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[eventBit])) {
return 0;
}

4
src/d/d_kankyo.cpp
View File

@ -8669,8 +8669,8 @@ static int dKy_Create(void* i_this) {
#if DEBUG
if (strcmp(dComIfGp_getStartStageName(), "T_SASA0") == 0) {
dComIfGs_onEventBit((u16)dSv_event_flag_c::saveBitLabels[142]);
dComIfGs_onEventBit((u16)dSv_event_flag_c::saveBitLabels[167]);
dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[142]);
dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[167]);
}
#endif

827
src/d/d_menu_fmap2D.cpp
View File

File diff suppressed because it is too large Load Diff

4
src/d/d_meter2_info.cpp
View File

@ -1414,7 +1414,7 @@ const char* dMeter2Info_getPlusTextureName() {
return tex_name;
}
bool dMeter2Info_getPixel(f32 i_posX, f32 i_posY, f32 param_2, f32 param_3, f32 i_sizeX,
u8 dMeter2Info_getPixel(f32 i_posX, f32 i_posY, f32 param_2, f32 param_3, f32 i_sizeX,
f32 i_sizeY, ResTIMG const* i_resTimg) {
f32 temp_f31 = i_posX - param_2;
f32 temp_f30 = i_posY - param_3;
@ -1442,7 +1442,7 @@ bool dMeter2Info_getPixel(f32 i_posX, f32 i_posY, f32 param_2, f32 param_3, f32
return 1;
}
return var_r24 & 0x7000;
return (var_r24 & 0x7000) != 0;
}
void dMeter2Info_setCloth(u8 i_clothId, bool i_offItemBit) {

10
src/d/d_msg_flow.cpp
View File

@ -767,7 +767,7 @@ void dMsgFlow_c::dbgPrint() {}
u16 dMsgFlow_c::query001(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_speaker_p, int param_2) {
const u16 prm0 = i_flowNode_p->param;
u16 ret = dComIfGs_isEventBit((u16)dSv_event_flag_c::saveBitLabels[prm0]) == false;
u16 ret = dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[prm0]) == false;
if (param_2 != 0) {
// "Flag Check"
@ -1753,11 +1753,11 @@ int dMsgFlow_c::event000(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speak
OS_REPORT("flow:%d, prm0:%d, prm1:%d\n", mFlow, prm0, prm1);
if (prm0 != 0) {
dComIfGs_onEventBit((u16)dSv_event_flag_c::saveBitLabels[prm0]);
dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[prm0]);
}
if (prm1 != 0) {
dComIfGs_onEventBit((u16)dSv_event_flag_c::saveBitLabels[prm1]);
dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[prm1]);
}
return 1;
@ -1772,11 +1772,11 @@ int dMsgFlow_c::event001(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speak
OS_REPORT("flow:%d, prm0:%d, prm1:%d\n", mFlow, prm0, prm1);
if (prm0 != 0) {
dComIfGs_offEventBit((u16)dSv_event_flag_c::saveBitLabels[prm0]);
dComIfGs_offEventBit(dSv_event_flag_c::saveBitLabels[prm0]);
}
if (prm1 != 0) {
dComIfGs_offEventBit((u16)dSv_event_flag_c::saveBitLabels[prm1]);
dComIfGs_offEventBit(dSv_event_flag_c::saveBitLabels[prm1]);
}
return 1;

8
src/d/d_s_menu.cpp
View File

@ -766,7 +766,7 @@ int toGameScene(dScnMenu_c* i_this) {
/* Main Event - Get shadow crystal (can now transform) */
dComIfGs_offEventBit(dSv_event_flag_c::M_077);
/* dSv_event_flag_c::F_0550 - Main Event - Gain ability to use sense */
dComIfGs_offEventBit((u16)dSv_event_flag_c::saveBitLabels[550]);
dComIfGs_offEventBit(dSv_event_flag_c::saveBitLabels[550]);
/* Secret techniques - Obtained 1 secret techinques - Shield attack */
dComIfGs_offEventBit(dSv_event_flag_c::F_0338);
rt = fopScnM_ChangeReq(i_this, PROC_PLAY_SCENE, 0, 5);
@ -909,7 +909,7 @@ void setEnvData(menu_data_class* i_data) {
label_no = atoi(string);
if (label_no >= 0 && label_no <= 999) {
dComIfGs_onEventBit((u16)dSv_event_flag_c::saveBitLabels[label_no]);
dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[label_no]);
}
if (i_data->env_data[i] != '+') {
@ -944,7 +944,7 @@ void setEnvData(menu_data_class* i_data) {
label_no = atoi(string);
if (label_no >= 0 && label_no <= 999) {
dComIfGs_offEventBit((u16)dSv_event_flag_c::saveBitLabels[label_no]);
dComIfGs_offEventBit(dSv_event_flag_c::saveBitLabels[label_no]);
}
if (i_data->env_data[i] != '+') {
@ -1636,7 +1636,7 @@ int phase_2(dScnMenu_c* i_this) {
/* Main Event - when OFF, wolf carries sword and shield on back */
dComIfGs_onEventBit(dSv_event_flag_c::M_068);
/* dSv_event_flag_c::F_0550 - Main Event - Gain ability to use sense */
dComIfGs_onEventBit((u16)dSv_event_flag_c::saveBitLabels[550]);
dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[550]);
return cPhs_COMPLEATE_e;
}

21
src/d/d_save.cpp
View File

@ -1708,14 +1708,14 @@ int dSv_info_c::memory_to_card(char* card_ptr, int dataNum) {
#endif
// If haven't gotten then lantern back from the monkey
if (!dComIfGs_isEventBit((u16)dSv_event_flag_c::saveBitLabels[226])) {
if (!dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[226])) {
// Store whether or not it's stolen and dropped
lantern_dropped = dComIfGs_isEventBit((u16)dSv_event_flag_c::saveBitLabels[224]);
lantern_stolen = dComIfGs_isEventBit((u16)dSv_event_flag_c::saveBitLabels[225]);
lantern_dropped = dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[224]);
lantern_stolen = dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[225]);
// Then turn those events off
dComIfGs_offEventBit((u16)dSv_event_flag_c::saveBitLabels[224]);
dComIfGs_offEventBit((u16)dSv_event_flag_c::saveBitLabels[225]);
dComIfGs_offEventBit(dSv_event_flag_c::saveBitLabels[224]);
dComIfGs_offEventBit(dSv_event_flag_c::saveBitLabels[225]);
// Used to turn events back on later
lantern_not_recovered = true;
@ -1765,10 +1765,10 @@ int dSv_info_c::memory_to_card(char* card_ptr, int dataNum) {
// Now that we've saved, reset events if needed
if (lantern_not_recovered == true) {
if (lantern_dropped) {
dComIfGs_onEventBit((u16)dSv_event_flag_c::saveBitLabels[224]);
dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[224]);
}
if (lantern_stolen) {
dComIfGs_onEventBit((u16)dSv_event_flag_c::saveBitLabels[225]);
dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[225]);
}
}
@ -2014,7 +2014,12 @@ BOOL flagFile_c::check_flag(u16 i_flag) {
#if VERSION > VERSION_GCN_JPN
const
#endif
u16 dSv_event_flag_c::saveBitLabels[822] = {
#if PLATFORM_SHIELD
s16
#else
u16
#endif
dSv_event_flag_c::saveBitLabels[822] = {
UNUSED, TEST_001, TEST_002, TEST_003, TEST_004, F_0001, F_0002, F_0003, F_0004, F_0005, F_0006,
F_0007, F_0008, F_0009, F_0010, F_0011, F_0012, F_0013, F_0014, F_0015, F_0016, F_0017, F_0018,
F_0019, F_0020, D_0001, F_0021, F_0022, F_0023, F_0024, F_0025, F_0026, F_0027, F_0028, F_0029,