mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-09-12 20:26:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

misc minor cleanup (indentation, offset comments, etc)

Browse Source
This commit is contained in:
LagoLunatic
2023-12-19 21:29:37 -05:00
parent 1f8f630e2f
commit ec3f7f0198
53 changed files with 285 additions and 291 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/JSystem/J2DGraph/J2DWindow.cpp
+3 -3
View File
@@ -128,11 +128,11 @@ void J2DWindow::draw_private(const JGeometry::TBox2<f32>& frameBox, const JGeome
f32 bottom = 1.0f + mpFrameTexture1->getHeight();
u16 s0, s1, t0, t1;
drawFrameTexture(mpFrameTexture1, 0.0f, 0.0f,
drawFrameTexture(mpFrameTexture1, 0.0f, 0.0f,
(field_0x110 >> 7) & 1,
(field_0x110 >> 6) & 1, true);
drawFrameTexture(mpFrameTexture2, right, 0.0f,
(field_0x110 >> 5) & 1,
drawFrameTexture(mpFrameTexture2, right, 0.0f,
(field_0x110 >> 5) & 1,
(field_0x110 >> 4) & 1, (field_0x111 >> 0) & 1);
s0 = ((field_0x110 >> 5) & 1) ? (u16)0x8000 : (u16)0;
src/JSystem/J3DGraphAnimator/J3DAnimation.cpp
+3 -3
View File
@@ -60,7 +60,7 @@ BOOL J3DFrameCtrl::checkPass(f32 pass_frame) {
return false;
}
} else if (mEnd <= cur_frame) {
while (next_frame >= mEnd) {
while (next_frame >= mEnd) {
if (mEnd - mLoop <= 0.0f) {
break;
}
@@ -73,7 +73,7 @@ BOOL J3DFrameCtrl::checkPass(f32 pass_frame) {
return false;
}
} else if (next_frame < mStart) {
while (next_frame < mStart) {
while (next_frame < mStart) {
if (mLoop - mStart <= 0.0f) {
break;
}
@@ -86,7 +86,7 @@ BOOL J3DFrameCtrl::checkPass(f32 pass_frame) {
return false;
}
} else if (mEnd <= next_frame) {
while (next_frame >= mEnd) {
while (next_frame >= mEnd) {
if (mEnd - mLoop <= 0.0f) {
break;
}
src/JSystem/J3DGraphBase/J3DGD.cpp
+1 -1
View File
@@ -227,7 +227,7 @@ void J3DGDSetTexCoordGen(GXTexGenType type, GXTexGenSrc src) {
switch (src) {
case GX_TG_POS: row = 0; form = 1; break;
case GX_TG_NRM: row = 1; form = 1; break;
case GX_TG_NRM: row = 1; form = 1; break;
case GX_TG_BINRM: row = 3; form = 1; break;
case GX_TG_TANGENT: row = 4; form = 1; break;
case GX_TG_COLOR0: row = 2; break;
src/JSystem/JAudio/JASDriverIF.cpp
+5 -5
View File
@@ -19,11 +19,11 @@ void JASystem::Driver::init() {
u16 JASystem::Driver::MAX_MIXERLEVEL = 0x2ee0;
static void dummy() {
OSReport("JASDriverIF.cpp");
OSReport("(0.0 <= channel_level) && (channel_level <= 2.0)");
OSReport("Halt");
OSReport("(0.0 <= auto_level) && (auto_level <= 2.0)");
OSReport("(0.0 <= dsp_level) && (dsp_level <= 8.0)");
OSReport("JASDriverIF.cpp");
OSReport("(0.0 <= channel_level) && (channel_level <= 2.0)");
OSReport("Halt");
OSReport("(0.0 <= auto_level) && (auto_level <= 2.0)");
OSReport("(0.0 <= dsp_level) && (dsp_level <= 8.0)");
}
/* 8028A9A0-8028AAC4 .text setMixerLevel__Q28JASystem6DriverFff */
src/JSystem/JGadget/linklist.cpp
+3 -3
View File
@@ -9,9 +9,9 @@ namespace std {
template <class InputIterator, class Predicate>
inline InputIterator find_if(InputIterator first, InputIterator last, Predicate pred) {
while (first != last && !pred(*first))
++first;
return first;
while (first != last && !pred(*first))
++first;
return first;
}
} // namespace std
src/JSystem/JKernel/JKRMemArchive.cpp
+17 -17
View File
@@ -44,13 +44,13 @@ JKRMemArchive::~JKRMemArchive() {
/* 802B9700-802B9740 .text fixedInit__13JKRMemArchiveFl */
void JKRMemArchive::fixedInit(s32 param_1) {
mIsMounted = false;
mMountMode = 1;
mMountCount = 1;
field_0x58 = 2;
mHeap = JKRHeap::sCurrentHeap;
mEntryNum = param_1;
if (sCurrentVolume) return;
sCurrentVolume = this;
mMountMode = 1;
mMountCount = 1;
field_0x58 = 2;
mHeap = JKRHeap::sCurrentHeap;
mEntryNum = param_1;
if (sCurrentVolume) return;
sCurrentVolume = this;
setCurrentDirID(0);
}
@@ -59,30 +59,30 @@ bool JKRMemArchive::mountFixed(void* param_1, JKRMemBreakFlag param_2) {
if (check_mount_already((s32)param_1)) {
return false;
}
fixedInit((s32)param_1);
if (!open(param_1, 0xffff, param_2)) {
fixedInit((s32)param_1);
if (!open(param_1, 0xffff, param_2)) {
return false;
}
mVolumeType = 'RARC';
mVolumeType = 'RARC';
mVolumeName = mStringTable + mNodes->name_offset;
sVolumeList.prepend(&mFileLoaderLink);
sVolumeList.prepend(&mFileLoaderLink);
mIsOpen = param_2 == 1;
mIsMounted = true;
mIsMounted = true;
return true;
}
/* 802B9810-802B98FC .text unmountFixed__13JKRMemArchiveFv */
void JKRMemArchive::unmountFixed() {
JUT_ASSERT(337, isMounted());
JUT_ASSERT(340, mMountCount == 1);
if (sCurrentVolume == this) {
JUT_ASSERT(340, mMountCount == 1);
if (sCurrentVolume == this) {
sCurrentVolume = NULL;
}
if (mIsOpen && mArcHeader) {
if (mIsOpen && mArcHeader) {
JKRHeap::free(mArcHeader, mHeap);
}
sVolumeList.remove(&mFileLoaderLink);
mIsMounted = false;
sVolumeList.remove(&mFileLoaderLink);
mIsMounted = false;
}
/* 802B98FC-802B9A90 .text open__13JKRMemArchiveFlQ210JKRArchive15EMountDirection */
src/JSystem/JUtility/JUTGamePad.cpp
+11 -11
View File
@@ -520,15 +520,15 @@ bool JUTGamePad::recalibrate(u32 mask) {
}
static void dummy() {
OSReport("JUTGamePad.cpp");
OSReport("getDataSizePerFrame() > 0");
OSReport("Halt");
OSReport("mBuffer");
OSReport("(u32)mBuffer <= (u32)dataEnd && (u32)dataEnd <= (u32)mBufferEnd");
OSReport("part != 0");
OSReport("getBuffer() == getDataEnd() || part == mPart");
OSReport("JUTGamePad.h");
OSReport("size > 0");
OSReport("mBuffer && isValidData( mCurrent )");
OSReport("mBuffer && isValidBuffer( mCurrent )");
OSReport("JUTGamePad.cpp");
OSReport("getDataSizePerFrame() > 0");
OSReport("Halt");
OSReport("mBuffer");
OSReport("(u32)mBuffer <= (u32)dataEnd && (u32)dataEnd <= (u32)mBufferEnd");
OSReport("part != 0");
OSReport("getBuffer() == getDataEnd() || part == mPart");
OSReport("JUTGamePad.h");
OSReport("size > 0");
OSReport("mBuffer && isValidData( mCurrent )");
OSReport("mBuffer && isValidBuffer( mCurrent )");
}
src/JSystem/JUtility/JUTXfb.cpp
+3 -3
View File
@@ -109,7 +109,7 @@ void JUTXfb::initiate(u16 width, u16 height, JKRHeap* pHeap, JUTXfb::EXfbNumber
}
static void dummy() {
OSReport("JX:: disp = %d\n");
OSReport("JX:: drawing %d -> ");
OSReport("%d\n");
OSReport("JX:: disp = %d\n");
OSReport("JX:: drawing %d -> ");
OSReport("%d\n");
}
src/d/actor/d_a_arrow_lighteff.cpp
+1 -1
View File
@@ -229,7 +229,7 @@ bool daArrow_Lighteff_c::_delete() {
/* 00000B70-00000C10 .text daArrow_Lighteff_Delete__FPv */
static BOOL daArrow_Lighteff_Delete(void* i_this) {
return static_cast<daArrow_Lighteff_c*>(i_this)->_delete();
return static_cast<daArrow_Lighteff_c*>(i_this)->_delete();
}
bool daArrow_Lighteff_c::_draw() {
src/d/actor/d_a_bg.cpp
-7
View File
@@ -127,7 +127,6 @@ static BOOL checkCreateHeap(fopAc_ac_c* i_ac) {
/* 800D88F8-800D8C50 .text createHeap__6daBg_cFv */
BOOL daBg_c::createHeap() {
/* Nonmatching - array loads */
static char l_modelName[4][13] = {
"model.bmd",
"model1.bmd",
@@ -338,12 +337,6 @@ static s32 daBg_Create(fopAc_ac_c* i_ac) {
return ((daBg_c*)i_ac)->create();
}
// searchRoomMemory__Fi d_a_bg.o
// searchRoomNo__FiP10readRoom_c d_a_bg.o
// getRoomMemory__6daBg_cFi d_a_bg.o
// initRoomMemory__6daBg_cFv d_a_bg.o
// calcRoomMemory__6daBg_cFPPcPlPPcPl d_a_bg.o
/* 800D9094-800D9318 .text create__6daBg_cFv */
s32 daBg_c::create() {
fopAcM_SetupActor(this, daBg_c);
src/d/actor/d_a_bomb.cpp
+1 -1
View File
@@ -445,7 +445,7 @@ void daBomb_c::water_tention() {
f32 temp;
if(field_0x554.y - field_0x554.z < 0) {
temp = 0.8f * field_0x554.z;
}
}
else {
temp = 0.2f * field_0x554.z;
}
src/d/actor/d_a_branch.cpp
+2 -2
View File
@@ -65,7 +65,7 @@ BOOL daBranch_c::solidHeapCB(fopAc_ac_c* i_this) {
/* 00000248-0000049C .text CreateHeap__10daBranch_cFv */
s32 daBranch_c::CreateHeap() {
/* Nonmatching */
int basIds[] = { 8, 0 };
int basIds[] = { 8, 0 };
int bckIds[] = { 7, 2 };
int bmdIds[] = { 6, 5 };
int t[] = {0, 0};
@@ -90,7 +90,7 @@ s32 daBranch_c::CreateHeap() {
-1,
1,
0,
0,
0,
0x11020203
);
src/d/actor/d_a_kytag01.cpp
+1 -1
View File
@@ -40,7 +40,7 @@ static BOOL daKytag01_Delete(kytag01_class* i_this) {
}
/* 00000100-00000224 .text wave_make__Fv */
void wave_make() {
void wave_make() {
dScnKy_env_light_c& env_light = dKy_getEnvlight();
if (env_light.mWaveChan.mWaveCount == 0) {
env_light.mWaveChan.mWaveSpawnDist = 20000.0f;
src/d/actor/d_a_obj_toripost.cpp
+1 -1
View File
@@ -269,7 +269,7 @@ s32 daObjTpost_c::getReadableLetterNum() {
u8 daObjTpost_c::checkSendPrice() {
static const u8 pay_type[49] = {
02,
02,
01,
01,
00,
src/d/actor/d_a_obj_zouK.cpp
+1 -1
View File
@@ -259,7 +259,7 @@ bool daObjZouk::Act_c::_execute() {
}
static void dummy() {
const f32 floats[] = {
const f32 floats[] = {
1200.0f, 500.0f, 26.0f,
530.0f, 418.0f, 1003.0f,
305.0f, 235.0f, 1323.0f,
src/d/actor/d_a_player_main.cpp
+2 -2
View File
@@ -3004,7 +3004,7 @@ void daPy_lk_c::deleteEquipItem(int param_1) {
if ((mHeldItemType == ROPE && checkRopeAnime()) ||
(mHeldItemType == BOOMERANG && checkBoomerangAnime()) ||
(mHeldItemType == HOOKSHOT && m_anm_heap_upper[2].mIdx == LKANM_BCK_HOOKSHOTWAIT) ||
(mHeldItemType == HOOKSHOT && m_anm_heap_upper[2].mIdx == LKANM_BCK_HOOKSHOTWAIT) ||
(checkBowItem(mHeldItemType) && checkBowAnime()))
{
resetActAnimeUpper(UPPER_UNK2, -1.0f);
@@ -4910,7 +4910,7 @@ int phase_3(daPy_lk_c* i_this) {
static s32 daPy_Create(fopAc_ac_c* i_this) {
static int (*l_method[3])(daPy_lk_c*) = {
phase_1,
phase_1,
phase_2,
phase_3,
};
src/d/actor/d_a_rd.cpp
+4 -4
View File
@@ -236,7 +236,7 @@ static BOOL createHeap_CB(fopAc_ac_c* i_this) {
/* 000006C0-0000096C .text _createHeap__6daRd_cFv */
BOOL daRd_c::_createHeap() {
J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(m_arc_name, RD_BDL_RD));
JUT_ASSERT(504, modelData != 0);
JUT_ASSERT(504, modelData != 0);
mpMorf = new mDoExt_McaMorf(
modelData,
@@ -257,7 +257,7 @@ BOOL daRd_c::_createHeap() {
}
J3DAnmTextureSRTKey* btk = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes(m_arc_name, RD_BTK_RD_CLOSE));
JUT_ASSERT(525, btk != 0);
JUT_ASSERT(525, btk != 0);
if (!mBtkAnm.init(modelData, btk, true, 0, 1.0f, 0, -1, false, 0)) {
return FALSE;
}
@@ -265,7 +265,7 @@ BOOL daRd_c::_createHeap() {
modelData->getJointNodePointer(0x0C)->setCallBack(nodeHeadControl_CB); // ree_atama_1
J3DAnmTevRegKey* brk = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes(m_arc_name, RD_BRK_NML));
JUT_ASSERT(550, brk != 0);
JUT_ASSERT(550, brk != 0);
if (!mBrkAnm.init(modelData, brk, true, 0, 1.0f, 0, -1, false, 0)) {
return FALSE;
}
@@ -1384,7 +1384,7 @@ void daRd_c::setBrkAnm(s8 idx) {
J3DModel* model = mpMorf->getModel();
J3DAnmTevRegKey* brk = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes(m_arc_name, a_anm_idx_tbl[idx]));
JUT_ASSERT(1890, brk != 0);
JUT_ASSERT(1890, brk != 0);
mBrkAnm.init(model->getModelData(), brk, true, a_play_mod_tbl[idx], 1.0f, 0, -1, true, 0);
}
src/d/actor/d_a_sea.cpp
+3 -3
View File
@@ -57,7 +57,7 @@ u8 pos_around[16] = {
};
/* 8015B0A4-8015B0FC .text Pos2Index__25daSea_WaterHeightInfo_MngFfPf */
int daSea_WaterHeightInfo_Mng::Pos2Index(f32 v, f32* dst) {
int daSea_WaterHeightInfo_Mng::Pos2Index(f32 v, f32* dst) {
int idx = (v + 450000.0f) / 100000.0f;
if (dst != NULL)
*dst = (v + 450000.0f) - idx * 100000.0f;
@@ -200,7 +200,7 @@ bool daSea_packet_c::create(cXyz& pos) {
GXInitTexObjLOD(&mTexSea1, (GXTexFilter)timg->minFilter, (GXTexFilter)timg->magFilter,
timg->minLOD * 0.125f, timg->maxLOD * 0.125f, 0.0f,
(GXBool)timg->biasClamp, (GXBool)timg->doEdgeLOD,
(GXAnisotropy)timg->maxAnisotropy);
(GXAnisotropy)timg->maxAnisotropy);
timg = (ResTIMG*)dComIfG_getObjectRes("Always", ALWAYS_BTI_B_WYURAYURA_TEX1);
mDoLib_setResTimgObj(timg, &mpTexWyurayura, 0, NULL);
@@ -289,7 +289,7 @@ void daSea_GetPoly(void*, void (*)(void*, cXyz&, cXyz&, cXyz&), const cXyz&, con
/* 8015C010-8015C11C .text SetCullStopFlag__14daSea_packet_cFv */
void daSea_packet_c::SetCullStopFlag() {
/* Nonmatching */
/* Nonmatching */
if (strcmp(dComIfGp_getStartStageName(), "A_umikz") == 0) {
mCullStopFlag = false;
} else {
src/d/actor/d_a_swhit0.cpp
+1 -1
View File
@@ -92,7 +92,7 @@ s32 daSwhit0_c::getTimer() {
if (param == 0xFF) {
timer = 0;
}
return timer;
return timer;
}
/* 000000B8-000000C4 .text getSwNo2__10daSwhit0_cFv */
src/d/actor/d_a_tbox.cpp
+1 -3
View File
@@ -754,9 +754,7 @@ void daTbox_c::demoProcAppear_Tact() {
mAppearTimer--;
if (mAppearTimer > l_HIO.m08 - l_HIO.m0A) {
dKy_set_allcol_ratio(
(0.6f / l_HIO.m0A)
* (mAppearTimer - (l_HIO.m08 - l_HIO.m0A)) + 0.4f);
dKy_set_allcol_ratio((0.6f / l_HIO.m0A) * (mAppearTimer - (l_HIO.m08 - l_HIO.m0A)) + 0.4f);
}
else if (mAppearTimer < l_HIO.m0C) {
dKy_set_allcol_ratio((0.6f / l_HIO.m0C) * (l_HIO.m0C - mAppearTimer) + 0.4f);
src/d/d_drawlist.cpp
+1 -1
View File
@@ -413,7 +413,7 @@ void dDlst_2Dm_c::draw() {
GXSetAlphaCompare(GX_GREATER, 0, GX_AOP_OR, GX_GREATER, 0);
GXSetBlendMode(GX_BM_BLEND, GX_BL_SRC_ALPHA, GX_BL_INV_SRC_ALPHA, GX_LO_SET);
GXLoadPosMtxImm(mDoMtx_getIdentity(), GX_PNMTX0);
GXSetCurrentMtx(GX_PNMTX0);
GXSetCurrentMtx(GX_PNMTX0);
GXBegin(GX_QUADS, GX_VTXFMT0, 4);
GXPosition3f32(mX0, mY0, 0.0f);
src/d/d_item.cpp
+3 -3
View File
@@ -2622,9 +2622,9 @@ int getRotenItemNumInBag() {
/* 800C7B50-800C7B7C .text isDaizaItem__FUc */
BOOL isDaizaItem(u8 itemNo) {
BOOL isDaiza = FALSE;
if (itemNo == FLOWER_1 || itemNo == FLOWER_2 || itemNo == FLOWER_3 ||
itemNo == HEROS_FLAG || itemNo == TAIRYO_FLAG || itemNo == SALES_FLAG ||
itemNo == WIND_FLAG || itemNo == RED_FLAG || itemNo == FOSSIL_HEAD ||
if (itemNo == FLOWER_1 || itemNo == FLOWER_2 || itemNo == FLOWER_3 ||
itemNo == HEROS_FLAG || itemNo == TAIRYO_FLAG || itemNo == SALES_FLAG ||
itemNo == WIND_FLAG || itemNo == RED_FLAG || itemNo == FOSSIL_HEAD ||
itemNo == WATER_STATUE || itemNo == POSTMAN_STATUE || itemNo == PRESIDENT_STATUE)
{
isDaiza = TRUE;
src/d/d_kankyo.cpp
+1 -1
View File
@@ -2397,7 +2397,7 @@ void dKy_setLight() {
static f32 target = 255.0f;
f32 v;
f32 v;
if (pPlayer != NULL) {
if (envLight.mBaseLightInfluence.mPower > 0.0f)
v = envLight.mBaseLightInfluence.mPos.abs(pPlayer->current.pos) / envLight.mBaseLightInfluence.mPower;
src/d/d_kankyo_dayproc.inc
+1 -1
View File
@@ -79,7 +79,7 @@ static void dKankyo_DayProc() {
}
#endif
if (dKy_get_dayofweek() == 5) {
if (dKy_get_dayofweek() == 5) {
dComIfGs_offEventBit(0x2080);
dComIfGs_offEventBit(0x2004);
dComIfGs_offEventBit(0x2002);
src/d/d_kankyo_rain.cpp
+2 -2
View File
@@ -1079,7 +1079,7 @@ void dKyr_drawSun(Mtx drawMtx, cXyz* pPos, GXColor& reg0, u8** pImg) {
GXTexCoord2s16(0xFF, 0xFF);
GXPosition3f32(pos[3].x, pos[3].y, pos[3].z);
GXTexCoord2s16(0, 0xFF);
GXEnd();
GXEnd();
}
}
@@ -1171,7 +1171,7 @@ void dKyr_drawSun(Mtx drawMtx, cXyz* pPos, GXColor& reg0, u8** pImg) {
GXTexCoord2s16(0xFF, 0xFF);
GXPosition3f32(pos[3].x, pos[3].y, pos[3].z);
GXTexCoord2s16(0, 0xFF);
GXEnd();
GXEnd();
}
}
#if VERSION != VERSION_JPN
src/d/d_npc.cpp
+2 -2
View File
@@ -377,10 +377,10 @@ s32 dNpc_PathRun_c::absIdx(u8 startIdx, u8 lastIdx) {
s32 diff_2 = lastIdx - startIdx;
if(diff_1 < 0) {
diff_1 += maxPoint();
diff_1 += maxPoint();
}
if(diff_2 < 0) {
diff_2 += maxPoint();
diff_2 += maxPoint();
}
if(diff_1 > diff_2) {
return diff_2;
src/d/d_s_logo.cpp
+1 -1
View File
@@ -880,7 +880,7 @@ s32 phase_2(dScnLogo_c* i_this) {
rt = dComIfG_setObjectRes("Agb", JKRArchive::UNKNOWN_MOUNT_DIRECTION, NULL);
JUT_ASSERT(VERSION_SELECT(1360, 1659, 1699), rt == 1);
l_anmCommand = aramMount("/res/Object/LkAnm.arc");
l_anmCommand = aramMount("/res/Object/LkAnm.arc");
l_fmapCommand = aramMount("/res/Fmap/Fmap.arc");
l_itemResCommand = aramMount("/res/Msg/itemres.arc");
l_fmapResCommand = aramMount("/res/Msg/fmapres.arc");
src/d/d_s_title.cpp
+5 -5
View File
@@ -43,7 +43,7 @@ daMP_c* dScnTitle_c::mMp;
#endif
/* 802372F4-80237344 .text dScnTitle_Draw__FP20title_of_scene_class */
BOOL dScnTitle_Draw(title_of_scene_class* i_this) {
BOOL dScnTitle_Draw(title_of_scene_class* i_this) {
for (create_tag_class* pTag = fopDwIt_Begin(); pTag != NULL; pTag = fopDwIt_Next(pTag))
fpcM_Draw(pTag->mpTagData);
return TRUE;
@@ -140,11 +140,11 @@ static scene_method_class l_dScnTitle_Method = {
};
extern scene_process_profile_definition g_profile_TITLE_SCENE = {
fpcLy_ROOT_e,
fpcLy_ROOT_e,
1,
fpcPi_CURRENT_e,
PROC_TITLE_SCENE,
&g_fpcNd_Method.mBase,
&g_fpcNd_Method.mBase,
sizeof(title_of_scene_class),
0,
0,
@@ -153,11 +153,11 @@ extern scene_process_profile_definition g_profile_TITLE_SCENE = {
};
extern scene_process_profile_definition g_profile_ENDING_SCENE = {
fpcLy_ROOT_e,
fpcLy_ROOT_e,
1,
fpcPi_CURRENT_e,
PROC_ENDING_SCENE,
&g_fpcNd_Method.mBase,
&g_fpcNd_Method.mBase,
sizeof(title_of_scene_class),
0,
0,
src/f_op/f_op_actor_mng.cpp
+2 -2
View File
@@ -1138,7 +1138,7 @@ void* fopAcM_createStealItem(cXyz* p_pos, int i_tblNo, int i_roomNo, csXyz* p_an
if (isLimitedItem(itemNo)) {
if (
(i_itemBitNo == 0x1F || i_itemBitNo == -1 || i_itemBitNo == 0xFF) ||
(i_itemBitNo == 0x1F || i_itemBitNo == -1 || i_itemBitNo == 0xFF) ||
(
!(i_itemBitNo == 0x1F || i_itemBitNo == -1 || i_itemBitNo == 0xFF) &&
fopAcM_isItemForIb(i_itemBitNo, itemNo, i_roomNo)
@@ -1187,7 +1187,7 @@ void* fopAcM_createItemFromEnemyTable(u16 itemTableIdx, int i_itemBitNo, int i_r
if (isLimitedItem(items[itemIdx])) {
if (
(i_itemBitNo == 0x1F || i_itemBitNo == -1 || i_itemBitNo == 0xFF) ||
(i_itemBitNo == 0x1F || i_itemBitNo == -1 || i_itemBitNo == 0xFF) ||
(
!(i_itemBitNo == 0x1F || i_itemBitNo == -1 || i_itemBitNo == 0xFF) &&
fopAcM_isItemForIb(i_itemBitNo, items[itemIdx], i_roomNo)
src/f_pc/f_pc_manager_data.inc
+1 -1
View File
@@ -43,7 +43,7 @@ const u8 msg_data[] ALIGN_DECL(32) = {
0x46, 0x82, 0xC9, 0x82, 0xB5, 0x0A, 0x96, 0x7B, 0x91, 0xCC, 0x82, 0xCC, 0x8E, 0xE6, 0x88, 0xB5,
0x90, 0xE0, 0x96, 0xBE, 0x8F, 0x91, 0x82, 0xCC, 0x8E, 0x77, 0x8E, 0xA6, 0x82, 0xC9, 0x8F, 0x5D,
0x82, 0xC1, 0x82, 0xC4, 0x82, 0xAD, 0x82, 0xBE, 0x82, 0xB3, 0x82, 0xA2, 0x81, 0x42, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
#else
0x4d, 0x45, 0x53, 0x47, 0x62, 0x6d, 0x67, 0x31, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00, 0x02,
0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
src/m_Do/m_Do_graphic.cpp
+3 -3
View File
@@ -272,7 +272,7 @@ bool mDoGph_AfterOfDraw() {
if (!fapGmHIO_isMenu()) {
if (JUTGamePad::getPortStatus(JUTGamePad::Port_1).button == 0 && fapGmHIO_getMeter() != 0 && !JFWSystem::getSystemConsole()->isVisible()) {
}
}
}
GXSetZCompLoc(GX_TRUE);
GXSetZMode(GX_FALSE, GX_ALWAYS, GX_FALSE);
@@ -592,7 +592,7 @@ void encode_s3tc(u8*, u8*, int, int, GXTexFmt) {
}
/* 8000A530-8000A744 .text setUpRectangle__Fv */
void setUpRectangle() {
void setUpRectangle() {
GXSetNumChans(0);
GXSetNumTexGens(1);
GXSetTexCoordGen2(GX_TEXCOORD0, GX_TG_MTX2x4, GX_TG_TEX0, GX_IDENTITY, GX_FALSE, GX_PTIDENTITY);
@@ -694,7 +694,7 @@ void mDoGph_screenCaptureDraw() {
drawRectangle(centerX, centerY - sizeH, centerX + sizeW, centerY);
drawRectangle(centerX - sizeW, centerY, centerX, centerY + sizeH);
drawRectangle(centerX, centerY, centerX + sizeW, centerY + sizeH);
}
}
out:
GXSetProjectionv(projv);