From 3c26cf452e90db518418610101bb4aeeef4c247f Mon Sep 17 00:00:00 2001 From: TakaRikka <38417346+TakaRikka@users.noreply.github.com> Date: Mon, 27 Dec 2021 06:17:37 -0800 Subject: [PATCH] cleanup --- include/JSystem/J3DGraphLoader/J3DAnmLoader.h | 4 +- include/JSystem/JSupport/JSUInputStream.h | 1 - include/d/a/d_a_alink.h | 2 +- include/d/a/d_a_horse_static.h | 2 +- include/d/a/d_a_player.h | 2 +- include/d/d_drawlist.h | 4 +- include/d/d_stage.h | 2 +- include/d/map/d_map_path.h | 2 +- include/d/map/d_map_path_dmap.h | 14 +- include/d/meter/d_meter2_draw.h | 6 +- include/d/meter/d_meter_map.h | 14 +- include/m_Do/m_Do_ext.h | 4 +- include/rel/d/a/d_a_horse/d_a_horse.h | 6 +- include/rel/d/a/e/d_a_e_wb/d_a_e_wb.h | 2 +- libs/JSystem/J2DGraph/J2DScreen.cpp | 5 +- rel/d/a/d_a_horse/d_a_horse.cpp | 2 +- src/d/a/d_a_alink.cpp | 13 +- src/d/a/d_a_player.cpp | 174 ++--------- src/d/d_resorce.cpp | 2 +- src/d/meter/d_meter2.cpp | 59 +--- src/d/meter/d_meter2_draw.cpp | 21 +- src/d/meter/d_meter_map.cpp | 271 ++++++++++-------- src/d/msg/d_msg_object.cpp | 1 - 23 files changed, 228 insertions(+), 385 deletions(-) diff --git a/include/JSystem/J3DGraphLoader/J3DAnmLoader.h b/include/JSystem/J3DGraphLoader/J3DAnmLoader.h index 46e36e70c1d..0c6a6a84746 100644 --- a/include/JSystem/J3DGraphLoader/J3DAnmLoader.h +++ b/include/JSystem/J3DGraphLoader/J3DAnmLoader.h @@ -3,9 +3,7 @@ #include "dolphin/types.h" -enum J3DAnmLoaderDataBaseFlag { - UNK_FLAG0 -}; +enum J3DAnmLoaderDataBaseFlag { UNK_FLAG0 }; struct J3DAnmBase; diff --git a/include/JSystem/JSupport/JSUInputStream.h b/include/JSystem/JSupport/JSUInputStream.h index 5b7a7e0f6e9..5bb0f4f98e6 100644 --- a/include/JSystem/JSupport/JSUInputStream.h +++ b/include/JSystem/JSupport/JSUInputStream.h @@ -47,7 +47,6 @@ public: /* 802DC298 */ s32 read(void*, s32); }; // Size = 0x8 - // move? template T* JSUConvertOffsetToPtr(const void*, const void*); diff --git a/include/d/a/d_a_alink.h b/include/d/a/d_a_alink.h index 0c941d38040..1fd1e895d90 100644 --- a/include/d/a/d_a_alink.h +++ b/include/d/a/d_a_alink.h @@ -203,7 +203,7 @@ public: enum daAlink_WANM { /* 0x5E */ ANM_WOLF_HOWL_SUCCESS = 94, - /* 0x70 */ ANM_TRANFORM_HUMAN = 0x70, // verify + /* 0x70 */ ANM_TRANFORM_HUMAN = 0x70, // verify }; enum MODE_FLG { diff --git a/include/d/a/d_a_horse_static.h b/include/d/a/d_a_horse_static.h index 058dae74049..a2873bdfbaa 100644 --- a/include/d/a/d_a_horse_static.h +++ b/include/d/a/d_a_horse_static.h @@ -1,8 +1,8 @@ #ifndef D_A_D_A_HORSE_STATIC_H #define D_A_D_A_HORSE_STATIC_H -#include "rel/d/a/e/d_a_e_wb/d_a_e_wb.h" #include "dolphin/types.h" +#include "rel/d/a/e/d_a_e_wb/d_a_e_wb.h" class daTagHstop_c { static daTagHstop_c* m_top; diff --git a/include/d/a/d_a_player.h b/include/d/a/d_a_player.h index 14500ece0e4..61e0b9b342e 100644 --- a/include/d/a/d_a_player.h +++ b/include/d/a/d_a_player.h @@ -505,7 +505,7 @@ public: } return sumouCameraMode; } - + bool i_getSumouMode() const { return getSumouCameraMode(); } bool checkStatusWindowDraw() { return i_checkNoResetFlg2(STATUS_WINDOW_DRAW); } diff --git a/include/d/d_drawlist.h b/include/d/d_drawlist.h index 7a45959d10e..493fa2079a6 100644 --- a/include/d/d_drawlist.h +++ b/include/d/d_drawlist.h @@ -191,9 +191,7 @@ public: /* 800568D8 */ void wipeIn(f32); /* 80056900 */ void calcWipe(); - void set2DOpa(dDlst_base_c* dlst) { - set(field_0x1b4, field_0x1b8, dlst); - } + void set2DOpa(dDlst_base_c* dlst) { set(field_0x1b4, field_0x1b8, dlst); } static u8 mWipeDlst[72]; static u8 mWipeColor[4]; diff --git a/include/d/d_stage.h b/include/d/d_stage.h index 650545d52c5..59be2cc8a39 100644 --- a/include/d/d_stage.h +++ b/include/d/d_stage.h @@ -705,6 +705,6 @@ inline s8 dStage_sclsInfo_getTimeH(stage_scls_info_class* p_info) { inline u32 dStage_FileList_dt_getMiniMap(dStage_FileList_dt_c* p_fList) { return p_fList->field_0x0 >> 3 & 7; -} +} #endif /* D_D_STAGE_H */ diff --git a/include/d/map/d_map_path.h b/include/d/map/d_map_path.h index 9c9369c6942..f4fc8a3f2ec 100644 --- a/include/d/map/d_map_path.h +++ b/include/d/map/d_map_path.h @@ -18,7 +18,7 @@ public: /* 8003CB00 */ void rendering(dDrawPath_c::group_class const*); /* 8003CBBC */ void rendering(dDrawPath_c::floor_class const*); - + /* 8002AD3C */ virtual ~dDrawPath_c(); /* 8002ABF0 */ virtual bool isDrawType(int); virtual void getColor(int) = 0; diff --git a/include/d/map/d_map_path_dmap.h b/include/d/map/d_map_path_dmap.h index 2d51f013532..d556a2f6721 100644 --- a/include/d/map/d_map_path_dmap.h +++ b/include/d/map/d_map_path_dmap.h @@ -1,8 +1,8 @@ #ifndef D_MAP_D_MAP_PATH_DMAP_H #define D_MAP_D_MAP_PATH_DMAP_H -#include "d/map/d_map_path.h" #include "d/d_stage.h" +#include "d/map/d_map_path.h" #include "dolphin/types.h" struct dTres_c { @@ -68,7 +68,7 @@ public: /* 8003FE6C */ void setSingleRoomSetting(); /* 8003FFF4 */ void getFirstDrawRoomNo(); /* 80040094 */ void getNextDrawRoomNo(int); - + /* 8003FE18 */ virtual void draw(); /* 8002B150 */ virtual ~renderingDAmap_c(); /* 8003FD9C */ virtual void isSwitch(dDrawPath_c::group_class const*); @@ -82,7 +82,7 @@ public: /* 800402E0 */ virtual bool getFirstDrawLayerNo(); /* 800402E8 */ virtual void getNextDrawLayerNo(int); /* 800409E0 */ virtual void isDrawIconSingle(dTres_c::data_s const*, int, int, bool, bool, - Vec const*) const; + Vec const*) const; /* 80040AE4 */ virtual void getIconGroupNumber(u8) const; virtual void hasMap() const = 0; virtual void isRendAllRoom() const = 0; @@ -93,9 +93,7 @@ public: /* 8003FE70 */ virtual void isDrawRoom(int, int) const; /* 800409B4 */ virtual void isDrawRoomIcon(int, int) const; - bool isDraw() const { - return mDraw; - } + bool isDraw() const { return mDraw; } private: /* 0x24 */ int field_0x24; @@ -108,13 +106,13 @@ private: class stage_tgsc_data_class; class renderingPlusDoor_c : public renderingDAmap_c { -public: +public: /* 80040574 */ void drawDoor1(); /* 800405B8 */ void drawDoor2(); /* 800405FC */ void drawDoorCommon(stage_tgsc_data_class const*, int, bool); /* 80040710 */ void checkDispDoorS(int, int, f32); /* 80040838 */ void drawNormalDoorS(stage_tgsc_data_class const*, int, int, bool); - + /* 8002B0B4 */ virtual ~renderingPlusDoor_c(); /* 8004145C */ virtual void beforeDrawPath(); /* 80040518 */ virtual void afterDrawPath(); diff --git a/include/d/meter/d_meter2_draw.h b/include/d/meter/d_meter2_draw.h index b45c4830453..4e914825740 100644 --- a/include/d/meter/d_meter2_draw.h +++ b/include/d/meter/d_meter2_draw.h @@ -114,7 +114,7 @@ public: /* 802102F8 */ virtual ~dMeter2Draw_c(); - J2DScreen* getMainScreenPtr() { return mpScreen; } + J2DScreen* getMainScreenPtr() { return mpScreen; } private: /* 0x004 */ f32 field_0x4; @@ -213,8 +213,8 @@ private: /* 0x524 */ int field_0x524[2][2]; /* 0x534 */ u8 field_0x534[8]; /* 0x53C */ J2DAnmColorKey* field_0x53c; - /* 0x540 */ J2DAnmColorKey* field_0x540; // bpk - /* 0x544 */ J2DAnmColorKey* field_0x544; // bpk + /* 0x540 */ J2DAnmColorKey* field_0x540; + /* 0x544 */ J2DAnmColorKey* field_0x544; /* 0x548 */ u8 field_0x548[8]; /* 0x550 */ f32 field_0x550; /* 0x554 */ f32 field_0x554; diff --git a/include/d/meter/d_meter_map.h b/include/d/meter/d_meter_map.h index 208b135e464..b65ba6cc832 100644 --- a/include/d/meter/d_meter_map.h +++ b/include/d/meter/d_meter_map.h @@ -1,8 +1,8 @@ #ifndef D_METER_D_METER_MAP_H #define D_METER_D_METER_MAP_H -#include "JSystem/J2DGraph/J2DScreen.h" #include "JSystem/J2DGraph/J2DPicture.h" +#include "JSystem/J2DGraph/J2DScreen.h" #include "d/map/d_map_path_dmap.h" #include "dolphin/types.h" @@ -66,7 +66,7 @@ public: /* 8002A1BC */ void getDispType() const; /* 8002A32C */ void _move(f32, f32, int, f32); /* 8002AB54 */ void _draw(); - + /* 8002AF20 */ virtual ~dMap_c(); /* 800296EC */ virtual void isDrawType(int); /* 80028DF4 */ virtual void getColor(int); @@ -80,9 +80,7 @@ public: /* 8002A148 */ virtual void setAmapPaletteColor(int, u8, u8, u8, u8); /* 80029744 */ virtual bool isSpecialOutline(); - bool isDraw() const { - return renderingDAmap_c::isDraw(); - } + bool isDraw() const { return renderingDAmap_c::isDraw(); } ResTIMG* getResTIMGPointer() { return mResTIMG; } f32 getTopEdgePlus() { return mTopEdgePlus; } @@ -154,11 +152,7 @@ public: bool isDispPosInsideFlg() { return field_0x2d != 0; } - enum { - MAP_SIZE_TYPE_BIG = 2, - MAP_SIZE_TYPE_SMALL = 3, - MAP_SIZE_TYPE_STAGE = 7 - }; + enum { MAP_SIZE_TYPE_BIG = 2, MAP_SIZE_TYPE_SMALL = 3, MAP_SIZE_TYPE_STAGE = 7 }; private: /* 0x04 */ J2DPicture* mMapJ2DPicture; diff --git a/include/m_Do/m_Do_ext.h b/include/m_Do/m_Do_ext.h index 73826358d91..25aa4981243 100644 --- a/include/m_Do/m_Do_ext.h +++ b/include/m_Do/m_Do_ext.h @@ -20,9 +20,7 @@ private: class mDoExt_transAnmBas : public J3DAnmTransformKey { public: - mDoExt_transAnmBas(void* bas) { - mBas = bas; - } + mDoExt_transAnmBas(void* bas) { mBas = bas; } virtual ~mDoExt_transAnmBas(); private: diff --git a/include/rel/d/a/d_a_horse/d_a_horse.h b/include/rel/d/a/d_a_horse/d_a_horse.h index b77f7267429..9db68e95be0 100644 --- a/include/rel/d/a/d_a_horse/d_a_horse.h +++ b/include/rel/d/a/d_a_horse/d_a_horse.h @@ -1,12 +1,12 @@ #ifndef D_A_HORSE_H #define D_A_HORSE_H -#include "dolphin/types.h" -#include "f_op/f_op_actor.h" +#include "Z2AudioLib/Z2Creature.h" #include "d/bg/d_bg_s.h" #include "d/cc/d_cc_d.h" #include "d/msg/d_msg_flow.h" -#include "Z2AudioLib/Z2Creature.h" +#include "dolphin/types.h" +#include "f_op/f_op_actor.h" class daHorseRein_c { public: diff --git a/include/rel/d/a/e/d_a_e_wb/d_a_e_wb.h b/include/rel/d/a/e/d_a_e_wb/d_a_e_wb.h index f389bc94ed2..0f5478c59da 100644 --- a/include/rel/d/a/e/d_a_e_wb/d_a_e_wb.h +++ b/include/rel/d/a/e/d_a_e_wb/d_a_e_wb.h @@ -1,9 +1,9 @@ #ifndef D_A_E_WB_H #define D_A_E_WB_H +#include "Z2AudioLib/Z2Creature.h" #include "dolphin/types.h" #include "rel/d/a/d_a_horse/d_a_horse.h" -#include "Z2AudioLib/Z2Creature.h" class e_wb_class : public fopAc_ac_c { public: diff --git a/libs/JSystem/J2DGraph/J2DScreen.cpp b/libs/JSystem/J2DGraph/J2DScreen.cpp index 8bea45590cb..11318c75e98 100644 --- a/libs/JSystem/J2DGraph/J2DScreen.cpp +++ b/libs/JSystem/J2DGraph/J2DScreen.cpp @@ -249,9 +249,8 @@ SECTION_SDATA2 static f32 lit_1563[1 + 1 /* padding */] = { /* 802F8498-802F8540 2F2DD8 00A8+00 0/0 59/59 4/4 .text __ct__9J2DScreenFv */ #ifdef NONMATCHING -J2DScreen::J2DScreen() : - J2DPane(NULL, true, 'root', JGeometry::TBox2(0.0f, 0.0f, 640.0f, 480.0f)) { - +J2DScreen::J2DScreen() + : J2DPane(NULL, true, 'root', JGeometry::TBox2(0.0f, 0.0f, 640.0f, 480.0f)) { field_0x114 = -1; _4 = -1; mScissor = false; diff --git a/rel/d/a/d_a_horse/d_a_horse.cpp b/rel/d/a/d_a_horse/d_a_horse.cpp index 9fd7cb67a47..22c9a94e35e 100644 --- a/rel/d/a/d_a_horse/d_a_horse.cpp +++ b/rel/d/a/d_a_horse/d_a_horse.cpp @@ -1205,7 +1205,7 @@ asm void daHorse_c::createHeap() { #pragma pop /* 808392D8-808392DC 001498 0004+00 1/1 0/0 0/0 .text __ct__4cXyzFv */ -//cXyz::cXyz() +// cXyz::cXyz() extern "C" void __ct__4cXyzFv() { /* empty function */ } diff --git a/src/d/a/d_a_alink.cpp b/src/d/a/d_a_alink.cpp index 37a05cdd043..8c397548c83 100644 --- a/src/d/a/d_a_alink.cpp +++ b/src/d/a/d_a_alink.cpp @@ -20,8 +20,8 @@ #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_mtx.h" #include "rel/d/a/d_a_crod/d_a_crod.h" -#include "rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.h" #include "rel/d/a/d_a_horse/d_a_horse.h" +#include "rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.h" // // Types: @@ -6451,7 +6451,8 @@ bool daAlink_c::commonLineCheck(cXyz* param_0, cXyz* param_1) { /* 800A21E0-800A2280 09CB20 00A0+00 18/18 0/0 2/2 .text * getMoveBGActorName__9daAlink_cFR13cBgS_PolyInfoi */ s16 daAlink_c::getMoveBGActorName(cBgS_PolyInfo& param_0, int param_1) { - if ((param_1 != 0 || dComIfG_Bgsp().ChkPolySafe(param_0)) && dComIfG_Bgsp().ChkMoveBG_NoDABg(param_0) && dComIfG_Bgsp().GetActorPointer(param_0)) { + if ((param_1 != 0 || dComIfG_Bgsp().ChkPolySafe(param_0)) && + dComIfG_Bgsp().ChkMoveBG_NoDABg(param_0) && dComIfG_Bgsp().GetActorPointer(param_0)) { return fopAcM_GetName(dComIfG_Bgsp().GetActorPointer(param_0)); } return 0xFD; @@ -8433,7 +8434,7 @@ void* daAlink_c::getAnimeResource(daPy_anmHeap_c* p_anmHeap, u16 param_1, u32 bu u16 tmp2 = 0xFFFF; u16* tmp1 = ¶m_1; - + setIdxMask(tmp1, &tmp2); if (tmp2 == 0xFFFF) { @@ -18517,7 +18518,8 @@ bool daAlink_c::procCoMetamorphoseInit() { field_0x347c = 1.0f; mFallVoiceInit = 0; - if ((i_checkWolf() && mDemo.getDemoMode() == 0x39) || (!i_checkWolf() && mDemo.getDemoMode() == 0x3A)) { + if ((i_checkWolf() && mDemo.getDemoMode() == 0x39) || + (!i_checkWolf() && mDemo.getDemoMode() == 0x3A)) { field_0x300a = 1; mSpeed.y = 0.0f; mNormalSpeed = 0.0f; @@ -18554,7 +18556,7 @@ bool daAlink_c::procCoMetamorphoseInit() { setMetamorphoseModel(1); field_0x3588 = l_waitBaseAnime; field_0x3480 = daAlinkHIO_basic_c0::m.mLinkWolfTransformSpeed; - + cXyz pos(mCurrent.mPosition.x + (cM_ssin(mCollisionRot.y) * 100.0f), mCurrent.mPosition.y + 300.0f, mCurrent.mPosition.z + (cM_scos(mCollisionRot.y) * 100.0f)); @@ -18574,7 +18576,6 @@ bool daAlink_c::procCoMetamorphoseInit() { } tmp_58.y = tmp_4c.y; - if (commonLineCheck(&tmp_4c, &tmp_58) && dBgS_CheckBWallPoly(mLinkLinChk)) { if (dComIfG_Bgsp().GetWallCode(mLinkLinChk) != 7) { check = true; diff --git a/src/d/a/d_a_player.cpp b/src/d/a/d_a_player.cpp index 3acacdf0284..a09b46c0b77 100644 --- a/src/d/a/d_a_player.cpp +++ b/src/d/a/d_a_player.cpp @@ -4,6 +4,7 @@ // #include "d/a/d_a_player.h" +#include "JSystem/J3DGraphLoader/J3DAnmLoader.h" #include "SSystem/SComponent/c_math.h" #include "d/com/d_com_inf_game.h" #include "dol2asm.h" @@ -11,7 +12,6 @@ #include "dolphin/types.h" #include "f_op/f_op_actor_iter.h" #include "f_op/f_op_actor_mng.h" -#include "JSystem/J3DGraphLoader/J3DAnmLoader.h" #include "rel/d/a/d_a_boomerang/d_a_boomerang.h" // @@ -324,14 +324,19 @@ asm BOOL daPy_py_c::checkBombItem(int param_0) { /* 8015EA88-8015EAD8 1593C8 0050+00 0/0 5/5 0/0 .text checkBottleItem__9daPy_py_cFi */ // is there a way to write this with a switch? BOOL daPy_py_c::checkBottleItem(int i_itemNo) { - return (i_itemNo >= EMPTY_BOTTLE && i_itemNo <= FAIRY) || i_itemNo == BEE_CHILD || i_itemNo == WORM || i_itemNo == FAIRY_DROP || i_itemNo == CHUCHU_BLACK || (i_itemNo >= CHUCHU_RARE && i_itemNo <= LV3_SOUP); + return (i_itemNo >= EMPTY_BOTTLE && i_itemNo <= FAIRY) || i_itemNo == BEE_CHILD || + i_itemNo == WORM || i_itemNo == FAIRY_DROP || i_itemNo == CHUCHU_BLACK || + (i_itemNo >= CHUCHU_RARE && i_itemNo <= LV3_SOUP); } /* 8015EAD8-8015EB40 159418 0068+00 0/0 3/3 0/0 .text checkDrinkBottleItem__9daPy_py_cFi */ // is there a way to write this with a switch? BOOL daPy_py_c::checkDrinkBottleItem(int i_itemNo) { - return (i_itemNo >= RED_BOTTLE && i_itemNo <= HALF_MILK_BOTTLE) || i_itemNo == RED_BOTTLE_2 || i_itemNo == UGLY_SOUP || i_itemNo == HOT_SPRING || i_itemNo == BEE_CHILD || i_itemNo == CHUCHU_BLACK || i_itemNo == FAIRY_DROP || (i_itemNo >= CHUCHU_RARE && i_itemNo != CHUCHU_YELLOW && i_itemNo <= LV3_SOUP); + return (i_itemNo >= RED_BOTTLE && i_itemNo <= HALF_MILK_BOTTLE) || i_itemNo == RED_BOTTLE_2 || + i_itemNo == UGLY_SOUP || i_itemNo == HOT_SPRING || i_itemNo == BEE_CHILD || + i_itemNo == CHUCHU_BLACK || i_itemNo == FAIRY_DROP || + (i_itemNo >= CHUCHU_RARE && i_itemNo != CHUCHU_YELLOW && i_itemNo <= LV3_SOUP); } /* 8015EB40-8015EB68 159480 0028+00 0/0 4/4 0/0 .text checkOilBottleItem__9daPy_py_cFi */ @@ -358,7 +363,9 @@ BOOL daPy_py_c::checkHookshotItem(int i_itemNo) { /* 8015EBD8-8015EC28 159518 0050+00 0/0 3/3 0/0 .text checkTradeItem__9daPy_py_cFi */ BOOL daPy_py_c::checkTradeItem(int i_itemNo) { - return (i_itemNo >= LETTER && i_itemNo <= IRIAS_PENDANT) || i_itemNo == ANCIENT_DOCUMENT || i_itemNo == AIR_LETTER || i_itemNo == ANCIENT_DOCUMENT2 || i_itemNo == RAFRELS_MEMO || i_itemNo == TKS_LETTER || i_itemNo == ASHS_SCRIBBLING; + return (i_itemNo >= LETTER && i_itemNo <= IRIAS_PENDANT) || i_itemNo == ANCIENT_DOCUMENT || + i_itemNo == AIR_LETTER || i_itemNo == ANCIENT_DOCUMENT2 || i_itemNo == RAFRELS_MEMO || + i_itemNo == TKS_LETTER || i_itemNo == ASHS_SCRIBBLING; } /* 8015EC28-8015EC48 159568 0020+00 0/0 2/2 0/0 .text checkDungeonWarpItem__9daPy_py_cFi @@ -567,143 +574,15 @@ JKRHeap* daPy_anmHeap_c::setAnimeHeap() { /* ############################################################################################## */ /* 803BA0C0-803BA14C 0171E0 0089+03 1/1 0/0 0/0 .data l_sightDL */ SECTION_DATA static u8 l_sightDL[137] = { - 0x10, - 0x00, - 0x00, - 0x10, - 0x40, - 0xFF, - 0xFF, - 0x42, - 0x80, - 0x08, - 0x30, - 0x3C, - 0xF3, - 0xCF, - 0x00, - 0x10, - 0x00, - 0x00, - 0x10, - 0x18, - 0x3C, - 0xF3, - 0xCF, - 0x00, - 0x61, - 0x28, - 0x38, - 0x03, - 0xC0, - 0x61, - 0xC0, - 0x08, - 0x42, - 0x8F, - 0x61, - 0xC1, - 0x08, - 0xE6, - 0x70, - 0x61, - 0x43, - 0x00, - 0x00, - 0x01, - 0x61, - 0x40, - 0x00, - 0x00, - 0x06, - 0x61, - 0x41, - 0x00, - 0x04, - 0xAD, - 0x61, - 0xF3, - 0x64, - 0x00, - 0x00, - 0x10, - 0x00, - 0x00, - 0x10, - 0x3F, - 0x00, - 0x00, - 0x00, - 0x01, - 0x10, - 0x00, - 0x00, - 0x10, - 0x09, - 0x00, - 0x00, - 0x00, - 0x00, - 0x61, - 0x00, - 0x00, - 0x00, - 0x01, - 0x98, - 0x00, - 0x04, - 0x01, - 0x01, - 0x00, - 0x01, - 0x01, - 0xFF, - 0x01, - 0x00, - 0x00, - 0x01, - 0x01, - 0xFF, - 0x00, - 0x01, - 0x00, - 0xFF, - 0xFF, - 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, - 0x00, + 0x10, 0x00, 0x00, 0x10, 0x40, 0xFF, 0xFF, 0x42, 0x80, 0x08, 0x30, 0x3C, 0xF3, 0xCF, 0x00, 0x10, + 0x00, 0x00, 0x10, 0x18, 0x3C, 0xF3, 0xCF, 0x00, 0x61, 0x28, 0x38, 0x03, 0xC0, 0x61, 0xC0, 0x08, + 0x42, 0x8F, 0x61, 0xC1, 0x08, 0xE6, 0x70, 0x61, 0x43, 0x00, 0x00, 0x01, 0x61, 0x40, 0x00, 0x00, + 0x06, 0x61, 0x41, 0x00, 0x04, 0xAD, 0x61, 0xF3, 0x64, 0x00, 0x00, 0x10, 0x00, 0x00, 0x10, 0x3F, + 0x00, 0x00, 0x00, 0x01, 0x10, 0x00, 0x00, 0x10, 0x09, 0x00, 0x00, 0x00, 0x00, 0x61, 0x00, 0x00, + 0x00, 0x01, 0x98, 0x00, 0x04, 0x01, 0x01, 0x00, 0x01, 0x01, 0xFF, 0x01, 0x00, 0x00, 0x01, 0x01, + 0xFF, 0x00, 0x01, 0x00, 0xFF, 0xFF, 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, 0x00, }; /* 80453678-8045367C 001C78 0004+00 1/1 0/0 0/0 .sdata2 @4668 */ @@ -893,7 +772,8 @@ inline s32 dStage_stagInfo_GetSaveTbl(stage_stag_info_class* param_0) { /* 8015F698-8015F730 159FD8 0098+00 0/0 2/2 1/1 .text checkCarryStartLightBallA__9daPy_py_cFv */ u32 daPy_py_c::checkCarryStartLightBallA() { - if (checkRoomRestartStart() || !dComIfGp_getStage() || !dComIfGp_getStage()->getStagInfo() || dStage_stagInfo_GetSaveTbl(dComIfGp_getStage()->getStagInfo()) != 0x17) { + if (checkRoomRestartStart() || !dComIfGp_getStage() || !dComIfGp_getStage()->getStagInfo() || + dStage_stagInfo_GetSaveTbl(dComIfGp_getStage()->getStagInfo()) != 0x17) { return FALSE; } return dComIfGs_getLastSceneMode() & 0x100000; @@ -901,7 +781,8 @@ u32 daPy_py_c::checkCarryStartLightBallA() { /* 8015F730-8015F7C8 15A070 0098+00 0/0 2/2 1/1 .text checkCarryStartLightBallB__9daPy_py_cFv */ u32 daPy_py_c::checkCarryStartLightBallB() { - if (checkRoomRestartStart() || !dComIfGp_getStage() || !dComIfGp_getStage()->getStagInfo() || dStage_stagInfo_GetSaveTbl(dComIfGp_getStage()->getStagInfo()) != 0x17) { + if (checkRoomRestartStart() || !dComIfGp_getStage() || !dComIfGp_getStage()->getStagInfo() || + dStage_stagInfo_GetSaveTbl(dComIfGp_getStage()->getStagInfo()) != 0x17) { return FALSE; } return dComIfGs_getLastSceneMode() & 0x80000; @@ -983,12 +864,12 @@ int daPy_addCalcShort(s16* param_0, s16 param_1, s16 param_2, s16 param_3, s16 p s32 phi_r4; temp_r8 = *param_0; - temp_r9 = (s16) param_1; + temp_r9 = (s16)param_1; temp_r10 = temp_r9 - temp_r8; if (temp_r8 != temp_r9) { temp_r5 = temp_r10 / param_2; - temp_r0 = (s16) param_4; + temp_r0 = (s16)param_4; if (temp_r5 > temp_r0 || temp_r5 < -temp_r0) { temp_r0_2 = param_3; temp_r4 = -temp_r0_2; @@ -999,8 +880,7 @@ int daPy_addCalcShort(s16* param_0, s16 param_1, s16 param_2, s16 param_3, s16 p phi_r4 = temp_r0_2; } *param_0 += phi_r4; - } - else if (temp_r10 >= 0) { + } else if (temp_r10 >= 0) { *param_0 = temp_r8 + param_4; if (temp_r9 - *param_0 <= 0) { *param_0 = param_1; diff --git a/src/d/d_resorce.cpp b/src/d/d_resorce.cpp index 28167fca6d2..1f1222830f6 100644 --- a/src/d/d_resorce.cpp +++ b/src/d/d_resorce.cpp @@ -993,7 +993,7 @@ asm void* dRes_control_c::getRes(char const* param_0, char const* param_1, dRes_ #pragma optimization_level 0 #pragma optimizewithasm off asm void* dRes_control_c::getIDRes(char const* param_0, u16 param_1, dRes_info_c* param_2, - int param_3) { + int param_3) { nofralloc #include "asm/d/d_resorce/getIDRes__14dRes_control_cFPCcUsP11dRes_info_ci.s" } diff --git a/src/d/meter/d_meter2.cpp b/src/d/meter/d_meter2.cpp index 329a77b4930..24b8d4a645a 100644 --- a/src/d/meter/d_meter2.cpp +++ b/src/d/meter/d_meter2.cpp @@ -473,7 +473,7 @@ int dMeter2_c::_create() { f32 temp3 = FLOAT_LABEL(lit_4662); field_0x15c = temp3; - + for (int i = 0; i < 4; i++) { field_0x160[i] = temp3; field_0x174[i] = temp3; @@ -502,9 +502,11 @@ int dMeter2_c::_create() { if (field_0x128 == 0) { if (field_0x1d2[i * 2] == BOMB_BAG_LV1 || field_0x1d2[i * 2] == NORMAL_BOMB || field_0x1d2[i * 2] == WATER_BOMB || field_0x1d2[i * 2] == POKE_BOMB) { - mpMeterDraw->setItemNum(i, dComIfGp_getSelectItemNum(i), dComIfGp_getSelectItemMaxNum(i)); + mpMeterDraw->setItemNum(i, dComIfGp_getSelectItemNum(i), + dComIfGp_getSelectItemMaxNum(i)); } else if (field_0x1d2[i * 2] == BEE_CHILD) { - mpMeterDraw->setItemNum(i, dComIfGp_getSelectItemNum(i), dComIfGp_getSelectItemMaxNum(i)); + mpMeterDraw->setItemNum(i, dComIfGp_getSelectItemNum(i), + dComIfGp_getSelectItemMaxNum(i)); } else if (field_0x1d2[i * 2] == BOW || field_0x1d2[i * 2] == LIGHT_ARROW || field_0x1d2[i * 2] == ARROW_LV1 || field_0x1d2[i * 2] == ARROW_LV2 || field_0x1d2[i * 2] == ARROW_LV3 || field_0x1d2[i * 2] == HAWK_ARROW) { @@ -523,7 +525,7 @@ int dMeter2_c::_create() { } mpMeterDraw->setItemNum(i, item_num, item_max); } - } + } } mpMap = NULL; @@ -542,7 +544,7 @@ int dMeter2_c::_create() { field_0x110 = NULL; field_0x114 = NULL; field_0x118 = NULL; - + mpHeap->getTotalFreeSize(); field_0x11c = NULL; mDoExt_setCurrentHeap(heap); @@ -727,49 +729,6 @@ asm void dMeter2_c::moveKantera() { } #pragma pop -/* void dMeter2_c::moveKantera() { - s32 max_oil = dComIfGs_getMaxOil(); - bool meter_visible = false; - - s32 cur_oil = 0; - if (dComIfGp_getItemMaxOilCount() != 0) { - if (dComIfGs_getMaxOil() + dComIfGp_getItemMaxOilCount() <= max_oil) { - max_oil = dComIfGs_getMaxOil() + dComIfGp_getItemMaxOilCount(); - if (max_oil < 0) { - max_oil = 0; - } - } - dComIfGs_setMaxOil(max_oil); - - cur_oil = dComIfGs_getOil(); - dComIfGp_setItemOilCount(max_oil - cur_oil); - dComIfGp_clearItemMaxOilCount(); - meter_visible = true; - cur_oil = max_oil; - } - - if (dComIfGp_getItemOilCount() != 0) { - if (!meter_visible) { - cur_oil = dComIfGs_getMaxOil(); - } - - if (dComIfGs_getOil() + dComIfGp_getItemOilCount() <= cur_oil) { - cur_oil = dComIfGs_getOil(); - if (dComIfGs_getOil() < 0) { - cur_oil = 0; - } - } - - dComIfGs_setOil(cur_oil); - dComIfGp_clearItemOilCount(); - meter_visible = true; - } - - if () { - - } -} */ - /* ############################################################################################## */ /* 804549EC-804549F0 002FEC 0004+00 2/2 0/0 0/0 .sdata2 @5933 */ SECTION_SDATA2 static f32 lit_5933 = 0.5f; @@ -1199,9 +1158,7 @@ static asm int dMeter2_Create(msg_class* param_0) { /* ############################################################################################## */ /* 803BFA54-803BFA68 -00001 0014+00 1/0 0/0 0/0 .data l_dMeter2_Method */ SECTION_DATA static dMeter2_Method l_dMeter2_Method[5] = { - (dMeter2_Method)dMeter2_Create, dMeter2_Delete, - dMeter2_Execute, dMeter2_IsDelete, - dMeter2_Draw, + (dMeter2_Method)dMeter2_Create, dMeter2_Delete, dMeter2_Execute, dMeter2_IsDelete, dMeter2_Draw, }; /* 803BFA68-803BFA90 -00001 0028+00 0/0 0/0 1/0 .data g_profile_METER2 */ diff --git a/src/d/meter/d_meter2_draw.cpp b/src/d/meter/d_meter2_draw.cpp index 46229657991..85392410c69 100644 --- a/src/d/meter/d_meter2_draw.cpp +++ b/src/d/meter/d_meter2_draw.cpp @@ -4,9 +4,9 @@ // #include "d/meter/d_meter2_draw.h" -#include "d/meter/d_meter_HIO.h" -#include "d/com/d_com_inf_game.h" #include "JSystem/J2DGraph/J2DAnmLoader.h" +#include "d/com/d_com_inf_game.h" +#include "d/meter/d_meter_HIO.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -715,15 +715,18 @@ void dMeter2Draw_c::initMagic() { mpMagicFrameR = new CPaneMgr(mpKanteraScreen, 'm_w_r_n', 2, NULL); mpMagicMeter = new CPaneMgr(mpKanteraScreen, 'mm_00', 0, NULL); - void* res = JKRFileLoader::getGlbResource("zelda_game_image_sanso_10percent.bpk", dComIfGp_getMain2DArchive()); + void* res = JKRFileLoader::getGlbResource("zelda_game_image_sanso_10percent.bpk", + dComIfGp_getMain2DArchive()); field_0x53c = (J2DAnmColorKey*)J2DAnmLoaderDataBase::load(res); field_0x53c->searchUpdateMaterialID(mpKanteraScreen); - res = JKRFileLoader::getGlbResource("zelda_game_image_sanso_25percent.bpk", dComIfGp_getMain2DArchive()); + res = JKRFileLoader::getGlbResource("zelda_game_image_sanso_25percent.bpk", + dComIfGp_getMain2DArchive()); field_0x540 = (J2DAnmColorKey*)J2DAnmLoaderDataBase::load(res); field_0x540->searchUpdateMaterialID(mpKanteraScreen); - res = JKRFileLoader::getGlbResource("zelda_game_image_sanso_50percent.bpk", dComIfGp_getMain2DArchive()); + res = JKRFileLoader::getGlbResource("zelda_game_image_sanso_50percent.bpk", + dComIfGp_getMain2DArchive()); field_0x544 = (J2DAnmColorKey*)J2DAnmLoaderDataBase::load(res); field_0x544->searchUpdateMaterialID(mpKanteraScreen); @@ -744,12 +747,14 @@ void dMeter2Draw_c::initMagic() { u8 magic = dComIfGs_getMagic(); u8 max_magic = dComIfGs_getMaxMagic(); - drawMagic(max_magic, magic, g_drawHIO.mMagicMeterPosX + offsetX, g_drawHIO.mMagicMeterPosY + offsetY); + drawMagic(max_magic, magic, g_drawHIO.mMagicMeterPosX + offsetX, + g_drawHIO.mMagicMeterPosY + offsetY); setAlphaMagicChange(true); u16 oil = dComIfGs_getOil(); u16 max_oil = dComIfGs_getMaxOil(); - drawKantera(max_oil, oil, g_drawHIO.mLanternMeterPosX + offsetX, g_drawHIO.mLanternMeterPosY + (g_drawHIO.mNoMagicPosY + offsetY)); + drawKantera(max_oil, oil, g_drawHIO.mLanternMeterPosX + offsetX, + g_drawHIO.mLanternMeterPosY + (g_drawHIO.mNoMagicPosY + offsetY)); setAlphaKanteraChange(true); } #else @@ -1084,7 +1089,7 @@ SECTION_SDATA2 static f32 lit_6175 = 0.03125f; #ifdef NONMATCHING void dMeter2Draw_c::drawMagic(s16 max_count, s16 now_count, f32 x_pos, f32 y_pos) { f32 x_diff = mpMagicFrameR->getInitPosX() - mpMagicFrameL->getInitPosX(); - + field_0x584 = mpMagicMeter->getInitSizeX() * (lit_6175 * now_count); field_0x590 = mpMagicMeter->getInitSizeY(); diff --git a/src/d/meter/d_meter_map.cpp b/src/d/meter/d_meter_map.cpp index 681b839ee85..e333a537ab9 100644 --- a/src/d/meter/d_meter_map.cpp +++ b/src/d/meter/d_meter_map.cpp @@ -4,13 +4,13 @@ // #include "d/meter/d_meter_map.h" +#include "Z2AudioLib/Z2AudioMgr.h" #include "d/com/d_com_inf_game.h" #include "d/menu/d_menu_window.h" #include "d/msg/d_msg_object.h" -#include "f_op/f_op_overlap_mng.h" -#include "Z2AudioLib/Z2AudioMgr.h" #include "dol2asm.h" #include "dolphin/types.h" +#include "f_op/f_op_overlap_mng.h" // // Forward References: @@ -114,7 +114,6 @@ inline BOOL dComIfGs_isEventBit(u16 id) { return g_dComIfG_gameInfo.info.getEvent().isEventBit(id); } - /* 8020D49C-8020D528 207DDC 008C+00 1/1 0/0 0/0 .text isEnableDispMap__11dMeterMap_cFv */ bool dMeterMap_c::isEnableDispMap() { bool minimapEnable = false; @@ -138,7 +137,8 @@ int dMeterMap_c::getMapDispSizeTypeNo() { int uvar6 = 7; int stayNo = dComIfGp_roomControl_getStayNo(); - dStage_FileList_dt_c* fList = dComIfGp_roomControl_getStatusRoomDt(stayNo)->mRoomDt.getFileListInfo(); + dStage_FileList_dt_c* fList = + dComIfGp_roomControl_getStatusRoomDt(stayNo)->mRoomDt.getFileListInfo(); if (fList != NULL) { uvar6 = dStage_FileList_dt_getMiniMap(fList); } @@ -154,27 +154,27 @@ int dMeterMap_c::getMapDispSizeTypeNo() { int mapDispSizeType = 0; switch (uvar6) { - case 0: - break; - case 1: - if (mapDispType == 1) { - mapDispSizeType = 4; - } else { - mapDispSizeType = 1; - } - break; - case 2: - if (mapDispType != 1) { - mapDispSizeType = 2; - } - break; - case 3: - if (mapDispType == 1) { - mapDispSizeType = 5; - } else { - mapDispSizeType = 3; - } - break; + case 0: + break; + case 1: + if (mapDispType == 1) { + mapDispSizeType = 4; + } else { + mapDispSizeType = 1; + } + break; + case 2: + if (mapDispType != 1) { + mapDispSizeType = 2; + } + break; + case 3: + if (mapDispType == 1) { + mapDispSizeType = 5; + } else { + mapDispSizeType = 3; + } + break; } return mapDispSizeType; @@ -273,7 +273,9 @@ SECTION_SDATA2 static f64 lit_4131 = 4503599627370496.0 /* cast u32 to float */; f32 dMeterMap_c::getMapDispEdgeTop() { f32 tmp = 0.0f; if (mMap != NULL) { - tmp = mMap->getTexSizeY() - mMap->getTexelPerCm() * (mMap->getPackZ() - mMap->getPackPlusZ()) - mMap->getTopEdgePlus(); + tmp = mMap->getTexSizeY() - + mMap->getTexelPerCm() * (mMap->getPackZ() - mMap->getPackPlusZ()) - + mMap->getTopEdgePlus(); } return getMapDispEdgeBottomY_Layout() - tmp; } @@ -305,7 +307,8 @@ s16 dMeterMap_c::getDispPosOutSide_OffsetX() { f32 dvar3 = -36.0f - mSizeW; f32 tmp = 0.0f; if (mMap != NULL) { - tmp = (mMap->getTexelPerCm() * mMap->getPackX()) + (mMap->getRightEdgePlus() + (mMap->getTexelPerCm() * mMap->getPackPlusZ())); + tmp = (mMap->getTexelPerCm() * mMap->getPackX()) + + (mMap->getRightEdgePlus() + (mMap->getTexelPerCm() * mMap->getPackPlusZ())); tmp += dvar3; } return tmp - getMapDispEdgeLeftX_Layout(); @@ -344,7 +347,6 @@ void dMeterMap_c::setMapAlpha(u8 alpha) { mMapAlpha = alpha; } - /* 8020D900-8020D948 208240 0048+00 3/3 1/1 0/0 .text isMapOpenCheck__11dMeterMap_cFv */ bool dMeterMap_c::isMapOpenCheck() { return dStage_stagInfo_GetUpButton(dComIfGp_getStage()->getStagInfo()) == 7 ? false : true; @@ -385,37 +387,37 @@ void dMeterMap_c::_create(J2DScreen* param_0) { getMapDispSizeTypeNo(); switch (getMapDispSizeTypeNo()) { - case 1: - dispSizeW = 216; - dispSizeH = 216; - sizeX = 144; - sizeY = 144; - break; - case 2: - dispSizeW = 216; - dispSizeH = 216; - sizeX = 216; - sizeY = 216; - break; - case 3: - dispSizeW = 216; - dispSizeH = 216; - sizeX = 96; - sizeY = 96; - break; - case 0: - case 4: - dispSizeW = 144; - dispSizeH = 144; - sizeX = 144; - sizeY = 144; - break; - case 5: - dispSizeW = 144; - dispSizeH = 144; - sizeX = 96; - sizeY = 96; - break; + case 1: + dispSizeW = 216; + dispSizeH = 216; + sizeX = 144; + sizeY = 144; + break; + case 2: + dispSizeW = 216; + dispSizeH = 216; + sizeX = 216; + sizeY = 216; + break; + case 3: + dispSizeW = 216; + dispSizeH = 216; + sizeX = 96; + sizeY = 96; + break; + case 0: + case 4: + dispSizeW = 144; + dispSizeH = 144; + sizeX = 144; + sizeY = 144; + break; + case 5: + dispSizeW = 144; + dispSizeH = 144; + sizeX = 96; + sizeY = 96; + break; } mSizeW = (s16)sizeX; @@ -438,7 +440,7 @@ void dMeterMap_c::_create(J2DScreen* param_0) { if (!isMapOpenCheck()) { field_0x2d = 0; - } + } } else { field_0x2d = 0; } @@ -513,21 +515,17 @@ void dMeterMap_c::_move(u32 param_0) { field_0x2a = checkMoveStatus(); if (field_0x2a == 1 || field_0x2a == 2 || field_0x2a == 3 || - dMeter2Info_getPauseStatus() == 7 || - dMeter2Info_getPauseStatus() == 2 || - dMeter2Info_getPauseStatus() == 6 || - dMeter2Info_getPauseStatus() == 4 || - dMeter2Info_getPauseStatus() == 3 || - dMeter2Info_getPauseStatus() == 5) { - ctrlShowMap(); + dMeter2Info_getPauseStatus() == 7 || dMeter2Info_getPauseStatus() == 2 || + dMeter2Info_getPauseStatus() == 6 || dMeter2Info_getPauseStatus() == 4 || + dMeter2Info_getPauseStatus() == 3 || dMeter2Info_getPauseStatus() == 5) { + ctrlShowMap(); } if (field_0x2d != 0) { if (field_0x28 != getDispPosInside_OffsetX()) { cLib_addCalcAngleS(&field_0x28, getDispPosInside_OffsetX(), 2, 60, 10); } - } - else { + } else { cLib_addCalcAngleS(&field_0x28, getDispPosOutSide_OffsetX(), 2, 60, 10); } @@ -535,7 +533,7 @@ void dMeterMap_c::_move(u32 param_0) { field_0x18 = field_0x28 + getMapDispEdgeLeftX_Layout(); field_0x1c = getMapDispEdgeBottomY_Layout() - mSizeH; - + mMap->_move(map_pos.x, map_pos.z, stayNo, map_pos.y); field_0x30 = dComIfGp_event_runCheck(); } @@ -582,44 +580,47 @@ void dMeterMap_c::ctrlShowMap() { if (!dMeter2Info_isGameStatus(1)) { if (!isMapOpenCheck() && !isEventRunCheck()) { if (dMw_LEFT_TRIGGER() || dMw_RIGHT_TRIGGER()) { - Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SYS_ERROR, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SYS_ERROR, NULL, 0, 0, 1.0f, 1.0f, -1.0f, + -1.0f, 0); } } else { if (dMeter2Info_getPauseStatus() == 1 || dMeter2Info_getPauseStatus() == 7 || dMeter2Info_getPauseStatus() == 3 || dMeter2Info_getPauseStatus() == 5 || dMeter2Info_getPauseStatus() == 2 || dMeter2Info_getPauseStatus() == 6) { - if (dMeter2Info_getMapStatus() == 0 && field_0x2d == 0) { - setDispPosInsideFlg_SE_On(); - Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MAP_OPEN_S, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); - dMeter2Info_set2DVibration(); - dMeter2Info_setMapStatus(1); - } + if (dMeter2Info_getMapStatus() == 0 && field_0x2d == 0) { + setDispPosInsideFlg_SE_On(); + Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MAP_OPEN_S, NULL, 0, 0, 1.0f, 1.0f, + -1.0f, -1.0f, 0); + dMeter2Info_set2DVibration(); + dMeter2Info_setMapStatus(1); + } - if (dMeter2Info_getMapStatus() == 1 && field_0x2d != 0 && isFmapScreen()) { - switch (dMeter2Info_getPauseStatus()) { - case 1: - dMeter2Info_setMapStatus(4); - break; - case 2: - dMeter2Info_setMapStatus(7); - break; - case 3: - dMeter2Info_setMapStatus(8); - break; - case 5: - dMeter2Info_setMapStatus(9); - break; - case 6: - dMeter2Info_setMapStatus(5); - break; - case 7: - dMeter2Info_setMapStatus(3); - break; - } - dMeter2Info_setMapKeyDirection(0x400); - Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MAP_OPEN_S, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); - dMeter2Info_set2DVibration(); + if (dMeter2Info_getMapStatus() == 1 && field_0x2d != 0 && isFmapScreen()) { + switch (dMeter2Info_getPauseStatus()) { + case 1: + dMeter2Info_setMapStatus(4); + break; + case 2: + dMeter2Info_setMapStatus(7); + break; + case 3: + dMeter2Info_setMapStatus(8); + break; + case 5: + dMeter2Info_setMapStatus(9); + break; + case 6: + dMeter2Info_setMapStatus(5); + break; + case 7: + dMeter2Info_setMapStatus(3); + break; } + dMeter2Info_setMapKeyDirection(0x400); + Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MAP_OPEN_S, NULL, 0, 0, 1.0f, 1.0f, + -1.0f, -1.0f, 0); + dMeter2Info_set2DVibration(); + } dMeter2Info_resetPauseStatus(); } else { if (dMeter2Info_getPauseStatus() == 4) { @@ -627,7 +628,8 @@ void dMeterMap_c::ctrlShowMap() { if (isDmapScreen()) { if (dMeter2Info_getMapStatus() == 0 && field_0x2d == 0) { setDispPosInsideFlg_SE_On(); - Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MAP_OPEN_S, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MAP_OPEN_S, NULL, 0, 0, 1.0f, + 1.0f, -1.0f, -1.0f, 0); dMeter2Info_set2DVibration(); dMeter2Info_setMapStatus(1); } @@ -635,11 +637,12 @@ void dMeterMap_c::ctrlShowMap() { if (dMeter2Info_getMapStatus() == 1 && field_0x2d != 0) { dMeter2Info_setMapStatus(6); dMeter2Info_setMapKeyDirection(0x400); - Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MAP_OPEN_S, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MAP_OPEN_S, NULL, 0, 0, 1.0f, + 1.0f, -1.0f, -1.0f, 0); dMeter2Info_set2DVibration(); } } - + } else if (!mDoCPd_c::getTrigUp(0) && !mDoCPd_c::getTrigDown(0)) { keyCheck(); } @@ -704,13 +707,15 @@ asm u8 dMeterMap_c::checkMoveStatus() { // extra gameinfo label load for dComIfGp_event_checkHind #ifdef NONMATCHING bool dMeterMap_c::isShow(u32 param_0) { - if ((param_0 & 0x4000) || fopOvlpM_IsDoingReq() || ((param_0 & 0x40) && dComIfGp_event_checkHind(0x100) && !dComIfGp_event_chkEventFlag(0x40)) || + if ((param_0 & 0x4000) || fopOvlpM_IsDoingReq() || + ((param_0 & 0x40) && dComIfGp_event_checkHind(0x100) && + !dComIfGp_event_chkEventFlag(0x40)) || daPy_getPlayerActorClass()->i_getSumouMode() || (param_0 & 0x200000) || (param_0 & 0x100) || - (param_0 & 0x80) || (param_0 & 0x40000000) || (param_0 & 0x1000) || - (param_0 & 0x100000) || (param_0 & 0x20000) || (param_0 & 8) || - (param_0 & 0x10) || (param_0 & 0x1000000) || (param_0 & 0x800000) || - (param_0 & 0x20) || (param_0 & 0x4000000) || (param_0 & 0x10000000) || - (param_0 & 0x800) || (param_0 & 0x20000000) || daPy_getPlayerActorClass()->checkEnemyAttentionLock() || dMeter2Info_isGameStatus(2)) { + (param_0 & 0x80) || (param_0 & 0x40000000) || (param_0 & 0x1000) || (param_0 & 0x100000) || + (param_0 & 0x20000) || (param_0 & 8) || (param_0 & 0x10) || (param_0 & 0x1000000) || + (param_0 & 0x800000) || (param_0 & 0x20) || (param_0 & 0x4000000) || + (param_0 & 0x10000000) || (param_0 & 0x800) || (param_0 & 0x20000000) || + daPy_getPlayerActorClass()->checkEnemyAttentionLock() || dMeter2Info_isGameStatus(2)) { return false; } return true; @@ -733,7 +738,7 @@ bool dMeterMap_c::isFmapScreen() { dStage_stagInfo_GetUpButton(dComIfGp_getStage()->getStagInfo()) == 3 || dStage_stagInfo_GetUpButton(dComIfGp_getStage()->getStagInfo()) == 4 || dStage_stagInfo_GetUpButton(dComIfGp_getStage()->getStagInfo()) == 6) { - return true; + return true; } return false; } @@ -752,29 +757,32 @@ void dMeterMap_c::meter_map_move(u32 param_0) { if (!dMeter2Info_isSub2DStatus(1) && isFmapScreen()) { dMeter2Info_setMapStatus(3); dMeter2Info_setMapKeyDirection(0x400); - Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MAP_OPEN_S, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MAP_OPEN_S, NULL, 0, 0, 1.0f, 1.0f, -1.0f, + -1.0f, 0); dMeter2Info_set2DVibration(); } dMeter2Info_resetPauseStatus(); } else { if (dMw_LEFT_TRIGGER() && !dComIfGp_event_runCheck() && !dMsgObject_isTalkNowCheck() && (dMeter2Info_getMapStatus() == 0 || dMeter2Info_getMapStatus() == 1)) { - if (dMeter2Info_getMapStatus() == 0 && !dMeter2Info_isSub2DStatus(1)) { + if (dMeter2Info_getMapStatus() == 0 && !dMeter2Info_isSub2DStatus(1)) { if (isFmapScreen() || isDmapScreen()) { dMeter2Info_setMapStatus(2); dMeter2Info_setMapKeyDirection(0x200); - Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MAP_OPEN_S, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MAP_OPEN_S, NULL, 0, 0, 1.0f, 1.0f, + -1.0f, -1.0f, 0); dMeter2Info_set2DVibration(); } } - } - else if (dMw_RIGHT_TRIGGER() && !dComIfGp_event_runCheck() && !dMsgObject_isTalkNowCheck() && - (dMeter2Info_getMapStatus() == 0 || dMeter2Info_getMapStatus() == 1)) { + } else if (dMw_RIGHT_TRIGGER() && !dComIfGp_event_runCheck() && + !dMsgObject_isTalkNowCheck() && + (dMeter2Info_getMapStatus() == 0 || dMeter2Info_getMapStatus() == 1)) { if (!dMeter2Info_isSub2DStatus(1)) { if (isFmapScreen() || isDmapScreen()) { dMeter2Info_setMapStatus(2); dMeter2Info_setMapKeyDirection(0x400); - Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MAP_OPEN_S, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MAP_OPEN_S, NULL, 0, 0, 1.0f, 1.0f, + -1.0f, -1.0f, 0); dMeter2Info_set2DVibration(); } } @@ -797,50 +805,59 @@ asm void dMeterMap_c::meter_map_move(u32 param_0) { // matches with literals #ifdef NONMATCHING void dMeterMap_c::keyCheck() { - if (dMw_LEFT_TRIGGER() && !isEventRunCheck() && (dMeter2Info_getMapStatus() == 0 || dMeter2Info_getMapStatus() == 1)) { + if (dMw_LEFT_TRIGGER() && !isEventRunCheck() && + (dMeter2Info_getMapStatus() == 0 || dMeter2Info_getMapStatus() == 1)) { if (dMeter2Info_getMapStatus() == 1) { if (isDispPosInsideFlg()) { setDispPosOutsideFlg_SE_On(); - Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MAP_CLOSE_S, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MAP_CLOSE_S, NULL, 0, 0, 1.0f, 1.0f, -1.0f, + -1.0f, 0); dMeter2Info_setMapStatus(0); } } else if (dMeter2Info_getMapStatus() == 0) { if (!dMeter2Info_isSub2DStatus(1) && (isFmapScreen() || isDmapScreen())) { dMeter2Info_setMapStatus(2); dMeter2Info_setMapKeyDirection(0x200); - Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MAP_OPEN_S, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MAP_OPEN_S, NULL, 0, 0, 1.0f, 1.0f, -1.0f, + -1.0f, 0); dMeter2Info_set2DVibration(); } else { setDispPosInsideFlg_SE_On(); - Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MAP_OPEN_S, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MAP_OPEN_S, NULL, 0, 0, 1.0f, 1.0f, -1.0f, + -1.0f, 0); dMeter2Info_set2DVibration(); dMeter2Info_setMapStatus(1); } } - } else if (dMw_RIGHT_TRIGGER() && !isEventRunCheck() && (dMeter2Info_getMapStatus() == 0 || dMeter2Info_getMapStatus() == 1)) { + } else if (dMw_RIGHT_TRIGGER() && !isEventRunCheck() && + (dMeter2Info_getMapStatus() == 0 || dMeter2Info_getMapStatus() == 1)) { if (dMeter2Info_getMapStatus() == 0) { if (isEnableDispMapAndMapDispSizeTypeNo()) { if (!isDispPosInsideFlg()) { setDispPosInsideFlg_SE_On(); - Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MAP_OPEN_S, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MAP_OPEN_S, NULL, 0, 0, 1.0f, 1.0f, + -1.0f, -1.0f, 0); dMeter2Info_set2DVibration(); dMeter2Info_setMapStatus(1); } } else if (!dMeter2Info_isSub2DStatus(1) && (isFmapScreen() || isDmapScreen())) { dMeter2Info_setMapStatus(2); dMeter2Info_setMapKeyDirection(0x400); - Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MAP_OPEN_S, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MAP_OPEN_S, NULL, 0, 0, 1.0f, 1.0f, -1.0f, + -1.0f, 0); dMeter2Info_set2DVibration(); } } else if (dMeter2Info_getMapStatus() == 1 && isDispPosInsideFlg()) { if (!dMeter2Info_isSub2DStatus(1) && (isFmapScreen() || isDmapScreen())) { dMeter2Info_setMapStatus(2); dMeter2Info_setMapKeyDirection(0x400); - Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MAP_OPEN_S, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MAP_OPEN_S, NULL, 0, 0, 1.0f, 1.0f, -1.0f, + -1.0f, 0); dMeter2Info_set2DVibration(); } else { setDispPosOutsideFlg_SE_On(); - Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MAP_CLOSE_S, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MAP_CLOSE_S, NULL, 0, 0, 1.0f, 1.0f, -1.0f, + -1.0f, 0); dMeter2Info_setMapStatus(0); } } diff --git a/src/d/msg/d_msg_object.cpp b/src/d/msg/d_msg_object.cpp index fc4aa12c400..e9603f27269 100644 --- a/src/d/msg/d_msg_object.cpp +++ b/src/d/msg/d_msg_object.cpp @@ -93,7 +93,6 @@ struct dMsgScrnBase_c { /* 8023C3EC */ void setRubyString(char*); }; - struct COutFont_c { /* 80225C94 */ COutFont_c(u8); };