From ec3f7f0198981e4ddbb6aaab68521396c0a6ca51 Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Tue, 19 Dec 2023 21:29:37 -0500 Subject: [PATCH] misc minor cleanup (indentation, offset comments, etc) --- include/JSystem/J3DGraphAnimator/J3DModel.h | 2 +- .../JSystem/J3DGraphAnimator/J3DSkinDeform.h | 6 +- include/JSystem/J3DGraphBase/J3DTransform.h | 76 +++++------ include/JSystem/JAudio/JAISequenceMgr.h | 16 +-- include/JSystem/JAudio/JASChannelMgr.h | 48 +++---- include/JSystem/JKernel/JKRSolidHeap.h | 10 +- include/JSystem/JParticle/JPADraw.h | 48 +++---- include/JSystem/JParticle/JPADrawSetupTev.h | 6 +- include/JSystem/JParticle/JPADrawVisitor.h | 128 +++++++++--------- include/JSystem/JParticle/JPAEmitter.h | 2 +- include/JSystem/JUtility/JUTAssert.h | 2 +- include/JSystem/JUtility/JUTDirectFile.h | 12 +- include/JSystem/JUtility/JUTProcBar.h | 10 +- include/d/actor/d_a_bg.h | 3 + include/d/actor/d_a_bomb2.h | 2 +- include/d/actor/d_a_branch.h | 2 +- include/d/d_attention.h | 8 +- include/d/d_com_inf_game.h | 4 +- include/d/d_drawlist.h | 2 +- include/d/d_particle.h | 2 +- include/dolphin/gx/GXInit.h | 4 +- include/f_pc/f_pc_base.h | 2 +- src/JSystem/J2DGraph/J2DWindow.cpp | 6 +- src/JSystem/J3DGraphAnimator/J3DAnimation.cpp | 6 +- src/JSystem/J3DGraphBase/J3DGD.cpp | 2 +- src/JSystem/JAudio/JASDriverIF.cpp | 10 +- src/JSystem/JGadget/linklist.cpp | 6 +- src/JSystem/JKernel/JKRMemArchive.cpp | 34 ++--- src/JSystem/JUtility/JUTGamePad.cpp | 22 +-- src/JSystem/JUtility/JUTXfb.cpp | 6 +- src/d/actor/d_a_arrow_lighteff.cpp | 2 +- src/d/actor/d_a_bg.cpp | 7 - src/d/actor/d_a_bomb.cpp | 2 +- src/d/actor/d_a_branch.cpp | 4 +- src/d/actor/d_a_kytag01.cpp | 2 +- src/d/actor/d_a_obj_toripost.cpp | 2 +- src/d/actor/d_a_obj_zouK.cpp | 2 +- src/d/actor/d_a_player_main.cpp | 4 +- src/d/actor/d_a_rd.cpp | 8 +- src/d/actor/d_a_sea.cpp | 6 +- src/d/actor/d_a_swhit0.cpp | 2 +- src/d/actor/d_a_tbox.cpp | 4 +- src/d/d_drawlist.cpp | 2 +- src/d/d_item.cpp | 6 +- src/d/d_kankyo.cpp | 2 +- src/d/d_kankyo_dayproc.inc | 2 +- src/d/d_kankyo_rain.cpp | 4 +- src/d/d_npc.cpp | 4 +- src/d/d_s_logo.cpp | 2 +- src/d/d_s_title.cpp | 10 +- src/f_op/f_op_actor_mng.cpp | 4 +- src/f_pc/f_pc_manager_data.inc | 2 +- src/m_Do/m_Do_graphic.cpp | 6 +- 53 files changed, 285 insertions(+), 291 deletions(-) diff --git a/include/JSystem/J3DGraphAnimator/J3DModel.h b/include/JSystem/J3DGraphAnimator/J3DModel.h index b3571ec31..9da5cbd6f 100644 --- a/include/JSystem/J3DGraphAnimator/J3DModel.h +++ b/include/JSystem/J3DGraphAnimator/J3DModel.h @@ -13,7 +13,7 @@ enum J3DMdlFlag { /* 0x00002 */ J3DMdlFlag_Unk00002 = 0x2, /* 0x00004 */ J3DMdlFlag_SkinPosCpu = 0x4, /* 0x00008 */ J3DMdlFlag_SkinNrmCpu = 0x8, - /* 0x00010 */ J3DMdlFlag_Unk00010 = 0x10, + /* 0x00010 */ J3DMdlFlag_Unk00010 = 0x10, /* 0x20000 */ J3DMdlFlag_Unk20000 = 0x20000, /* 0x40000 */ J3DMdlFlag_Unk40000 = 0x40000, /* 0x80000 */ J3DMdlFlag_Unk80000 = 0x80000, diff --git a/include/JSystem/J3DGraphAnimator/J3DSkinDeform.h b/include/JSystem/J3DGraphAnimator/J3DSkinDeform.h index d68d692c1..4b486c746 100644 --- a/include/JSystem/J3DGraphAnimator/J3DSkinDeform.h +++ b/include/JSystem/J3DGraphAnimator/J3DSkinDeform.h @@ -106,9 +106,9 @@ inline void J3DFillZero32B(register void* param_0, register u32 param_1) { srwi param_1, param_1, 5 mtctr param_1 lbl_8032D948: - dcbz 0, param_0 - addi param_0, param_0, 0x20 - bdnz lbl_8032D948 + dcbz 0, param_0 + addi param_0, param_0, 0x20 + bdnz lbl_8032D948 } } diff --git a/include/JSystem/J3DGraphBase/J3DTransform.h b/include/JSystem/J3DGraphBase/J3DTransform.h index 2b480e1ef..657a49061 100644 --- a/include/JSystem/J3DGraphBase/J3DTransform.h +++ b/include/JSystem/J3DGraphBase/J3DTransform.h @@ -67,25 +67,25 @@ inline void J3DPSMulMtxVec(register MtxP mtx, register Vec* vec, register Vec* d register f32 fr00; asm { psq_l fr00, 0(vec), 0, 0 - psq_l fr2, 0(mtx), 0, 0 - psq_l fr01, 8(vec), 1, 0 - ps_mul fr4, fr2, fr00 - psq_l fr3, 8(mtx), 0, 0 - ps_madd fr5, fr3, fr01, fr4 - psq_l fr8, 16(mtx), 0, 0 - ps_sum0 fr6, fr5, fr6, fr5 - psq_l fr9, 24(mtx), 0, 0 - ps_mul fr10, fr8, fr00 - psq_st fr6, 0(dst), 1, 0 - ps_madd fr11, fr9, fr01, fr10 - psq_l fra2, 32(mtx), 0, 0 - ps_sum0 fr12, fr11, fr12, fr11 - psq_l fr3, 40(mtx), 0, 0 - ps_mul fra4, fra2, fr00 - psq_st fr12, 4(dst), 1, 0 - ps_madd fra5, fr3, fr01, fra4 - ps_sum0 fra6, fra5, fra6, fra5 - psq_st fra6, 8(dst), 1, 0 + psq_l fr2, 0(mtx), 0, 0 + psq_l fr01, 8(vec), 1, 0 + ps_mul fr4, fr2, fr00 + psq_l fr3, 8(mtx), 0, 0 + ps_madd fr5, fr3, fr01, fr4 + psq_l fr8, 16(mtx), 0, 0 + ps_sum0 fr6, fr5, fr6, fr5 + psq_l fr9, 24(mtx), 0, 0 + ps_mul fr10, fr8, fr00 + psq_st fr6, 0(dst), 1, 0 + ps_madd fr11, fr9, fr01, fr10 + psq_l fra2, 32(mtx), 0, 0 + ps_sum0 fr12, fr11, fr12, fr11 + psq_l fr3, 40(mtx), 0, 0 + ps_mul fra4, fra2, fr00 + psq_st fr12, 4(dst), 1, 0 + ps_madd fra5, fr3, fr01, fra4 + ps_sum0 fra6, fra5, fra6, fra5 + psq_st fra6, 8(dst), 1, 0 } } @@ -109,25 +109,25 @@ inline void J3DPSMulMtxVec(register MtxP mtx, register SVec* vec, register SVec* register f32 fr00; asm { psq_l fr00, 0(vec), 0, 7 - psq_l fr2, 0(mtx), 0, 0 - psq_l fr01, 4(vec), 1, 7 - ps_mul fr4, fr2, fr00 - psq_l fr3, 8(mtx), 0, 0 - ps_madd fr5, fr3, fr01, fr4 - psq_l fr8, 16(mtx), 0, 0 - ps_sum0 fr6, fr5, fr6, fr5 - psq_l fr9, 24(mtx), 0, 0 - ps_mul fr10, fr8, fr00 - psq_st fr6, 0(dst), 1, 7 - ps_madd fr11, fr9, fr01, fr10 - psq_l fra2, 32(mtx), 0, 0 - ps_sum0 fr12, fr11, fr12, fr11 - psq_l fr3, 40(mtx), 0, 0 - ps_mul fra4, fra2, fr00 - psq_st fr12, 2(dst), 1, 7 - ps_madd fra5, fr3, fr01, fra4 - ps_sum0 fra6, fra5, fra6, fra5 - psq_st fra6, 4(dst), 1, 7 + psq_l fr2, 0(mtx), 0, 0 + psq_l fr01, 4(vec), 1, 7 + ps_mul fr4, fr2, fr00 + psq_l fr3, 8(mtx), 0, 0 + ps_madd fr5, fr3, fr01, fr4 + psq_l fr8, 16(mtx), 0, 0 + ps_sum0 fr6, fr5, fr6, fr5 + psq_l fr9, 24(mtx), 0, 0 + ps_mul fr10, fr8, fr00 + psq_st fr6, 0(dst), 1, 7 + ps_madd fr11, fr9, fr01, fr10 + psq_l fra2, 32(mtx), 0, 0 + ps_sum0 fr12, fr11, fr12, fr11 + psq_l fr3, 40(mtx), 0, 0 + ps_mul fra4, fra2, fr00 + psq_st fr12, 2(dst), 1, 7 + ps_madd fra5, fr3, fr01, fra4 + ps_sum0 fra6, fra5, fra6, fra5 + psq_st fra6, 4(dst), 1, 7 } } diff --git a/include/JSystem/JAudio/JAISequenceMgr.h b/include/JSystem/JAudio/JAISequenceMgr.h index 3950f501d..41b321762 100644 --- a/include/JSystem/JAudio/JAISequenceMgr.h +++ b/include/JSystem/JAudio/JAISequenceMgr.h @@ -62,7 +62,7 @@ namespace JAInter { class MuteBit { public: - MuteBit(); + MuteBit(); u8 flag1 : 1; u8 flag2 : 1; @@ -72,12 +72,12 @@ namespace JAInter { u8 flag6 : 1; u8 flag7 : 1; u8 flag8 : 1; - }; + }; class SeqParameter { public: SeqParameter() {} - int init(); + int init(); /* 0x0000 */ MoveParaSet field_0x0; /* 0x0010 */ MoveParaSet field_0x10[16]; @@ -99,7 +99,7 @@ namespace JAInter { /* 0x135C */ SeqUpdateData* field_0x135c; /* 0x1360 */ JASystem::TTrack field_0x1360; /* 0x16EC */ JASystem::TTrack::TOuterParam field_0x16ec; - }; + }; namespace SequenceMgr { void init(); @@ -118,10 +118,10 @@ namespace JAInter { void checkPlayingSeqUpdateTrack(u32, u32, MoveParaSet*, u32*, u8, f32*); void checkPlayingSeqTrack(u32); void stopSeq(JAISound*); - void checkDvdLoadArc(u32, u32); - void storeSeqBuffer(JAISound**, Actor*, u32, u32, u8, void*); - void releaseSeqBuffer(JAISound*, u32); - int getPlayTrackInfo(u32); + void checkDvdLoadArc(u32, u32); + void storeSeqBuffer(JAISound**, Actor*, u32, u32, u8, void*); + void releaseSeqBuffer(JAISound*, u32); + int getPlayTrackInfo(u32); extern LinkSound seqControl; extern SeqUpdateData* seqTrackInfo; diff --git a/include/JSystem/JAudio/JASChannelMgr.h b/include/JSystem/JAudio/JASChannelMgr.h index a2551ef20..cab79bd15 100644 --- a/include/JSystem/JAudio/JASChannelMgr.h +++ b/include/JSystem/JAudio/JASChannelMgr.h @@ -23,30 +23,30 @@ namespace JASystem { int checkLimitStart(u32); void checkLimitStop(TChannel*, u32); - u32 field_0x0; - int field_0x4; - TChannel* field_0x8; - TChannel* field_0xc; - TChannel* field_0x10; - TChannel* field_0x14; - f32 field_0x18; - f32 field_0x1c; - f32 field_0x20; - f32 field_0x24; - f32 field_0x28; - s16 field_0x2c[8]; - s16 field_0x3c[4]; - int field_0x44; - int field_0x48; - s16 field_0x4c; - u16 field_0x4e[6]; - u8 field_0x5a[6]; - u8 field_0x60; - u8 field_0x61; - u8 field_0x62[3]; - int field_0x68; - u16 field_0x6c; - int field_0x70; + /* 0x00 */ u32 field_0x0; + /* 0x04 */ int field_0x4; + /* 0x08 */ TChannel* field_0x8; + /* 0x0C */ TChannel* field_0xc; + /* 0x10 */ TChannel* field_0x10; + /* 0x14 */ TChannel* field_0x14; + /* 0x18 */ f32 field_0x18; + /* 0x1C */ f32 field_0x1c; + /* 0x20 */ f32 field_0x20; + /* 0x24 */ f32 field_0x24; + /* 0x28 */ f32 field_0x28; + /* 0x2C */ s16 field_0x2c[8]; + /* 0x3C */ s16 field_0x3c[4]; + /* 0x44 */ int field_0x44; + /* 0x48 */ int field_0x48; + /* 0x4C */ s16 field_0x4c; + /* 0x4E */ u16 field_0x4e[6]; + /* 0x5A */ u8 field_0x5a[6]; + /* 0x60 */ u8 field_0x60; + /* 0x61 */ u8 field_0x61; + /* 0x62 */ u8 field_0x62[3]; + /* 0x68 */ int field_0x68; + /* 0x6C */ u16 field_0x6c; + /* 0x70 */ int field_0x70; }; } diff --git a/include/JSystem/JKernel/JKRSolidHeap.h b/include/JSystem/JKernel/JKRSolidHeap.h index 79beebb2a..e53cdabe2 100644 --- a/include/JSystem/JKernel/JKRSolidHeap.h +++ b/include/JSystem/JKernel/JKRSolidHeap.h @@ -6,11 +6,11 @@ class JKRSolidHeap : public JKRHeap { public: struct Unknown { - u32 field_0x0; - u32 field_0x4; - u32 field_0x8; - void* field_0xc; - Unknown* mNext; + /* 0x00 */ u32 field_0x0; + /* 0x04 */ u32 field_0x4; + /* 0x08 */ u32 field_0x8; + /* 0x0C */ void* field_0xc; + /* 0x10 */ Unknown* mNext; }; protected: diff --git a/include/JSystem/JParticle/JPADraw.h b/include/JSystem/JParticle/JPADraw.h index 267de7a67..d2fdaba1b 100644 --- a/include/JSystem/JParticle/JPADraw.h +++ b/include/JSystem/JParticle/JPADraw.h @@ -14,30 +14,30 @@ public: JPADrawClipBoard() {} ~JPADrawClipBoard() {} - JPADrawSetupTev field_0x0; - f32 field_0x4; - f32 field_0x8; - f32 field_0xc; - f32 field_0x10; - JGeometry::TVec2 field_0x14[4]; - MtxP field_0x34; - f32 field_0x38; - f32 field_0x3c; - f32 field_0x40; - f32 field_0x44; - f32 field_0x48; - f32 field_0x4c; - f32 field_0x50; - f32 field_0x54; - f32 field_0x58; - f32 field_0x5c; - f32 field_0x60; - f32 field_0x64; - Mtx field_0x68; - GXColor field_0x98; - GXColor field_0x9c; - void* field_0xa0; - u8 field_0xa4[0xb4 - 0xa4]; + /* 0x00 */ JPADrawSetupTev field_0x0; + /* 0x04 */ f32 field_0x4; + /* 0x08 */ f32 field_0x8; + /* 0x0C */ f32 field_0xc; + /* 0x10 */ f32 field_0x10; + /* 0x14 */ JGeometry::TVec2 field_0x14[4]; + /* 0x34 */ MtxP field_0x34; + /* 0x38 */ f32 field_0x38; + /* 0x3C */ f32 field_0x3c; + /* 0x40 */ f32 field_0x40; + /* 0x44 */ f32 field_0x44; + /* 0x48 */ f32 field_0x48; + /* 0x4C */ f32 field_0x4c; + /* 0x50 */ f32 field_0x50; + /* 0x54 */ f32 field_0x54; + /* 0x58 */ f32 field_0x58; + /* 0x5C */ f32 field_0x5c; + /* 0x60 */ f32 field_0x60; + /* 0x64 */ f32 field_0x64; + /* 0x68 */ Mtx field_0x68; + /* 0x98 */ GXColor field_0x98; + /* 0x9C */ GXColor field_0x9c; + /* 0xA0 */ void* field_0xa0; + /* 0xA4 */ u8 field_0xa4[0xb4 - 0xa4]; }; class JPADraw { diff --git a/include/JSystem/JParticle/JPADrawSetupTev.h b/include/JSystem/JParticle/JPADrawSetupTev.h index 0294ce26d..f4c7fe7e9 100644 --- a/include/JSystem/JParticle/JPADrawSetupTev.h +++ b/include/JSystem/JParticle/JPADrawSetupTev.h @@ -10,9 +10,9 @@ class JPADrawSetupTev { public: void setupTev(JPABaseShape* param_1, JPAExTexShape* param_2); - u8 field_0x0; - u8 field_0x1; - u8 field_0x2; + /* 0x0 */ u8 field_0x0; + /* 0x1 */ u8 field_0x1; + /* 0x2 */ u8 field_0x2; }; #endif /* JPADRAWSETUPTEV_H */ diff --git a/include/JSystem/JParticle/JPADrawVisitor.h b/include/JSystem/JParticle/JPADrawVisitor.h index dcb4b044f..95208e2b7 100644 --- a/include/JSystem/JParticle/JPADrawVisitor.h +++ b/include/JSystem/JParticle/JPADrawVisitor.h @@ -454,70 +454,70 @@ public: class JPADrawVisitorContainer { public: - JPADrawExecGenPrjMtx field_0x0; - JPADrawExecGenPrjTexMtx field_0x4; - JPADrawExecGenTexMtx0 field_0x8; - JPADrawExecGenIdtMtx field_0xc; - JPADrawExecSetTexMtx field_0x10; - JPADrawExecSetPointSize field_0x18; - JPADrawExecSetLineWidth field_0x1c; - JPADrawExecRegisterColorEmitterPE field_0x20; - JPADrawExecRegisterColorEmitterP field_0x24; - JPADrawExecRegisterColorEmitterE field_0x28; - JPADrawExecRegisterColorChildPE field_0x2c; - JPADrawExecRegisterPrmColorAnm field_0x30; - JPADrawExecRegisterPrmAlphaAnm field_0x34; - JPADrawExecRegisterEnvColorAnm field_0x38; - JPADrawExecRegisterPrmCEnv field_0x3c; - JPADrawExecRegisterPrmAEnv field_0x40; - JPADrawExecLoadDefaultTexture field_0x44; - JPADrawExecLoadTexture field_0x48; - JPADrawExecLoadExTex field_0x50; - JPADrawExecBillBoard field_0x54; - JPADrawExecRotBillBoard field_0x58; - JPADrawExecYBillBoard field_0x5c; - JPADrawExecRotYBillBoard field_0x60; - JPADrawExecDirectional field_0x64; - JPADrawExecRotDirectional field_0x68; - JPADrawExecDirectionalCross field_0x6c; - JPADrawExecRotDirectionalCross field_0x70; - JPADrawExecDirBillBoard field_0x74; - JPADrawExecRotation field_0x78; - JPADrawExecRotationCross field_0x7c; - JPADrawExecPoint field_0x80; - JPADrawExecLine field_0x84; - JPADrawExecStripe field_0x88; - JPADrawExecStripeCross field_0x8c; - JPADrawExecCallBack field_0x90; - JPADrawCalcScaleX field_0x98; - JPADrawCalcScaleXBySpeed field_0x9c; - JPADrawCalcScaleY field_0xa0; - JPADrawCalcScaleYBySpeed field_0xa4; - JPADrawCalcScaleCopyX2Y field_0xa8; - JPADrawCalcScaleAnmTimingNormal field_0xac; - JPADrawCalcScaleAnmTimingRepeatX field_0xb0; - JPADrawCalcScaleAnmTimingRepeatY field_0xb4; - JPADrawCalcScaleAnmTimingReverseX field_0xb8; - JPADrawCalcScaleAnmTimingReverseY field_0xbc; - JPADrawCalcColorPrm field_0xc0; - JPADrawCalcColorEnv field_0xc8; - JPADrawCalcColorCopyFromEmitter field_0xd0; - JPADrawCalcColorAnmFrameNormal field_0xd4; - JPADrawCalcColorAnmFrameRepeat field_0xdc; - JPADrawCalcColorAnmFrameReverse field_0xe4; - JPADrawCalcColorAnmFrameMerge field_0xec; - JPADrawCalcColorAnmFrameRandom field_0xf4; - JPADrawCalcAlpha field_0xfc; - JPADrawCalcAlphaFlickNrmSin field_0x100; - JPADrawCalcAlphaFlickAddSin field_0x104; - JPADrawCalcAlphaFlickMultSin field_0x108; - JPADrawCalcTextureAnmIndexNormal field_0x10c; - JPADrawCalcTextureAnmIndexRepeat field_0x114; - JPADrawCalcTextureAnmIndexReverse field_0x11c; - JPADrawCalcTextureAnmIndexMerge field_0x124; - JPADrawCalcTextureAnmIndexRandom field_0x12c; - JPADrawCalcChildAlphaOut field_0x134; - JPADrawCalcChildScaleOut field_0x138; + /* 0x000 */ JPADrawExecGenPrjMtx field_0x0; + /* 0x004 */ JPADrawExecGenPrjTexMtx field_0x4; + /* 0x008 */ JPADrawExecGenTexMtx0 field_0x8; + /* 0x00C */ JPADrawExecGenIdtMtx field_0xc; + /* 0x010 */ JPADrawExecSetTexMtx field_0x10; + /* 0x018 */ JPADrawExecSetPointSize field_0x18; + /* 0x01C */ JPADrawExecSetLineWidth field_0x1c; + /* 0x020 */ JPADrawExecRegisterColorEmitterPE field_0x20; + /* 0x024 */ JPADrawExecRegisterColorEmitterP field_0x24; + /* 0x028 */ JPADrawExecRegisterColorEmitterE field_0x28; + /* 0x02C */ JPADrawExecRegisterColorChildPE field_0x2c; + /* 0x030 */ JPADrawExecRegisterPrmColorAnm field_0x30; + /* 0x034 */ JPADrawExecRegisterPrmAlphaAnm field_0x34; + /* 0x038 */ JPADrawExecRegisterEnvColorAnm field_0x38; + /* 0x03C */ JPADrawExecRegisterPrmCEnv field_0x3c; + /* 0x040 */ JPADrawExecRegisterPrmAEnv field_0x40; + /* 0x044 */ JPADrawExecLoadDefaultTexture field_0x44; + /* 0x048 */ JPADrawExecLoadTexture field_0x48; + /* 0x050 */ JPADrawExecLoadExTex field_0x50; + /* 0x054 */ JPADrawExecBillBoard field_0x54; + /* 0x058 */ JPADrawExecRotBillBoard field_0x58; + /* 0x05C */ JPADrawExecYBillBoard field_0x5c; + /* 0x060 */ JPADrawExecRotYBillBoard field_0x60; + /* 0x064 */ JPADrawExecDirectional field_0x64; + /* 0x068 */ JPADrawExecRotDirectional field_0x68; + /* 0x06C */ JPADrawExecDirectionalCross field_0x6c; + /* 0x070 */ JPADrawExecRotDirectionalCross field_0x70; + /* 0x074 */ JPADrawExecDirBillBoard field_0x74; + /* 0x078 */ JPADrawExecRotation field_0x78; + /* 0x07C */ JPADrawExecRotationCross field_0x7c; + /* 0x080 */ JPADrawExecPoint field_0x80; + /* 0x084 */ JPADrawExecLine field_0x84; + /* 0x088 */ JPADrawExecStripe field_0x88; + /* 0x08C */ JPADrawExecStripeCross field_0x8c; + /* 0x090 */ JPADrawExecCallBack field_0x90; + /* 0x098 */ JPADrawCalcScaleX field_0x98; + /* 0x09C */ JPADrawCalcScaleXBySpeed field_0x9c; + /* 0x0A0 */ JPADrawCalcScaleY field_0xa0; + /* 0x0A4 */ JPADrawCalcScaleYBySpeed field_0xa4; + /* 0x0A8 */ JPADrawCalcScaleCopyX2Y field_0xa8; + /* 0x0AC */ JPADrawCalcScaleAnmTimingNormal field_0xac; + /* 0x0B0 */ JPADrawCalcScaleAnmTimingRepeatX field_0xb0; + /* 0x0B4 */ JPADrawCalcScaleAnmTimingRepeatY field_0xb4; + /* 0x0B8 */ JPADrawCalcScaleAnmTimingReverseX field_0xb8; + /* 0x0BC */ JPADrawCalcScaleAnmTimingReverseY field_0xbc; + /* 0x0C0 */ JPADrawCalcColorPrm field_0xc0; + /* 0x0C8 */ JPADrawCalcColorEnv field_0xc8; + /* 0x0D0 */ JPADrawCalcColorCopyFromEmitter field_0xd0; + /* 0x0D4 */ JPADrawCalcColorAnmFrameNormal field_0xd4; + /* 0x0DC */ JPADrawCalcColorAnmFrameRepeat field_0xdc; + /* 0x0E4 */ JPADrawCalcColorAnmFrameReverse field_0xe4; + /* 0x0EC */ JPADrawCalcColorAnmFrameMerge field_0xec; + /* 0x0F4 */ JPADrawCalcColorAnmFrameRandom field_0xf4; + /* 0x0FC */ JPADrawCalcAlpha field_0xfc; + /* 0x100 */ JPADrawCalcAlphaFlickNrmSin field_0x100; + /* 0x104 */ JPADrawCalcAlphaFlickAddSin field_0x104; + /* 0x108 */ JPADrawCalcAlphaFlickMultSin field_0x108; + /* 0x10C */ JPADrawCalcTextureAnmIndexNormal field_0x10c; + /* 0x114 */ JPADrawCalcTextureAnmIndexRepeat field_0x114; + /* 0x11C */ JPADrawCalcTextureAnmIndexReverse field_0x11c; + /* 0x124 */ JPADrawCalcTextureAnmIndexMerge field_0x124; + /* 0x12C */ JPADrawCalcTextureAnmIndexRandom field_0x12c; + /* 0x134 */ JPADrawCalcChildAlphaOut field_0x134; + /* 0x138 */ JPADrawCalcChildScaleOut field_0x138; }; #endif /* JPADRAWVISITOR_H */ diff --git a/include/JSystem/JParticle/JPAEmitter.h b/include/JSystem/JParticle/JPAEmitter.h index 8008f8038..0539a85ee 100644 --- a/include/JSystem/JParticle/JPAEmitter.h +++ b/include/JSystem/JParticle/JPAEmitter.h @@ -184,7 +184,7 @@ public: JPASetRMtxTVecfromMtx(mtx, mGlobalRotation, mGlobalTranslation); } void setGlobalRotation(const JGeometry::TVec3& rot) { - JPAGetXYZRotateMtx(rot.x, rot.y, rot.z, mGlobalRotation); + JPAGetXYZRotateMtx(rot.x, rot.y, rot.z, mGlobalRotation); } void setGlobalTranslation(f32 x, f32 y, f32 z) { mGlobalTranslation.set(x, y, z); } void setGlobalTranslation(const JGeometry::TVec3& trans) { mGlobalTranslation.set(trans); } diff --git a/include/JSystem/JUtility/JUTAssert.h b/include/JSystem/JUtility/JUTAssert.h index e03d2e354..6d01dd5ab 100644 --- a/include/JSystem/JUtility/JUTAssert.h +++ b/include/JSystem/JUtility/JUTAssert.h @@ -14,7 +14,7 @@ #define JUT_ASSERT_MSG(LINE, COND, MSG) \ if (!(COND)) { \ OSReport(MSG); \ - if (!(COND)) { \ + if (!(COND)) { \ JUTAssertion::showAssert(3, __FILE__, LINE, #COND); \ OSPanic(__FILE__, LINE, "Halt"); \ } \ diff --git a/include/JSystem/JUtility/JUTDirectFile.h b/include/JSystem/JUtility/JUTDirectFile.h index ec527ac3b..7e0a981c4 100644 --- a/include/JSystem/JUtility/JUTDirectFile.h +++ b/include/JSystem/JUtility/JUTDirectFile.h @@ -14,12 +14,12 @@ struct JUTDirectFile { int fgets(void*, int); /* 0x000 */ u8 mBuffer[0x820]; - /* 0x820 */ u8* mSectorStart; - /* 0x824 */ u32 mToRead; - /* 0x828 */ u32 mLength; - /* 0x82C */ u32 mPos; - /* 0x830 */ bool mIsOpen; - /* 0x834 */ DVDFileInfo mFileInfo; + /* 0x820 */ u8* mSectorStart; + /* 0x824 */ u32 mToRead; + /* 0x828 */ u32 mLength; + /* 0x82C */ u32 mPos; + /* 0x830 */ bool mIsOpen; + /* 0x834 */ DVDFileInfo mFileInfo; }; #endif /* JUTDIRECTFILE_H */ diff --git a/include/JSystem/JUtility/JUTProcBar.h b/include/JSystem/JUtility/JUTProcBar.h index c67d5c5fa..2d17e65a2 100644 --- a/include/JSystem/JUtility/JUTProcBar.h +++ b/include/JSystem/JUtility/JUTProcBar.h @@ -33,11 +33,11 @@ public: } void accumePeek() { - if (++field_0xc >= 0x10 || mCost >= field_0x8) { - field_0x8 = mCost; - field_0xc = 0; - } - } + if (++field_0xc >= 0x10 || mCost >= field_0x8) { + field_0x8 = mCost; + field_0xc = 0; + } + } int calcBarSize(int p1, int p2) { return mCost * p1 / p2; } diff --git a/include/d/actor/d_a_bg.h b/include/d/actor/d_a_bg.h index 4e14fb87d..4fcb1a690 100644 --- a/include/d/actor/d_a_bg.h +++ b/include/d/actor/d_a_bg.h @@ -59,4 +59,7 @@ public: /* 0x2DC */ u8 mUnloadTimer; }; +// inline void searchRoomMemory(int) {} +// inline void searchRoomNo(int, readRoom_c*) {} + #endif /* D_A_BG_H */ diff --git a/include/d/actor/d_a_bomb2.h b/include/d/actor/d_a_bomb2.h index 352392468..3d388ac64 100644 --- a/include/d/actor/d_a_bomb2.h +++ b/include/d/actor/d_a_bomb2.h @@ -175,7 +175,7 @@ namespace daBomb2 { PRM_2_S = 0x00, }; - private: + private: //some of these might need updating since i initially copied them from daBomb_c /* 0x290 */ request_of_phase_process_class mPhs; /* 0x298 */ J3DModel* mpModel; diff --git a/include/d/actor/d_a_branch.h b/include/d/actor/d_a_branch.h index d05d6be64..3dcb20c57 100644 --- a/include/d/actor/d_a_branch.h +++ b/include/d/actor/d_a_branch.h @@ -32,7 +32,7 @@ public: /* 0x0290 */ request_of_phase_process_class mPhs; /* 0x0298 */ J3DModel* mModel[2]; - /* 0x02A0 */ u8 dummy2[0x08]; + /* 0x02A0 */ u8 dummy2[0x08]; /* 0x02A8 */ mDoExt_McaMorf* mAnims[2]; /* 0x02B0 */ u8 dummy[0x08]; /* 0x02B8 */ u32 m02B8; diff --git a/include/d/d_attention.h b/include/d/d_attention.h index bde7ccc9c..0a6c0a7b0 100644 --- a/include/d/d_attention.h +++ b/include/d/d_attention.h @@ -86,10 +86,10 @@ public: void requestF(fopAc_ac_c*, s16, int); private: - u32 field_0x0; - u32 field_0x4; - f32 field_0x8; - u32 mLookTargetID; + /* 0x0 */ u32 field_0x0; + /* 0x4 */ u32 field_0x4; + /* 0x8 */ f32 field_0x8; + /* 0xC */ u32 mLookTargetID; }; // Size: 0x10 class dAttList_c { diff --git a/include/d/d_com_inf_game.h b/include/d/d_com_inf_game.h index 506b48723..325685148 100644 --- a/include/d/d_com_inf_game.h +++ b/include/d/d_com_inf_game.h @@ -367,7 +367,7 @@ public: void setMessageCountNumber(s16 num) { mMsgCountNumber = num; } s16 getMiniGameRupee() { return mMiniGameRupee; } - void plusMiniGameRupee(s16 count) { + void plusMiniGameRupee(s16 count) { if(mMiniGameRupee + count > 0) { mMiniGameRupee += count; } @@ -2136,7 +2136,7 @@ inline s16 dComIfGp_getMiniGameRupee() { return g_dComIfG_gameInfo.play.getMiniGameRupee(); } -inline void dComIfGp_plusMiniGameRupee(s16 count) { +inline void dComIfGp_plusMiniGameRupee(s16 count) { g_dComIfG_gameInfo.play.plusMiniGameRupee(count); } diff --git a/include/d/d_drawlist.h b/include/d/d_drawlist.h index 2ac6dac72..6ec76b6a3 100644 --- a/include/d/d_drawlist.h +++ b/include/d/d_drawlist.h @@ -120,7 +120,7 @@ public: class dDlst_snapShot_c : public dDlst_base_c { public: ~dDlst_snapShot_c() {}; - void draw(); + void draw(); }; class dDlst_window_c { diff --git a/include/d/d_particle.h b/include/d/d_particle.h index 304f37e98..168aae6e8 100644 --- a/include/d/d_particle.h +++ b/include/d/d_particle.h @@ -254,7 +254,7 @@ public: virtual void draw(JPABaseEmitter*); virtual void setup(JPABaseEmitter*, const cXyz*, const csXyz*, s8); - u8 field_0x4; + /* 0x04 */ u8 field_0x4; }; class dPa_windPcallBack : public JPACallBackBase2 { diff --git a/include/dolphin/gx/GXInit.h b/include/dolphin/gx/GXInit.h index ea28dcdee..72eef5a6c 100644 --- a/include/dolphin/gx/GXInit.h +++ b/include/dolphin/gx/GXInit.h @@ -56,8 +56,8 @@ typedef struct _GXData { /* 0x208 */ GXTexRegion field_0x208[8]; /* 0x288 */ GXTexRegion field_0x288[8]; /* 0x308 */ GXTexRegion field_0x308[8]; - /* 0x388 */ GXTlutRegion field_0x388[16]; - /* 0x488 */ GXTlutRegion field_0x488[4]; + /* 0x388 */ GXTlutRegion field_0x388[16]; + /* 0x488 */ GXTlutRegion field_0x488[4]; /* 0x4C8 */ GXTexRegionCallback field_0x4c8; /* 0x4CC */ GXTlutRegionCallback field_0x4cc; /* 0x4D0 */ GXAttrType field_0x4d0; diff --git a/include/f_pc/f_pc_base.h b/include/f_pc/f_pc_base.h index 984a1b1ba..192abcb8a 100644 --- a/include/f_pc/f_pc_base.h +++ b/include/f_pc/f_pc_base.h @@ -9,7 +9,7 @@ #include "f_pc/f_pc_profile.h" typedef struct create_request create_request; -typedef struct process_method_class process_method_class; +typedef struct process_method_class process_method_class; typedef struct profile_method_class profile_method_class; typedef struct base_process_class { diff --git a/src/JSystem/J2DGraph/J2DWindow.cpp b/src/JSystem/J2DGraph/J2DWindow.cpp index 1fe3460c2..732e4da97 100644 --- a/src/JSystem/J2DGraph/J2DWindow.cpp +++ b/src/JSystem/J2DGraph/J2DWindow.cpp @@ -128,11 +128,11 @@ void J2DWindow::draw_private(const JGeometry::TBox2& 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; diff --git a/src/JSystem/J3DGraphAnimator/J3DAnimation.cpp b/src/JSystem/J3DGraphAnimator/J3DAnimation.cpp index 41a754827..544a3e12c 100644 --- a/src/JSystem/J3DGraphAnimator/J3DAnimation.cpp +++ b/src/JSystem/J3DGraphAnimator/J3DAnimation.cpp @@ -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; } diff --git a/src/JSystem/J3DGraphBase/J3DGD.cpp b/src/JSystem/J3DGraphBase/J3DGD.cpp index 715a8126f..987109fb0 100644 --- a/src/JSystem/J3DGraphBase/J3DGD.cpp +++ b/src/JSystem/J3DGraphBase/J3DGD.cpp @@ -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; diff --git a/src/JSystem/JAudio/JASDriverIF.cpp b/src/JSystem/JAudio/JASDriverIF.cpp index c4a1cce4e..b5255cf41 100644 --- a/src/JSystem/JAudio/JASDriverIF.cpp +++ b/src/JSystem/JAudio/JASDriverIF.cpp @@ -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 */ diff --git a/src/JSystem/JGadget/linklist.cpp b/src/JSystem/JGadget/linklist.cpp index 702226316..783c74931 100644 --- a/src/JSystem/JGadget/linklist.cpp +++ b/src/JSystem/JGadget/linklist.cpp @@ -9,9 +9,9 @@ namespace std { template 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 diff --git a/src/JSystem/JKernel/JKRMemArchive.cpp b/src/JSystem/JKernel/JKRMemArchive.cpp index 25501e5ba..e8d5b8fa1 100644 --- a/src/JSystem/JKernel/JKRMemArchive.cpp +++ b/src/JSystem/JKernel/JKRMemArchive.cpp @@ -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 */ diff --git a/src/JSystem/JUtility/JUTGamePad.cpp b/src/JSystem/JUtility/JUTGamePad.cpp index 944c192da..66f8e525e 100644 --- a/src/JSystem/JUtility/JUTGamePad.cpp +++ b/src/JSystem/JUtility/JUTGamePad.cpp @@ -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 )"); } diff --git a/src/JSystem/JUtility/JUTXfb.cpp b/src/JSystem/JUtility/JUTXfb.cpp index 4ebba5849..cc1add7d6 100644 --- a/src/JSystem/JUtility/JUTXfb.cpp +++ b/src/JSystem/JUtility/JUTXfb.cpp @@ -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"); } diff --git a/src/d/actor/d_a_arrow_lighteff.cpp b/src/d/actor/d_a_arrow_lighteff.cpp index 38a92244c..ae3d6e48e 100644 --- a/src/d/actor/d_a_arrow_lighteff.cpp +++ b/src/d/actor/d_a_arrow_lighteff.cpp @@ -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(i_this)->_delete(); + return static_cast(i_this)->_delete(); } bool daArrow_Lighteff_c::_draw() { diff --git a/src/d/actor/d_a_bg.cpp b/src/d/actor/d_a_bg.cpp index 0aec7eaa1..094ab3c50 100644 --- a/src/d/actor/d_a_bg.cpp +++ b/src/d/actor/d_a_bg.cpp @@ -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); diff --git a/src/d/actor/d_a_bomb.cpp b/src/d/actor/d_a_bomb.cpp index 13586d3db..b19ec110c 100644 --- a/src/d/actor/d_a_bomb.cpp +++ b/src/d/actor/d_a_bomb.cpp @@ -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; } diff --git a/src/d/actor/d_a_branch.cpp b/src/d/actor/d_a_branch.cpp index d28eb2f34..7401e6e17 100644 --- a/src/d/actor/d_a_branch.cpp +++ b/src/d/actor/d_a_branch.cpp @@ -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 ); diff --git a/src/d/actor/d_a_kytag01.cpp b/src/d/actor/d_a_kytag01.cpp index f870d7e28..4df1729fc 100644 --- a/src/d/actor/d_a_kytag01.cpp +++ b/src/d/actor/d_a_kytag01.cpp @@ -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; diff --git a/src/d/actor/d_a_obj_toripost.cpp b/src/d/actor/d_a_obj_toripost.cpp index df11438cc..fd0fbf45c 100644 --- a/src/d/actor/d_a_obj_toripost.cpp +++ b/src/d/actor/d_a_obj_toripost.cpp @@ -269,7 +269,7 @@ s32 daObjTpost_c::getReadableLetterNum() { u8 daObjTpost_c::checkSendPrice() { static const u8 pay_type[49] = { - 02, + 02, 01, 01, 00, diff --git a/src/d/actor/d_a_obj_zouK.cpp b/src/d/actor/d_a_obj_zouK.cpp index b2ef0394c..6afd35946 100644 --- a/src/d/actor/d_a_obj_zouK.cpp +++ b/src/d/actor/d_a_obj_zouK.cpp @@ -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, diff --git a/src/d/actor/d_a_player_main.cpp b/src/d/actor/d_a_player_main.cpp index 56267f1b9..e79203d80 100644 --- a/src/d/actor/d_a_player_main.cpp +++ b/src/d/actor/d_a_player_main.cpp @@ -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, }; diff --git a/src/d/actor/d_a_rd.cpp b/src/d/actor/d_a_rd.cpp index 91c031759..9a7e530f2 100644 --- a/src/d/actor/d_a_rd.cpp +++ b/src/d/actor/d_a_rd.cpp @@ -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(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(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(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(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); } diff --git a/src/d/actor/d_a_sea.cpp b/src/d/actor/d_a_sea.cpp index 7032498f0..c9946379a 100644 --- a/src/d/actor/d_a_sea.cpp +++ b/src/d/actor/d_a_sea.cpp @@ -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 { diff --git a/src/d/actor/d_a_swhit0.cpp b/src/d/actor/d_a_swhit0.cpp index d5ec18617..2d6a6878c 100644 --- a/src/d/actor/d_a_swhit0.cpp +++ b/src/d/actor/d_a_swhit0.cpp @@ -92,7 +92,7 @@ s32 daSwhit0_c::getTimer() { if (param == 0xFF) { timer = 0; } - return timer; + return timer; } /* 000000B8-000000C4 .text getSwNo2__10daSwhit0_cFv */ diff --git a/src/d/actor/d_a_tbox.cpp b/src/d/actor/d_a_tbox.cpp index 323275706..05343a31d 100644 --- a/src/d/actor/d_a_tbox.cpp +++ b/src/d/actor/d_a_tbox.cpp @@ -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); diff --git a/src/d/d_drawlist.cpp b/src/d/d_drawlist.cpp index 420d42c29..7cffa80a3 100644 --- a/src/d/d_drawlist.cpp +++ b/src/d/d_drawlist.cpp @@ -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); diff --git a/src/d/d_item.cpp b/src/d/d_item.cpp index d10014f5a..ccb8b6d62 100644 --- a/src/d/d_item.cpp +++ b/src/d/d_item.cpp @@ -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; diff --git a/src/d/d_kankyo.cpp b/src/d/d_kankyo.cpp index 03ee242bc..3afd13493 100644 --- a/src/d/d_kankyo.cpp +++ b/src/d/d_kankyo.cpp @@ -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; diff --git a/src/d/d_kankyo_dayproc.inc b/src/d/d_kankyo_dayproc.inc index 5c5902abc..04b3d078c 100644 --- a/src/d/d_kankyo_dayproc.inc +++ b/src/d/d_kankyo_dayproc.inc @@ -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); diff --git a/src/d/d_kankyo_rain.cpp b/src/d/d_kankyo_rain.cpp index 4d3ccba86..55824b60b 100644 --- a/src/d/d_kankyo_rain.cpp +++ b/src/d/d_kankyo_rain.cpp @@ -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 diff --git a/src/d/d_npc.cpp b/src/d/d_npc.cpp index ca971c1f1..1878fb69c 100644 --- a/src/d/d_npc.cpp +++ b/src/d/d_npc.cpp @@ -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; diff --git a/src/d/d_s_logo.cpp b/src/d/d_s_logo.cpp index c61d4704e..b879b4e7a 100644 --- a/src/d/d_s_logo.cpp +++ b/src/d/d_s_logo.cpp @@ -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"); diff --git a/src/d/d_s_title.cpp b/src/d/d_s_title.cpp index e6f534286..7e3169b6f 100644 --- a/src/d/d_s_title.cpp +++ b/src/d/d_s_title.cpp @@ -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, diff --git a/src/f_op/f_op_actor_mng.cpp b/src/f_op/f_op_actor_mng.cpp index 400a8fbbf..656e49fe2 100644 --- a/src/f_op/f_op_actor_mng.cpp +++ b/src/f_op/f_op_actor_mng.cpp @@ -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) diff --git a/src/f_pc/f_pc_manager_data.inc b/src/f_pc/f_pc_manager_data.inc index 03e1d7795..c80273d60 100644 --- a/src/f_pc/f_pc_manager_data.inc +++ b/src/f_pc/f_pc_manager_data.inc @@ -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, diff --git a/src/m_Do/m_Do_graphic.cpp b/src/m_Do/m_Do_graphic.cpp index cce10543a..6c535c209 100644 --- a/src/m_Do/m_Do_graphic.cpp +++ b/src/m_Do/m_Do_graphic.cpp @@ -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);