From f8ce912342883d88838e0304ac128023d71d973e Mon Sep 17 00:00:00 2001 From: TakaRikka <38417346+TakaRikka@users.noreply.github.com> Date: Tue, 4 Jan 2022 04:53:20 -0800 Subject: [PATCH 1/7] d_menu_window --- include/JSystem/JFramework/JFWDisplay.h | 74 + include/JSystem/JUtility/JUTFader.h | 4 + include/d/com/d_com_inf_game.h | 25 +- include/d/d_drawlist.h | 5 +- include/d/d_lib.h | 8 + include/d/d_select_cursor.h | 42 + include/d/event/d_event.h | 1 + include/d/menu/d_menu_collect.h | 356 ++++ include/d/menu/d_menu_dmap.h | 133 ++ include/d/menu/d_menu_fishing.h | 66 + include/d/menu/d_menu_fmap.h | 211 +++ include/d/menu/d_menu_insect.h | 89 + include/d/menu/d_menu_letter.h | 120 ++ include/d/menu/d_menu_option.h | 206 +++ include/d/menu/d_menu_ring.h | 188 +++ include/d/menu/d_menu_save.h | 275 ++++ include/d/menu/d_menu_skill.h | 100 ++ include/d/menu/d_menu_window.h | 175 +- include/d/menu/d_menu_window_HIO.h | 6 +- include/d/meter/d_meter2.h | 6 +- include/d/meter/d_meter2_info.h | 30 + include/d/msg/d_msg_class.h | 5 + include/f_op/f_op_msg_mng.h | 1 + include/m_Do/m_Do_ext.h | 1 + include/m_Do/m_Do_graphic.h | 41 + libs/JSystem/JFramework/JFWDisplay.cpp | 125 +- src/d/com/d_com_inf_game.cpp | 6 +- src/d/d_resorce.cpp | 5 - src/d/d_select_cursor.cpp | 75 +- src/d/event/d_event.cpp | 4 - src/d/event/d_event_data.cpp | 7 - src/d/kankyo/d_kankyo.cpp | 8 - src/d/menu/d_menu_collect.cpp | 279 +--- src/d/menu/d_menu_dmap.cpp | 169 +- src/d/menu/d_menu_fishing.cpp | 67 +- src/d/menu/d_menu_fmap.cpp | 191 +-- src/d/menu/d_menu_insect.cpp | 110 +- src/d/menu/d_menu_letter.cpp | 131 +- src/d/menu/d_menu_option.cpp | 161 +- src/d/menu/d_menu_ring.cpp | 142 +- src/d/menu/d_menu_save.cpp | 213 +-- src/d/menu/d_menu_skill.cpp | 144 +- src/d/menu/d_menu_window.cpp | 1979 +++++++++++++---------- src/d/msg/d_msg_flow.cpp | 4 - src/m_Do/m_Do_graphic.cpp | 143 +- 45 files changed, 3291 insertions(+), 2840 deletions(-) diff --git a/include/JSystem/JFramework/JFWDisplay.h b/include/JSystem/JFramework/JFWDisplay.h index 40ec8d5fe6e..b7fdb6c3ae3 100644 --- a/include/JSystem/JFramework/JFWDisplay.h +++ b/include/JSystem/JFramework/JFWDisplay.h @@ -2,5 +2,79 @@ #define JFWDISPLAY_H #include "dolphin/types.h" +#include "dolphin/gx/GX.h" +#include "JSystem/JUtility/JUTXfb.h" +#include "JSystem/JKernel/JKRHeap.h" +#include "JSystem/JUtility/TColor.h" +#include "JSystem/JUtility/JUTFader.h" + +class JFWDisplay { +public: + enum EDrawDone { + /* 0x1 */ UNK_METHOD_1 = 1 + }; + + /* 80272040 */ void ctor_subroutine(bool); + /* 802720F8 */ JFWDisplay(JKRHeap*, JUTXfb::EXfbNumber, bool); + /* 802721DC */ void createManager(_GXRenderModeObj const*, JKRHeap*, JUTXfb::EXfbNumber, bool); + /* 802722B8 */ void prepareCopyDisp(); + /* 802723AC */ void drawendXfb_single(); + /* 802723F4 */ void exchangeXfb_double(); + /* 802724FC */ void exchangeXfb_triple(); + /* 80272574 */ void copyXfb_triple(); + /* 802725F8 */ void preGX(); + /* 8027268C */ void endGX(); + /* 80272C60 */ void waitBlanking(int); + /* 80272E10 */ void threadSleep(s64); + /* 80272EB8 */ void clearEfb_init(); + /* 80272F9C */ void clearEfb(int, int, int, int, _GXColor); + /* 80272F2C */ void clearEfb(); + /* 80272F58 */ void clearEfb(_GXColor); + /* 8027331C */ void calcCombinationRatio(); + + /* 80272798 */ virtual void beginRender(); + /* 80272A04 */ virtual void endRender(); + /* 80272AB0 */ virtual void endFrame(); + /* 80272160 */ virtual ~JFWDisplay(); + + static JFWDisplay* getManager() { return sManager; } + + int startFadeOut(int param_0) { + if (mFader != NULL) { + return mFader->startFadeOut(param_0); + } + return 1; + } + + int startFadeIn(int param_0) { + if (mFader != NULL) { + return mFader->startFadeIn(param_0); + } + return 1; + } + + static JFWDisplay* sManager; + +private: + /* 0x04 */ JUTFader* mFader; + /* 0x08 */ JUtility::TColor mClearColor; + /* 0x0C */ u32 field_0xc; + /* 0x10 */ JUTXfb* mXfbManager; + /* 0x14 */ u16 field_0x14; + /* 0x18 */ EDrawDone mDrawDoneMethod; + /* 0x1C */ u16 mFrameRate; + /* 0x20 */ u32 mTickRate; + /* 0x24 */ bool field_0x24; + /* 0x28 */ f32 mCombinationRatio; + /* 0x2C */ u32 field_0x2c; + /* 0x30 */ int field_0x30; + /* 0x34 */ int field_0x34; + /* 0x38 */ int field_0x38; + /* 0x3C */ int field_0x3c; + /* 0x40 */ u8 field_0x40; + /* 0x44 */ int field_0x44; + /* 0x48 */ u16 field_0x48; + /* 0x4A */ u8 field_0x4a; +}; #endif /* JFWDISPLAY_H */ diff --git a/include/JSystem/JUtility/JUTFader.h b/include/JSystem/JUtility/JUTFader.h index 7c7bf8d1b15..a82a91e5592 100644 --- a/include/JSystem/JUtility/JUTFader.h +++ b/include/JSystem/JUtility/JUTFader.h @@ -9,6 +9,7 @@ class JUTFader { public: enum EStatus { UNKSTATUS_M1 = -1, + UNKSTATUS_0 = 0, }; /* 802E5530 */ JUTFader(int, int, int, int, JUtility::TColor); @@ -20,6 +21,9 @@ public: /* 802E579C */ virtual bool startFadeOut(int); /* 802E56DC */ virtual void draw(); + s32 getStatus() const { return mStatus; } + void setColor(JUtility::TColor color) { mColor.set(color); } + private: /* 0x04 */ s32 mStatus; /* 0x08 */ u16 field_0x8; diff --git a/include/d/com/d_com_inf_game.h b/include/d/com/d_com_inf_game.h index aa8d749584e..189f63bc53b 100644 --- a/include/d/com/d_com_inf_game.h +++ b/include/d/com/d_com_inf_game.h @@ -229,7 +229,7 @@ public: JKRExpHeap* getSubExpHeap2D(int idx) { return mSubExpHeap2D[idx]; } void setSubExpHeap2D(int idx, void* heap) { mSubExpHeap2D[idx] = (JKRExpHeap*)heap; } void offEnableNextStage() { mNextStage.offEnable(); } - JKRHeap* getExpHeap2D() { return mExpHeap2D; } + JKRExpHeap* getExpHeap2D() { return mExpHeap2D; } dEvent_manager_c& getEvtManager() { return mEvtManager; } dAttention_c& getAttention() { return mAttention; } JKRArchive* getMsgDtArchive(int idx) { return mMsgDtArchive[idx]; } @@ -240,6 +240,7 @@ public: void* getPlayer(int idx) { return mPlayer[idx]; } JKRArchive* getMain2DArchive() { return mMain2DArchive; } JKRArchive* getAnmArchive() { return mAnmArchive; } + JKRArchive* getCollectResArchive() { return mCollectResArchive; } J2DGrafContext* getCurrentGrafPort() { return mCurrentGrafPort; } dVibration_c& getVibration() { return mVibration; } void setPlayerStatus(int param_0, int i, u32 flag) { mPlayerStatus[i] |= flag; } @@ -255,6 +256,7 @@ public: m3DDirection = direction; m3DSetFlag = flag; } + void offPauseFlag() { mPauseFlag = false; } public: /* 0x00000 */ dBgS mDBgS; @@ -506,6 +508,8 @@ STATIC_ASSERT(122384 == sizeof(dComIfG_inf_c)); extern dComIfG_inf_c g_dComIfG_gameInfo; +extern GXColor g_blackColor; + void dComIfGp_setItemLifeCount(float, u8); void dComIfGp_setItemRupeeCount(long); int dComIfGs_isItemFirstBit(u8); @@ -547,6 +551,7 @@ int dComIfGp_getSelectItemMaxNum(int); void dComIfGp_mapShow(); void dComIfGp_mapHide(); bool dComIfGp_checkMapShow(); +s32 dComIfGp_setHeapLockFlag(u8); inline void dComIfGp_setRStatus(u8 status, u8 flag) { g_dComIfG_gameInfo.play.setRStatus(status, flag); @@ -967,7 +972,7 @@ inline int dComIfG_syncObjectRes(const char* name) { return g_dComIfG_gameInfo.mResControl.syncObjectRes(name); } -inline JKRHeap* dComIfGp_getExpHeap2D() { +inline JKRExpHeap* dComIfGp_getExpHeap2D() { return g_dComIfG_gameInfo.play.getExpHeap2D(); } @@ -1119,6 +1124,10 @@ inline daPy_py_c* dComIfGp_getLinkPlayer() { return (daPy_py_c*)g_dComIfG_gameInfo.play.getPlayerPtr(LINK_PTR); } +inline daPy_py_c* daPy_getLinkPlayerActorClass() { + return dComIfGp_getLinkPlayer(); +} + inline daAlink_c* daAlink_getAlinkActorClass() { return (daAlink_c*)g_dComIfG_gameInfo.play.getPlayerPtr(LINK_PTR); } @@ -1131,6 +1140,10 @@ inline JKRArchive* dComIfGp_getAnmArchive() { return g_dComIfG_gameInfo.play.getAnmArchive(); } +inline JKRArchive* dComIfGp_getCollectResArchive() { + return g_dComIfG_gameInfo.play.getCollectResArchive(); +} + inline J2DGrafContext* dComIfGp_getCurrentGrafPort() { return g_dComIfG_gameInfo.play.getCurrentGrafPort(); } @@ -1419,8 +1432,16 @@ inline void dComIfGd_set2DOpa(dDlst_base_c* dlst) { g_dComIfG_gameInfo.drawlist.set2DOpa(dlst); } +inline void dComIfGd_set2DOpaTop(dDlst_base_c* dlst) { + g_dComIfG_gameInfo.drawlist.set2DOpaTop(dlst); +} + inline dMsgObject_c* dComIfGp_getMsgObjectClass() { return g_dComIfG_gameInfo.play.getMsgObjectClass(); } +inline void dComIfGp_offPauseFlag() { + g_dComIfG_gameInfo.play.offPauseFlag(); +} + #endif /* D_COM_D_COM_INF_GAME_H */ diff --git a/include/d/d_drawlist.h b/include/d/d_drawlist.h index 493fa2079a6..530338155db 100644 --- a/include/d/d_drawlist.h +++ b/include/d/d_drawlist.h @@ -192,6 +192,7 @@ public: /* 80056900 */ void calcWipe(); void set2DOpa(dDlst_base_c* dlst) { set(field_0x1b4, field_0x1b8, dlst); } + void set2DOpaTop(dDlst_base_c* dlst) { set(field_0xac, field_0xb0, dlst); } static u8 mWipeDlst[72]; static u8 mWipeColor[4]; @@ -226,8 +227,8 @@ private: /* 0x00068 */ dDlst_list_c** field_0x68; /* 0x0006C */ dDlst_list_c** field_0x6c; // array? /* 0x00070 */ u8 field_0x70[0x3C]; - /* 0x000AC */ dDlst_list_c* field_0xac; - /* 0x000B0 */ dDlst_list_c** field_0xb0; + /* 0x000AC */ dDlst_base_c** field_0xac; + /* 0x000B0 */ dDlst_base_c** field_0xb0; /* 0x000B4 */ dDlst_list_c** field_0xb4; // array? /* 0x000B8 */ u8 field_0xb8[0xFC]; /* 0x001B4 */ dDlst_base_c** field_0x1b4; diff --git a/include/d/d_lib.h b/include/d/d_lib.h index 4d43c9fe2e8..44ae4d2e45f 100644 --- a/include/d/d_lib.h +++ b/include/d/d_lib.h @@ -17,6 +17,8 @@ struct STControl { /* 80032524 */ bool checkUpTrigger(); /* 800325A0 */ bool checkDownTrigger(); + void setFirstWaitTime(s16 time) { mFirstWaitTime = time; } + /* 0x04 */ f32 field_0x04; /* 0x08 */ f32 field_0x08; /* 0x0C */ u8 field_0x0c; @@ -40,6 +42,12 @@ struct STControl { }; // Size = 0x30 struct CSTControl : public STControl { + CSTControl(s16 param_0, s16 param_1, s16 param_2, + s16 param_3, f32 param_4, f32 param_5, + s16 param_6, s16 param_7) + : STControl(param_0, param_1, param_2, param_3, + param_4, param_5, param_6, param_7) {} + virtual f32 getValueStick(); virtual s16 getAngleStick(); }; diff --git a/include/d/d_select_cursor.h b/include/d/d_select_cursor.h index 9a6eaad2c23..65c0cb8297f 100644 --- a/include/d/d_select_cursor.h +++ b/include/d/d_select_cursor.h @@ -2,5 +2,47 @@ #define D_D_SELECT_CURSOR_H #include "dolphin/types.h" +#include "d/d_select_icon.h" +#include "d/d_drawlist.h" + +class dSelect_cursorHIO_c { +public: + /* 801941E4 */ dSelect_cursorHIO_c(); + + /* 80195978 */ virtual ~dSelect_cursorHIO_c(); + +private: + /* 0x04 */ u8 field_0x4; + /* 0x08 */ f32 field_0x8; + /* 0x0C */ f32 mXAxisExpansion; + /* 0x10 */ f32 mYAxisExpansion; + /* 0x14 */ f32 mOscillation; + /* 0x18 */ f32 field_0x18; + /* 0x1C */ f32 mRatioX; + /* 0x20 */ f32 mRatioY; + /* 0x24 */ bool mDebugON; +}; + +class dSelect_cursor_c : public dDlst_base_c { +public: + /* 80194220 */ dSelect_cursor_c(u8, f32, JKRArchive*); + /* 80194CC0 */ void update(); + /* 801950F4 */ void setPos(f32, f32, J2DPane*, bool); + /* 801951B0 */ void setParam(f32, f32, f32, f32, f32); + /* 801951C8 */ void setScale(f32); + /* 801952A0 */ void setAlphaRate(f32); + /* 80195330 */ void addAlpha(); + /* 801953CC */ void decAlpha(); + /* 80195460 */ void setBpkAnimation(J2DAnmColor*); + /* 801955F0 */ void setBtk0Animation(J2DAnmTextureSRTKey*); + /* 80195724 */ void setCursorAnimation(); + /* 801958E0 */ void setBckAnimation(J2DAnmTransformKey*); + /* 80195940 */ void moveCenter(J2DPane*, f32, f32); + + /* 80194C30 */ virtual void draw(); + /* 801949EC */ virtual ~dSelect_cursor_c(); + +private: +}; #endif /* D_D_SELECT_CURSOR_H */ diff --git a/include/d/event/d_event.h b/include/d/event/d_event.h index d007a65ad68..20c6f4be3f5 100644 --- a/include/d/event/d_event.h +++ b/include/d/event/d_event.h @@ -84,6 +84,7 @@ public: u16 chkEventFlag(u16 flag) { return flag & mEventFlag; } u8 getMode() const { return mMode; } u16 checkHind(u16 flag) { return flag & mHindFlag; } + u8 checkCompulsory() { return mCompulsory; } bool i_isOrderOK() { return field_0xe5 == 0 || field_0xe5 == 2; } diff --git a/include/d/menu/d_menu_collect.h b/include/d/menu/d_menu_collect.h index 586692e48f5..a626bddb255 100644 --- a/include/d/menu/d_menu_collect.h +++ b/include/d/menu/d_menu_collect.h @@ -2,5 +2,361 @@ #define D_MENU_D_MENU_COLLECT_H #include "dolphin/types.h" +#include "d/d_lib.h" +#include "d/d_select_cursor.h" +#include "JSystem/J2DGraph/J2DPicture.h" + +class dMsgString_c; +class dMenu_save_c; +class dMenu_Option_c; +class dMenu_Letter_c; +class dMenu_Fishing_c; +class dMenu_Skill_c; +class dMenu_Insect_c; + +class dMenu_Collect2D_c; +class dMenu_Collect2DTop_c : public dDlst_base_c { +public: + /* 801B77A4 */ virtual void draw(); + /* 801B7EB8 */ virtual ~dMenu_Collect2DTop_c(); + + /* 0x4 */ dMenu_Collect2D_c* mpCollect2D; +}; + +class dMenu_Collect2D_c : public dDlst_base_c { +public: + /* 801AFD48 */ dMenu_Collect2D_c(JKRExpHeap*, STControl*, CSTControl*); + /* 801AFEA4 */ void _create(); + /* 801B0100 */ void _delete(); + /* 801B0570 */ void initialize(); + /* 801B05A8 */ void isFishIconVisible(); + /* 801B061C */ void isSkillIconVisible(); + /* 801B071C */ void isInsectIconVisible(); + /* 801B074C */ void screenSet(); + /* 801B1C3C */ void animationSet(); + /* 801B1CE0 */ void btkAnimeLoop0(J2DAnmTextureSRTKey*); + /* 801B1EDC */ void setBackAlpha(); + /* 801B1FAC */ void cursorMove(); + /* 801B27EC */ void cursorPosSet(); + /* 801B2A74 */ void changeSword(); + /* 801B2D00 */ void changeShield(); + /* 801B2EE4 */ void changeClothe(); + /* 801B30C8 */ void setArrowMaxNum(u8); + /* 801B3340 */ void setWalletMaxNum(u16); + /* 801B3524 */ void setSmellType(); + /* 801B3640 */ void setHeartPiece(); + /* 801B370C */ void setPohMaxNum(u8); + /* 801B39D0 */ void setEquipItemFrameColorSword(int); + /* 801B3CF4 */ void setEquipItemFrameColorShield(int); + /* 801B3FDC */ void setEquipItemFrameColorClothes(int); + /* 801B42D8 */ void setHIO(bool); + /* 801B46FC */ void getItemTag(int, int, bool); + /* 801B473C */ void wait_init(); + /* 801B48D0 */ void wait_proc(); + /* 801B4E14 */ void save_open_init(); + /* 801B4EC0 */ void save_open_proc(); + /* 801B4F30 */ void save_move_init(); + /* 801B4F6C */ void save_move_proc(); + /* 801B4FDC */ void save_close_init(); + /* 801B5018 */ void save_close_proc(); + /* 801B5094 */ void option_open_init(); + /* 801B513C */ void option_open_proc(); + /* 801B51AC */ void option_move_init(); + /* 801B51E8 */ void option_move_proc(); + /* 801B5258 */ void option_close_init(); + /* 801B5294 */ void option_close_proc(); + /* 801B5310 */ void letter_open_init(); + /* 801B53AC */ void letter_open_proc(); + /* 801B541C */ void letter_move_init(); + /* 801B5458 */ void letter_move_proc(); + /* 801B54C8 */ void letter_close_init(); + /* 801B5504 */ void letter_close_proc(); + /* 801B5580 */ void fishing_open_init(); + /* 801B561C */ void fishing_open_proc(); + /* 801B568C */ void fishing_move_init(); + /* 801B56C8 */ void fishing_move_proc(); + /* 801B5738 */ void fishing_close_init(); + /* 801B5774 */ void fishing_close_proc(); + /* 801B57F0 */ void skill_open_init(); + /* 801B588C */ void skill_open_proc(); + /* 801B58FC */ void skill_move_init(); + /* 801B5938 */ void skill_move_proc(); + /* 801B59A8 */ void skill_close_init(); + /* 801B59E4 */ void skill_close_proc(); + /* 801B5A60 */ void insect_open_init(); + /* 801B5B00 */ void insect_open_proc(); + /* 801B5B70 */ void insect_move_init(); + /* 801B5BAC */ void insect_move_proc(); + /* 801B5C1C */ void insect_close_init(); + /* 801B5C58 */ void insect_close_proc(); + /* 801B5CD4 */ void _move(); + /* 801B5D70 */ void _draw(); + /* 801B5F48 */ void drawTop(); + /* 801B5F84 */ bool isKeyCheck(); + /* 801B5FAC */ bool isOutCheck(); + /* 801B5FB4 */ void setAButtonString(u16); + /* 801B60B8 */ void setBButtonString(u16); + /* 801B61BC */ void setItemNameString(u8, u8); + /* 801B6344 */ void setItemNameStringNull(); + + /* 801B7F00 */ virtual void draw(); + /* 801AFE34 */ virtual ~dMenu_Collect2D_c(); + + u8 getSubWindowOpenCheck() { return mSubWindowOpenCheck; } + +private: + /* 0x004 */ JKRExpHeap* mpHeap; + /* 0x008 */ JKRExpHeap* mpSubHeap; + /* 0x00C */ void* field_0xc; + /* 0x010 */ STControl* field_0x10; + /* 0x014 */ CSTControl* field_0x14; + /* 0x018 */ J2DScreen* mpScreen; + /* 0x01C */ J2DScreen* mpScreenIcon; + /* 0x020 */ dSelect_cursor_c* mpDrawCursor; + /* 0x024 */ dMsgString_c* mpString; + /* 0x028 */ u8 field_0x28[4]; + /* 0x02C */ J2DAnmTextureSRTKey* field_0x2c; + /* 0x030 */ u8 field_0x30[4]; + /* 0x034 */ f32 field_0x34; + /* 0x038 */ f32 field_0x38; + /* 0x03C */ f32 field_0x3c; + /* 0x040 */ s32 field_0x40; + /* 0x044 */ f32 field_0x44[2]; + /* 0x04C */ f32 field_0x4c[2]; + /* 0x054 */ f32 field_0x54; + /* 0x058 */ f32 field_0x58; + /* 0x05C */ f32 field_0x5c; + /* 0x060 */ f32 field_0x60; + /* 0x064 */ f32 field_0x64; + /* 0x068 */ f32 field_0x68; + /* 0x06C */ f32 field_0x6c; + /* 0x070 */ f32 field_0x70; + /* 0x074 */ f32 field_0x74; + /* 0x078 */ f32 field_0x78; + /* 0x07C */ cXyz field_0x7c; + /* 0x088 */ dMenu_Collect2DTop_c* mpDraw2DTop; + /* 0x08C */ J2DPicture* mpBlackTex; + /* 0x090 */ dMenu_save_c* mpSaveScrn; + /* 0x094 */ dMenu_Option_c* mpOptionScrn; + /* 0x098 */ dMenu_Letter_c* mpLetterScrn; + /* 0x09C */ dMenu_Fishing_c* mpFishingScrn; + /* 0x0A0 */ dMenu_Skill_c* mpSkillScrn; + /* 0x0A4 */ dMenu_Insect_c* mpInsectScrn; + /* 0x0A8 */ CPaneMgr* mpLinkPm; + /* 0x0AC */ CPaneMgr* mpMaskPm; + /* 0x0B0 */ CPaneMgr* mpSelPm[7][6]; + /* 0x158 */ u8 field_0x158[0x8]; + /* 0x160 */ CPaneMgr* mpModelBg; + /* 0x164 */ CPaneMgr* mpHeartParent; + /* 0x168 */ CPaneMgr* mpHeartPiece; + /* 0x16C */ CPaneMgr* mpButtonAB[2]; + /* 0x174 */ CPaneMgr* mpButtonText[2]; + /* 0x17C */ u16 field_0x17c; + /* 0x17E */ u16 field_0x17e; + /* 0x180 */ u16 field_0x180; + /* 0x182 */ u16 field_0x182; + /* 0x184 */ u16 field_0x184; + /* 0x186 */ u16 field_0x186; + /* 0x188 */ u16 field_0x188; + /* 0x18A */ u16 field_0x18a; + /* 0x18C */ u16 field_0x18c; + /* 0x18E */ u16 field_0x18e; + /* 0x190 */ u16 field_0x190; + /* 0x192 */ u16 field_0x192; + /* 0x194 */ u16 field_0x194; + /* 0x196 */ u16 field_0x196; + /* 0x198 */ u16 field_0x198; + /* 0x19A */ u16 field_0x19a; + /* 0x19C */ u16 field_0x19c; + /* 0x19E */ u16 field_0x19e; + /* 0x1A0 */ u16 field_0x1a0; + /* 0x1A2 */ u16 field_0x1a2; + /* 0x1A4 */ u16 field_0x1a4; + /* 0x1A6 */ u16 field_0x1a6; + /* 0x1A8 */ u16 field_0x1a8; + /* 0x1AA */ u16 field_0x1aa; + /* 0x1AC */ u16 field_0x1ac; + /* 0x1AE */ u16 field_0x1ae; + /* 0x1B0 */ u16 field_0x1b0; + /* 0x1B2 */ u16 field_0x1b2; + /* 0x1B4 */ u16 field_0x1b4; + /* 0x1B6 */ u16 field_0x1b6; + /* 0x1B8 */ u16 field_0x1b8; + /* 0x1BA */ u16 field_0x1ba; + /* 0x1BC */ u16 field_0x1bc; + /* 0x1BE */ u16 field_0x1be; + /* 0x1C0 */ u16 field_0x1c0; + /* 0x1C2 */ u16 field_0x1c2; + /* 0x1C4 */ u16 field_0x1c4; + /* 0x1C6 */ u16 field_0x1c6; + /* 0x1C8 */ u16 field_0x1c8; + /* 0x1CA */ u16 field_0x1ca; + /* 0x1CC */ u16 field_0x1cc; + /* 0x1CE */ u16 field_0x1ce; + /* 0x1D0 */ u16 field_0x1d0; + /* 0x1D2 */ u16 field_0x1d2; + /* 0x1D4 */ u16 field_0x1d4; + /* 0x1D6 */ u16 field_0x1d6; + /* 0x1D8 */ u16 field_0x1d8; + /* 0x1DA */ u16 field_0x1da; + /* 0x1DC */ u16 field_0x1dc; + /* 0x1DE */ u16 field_0x1de; + /* 0x1E0 */ u16 field_0x1e0; + /* 0x1E2 */ u16 field_0x1e2; + /* 0x1E4 */ u16 field_0x1e4; + /* 0x1E6 */ u16 field_0x1e6; + /* 0x1E8 */ u16 field_0x1e8; + /* 0x1EA */ u16 field_0x1ea; + /* 0x1EC */ u16 field_0x1ec; + /* 0x1EE */ u16 field_0x1ee; + /* 0x1F0 */ u16 field_0x1f0; + /* 0x1F2 */ u16 field_0x1f2; + /* 0x1F4 */ u16 field_0x1f4; + /* 0x1F6 */ u16 field_0x1f6; + /* 0x1F8 */ u16 field_0x1f8; + /* 0x1FA */ u16 field_0x1fa; + /* 0x1FC */ u16 field_0x1fc; + /* 0x1FE */ u16 field_0x1fe; + /* 0x200 */ u16 field_0x200; + /* 0x202 */ u16 field_0x202; + /* 0x204 */ u16 field_0x204; + /* 0x206 */ u16 field_0x206; + /* 0x208 */ u16 field_0x208; + /* 0x20A */ u16 field_0x20a; + /* 0x20C */ u16 field_0x20c; + /* 0x20E */ u16 field_0x20e; + /* 0x210 */ u16 field_0x210; + /* 0x212 */ u16 field_0x212; + /* 0x214 */ u16 field_0x214; + /* 0x216 */ u16 field_0x216; + /* 0x218 */ u16 field_0x218; + /* 0x21A */ u16 field_0x21a; + /* 0x21C */ u16 field_0x21c; + /* 0x21E */ u16 field_0x21e; + /* 0x220 */ u16 field_0x220; + /* 0x222 */ u16 field_0x222; + /* 0x224 */ u16 field_0x224; + /* 0x226 */ u16 field_0x226; + /* 0x228 */ u16 field_0x228; + /* 0x22A */ u16 field_0x22a; + /* 0x22C */ u8 field_0x22c; + /* 0x22D */ u8 field_0x22d; + /* 0x22E */ u8 field_0x22e; + /* 0x22F */ u8 field_0x22f; + /* 0x230 */ u8 field_0x230; + /* 0x231 */ u8 field_0x231; + /* 0x232 */ u8 field_0x232; + /* 0x233 */ u8 field_0x233; + /* 0x234 */ u8 field_0x234; + /* 0x235 */ u8 field_0x235; + /* 0x236 */ u8 field_0x236; + /* 0x237 */ u8 field_0x237; + /* 0x238 */ u8 field_0x238; + /* 0x239 */ u8 field_0x239; + /* 0x23A */ u8 field_0x23a; + /* 0x23B */ u8 field_0x23b; + /* 0x23C */ u8 field_0x23c; + /* 0x23D */ u8 field_0x23d; + /* 0x23E */ u8 field_0x23e; + /* 0x23F */ u8 field_0x23f; + /* 0x240 */ u8 field_0x240; + /* 0x241 */ u8 field_0x241; + /* 0x242 */ u8 field_0x242; + /* 0x243 */ u8 field_0x243; + /* 0x244 */ u8 field_0x244; + /* 0x245 */ u8 field_0x245; + /* 0x246 */ u8 field_0x246; + /* 0x247 */ u8 field_0x247; + /* 0x248 */ u8 field_0x248; + /* 0x249 */ u8 field_0x249; + /* 0x24A */ u8 field_0x24a; + /* 0x24B */ u8 field_0x24b; + /* 0x24C */ u8 field_0x24c; + /* 0x24D */ u8 field_0x24d; + /* 0x24E */ u8 field_0x24e; + /* 0x24F */ u8 field_0x24f; + /* 0x250 */ u8 field_0x250; + /* 0x251 */ u8 field_0x251; + /* 0x252 */ u8 field_0x252; + /* 0x253 */ u8 field_0x253; + /* 0x254 */ u8 field_0x254; + /* 0x255 */ u8 field_0x255; + /* 0x256 */ u8 field_0x256; + /* 0x257 */ u8 mCursorX; + /* 0x258 */ u8 mCursorY; + /* 0x259 */ u8 field_0x259; + /* 0x25A */ u8 field_0x25a; + /* 0x25B */ u8 field_0x25b; + /* 0x25C */ u8 field_0x25c; + /* 0x25D */ u8 field_0x25d; + /* 0x25E */ u8 mSubWindowOpenCheck; + /* 0x25F */ u8 field_0x25f; + /* 0x260 */ u8 field_0x260; + /* 0x261 */ u8 field_0x261; +}; + +class dMenu_Collect3D_c { +public: + /* 801B6454 */ dMenu_Collect3D_c(JKRExpHeap*, dMenu_Collect2D_c*, CSTControl*); + /* 801B65A8 */ void _create(); + /* 801B6694 */ void _delete(); + /* 801B66C8 */ void _move(u8, u8); + /* 801B696C */ void draw(); + /* 801B6A30 */ void setJ3D(char const*, char const*, char const*); + /* 801B6D30 */ void set_mtx(); + /* 801B6E70 */ void animePlay(); + /* 801B6FB0 */ void animeEntry(); + /* 801B7014 */ void createMaskModel(); + /* 801B71C4 */ void createMirrorModel(); + /* 801B7434 */ void getCrystalNum(); + /* 801B749C */ void getMirrorNum(); + /* 801B7504 */ void getMaskMdlVisible(); + /* 801B75E8 */ void setupItem3D(f32 (*)[4]); + /* 801B7660 */ void toItem3Dpos(f32, f32, f32, cXyz*); + /* 801B774C */ void calcViewMtx(f32 (*)[4]); + + /* 801B6538 */ virtual ~dMenu_Collect3D_c(); + + static f32 mViewOffsetY; + +private: + /* 0x004 */ JKRExpHeap* mpHeap; + /* 0x008 */ JKRSolidHeap* mpSolidHeap; + /* 0x00C */ dMenu_Collect2D_c* mpCollect2D; + /* 0x010 */ void* field_0x10; + /* 0x014 */ CSTControl* field_0x14; + /* 0x018 */ J3DModel* mpModel; + /* 0x01C */ mDoExt_bckAnm* field_0x1c; + /* 0x020 */ mDoExt_brkAnm* field_0x20; + /* 0x024 */ u8 field_0x24[4]; + /* 0x028 */ dKy_tevstr_c field_0x28; + /* 0x3B0 */ cXyz field_0x3b0; + /* 0x3BC */ csXyz field_0x3bc; + /* 0x3C4 */ f32 field_0x3c4; + /* 0x3C8 */ f32 field_0x3c8; + /* 0x3CC */ f32 field_0x3cc; + /* 0x3D0 */ f32 field_0x3d0; + /* 0x3D4 */ f32 field_0x3d4; + /* 0x3D8 */ s16 field_0x3d8; +}; + +class dMenu_Collect_c { +public: + /* 801B78C0 */ dMenu_Collect_c(JKRExpHeap*, STControl*, CSTControl*); + /* 801B7A0C */ void _create(); + /* 801B7A44 */ void _delete(); + /* 801B7A7C */ void _move(); + /* 801B7AC0 */ void draw(); + + /* 801B795C */ virtual ~dMenu_Collect_c(); + + u8 getSubWindowOpenCheck() { return mpCollect2D->getSubWindowOpenCheck(); } + bool isKeyCheck() { return mpCollect2D->isKeyCheck(); } + bool isOutCheck() { return mpCollect2D->isOutCheck(); } + +private: + /* 0x4 */ dMenu_Collect2D_c* mpCollect2D; + /* 0x8 */ dMenu_Collect3D_c* mpCollect3D; +}; #endif /* D_MENU_D_MENU_COLLECT_H */ diff --git a/include/d/menu/d_menu_dmap.h b/include/d/menu/d_menu_dmap.h index 559414565ce..09d9766da38 100644 --- a/include/d/menu/d_menu_dmap.h +++ b/include/d/menu/d_menu_dmap.h @@ -2,5 +2,138 @@ #define D_MENU_D_MENU_DMAP_H #include "dolphin/types.h" +#include "JSystem/J2DGraph/J2DOrthoGraph.h" +#include "d/d_lib.h" +#include "d/d_select_cursor.h" + +class dMenu_DmapMapCtrl_c; +class dMenu_DmapBg_c; +class mDoDvdThd_mountArchive_c; + +class dMenu_Dmap_c { +public: + /* 801BB498 */ dMenu_Dmap_c(JKRExpHeap*, STControl*, CSTControl*, u8, u8); + /* 801BB634 */ void screenInit(); + /* 801BC788 */ void getPlayerIconPos(s8, f32); + /* 801BC848 */ void getIconPos(s8, f32); + /* 801BD1D4 */ void getCurFloorPos(); + /* 801BD1E8 */ void getDefaultCurFloorPos(); + /* 801BD208 */ void iconMoveCalc(); + /* 801BD3B8 */ void drawFloorScreenBack(J2DScreen*, f32, f32, J2DOrthoGraph*); + /* 801BD524 */ void drawFloorScreenTop(J2DScreen*, f32, f32, J2DOrthoGraph*); + /* 801BD690 */ void isMapMoveState(); + /* 801BD6C4 */ void floorChangeMode(); + /* 801BD7C0 */ void _create(); + /* 801BDDA4 */ void _move(); + /* 801BDEF8 */ void setMapTexture(); + /* 801BDF48 */ void mapBgAnime(); + /* 801BDF6C */ void mapControl(); + /* 801BE328 */ bool isOpen(); + /* 801BE670 */ bool isClose(); + /* 801BE7E0 */ void _draw(); + /* 801BEAFC */ void itemInfo_init_proc(); + /* 801BEB0C */ void itemInfo_proc(); + /* 801BEB44 */ void itemSelect(); + /* 801BEF28 */ void getNextItem(int); + /* 801BEFCC */ void itemSelectAnmInit(); + /* 801BF030 */ void itemSelectAnm(); + /* 801BF180 */ void itemInfoOpenAnm(); + /* 801BF18C */ void itemInfoWait(); + /* 801BF278 */ void itemInfoCloseAnm(); + /* 801BF334 */ u8 getNextStatus(); + /* 801BF410 */ bool isSync(); + /* 801BF464 */ void isKeyCheck(); + /* 801BF4A4 */ void infoModeChange_init_proc(); + /* 801BF528 */ void infoModeChange_proc(); + /* 801BF688 */ void mapModeChange_init_proc(); + /* 801BF70C */ void mapModeChange_proc(); + /* 801BF8A0 */ void lv5_talk_init_proc(); + /* 801BF8F8 */ void lv5_talk_proc(); + /* 801BF9D4 */ void mapMode_init_proc(); + /* 801BF9E0 */ void mapMode_proc(); + /* 801BFA84 */ void floorSelect_init_proc(); + /* 801BFA88 */ void floorSelect_proc(); + /* 801BFC78 */ void itemCarryCheck(); + /* 801BFCAC */ void floorChange_init_proc(); + /* 801BFD5C */ void floorChange_proc(); + /* 801BFF84 */ void zoomWait_init_proc(); + /* 801BFF88 */ void zoomWait_proc(); + /* 801C008C */ void zoomIn_init_proc(); + /* 801C01A0 */ void zoomIn_proc(); + /* 801C023C */ void zoomOut_init_proc(); + /* 801C02F0 */ void zoomOut_proc(); + + /* 801BCDF4 */ virtual ~dMenu_Dmap_c(); + + void setInOutDir(u8 dir) { mInOutDir = dir; } + u8 getZoomState() { return mZoomState; } + + static u8 myclass[4 + 4 /* padding */]; + +private: + /* 0x004 */ dMenu_DmapMapCtrl_c* mMapCtrl; + /* 0x008 */ dMenu_DmapBg_c* mpDrawBg[2]; + /* 0x010 */ CPaneMgr* field_0x10; + /* 0x014 */ CPaneMgr* mSelFloor[8]; + /* 0x034 */ CPaneMgr* mIconLinkPos[8]; + /* 0x054 */ CPaneMgr* mIconBossPos[8]; + /* 0x074 */ CPaneMgr* mStayIcon[2]; + /* 0x07C */ CPaneMgr* field_0x7c; + /* 0x080 */ CPaneMgr* field_0x80; + /* 0x084 */ CPaneMgr* field_0x84; + /* 0x088 */ CPaneMgr* field_0x88[3]; + /* 0x094 */ CPaneMgr* field_0x94; + /* 0x098 */ CPaneMgr* field_0x98; + /* 0x09C */ u8 field_0x9c[0x44]; + /* 0x0E0 */ mDoDvdThd_mountArchive_c* field_0xe0; + /* 0x0E4 */ JKRArchive* field_0xe4; + /* 0x0E8 */ JKRExpHeap* field_0xe8; + /* 0x0EC */ JKRExpHeap* mDmapHeap; + /* 0x0F0 */ STControl* mSelStick; + /* 0x0F4 */ STControl* mpStick; + /* 0x0F8 */ CSTControl* mpCStick; + /* 0x0FC */ u8* mItemTexBuf; + /* 0x100 */ void* mpBinData; + /* 0x104 */ f32 field_0x104; + /* 0x108 */ f32 field_0x108; + /* 0x10C */ f32 field_0x10c; + /* 0x110 */ f32 field_0x110; + /* 0x114 */ f32 field_0x114[8]; + /* 0x134 */ f32 field_0x134; + /* 0x138 */ f32 field_0x138; + /* 0x13C */ f32 field_0x13c; + /* 0x140 */ f32 field_0x140; + /* 0x144 */ f32 field_0x144; + /* 0x148 */ f32 field_0x148; + /* 0x14C */ Vec field_0x14c[2]; + /* 0x164 */ s16 field_0x164; + /* 0x166 */ u16 mCMessageNum; + /* 0x168 */ u16 mJMessageNum; + /* 0x16A */ u16 field_0x16a; + /* 0x16C */ u8 field_0x16c; + /* 0x16D */ u8 field_0x16d; + /* 0x16E */ u8 field_0x16e; + /* 0x16F */ u8 field_0x16f; + /* 0x170 */ u8 field_0x170; + /* 0x171 */ u8 mBottomFloor; + /* 0x172 */ u8 field_0x172; + /* 0x173 */ u8 field_0x173; + /* 0x174 */ u8 field_0x174[3]; + /* 0x177 */ u8 field_0x177; + /* 0x178 */ u8 field_0x178; + /* 0x179 */ u8 field_0x179; + /* 0x17A */ u8 mInOutDir; + /* 0x17B */ u8 field_0x17b; + /* 0x17C */ u8 field_0x17c; + /* 0x17D */ u8 field_0x17d; + /* 0x17E */ u8 field_0x17e; + /* 0x17F */ u8 mZoomState; + /* 0x180 */ u8 field_0x180; + /* 0x181 */ u8 field_0x181; + /* 0x182 */ u8 field_0x182; + /* 0x183 */ u8 field_0x183; + /* 0x184 */ u8 field_0x184; + /* 0x185 */ u8 field_0x185; +}; #endif /* D_MENU_D_MENU_DMAP_H */ diff --git a/include/d/menu/d_menu_fishing.h b/include/d/menu/d_menu_fishing.h index baf4bfce814..551222cd58d 100644 --- a/include/d/menu/d_menu_fishing.h +++ b/include/d/menu/d_menu_fishing.h @@ -2,5 +2,71 @@ #define D_MENU_D_MENU_FISHING_H #include "dolphin/types.h" +#include "JSystem/J2DGraph/J2DPicture.h" +#include "d/d_select_cursor.h" +#include "d/d_lib.h" + +class mDoDvdThd_mountArchive_c; +class dMsgString_c; + +class dMenu_Fishing_c : public dDlst_base_c { +public: + /* 801C4D54 */ dMenu_Fishing_c(JKRExpHeap*, STControl*, CSTControl*); + /* 801C504C */ void _create(); + /* 801C50B4 */ void _move(); + /* 801C514C */ void _draw(); + /* 801C5204 */ bool isSync(); + /* 801C522C */ void init(); + /* 801C52E4 */ void _open(); + /* 801C5470 */ void _close(); + /* 801C556C */ void wait_init(); + /* 801C55A8 */ void wait_move(); + /* 801C55D8 */ void screenSetBase(); + /* 801C5D3C */ void screenSetDoIcon(); + /* 801C5EB8 */ void setAButtonString(u16); + /* 801C5F68 */ void setBButtonString(u16); + /* 801C6018 */ void getFigure(int); + /* 801C605C */ void setFishParam(int, u16, u8); + /* 801C6210 */ void setHIO(bool); + + /* 801C659C */ virtual void draw(); + /* 801C4D98 */ virtual ~dMenu_Fishing_c(); + + u8 getStatus() { return mStatus; } + +private: + /* 0x004 */ JKRExpHeap* mpHeap; + /* 0x008 */ JKRArchive* field_0x8; + /* 0x00C */ STControl* mpStick; + /* 0x010 */ CSTControl* mpCStick; + /* 0x014 */ mDoDvdThd_mountArchive_c* field_0x14; + /* 0x018 */ J2DScreen* mpScreen; + /* 0x01C */ J2DScreen* mpIconScreen; + /* 0x020 */ J2DTextBox* field_0x20[5]; + /* 0x034 */ J2DTextBox* field_0x34[5]; + /* 0x048 */ CPaneMgr* mpParent; + /* 0x04C */ CPaneMgr* mpFishParent[6]; + /* 0x064 */ CPaneMgr* mpFishParts[6][6]; + /* 0x0F4 */ CPaneMgr* mpFishInfoParent[2]; + /* 0x0FC */ CPaneMgr* mpButtonAB[2]; + /* 0x104 */ CPaneMgr* mpButtonText[2]; + /* 0x10C */ J2DTextBox* field_0x10c[1][6]; + /* 0x124 */ J2DTextBox* field_0x124[6]; + /* 0x13C */ J2DTextBox* field_0x13c[1][6]; + /* 0x154 */ J2DTextBox* field_0x154[6]; + /* 0x16C */ J2DTextBox* field_0x16c[1][6]; + /* 0x184 */ J2DTextBox* field_0x184[6]; + /* 0x19C */ J2DTextBox* field_0x19c[1][6]; + /* 0x1B4 */ J2DTextBox* field_0x1b4[6]; + /* 0x1CC */ J2DTextBox* field_0x1cc[6]; + /* 0x1E4 */ J2DTextBox* field_0x1e4; + /* 0x1E8 */ J2DTextBox* field_0x1e8; + /* 0x1EC */ J2DTextBox* field_0x1ec; + /* 0x1F0 */ J2DPicture* mpBlackTex; + /* 0x1F4 */ dMsgString_c* mpString; + /* 0x1F8 */ u16 field_0x1f8; + /* 0x1FA */ u8 mStatus; + /* 0x1FB */ u8 field_0x1fb; +}; #endif /* D_MENU_D_MENU_FISHING_H */ diff --git a/include/d/menu/d_menu_fmap.h b/include/d/menu/d_menu_fmap.h index 2ac6c1c58da..df43e86ba45 100644 --- a/include/d/menu/d_menu_fmap.h +++ b/include/d/menu/d_menu_fmap.h @@ -2,5 +2,216 @@ #define D_MENU_D_MENU_FMAP_H #include "dolphin/types.h" +#include "d/pane/d_pane_class.h" +#include "d/d_lib.h" +#include "d/d_drawlist.h" +#include "d/msg/d_msg_flow.h" + +class dMenu_Fmap_stage_data_c; +class dMenu_Fmap_world_data_c; +class dMenu_Fmap_region_data_c; +class dMenu_Fmap2DBack_c; +class dMenu_Fmap2DTop_c; +class dMenu_FmapMap_c; +class mDoDvdThd_mountArchive_c; +struct RoomData_c; + +class dMenu_Fmap_c { +public: + /* 801C66E4 */ dMenu_Fmap_c(JKRExpHeap*, STControl*, CSTControl*, u8, u8, u8, f32, f32, u8); + /* 801C6D64 */ void _create(); + /* 801C74A4 */ void _delete(); + /* 801C74A8 */ void _move(); + /* 801C7650 */ void _draw(); + /* 801C77F0 */ u8 getNextStatus(u8*); + /* 801C7AFC */ bool isSync(); + /* 801C7B24 */ void all_map_init(); + /* 801C7C2C */ void all_map_proc(); + /* 801C8230 */ void zoom_all_to_region_init(); + /* 801C8308 */ void zoom_all_to_region_proc(); + /* 801C83E0 */ void zoom_region_to_all_init(); + /* 801C8438 */ void zoom_region_to_all_proc(); + /* 801C8518 */ void region_map_init(); + /* 801C8600 */ void region_map_proc(); + /* 801C8B00 */ void to_portal_warp_map_init(); + /* 801C8B0C */ void to_portal_warp_map_proc(); + /* 801C8B48 */ void portal_warp_map_init(); + /* 801C8C0C */ void portal_warp_map_proc(); + /* 801C90A4 */ void portal_warp_select_init(); + /* 801C90A8 */ void portal_warp_select_proc(); + /* 801C91D8 */ void portal_warp_forbid_init(); + /* 801C9238 */ void portal_warp_forbid_proc(); + /* 801C92A4 */ void zoom_region_to_spot_init(); + /* 801C9304 */ void zoom_region_to_spot_proc(); + /* 801C93CC */ void zoom_spot_to_region_init(); + /* 801C9428 */ void zoom_spot_to_region_proc(); + /* 801C950C */ void spot_map_init(); + /* 801C9618 */ void spot_map_proc(); + /* 801C9A4C */ void portal_demo1_init(); + /* 801C9B64 */ void portal_demo1_move(); + /* 801C9C7C */ void portal_demo2_init(); + /* 801C9CC8 */ void portal_demo2_move(); + /* 801C9D60 */ void portal_demo3_init(); + /* 801C9DB4 */ void portal_demo3_move(); + /* 801C9EB8 */ void portal_demo4_init(); + /* 801C9F14 */ void portal_demo4_move(); + /* 801C9F7C */ void portal_demo5_init(); + /* 801C9FBC */ void portal_demo5_move(); + /* 801CA158 */ void portal_demo6_init(); + /* 801CA15C */ void portal_demo6_move(); + /* 801CA1E8 */ void yamiboss_demo1_init(); + /* 801CA2F4 */ void yamiboss_demo1_move(); + /* 801CA34C */ void yamiboss_demo2_init(); + /* 801CA35C */ void yamiboss_demo2_move(); + /* 801CA40C */ void yamiboss_demo3_init(); + /* 801CA410 */ void yamiboss_demo3_move(); + /* 801CA468 */ void yamiboss_demo4_init(); + /* 801CA4C0 */ void yamiboss_demo4_move(); + /* 801CA544 */ void yamiboss_demo5_init(); + /* 801CA548 */ void yamiboss_demo5_move(); + /* 801CA5CC */ void light_demo1_init(); + /* 801CA7A4 */ void light_demo1_move(); + /* 801CA7E0 */ void light_demo2_init(); + /* 801CA814 */ void light_demo2_move(); + /* 801CA874 */ void table_demo1_init(); + /* 801CA9B4 */ void table_demo1_move(); + /* 801CAA78 */ void table_demo2_init(); + /* 801CAABC */ void table_demo2_move(); + /* 801CAB88 */ void table_demo3_init(); + /* 801CABD0 */ void table_demo3_move(); + /* 801CAC30 */ void howl_demo1_init(); + /* 801CAC7C */ void howl_demo1_move(); + /* 801CAD48 */ void howl_demo2_init(); + /* 801CAD54 */ void howl_demo2_move(); + /* 801CAD9C */ void howl_demo3_init(); + /* 801CADA0 */ void howl_demo3_move(); + /* 801CADC4 */ bool isOpen(); + /* 801CB038 */ bool isClose(); + /* 801CB1DC */ u8 getProcess(); + /* 801CB200 */ u8 getRegionCursor(); + /* 801CB230 */ u8 getStageCursor(); + /* 801CB260 */ f32 getStageTransX(); + /* 801CB290 */ f32 getStageTransZ(); + /* 801CB2C0 */ void isRoomCheck(int, int); + /* 801CB570 */ void checkStRoomData(); + /* 801CB664 */ void talkButton(); + /* 801CB6D0 */ void setProcess(u8); + /* 801CB6E0 */ void setFlash(u8, bool); + /* 801CB770 */ void readWorldData(u8); + /* 801CB938 */ void readAreaData(u8, bool); + /* 801CBF04 */ void readRoomData(char const*, dMenu_Fmap_stage_data_c*, void*, int, u8); + /* 801CC094 */ void readFieldMapData(void**, char const*, bool, bool); + /* 801CC2B0 */ void decodeFieldMapData(); + /* 801CC4EC */ void decodePortalData(); + /* 801CC51C */ void readRoomDzsData(void**, u32, char const*); + /* 801CC61C */ void removeAreaData(); + /* 801CC7A8 */ void removeRoomData(dMenu_Fmap_stage_data_c*); + /* 801CC85C */ void setTitleName(u32); + /* 801CC880 */ void setAreaName(u32); + /* 801CC8AC */ void setAreaNameZero(); + /* 801CC8DC */ void portalWarpMapMove(STControl*); + /* 801CCA70 */ void onRoomDataBit(int); + /* 801CCA98 */ void isRoomDataBit(int); + /* 801CCAC4 */ void resetRoomDataBit(); + /* 801CCB08 */ void drawIcon(f32, bool); + /* 801CD10C */ void drawIcon(u8, int); + /* 801CCD98 */ void drawLightDropIcon(); + /* 801CCDDC */ void drawBatsumarkIcon(); + /* 801CCE04 */ void drawSnowmanIcon(); + /* 801CCE48 */ void drawGoldWolfIcon(); + /* 801CCE70 */ void drawCoachIcon(); + /* 801CCE98 */ void drawPlayEnterIcon(); + /* 801CCFB0 */ void checkDrawPortalIcon(int, int); + /* 801CD000 */ void searchIcon(u8, int, f32*, f32*); + /* 801CD210 */ void drawEnterIcon(); + /* 801CD254 */ void drawPortalIcon(); + /* 801CD2FC */ void getRegionStageNum(int); + /* 801CD350 */ void getNowFmapRegionData(); + /* 801CD368 */ void getNowFmapStageData(); + /* 801CD380 */ void searchPortalStageID(char*); + /* 801CD3F0 */ void drawDebugStage(); + /* 801CD460 */ void arrowPosInit(); + /* 801CD5CC */ void tableArrowPosInit(bool); + /* 801CD770 */ void yamibossArrowPosInit(); + /* 801CD814 */ void howlArrowPosInit(); + /* 801CD8B4 */ void getHowlRegionID(); + /* 801CD92C */ void isLightVesselGet(); + /* 801CD95C */ void getPlayerPos2D(); + + /* 801C6AC8 */ virtual ~dMenu_Fmap_c(); + + static u8 MyClass[4]; + +private: + /* 0x004 */ JKRHeap* mpHeap; + /* 0x008 */ JKRExpHeap* mpTalkHeap; + /* 0x00C */ STControl* mpStick; + /* 0x010 */ CSTControl* mpCStick; + /* 0x014 */ dMenu_Fmap2DBack_c* mpDraw2DBack; + /* 0x018 */ dMenu_Fmap2DTop_c* mpDraw2DTop; + /* 0x01C */ mDoDvdThd_mountArchive_c* field_0x1c; + /* 0x020 */ dMenu_Fmap_world_data_c* mpWorldData; + /* 0x024 */ dMenu_Fmap_region_data_c* field_0x24[8]; + /* 0x044 */ dMenu_Fmap_stage_data_c* field_0x44[8]; + /* 0x064 */ JKRArchive* field_0x64; + /* 0x068 */ int field_0x68; + /* 0x06C */ RoomData_c* field_0x6c[8]; + /* 0x08C */ void* field_0x8c; + /* 0x090 */ void* field_0x90; + /* 0x094 */ int field_0x94[8]; + /* 0x0B4 */ int field_0xb4; + /* 0x0B8 */ dMenu_FmapMap_c* mpMenuFmapMap; + /* 0x0BC */ int field_0xbc; + /* 0x0C0 */ u8* field_0xc0; + /* 0x0C4 */ dMsgFlow_c field_0xc4; + /* 0x110 */ cXyz field_0x110; + /* 0x11C */ f32 field_0x11c; + /* 0x120 */ f32 field_0x120; + /* 0x124 */ f32 field_0x124; + /* 0x128 */ f32 field_0x128[8]; + /* 0x148 */ f32 field_0x148[8]; + /* 0x168 */ f32 field_0x168[8]; + /* 0x188 */ f32 field_0x188[8]; + /* 0x1A8 */ f32 field_0x1a8; + /* 0x1AC */ f32 field_0x1ac[8]; + /* 0x1CC */ f32 field_0x1cc[8]; + /* 0x1EC */ f32 field_0x1ec; + /* 0x1F0 */ f32 field_0x1f0; + /* 0x1F4 */ f32 field_0x1f4; + /* 0x1F8 */ int field_0x1f8[2]; + /* 0x200 */ int field_0x200; + /* 0x204 */ int field_0x204; + /* 0x208 */ int field_0x208; + /* 0x20C */ int field_0x20c; + /* 0x210 */ u16 field_0x210; + /* 0x212 */ u16 field_0x212; + /* 0x214 */ u16 field_0x214; + /* 0x216 */ u16 field_0x216; + /* 0x218 */ u16 field_0x218[8]; + /* 0x228 */ u16 field_0x228[20]; + /* 0x250 */ char field_0x250[8]; + /* 0x258 */ char field_0x258[8]; + /* 0x260 */ char field_0x260[20][8]; + /* 0x300 */ u8 mProcess; + /* 0x301 */ u8 field_0x301; + /* 0x302 */ u8 field_0x302; + /* 0x303 */ u8 mDataNumMax; + /* 0x304 */ u8 field_0x304; + /* 0x305 */ u8 field_0x305; + /* 0x306 */ u8 mSpotNum; + /* 0x307 */ u8 field_0x307; + /* 0x308 */ u8 field_0x308; + /* 0x309 */ u8 field_0x309; + /* 0x30A */ u8 field_0x30a; + /* 0x30B */ u8 field_0x31b; + /* 0x30C */ u8 field_0x31c; + /* 0x30D */ u8 field_0x31d; + /* 0x30E */ u8 field_0x30e; + /* 0x30F */ u8 field_0x30f; + /* 0x310 */ u8 field_0x310; + /* 0x311 */ u8 field_0x311; + /* 0x312 */ u8 field_0x312; + /* 0x313 */ u8 field_0x313; +}; #endif /* D_MENU_D_MENU_FMAP_H */ diff --git a/include/d/menu/d_menu_insect.h b/include/d/menu/d_menu_insect.h index 47035a57b49..c0e7930dc24 100644 --- a/include/d/menu/d_menu_insect.h +++ b/include/d/menu/d_menu_insect.h @@ -2,5 +2,94 @@ #define D_MENU_D_MENU_INSECT_H #include "dolphin/types.h" +#include "JSystem/J2DGraph/J2DPicture.h" +#include "d/d_select_cursor.h" +#include "d/d_lib.h" + +class dMsgScrn3Select_c; +class dMsgString_c; + +class dMenu_Insect_c : public dDlst_base_c { +public: + /* 801D8114 */ dMenu_Insect_c(JKRExpHeap*, STControl*, CSTControl*, u8); + /* 801D8658 */ void _create(); + /* 801D86C8 */ void _move(); + /* 801D8760 */ void _draw(); + /* 801D88EC */ bool isSync(); + /* 801D8914 */ void init(); + /* 801D894C */ void _open(); + /* 801D8B2C */ void _close(); + /* 801D8C68 */ void wait_init(); + /* 801D8CCC */ void wait_move(); + /* 801D8E00 */ void explain_open_init(); + /* 801D91E4 */ void explain_open_move(); + /* 801D9264 */ void explain_move_init(); + /* 801D9268 */ void explain_move_move(); + /* 801D9290 */ void select_move_init(); + /* 801D92DC */ void select_move_move(); + /* 801D9504 */ void explain_close_init(); + /* 801D95AC */ void explain_close_move(); + /* 801D9644 */ void screenSetBase(); + /* 801D98F0 */ void screenSetExplain(); + /* 801D9BD0 */ void screenSetDoIcon(); + /* 801D9D4C */ void getGetInsectNum(); + /* 801D9DCC */ void getInsectItemID(int, int); + /* 801D9DE4 */ void isGetInsect(int, int); + /* 801D9E20 */ void isGiveInsect(int, int); + /* 801D9ED4 */ void isGiveInsect(u8); + /* 801D9E7C */ void isCatchInsect(u8); + /* 801D9F3C */ void isCatchNotGiveInsect(u8); + /* 801D9F8C */ void cursorMove(); + /* 801DA1EC */ void setCursorPos(); + /* 801DA2FC */ bool dpdMove(); + /* 801DA304 */ void setAButtonString(u16); + /* 801DA3B4 */ void setBButtonString(u16); + /* 801DA464 */ void setHIO(bool); + + /* 801DA630 */ virtual void draw(); + /* 801D82F4 */ virtual ~dMenu_Insect_c(); + + u8 getStatus() { return mStatus; } + +private: + /* 0x04 */ JKRExpHeap* mpHeap; + /* 0x08 */ void* field_0x8; + /* 0x0C */ STControl* mpStick; + /* 0x10 */ CSTControl* mpCStick; + /* 0x14 */ void* field_0x14; + /* 0x18 */ dSelect_cursor_c* mpDrawCursor; + /* 0x1C */ dMsgScrn3Select_c* mpSelect_c; + /* 0x20 */ J2DScreen* mpScreen; + /* 0x24 */ J2DScreen* mpExpScreen; + /* 0x28 */ J2DScreen* mpIconScreen; + /* 0x2C */ J2DTextBox* field_0x2c[5]; + /* 0x40 */ J2DTextBox* field_0x40[5]; + /* 0x54 */ J2DTextBox* field_0x54; + /* 0x58 */ J2DTextBox* field_0x58; + /* 0x5C */ J2DTextBox* field_0x5c; + /* 0x60 */ J2DPicture* mpBlackTex; + /* 0x64 */ CPaneMgr* mpParent; + /* 0x68 */ CPaneMgr* mpExpParent; + /* 0x6C */ CPaneMgr* mpINSParent[24]; + /* 0xCC */ CPaneMgr* mpInfoText; + /* 0xD0 */ CPaneMgr* mpExpSubWin[2]; + /* 0xD8 */ CPaneMgr* mpButtonAB[2]; + /* 0xE0 */ CPaneMgr* mpButtonText[2]; + /* 0xE8 */ dMsgString_c* mpString; + /* 0xEC */ void* mpExpItemTex; + /* 0xF0 */ u8 field_0xf0; + /* 0xF1 */ u8 field_0xf1; + /* 0xF2 */ u8 mStatus; + /* 0xF3 */ u8 field_0xf3; + /* 0xF4 */ u8 field_0xf4; + /* 0xF5 */ u8 field_0xf5; + /* 0xF6 */ u8 field_0xf6; + /* 0xF7 */ u8 field_0xf7; + /* 0xF8 */ u8 field_0xf8; + /* 0xF9 */ u8 field_0xf9; + /* 0xFA */ u8 field_0xfa; + /* 0xFB */ u8 field_0xfb; + /* 0xFC */ u8 field_0xfc; +}; #endif /* D_MENU_D_MENU_INSECT_H */ diff --git a/include/d/menu/d_menu_letter.h b/include/d/menu/d_menu_letter.h index a3658db74ae..d21d923d0f0 100644 --- a/include/d/menu/d_menu_letter.h +++ b/include/d/menu/d_menu_letter.h @@ -2,5 +2,125 @@ #define D_MENU_D_MENU_LETTER_H #include "dolphin/types.h" +#include "JSystem/J2DGraph/J2DPicture.h" +#include "d/d_select_cursor.h" +#include "d/d_lib.h" + +class mDoDvdThd_mountArchive_c; +class dMsgString_c; +class dMsgScrnArrow_c; + +class dMenu_Letter_c : public dDlst_base_c { +public: + /* 801DCDC0 */ dMenu_Letter_c(JKRExpHeap*, STControl*, CSTControl*); + /* 801DD36C */ void _create(); + /* 801DD474 */ void _move(); + /* 801DD50C */ void _draw(); + /* 801DD934 */ bool isSync(); + /* 801DD95C */ void letter_init_calc(); + /* 801DDA20 */ void init(); + /* 801DDA74 */ void _open(); + /* 801DDC98 */ void _close(); + /* 801DDE18 */ void wait_init(); + /* 801DDE54 */ void wait_move(); + /* 801DE164 */ void slide_right_init(); + /* 801DE1E8 */ void slide_right_move(); + /* 801DE24C */ void slide_left_init(); + /* 801DE2D0 */ void slide_left_move(); + /* 801DE334 */ void read_open_init(); + /* 801DE564 */ void read_open_move(); + /* 801DE70C */ void read_move_init(); + /* 801DE824 */ void read_move_move(); + /* 801DEA48 */ void read_next_fadeout_init(); + /* 801DEA94 */ void read_next_fadeout_move(); + /* 801DEBD8 */ void read_next_fadein_init(); + /* 801DED04 */ void read_next_fadein_move(); + /* 801DEE20 */ void read_close_init(); + /* 801DEE6C */ void read_close_move(); + /* 801DF010 */ void screenSetMenu(); + /* 801DFA58 */ void screenSetBase(); + /* 801E0330 */ void screenSetShadow(); + /* 801E03D8 */ void screenSetLetter(); + /* 801E09A8 */ void screenSetDoIcon(); + /* 801E0B24 */ void setCursorPos(); + /* 801E0BB0 */ void changeActiveColor(); + /* 801E0E34 */ void changePageLight(); + /* 801E0E84 */ void setPageText(); + /* 801E1038 */ void setDMYPageText(); + /* 801E11EC */ void copyDMYMenu(); + /* 801E1518 */ void setAButtonString(u16); + /* 801E15C8 */ void setBButtonString(u16); + /* 801E1678 */ void getLetterNum(); + /* 801E1748 */ void setHIO(bool); + + /* 801E1D5C */ virtual void draw(); + /* 801DCF34 */ virtual ~dMenu_Letter_c(); + + u8 getStatus() { return mStatus; } + +private: + /* 0x004 */ JKRExpHeap* mpHeap; + /* 0x008 */ JKRArchive* field_0x8; + /* 0x00C */ STControl* mpStick; + /* 0x010 */ CSTControl* mpCStick; + /* 0x014 */ mDoDvdThd_mountArchive_c* field_0x14; + /* 0x018 */ J2DScreen* mpMenuScreen; + /* 0x01C */ J2DScreen* mpMenuDMYScreen; + /* 0x020 */ J2DScreen* mpMenuBaseScreen; + /* 0x024 */ J2DScreen* mpSdwScreen; + /* 0x028 */ J2DScreen* mpLetterScreen[2]; + /* 0x030 */ J2DScreen* mpIconScreen; + /* 0x034 */ J2DTextBox* field_0x40[6][5]; + /* 0x0AC */ J2DTextBox* field_0xac[6][5]; + /* 0x124 */ J2DTextBox* field_0x124[6][4]; + /* 0x184 */ J2DTextBox* field_0x184[6][4]; + /* 0x1E4 */ J2DTextBox* field_0x1e4[2]; + /* 0x1EC */ J2DTextBox* field_0x1ec; + /* 0x1F0 */ J2DTextBox* field_0x1f0[9]; + /* 0x214 */ u8 field_0x214[0x24]; + /* 0x238 */ J2DTextBox* field_0x238[9]; + /* 0x25C */ J2DTextBox* field_0x25c[12]; + /* 0x28C */ J2DTextBox* field_0x28c[5]; + /* 0x2A0 */ J2DTextBox* field_0x2a0[5]; + /* 0x2B4 */ J2DPicture* mpBlackTex; + /* 0x2B8 */ CPaneMgr* mpParent[3]; + /* 0x2C4 */ CPaneMgr* mpDMYParent; + /* 0x2C8 */ CPaneMgr* mpLetterParent[6]; + /* 0x2E0 */ CPaneMgr* mpTextParent[2]; + /* 0x2E8 */ CPaneMgr* mpLineParent; + /* 0x2EC */ CPaneMgr* field_0x2ec; + /* 0x2F0 */ CPaneMgr* field_0x2f0; + /* 0x2F4 */ CPaneMgr* field_0x2f4[2]; + /* 0x2FC */ CPaneMgr* mpButtonAB[2]; + /* 0x304 */ CPaneMgr* mpButtonText[2]; + /* 0x30C */ dSelect_cursor_c* mpDrawCursor; + /* 0x310 */ dMsgString_c* mpString; + /* 0x314 */ dMsgScrnArrow_c* mpArrow; + /* 0x318 */ JUtility::TColor field_0x318[4]; + /* 0x328 */ JUtility::TColor field_0x328[4]; + /* 0x338 */ JUtility::TColor field_0x338[4]; + /* 0x348 */ JUtility::TColor field_0x348[4]; + /* 0x358 */ f32 field_0x358; + /* 0x35C */ f32 field_0x35c; + /* 0x360 */ f32 field_0x360; + /* 0x364 */ f32 field_0x364; + /* 0x368 */ u16 field_0x368; + /* 0x36A */ u16 field_0x36a; + /* 0x36C */ u8 mStatus; + /* 0x36D */ u8 field_0x36d; + /* 0x36E */ u8 field_0x36e; + /* 0x36F */ u8 field_0x36f; + /* 0x370 */ u8 field_0x370; + /* 0x371 */ u8 field_0x371; + /* 0x372 */ u8 field_0x372; + /* 0x373 */ u8 field_0x373; + /* 0x374 */ u8 field_0x374; + /* 0x375 */ u8 m_letter_num; + /* 0x376 */ u8 field_0x376[9][6]; + /* 0x3AC */ u8 field_0x3ac[54]; + /* 0x3E2 */ u8 field_0x3e2; + /* 0x3E3 */ u8 field_0x3e3; + /* 0x3E4 */ u8 field_0x3e4; +}; #endif /* D_MENU_D_MENU_LETTER_H */ diff --git a/include/d/menu/d_menu_option.h b/include/d/menu/d_menu_option.h index 38349d75b09..661e8897f82 100644 --- a/include/d/menu/d_menu_option.h +++ b/include/d/menu/d_menu_option.h @@ -2,5 +2,211 @@ #define D_MENU_D_MENU_OPTION_H #include "dolphin/types.h" +#include "d/d_lib.h" +#include "d/d_select_cursor.h" +#include "JSystem/J2DGraph/J2DPicture.h" + +class dFile_warning_c; +class dMenu_Calibration_c; +class mDoDvdThd_mountArchive_c; +class dMsgString_c; +class dMeterHaihai_c; + +class dMenu_Option_c : public dDlst_base_c { +public: + /* 801E1F10 */ dMenu_Option_c(JKRArchive*, STControl*); + /* 801E205C */ void _create(); + /* 801E2C1C */ void _delete(); + /* 801E3408 */ void _move(); + /* 801E36CC */ void _draw(); + /* 801E38CC */ void drawHaihai(); + /* 801E3A7C */ bool isSync(); + /* 801E3AA4 */ void checkLeftTrigger(); + /* 801E3AC8 */ void checkRightTrigger(); + /* 801E3AEC */ void setAnimation(); + /* 801E3B98 */ bool _open(); + /* 801E3DE0 */ void _close(); + /* 801E3F6C */ void atten_init(); + /* 801E3FC4 */ void atten_move(); + /* 801E41A0 */ void vib_init(); + /* 801E41F8 */ void vib_move(); + /* 801E4488 */ void sound_init(); + /* 801E44E0 */ void sound_move(); + /* 801E48AC */ void change_init(); + /* 801E48E8 */ void change_move(); + /* 801E4B34 */ void confirm_open_init(); + /* 801E4C10 */ void confirm_open_move(); + /* 801E4CE4 */ void confirm_move_init(); + /* 801E4D20 */ void confirm_move_move(); + /* 801E4E98 */ void confirm_select_init(); + /* 801E4E9C */ void confirm_select_move(); + /* 801E4F18 */ void confirm_close_init(); + /* 801E4FB0 */ void confirm_close_move(); + /* 801E51CC */ void tv_open1_move(); + /* 801E5244 */ void tv_open2_move(); + /* 801E5260 */ void tv_move_move(); + /* 801E5300 */ void tv_close1_move(); + /* 801E5364 */ void tv_close2_move(); + /* 801E5380 */ void calibration_open1_move(); + /* 801E53C4 */ void calibration_open2_move(); + /* 801E53E0 */ void calibration_move_move(); + /* 801E5434 */ void calibration_close1_move(); + /* 801E5478 */ void calibration_close2_move(); + /* 801E5494 */ void menuVisible(); + /* 801E54F8 */ void menuShow(int); + /* 801E55B8 */ void menuHide(int); + /* 801E5678 */ void screenSet(); + /* 801E6FBC */ void setSoundMode(u32); + /* 801E7004 */ void setAttenString(); + /* 801E70E8 */ void setVibString(); + /* 801E71CC */ void setSoundString(); + /* 801E7314 */ void setCursorPos(u8); + /* 801E73D8 */ void setSelectColor(u8, bool); + /* 801E76EC */ void getSelectType(); + /* 801E7718 */ void changeBarColor(bool); + /* 801E78B8 */ void setHIO(bool); + /* 801E7D18 */ void cursorAnime(f32); + /* 801E7D60 */ void setZButtonString(u16); + /* 801E7DF4 */ void changeTVCheck(); + /* 801E7E98 */ void setAButtonString(u16); + /* 801E7F9C */ void setBButtonString(u16); + /* 801E80A0 */ void isRumbleSupported(); + /* 801E80AC */ bool dpdMenuMove(); + /* 801E80B4 */ void paneResize(u64); + /* 801E8210 */ void initialize(); + /* 801E82C4 */ void yesnoMenuMoveAnmInitSet(int, int); + /* 801E8438 */ void yesnoMenuMoveAnm(); + /* 801E85D4 */ void yesnoSelectMoveAnm(); + /* 801E8888 */ void yesnoCursorShow(); + /* 801E89F8 */ void yesNoSelectStart(); + /* 801E8AC8 */ void yesnoSelectAnmSet(); + /* 801E8C38 */ void yesnoCancelAnmSet(); + /* 801E8CB0 */ void yesnoWakuAlpahAnmInit(u8, u8, u8, u8); + /* 801E8CFC */ void yesnoWakuAlpahAnm(u8); + + /* 801E8E6C */ virtual void draw(); + /* 801E2014 */ virtual ~dMenu_Option_c(); + + u8 getQuitStatus() { return mQuitStatus; } + +private: + /* 0x004 */ J2DScreen* mpBackScreen; + /* 0x008 */ J2DScreen* mpScreen; + /* 0x00C */ J2DScreen* mpClipScreen; + /* 0x010 */ J2DScreen* mpShadowScreen; + /* 0x014 */ J2DScreen* mpTVScreen; + /* 0x018 */ J2DScreen* mpScreenIcon; + /* 0x01C */ J2DScreen* mpSelectScreen; + /* 0x020 */ void* field_0x20; // bck + /* 0x024 */ void* field_0x24; // bck + /* 0x028 */ void* field_0x28; // bck + /* 0x02C */ void* field_0x2c; // bpk + /* 0x030 */ void* field_0x30; // btk + /* 0x034 */ dFile_warning_c* mpWarning; + /* 0x038 */ J2DPicture* mpBlackTex; + /* 0x03C */ dMenu_Calibration_c* field_0x3c; + /* 0x040 */ mDoDvdThd_mountArchive_c* field_0x40; + /* 0x044 */ dSelect_cursor_c* mpDrawCursor; + /* 0x048 */ dMsgString_c* mpString; + /* 0x04C */ dMeterHaihai_c* mpMeterHaihai; + /* 0x050 */ JKRArchive* field_0x50; + /* 0x054 */ JUTFont* field_0x54; + /* 0x058 */ STControl* field_0x58; + /* 0x05C */ CPaneMgr* mpParent[5]; + /* 0x070 */ CPaneMgr* mpTitle; + /* 0x074 */ CPaneMgr* mpMenuNull[6]; + /* 0x08C */ CPaneMgr* mpMenuPane[6]; + /* 0x0A4 */ CPaneMgr* mpMenuPaneC[6]; + /* 0x0BC */ CPaneMgr* mpMenuPane2[6]; + /* 0x0D4 */ CPaneMgr* mpMenuPane3[6]; + /* 0x0EC */ CPaneMgr* mpMenuPane32[6]; + /* 0x104 */ CPaneMgr* mpMenuText[5][6]; + /* 0x17C */ int field_0x17c[6]; + /* 0x194 */ CPaneMgr* mpHaihaiPosL[5]; + /* 0x1A8 */ CPaneMgr* mpHaihaiPosR[5]; + /* 0x1BC */ u8 field_0x1bc[4]; + /* 0x1C0 */ int field_0x1c0[4]; + /* 0x1D0 */ CPaneMgr* mpZButtonText[3]; + /* 0x1DC */ CPaneMgr* mpYesNoSelBase_c[2]; + /* 0x1E4 */ CPaneMgr* mpYesNoTxt_c[2]; + /* 0x1EC */ CPaneMgr* mpYesNoCurWaku_c[2]; + /* 0x1F4 */ CPaneMgr* mpYesNoCurWakuG0_c[2]; + /* 0x1FC */ CPaneMgr* mpYesNoCurWakuG1_c[2]; + /* 0x204 */ CPaneMgr* mpButtonAB[2]; + /* 0x20C */ CPaneMgr* mpButtonText[2]; + /* 0x214 */ CPaneMgr* mpTVButtonAB; + /* 0x218 */ CPaneMgr* mpTVButtonText; + /* 0x21C */ J2DTextBox* field_0x21c[12]; + /* 0x24C */ u8 field_0x24c[0x8]; + /* 0x254 */ int field_0x254; + /* 0x258 */ int field_0x258; + /* 0x25C */ J2DTextBox* field_0x25c[5]; + /* 0x270 */ J2DTextBox* field_0x270[3]; + /* 0x27C */ int field_0x27c; + /* 0x280 */ int field_0x280[6]; + /* 0x298 */ int field_0x298[6]; + /* 0x2B0 */ JUtility::TColor field_0x2b0[2]; + /* 0x2B8 */ JUtility::TColor field_0x2b8[2]; + /* 0x2C0 */ JUtility::TColor field_0x2c0[2]; + /* 0x2C8 */ JUtility::TColor field_0x2c8[2]; + /* 0x2D0 */ int field_0x2d0[3][8]; + /* 0x330 */ f32 field_0x330; + /* 0x334 */ f32 field_0x334; + /* 0x338 */ f32 field_0x338; + /* 0x33C */ f32 field_0x33c[2]; + /* 0x344 */ f32 field_0x344[6]; + /* 0x35C */ f32 field_0x35c[6]; + /* 0x374 */ f32 field_0x374; + /* 0x378 */ f32 field_0x378; + /* 0x37C */ f32 field_0x37c; + /* 0x380 */ f32 field_0x380; + /* 0x384 */ f32 field_0x384[6]; + /* 0x39C */ f32 field_0x39c[6]; + /* 0x3B4 */ f32 field_0x3b4; + /* 0x3B8 */ JUtility::TColor field_0x3b8; + /* 0x3BC */ JUtility::TColor field_0x3bc; + /* 0x3C0 */ int field_0x3c0; + /* 0x3C4 */ int field_0x3c4; + /* 0x3C8 */ int field_0x3c8[4]; + /* 0x3D8 */ u16 field_0x3d8; + /* 0x3DA */ u16 field_0x3da; + /* 0x3DC */ u16 field_0x3dc; + /* 0x3DE */ u16 field_0x3de; + /* 0x3E0 */ u8 field_0x3e0; + /* 0x3E1 */ u8 field_0x3e1; + /* 0x3E2 */ u8 field_0x3e2; + /* 0x3E3 */ u8 field_0x3e3; + /* 0x3E4 */ u8 field_0x3e4; + /* 0x3E5 */ u8 field_0x3e5; + /* 0x3E6 */ u8 field_0x3e6; + /* 0x3E7 */ u8 field_0x3e7; + /* 0x3E8 */ u8 field_0x3e8; + /* 0x3E9 */ u8 field_0x3e9; + /* 0x3EA */ u8 field_0x3ea; + /* 0x3EB */ u8 field_0x3eb; + /* 0x3EC */ u8 mQuitStatus; + /* 0x3ED */ u8 field_0x3ed; + /* 0x3EE */ u8 mUseFlag; + /* 0x3EF */ u8 field_0x3ef; + /* 0x3F0 */ u8 field_0x3f0; + /* 0x3F1 */ u8 field_0x3f1; + /* 0x3F2 */ u8 field_0x3f2; + /* 0x3F3 */ u8 field_0x3f3; + /* 0x3F4 */ u8 field_0x3f4; + /* 0x3F5 */ u8 field_0x3f5; + /* 0x3F6 */ u8 field_0x3f6; + /* 0x3F7 */ u8 field_0x3f7; + /* 0x3F8 */ u8 field_0x3f8; + /* 0x3F9 */ u8 field_0x3f9; + /* 0x3FA */ u8 field_0x3fa; + /* 0x3FB */ u8 field_0x3fb[2]; + /* 0x3FD */ u8 field_0x3fd[2]; + /* 0x3FF */ u8 field_0x3ff[2]; + /* 0x401 */ u8 field_0x401; + /* 0x402 */ u8 field_0x402; + /* 0x403 */ u8 field_0x403; + /* 0x404 */ u8 field_0x404[4]; + /* 0x408 */ u8 field_0x408[4]; +}; #endif /* D_MENU_D_MENU_OPTION_H */ diff --git a/include/d/menu/d_menu_ring.h b/include/d/menu/d_menu_ring.h index 7f297d26270..9169f206387 100644 --- a/include/d/menu/d_menu_ring.h +++ b/include/d/menu/d_menu_ring.h @@ -2,5 +2,193 @@ #define D_MENU_D_MENU_RING_H #include "dolphin/types.h" +#include "JSystem/J2DGraph/J2DPicture.h" +#include "d/d_select_cursor.h" +#include "d/d_lib.h" + +class dMsgString_c; +class dKantera_icon_c; +class dMenu_ItemExplain_c; + +class dMenu_Ring_c : public dDlst_base_c { +public: + /* 801E9118 */ dMenu_Ring_c(JKRExpHeap*, STControl*, CSTControl*, u8); + /* 801EAB7C */ void _create(); + /* 801EABE8 */ void _delete(); + /* 801EABEC */ void _move(); + /* 801EACC8 */ void _draw(); + /* 801EB080 */ void setKanteraPos(f32, f32); + /* 801EB0A4 */ bool isOpen(); + /* 801EB2B4 */ bool isMoveEnd(); + /* 801EB3CC */ bool isClose(); + /* 801EB624 */ void getStickInfo(STControl*); + /* 801EB8C0 */ void calcStickAngle(STControl*, u8); + /* 801EB960 */ void setRotate(); + /* 801EBA38 */ void setItemScale(int, f32); + /* 801EBAB8 */ void setButtonScale(int, f32); + /* 801EBB10 */ void setItem(); + /* 801EBE58 */ void setJumpItem(bool); + /* 801EC20C */ void setScale(); + /* 801EC3B0 */ void setNameString(u32); + /* 801EC504 */ void setActiveCursor(); + /* 801EC754 */ void setMixItem(); + /* 801ECB14 */ void drawItem(); + /* 801ECF9C */ void drawItem2(); + /* 801ED2BC */ void stick_wait_init(); + /* 801ED31C */ void stick_wait_proc(); + /* 801ED490 */ void stick_move_init(); + /* 801ED53C */ void stick_move_proc(); + /* 801ED934 */ void stick_explain_init(); + /* 801ED938 */ void stick_explain_force_init(); + /* 801ED93C */ void stick_explain_proc(); + /* 801EDA0C */ void stick_explain_force_proc(); + /* 801EDB14 */ void setSelectItem(int, u8); + /* 801EDC98 */ void drawSelectItem(); + /* 801EDF2C */ void setSelectItemForce(int); + /* 801EDFDC */ void getCursorPos(u8); + /* 801EE058 */ void getItemNum(u8); + /* 801EE15C */ void getItemMaxNum(u8); + /* 801EE228 */ void checkExplainForce(); + /* 801EE63C */ bool checkCombineBomb(int); + /* 801EE644 */ void setCombineBomb(int); + /* 801EE648 */ void drawNumber(int, int, f32, f32); + /* 801EEA84 */ void getItem(int, u8); + /* 801EEAE4 */ void setDoStatus(u8); + /* 801EEB58 */ void isMixItemOn(); + /* 801EEC98 */ void isMixItemOff(); + /* 801EED84 */ void setMixMessage(); + /* 801EEF14 */ void textScaleHIO(); + /* 801EF11C */ void textCentering(); + /* 801EF13C */ void clacEllipseFunction(f32, f32, f32); + /* 801EF174 */ void calcDistance(f32, f32, f32, f32); + /* 801EF1A0 */ void clacEllipsePlotAverage(int, f32, f32); + /* 801EF484 */ bool dpdMove(); + /* 801EF48C */ void openExplain(u8); + + /* 801EF560 */ virtual void draw(); + /* 801EA708 */ virtual ~dMenu_Ring_c(); + + void drawFlag0() { mDrawFlag = 0; } + +private: + /* 0x004 */ JKRExpHeap* mpHeap; + /* 0x008 */ STControl* mpStick; + /* 0x00C */ CSTControl* mpCStick; + /* 0x010 */ dSelect_cursor_c* mpDrawCursor; + /* 0x014 */ dMsgString_c* mpString; + /* 0x018 */ CPaneMgr* mpMessageParent; + /* 0x01C */ CPaneMgr* mpCenterParent; + /* 0x020 */ CPaneMgr* mpSpotParent; + /* 0x024 */ CPaneMgr* mpTextParent[10]; + /* 0x04C */ CPaneMgr* mpNameParent; + /* 0x050 */ CPaneMgr* mpCircle; + /* 0x054 */ dKantera_icon_c* mpKanteraMeter; + /* 0x058 */ J2DScreen* mpScreen; + /* 0x05C */ J2DScreen* mpSpotScreen; + /* 0x060 */ u8 field_0x60[4]; + /* 0x064 */ J2DScreen* mpCenterScreen; + /* 0x068 */ J2DPicture* mpSelectItemTex[4][3]; + /* 0x098 */ J2DPicture* mpItemTex[4][3]; + /* 0x0C8 */ u8 field_0xc8[0xF0]; + /* 0x1B8 */ J2DPicture* mpBlackTex; + /* 0x1BC */ J2DPicture* mpItemNumTex[3]; + /* 0x1C8 */ J2DTextBox* field_0x1c8[5]; + /* 0x1DC */ J2DTextBox* field_0x1dc[5]; + /* 0x1F0 */ ResTIMG* mpSelectItemTexBuf[4][3][2]; + /* 0x250 */ ResTIMG* mpItemBuf[4][3]; + /* 0x280 */ u8 field_0x280[0xF0]; + /* 0x370 */ dMenu_ItemExplain_c* mpItemExplain; + /* 0x374 */ void* field_0x374[3]; + /* 0x380 */ cXyz field_0x380; + /* 0x38C */ f32 field_0x38c[24]; + /* 0x3EC */ f32 field_0x3ec[24]; + /* 0x44C */ f32 field_0x44c[24]; + /* 0x4AC */ f32 field_0x4ac[24]; + /* 0x50C */ f32 field_0x50c; + /* 0x510 */ f32 field_0x510; + /* 0x514 */ f32 field_0x514; + /* 0x518 */ f32 field_0x518[4]; + /* 0x528 */ f32 field_0x528[4]; + /* 0x538 */ f32 field_0x538[4]; + /* 0x548 */ f32 field_0x548[4]; + /* 0x558 */ f32 field_0x558[4]; + /* 0x568 */ f32 field_0x568; + /* 0x56C */ f32 field_0x56c; + /* 0x570 */ f32 field_0x570; + /* 0x574 */ f32 field_0x574[2]; + /* 0x57C */ f32 field_0x57c[2]; + /* 0x584 */ f32 field_0x584; + /* 0x588 */ f32 field_0x588; + /* 0x58C */ f32 field_0x58c; + /* 0x590 */ f32 field_0x590[10]; + /* 0x5B8 */ f32 field_0x5b8[10]; + /* 0x5E0 */ f32 field_0x5e0[10]; + /* 0x608 */ f32 field_0x608; + /* 0x604 */ f32 field_0x604; + /* 0x610 */ f32 field_0x610; + /* 0x614 */ f32 field_0x614; + /* 0x618 */ f32 field_0x618; + /* 0x61C */ f32 field_0x61c; + /* 0x620 */ u8 field_0x620[4]; + /* 0x624 */ int field_0x624; + /* 0x628 */ u32 field_0x628; + /* 0x62C */ int field_0x62c; + /* 0x630 */ u16 field_0x630; + /* 0x632 */ u16 field_0x632; + /* 0x634 */ u16 field_0x634; + /* 0x636 */ u16 field_0x636[24]; + /* 0x666 */ u16 field_0x666; + /* 0x668 */ u16 field_0x668; + /* 0x66A */ u16 field_0x66a; + /* 0x66C */ u16 field_0x66c[4]; + /* 0x674 */ u16 field_0x674; + /* 0x676 */ u16 field_0x676; + /* 0x678 */ u16 field_0x678; + /* 0x67A */ u16 field_0x67a; + /* 0x67C */ u16 field_0x67c; + /* 0x67E */ u16 field_0x67e[4]; + /* 0x686 */ u16 field_0x686; + /* 0x688 */ u8 field_0x688[24]; + /* 0x6A0 */ u8 field_0x6a0; + /* 0x6A1 */ u8 field_0x6a1; + /* 0x6A2 */ u8 field_0x6a2; + /* 0x6A3 */ u8 field_0x6a3; + /* 0x6A4 */ u8 field_0x6a4; + /* 0x6A5 */ u8 field_0x6a5; + /* 0x6A6 */ u8 field_0x6a6; + /* 0x6A7 */ u8 field_0x6a7; + /* 0x6A8 */ u8 mStatus; + /* 0x6A9 */ u8 field_0x6a9; + /* 0x6AA */ u8 field_0x6aa; + /* 0x6AB */ u8 field_0x6ab; + /* 0x6AC */ u8 field_0x6ac[4]; + /* 0x6B0 */ u8 field_0x6b0[4]; + /* 0x6B4 */ u8 field_0x6b4; + /* 0x6B5 */ u8 field_0x6b5; + /* 0x6B6 */ u8 field_0x6b6[4]; + /* 0x6BA */ u8 field_0x6ba; + /* 0x6BB */ u8 field_0x6bb; + /* 0x6BC */ u8 field_0x6bc; + /* 0x6BD */ u8 mDrawFlag; + /* 0x6BE */ u8 field_0x6be; + /* 0x6BF */ u8 field_0x6bf[4]; + /* 0x6C3 */ u8 field_0x6c3; + /* 0x6C4 */ u8 field_0x6c4; + /* 0x6C5 */ u8 field_0x6c5; + /* 0x6C6 */ u8 field_0x6c6; + /* 0x6C7 */ u8 field_0x6c7; + /* 0x6C8 */ u8 field_0x6c8; + /* 0x6C9 */ u8 field_0x6c9; + /* 0x6CA */ u8 field_0x6ca; + /* 0x6CB */ u8 field_0x6cb; + /* 0x6CC */ u8 field_0x6cc; + /* 0x6CD */ u8 field_0x6cd; + /* 0x6CE */ u8 field_0x6ce; + /* 0x6CF */ u8 field_0x6cf; + /* 0x6D0 */ u8 field_0x6d0; + /* 0x6D1 */ u8 field_0x6d1; + /* 0x6D2 */ u8 field_0x6d2; + /* 0x6D3 */ u8 field_0x6d3; +}; #endif /* D_MENU_D_MENU_RING_H */ diff --git a/include/d/menu/d_menu_save.h b/include/d/menu/d_menu_save.h index f5942cdb458..f46ca98a96c 100644 --- a/include/d/menu/d_menu_save.h +++ b/include/d/menu/d_menu_save.h @@ -1,6 +1,281 @@ #ifndef D_MENU_D_MENU_SAVE_H #define D_MENU_D_MENU_SAVE_H +#include "JSystem/J2DGraph/J2DScreen.h" +#include "d/d_lib.h" #include "dolphin/types.h" +#include "d/d_select_cursor.h" + +class dMsgString_c; +class mDoDvdThd_command_c; +class dFile_warning_c; +class dFile_info_c; +class dMsgScrnExplain_c; + +class dDlst_MenuSaveExplain_c : public dDlst_base_c { +public: + /* 801F6ADC */ virtual void draw(); + /* 801F6B8C */ virtual ~dDlst_MenuSaveExplain_c(); + +private: + /* 0x4 */ int field_0x4; +}; + +class dDlst_MenuSave_c : public dDlst_base_c { +public: + /* 801F6B0C */ virtual void draw(); + /* 801F6B44 */ virtual ~dDlst_MenuSave_c(); +}; + +class dMenu_save_c { +public: + /* 801EF6A0 */ dMenu_save_c(); + /* 801EF7AC */ void _create(); + /* 801EF904 */ void screenSet(); + /* 801F0938 */ void initialize(); + /* 801F0958 */ void displayInit(); + /* 801F09AC */ bool _open(); + /* 801F0B10 */ void _close(); + /* 801F0B28 */ void _delete(); + /* 801F1048 */ void _move(); + /* 801F1100 */ void saveSelAnm(); + /* 801F1148 */ void selFileWakuAnm(); + /* 801F11F4 */ void bookIconAnm(); + /* 801F12F0 */ void memCardWatch(); + /* 801F1378 */ void saveQuestion(); + /* 801F1558 */ void saveQuestion2(); + /* 801F1620 */ void saveQuestion21(); + /* 801F1644 */ void saveQuestion3(); + /* 801F16B8 */ void saveQuestion4(); + /* 801F16F4 */ void saveGuide(); + /* 801F1720 */ void memCardCheck(); + /* 801F191C */ void memCardErrMsgWaitKey(); + /* 801F19A8 */ void backSaveQuestionInitSet(); + /* 801F19DC */ void backSaveQuestion(); + /* 801F1A48 */ void backSaveQuestion2(); + /* 801F1B38 */ void closeSelect(); + /* 801F1BF8 */ void closeSelect2(); + /* 801F1C70 */ void iplSelMsgInitSet(); + /* 801F1C94 */ void iplSelInitSet(); + /* 801F1CEC */ void IPLSelectDisp1(); + /* 801F1D54 */ void IPLSelectDisp2(); + /* 801F1DD4 */ void memCardErrGoIPLSel(); + /* 801F1E58 */ void IPLSelect2Disp(); + /* 801F1EE0 */ void memCardErrGoIPLSel2(); + /* 801F1F80 */ void memCardErrGotoIPL(); + /* 801F2000 */ void memCardErrMsgWaitFormatSel(); + /* 801F20AC */ void cardFormatYesSelDisp(); + /* 801F2134 */ void cardFormatNoSelDisp(); + /* 801F219C */ void memCardErrMsgWaitFormatSel2(); + /* 801F2250 */ void cardFormatYesSel2Disp(); + /* 801F22CC */ void memCardFormat(); + /* 801F232C */ void memCardFormatWait(); + /* 801F23A4 */ void gameFileMakeSelInitSet(); + /* 801F23FC */ void makeGameFileSelDisp(); + /* 801F247C */ void memCardMakeGameFileSel(); + /* 801F2514 */ void makeGameFileDisp(); + /* 801F25AC */ void memCardMakeGameFile(); + /* 801F260C */ void memCardMakeGameFileWait(); + /* 801F2698 */ void memCardCommandEnd(); + /* 801F2708 */ void memCardCommandEnd2(); + /* 801F27CC */ void memCardDataLoadWait(); + /* 801F2840 */ void dataWrite(); + /* 801F28E4 */ void memCardDataSaveWait(); + /* 801F298C */ void memCardDataSaveWait2(); + /* 801F2B5C */ void gameContinueDisp(); + /* 801F2BF8 */ void gameContinue(); + /* 801F2D78 */ void gameContinue2(); + /* 801F2DA0 */ void gameContinue3(); + /* 801F2DD4 */ void saveEnd(); + /* 801F2E88 */ void endingNoSave(); + /* 801F2F08 */ void endingNoSave2(); + /* 801F2F38 */ void endingDataCheck(); + /* 801F2F4C */ void retryQuestion0(); + /* 801F2FB4 */ void retryQuestion1(); + /* 801F3040 */ void retryQuestion2(); + /* 801F30B8 */ void restartInit(); + /* 801F31B0 */ void saveWait(); + /* 801F31B4 */ void messageChange(); + /* 801F328C */ void YesNoSelect(); + /* 801F34BC */ void msgTxtSet(u16, bool); + /* 801F3588 */ void openSaveSelect(); + /* 801F36B4 */ void openSaveSelect2(); + /* 801F37A0 */ void openSaveSelect3(); + /* 801F3934 */ void saveSelect(); + /* 801F3A94 */ void saveSelectStart(); + /* 801F3BE0 */ void selectDataOpenMove(); + /* 801F3C7C */ void dataSelectAnmSet(); + /* 801F3E30 */ void saveSelectMoveAnime(); + /* 801F40D8 */ void saveYesNoSelect(); + /* 801F4238 */ void yesnoSelectStart(); + /* 801F42FC */ void saveMoveDisp(); + /* 801F43F8 */ void saveMoveDisp2(); + /* 801F4510 */ void yesnoSelectAnmSet(u8); + /* 801F46B4 */ void yesNoCursorMoveAnm(); + /* 801F4724 */ void yesnoCancelAnmSet(); + /* 801F47DC */ void saveYesNoCancelMove(); + /* 801F485C */ void headerTxtSet(u16); + /* 801F4928 */ void headerTxtChangeAnm(); + /* 801F4A10 */ void errDispInitSet(int); + /* 801F4B84 */ void msgWindowInitOpen(); + /* 801F4D10 */ void msgWindowOpen(); + /* 801F4DAC */ void msgWindowClose(); + /* 801F4E48 */ void errYesNoSelect(u8, u8); + /* 801F4FB4 */ void errCurMove(u8, u8); + /* 801F5054 */ void errYesNoCursorMoveAnm(); + /* 801F50C4 */ void errorTxtSet(u16); + /* 801F5190 */ void errorTxtChangeAnm(); + /* 801F5278 */ void saveSelectOpenInit(); + /* 801F533C */ void selectDataBaseMoveAnmInitSet(int, int); + /* 801F53D4 */ void selectDataBaseMoveAnm(); + /* 801F54C0 */ void saveSelectOpenAnmSet(); + /* 801F5508 */ void selectDataMoveAnmInitSet(int, int); + /* 801F5600 */ void selectDataMoveAnm(); + /* 801F5744 */ void yesnoMenuMoveAnmInitSet(int, int, u8); + /* 801F58C8 */ void yesnoMenuMoveAnm(); + /* 801F5AE4 */ void yesnoSelectMoveAnm(u8); + /* 801F5D84 */ void yesnoCursorShow(); + /* 801F5EF4 */ void errorMoveAnmInitSet(int, int); + /* 801F5F84 */ void errorMoveAnm(); + /* 801F60A4 */ void modoruTxtDispAnmInit(u8); + /* 801F6120 */ void modoruTxtDispAnm(); + /* 801F61FC */ void ketteiTxtDispAnmInit(u8); + /* 801F6278 */ void ketteiTxtDispAnm(); + /* 801F6354 */ void selectWakuAlpahAnmInit(u8, u8, u8, u8); + /* 801F6390 */ void selectWakuAlpahAnm(u8); + /* 801F6458 */ void selFileCursorShow(); + /* 801F6608 */ void yesnoWakuAlpahAnmInit(u8, u8, u8, u8); + /* 801F6654 */ void yesnoWakuAlpahAnm(u8); + /* 801F67B8 */ void dataSave(); + /* 801F67F0 */ void setSaveData(); + /* 801F6954 */ void setInitSaveData(); + /* 801F69B8 */ void _draw(); + /* 801F69FC */ void _draw2(); + + /* 802844D0 */ virtual ~dMenu_save_c(); + + u8 getSaveStatus() { return mSaveStatus; } + void setUseType(u8 type) { mUseType = type; } + + struct SaveSel { + /* 0x00 */ J2DScreen* Scr; + /* 0x04 */ JUTFont* font[2]; + /* 0x0C */ dMsgString_c* mMsgString; + }; // Size: 0x10 + +private: + /* 0x0004 */ JKRArchive* field_0x4; + /* 0x0008 */ mDoDvdThd_command_c* field_0x8; + /* 0x000C */ STControl* stick; + /* 0x0010 */ dDlst_MenuSaveExplain_c field_0x10; + /* 0x0018 */ dDlst_MenuSave_c field_0x18; + /* 0x001C */ SaveSel mSaveSel; + /* 0x002C */ dSelect_cursor_c* mSelIcon; + /* 0x0030 */ dFile_warning_c* field_0x30; + /* 0x0034 */ dFile_info_c* field_0x34[3]; + /* 0x0040 */ void* field_0x40; // bck + /* 0x0044 */ void* field_0x44; // bck + /* 0x0048 */ void* field_0x48; // bck + /* 0x004C */ void* field_0x4c; // bck + /* 0x0050 */ s32 field_0x50; + /* 0x0054 */ u8 field_0x54; + /* 0x0058 */ CPaneMgr* field_0x58; + /* 0x005C */ int field_0x5c; + /* 0x0060 */ int field_0x60; + /* 0x0064 */ u8 field_0x64; + /* 0x0064 */ u8 field_0x65; + /* 0x0068 */ CPaneMgr* field_0x68[3]; + /* 0x0074 */ u8 field_0x74[0x10]; + /* 0x0084 */ CPaneMgr* field_0x84[2]; + /* 0x008C */ u8 field_0x8c[0x10]; + /* 0x009C */ u8 field_0x9c; + /* 0x00A0 */ int field_0xa0; + /* 0x00A4 */ u8 field_0xa4[0x10]; + /* 0x00B4 */ J2DPane* field_0xb4; + /* 0x00B8 */ int field_0xb8; + /* 0x00BC */ int field_0xbc; + /* 0x00C0 */ CPaneMgr* field_0xc0[2]; + /* 0x00C8 */ char* field_0xc8[2]; + /* 0x00D0 */ u8 field_0xd0; + /* 0x00D2 */ u8 field_0xd1; + /* 0x00D2 */ u8 field_0xd2; + /* 0x00D3 */ u8 field_0xd3; + /* 0x00D4 */ CPaneMgr* field_0xd4[3]; + /* 0x00E0 */ CPaneMgr* field_0xe0[3]; + /* 0x00EC */ CPaneMgr* field_0xec[3]; + /* 0x00F8 */ CPaneMgr* field_0xf8[3]; + /* 0x0104 */ u8 field_0x104[3]; + /* 0x0107 */ u8 field_0x107[3]; + /* 0x010A */ u8 field_0x10a[3]; + /* 0x010D */ u8 field_0x10d[11]; + /* 0x0118 */ CPaneMgr* field_0x118[2]; + /* 0x0120 */ CPaneMgr* field_0x120[2]; + /* 0x0128 */ CPaneMgr* field_0x128[2]; + /* 0x0130 */ u8 field_0x130[2]; + /* 0x0132 */ u8 field_0x132[2]; + /* 0x0134 */ u8 field_0x134[2]; + /* 0x0138 */ CPaneMgr* field_0x138[2]; + /* 0x0140 */ void* field_0x140; // bpk + /* 0x0144 */ int field_0x144; + /* 0x0148 */ void* field_0x148; // btk + /* 0x014C */ int field_0x14c; + /* 0x0150 */ void* field_0x150; + /* 0x0154 */ int field_0x154; + /* 0x0158 */ void* field_0x158; // btk + /* 0x015C */ int field_0x15c; + /* 0x0160 */ void* field_0x160; // brk + /* 0x0164 */ int field_0x164; + /* 0x0168 */ CPaneMgr* field_0x168[2]; + /* 0x0170 */ u8 field_0x170[8]; + /* 0x0178 */ u8 field_0x178; + /* 0x0179 */ u8 field_0x179; + /* 0x017A */ u8 field_0x17a; + /* 0x017B */ u8 field_0x17b[0x19]; + /* 0x0194 */ CPaneMgr* field_0x194; + /* 0x0198 */ CPaneMgr* field_0x198; + /* 0x019C */ u8 field_0x19c; + /* 0x019D */ u8 field_0x19d; + /* 0x01A0 */ CPaneMgr* field_0x1a0; + /* 0x01A4 */ CPaneMgr* field_0x1a4; + /* 0x01A8 */ u8 field_0x1a8; + /* 0x01A9 */ u8 field_0x1a9; + /* 0x01AA */ u8 field_0x1aa[3]; + /* 0x01AD */ u8 field_0x1ad[3]; + /* 0x01B0 */ u8 field_0x1b0; + /* 0x01B1 */ u8 field_0x1b1; + /* 0x01B2 */ u8 field_0x1b2; + /* 0x01B3 */ u8 field_0x1b3; + /* 0x01B4 */ u8 field_0x1b4; + /* 0x01B5 */ u8 field_0x1b5; + /* 0x01B6 */ u8 field_0x1b6; + /* 0x01B7 */ u8 field_0x1b7; + /* 0x01B8 */ u8 field_0x1b8; + /* 0x01B9 */ u8 field_0x1b9; + /* 0x01BA */ u8 mSaveStatus; + /* 0x01BB */ u8 mEndStatus; + /* 0x01BC */ u8 mUseType; + /* 0x01BD */ u8 field_0x1bd; + /* 0x01BE */ u8 field_0x1be; + /* 0x01BF */ u8 field_0x1bf; + /* 0x01C0 */ u8 field_0x1c0; + /* 0x01C4 */ int field_0x1c4; + /* 0x01C8 */ int field_0x1c8; + /* 0x01CC */ void* field_0x1cc; // func + /* 0x01D0 */ u8 field_0x1d0[0xA94 * 3]; // 3 savefiles buffer + /* 0x218C */ dMsgScrnExplain_c* mpScrnExplain; + /* 0x2190 */ u8 field_0x2190; + /* 0x2192 */ u16 field_0x2192; + /* 0x2194 */ u8 field_0x2194; + /* 0x2195 */ u8 field_0x2195; + /* 0x2198 */ int field_0x2198; + /* 0x219C */ u8 field_0x219c; + /* 0x219D */ u8 field_0x219d; + /* 0x219E */ u8 field_0x219e; + /* 0x219F */ u8 field_0x219f; + /* 0x21A0 */ u8 field_0x21a0; + /* 0x21A1 */ u8 field_0x21a1; + /* 0x21A2 */ u8 field_0x21a2; + /* 0x21A3 */ u8 field_0x21a3; +}; #endif /* D_MENU_D_MENU_SAVE_H */ diff --git a/include/d/menu/d_menu_skill.h b/include/d/menu/d_menu_skill.h index 2e8018c36ae..db40cf1b617 100644 --- a/include/d/menu/d_menu_skill.h +++ b/include/d/menu/d_menu_skill.h @@ -2,5 +2,105 @@ #define D_MENU_D_MENU_SKILL_H #include "dolphin/types.h" +#include "d/d_lib.h" +#include "d/d_select_cursor.h" +#include "JSystem/J2DGraph/J2DPicture.h" + +class mDoDvdThd_mountArchive_c; +class dMsgString_c; + +class dMenu_Skill_c : public dDlst_base_c { +public: + /* 801F7224 */ dMenu_Skill_c(JKRExpHeap*, STControl*, CSTControl*); + /* 801F763C */ void _create(); + /* 801F7718 */ void _move(); + /* 801F77B0 */ void _draw(); + /* 801F7950 */ bool isSync(); + /* 801F7978 */ void skill_init_calc(); + /* 801F79EC */ void init(); + /* 801F7A40 */ void _open(); + /* 801F7C1C */ void _close(); + /* 801F7D58 */ void wait_init(); + /* 801F7D94 */ void wait_move(); + /* 801F7F24 */ void read_open_init(); + /* 801F7FF8 */ void read_open_move(); + /* 801F8114 */ void read_move_init(); + /* 801F8150 */ void read_move_move(); + /* 801F8218 */ void read_close_init(); + /* 801F826C */ void read_close_move(); + /* 801F8388 */ void screenSetMenu(); + /* 801F8A18 */ void screenSetLetter(); + /* 801F8D20 */ void screenSetDoIcon(); + /* 801F8E9C */ void setCursorPos(); + /* 801F8F28 */ void changeActiveColor(); + /* 801F9144 */ void setPageText(); + /* 801F9260 */ void setAButtonString(u16); + /* 801F9310 */ void setBButtonString(u16); + /* 801F93C0 */ void setNameString(u16); + /* 801F9470 */ void getSkillNum(); + /* 801F9500 */ void setHIO(bool); + + /* 801F9A08 */ virtual void draw(); + /* 801F7348 */ virtual ~dMenu_Skill_c(); + + u8 getStatus() { return mStatus; } + +private: + /* 0x004 */ JKRExpHeap* field_0x4; + /* 0x008 */ JKRArchive* field_0x8; + /* 0x00C */ STControl* field_0xc; + /* 0x010 */ CSTControl* field_0x10; + /* 0x014 */ mDoDvdThd_mountArchive_c* field_0x14; + /* 0x018 */ J2DScreen* mpMenuScreen; + /* 0x01C */ J2DScreen* mpLetterScreen; + /* 0x020 */ J2DScreen* mpIconScreen; + /* 0x024 */ J2DPane* field_0x24[4]; + /* 0x034 */ J2DPane* field_0x34[4]; + /* 0x044 */ J2DPane* field_0x44[4]; + /* 0x054 */ J2DPane* field_0x54[4]; + /* 0x064 */ J2DPane* field_0x64[4]; + /* 0x074 */ J2DPane* field_0x74[4]; + /* 0x084 */ J2DPane* field_0x84[4]; + /* 0x094 */ J2DPane* field_0x94[4]; + /* 0x0A4 */ u8 field_0xa4[0xC]; + /* 0x0B0 */ J2DTextBox* field_0xb0[4]; + /* 0x0C0 */ J2DTextBox* field_0xc0[4]; + /* 0x0D0 */ J2DTextBox* field_0xd0[4]; + /* 0x0E0 */ J2DTextBox* field_0xe0[4]; + /* 0x0F0 */ J2DTextBox* field_0xf0[4]; + /* 0x100 */ J2DTextBox* field_0x100[4]; + /* 0x110 */ J2DTextBox* field_0x110[4]; + /* 0x120 */ J2DTextBox* mAButtonString[5]; + /* 0x134 */ J2DTextBox* mBButtonString[5]; + /* 0x148 */ J2DTextBox* mNameString[4]; + /* 0x158 */ J2DPicture* mpBlackTex; + /* 0x15C */ CPaneMgr* mpParent; + /* 0x160 */ CPaneMgr* mpLetterParent[7]; + /* 0x17C */ CPaneMgr* mpTextParent; + /* 0x180 */ CPaneMgr* mpTextPane; + /* 0x184 */ CPaneMgr* mpExpName; + /* 0x188 */ CPaneMgr* field_0x188[2]; + /* 0x190 */ CPaneMgr* field_0x190[2]; + /* 0x198 */ dSelect_cursor_c* mpDrawCursor; + /* 0x19C */ dMsgString_c* mpString; + /* 0x1A0 */ JUtility::TColor field_0x1a0[5]; + /* 0x1B4 */ JUtility::TColor field_0x1b4[5]; + /* 0x1C8 */ JUtility::TColor field_0x1c8[5]; + /* 0x1DC */ JUtility::TColor field_0x1dc[5]; + /* 0x1F0 */ f32 field_0x1f0; + /* 0x1F4 */ f32 field_0x1f4; + /* 0x1F8 */ f32 field_0x1f8; + /* 0x1FC */ int field_0x1fc; + /* 0x200 */ u16 field_0x200; + /* 0x202 */ u16 field_0x202; + /* 0x204 */ u8 mStatus; + /* 0x205 */ u8 field_0x205; + /* 0x206 */ u8 field_0x206; + /* 0x207 */ u8 field_0x207; + /* 0x208 */ u8 field_0x208; + /* 0x209 */ u8 field_0x209; + /* 0x20A */ u8 field_0x20a; + /* 0x20B */ u8 field_0x20b; +}; // Size: 0x20C #endif /* D_MENU_D_MENU_SKILL_H */ diff --git a/include/d/menu/d_menu_window.h b/include/d/menu/d_menu_window.h index 62847702451..4d0a5bbe46f 100644 --- a/include/d/menu/d_menu_window.h +++ b/include/d/menu/d_menu_window.h @@ -4,23 +4,77 @@ #include "d/meter/d_meter2_info.h" #include "dolphin/types.h" #include "m_Do/m_Do_controller_pad.h" +#include "m_Do/m_Do_graphic.h" +#include "d/d_drawlist.h" +#include "d/menu/d_menu_collect.h" +#include "d/msg/d_msg_class.h" -struct STControl; -struct CSTControl; -class dDlst_base_c; class dMenu_Ring_c; -class dMenu_Collect2D_c; class dMenu_Dmap_c; class dMenu_Fmap_c; -class dMenu_save_c; -class dMenu_Option_c; -class dMenu_Letter_c; -class dMenu_Fishing_c; -class dMenu_Skill_c; -class dMenu_Insect_c; -class dMw_c { +class dDlst_MENU_CAPTURE_c : public dDlst_base_c { public: + /* 801FDFCC */ virtual void draw(); + /* 801FE2E8 */ virtual ~dDlst_MENU_CAPTURE_c(); + + dDlst_MENU_CAPTURE_c() { + mFlag = 0; + mAlpha = 255; + mTopFlag = 0; + } + + void setCaptureFlag() { mFlag = 1; } + bool checkDraw() { return mFlag; } + u8 getAlpha() { return mAlpha; } + u8 getTopFlag() { return mTopFlag; } + +private: + /* 0x4 */ u8 mFlag; + /* 0x5 */ u8 mAlpha; + /* 0x6 */ u8 mTopFlag; +}; + +class dMw_c : public msg_class { +public: + enum dMw_Status { + /* 0x00 */ NO_MENU, + /* 0x01 */ RING_OPEN, + /* 0x02 */ RING_MOVE, + /* 0x03 */ RING_CLOSE, + /* 0x04 */ COLLECT_OPEN, + /* 0x05 */ COLLECT_MOVE, + /* 0x06 */ COLLECT_CLOSE, + /* 0x07 */ FMAP_OPEN, + /* 0x08 */ FMAP_MOVE, + /* 0x09 */ FMAP_CLOSE, + /* 0x0A */ DMAP_OPEN, + /* 0x0B */ DMAP_MOVE, + /* 0x0C */ DMAP_CLOSE, + /* 0x0D */ SAVE_OPEN, + /* 0x0E */ SAVE_MOVE, + /* 0x0F */ SAVE_CLOSE, + /* 0x10 */ OPTIONS_OPEN, + /* 0x11 */ OPTIONS_MOVE, + /* 0x12 */ OPTIONS_CLOSE, + /* 0x13 */ LETTER_OPEN, + /* 0x14 */ LETTER_MOVE, + /* 0x15 */ LETTER_CLOSE, + /* 0x16 */ FISHING_OPEN, + /* 0x17 */ FISHING_MOVE, + /* 0x18 */ FISHING_CLOSE, + /* 0x19 */ SKILL_OPEN, + /* 0x1A */ SKILL_MOVE, + /* 0x1B */ SKILL_CLOSE, + /* 0x1C */ INSECT_OPEN, + /* 0x1D */ INSECT_MOVE, + /* 0x1E */ INSECT_CLOSE, + /* 0x1F */ INSECT_AGITHA_OPEN1, + /* 0x20 */ INSECT_AGITHA_OPEN2, + /* 0x21 */ INSECT_AGITHA_MOVE, + /* 0x22 */ INSECT_AGITHA_CLOSE, + }; + /* 801FA13C */ void key_wait_init(u8); /* 801FA220 */ void ring_open_init(u8); /* 801FA23C */ void ring_move_init(u8); @@ -94,70 +148,71 @@ public: /* 801FBD80 */ void dMw_capture_create(); /* 801FBE14 */ void dMw_capture_delete(); /* 801FBE94 */ void dMw_ring_create(u8); - /* 801FBF60 */ void dMw_ring_delete(); + /* 801FBF60 */ bool dMw_ring_delete(); /* 801FBFF8 */ void dMw_collect_create(); - /* 801FC090 */ void dMw_collect_delete(bool); + /* 801FC090 */ bool dMw_collect_delete(bool); /* 801FC0FC */ void dMw_fmap_create(); - /* 801FC264 */ void dMw_fmap_delete(bool); + /* 801FC264 */ bool dMw_fmap_delete(bool); /* 801FC350 */ void dMw_dmap_create(); - /* 801FC46C */ void dMw_dmap_delete(bool); + /* 801FC46C */ bool dMw_dmap_delete(bool); /* 801FC520 */ void dMw_save_create(); - /* 801FC5D0 */ void dMw_save_delete(); + /* 801FC5D0 */ bool dMw_save_delete(); /* 801FC668 */ void dMw_option_create(); - /* 801FC70C */ void dMw_option_delete(); + /* 801FC70C */ bool dMw_option_delete(); /* 801FC7BC */ void dMw_letter_create(); - /* 801FC85C */ void dMw_letter_delete(); + /* 801FC85C */ bool dMw_letter_delete(); /* 801FC904 */ void dMw_fishing_create(); - /* 801FC9A4 */ void dMw_fishing_delete(); + /* 801FC9A4 */ bool dMw_fishing_delete(); /* 801FCA4C */ void dMw_skill_create(); - /* 801FCAEC */ void dMw_skill_delete(); + /* 801FCAEC */ bool dMw_skill_delete(); /* 801FCB94 */ void dMw_insect_create(u8); - /* 801FCC44 */ void dMw_insect_delete(); + /* 801FCC44 */ bool dMw_insect_delete(); /* 801FCCEC */ void dMw_onButtonBit(u8); /* 801FCCFC */ void dMw_offButtonBit(u8); - /* 801FCD0C */ void dMw_isButtonBit(u8); - /* 801FCD24 */ void dMw_isPush_S_Button(); - /* 801FCDD8 */ void isPauseReady(); - /* 801FCE08 */ void dMw_fade_out(); - /* 801FCE78 */ void dMw_fade_in(); - /* 801FCEE8 */ void checkCStickTrigger(); - /* 801FCF84 */ void isEventCheck(); + /* 801FCD0C */ BOOL dMw_isButtonBit(u8); + /* 801FCD24 */ BOOL dMw_isPush_S_Button(); + /* 801FCDD8 */ bool isPauseReady(); + /* 801FCE08 */ static void dMw_fade_out(); + /* 801FCE78 */ static void dMw_fade_in(); + /* 801FCEE8 */ int checkCStickTrigger(); + /* 801FCF84 */ bool isEventCheck(); /* 801FD094 */ void markMemSize(); /* 801FD0D4 */ void checkMemSize(); - /* 801FD140 */ void _create(); - /* 801FD2D8 */ void _execute(); - /* 801FD450 */ void _draw(); - /* 801FD67C */ void _delete(); + /* 801FD140 */ int _create(); + /* 801FD2D8 */ int _execute(); + /* 801FD450 */ int _draw(); + /* 801FD67C */ int _delete(); void onPauseWindow() { mPauseWindow = true; } void offPauseWindow() { mPauseWindow = false; } void onShowFlag() { mShowFlag |= 1; } void offShowFlag() { mShowFlag &= ~1; } bool isShowFlag() { return mShowFlag & 1 != 0; } + bool isFadeNowCheck() { return mDoGph_gInf_c::getFader()->getStatus() == 1; } private: - u8 field_0x0[0x100]; - /* 0x100 */ void* field_0x100; + /* 0x100 */ JKRExpHeap* mpHeap; /* 0x104 */ STControl* mpStick; /* 0x108 */ CSTControl* mpCStick; - /* 0x10C */ dDlst_base_c* field_0x10c; - /* 0x110 */ dMenu_Ring_c* mRing; - /* 0x114 */ dMenu_Collect2D_c* mCollect2D; - /* 0x118 */ dMenu_Dmap_c* mDmap; - /* 0x11C */ dMenu_Fmap_c* mFmap; - /* 0x120 */ dMenu_save_c* mSave; - /* 0x124 */ dMenu_Option_c* mOption; - /* 0x128 */ dMenu_Letter_c* mLetter; - /* 0x12C */ dMenu_Fishing_c* mFishing; - /* 0x130 */ dMenu_Skill_c* mSkill; - /* 0x134 */ dMenu_Insect_c* mInsect; - /* 0x138 */ int field_0x138; - /* 0x13C */ u8 field_0x13c[8]; + /* 0x10C */ dDlst_MENU_CAPTURE_c* mpCapture; + /* 0x110 */ dMenu_Ring_c* mpMenuRing; + /* 0x114 */ dMenu_Collect_c* mpMenuCollect; + /* 0x118 */ dMenu_Dmap_c* mpMenuDmap; + /* 0x11C */ dMenu_Fmap_c* mpMenuFmap; + /* 0x120 */ dMenu_save_c* mpMenuSave; + /* 0x124 */ dMenu_Option_c* mpMenuOption; + /* 0x128 */ dMenu_Letter_c* mpMenuLetter; + /* 0x12C */ dMenu_Fishing_c* mpMenuFishing; + /* 0x130 */ dMenu_Skill_c* mpMenuSkill; + /* 0x134 */ dMenu_Insect_c* mpMenuInsect; + /* 0x138 */ s32 mMemSize; + /* 0x13C */ f32 field_0x13c; + /* 0x140 */ f32 field_0x140; /* 0x144 */ u8 field_0x144; /* 0x145 */ u8 mButtons; - /* 0x146 */ u8 field_0x146; + /* 0x146 */ u8 mMenuStatus; /* 0x147 */ u8 mShowFlag; - /* 0x148 */ u8 field_0x148; + /* 0x148 */ s8 field_0x148; /* 0x149 */ u8 field_0x149; /* 0x14A */ u8 field_0x14A; /* 0x14B */ u8 field_0x14B; @@ -175,4 +230,26 @@ private: BOOL dMw_LEFT_TRIGGER(); BOOL dMw_RIGHT_TRIGGER(); +static int dMw_Draw(dMw_c*); +static int dMw_Execute(dMw_c*); +static int dMw_IsDelete(dMw_c*); +static int dMw_Delete(dMw_c*); +static int dMw_Create(msg_class*); + +typedef int (*dMw_Method)(dMw_c*); + +typedef void (dMw_c::*dMw_init_func)(u8); +struct dMw_init_proc { + /* 0x0 */ u32 field_0x0; + /* 0x4 */ u32 field_0x4; + /* 0x8 */ dMw_init_func init_func; +}; + +typedef void (dMw_c::*dMw_proc_func)(); +struct dMw_move_proc { + /* 0x0 */ u32 field_0x0; + /* 0x4 */ u32 field_0x4; + /* 0x8 */ dMw_proc_func proc_func; +}; + #endif /* D_MENU_D_MENU_WINDOW_H */ diff --git a/include/d/menu/d_menu_window_HIO.h b/include/d/menu/d_menu_window_HIO.h index dc3054edfd5..f3308eb6f25 100644 --- a/include/d/menu/d_menu_window_HIO.h +++ b/include/d/menu/d_menu_window_HIO.h @@ -9,8 +9,7 @@ public: /* 801F9E98 */ virtual ~dMw_DHIO_c() {} -private: - /* 0x004 */ u8 field_0x4; + /* 0x004 */ s8 field_0x4; /* 0x005 */ bool mMap[32]; /* 0x025 */ bool mCompass[32]; /* 0x045 */ bool mBossKey[32]; @@ -41,8 +40,7 @@ public: /* 801F9EE0 */ virtual ~dMw_HIO_c() {} -private: - /* 0x004 */ u8 field_0x4; + /* 0x004 */ s8 field_0x4; /* 0x006 */ u16 mLife; /* 0x008 */ u16 mMaxLife; /* 0x00A */ u8 mMagic; diff --git a/include/d/meter/d_meter2.h b/include/d/meter/d_meter2.h index 4dd2347f623..df92f8011a6 100644 --- a/include/d/meter/d_meter2.h +++ b/include/d/meter/d_meter2.h @@ -5,13 +5,9 @@ #include "d/com/d_com_inf_game.h" #include "d/meter/d_meter2_draw.h" #include "d/meter/d_meter_map.h" +#include "d/msg/d_msg_class.h" #include "dolphin/types.h" -class msg_class { -public: - /* 0x0 */ u8 field_0x0[0x100]; -}; - class dMeterMap_c; class dMeter2_c : public msg_class { diff --git a/include/d/meter/d_meter2_info.h b/include/d/meter/d_meter2_info.h index 49bb7bcf69d..1744f32bee6 100644 --- a/include/d/meter/d_meter2_info.h +++ b/include/d/meter/d_meter2_info.h @@ -112,6 +112,7 @@ public: } u8& getDirectUseItem() { return mDirectUseItem; } dMeterMap_c* getMeterMapClass() { return mMeterMap; } + void setMenuWindowClass(dMw_c* p_menu) { mMenuWindowClass = p_menu; } dMw_c* getMenuWindowClass() { return mMenuWindowClass; } void offUseButton(int pButton) { mUseButton &= ~(u16)pButton; } u16 getOilGaugeBackUp() { return mOilGaugeBackUp; } @@ -134,6 +135,10 @@ public: bool isGameStatus(int status) { return mGameStatus & status; } void setMapKeyDirection(u16 direction) { mMapKeyDirection = direction; } bool isSub2DStatus(int flag) { return mSub2DStatus & (1 << flag); } + void offMenuInForce(int flag) { unk152 &= ~(1 << flag); } + bool isMenuInForce(int flag) { return unk152 & (1 << flag); } + u16 getMapKeyDirection() { return mMapKeyDirection; } + u8 getWindowStatus() { return mWindowStatus; } public: /* 0x04 */ u8 unk4[4]; @@ -222,6 +227,7 @@ extern dMeter2Info_c g_meter2_info; void dMeter2Info_setSword(u8, bool); void dMeter2Info_set2DVibration(); +void dMeter2Info_set2DVibrationM(); inline void dMeter2Info_Initialize() { g_meter2_info.init(); @@ -339,4 +345,28 @@ inline bool dMeter2Info_isSub2DStatus(int flag) { return g_meter2_info.isSub2DStatus(flag); } +inline void dMeter2Info_offMenuInForce(int flag) { + g_meter2_info.offMenuInForce(flag); +} + +inline bool dMeter2Info_isMenuInForce(int flag) { + return g_meter2_info.isMenuInForce(flag); +} + +inline void dMeter2Info_setMenuWindowClass(dMw_c* p_menu) { + g_meter2_info.setMenuWindowClass(p_menu); +} + +inline void dMeter2Info_resetWarpStatus() { + g_meter2_info.resetWarpStatus(); +} + +inline u16 dMeter2Info_getMapKeyDirection() { + return g_meter2_info.getMapKeyDirection(); +} + +inline u8 dMeter2Info_getWindowStatus() { + return g_meter2_info.getWindowStatus(); +} + #endif /* D_METER_D_METER2_INFO_H */ diff --git a/include/d/msg/d_msg_class.h b/include/d/msg/d_msg_class.h index e02712887a0..68a1fa3881a 100644 --- a/include/d/msg/d_msg_class.h +++ b/include/d/msg/d_msg_class.h @@ -3,4 +3,9 @@ #include "dolphin/types.h" +class msg_class { +public: + /* 0x0 */ u8 field_0x0[0x100]; +}; + #endif /* D_MSG_D_MSG_CLASS_H */ diff --git a/include/f_op/f_op_msg_mng.h b/include/f_op/f_op_msg_mng.h index f97e09759d9..46f6764fbc8 100644 --- a/include/f_op/f_op_msg_mng.h +++ b/include/f_op/f_op_msg_mng.h @@ -7,5 +7,6 @@ typedef int (*fopMsgCreateFunc)(void*); JKRExpHeap* fopMsgM_createExpHeap(u32, JKRHeap*); +void fopMsgM_setStageLayer(void*); #endif \ No newline at end of file diff --git a/include/m_Do/m_Do_ext.h b/include/m_Do/m_Do_ext.h index 25aa4981243..3755eddd107 100644 --- a/include/m_Do/m_Do_ext.h +++ b/include/m_Do/m_Do_ext.h @@ -176,6 +176,7 @@ JKRSolidHeap* mDoExt_createSolidHeapToCurrent(u32, JKRHeap*, u32); JKRSolidHeap* mDoExt_createSolidHeapFromGameToCurrent(u32, u32); JKRSolidHeap* mDoExt_createSolidHeapFromGameToCurrent(JKRHeap**, u32, u32); JKRHeap* mDoExt_getCurrentHeap(); +void mDoExt_removeMesgFont(); extern JKRExpHeap* zeldaHeap; extern JKRExpHeap* gameHeap; diff --git a/include/m_Do/m_Do_graphic.h b/include/m_Do/m_Do_graphic.h index ec686f07b08..c7e5aaa77de 100644 --- a/include/m_Do/m_Do_graphic.h +++ b/include/m_Do/m_Do_graphic.h @@ -1,8 +1,49 @@ #ifndef M_DO_M_DO_GRAPHIC_H #define M_DO_M_DO_GRAPHIC_H +#include "dolphin/gx/GX.h" +#include "JSystem/JUtility/JUTFader.h" +#include "JSystem/JFramework/JFWDisplay.h" #include "dolphin/types.h" void mDoGph_Create(); +class mDoGph_gInf_c { +public: + class bloom_c { + public: + /* 80009544 */ void create(); + /* 800095F8 */ void remove(); + /* 80009650 */ void draw(); + }; + + /* 80007E44 */ void create(); + /* 80007F90 */ void beginRender(); + /* 800080D0 */ void fadeOut(f32); + /* 80007FD8 */ void fadeOut(f32, _GXColor&); + /* 80008028 */ void fadeOut_f(f32, _GXColor&); + /* 800080A0 */ void onBlure(f32 const (*)[4]); + /* 80008078 */ void onBlure(); + /* 80008330 */ void calcFade(); + + static JUTFader* getFader() { return mFader; } + static int startFadeOut(int param_0) { return JFWDisplay::getManager()->startFadeOut(param_0); } + static int startFadeIn(int param_0) { return JFWDisplay::getManager()->startFadeIn(param_0); } + static void setFadeColor(JUtility::TColor color) { mFader->setColor(color); } + + static u8 mFrameBufferTexObj[32]; + static u8 mZbufferTexObj[32]; + static u8 m_bloom[20]; + static u8 mBlureMtx[48 + 4 /* padding */]; + static u8 mBackColor[4]; + static u8 mFadeColor[4]; + static JUTFader* mFader; + static u8 mFrameBufferTimg[4]; + static u8 mFrameBufferTex[4]; + static u8 mZbufferTimg[4]; + static u8 mZbufferTex[4]; + static f32 mFadeRate; + static f32 mFadeSpeed; +}; + #endif /* M_DO_M_DO_GRAPHIC_H */ diff --git a/libs/JSystem/JFramework/JFWDisplay.cpp b/libs/JSystem/JFramework/JFWDisplay.cpp index 3620e4afe05..d3b04a2376e 100644 --- a/libs/JSystem/JFramework/JFWDisplay.cpp +++ b/libs/JSystem/JFramework/JFWDisplay.cpp @@ -12,36 +12,8 @@ // Types: // -struct _GXRenderModeObj {}; - -struct _GXColor {}; - -struct OSContext {}; - struct OSAlarm {}; -struct JKRHeap {}; - -struct JUTXfb { - struct EXfbNumber {}; - - /* 802E53B8 */ void createManager(JKRHeap*, JUTXfb::EXfbNumber); - /* 802E5424 */ void destroyManager(); - - static u8 sManager[4 + 4 /* padding */]; -}; - -struct JUTVideo { - /* 802E5088 */ void drawDoneStart(); - /* 802E50B0 */ void dummyNoDrawWait(); - /* 802E5198 */ void setRenderMode(_GXRenderModeObj const*); - /* 802E5210 */ void waitRetraceIfNeed(); - - static u8 sManager[4]; - static u8 sVideoLastTick[4]; - static u8 sVideoInterval[4]; -}; - struct JUTProcBar { /* 802E59E0 */ void create(); /* 802E5A28 */ void destroy(); @@ -51,10 +23,6 @@ struct JUTProcBar { static u8 sManager[4]; }; -struct JUTFader { - /* 802E55DC */ void control(); -}; - struct JUTDirectPrint { /* 802E456C */ void changeFrameBuffer(void*, u16, u16); @@ -78,51 +46,6 @@ struct JUTAssertion { /* 802E4A54 */ void flushMessage_dbPrint(); }; -struct JSUPtrLink { - /* 802DBDFC */ JSUPtrLink(void*); - /* 802DBE14 */ ~JSUPtrLink(); -}; - -struct JSUPtrList { - /* 802DBE74 */ JSUPtrList(bool); - /* 802DBEAC */ ~JSUPtrList(); - /* 802DBF4C */ void append(JSUPtrLink*); - /* 802DC15C */ void remove(JSUPtrLink*); -}; - -template -struct JSUList {}; -/* JSUList */ -struct JSUList__template0 { - /* 80273724 */ void func_80273724(void* _this); -}; - -struct JFWDisplay { - /* 80272040 */ void ctor_subroutine(bool); - /* 802720F8 */ JFWDisplay(JKRHeap*, JUTXfb::EXfbNumber, bool); - /* 80272160 */ ~JFWDisplay(); - /* 802721DC */ void createManager(_GXRenderModeObj const*, JKRHeap*, JUTXfb::EXfbNumber, bool); - /* 802722B8 */ void prepareCopyDisp(); - /* 802723AC */ void drawendXfb_single(); - /* 802723F4 */ void exchangeXfb_double(); - /* 802724FC */ void exchangeXfb_triple(); - /* 80272574 */ void copyXfb_triple(); - /* 802725F8 */ void preGX(); - /* 8027268C */ void endGX(); - /* 80272798 */ void beginRender(); - /* 80272A04 */ void endRender(); - /* 80272AB0 */ void endFrame(); - /* 80272C60 */ void waitBlanking(int); - /* 80272E10 */ void threadSleep(s64); - /* 80272EB8 */ void clearEfb_init(); - /* 80272F9C */ void clearEfb(int, int, int, int, _GXColor); - /* 80272F2C */ void clearEfb(); - /* 80272F58 */ void clearEfb(_GXColor); - /* 8027331C */ void calcCombinationRatio(); - - static u8 sManager[4]; -}; - struct JFWAlarm { static u8 sList[12]; }; @@ -173,7 +96,6 @@ extern "C" u8 sManager__10JFWDisplay[4]; // External References: // -extern "C" void OSReport(); extern "C" void* __nw__FUl(); extern "C" void __dl__FPv(); extern "C" void __ct__10JSUPtrLinkFPv(); @@ -203,71 +125,29 @@ extern "C" void setPort__13J2DOrthoGraphFv(); extern "C" void OSCreateAlarm(); extern "C" void OSSetAlarm(); extern "C" void OSCancelAlarm(); -extern "C" void OSDisableInterrupts(); -extern "C" void OSRestoreInterrupts(); -extern "C" void OSReceiveMessage(); -extern "C" void OSGetCurrentThread(); -extern "C" void OSResumeThread(); -extern "C" void OSSuspendThread(); -extern "C" void OSGetTime(); -extern "C" void OSGetTick(); extern "C" void VIFlush(); -extern "C" void VIGetRetraceCount(); extern "C" void GXInit(); extern "C" void GXGetGPStatus(); extern "C" void GXGetFifoBase(); extern "C" void GXGetFifoSize(); extern "C" void GXGetCPUFifo(); -extern "C" void GXSetVtxDesc(); extern "C" void GXClearVtxDesc(); -extern "C" void GXSetVtxAttrFmt(); extern "C" void GXInvalidateVtxCache(); -extern "C" void GXSetTexCoordGen2(); -extern "C" void GXSetNumTexGens(); extern "C" void GXFlush(); extern "C" void GXAbortFrame(); extern "C" void GXSetDrawDone(); extern "C" void GXDrawDone(); extern "C" void GXPixModeSync(); -extern "C" void GXBegin(); -extern "C" void GXSetCullMode(); extern "C" void GXSetDispCopySrc(); extern "C" void GXSetDispCopyDst(); extern "C" void GXSetCopyClamp(); -extern "C" void GXGetNumXfbLines(); -extern "C" void GXGetYScaleFactor(); extern "C" void GXSetDispCopyYScale(); extern "C" void GXSetCopyClear(); -extern "C" void GXSetCopyFilter(); extern "C" void GXSetDispCopyGamma(); extern "C" void GXCopyDisp(); -extern "C" void GXSetNumChans(); -extern "C" void GXSetChanCtrl(); -extern "C" void GXInitTexObj(); -extern "C" void GXInitTexObjLOD(); -extern "C" void GXLoadTexObj(); extern "C" void GXInvalidateTexAll(); -extern "C" void GXSetTevColorIn(); -extern "C" void GXSetTevAlphaIn(); -extern "C" void GXSetTevColorOp(); -extern "C" void GXSetTevAlphaOp(); -extern "C" void GXSetTevColor(); -extern "C" void GXSetAlphaCompare(); -extern "C" void GXSetZTexture(); -extern "C" void GXSetTevOrder(); -extern "C" void GXSetNumTevStages(); -extern "C" void GXSetBlendMode(); -extern "C" void GXSetAlphaUpdate(); -extern "C" void GXSetZMode(); -extern "C" void GXSetZCompLoc(); extern "C" void GXSetPixelFmt(); -extern "C" void GXSetDither(); extern "C" void GXSetDstAlpha(); -extern "C" void GXSetProjection(); -extern "C" void GXLoadPosMtxImm(); -extern "C" void GXSetCurrentMtx(); -extern "C" void GXSetViewport(); -extern "C" void GXSetScissor(); extern "C" void GXReadXfRasMetric(); extern "C" void __register_global_object(); extern "C" void _savegpr_24(); @@ -425,7 +305,7 @@ asm JFWDisplay::~JFWDisplay() { /* ############################################################################################## */ /* 804511C0-804511C4 0006C0 0004+00 2/2 40/40 1/1 .sbss sManager__10JFWDisplay */ -u8 JFWDisplay::sManager[4]; +JFWDisplay* JFWDisplay::sManager; /* 802721DC-80272260 26CB1C 0084+00 0/0 1/1 0/0 .text * createManager__10JFWDisplayFPC16_GXRenderModeObjP7JKRHeapQ26JUTXfb10EXfbNumberb */ @@ -540,7 +420,8 @@ asm void JFWDisplay::endGX() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void JFWDisplay::beginRender() { +// asm void JFWDisplay::beginRender() { +extern "C" asm void beginRender__10JFWDisplayFv() { nofralloc #include "asm/JSystem/JFramework/JFWDisplay/beginRender__10JFWDisplayFv.s" } diff --git a/src/d/com/d_com_inf_game.cpp b/src/d/com/d_com_inf_game.cpp index b98fe060740..7358966282d 100644 --- a/src/d/com/d_com_inf_game.cpp +++ b/src/d/com/d_com_inf_game.cpp @@ -16,10 +16,6 @@ struct scene_class {}; -struct mDoGph_gInf_c { - static u8 mFader[4]; -}; - struct dSmplMdl_draw_c { /* 80048CB4 */ dSmplMdl_draw_c(); /* 80048E0C */ void draw(); @@ -1360,7 +1356,7 @@ SECTION_SDATA extern u8 g_clearColor[4] = { }; /* 80450604-80450608 000084 0004+00 1/1 10/10 15/15 .sdata g_blackColor */ -SECTION_SDATA extern u32 g_blackColor = 0x000000FF; +SECTION_SDATA extern GXColor g_blackColor = { 0, 0, 0, 255 }; /* 8002CC54-8002CD44 027594 00F0+00 1/1 1/1 0/0 .text dComIfG_changeOpeningScene__FP11scene_classs */ diff --git a/src/d/d_resorce.cpp b/src/d/d_resorce.cpp index 1f1222830f6..d735f1a7ec1 100644 --- a/src/d/d_resorce.cpp +++ b/src/d/d_resorce.cpp @@ -26,11 +26,6 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct mDoGph_gInf_c { - static u8 mFrameBufferTimg[4]; - static u8 mZbufferTimg[4]; -}; - struct dBgWKCol { /* 8007E7D0 */ void initKCollision(void*); }; diff --git a/src/d/d_select_cursor.cpp b/src/d/d_select_cursor.cpp index ab48d311f68..fb6da31781f 100644 --- a/src/d/d_select_cursor.cpp +++ b/src/d/d_select_cursor.cpp @@ -11,79 +11,10 @@ // Types: // -struct J2DPane {}; - -struct dSelect_icon_c { - /* 80195A3C */ void animation(); - /* 80195B40 */ void setAlpha(u8); - /* 80195B70 */ void setPos(J2DPane*, f32, f32); -}; - -struct J2DAnmTransformKey { - /* 801959C0 */ ~J2DAnmTransformKey(); -}; - -struct J2DAnmTextureSRTKey {}; - -struct JKRArchive {}; - -struct J2DAnmColor {}; - -struct dSelect_cursor_c { - /* 80194220 */ dSelect_cursor_c(u8, f32, JKRArchive*); - /* 801949EC */ ~dSelect_cursor_c(); - /* 80194C30 */ void draw(); - /* 80194CC0 */ void update(); - /* 801950F4 */ void setPos(f32, f32, J2DPane*, bool); - /* 801951B0 */ void setParam(f32, f32, f32, f32, f32); - /* 801951C8 */ void setScale(f32); - /* 801952A0 */ void setAlphaRate(f32); - /* 80195330 */ void addAlpha(); - /* 801953CC */ void decAlpha(); - /* 80195460 */ void setBpkAnimation(J2DAnmColor*); - /* 801955F0 */ void setBtk0Animation(J2DAnmTextureSRTKey*); - /* 80195724 */ void setCursorAnimation(); - /* 801958E0 */ void setBckAnimation(J2DAnmTransformKey*); - /* 80195940 */ void moveCenter(J2DPane*, f32, f32); -}; - -struct dSelect_cursorHIO_c { - /* 801941E4 */ dSelect_cursorHIO_c(); - /* 80195978 */ ~dSelect_cursorHIO_c(); -}; - -struct JKRFileLoader { - /* 802D4270 */ void getGlbResource(char const*, JKRFileLoader*); -}; - -struct JKRExpHeap {}; - -struct J2DGrafContext {}; - -struct J2DScreen { - /* 802F8498 */ J2DScreen(); - /* 802F8648 */ void setPriority(char const*, u32, JKRArchive*); - /* 802F8ED4 */ void draw(f32, f32, J2DGrafContext const*); - /* 802F9690 */ void animation(); -}; - struct J2DAnmLoaderDataBase { /* 80308A6C */ void load(void const*); }; -struct CPaneMgrAlpha { - /* 802555C8 */ void show(); - /* 80255608 */ void hide(); - /* 8025564C */ void isVisible(); - /* 802557D0 */ void setAlphaRate(f32); - /* 80255828 */ void getAlphaRate(); -}; - -struct CPaneMgr { - /* 80253984 */ CPaneMgr(J2DScreen*, u64, u8, JKRExpHeap*); - /* 80254EBC */ void getGlobalVtxCenter(J2DPane*, bool, s16); -}; - // // Forward References: // @@ -322,7 +253,8 @@ asm dSelect_cursor_c::~dSelect_cursor_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dSelect_cursor_c::draw() { +// asm void dSelect_cursor_c::draw() { +extern "C" asm void draw__16dSelect_cursor_cFv() { nofralloc #include "asm/d/d_select_cursor/draw__16dSelect_cursor_cFv.s" } @@ -513,7 +445,8 @@ asm dSelect_cursorHIO_c::~dSelect_cursorHIO_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J2DAnmTransformKey::~J2DAnmTransformKey() { +// asm J2DAnmTransformKey::~J2DAnmTransformKey() { +extern "C" asm void __dt__18J2DAnmTransformKeyFv() { nofralloc #include "asm/d/d_select_cursor/__dt__18J2DAnmTransformKeyFv.s" } diff --git a/src/d/event/d_event.cpp b/src/d/event/d_event.cpp index a6fc85fd473..bd2455821b8 100644 --- a/src/d/event/d_event.cpp +++ b/src/d/event/d_event.cpp @@ -14,10 +14,6 @@ // Types: // -struct mDoGph_gInf_c { - /* 800080D0 */ void fadeOut(f32); -}; - struct dDemo_c { /* 80039CF8 */ void end(); diff --git a/src/d/event/d_event_data.cpp b/src/d/event/d_event_data.cpp index 98c0831c874..ddb63cb9abc 100644 --- a/src/d/event/d_event_data.cpp +++ b/src/d/event/d_event_data.cpp @@ -12,13 +12,6 @@ // Types: // -struct mDoGph_gInf_c { - /* 80007FD8 */ void fadeOut(f32, _GXColor&); - /* 800080D0 */ void fadeOut(f32); - - static f32 mFadeRate; -}; - struct dDemo_c { /* 80039B6C */ void start(u8 const*, cXyz*, f32); /* 80039CF8 */ void end(); diff --git a/src/d/kankyo/d_kankyo.cpp b/src/d/kankyo/d_kankyo.cpp index 56fc46daa22..bc55d5987b1 100644 --- a/src/d/kankyo/d_kankyo.cpp +++ b/src/d/kankyo/d_kankyo.cpp @@ -19,14 +19,6 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct mDoGph_gInf_c { - struct bloom_c { - /* 80009544 */ void create(); - }; - - static u8 m_bloom[20]; -}; - struct color_RGB_class {}; struct Z2SeMgr { diff --git a/src/d/menu/d_menu_collect.cpp b/src/d/menu/d_menu_collect.cpp index d81aa008f54..64f0ac856b8 100644 --- a/src/d/menu/d_menu_collect.cpp +++ b/src/d/menu/d_menu_collect.cpp @@ -19,34 +19,6 @@ struct mDoGph_gInf_c { static u8 mFader[4]; }; -struct J3DMaterialTable {}; - -struct J3DModelData {}; - -struct J3DAnmTevRegKey { - /* 8032B87C */ void searchUpdateMaterialID(J3DModelData*); -}; - -struct mDoExt_brkAnm { - /* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16); - /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); -}; - -struct J3DAnmTransform {}; - -struct mDoExt_bckAnm { - /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); - /* 8000D9CC */ void entry(J3DModelData*, f32); -}; - -struct mDoExt_baseAnm { - /* 8000D428 */ void play(); -}; - -struct cXyz { - static f32 Zero[3]; -}; - struct daAlink_c { /* 80140064 */ void setShieldChange(); /* 801406A8 */ void initStatusWindow(); @@ -76,24 +48,6 @@ struct dSv_event_c { /* 800349BC */ void isEventBit(u16) const; }; -struct J2DPane {}; - -struct JKRArchive {}; - -struct dSelect_cursor_c { - /* 80194220 */ dSelect_cursor_c(u8, f32, JKRArchive*); - /* 801950F4 */ void setPos(f32, f32, J2DPane*, bool); - /* 801951B0 */ void setParam(f32, f32, f32, f32, f32); - /* 801952A0 */ void setAlphaRate(f32); -}; - -struct dKy_tevstr_c {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - struct dMsgString_c { /* 80249C20 */ dMsgString_c(); /* 80249D28 */ ~dMsgString_c(); @@ -120,25 +74,6 @@ struct dMenu_save_c { /* 801F69B8 */ void _draw(); }; -struct STControl { - /* 8003219C */ void checkTrigger(); - /* 8003242C */ void checkLeftTrigger(); - /* 800324A8 */ void checkRightTrigger(); - /* 80032524 */ void checkUpTrigger(); - /* 800325A0 */ void checkDownTrigger(); -}; - -struct CSTControl {}; - -struct JKRHeap { - /* 802CE5CC */ void freeAll(); - /* 802CE784 */ void getTotalFreeSize(); -}; - -struct JKRExpHeap { - /* 802CEE2C */ void create(u32, JKRHeap*, bool); -}; - struct dMenu_Skill_c { /* 801F7224 */ dMenu_Skill_c(JKRExpHeap*, STControl*, CSTControl*); /* 801F7718 */ void _move(); @@ -182,133 +117,8 @@ struct dMenu_Fishing_c { /* 801C5470 */ void _close(); }; -struct dMenu_Collect_c { - /* 801B78C0 */ dMenu_Collect_c(JKRExpHeap*, STControl*, CSTControl*); - /* 801B795C */ ~dMenu_Collect_c(); - /* 801B7A0C */ void _create(); - /* 801B7A44 */ void _delete(); - /* 801B7A7C */ void _move(); - /* 801B7AC0 */ void draw(); -}; - -struct J2DAnmTextureSRTKey {}; - -struct dMenu_Collect2D_c { - /* 801AFD48 */ dMenu_Collect2D_c(JKRExpHeap*, STControl*, CSTControl*); - /* 801AFE34 */ ~dMenu_Collect2D_c(); - /* 801AFEA4 */ void _create(); - /* 801B0100 */ void _delete(); - /* 801B0570 */ void initialize(); - /* 801B05A8 */ void isFishIconVisible(); - /* 801B061C */ void isSkillIconVisible(); - /* 801B071C */ void isInsectIconVisible(); - /* 801B074C */ void screenSet(); - /* 801B1C3C */ void animationSet(); - /* 801B1CE0 */ void btkAnimeLoop0(J2DAnmTextureSRTKey*); - /* 801B1EDC */ void setBackAlpha(); - /* 801B1FAC */ void cursorMove(); - /* 801B27EC */ void cursorPosSet(); - /* 801B2A74 */ void changeSword(); - /* 801B2D00 */ void changeShield(); - /* 801B2EE4 */ void changeClothe(); - /* 801B30C8 */ void setArrowMaxNum(u8); - /* 801B3340 */ void setWalletMaxNum(u16); - /* 801B3524 */ void setSmellType(); - /* 801B3640 */ void setHeartPiece(); - /* 801B370C */ void setPohMaxNum(u8); - /* 801B39D0 */ void setEquipItemFrameColorSword(int); - /* 801B3CF4 */ void setEquipItemFrameColorShield(int); - /* 801B3FDC */ void setEquipItemFrameColorClothes(int); - /* 801B42D8 */ void setHIO(bool); - /* 801B46FC */ void getItemTag(int, int, bool); - /* 801B473C */ void wait_init(); - /* 801B48D0 */ void wait_proc(); - /* 801B4E14 */ void save_open_init(); - /* 801B4EC0 */ void save_open_proc(); - /* 801B4F30 */ void save_move_init(); - /* 801B4F6C */ void save_move_proc(); - /* 801B4FDC */ void save_close_init(); - /* 801B5018 */ void save_close_proc(); - /* 801B5094 */ void option_open_init(); - /* 801B513C */ void option_open_proc(); - /* 801B51AC */ void option_move_init(); - /* 801B51E8 */ void option_move_proc(); - /* 801B5258 */ void option_close_init(); - /* 801B5294 */ void option_close_proc(); - /* 801B5310 */ void letter_open_init(); - /* 801B53AC */ void letter_open_proc(); - /* 801B541C */ void letter_move_init(); - /* 801B5458 */ void letter_move_proc(); - /* 801B54C8 */ void letter_close_init(); - /* 801B5504 */ void letter_close_proc(); - /* 801B5580 */ void fishing_open_init(); - /* 801B561C */ void fishing_open_proc(); - /* 801B568C */ void fishing_move_init(); - /* 801B56C8 */ void fishing_move_proc(); - /* 801B5738 */ void fishing_close_init(); - /* 801B5774 */ void fishing_close_proc(); - /* 801B57F0 */ void skill_open_init(); - /* 801B588C */ void skill_open_proc(); - /* 801B58FC */ void skill_move_init(); - /* 801B5938 */ void skill_move_proc(); - /* 801B59A8 */ void skill_close_init(); - /* 801B59E4 */ void skill_close_proc(); - /* 801B5A60 */ void insect_open_init(); - /* 801B5B00 */ void insect_open_proc(); - /* 801B5B70 */ void insect_move_init(); - /* 801B5BAC */ void insect_move_proc(); - /* 801B5C1C */ void insect_close_init(); - /* 801B5C58 */ void insect_close_proc(); - /* 801B5CD4 */ void _move(); - /* 801B5D70 */ void _draw(); - /* 801B5F48 */ void drawTop(); - /* 801B5F84 */ void isKeyCheck(); - /* 801B5FAC */ bool isOutCheck(); - /* 801B5FB4 */ void setAButtonString(u16); - /* 801B60B8 */ void setBButtonString(u16); - /* 801B61BC */ void setItemNameString(u8, u8); - /* 801B6344 */ void setItemNameStringNull(); - /* 801B7F00 */ void draw(); -}; - -struct dMenu_Collect3D_c { - /* 801B6454 */ dMenu_Collect3D_c(JKRExpHeap*, dMenu_Collect2D_c*, CSTControl*); - /* 801B6538 */ ~dMenu_Collect3D_c(); - /* 801B65A8 */ void _create(); - /* 801B6694 */ void _delete(); - /* 801B66C8 */ void _move(u8, u8); - /* 801B696C */ void draw(); - /* 801B6A30 */ void setJ3D(char const*, char const*, char const*); - /* 801B6D30 */ void set_mtx(); - /* 801B6E70 */ void animePlay(); - /* 801B6FB0 */ void animeEntry(); - /* 801B7014 */ void createMaskModel(); - /* 801B71C4 */ void createMirrorModel(); - /* 801B7434 */ void getCrystalNum(); - /* 801B749C */ void getMirrorNum(); - /* 801B7504 */ void getMaskMdlVisible(); - /* 801B75E8 */ void setupItem3D(f32 (*)[4]); - /* 801B7660 */ void toItem3Dpos(f32, f32, f32, cXyz*); - /* 801B774C */ void calcViewMtx(f32 (*)[4]); - - static f32 mViewOffsetY[1 + 1 /* padding */]; -}; - -struct dMenu_Collect2DTop_c { - /* 801B77A4 */ void draw(); - /* 801B7EB8 */ ~dMenu_Collect2DTop_c(); -}; - -struct dDlst_base_c {}; - -struct dDlst_list_c { - /* 80056794 */ void set(dDlst_base_c**&, dDlst_base_c**&, dDlst_base_c*); -}; - struct JAISoundID {}; -struct Vec {}; - struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -317,20 +127,6 @@ struct Z2AudioMgr { static u8 mAudioMgrPtr[4 + 4 /* padding */]; }; -struct ResTIMG {}; - -struct JKRSolidHeap { - /* 802D0BF4 */ void adjustSize(); -}; - -struct JKRFileLoader { - /* 802D4270 */ void getGlbResource(char const*, JKRFileLoader*); -}; - -struct J3DVertexBuffer { - /* 80310FD8 */ void init(); -}; - struct J3DTexNoAnm { /* 8003B1F8 */ ~J3DTexNoAnm(); /* 8003B240 */ J3DTexNoAnm(); @@ -355,11 +151,6 @@ struct J3DModelLoaderDataBase { /* 803346BC */ void load(void const*, u32); }; -struct J3DModel { - /* 80327100 */ void initialize(); - /* 80327184 */ void entryModelData(J3DModelData*, u32, u32); -}; - struct J3DMaterialAnm { /* 8032C320 */ void initialize(); }; @@ -369,56 +160,16 @@ struct J3DMatColorAnm { /* 8003B2F4 */ J3DMatColorAnm(); }; -struct J3DLightObj { - /* 80018C0C */ J3DLightObj(); -}; - -struct J3DLightInfo { - /* 803256C4 */ void operator=(J3DLightInfo const&); -}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); -}; - struct J3DAnmLoaderDataBaseFlag {}; struct J3DAnmLoaderDataBase { /* 80337B40 */ void load(void const*, J3DAnmLoaderDataBaseFlag); }; -struct J2DTextBox { - /* 80300658 */ void getStringPtr() const; - /* 8030074C */ void setString(s16, char const*, ...); -}; - -struct J2DGrafContext {}; - -struct J2DScreen { - /* 802F8498 */ J2DScreen(); - /* 802F8648 */ void setPriority(char const*, u32, JKRArchive*); - /* 802F8ED4 */ void draw(f32, f32, J2DGrafContext const*); - /* 802F9690 */ void animation(); -}; - -struct J2DPicture { - /* 802FC708 */ J2DPicture(ResTIMG const*); -}; - struct J2DAnmLoaderDataBase { /* 80308A6C */ void load(void const*); }; -struct CPaneMgrAlpha { - /* 802557D0 */ void setAlphaRate(f32); -}; - -struct CPaneMgr { - /* 80253984 */ CPaneMgr(J2DScreen*, u64, u8, JKRExpHeap*); - /* 802545B0 */ void paneTrans(f32, f32); - /* 80254EBC */ void getGlobalVtxCenter(J2DPane*, bool, s16); -}; - // // Forward References: // @@ -663,13 +414,6 @@ extern "C" void searchUpdateMaterialID__15J3DAnmTevRegKeyFP12J3DModelData(); extern "C" void initialize__14J3DMaterialAnmFv(); extern "C" void load__22J3DModelLoaderDataBaseFPCvUl(); extern "C" void load__20J3DAnmLoaderDataBaseFPCv24J3DAnmLoaderDataBaseFlag(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXInverse(); -extern "C" void PSMTXTrans(); -extern "C" void PSMTXMultVec(); -extern "C" void C_MTXPerspective(); -extern "C" void GXSetProjection(); -extern "C" void GXSetViewport(); extern "C" void __construct_array(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_17(); @@ -687,8 +431,6 @@ extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); extern "C" void strcpy(); -extern "C" void tan(); -extern "C" extern u8 const j3dDefaultLightInfo[52]; extern "C" extern void* __vt__12J3DFrameCtrl[3]; extern "C" extern void* __vt__12dDlst_base_c[3]; extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; @@ -700,7 +442,6 @@ extern "C" extern u8 g_env_light[4880]; extern "C" extern u8 g_drawHIO[3880]; extern "C" extern u8 g_meter2_info[248]; extern "C" f32 Zero__4cXyz[3]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 mFader__13mDoGph_gInf_c[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; @@ -2209,7 +1950,7 @@ asm void dMenu_Collect2D_c::drawTop() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMenu_Collect2D_c::isKeyCheck() { +asm bool dMenu_Collect2D_c::isKeyCheck() { nofralloc #include "asm/d/menu/d_menu_collect/isKeyCheck__17dMenu_Collect2D_cFv.s" } @@ -2299,7 +2040,8 @@ asm dMenu_Collect3D_c::dMenu_Collect3D_c(JKRExpHeap* param_0, dMenu_Collect2D_c* #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dMenu_Collect3D_c::~dMenu_Collect3D_c() { +// asm dMenu_Collect3D_c::~dMenu_Collect3D_c() { +extern "C" asm void __dt__17dMenu_Collect3D_cFv() { nofralloc #include "asm/d/menu/d_menu_collect/__dt__17dMenu_Collect3D_cFv.s" } @@ -2563,11 +2305,7 @@ asm void dMenu_Collect3D_c::getMaskMdlVisible() { /* ############################################################################################## */ /* 80450720-80450728 0001A0 0004+04 1/1 0/0 1/1 .sdata mViewOffsetY__17dMenu_Collect3D_c */ -SECTION_SDATA f32 dMenu_Collect3D_c::mViewOffsetY[1 + 1 /* padding */] = { - -100.0f, - /* padding */ - 0.0f, -}; +SECTION_SDATA f32 dMenu_Collect3D_c::mViewOffsetY = -100.0f; /* 80453FC4-80453FC8 0025C4 0004+00 3/3 0/0 0/0 .sdata2 @7944 */ SECTION_SDATA2 static f32 lit_7944 = 608.0f; @@ -2630,7 +2368,8 @@ asm void dMenu_Collect3D_c::calcViewMtx(f32 (*param_0)[4]) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMenu_Collect2DTop_c::draw() { +// asm void dMenu_Collect2DTop_c::draw() { +extern "C" asm void draw__20dMenu_Collect2DTop_cFv() { nofralloc #include "asm/d/menu/d_menu_collect/draw__20dMenu_Collect2DTop_cFv.s" } @@ -2651,7 +2390,8 @@ asm dMenu_Collect_c::dMenu_Collect_c(JKRExpHeap* param_0, STControl* param_1, CS #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dMenu_Collect_c::~dMenu_Collect_c() { +// asm dMenu_Collect_c::~dMenu_Collect_c() { +extern "C" asm void __dt__15dMenu_Collect_cFv() { nofralloc #include "asm/d/menu/d_menu_collect/__dt__15dMenu_Collect_cFv.s" } @@ -2726,7 +2466,8 @@ asm dMenu_Collect2DTop_c::~dMenu_Collect2DTop_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMenu_Collect2D_c::draw() { +// asm void dMenu_Collect2D_c::draw() { +extern "C" asm void draw__17dMenu_Collect2D_cFv() { nofralloc #include "asm/d/menu/d_menu_collect/draw__17dMenu_Collect2D_cFv.s" } diff --git a/src/d/menu/d_menu_dmap.cpp b/src/d/menu/d_menu_dmap.cpp index 7aecff476fb..231777b8272 100644 --- a/src/d/menu/d_menu_dmap.cpp +++ b/src/d/menu/d_menu_dmap.cpp @@ -16,13 +16,6 @@ struct renderingDmap_c { /* 801C051C */ renderingDmap_c(); }; -struct JKRHeap { - /* 802CE4D4 */ void alloc(u32, int); - /* 802CE548 */ void free(void*); - /* 802CE72C */ void getFreeSize(); - /* 802CE784 */ void getTotalFreeSize(); -}; - struct mDoDvdThd_mountArchive_c { /* 80015E14 */ void create(char const*, u8, JKRHeap*); }; @@ -50,22 +43,6 @@ struct dSv_event_c { /* 800349BC */ void isEventBit(u16) const; }; -struct J2DBasePosition {}; - -struct J2DPane { - /* 802F7100 */ void getBounds(); - /* 802F76F8 */ void setBasePosition(J2DBasePosition); -}; - -struct JKRArchive {}; - -struct dSelect_cursor_c { - /* 80194220 */ dSelect_cursor_c(u8, f32, JKRArchive*); - /* 801950F4 */ void setPos(f32, f32, J2DPane*, bool); - /* 801951B0 */ void setParam(f32, f32, f32, f32, f32); - /* 801952A0 */ void setAlphaRate(f32); -}; - struct dMsgString_c { /* 80249C20 */ dMsgString_c(); /* 80249D28 */ ~dMsgString_c(); @@ -95,8 +72,6 @@ struct dMeterHaihai_c { /* 8020BC20 */ void setScale(f32); }; -struct ResTIMG {}; - struct J2DPicture { /* 801BDD40 */ void append(ResTIMG const*, f32); /* 801BDD70 */ void insert(ResTIMG const*, u8, f32); @@ -140,21 +115,6 @@ struct dMenu_StageMapCtrl_c { /* 801C2590 */ void setPlusZoomCenterZ(f32); }; -struct STControl { - /* 80032044 */ STControl(s16, s16, s16, s16, f32, f32, s16, s16); - /* 8003219C */ void checkTrigger(); - /* 8003242C */ void checkLeftTrigger(); - /* 800324A8 */ void checkRightTrigger(); - /* 80032524 */ void checkUpTrigger(); - /* 800325A0 */ void checkDownTrigger(); -}; - -struct J2DOrthoGraph {}; - -struct JKRExpHeap { - /* 802CEE2C */ void create(u32, JKRHeap*, bool); -}; - struct dMenu_ItemExplain_c { /* 801DA754 */ dMenu_ItemExplain_c(JKRExpHeap*, JKRArchive*, STControl*, bool); /* 801DB470 */ void move(); @@ -162,82 +122,6 @@ struct dMenu_ItemExplain_c { /* 801DC3C8 */ void openExplainDmap(u8, u8, u8, bool, u8); }; -struct CSTControl {}; - -struct JGeometry { - template - struct TBox2 {}; - /* TBox2 */ - struct TBox2__template0 {}; -}; - -struct J2DGrafContext { - /* 802E90C0 */ void scissor(JGeometry::TBox2 const&); -}; - -struct J2DScreen { - /* 802F8498 */ J2DScreen(); - /* 802F8648 */ void setPriority(char const*, u32, JKRArchive*); - /* 802F8ED4 */ void draw(f32, f32, J2DGrafContext const*); - /* 802F9690 */ void animation(); -}; - -struct dMenu_Dmap_c { - /* 801BB498 */ dMenu_Dmap_c(JKRExpHeap*, STControl*, CSTControl*, u8, u8); - /* 801BB634 */ void screenInit(); - /* 801BC788 */ void getPlayerIconPos(s8, f32); - /* 801BC848 */ void getIconPos(s8, f32); - /* 801BCDF4 */ ~dMenu_Dmap_c(); - /* 801BD1D4 */ void getCurFloorPos(); - /* 801BD1E8 */ void getDefaultCurFloorPos(); - /* 801BD208 */ void iconMoveCalc(); - /* 801BD3B8 */ void drawFloorScreenBack(J2DScreen*, f32, f32, J2DOrthoGraph*); - /* 801BD524 */ void drawFloorScreenTop(J2DScreen*, f32, f32, J2DOrthoGraph*); - /* 801BD690 */ void isMapMoveState(); - /* 801BD6C4 */ void floorChangeMode(); - /* 801BD7C0 */ void _create(); - /* 801BDDA4 */ void _move(); - /* 801BDEF8 */ void setMapTexture(); - /* 801BDF48 */ void mapBgAnime(); - /* 801BDF6C */ void mapControl(); - /* 801BE328 */ void isOpen(); - /* 801BE670 */ void isClose(); - /* 801BE7E0 */ void _draw(); - /* 801BEAFC */ void itemInfo_init_proc(); - /* 801BEB0C */ void itemInfo_proc(); - /* 801BEB44 */ void itemSelect(); - /* 801BEF28 */ void getNextItem(int); - /* 801BEFCC */ void itemSelectAnmInit(); - /* 801BF030 */ void itemSelectAnm(); - /* 801BF180 */ void itemInfoOpenAnm(); - /* 801BF18C */ void itemInfoWait(); - /* 801BF278 */ void itemInfoCloseAnm(); - /* 801BF334 */ void getNextStatus(); - /* 801BF410 */ void isSync(); - /* 801BF464 */ void isKeyCheck(); - /* 801BF4A4 */ void infoModeChange_init_proc(); - /* 801BF528 */ void infoModeChange_proc(); - /* 801BF688 */ void mapModeChange_init_proc(); - /* 801BF70C */ void mapModeChange_proc(); - /* 801BF8A0 */ void lv5_talk_init_proc(); - /* 801BF8F8 */ void lv5_talk_proc(); - /* 801BF9D4 */ void mapMode_init_proc(); - /* 801BF9E0 */ void mapMode_proc(); - /* 801BFA84 */ void floorSelect_init_proc(); - /* 801BFA88 */ void floorSelect_proc(); - /* 801BFC78 */ void itemCarryCheck(); - /* 801BFCAC */ void floorChange_init_proc(); - /* 801BFD5C */ void floorChange_proc(); - /* 801BFF84 */ void zoomWait_init_proc(); - /* 801BFF88 */ void zoomWait_proc(); - /* 801C008C */ void zoomIn_init_proc(); - /* 801C01A0 */ void zoomIn_proc(); - /* 801C023C */ void zoomOut_init_proc(); - /* 801C02F0 */ void zoomOut_proc(); - - static u8 myclass[4 + 4 /* padding */]; -}; - struct dMenu_DmapMap_c { /* 801C04AC */ ~dMenu_DmapMap_c(); }; @@ -285,16 +169,8 @@ struct dMenuMapCommon_c { /* 801C443C */ void clearIconInfo(); }; -struct dDlst_base_c {}; - -struct dDlst_list_c { - /* 80056794 */ void set(dDlst_base_c**&, dDlst_base_c**&, dDlst_base_c*); -}; - struct JAISoundID {}; -struct Vec {}; - struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); @@ -308,43 +184,10 @@ struct JMath { static u8 sincosTable_[65536]; }; -struct JKRFileLoader { - /* 802D4270 */ void getGlbResource(char const*, JKRFileLoader*); -}; - -struct J2DTextBox { - /* 80300658 */ void getStringPtr() const; - /* 8030074C */ void setString(s16, char const*, ...); -}; - struct J2DAnmLoaderDataBase { /* 80308A6C */ void load(void const*); }; -struct CPaneMgrAlphaMorf { - /* 80255C68 */ CPaneMgrAlphaMorf(J2DScreen*, u64, u8, JKRExpHeap*); - /* 80255DD0 */ void setBackupAlpha(); - /* 80255E28 */ void setAlphaMorfRate(f32); -}; - -struct CPaneMgrAlpha { - /* 802553FC */ CPaneMgrAlpha(J2DScreen*, u64, u8, JKRExpHeap*); - /* 802555C8 */ void show(); - /* 80255608 */ void hide(); - /* 802557D0 */ void setAlphaRate(f32); - /* 80255878 */ void alphaAnime(s16, u8, u8, u8); -}; - -struct CPaneMgr { - /* 80253984 */ CPaneMgr(J2DScreen*, u64, u8, JKRExpHeap*); - /* 80253930 */ CPaneMgr(); - /* 80253A18 */ ~CPaneMgr(); - /* 802545B0 */ void paneTrans(f32, f32); - /* 802547CC */ void scaleAnime(s16, f32, f32, u8); - /* 80254C90 */ void getGlobalVtx(J2DPane*, f32 (*)[3][4], u8, bool, s16); - /* 80254EBC */ void getGlobalVtxCenter(J2DPane*, bool, s16); -}; - // // Forward References: // @@ -562,7 +405,6 @@ extern "C" void __ct__10J2DPictureFPC7ResTIMG(); extern "C" void getStringPtr__10J2DTextBoxCFv(); extern "C" void setString__10J2DTextBoxFsPCce(); extern "C" void load__20J2DAnmLoaderDataBaseFPCv(); -extern "C" void GXGetScissor(); extern "C" void __destroy_arr(); extern "C" void __construct_array(); extern "C" void __ptmf_scall(); @@ -1773,7 +1615,8 @@ asm void dMenu_Dmap_c::getIconPos(s8 param_0, f32 param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dMenu_Dmap_c::~dMenu_Dmap_c() { +// asm dMenu_Dmap_c::~dMenu_Dmap_c() { +extern "C" asm void __dt__12dMenu_Dmap_cFv() { nofralloc #include "asm/d/menu/d_menu_dmap/__dt__12dMenu_Dmap_cFv.s" } @@ -1961,7 +1804,7 @@ SECTION_DEAD static char const* const pad_8039584B = "\0\0\0\0\0\0\0\0\0\0\0\0\0 #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMenu_Dmap_c::isOpen() { +asm bool dMenu_Dmap_c::isOpen() { nofralloc #include "asm/d/menu/d_menu_dmap/isOpen__12dMenu_Dmap_cFv.s" } @@ -1971,7 +1814,7 @@ asm void dMenu_Dmap_c::isOpen() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMenu_Dmap_c::isClose() { +asm bool dMenu_Dmap_c::isClose() { nofralloc #include "asm/d/menu/d_menu_dmap/isClose__12dMenu_Dmap_cFv.s" } @@ -2084,7 +1927,7 @@ asm void dMenu_Dmap_c::itemInfoCloseAnm() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMenu_Dmap_c::getNextStatus() { +asm u8 dMenu_Dmap_c::getNextStatus() { nofralloc #include "asm/d/menu/d_menu_dmap/getNextStatus__12dMenu_Dmap_cFv.s" } @@ -2094,7 +1937,7 @@ asm void dMenu_Dmap_c::getNextStatus() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMenu_Dmap_c::isSync() { +asm bool dMenu_Dmap_c::isSync() { nofralloc #include "asm/d/menu/d_menu_dmap/isSync__12dMenu_Dmap_cFv.s" } diff --git a/src/d/menu/d_menu_fishing.cpp b/src/d/menu/d_menu_fishing.cpp index 86a40dff3ea..4d87bb6f4e9 100644 --- a/src/d/menu/d_menu_fishing.cpp +++ b/src/d/menu/d_menu_fishing.cpp @@ -15,8 +15,6 @@ struct mDoGph_gInf_c { static u8 mFader[4]; }; -struct JKRHeap {}; - struct mDoDvdThd_mountArchive_c { /* 80015E14 */ void create(char const*, u8, JKRHeap*); }; @@ -36,66 +34,6 @@ struct dMeter2Info_c { /* 8021C544 */ void getStringKanji(u32, char*, JMSMesgEntry_c*); }; -struct STControl {}; - -struct CSTControl {}; - -struct JKRExpHeap {}; - -struct dMenu_Fishing_c { - /* 801C4D54 */ dMenu_Fishing_c(JKRExpHeap*, STControl*, CSTControl*); - /* 801C4D98 */ ~dMenu_Fishing_c(); - /* 801C504C */ void _create(); - /* 801C50B4 */ void _move(); - /* 801C514C */ void _draw(); - /* 801C5204 */ void isSync(); - /* 801C522C */ void init(); - /* 801C52E4 */ void _open(); - /* 801C5470 */ void _close(); - /* 801C556C */ void wait_init(); - /* 801C55A8 */ void wait_move(); - /* 801C55D8 */ void screenSetBase(); - /* 801C5D3C */ void screenSetDoIcon(); - /* 801C5EB8 */ void setAButtonString(u16); - /* 801C5F68 */ void setBButtonString(u16); - /* 801C6018 */ void getFigure(int); - /* 801C605C */ void setFishParam(int, u16, u8); - /* 801C6210 */ void setHIO(bool); - /* 801C659C */ void draw(); -}; - -struct ResTIMG {}; - -struct JKRArchive {}; - -struct J2DTextBox { - /* 80300658 */ void getStringPtr() const; - /* 8030074C */ void setString(s16, char const*, ...); -}; - -struct J2DGrafContext {}; - -struct J2DScreen { - /* 802F8498 */ J2DScreen(); - /* 802F8648 */ void setPriority(char const*, u32, JKRArchive*); - /* 802F8ED4 */ void draw(f32, f32, J2DGrafContext const*); -}; - -struct J2DPicture { - /* 802FC708 */ J2DPicture(ResTIMG const*); -}; - -struct CPaneMgrAlpha { - /* 802555C8 */ void show(); - /* 80255608 */ void hide(); - /* 802557D0 */ void setAlphaRate(f32); -}; - -struct CPaneMgr { - /* 80253984 */ CPaneMgr(J2DScreen*, u64, u8, JKRExpHeap*); - /* 802545B0 */ void paneTrans(f32, f32); -}; - // // Forward References: // @@ -292,7 +230,7 @@ asm void dMenu_Fishing_c::_draw() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMenu_Fishing_c::isSync() { +asm bool dMenu_Fishing_c::isSync() { nofralloc #include "asm/d/menu/d_menu_fishing/isSync__15dMenu_Fishing_cFv.s" } @@ -620,7 +558,8 @@ asm void dMenu_Fishing_c::setHIO(bool param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMenu_Fishing_c::draw() { +// asm void dMenu_Fishing_c::draw() { +extern "C" asm void draw__15dMenu_Fishing_cFv() { nofralloc #include "asm/d/menu/d_menu_fishing/draw__15dMenu_Fishing_cFv.s" } diff --git a/src/d/menu/d_menu_fmap.cpp b/src/d/menu/d_menu_fmap.cpp index ebcea3da31d..ac1db58a5ee 100644 --- a/src/d/menu/d_menu_fmap.cpp +++ b/src/d/menu/d_menu_fmap.cpp @@ -21,18 +21,10 @@ struct renderingFmap_c { int*); }; -struct JKRHeap { - /* 802CE4D4 */ void alloc(u32, int); - /* 802CE548 */ void free(void*); - /* 802CE784 */ void getTotalFreeSize(); -}; - struct mDoDvdThd_mountArchive_c { /* 80015E14 */ void create(char const*, u8, JKRHeap*); }; -struct fopAc_ac_c {}; - struct fmpTresTypeGroupDataList_c { /* 8003EB10 */ ~fmpTresTypeGroupDataList_c(); }; @@ -70,13 +62,6 @@ struct dMsgObject_c { /* 8023849C */ void setPortalMessageID(u16); }; -struct dMsgFlow_c { - /* 80249F00 */ dMsgFlow_c(); - /* 80249F48 */ ~dMsgFlow_c(); - /* 80249F90 */ void init(fopAc_ac_c*, int, int, fopAc_ac_c**); - /* 8024A2D8 */ void doFlow(fopAc_ac_c*, fopAc_ac_c**, int); -}; - struct dMf_HIO_c { /* 801C65F8 */ dMf_HIO_c(); /* 801CDA2C */ ~dMf_HIO_c(); @@ -88,8 +73,6 @@ struct dMeterMap_c { /* 8020D650 */ void isEnableDispMapAndMapDispSizeTypeNo(); }; -struct cXyz {}; - struct dMeter2Info_c { /* 8021CC0C */ void setWarpInfo(char const*, cXyz const&, s16, u8, u8, u8); }; @@ -100,141 +83,6 @@ struct dMenu_Fmap_world_data_c { struct dMenu_Fmap_stage_data_c {}; -struct STControl { - /* 8003219C */ void checkTrigger(); -}; - -struct CSTControl {}; - -struct JKRExpHeap { - /* 802CEE2C */ void create(u32, JKRHeap*, bool); -}; - -struct dMenu_Fmap_c { - /* 801C66E4 */ dMenu_Fmap_c(JKRExpHeap*, STControl*, CSTControl*, u8, u8, u8, f32, f32, u8); - /* 801C6AC8 */ ~dMenu_Fmap_c(); - /* 801C6D64 */ void _create(); - /* 801C74A4 */ void _delete(); - /* 801C74A8 */ void _move(); - /* 801C7650 */ void _draw(); - /* 801C77F0 */ void getNextStatus(u8*); - /* 801C7AFC */ void isSync(); - /* 801C7B24 */ void all_map_init(); - /* 801C7C2C */ void all_map_proc(); - /* 801C8230 */ void zoom_all_to_region_init(); - /* 801C8308 */ void zoom_all_to_region_proc(); - /* 801C83E0 */ void zoom_region_to_all_init(); - /* 801C8438 */ void zoom_region_to_all_proc(); - /* 801C8518 */ void region_map_init(); - /* 801C8600 */ void region_map_proc(); - /* 801C8B00 */ void to_portal_warp_map_init(); - /* 801C8B0C */ void to_portal_warp_map_proc(); - /* 801C8B48 */ void portal_warp_map_init(); - /* 801C8C0C */ void portal_warp_map_proc(); - /* 801C90A4 */ void portal_warp_select_init(); - /* 801C90A8 */ void portal_warp_select_proc(); - /* 801C91D8 */ void portal_warp_forbid_init(); - /* 801C9238 */ void portal_warp_forbid_proc(); - /* 801C92A4 */ void zoom_region_to_spot_init(); - /* 801C9304 */ void zoom_region_to_spot_proc(); - /* 801C93CC */ void zoom_spot_to_region_init(); - /* 801C9428 */ void zoom_spot_to_region_proc(); - /* 801C950C */ void spot_map_init(); - /* 801C9618 */ void spot_map_proc(); - /* 801C9A4C */ void portal_demo1_init(); - /* 801C9B64 */ void portal_demo1_move(); - /* 801C9C7C */ void portal_demo2_init(); - /* 801C9CC8 */ void portal_demo2_move(); - /* 801C9D60 */ void portal_demo3_init(); - /* 801C9DB4 */ void portal_demo3_move(); - /* 801C9EB8 */ void portal_demo4_init(); - /* 801C9F14 */ void portal_demo4_move(); - /* 801C9F7C */ void portal_demo5_init(); - /* 801C9FBC */ void portal_demo5_move(); - /* 801CA158 */ void portal_demo6_init(); - /* 801CA15C */ void portal_demo6_move(); - /* 801CA1E8 */ void yamiboss_demo1_init(); - /* 801CA2F4 */ void yamiboss_demo1_move(); - /* 801CA34C */ void yamiboss_demo2_init(); - /* 801CA35C */ void yamiboss_demo2_move(); - /* 801CA40C */ void yamiboss_demo3_init(); - /* 801CA410 */ void yamiboss_demo3_move(); - /* 801CA468 */ void yamiboss_demo4_init(); - /* 801CA4C0 */ void yamiboss_demo4_move(); - /* 801CA544 */ void yamiboss_demo5_init(); - /* 801CA548 */ void yamiboss_demo5_move(); - /* 801CA5CC */ void light_demo1_init(); - /* 801CA7A4 */ void light_demo1_move(); - /* 801CA7E0 */ void light_demo2_init(); - /* 801CA814 */ void light_demo2_move(); - /* 801CA874 */ void table_demo1_init(); - /* 801CA9B4 */ void table_demo1_move(); - /* 801CAA78 */ void table_demo2_init(); - /* 801CAABC */ void table_demo2_move(); - /* 801CAB88 */ void table_demo3_init(); - /* 801CABD0 */ void table_demo3_move(); - /* 801CAC30 */ void howl_demo1_init(); - /* 801CAC7C */ void howl_demo1_move(); - /* 801CAD48 */ void howl_demo2_init(); - /* 801CAD54 */ void howl_demo2_move(); - /* 801CAD9C */ void howl_demo3_init(); - /* 801CADA0 */ void howl_demo3_move(); - /* 801CADC4 */ void isOpen(); - /* 801CB038 */ void isClose(); - /* 801CB1DC */ void getProcess(); - /* 801CB200 */ void getRegionCursor(); - /* 801CB230 */ void getStageCursor(); - /* 801CB260 */ void getStageTransX(); - /* 801CB290 */ void getStageTransZ(); - /* 801CB2C0 */ void isRoomCheck(int, int); - /* 801CB570 */ void checkStRoomData(); - /* 801CB664 */ void talkButton(); - /* 801CB6D0 */ void setProcess(u8); - /* 801CB6E0 */ void setFlash(u8, bool); - /* 801CB770 */ void readWorldData(u8); - /* 801CB938 */ void readAreaData(u8, bool); - /* 801CBF04 */ void readRoomData(char const*, dMenu_Fmap_stage_data_c*, void*, int, u8); - /* 801CC094 */ void readFieldMapData(void**, char const*, bool, bool); - /* 801CC2B0 */ void decodeFieldMapData(); - /* 801CC4EC */ void decodePortalData(); - /* 801CC51C */ void readRoomDzsData(void**, u32, char const*); - /* 801CC61C */ void removeAreaData(); - /* 801CC7A8 */ void removeRoomData(dMenu_Fmap_stage_data_c*); - /* 801CC85C */ void setTitleName(u32); - /* 801CC880 */ void setAreaName(u32); - /* 801CC8AC */ void setAreaNameZero(); - /* 801CC8DC */ void portalWarpMapMove(STControl*); - /* 801CCA70 */ void onRoomDataBit(int); - /* 801CCA98 */ void isRoomDataBit(int); - /* 801CCAC4 */ void resetRoomDataBit(); - /* 801CCB08 */ void drawIcon(f32, bool); - /* 801CD10C */ void drawIcon(u8, int); - /* 801CCD98 */ void drawLightDropIcon(); - /* 801CCDDC */ void drawBatsumarkIcon(); - /* 801CCE04 */ void drawSnowmanIcon(); - /* 801CCE48 */ void drawGoldWolfIcon(); - /* 801CCE70 */ void drawCoachIcon(); - /* 801CCE98 */ void drawPlayEnterIcon(); - /* 801CCFB0 */ void checkDrawPortalIcon(int, int); - /* 801CD000 */ void searchIcon(u8, int, f32*, f32*); - /* 801CD210 */ void drawEnterIcon(); - /* 801CD254 */ void drawPortalIcon(); - /* 801CD2FC */ void getRegionStageNum(int); - /* 801CD350 */ void getNowFmapRegionData(); - /* 801CD368 */ void getNowFmapStageData(); - /* 801CD380 */ void searchPortalStageID(char*); - /* 801CD3F0 */ void drawDebugStage(); - /* 801CD460 */ void arrowPosInit(); - /* 801CD5CC */ void tableArrowPosInit(bool); - /* 801CD770 */ void yamibossArrowPosInit(); - /* 801CD814 */ void howlArrowPosInit(); - /* 801CD8B4 */ void getHowlRegionID(); - /* 801CD92C */ void isLightVesselGet(); - /* 801CD95C */ void getPlayerPos2D(); - - static u8 MyClass[4]; -}; - struct dMenu_FmapMap_c { /* 801CEC24 */ dMenu_FmapMap_c(); /* 801CEDE8 */ void _create(u16, u16, u16, u16, void*); @@ -243,8 +91,6 @@ struct dMenu_FmapMap_c { /* 801CF450 */ void setRendering(dMenu_Fmap_world_data_c*, int, f32, f32, f32, f32); }; -struct J2DAnmTextureSRTKey {}; - struct dMenu_Fmap2DTop_c { /* 801D5BD0 */ dMenu_Fmap2DTop_c(JKRExpHeap*, STControl*); /* 801D6A44 */ void _execute(); @@ -267,8 +113,6 @@ struct dMenu_Fmap2DTop_c { /* 801D8088 */ void isWarpAccept(); }; -struct ResTIMG {}; - struct dMenu_Fmap2DBack_c { /* 801CF56C */ dMenu_Fmap2DBack_c(); /* 801D0804 */ void setRegionTexData(u8, ResTIMG*, f32, f32, f32, f32, f32, f32, f32, f32, f32); @@ -322,16 +166,8 @@ struct dMapInfo_n { /* 8003F02C */ void getMapRestartPos(); }; -struct dDlst_base_c {}; - -struct dDlst_list_c { - /* 80056794 */ void set(dDlst_base_c**&, dDlst_base_c**&, dDlst_base_c*); -}; - struct JAISoundID {}; -struct Vec {}; - struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -340,10 +176,6 @@ struct Z2AudioMgr { static u8 mAudioMgrPtr[4 + 4 /* padding */]; }; -struct JKRArchive { - /* 801CC284 */ void getExpandedResSize(void const*) const; -}; - struct JKRAramArchive {}; // @@ -1429,7 +1261,8 @@ asm dMenu_Fmap_c::dMenu_Fmap_c(JKRExpHeap* param_0, STControl* param_1, CSTContr #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dMenu_Fmap_c::~dMenu_Fmap_c() { +// asm dMenu_Fmap_c::~dMenu_Fmap_c() { +extern "C" asm void __dt__12dMenu_Fmap_cFv() { nofralloc #include "asm/d/menu/d_menu_fmap/__dt__12dMenu_Fmap_cFv.s" } @@ -1502,7 +1335,7 @@ SECTION_SDATA2 static f32 lit_4541 = -1.0f; #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMenu_Fmap_c::getNextStatus(u8* param_0) { +asm u8 dMenu_Fmap_c::getNextStatus(u8* param_0) { nofralloc #include "asm/d/menu/d_menu_fmap/getNextStatus__12dMenu_Fmap_cFPUc.s" } @@ -1512,7 +1345,7 @@ asm void dMenu_Fmap_c::getNextStatus(u8* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMenu_Fmap_c::isSync() { +asm bool dMenu_Fmap_c::isSync() { nofralloc #include "asm/d/menu/d_menu_fmap/isSync__12dMenu_Fmap_cFv.s" } @@ -2138,7 +1971,7 @@ asm void dMenu_Fmap_c::howl_demo3_move() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMenu_Fmap_c::isOpen() { +asm bool dMenu_Fmap_c::isOpen() { nofralloc #include "asm/d/menu/d_menu_fmap/isOpen__12dMenu_Fmap_cFv.s" } @@ -2148,7 +1981,7 @@ asm void dMenu_Fmap_c::isOpen() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMenu_Fmap_c::isClose() { +asm bool dMenu_Fmap_c::isClose() { nofralloc #include "asm/d/menu/d_menu_fmap/isClose__12dMenu_Fmap_cFv.s" } @@ -2158,7 +1991,7 @@ asm void dMenu_Fmap_c::isClose() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMenu_Fmap_c::getProcess() { +asm u8 dMenu_Fmap_c::getProcess() { nofralloc #include "asm/d/menu/d_menu_fmap/getProcess__12dMenu_Fmap_cFv.s" } @@ -2169,7 +2002,7 @@ asm void dMenu_Fmap_c::getProcess() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMenu_Fmap_c::getRegionCursor() { +asm u8 dMenu_Fmap_c::getRegionCursor() { nofralloc #include "asm/d/menu/d_menu_fmap/getRegionCursor__12dMenu_Fmap_cFv.s" } @@ -2179,7 +2012,7 @@ asm void dMenu_Fmap_c::getRegionCursor() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMenu_Fmap_c::getStageCursor() { +asm u8 dMenu_Fmap_c::getStageCursor() { nofralloc #include "asm/d/menu/d_menu_fmap/getStageCursor__12dMenu_Fmap_cFv.s" } @@ -2189,7 +2022,7 @@ asm void dMenu_Fmap_c::getStageCursor() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMenu_Fmap_c::getStageTransX() { +asm f32 dMenu_Fmap_c::getStageTransX() { nofralloc #include "asm/d/menu/d_menu_fmap/getStageTransX__12dMenu_Fmap_cFv.s" } @@ -2199,7 +2032,7 @@ asm void dMenu_Fmap_c::getStageTransX() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMenu_Fmap_c::getStageTransZ() { +asm f32 dMenu_Fmap_c::getStageTransZ() { nofralloc #include "asm/d/menu/d_menu_fmap/getStageTransZ__12dMenu_Fmap_cFv.s" } @@ -2303,7 +2136,7 @@ asm void dMenu_Fmap_c::readFieldMapData(void** param_0, char const* param_1, boo #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void JKRArchive::getExpandedResSize(void const* param_0) const { +asm u32 JKRArchive::getExpandedResSize(void const* param_0) const { nofralloc #include "asm/d/menu/d_menu_fmap/getExpandedResSize__10JKRArchiveCFPCv.s" } diff --git a/src/d/menu/d_menu_insect.cpp b/src/d/menu/d_menu_insect.cpp index b29cefe0c94..6ba895e2b17 100644 --- a/src/d/menu/d_menu_insect.cpp +++ b/src/d/menu/d_menu_insect.cpp @@ -15,11 +15,6 @@ struct mDoGph_gInf_c { static u8 mFader[4]; }; -struct JKRHeap { - /* 802CE4D4 */ void alloc(u32, int); - /* 802CE548 */ void free(void*); -}; - struct mDoDvdThd_mountArchive_c { /* 80015E14 */ void create(char const*, u8, JKRHeap*); }; @@ -40,18 +35,6 @@ struct dSv_event_c { /* 800349BC */ void isEventBit(u16) const; }; -struct J2DPane {}; - -struct JKRArchive {}; - -struct dSelect_cursor_c { - /* 80194220 */ dSelect_cursor_c(u8, f32, JKRArchive*); - /* 801950F4 */ void setPos(f32, f32, J2DPane*, bool); - /* 801951B0 */ void setParam(f32, f32, f32, f32, f32); - /* 801951C8 */ void setScale(f32); - /* 801952A0 */ void setAlphaRate(f32); -}; - struct dMsgString_c { /* 80249C20 */ dMsgString_c(); /* 80249D28 */ ~dMsgString_c(); @@ -72,14 +55,6 @@ struct dMsgScrn3Select_c { /* 8023A97C */ void getCharSpace(); }; -struct ResTIMG {}; - -struct J2DPicture { - /* 802FC708 */ J2DPicture(ResTIMG const*); -}; - -struct JUTFont {}; - struct JMSMesgEntry_c {}; struct dMeter2Info_c { @@ -90,61 +65,8 @@ struct dMeter2Info_c { J2DPicture*, void*, J2DPicture*, int); }; -struct STControl { - /* 8003219C */ void checkTrigger(); - /* 8003242C */ void checkLeftTrigger(); - /* 800324A8 */ void checkRightTrigger(); - /* 80032524 */ void checkUpTrigger(); - /* 800325A0 */ void checkDownTrigger(); -}; - -struct CSTControl {}; - -struct JKRExpHeap {}; - -struct dMenu_Insect_c { - /* 801D8114 */ dMenu_Insect_c(JKRExpHeap*, STControl*, CSTControl*, u8); - /* 801D82F4 */ ~dMenu_Insect_c(); - /* 801D8658 */ void _create(); - /* 801D86C8 */ void _move(); - /* 801D8760 */ void _draw(); - /* 801D88EC */ void isSync(); - /* 801D8914 */ void init(); - /* 801D894C */ void _open(); - /* 801D8B2C */ void _close(); - /* 801D8C68 */ void wait_init(); - /* 801D8CCC */ void wait_move(); - /* 801D8E00 */ void explain_open_init(); - /* 801D91E4 */ void explain_open_move(); - /* 801D9264 */ void explain_move_init(); - /* 801D9268 */ void explain_move_move(); - /* 801D9290 */ void select_move_init(); - /* 801D92DC */ void select_move_move(); - /* 801D9504 */ void explain_close_init(); - /* 801D95AC */ void explain_close_move(); - /* 801D9644 */ void screenSetBase(); - /* 801D98F0 */ void screenSetExplain(); - /* 801D9BD0 */ void screenSetDoIcon(); - /* 801D9D4C */ void getGetInsectNum(); - /* 801D9DCC */ void getInsectItemID(int, int); - /* 801D9DE4 */ void isGetInsect(int, int); - /* 801D9E20 */ void isGiveInsect(int, int); - /* 801D9ED4 */ void isGiveInsect(u8); - /* 801D9E7C */ void isCatchInsect(u8); - /* 801D9F3C */ void isCatchNotGiveInsect(u8); - /* 801D9F8C */ void cursorMove(); - /* 801DA1EC */ void setCursorPos(); - /* 801DA2FC */ bool dpdMove(); - /* 801DA304 */ void setAButtonString(u16); - /* 801DA3B4 */ void setBButtonString(u16); - /* 801DA464 */ void setHIO(bool); - /* 801DA630 */ void draw(); -}; - struct JAISoundID {}; -struct Vec {}; - struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -153,33 +75,6 @@ struct Z2AudioMgr { static u8 mAudioMgrPtr[4 + 4 /* padding */]; }; -struct J2DTextBox { - /* 80300658 */ void getStringPtr() const; - /* 8030074C */ void setString(s16, char const*, ...); -}; - -struct J2DGrafContext {}; - -struct J2DScreen { - /* 802F8498 */ J2DScreen(); - /* 802F8648 */ void setPriority(char const*, u32, JKRArchive*); - /* 802F8ED4 */ void draw(f32, f32, J2DGrafContext const*); -}; - -struct CPaneMgrAlpha { - /* 802555C8 */ void show(); - /* 80255608 */ void hide(); - /* 802557D0 */ void setAlphaRate(f32); - /* 80255828 */ void getAlphaRate(); - /* 80255878 */ void alphaAnime(s16, u8, u8, u8); -}; - -struct CPaneMgr { - /* 80253984 */ CPaneMgr(J2DScreen*, u64, u8, JKRExpHeap*); - /* 802545B0 */ void paneTrans(f32, f32); - /* 80254EBC */ void getGlobalVtxCenter(J2DPane*, bool, s16); -}; - // // Forward References: // @@ -555,7 +450,7 @@ asm void dMenu_Insect_c::_draw() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMenu_Insect_c::isSync() { +asm bool dMenu_Insect_c::isSync() { nofralloc #include "asm/d/menu/d_menu_insect/isSync__14dMenu_Insect_cFv.s" } @@ -982,7 +877,8 @@ asm void dMenu_Insect_c::setHIO(bool param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMenu_Insect_c::draw() { +// asm void dMenu_Insect_c::draw() { +extern "C" asm void draw__14dMenu_Insect_cFv() { nofralloc #include "asm/d/menu/d_menu_insect/draw__14dMenu_Insect_cFv.s" } diff --git a/src/d/menu/d_menu_letter.cpp b/src/d/menu/d_menu_letter.cpp index 2b4d115366c..79f15c44d60 100644 --- a/src/d/menu/d_menu_letter.cpp +++ b/src/d/menu/d_menu_letter.cpp @@ -15,8 +15,6 @@ struct mDoGph_gInf_c { static u8 mFader[4]; }; -struct JKRHeap {}; - struct mDoDvdThd_mountArchive_c { /* 80015E14 */ void create(char const*, u8, JKRHeap*); }; @@ -31,29 +29,6 @@ struct dSv_letter_info_c { /* 8003449C */ void isLetterReadFlag(int) const; }; -struct J2DPane { - /* 802F7100 */ void getBounds(); -}; - -struct JKRArchive {}; - -struct dSelect_cursor_c { - /* 80194220 */ dSelect_cursor_c(u8, f32, JKRArchive*); - /* 801950F4 */ void setPos(f32, f32, J2DPane*, bool); - /* 801951B0 */ void setParam(f32, f32, f32, f32, f32); - /* 801951C8 */ void setScale(f32); - /* 801952A0 */ void setAlphaRate(f32); -}; - -struct J2DTextBox { - /* 801DFA28 */ void getWhite() const; - /* 801DFA34 */ void getBlack() const; - /* 80300658 */ void getStringPtr() const; - /* 8030074C */ void setString(s16, char const*, ...); -}; - -struct JUTFont {}; - struct COutFont_c {}; struct dMsgString_c { @@ -85,68 +60,12 @@ struct dMeter2Info_c { /* 8021C544 */ void getStringKanji(u32, char*, JMSMesgEntry_c*); }; -struct STControl { - /* 80032524 */ void checkUpTrigger(); - /* 800325A0 */ void checkDownTrigger(); -}; - -struct CSTControl {}; - -struct JKRExpHeap {}; - -struct dMenu_Letter_c { - /* 801DCDC0 */ dMenu_Letter_c(JKRExpHeap*, STControl*, CSTControl*); - /* 801DCF34 */ ~dMenu_Letter_c(); - /* 801DD36C */ void _create(); - /* 801DD474 */ void _move(); - /* 801DD50C */ void _draw(); - /* 801DD934 */ void isSync(); - /* 801DD95C */ void letter_init_calc(); - /* 801DDA20 */ void init(); - /* 801DDA74 */ void _open(); - /* 801DDC98 */ void _close(); - /* 801DDE18 */ void wait_init(); - /* 801DDE54 */ void wait_move(); - /* 801DE164 */ void slide_right_init(); - /* 801DE1E8 */ void slide_right_move(); - /* 801DE24C */ void slide_left_init(); - /* 801DE2D0 */ void slide_left_move(); - /* 801DE334 */ void read_open_init(); - /* 801DE564 */ void read_open_move(); - /* 801DE70C */ void read_move_init(); - /* 801DE824 */ void read_move_move(); - /* 801DEA48 */ void read_next_fadeout_init(); - /* 801DEA94 */ void read_next_fadeout_move(); - /* 801DEBD8 */ void read_next_fadein_init(); - /* 801DED04 */ void read_next_fadein_move(); - /* 801DEE20 */ void read_close_init(); - /* 801DEE6C */ void read_close_move(); - /* 801DF010 */ void screenSetMenu(); - /* 801DFA58 */ void screenSetBase(); - /* 801E0330 */ void screenSetShadow(); - /* 801E03D8 */ void screenSetLetter(); - /* 801E09A8 */ void screenSetDoIcon(); - /* 801E0B24 */ void setCursorPos(); - /* 801E0BB0 */ void changeActiveColor(); - /* 801E0E34 */ void changePageLight(); - /* 801E0E84 */ void setPageText(); - /* 801E1038 */ void setDMYPageText(); - /* 801E11EC */ void copyDMYMenu(); - /* 801E1518 */ void setAButtonString(u16); - /* 801E15C8 */ void setBButtonString(u16); - /* 801E1678 */ void getLetterNum(); - /* 801E1748 */ void setHIO(bool); - /* 801E1D5C */ void draw(); -}; - struct dMenu_Letter { static u8 letter_data[512]; }; struct JAISoundID {}; -struct Vec {}; - struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -155,50 +74,6 @@ struct Z2AudioMgr { static u8 mAudioMgrPtr[4 + 4 /* padding */]; }; -struct ResTIMG {}; - -struct JUtility { - struct TColor { - /* 80193960 */ TColor(); - }; -}; - -struct JGeometry { - template - struct TBox2 {}; - /* TBox2 */ - struct TBox2__template0 {}; -}; - -struct J2DGrafContext { - /* 802E90C0 */ void scissor(JGeometry::TBox2 const&); -}; - -struct J2DScreen { - /* 802F8498 */ J2DScreen(); - /* 802F8648 */ void setPriority(char const*, u32, JKRArchive*); - /* 802F8ED4 */ void draw(f32, f32, J2DGrafContext const*); -}; - -struct J2DPicture { - /* 801DFA40 */ void getWhite() const; - /* 801DFA4C */ void getBlack() const; - /* 802FC708 */ J2DPicture(ResTIMG const*); -}; - -struct CPaneMgrAlpha { - /* 802557D0 */ void setAlphaRate(f32); -}; - -struct CPaneMgr { - /* 80253984 */ CPaneMgr(J2DScreen*, u64, u8, JKRExpHeap*); - /* 80253930 */ CPaneMgr(); - /* 80253A18 */ ~CPaneMgr(); - /* 802545B0 */ void paneTrans(f32, f32); - /* 80254C90 */ void getGlobalVtx(J2DPane*, f32 (*)[3][4], u8, bool, s16); - /* 80254EBC */ void getGlobalVtxCenter(J2DPane*, bool, s16); -}; - // // Forward References: // @@ -308,7 +183,6 @@ extern "C" void draw__9J2DScreenFffPC14J2DGrafContext(); extern "C" void __ct__10J2DPictureFPC7ResTIMG(); extern "C" void getStringPtr__10J2DTextBoxCFv(); extern "C" void setString__10J2DTextBoxFsPCce(); -extern "C" void GXGetScissor(); extern "C" void __construct_array(); extern "C" void __ptmf_scall(); extern "C" void __save_gpr(); @@ -634,7 +508,7 @@ asm void dMenu_Letter_c::_draw() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMenu_Letter_c::isSync() { +asm bool dMenu_Letter_c::isSync() { nofralloc #include "asm/d/menu/d_menu_letter/isSync__14dMenu_Letter_cFv.s" } @@ -1339,7 +1213,8 @@ asm void dMsgString_c::getStringPage(u32 param_0, u8 param_1, u8 param_2, J2DTex #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMenu_Letter_c::draw() { +// asm void dMenu_Letter_c::draw() { +extern "C" asm void draw__14dMenu_Letter_cFv() { nofralloc #include "asm/d/menu/d_menu_letter/draw__14dMenu_Letter_cFv.s" } diff --git a/src/d/menu/d_menu_option.cpp b/src/d/menu/d_menu_option.cpp index a4aa32107b4..ce562e8322b 100644 --- a/src/d/menu/d_menu_option.cpp +++ b/src/d/menu/d_menu_option.cpp @@ -15,8 +15,6 @@ struct mDoGph_gInf_c { static u8 mFader[4]; }; -struct JKRHeap {}; - struct mDoDvdThd_mountArchive_c { /* 80015E14 */ void create(char const*, u8, JKRHeap*); }; @@ -30,24 +28,6 @@ struct dSv_player_config_c { /* 80034684 */ void getSound(); }; -struct J2DBasePosition {}; - -struct J2DPane { - /* 802F7100 */ void getBounds(); - /* 802F76F8 */ void setBasePosition(J2DBasePosition); - /* 802F7FCC */ void animationTransform(); -}; - -struct JKRArchive {}; - -struct dSelect_cursor_c { - /* 80194220 */ dSelect_cursor_c(u8, f32, JKRArchive*); - /* 801950F4 */ void setPos(f32, f32, J2DPane*, bool); - /* 801951B0 */ void setParam(f32, f32, f32, f32, f32); - /* 801951C8 */ void setScale(f32); - /* 801952A0 */ void setAlphaRate(f32); -}; - struct dMw_c { /* 801FCE08 */ void dMw_fade_out(); /* 801FCE78 */ void dMw_fade_in(); @@ -69,98 +49,10 @@ struct dMeter2Info_c { /* 8021C544 */ void getStringKanji(u32, char*, JMSMesgEntry_c*); }; -struct STControl { - /* 8003219C */ void checkTrigger(); - /* 8003242C */ void checkLeftTrigger(); - /* 800324A8 */ void checkRightTrigger(); - /* 80032524 */ void checkUpTrigger(); - /* 800325A0 */ void checkDownTrigger(); -}; - -struct dMenu_Option_c { - /* 801E1F10 */ dMenu_Option_c(JKRArchive*, STControl*); - /* 801E2014 */ ~dMenu_Option_c(); - /* 801E205C */ void _create(); - /* 801E2C1C */ void _delete(); - /* 801E3408 */ void _move(); - /* 801E36CC */ void _draw(); - /* 801E38CC */ void drawHaihai(); - /* 801E3A7C */ void isSync(); - /* 801E3AA4 */ void checkLeftTrigger(); - /* 801E3AC8 */ void checkRightTrigger(); - /* 801E3AEC */ void setAnimation(); - /* 801E3B98 */ void _open(); - /* 801E3DE0 */ void _close(); - /* 801E3F6C */ void atten_init(); - /* 801E3FC4 */ void atten_move(); - /* 801E41A0 */ void vib_init(); - /* 801E41F8 */ void vib_move(); - /* 801E4488 */ void sound_init(); - /* 801E44E0 */ void sound_move(); - /* 801E48AC */ void change_init(); - /* 801E48E8 */ void change_move(); - /* 801E4B34 */ void confirm_open_init(); - /* 801E4C10 */ void confirm_open_move(); - /* 801E4CE4 */ void confirm_move_init(); - /* 801E4D20 */ void confirm_move_move(); - /* 801E4E98 */ void confirm_select_init(); - /* 801E4E9C */ void confirm_select_move(); - /* 801E4F18 */ void confirm_close_init(); - /* 801E4FB0 */ void confirm_close_move(); - /* 801E51CC */ void tv_open1_move(); - /* 801E5244 */ void tv_open2_move(); - /* 801E5260 */ void tv_move_move(); - /* 801E5300 */ void tv_close1_move(); - /* 801E5364 */ void tv_close2_move(); - /* 801E5380 */ void calibration_open1_move(); - /* 801E53C4 */ void calibration_open2_move(); - /* 801E53E0 */ void calibration_move_move(); - /* 801E5434 */ void calibration_close1_move(); - /* 801E5478 */ void calibration_close2_move(); - /* 801E5494 */ void menuVisible(); - /* 801E54F8 */ void menuShow(int); - /* 801E55B8 */ void menuHide(int); - /* 801E5678 */ void screenSet(); - /* 801E6FBC */ void setSoundMode(u32); - /* 801E7004 */ void setAttenString(); - /* 801E70E8 */ void setVibString(); - /* 801E71CC */ void setSoundString(); - /* 801E7314 */ void setCursorPos(u8); - /* 801E73D8 */ void setSelectColor(u8, bool); - /* 801E76EC */ void getSelectType(); - /* 801E7718 */ void changeBarColor(bool); - /* 801E78B8 */ void setHIO(bool); - /* 801E7D18 */ void cursorAnime(f32); - /* 801E7D60 */ void setZButtonString(u16); - /* 801E7DF4 */ void changeTVCheck(); - /* 801E7E98 */ void setAButtonString(u16); - /* 801E7F9C */ void setBButtonString(u16); - /* 801E80A0 */ void isRumbleSupported(); - /* 801E80AC */ bool dpdMenuMove(); - /* 801E80B4 */ void paneResize(u64); - /* 801E8210 */ void initialize(); - /* 801E82C4 */ void yesnoMenuMoveAnmInitSet(int, int); - /* 801E8438 */ void yesnoMenuMoveAnm(); - /* 801E85D4 */ void yesnoSelectMoveAnm(); - /* 801E8888 */ void yesnoCursorShow(); - /* 801E89F8 */ void yesNoSelectStart(); - /* 801E8AC8 */ void yesnoSelectAnmSet(); - /* 801E8C38 */ void yesnoCancelAnmSet(); - /* 801E8CB0 */ void yesnoWakuAlpahAnmInit(u8, u8, u8, u8); - /* 801E8CFC */ void yesnoWakuAlpahAnm(u8); - /* 801E8E6C */ void draw(); -}; - struct dMenu_Calibration_c { /* 801AEDAC */ void _move(); }; -struct JUtility { - struct TColor { - /* 80193960 */ TColor(); - }; -}; - struct dFile_warning_c { /* 80191BAC */ dFile_warning_c(JKRArchive*, u8); /* 80191F18 */ void _move(); @@ -177,8 +69,6 @@ struct dComIfG_play_c { struct JAISoundID {}; -struct Vec {}; - struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -189,8 +79,6 @@ struct Z2AudioMgr { static u8 mAudioMgrPtr[4 + 4 /* padding */]; }; -struct ResTIMG {}; - struct JUTGamePad { struct CRumble { struct ERumble {}; @@ -201,51 +89,10 @@ struct JUTGamePad { static u8 sRumbleSupported[4]; }; -struct JKRFileLoader { - /* 802D4270 */ void getGlbResource(char const*, JKRFileLoader*); -}; - -struct JKRExpHeap {}; - -struct J2DTextBox { - /* 80300658 */ void getStringPtr() const; - /* 8030074C */ void setString(s16, char const*, ...); -}; - -struct J2DGrafContext {}; - -struct J2DScreen { - /* 802F8498 */ J2DScreen(); - /* 802F8648 */ void setPriority(char const*, u32, JKRArchive*); - /* 802F8ED4 */ void draw(f32, f32, J2DGrafContext const*); - /* 802F9690 */ void animation(); -}; - -struct J2DPicture { - /* 802FC708 */ J2DPicture(ResTIMG const*); -}; - struct J2DAnmLoaderDataBase { /* 80308A6C */ void load(void const*); }; -struct CPaneMgrAlpha { - /* 802555C8 */ void show(); - /* 80255608 */ void hide(); - /* 802557D0 */ void setAlphaRate(f32); - /* 80255878 */ void alphaAnime(s16, u8, u8, u8); -}; - -struct CPaneMgr { - /* 80253984 */ CPaneMgr(J2DScreen*, u64, u8, JKRExpHeap*); - /* 80253930 */ CPaneMgr(); - /* 80253A18 */ ~CPaneMgr(); - /* 802545B0 */ void paneTrans(f32, f32); - /* 802548BC */ void colorAnime(s16, JUtility::TColor, JUtility::TColor, JUtility::TColor, - JUtility::TColor, u8); - /* 80254EBC */ void getGlobalVtxCenter(J2DPane*, bool, s16); -}; - // // Forward References: // @@ -395,7 +242,6 @@ extern "C" void __ct__10J2DPictureFPC7ResTIMG(); extern "C" void getStringPtr__10J2DTextBoxCFv(); extern "C" void setString__10J2DTextBoxFsPCce(); extern "C" void load__20J2DAnmLoaderDataBaseFPCv(); -extern "C" void OSSetSoundMode(); extern "C" void __construct_array(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_20(); @@ -1080,7 +926,7 @@ asm void dMenu_Option_c::drawHaihai() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMenu_Option_c::isSync() { +asm bool dMenu_Option_c::isSync() { nofralloc #include "asm/d/menu/d_menu_option/isSync__14dMenu_Option_cFv.s" } @@ -1131,7 +977,7 @@ SECTION_DEAD static char const* const stringBase_80397721 = "/res/Layout/optres. #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMenu_Option_c::_open() { +asm bool dMenu_Option_c::_open() { nofralloc #include "asm/d/menu/d_menu_option/_open__14dMenu_Option_cFv.s" } @@ -2232,7 +2078,8 @@ asm void dMenu_Option_c::yesnoWakuAlpahAnm(u8 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMenu_Option_c::draw() { +// asm void dMenu_Option_c::draw() { +extern "C" asm void draw__14dMenu_Option_cFv() { nofralloc #include "asm/d/menu/d_menu_option/draw__14dMenu_Option_cFv.s" } diff --git a/src/d/menu/d_menu_ring.cpp b/src/d/menu/d_menu_ring.cpp index ef4010363ea..9fb9ee4fa7d 100644 --- a/src/d/menu/d_menu_ring.cpp +++ b/src/d/menu/d_menu_ring.cpp @@ -11,6 +11,7 @@ // Types: // + struct mDoCPd_c { static u8 m_cpadInfo[256]; }; @@ -33,26 +34,11 @@ struct dSv_player_item_c { /* 80033354 */ void getLineUpItem(int) const; }; -struct JKRArchive {}; - -struct dSelect_cursor_c { - /* 80194220 */ dSelect_cursor_c(u8, f32, JKRArchive*); - /* 801951B0 */ void setParam(f32, f32, f32, f32, f32); - /* 801951C8 */ void setScale(f32); - /* 801952A0 */ void setAlphaRate(f32); -}; - struct dMsgString_c { /* 80249C20 */ dMsgString_c(); /* 80249D28 */ ~dMsgString_c(); }; -struct ResTIMG {}; - -struct J2DPicture { - /* 802FC708 */ J2DPicture(ResTIMG const*); -}; - struct dMeter2Info_c { /* 8021CA04 */ void warpInProc(); /* 8021CF08 */ void readItemTexture(u8, void*, J2DPicture*, void*, J2DPicture*, void*, @@ -60,78 +46,11 @@ struct dMeter2Info_c { /* 8021D36C */ void setItemColor(u8, J2DPicture*, J2DPicture*, J2DPicture*, J2DPicture*); }; -struct JUtility { - struct TColor {}; -}; - struct dMeter2Draw_c { /* 802140DC */ void drawPikari(f32, f32, f32*, f32, JUtility::TColor, JUtility::TColor, JUtility::TColor, JUtility::TColor, f32, u8); }; -struct STControl {}; - -struct CSTControl {}; - -struct JKRExpHeap {}; - -struct dMenu_Ring_c { - /* 801E9118 */ dMenu_Ring_c(JKRExpHeap*, STControl*, CSTControl*, u8); - /* 801EA708 */ ~dMenu_Ring_c(); - /* 801EAB7C */ void _create(); - /* 801EABE8 */ void _delete(); - /* 801EABEC */ void _move(); - /* 801EACC8 */ void _draw(); - /* 801EB080 */ void setKanteraPos(f32, f32); - /* 801EB0A4 */ void isOpen(); - /* 801EB2B4 */ void isMoveEnd(); - /* 801EB3CC */ void isClose(); - /* 801EB624 */ void getStickInfo(STControl*); - /* 801EB8C0 */ void calcStickAngle(STControl*, u8); - /* 801EB960 */ void setRotate(); - /* 801EBA38 */ void setItemScale(int, f32); - /* 801EBAB8 */ void setButtonScale(int, f32); - /* 801EBB10 */ void setItem(); - /* 801EBE58 */ void setJumpItem(bool); - /* 801EC20C */ void setScale(); - /* 801EC3B0 */ void setNameString(u32); - /* 801EC504 */ void setActiveCursor(); - /* 801EC754 */ void setMixItem(); - /* 801ECB14 */ void drawItem(); - /* 801ECF9C */ void drawItem2(); - /* 801ED2BC */ void stick_wait_init(); - /* 801ED31C */ void stick_wait_proc(); - /* 801ED490 */ void stick_move_init(); - /* 801ED53C */ void stick_move_proc(); - /* 801ED934 */ void stick_explain_init(); - /* 801ED938 */ void stick_explain_force_init(); - /* 801ED93C */ void stick_explain_proc(); - /* 801EDA0C */ void stick_explain_force_proc(); - /* 801EDB14 */ void setSelectItem(int, u8); - /* 801EDC98 */ void drawSelectItem(); - /* 801EDF2C */ void setSelectItemForce(int); - /* 801EDFDC */ void getCursorPos(u8); - /* 801EE058 */ void getItemNum(u8); - /* 801EE15C */ void getItemMaxNum(u8); - /* 801EE228 */ void checkExplainForce(); - /* 801EE63C */ bool checkCombineBomb(int); - /* 801EE644 */ void setCombineBomb(int); - /* 801EE648 */ void drawNumber(int, int, f32, f32); - /* 801EEA84 */ void getItem(int, u8); - /* 801EEAE4 */ void setDoStatus(u8); - /* 801EEB58 */ void isMixItemOn(); - /* 801EEC98 */ void isMixItemOff(); - /* 801EED84 */ void setMixMessage(); - /* 801EEF14 */ void textScaleHIO(); - /* 801EF11C */ void textCentering(); - /* 801EF13C */ void clacEllipseFunction(f32, f32, f32); - /* 801EF174 */ void calcDistance(f32, f32, f32, f32); - /* 801EF1A0 */ void clacEllipsePlotAverage(int, f32, f32); - /* 801EF484 */ bool dpdMove(); - /* 801EF48C */ void openExplain(u8); - /* 801EF560 */ void draw(); -}; - struct J2DOrthoGraph {}; struct dMenu_ItemExplain_c { @@ -155,12 +74,6 @@ struct dItem_data { static void* item_resource[1530]; }; -struct Vec {}; - -struct cXyz { - /* 80266B34 */ void operator-(Vec const&) const; -}; - struct JAISoundID {}; struct Z2SeMgr { @@ -175,47 +88,6 @@ struct JMath { static u8 sincosTable_[65536]; }; -struct JKRHeap { - /* 802CE4D4 */ void alloc(u32, int); - /* 802CE548 */ void free(void*); - /* 802CE784 */ void getTotalFreeSize(); -}; - -struct J2DTextBox { - /* 80300658 */ void getStringPtr() const; - /* 8030074C */ void setString(s16, char const*, ...); -}; - -struct J2DGrafContext {}; - -struct J2DScreen { - /* 802F8498 */ J2DScreen(); - /* 802F8ED4 */ void draw(f32, f32, J2DGrafContext const*); -}; - -struct J2DBasePosition {}; - -struct J2DPane { - /* 802F76F8 */ void setBasePosition(J2DBasePosition); -}; - -struct CPaneMgrAlpha { - /* 802553FC */ CPaneMgrAlpha(J2DScreen*, u64, u8, JKRExpHeap*); - /* 802555C8 */ void show(); - /* 80255608 */ void hide(); - /* 8025564C */ void isVisible(); - /* 802557D0 */ void setAlphaRate(f32); - /* 80255828 */ void getAlphaRate(); -}; - -struct CPaneMgr { - /* 80253984 */ CPaneMgr(J2DScreen*, u64, u8, JKRExpHeap*); - /* 80253930 */ CPaneMgr(); - /* 80253A18 */ ~CPaneMgr(); - /* 802545B0 */ void paneTrans(f32, f32); - /* 80254EBC */ void getGlobalVtxCenter(J2DPane*, bool, s16); -}; - // // Forward References: // @@ -355,7 +227,6 @@ extern "C" void draw__9J2DScreenFffPC14J2DGrafContext(); extern "C" void __ct__10J2DPictureFPC7ResTIMG(); extern "C" void getStringPtr__10J2DTextBoxCFv(); extern "C" void setString__10J2DTextBoxFsPCce(); -extern "C" void PSVECSquareMag(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_17(); extern "C" void _savegpr_18(); @@ -377,7 +248,6 @@ extern "C" void _restgpr_26(); extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" void abs(); extern "C" void strcpy(); extern "C" extern void* __vt__12dDlst_base_c[3]; extern "C" void* item_resource__10dItem_data[1530]; @@ -386,7 +256,6 @@ extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" extern u8 g_ringHIO[344]; extern "C" extern u8 g_meter2_info[248]; extern "C" u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; // @@ -766,7 +635,7 @@ SECTION_SDATA2 static f64 lit_4596 = 4503601774854144.0 /* cast s32 to float */; #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMenu_Ring_c::isOpen() { +asm bool dMenu_Ring_c::isOpen() { nofralloc #include "asm/d/menu/d_menu_ring/isOpen__12dMenu_Ring_cFv.s" } @@ -776,7 +645,7 @@ asm void dMenu_Ring_c::isOpen() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMenu_Ring_c::isMoveEnd() { +asm bool dMenu_Ring_c::isMoveEnd() { nofralloc #include "asm/d/menu/d_menu_ring/isMoveEnd__12dMenu_Ring_cFv.s" } @@ -786,7 +655,7 @@ asm void dMenu_Ring_c::isMoveEnd() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMenu_Ring_c::isClose() { +asm bool dMenu_Ring_c::isClose() { nofralloc #include "asm/d/menu/d_menu_ring/isClose__12dMenu_Ring_cFv.s" } @@ -1292,7 +1161,8 @@ asm void dMenu_Ring_c::openExplain(u8 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMenu_Ring_c::draw() { +// asm void dMenu_Ring_c::draw() { +extern "C" asm void draw__12dMenu_Ring_cFv() { nofralloc #include "asm/d/menu/d_menu_ring/draw__12dMenu_Ring_cFv.s" } diff --git a/src/d/menu/d_menu_save.cpp b/src/d/menu/d_menu_save.cpp index 3b394e25d2f..a8f52f73045 100644 --- a/src/d/menu/d_menu_save.cpp +++ b/src/d/menu/d_menu_save.cpp @@ -26,8 +26,6 @@ struct mDoMemCd_Ctrl_c { /* 800170B8 */ void command_attach(); }; -struct JKRHeap {}; - struct mDoDvdThd_mountArchive_c { /* 80015E14 */ void create(char const*, u8, JKRHeap*); }; @@ -62,33 +60,11 @@ struct dSv_event_c { /* 800349BC */ void isEventBit(u16) const; }; -struct J2DPane { - /* 802F7FCC */ void animationTransform(); -}; - -struct JKRArchive {}; - -struct dSelect_cursor_c { - /* 80194220 */ dSelect_cursor_c(u8, f32, JKRArchive*); - /* 801950F4 */ void setPos(f32, f32, J2DPane*, bool); - /* 801951B0 */ void setParam(f32, f32, f32, f32, f32); - /* 801952A0 */ void setAlphaRate(f32); -}; - struct dMsgString_c { /* 80249C20 */ dMsgString_c(); /* 80249D28 */ ~dMsgString_c(); }; -struct STControl { - /* 80032044 */ STControl(s16, s16, s16, s16, f32, f32, s16, s16); - /* 8003219C */ void checkTrigger(); - /* 8003242C */ void checkLeftTrigger(); - /* 800324A8 */ void checkRightTrigger(); - /* 80032524 */ void checkUpTrigger(); - /* 800325A0 */ void checkDownTrigger(); -}; - struct J2DOrthoGraph {}; struct dMsgScrnExplain_c { @@ -108,131 +84,6 @@ struct dMeter2Info_c { /* 8021E0C4 */ void resetMiniGameItem(bool); }; -struct dMenu_save_c { - /* 801EF6A0 */ dMenu_save_c(); - /* 801EF7AC */ void _create(); - /* 801EF904 */ void screenSet(); - /* 801F0938 */ void initialize(); - /* 801F0958 */ void displayInit(); - /* 801F09AC */ void _open(); - /* 801F0B10 */ void _close(); - /* 801F0B28 */ void _delete(); - /* 801F1048 */ void _move(); - /* 801F1100 */ void saveSelAnm(); - /* 801F1148 */ void selFileWakuAnm(); - /* 801F11F4 */ void bookIconAnm(); - /* 801F12F0 */ void memCardWatch(); - /* 801F1378 */ void saveQuestion(); - /* 801F1558 */ void saveQuestion2(); - /* 801F1620 */ void saveQuestion21(); - /* 801F1644 */ void saveQuestion3(); - /* 801F16B8 */ void saveQuestion4(); - /* 801F16F4 */ void saveGuide(); - /* 801F1720 */ void memCardCheck(); - /* 801F191C */ void memCardErrMsgWaitKey(); - /* 801F19A8 */ void backSaveQuestionInitSet(); - /* 801F19DC */ void backSaveQuestion(); - /* 801F1A48 */ void backSaveQuestion2(); - /* 801F1B38 */ void closeSelect(); - /* 801F1BF8 */ void closeSelect2(); - /* 801F1C70 */ void iplSelMsgInitSet(); - /* 801F1C94 */ void iplSelInitSet(); - /* 801F1CEC */ void IPLSelectDisp1(); - /* 801F1D54 */ void IPLSelectDisp2(); - /* 801F1DD4 */ void memCardErrGoIPLSel(); - /* 801F1E58 */ void IPLSelect2Disp(); - /* 801F1EE0 */ void memCardErrGoIPLSel2(); - /* 801F1F80 */ void memCardErrGotoIPL(); - /* 801F2000 */ void memCardErrMsgWaitFormatSel(); - /* 801F20AC */ void cardFormatYesSelDisp(); - /* 801F2134 */ void cardFormatNoSelDisp(); - /* 801F219C */ void memCardErrMsgWaitFormatSel2(); - /* 801F2250 */ void cardFormatYesSel2Disp(); - /* 801F22CC */ void memCardFormat(); - /* 801F232C */ void memCardFormatWait(); - /* 801F23A4 */ void gameFileMakeSelInitSet(); - /* 801F23FC */ void makeGameFileSelDisp(); - /* 801F247C */ void memCardMakeGameFileSel(); - /* 801F2514 */ void makeGameFileDisp(); - /* 801F25AC */ void memCardMakeGameFile(); - /* 801F260C */ void memCardMakeGameFileWait(); - /* 801F2698 */ void memCardCommandEnd(); - /* 801F2708 */ void memCardCommandEnd2(); - /* 801F27CC */ void memCardDataLoadWait(); - /* 801F2840 */ void dataWrite(); - /* 801F28E4 */ void memCardDataSaveWait(); - /* 801F298C */ void memCardDataSaveWait2(); - /* 801F2B5C */ void gameContinueDisp(); - /* 801F2BF8 */ void gameContinue(); - /* 801F2D78 */ void gameContinue2(); - /* 801F2DA0 */ void gameContinue3(); - /* 801F2DD4 */ void saveEnd(); - /* 801F2E88 */ void endingNoSave(); - /* 801F2F08 */ void endingNoSave2(); - /* 801F2F38 */ void endingDataCheck(); - /* 801F2F4C */ void retryQuestion0(); - /* 801F2FB4 */ void retryQuestion1(); - /* 801F3040 */ void retryQuestion2(); - /* 801F30B8 */ void restartInit(); - /* 801F31B0 */ void saveWait(); - /* 801F31B4 */ void messageChange(); - /* 801F328C */ void YesNoSelect(); - /* 801F34BC */ void msgTxtSet(u16, bool); - /* 801F3588 */ void openSaveSelect(); - /* 801F36B4 */ void openSaveSelect2(); - /* 801F37A0 */ void openSaveSelect3(); - /* 801F3934 */ void saveSelect(); - /* 801F3A94 */ void saveSelectStart(); - /* 801F3BE0 */ void selectDataOpenMove(); - /* 801F3C7C */ void dataSelectAnmSet(); - /* 801F3E30 */ void saveSelectMoveAnime(); - /* 801F40D8 */ void saveYesNoSelect(); - /* 801F4238 */ void yesnoSelectStart(); - /* 801F42FC */ void saveMoveDisp(); - /* 801F43F8 */ void saveMoveDisp2(); - /* 801F4510 */ void yesnoSelectAnmSet(u8); - /* 801F46B4 */ void yesNoCursorMoveAnm(); - /* 801F4724 */ void yesnoCancelAnmSet(); - /* 801F47DC */ void saveYesNoCancelMove(); - /* 801F485C */ void headerTxtSet(u16); - /* 801F4928 */ void headerTxtChangeAnm(); - /* 801F4A10 */ void errDispInitSet(int); - /* 801F4B84 */ void msgWindowInitOpen(); - /* 801F4D10 */ void msgWindowOpen(); - /* 801F4DAC */ void msgWindowClose(); - /* 801F4E48 */ void errYesNoSelect(u8, u8); - /* 801F4FB4 */ void errCurMove(u8, u8); - /* 801F5054 */ void errYesNoCursorMoveAnm(); - /* 801F50C4 */ void errorTxtSet(u16); - /* 801F5190 */ void errorTxtChangeAnm(); - /* 801F5278 */ void saveSelectOpenInit(); - /* 801F533C */ void selectDataBaseMoveAnmInitSet(int, int); - /* 801F53D4 */ void selectDataBaseMoveAnm(); - /* 801F54C0 */ void saveSelectOpenAnmSet(); - /* 801F5508 */ void selectDataMoveAnmInitSet(int, int); - /* 801F5600 */ void selectDataMoveAnm(); - /* 801F5744 */ void yesnoMenuMoveAnmInitSet(int, int, u8); - /* 801F58C8 */ void yesnoMenuMoveAnm(); - /* 801F5AE4 */ void yesnoSelectMoveAnm(u8); - /* 801F5D84 */ void yesnoCursorShow(); - /* 801F5EF4 */ void errorMoveAnmInitSet(int, int); - /* 801F5F84 */ void errorMoveAnm(); - /* 801F60A4 */ void modoruTxtDispAnmInit(u8); - /* 801F6120 */ void modoruTxtDispAnm(); - /* 801F61FC */ void ketteiTxtDispAnmInit(u8); - /* 801F6278 */ void ketteiTxtDispAnm(); - /* 801F6354 */ void selectWakuAlpahAnmInit(u8, u8, u8, u8); - /* 801F6390 */ void selectWakuAlpahAnm(u8); - /* 801F6458 */ void selFileCursorShow(); - /* 801F6608 */ void yesnoWakuAlpahAnmInit(u8, u8, u8, u8); - /* 801F6654 */ void yesnoWakuAlpahAnm(u8); - /* 801F67B8 */ void dataSave(); - /* 801F67F0 */ void setSaveData(); - /* 801F6954 */ void setInitSaveData(); - /* 801F69B8 */ void _draw(); - /* 801F69FC */ void _draw2(); -}; - struct dFile_warning_c { /* 80191BAC */ dFile_warning_c(JKRArchive*, u8); /* 80191F18 */ void _move(); @@ -248,30 +99,12 @@ struct dFile_info_c { /* 80192D60 */ void _draw(); }; -struct dDlst_base_c {}; - -struct dDlst_list_c { - /* 80056794 */ void set(dDlst_base_c**&, dDlst_base_c**&, dDlst_base_c*); -}; - -struct dDlst_MenuSave_c { - /* 801F6B0C */ void draw(); - /* 801F6B44 */ ~dDlst_MenuSave_c(); -}; - -struct dDlst_MenuSaveExplain_c { - /* 801F6ADC */ void draw(); - /* 801F6B8C */ ~dDlst_MenuSaveExplain_c(); -}; - struct Z2SeqMgr { /* 802B3EAC */ void checkBgmIDPlaying(u32); }; struct JAISoundID {}; -struct Vec {}; - struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); @@ -281,52 +114,14 @@ struct Z2AudioMgr { static u8 mAudioMgrPtr[4 + 4 /* padding */]; }; -struct JUtility { - struct TColor {}; -}; - -struct JKRFileLoader { - /* 802D4270 */ void getGlbResource(char const*, JKRFileLoader*); -}; - -struct JKRExpHeap {}; - struct JFWDisplay { static u8 sManager[4]; }; -struct J2DTextBox { - /* 80300658 */ void getStringPtr() const; - /* 80300660 */ void setString(char const*, ...); - /* 8030074C */ void setString(s16, char const*, ...); -}; - -struct J2DGrafContext {}; - -struct J2DScreen { - /* 802F8498 */ J2DScreen(); - /* 802F8648 */ void setPriority(char const*, u32, JKRArchive*); - /* 802F8ED4 */ void draw(f32, f32, J2DGrafContext const*); - /* 802F9690 */ void animation(); -}; - struct J2DAnmLoaderDataBase { /* 80308A6C */ void load(void const*); }; -struct CPaneMgrAlpha { - /* 802553FC */ CPaneMgrAlpha(J2DScreen*, u64, u8, JKRExpHeap*); - /* 802555C8 */ void show(); - /* 80255878 */ void alphaAnime(s16, u8, u8, u8); -}; - -struct CPaneMgr { - /* 80253984 */ CPaneMgr(J2DScreen*, u64, u8, JKRExpHeap*); - /* 802548BC */ void colorAnime(s16, JUtility::TColor, JUtility::TColor, JUtility::TColor, - JUtility::TColor, u8); - /* 80254EBC */ void getGlobalVtxCenter(J2DPane*, bool, s16); -}; - // // Forward References: // @@ -1670,7 +1465,7 @@ asm void dMenu_save_c::displayInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMenu_save_c::_open() { +asm bool dMenu_save_c::_open() { nofralloc #include "asm/d/menu/d_menu_save/_open__12dMenu_save_cFv.s" } @@ -2889,7 +2684,8 @@ asm void dMenu_save_c::_draw2() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dDlst_MenuSaveExplain_c::draw() { +// asm void dDlst_MenuSaveExplain_c::draw() { +extern "C" asm void draw__23dDlst_MenuSaveExplain_cFv() { nofralloc #include "asm/d/menu/d_menu_save/draw__23dDlst_MenuSaveExplain_cFv.s" } @@ -2899,7 +2695,8 @@ asm void dDlst_MenuSaveExplain_c::draw() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dDlst_MenuSave_c::draw() { +// asm void dDlst_MenuSave_c::draw() { +extern "C" asm void draw__16dDlst_MenuSave_cFv() { nofralloc #include "asm/d/menu/d_menu_save/draw__16dDlst_MenuSave_cFv.s" } diff --git a/src/d/menu/d_menu_skill.cpp b/src/d/menu/d_menu_skill.cpp index b20506c7285..0c78b194ce8 100644 --- a/src/d/menu/d_menu_skill.cpp +++ b/src/d/menu/d_menu_skill.cpp @@ -15,8 +15,6 @@ struct mDoGph_gInf_c { static u8 mFader[4]; }; -struct JKRHeap {}; - struct mDoDvdThd_mountArchive_c { /* 80015E14 */ void create(char const*, u8, JKRHeap*); }; @@ -33,18 +31,6 @@ struct dSv_event_c { /* 800349BC */ void isEventBit(u16) const; }; -struct J2DPane {}; - -struct JKRArchive {}; - -struct dSelect_cursor_c { - /* 80194220 */ dSelect_cursor_c(u8, f32, JKRArchive*); - /* 801950F4 */ void setPos(f32, f32, J2DPane*, bool); - /* 801951B0 */ void setParam(f32, f32, f32, f32, f32); - /* 801951C8 */ void setScale(f32); - /* 801952A0 */ void setAlphaRate(f32); -}; - struct dMsgString_c { /* 80249C20 */ dMsgString_c(); /* 80249D28 */ ~dMsgString_c(); @@ -56,52 +42,8 @@ struct dMeter2Info_c { /* 8021C544 */ void getStringKanji(u32, char*, JMSMesgEntry_c*); }; -struct STControl { - /* 80032524 */ void checkUpTrigger(); - /* 800325A0 */ void checkDownTrigger(); -}; - -struct CSTControl {}; - -struct JKRExpHeap {}; - -struct dMenu_Skill_c { - /* 801F7224 */ dMenu_Skill_c(JKRExpHeap*, STControl*, CSTControl*); - /* 801F7348 */ ~dMenu_Skill_c(); - /* 801F763C */ void _create(); - /* 801F7718 */ void _move(); - /* 801F77B0 */ void _draw(); - /* 801F7950 */ void isSync(); - /* 801F7978 */ void skill_init_calc(); - /* 801F79EC */ void init(); - /* 801F7A40 */ void _open(); - /* 801F7C1C */ void _close(); - /* 801F7D58 */ void wait_init(); - /* 801F7D94 */ void wait_move(); - /* 801F7F24 */ void read_open_init(); - /* 801F7FF8 */ void read_open_move(); - /* 801F8114 */ void read_move_init(); - /* 801F8150 */ void read_move_move(); - /* 801F8218 */ void read_close_init(); - /* 801F826C */ void read_close_move(); - /* 801F8388 */ void screenSetMenu(); - /* 801F8A18 */ void screenSetLetter(); - /* 801F8D20 */ void screenSetDoIcon(); - /* 801F8E9C */ void setCursorPos(); - /* 801F8F28 */ void changeActiveColor(); - /* 801F9144 */ void setPageText(); - /* 801F9260 */ void setAButtonString(u16); - /* 801F9310 */ void setBButtonString(u16); - /* 801F93C0 */ void setNameString(u16); - /* 801F9470 */ void getSkillNum(); - /* 801F9500 */ void setHIO(bool); - /* 801F9A08 */ void draw(); -}; - struct JAISoundID {}; -struct Vec {}; - struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -110,41 +52,6 @@ struct Z2AudioMgr { static u8 mAudioMgrPtr[4 + 4 /* padding */]; }; -struct ResTIMG {}; - -struct JUtility { - struct TColor { - /* 80193960 */ TColor(); - }; -}; - -struct J2DTextBox { - /* 80300658 */ void getStringPtr() const; - /* 8030074C */ void setString(s16, char const*, ...); -}; - -struct J2DGrafContext {}; - -struct J2DScreen { - /* 802F8498 */ J2DScreen(); - /* 802F8648 */ void setPriority(char const*, u32, JKRArchive*); - /* 802F8ED4 */ void draw(f32, f32, J2DGrafContext const*); -}; - -struct J2DPicture { - /* 802FC708 */ J2DPicture(ResTIMG const*); -}; - -struct CPaneMgrAlpha { - /* 802557D0 */ void setAlphaRate(f32); -}; - -struct CPaneMgr { - /* 80253984 */ CPaneMgr(J2DScreen*, u64, u8, JKRExpHeap*); - /* 802545B0 */ void paneTrans(f32, f32); - /* 80254EBC */ void getGlobalVtxCenter(J2DPane*, bool, s16); -}; - // // Forward References: // @@ -379,14 +286,26 @@ SECTION_SDATA2 static f32 lit_3809 = 1.0f; /* 801F7224-801F7348 1F1B64 0124+00 0/0 2/2 0/0 .text * __ct__13dMenu_Skill_cFP10JKRExpHeapP9STControlP10CSTControl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dMenu_Skill_c::dMenu_Skill_c(JKRExpHeap* param_0, STControl* param_1, CSTControl* param_2) { - nofralloc -#include "asm/d/menu/d_menu_skill/__ct__13dMenu_Skill_cFP10JKRExpHeapP9STControlP10CSTControl.s" +dMenu_Skill_c::dMenu_Skill_c(JKRExpHeap* param_0, STControl* param_1, CSTControl* param_2) { + field_0x4 = param_0; + field_0x8 = NULL; + field_0x14 = NULL; + field_0xc = param_1; + field_0x10 = param_2; + mStatus = 1; + field_0x205 = 0; + field_0x200 = 0; + field_0x1fc = 0; + field_0x202 = 0; + field_0x206 = 0; + field_0x209 = 255; + field_0x20a = 255; + skill_init_calc(); + field_0x1f0 = FLOAT_LABEL(lit_3808); + f32 tmp_1 = lit_3809; + field_0x1f8 = tmp_1; + field_0x1f4 = tmp_1; } -#pragma pop /* 801F7348-801F763C 1F1C88 02F4+00 1/0 0/0 0/0 .text __dt__13dMenu_Skill_cFv */ #pragma push @@ -459,7 +378,7 @@ asm void dMenu_Skill_c::_draw() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMenu_Skill_c::isSync() { +asm bool dMenu_Skill_c::isSync() { nofralloc #include "asm/d/menu/d_menu_skill/isSync__13dMenu_Skill_cFv.s" } @@ -818,18 +737,22 @@ asm void dMenu_Skill_c::screenSetLetter() { /* ############################################################################################## */ /* 80397D30-80397D58 024390 0028+00 1/1 0/0 0/0 .rodata text_a_tag$4365 */ -SECTION_RODATA static u8 const text_a_tag[40] = { - 0x61, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x31, 0x61, 0x74, 0x65, 0x78, 0x74, 0x31, - 0x5F, 0x32, 0x61, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x33, 0x61, 0x74, 0x65, 0x78, - 0x74, 0x31, 0x5F, 0x34, 0x61, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x35, +SECTION_RODATA static u64 const text_a_tag[5] = { + 'atext1_1', + 'atext1_2', + 'atext1_3', + 'atext1_4', + 'atext1_5', }; COMPILER_STRIP_GATE(0x80397D30, &text_a_tag); /* 80397D58-80397D80 0243B8 0028+00 1/1 0/0 0/0 .rodata text_b_tag$4366 */ -SECTION_RODATA static u8 const text_b_tag[40] = { - 0x62, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x31, 0x62, 0x74, 0x65, 0x78, 0x74, 0x31, - 0x5F, 0x32, 0x62, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x33, 0x62, 0x74, 0x65, 0x78, - 0x74, 0x31, 0x5F, 0x34, 0x62, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x35, +SECTION_RODATA static u64 const text_b_tag[5] = { + 'btext1_1', + 'btext1_2', + 'btext1_3', + 'btext1_4', + 'btext1_5', }; COMPILER_STRIP_GATE(0x80397D58, &text_b_tag); @@ -952,7 +875,8 @@ asm void dMenu_Skill_c::setHIO(bool param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMenu_Skill_c::draw() { +// asm void dMenu_Skill_c::draw() { +extern "C" asm void draw__13dMenu_Skill_cFv() { nofralloc #include "asm/d/menu/d_menu_skill/draw__13dMenu_Skill_cFv.s" } diff --git a/src/d/menu/d_menu_window.cpp b/src/d/menu/d_menu_window.cpp index 0a94f88341c..f9ee19e1edd 100644 --- a/src/d/menu/d_menu_window.cpp +++ b/src/d/menu/d_menu_window.cpp @@ -4,139 +4,25 @@ // #include "d/menu/d_menu_window.h" +#include "d/com/d_com_inf_game.h" +#include "d/menu/d_menu_collect.h" +#include "d/menu/d_menu_ring.h" +#include "d/menu/d_menu_skill.h" +#include "d/menu/d_menu_save.h" +#include "d/menu/d_menu_letter.h" +#include "d/menu/d_menu_fmap.h" +#include "d/menu/d_menu_dmap.h" +#include "d/menu/d_menu_fishing.h" +#include "d/menu/d_menu_insect.h" +#include "d/menu/d_menu_option.h" +#include "d/menu/d_menu_window_HIO.h" +#include "d/meter/d_meter_HIO.h" +#include "d/msg/d_msg_object.h" +#include "f_op/f_op_msg_mng.h" +#include "Z2AudioLib/Z2AudioMgr.h" #include "dol2asm.h" #include "dolphin/types.h" -// -// Types: -// - -struct mDoGph_gInf_c { - static u8 mFader[4]; - static u8 mFrameBufferTimg[4]; - static u8 mFrameBufferTex[4]; -}; - -struct dMenu_save_c { - /* 801EF6A0 */ dMenu_save_c(); - /* 801EF7AC */ void _create(); - /* 801F0938 */ void initialize(); - /* 801F09AC */ void _open(); - /* 801F0B28 */ void _delete(); - /* 801F1048 */ void _move(); - /* 801F69FC */ void _draw2(); -}; - -struct STControl { - /* 80032044 */ STControl(s16, s16, s16, s16, f32, f32, s16, s16); - /* 80032088 */ void setWaitParm(s16, s16, s16, s16, f32, f32, s16, s16); - /* 8003219C */ void checkTrigger(); -}; - -struct CSTControl {}; - -struct dMenu_Skill_c { - /* 801F7224 */ dMenu_Skill_c(JKRExpHeap*, STControl*, CSTControl*); - /* 801F7718 */ void _move(); - /* 801F7950 */ void isSync(); - /* 801F7A40 */ void _open(); -}; - -struct dMenu_Ring_c { - /* 801E9118 */ dMenu_Ring_c(JKRExpHeap*, STControl*, CSTControl*, u8); - /* 801EAB7C */ void _create(); - /* 801EABE8 */ void _delete(); - /* 801EABEC */ void _move(); - /* 801EB0A4 */ void isOpen(); - /* 801EB2B4 */ void isMoveEnd(); - /* 801EB3CC */ void isClose(); -}; - -struct dMenu_Option_c { - /* 801E1F10 */ dMenu_Option_c(JKRArchive*, STControl*); - /* 801E2C1C */ void _delete(); - /* 801E3408 */ void _move(); - /* 801E3A7C */ void isSync(); - /* 801E3B98 */ void _open(); -}; - -struct dMenu_Letter_c { - /* 801DCDC0 */ dMenu_Letter_c(JKRExpHeap*, STControl*, CSTControl*); - /* 801DD474 */ void _move(); - /* 801DD934 */ void isSync(); - /* 801DDA74 */ void _open(); -}; - -struct dMenu_Insect_c { - /* 801D8114 */ dMenu_Insect_c(JKRExpHeap*, STControl*, CSTControl*, u8); - /* 801D86C8 */ void _move(); - /* 801D88EC */ void isSync(); - /* 801D894C */ void _open(); -}; - -struct dMenu_Fmap_c { - /* 801C66E4 */ dMenu_Fmap_c(JKRExpHeap*, STControl*, CSTControl*, u8, u8, u8, f32, f32, u8); - /* 801C74A4 */ void _delete(); - /* 801C74A8 */ void _move(); - /* 801C7650 */ void _draw(); - /* 801C77F0 */ void getNextStatus(u8*); - /* 801C7AFC */ void isSync(); - /* 801CADC4 */ void isOpen(); - /* 801CB038 */ void isClose(); - /* 801CB1DC */ void getProcess(); - /* 801CB200 */ void getRegionCursor(); - /* 801CB230 */ void getStageCursor(); - /* 801CB260 */ void getStageTransX(); - /* 801CB290 */ void getStageTransZ(); -}; - -struct dMenu_Fishing_c { - /* 801C4D54 */ dMenu_Fishing_c(JKRExpHeap*, STControl*, CSTControl*); - /* 801C50B4 */ void _move(); - /* 801C5204 */ void isSync(); - /* 801C52E4 */ void _open(); -}; - -struct dMenu_Dmap_c { - /* 801BB498 */ dMenu_Dmap_c(JKRExpHeap*, STControl*, CSTControl*, u8, u8); - /* 801BDDA4 */ void _move(); - /* 801BE328 */ void isOpen(); - /* 801BE670 */ void isClose(); - /* 801BE7E0 */ void _draw(); - /* 801BF334 */ void getNextStatus(); - /* 801BF410 */ void isSync(); -}; - -struct dMenu_Collect_c { - /* 801B78C0 */ dMenu_Collect_c(JKRExpHeap*, STControl*, CSTControl*); - /* 801B7A0C */ void _create(); - /* 801B7A44 */ void _delete(); - /* 801B7A7C */ void _move(); - /* 801B7AC0 */ void draw(); -}; - -struct dMenu_Collect2D_c { - /* 801B5F84 */ void isKeyCheck(); - /* 801B5FAC */ bool isOutCheck(); -}; - -struct dDlst_MENU_CAPTURE_c { - /* 801FDFCC */ void draw(); - /* 801FE2E8 */ ~dDlst_MENU_CAPTURE_c(); -}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct JFWDisplay { - static u8 sManager[4]; -}; - // // Forward References: // @@ -377,11 +263,7 @@ extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__12dDlst_base_c[3]; extern "C" extern void* __vt__10CSTControl[4]; extern "C" u8 m_cpadInfo__8mDoCPd_c[256]; -extern "C" extern u8 g_mwHIO[304]; -extern "C" extern u8 g_mwDHIO[520]; -extern "C" extern u8 g_fmapHIO[1188]; extern "C" extern u8 g_clearColor[4]; -extern "C" extern u32 g_blackColor; extern "C" u8 mFader__13mDoGph_gInf_c[4]; extern "C" u8 mFrameBufferTimg__13mDoGph_gInf_c[4]; extern "C" u8 mFrameBufferTex__13mDoGph_gInf_c[4]; @@ -393,6 +275,10 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; // Declarations: // +inline BOOL dComIfGp_event_runCheck() { + return g_dComIfG_gameInfo.play.getEvent().runCheck(); +} + BOOL dMw_UP_TRIGGER() { return (bool)mDoCPd_c::getTrigUp(mDoCPd_c::PAD_0); } @@ -421,16 +307,16 @@ bool dMw_A_TRIGGER() { return mDoCPd_c::getTrigA(mDoCPd_c::PAD_0); } -bool dMw_B_TRIGGER() { - return mDoCPd_c::getTrigB(mDoCPd_c::PAD_0); +BOOL dMw_B_TRIGGER() { + return (bool)mDoCPd_c::getTrigB(mDoCPd_c::PAD_0); } bool dMw_Z_TRIGGER() { return mDoCPd_c::getTrigZ(mDoCPd_c::PAD_0); } -bool dMw_START_TRIGGER() { - return mDoCPd_c::getTrigStart(mDoCPd_c::PAD_0); +BOOL dMw_START_TRIGGER() { + return (bool)mDoCPd_c::getTrigStart(mDoCPd_c::PAD_0); } void dMw_onPauseWindow() { @@ -1242,51 +1128,37 @@ SECTION_DATA static u8 move_proc[420] = { 0x00, 0x00, 0x00, 0x00, }; -/* 803BEF94-803BF014 -00001 0080+00 1/1 0/0 0/0 .data @4360 */ -SECTION_DATA static void* lit_4360[32] = { - (void*)(((char*)key_wait_init__5dMw_cFUc) + 0x94), - (void*)(((char*)key_wait_init__5dMw_cFUc) + 0xBC), - (void*)(((char*)key_wait_init__5dMw_cFUc) + 0xBC), - (void*)(((char*)key_wait_init__5dMw_cFUc) + 0x60), - (void*)(((char*)key_wait_init__5dMw_cFUc) + 0xBC), - (void*)(((char*)key_wait_init__5dMw_cFUc) + 0xBC), - (void*)(((char*)key_wait_init__5dMw_cFUc) + 0x84), - (void*)(((char*)key_wait_init__5dMw_cFUc) + 0xBC), - (void*)(((char*)key_wait_init__5dMw_cFUc) + 0xBC), - (void*)(((char*)key_wait_init__5dMw_cFUc) + 0x74), - (void*)(((char*)key_wait_init__5dMw_cFUc) + 0xBC), - (void*)(((char*)key_wait_init__5dMw_cFUc) + 0xBC), - (void*)(((char*)key_wait_init__5dMw_cFUc) + 0xA0), - (void*)(((char*)key_wait_init__5dMw_cFUc) + 0xBC), - (void*)(((char*)key_wait_init__5dMw_cFUc) + 0xBC), - (void*)(((char*)key_wait_init__5dMw_cFUc) + 0xBC), - (void*)(((char*)key_wait_init__5dMw_cFUc) + 0xBC), - (void*)(((char*)key_wait_init__5dMw_cFUc) + 0xBC), - (void*)(((char*)key_wait_init__5dMw_cFUc) + 0xBC), - (void*)(((char*)key_wait_init__5dMw_cFUc) + 0xBC), - (void*)(((char*)key_wait_init__5dMw_cFUc) + 0xBC), - (void*)(((char*)key_wait_init__5dMw_cFUc) + 0xBC), - (void*)(((char*)key_wait_init__5dMw_cFUc) + 0xBC), - (void*)(((char*)key_wait_init__5dMw_cFUc) + 0xBC), - (void*)(((char*)key_wait_init__5dMw_cFUc) + 0xBC), - (void*)(((char*)key_wait_init__5dMw_cFUc) + 0xBC), - (void*)(((char*)key_wait_init__5dMw_cFUc) + 0xBC), - (void*)(((char*)key_wait_init__5dMw_cFUc) + 0xBC), - (void*)(((char*)key_wait_init__5dMw_cFUc) + 0xBC), - (void*)(((char*)key_wait_init__5dMw_cFUc) + 0xBC), - (void*)(((char*)key_wait_init__5dMw_cFUc) + 0xBC), - (void*)(((char*)key_wait_init__5dMw_cFUc) + 0xB0), -}; - /* 801FA13C-801FA220 1F4A7C 00E4+00 2/0 0/0 0/0 .text key_wait_init__5dMw_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::key_wait_init(u8 param_0) { - nofralloc -#include "asm/d/menu/d_menu_window/key_wait_init__5dMw_cFUc.s" +void dMw_c::key_wait_init(u8 menu_status) { + dMeter2Info_setWindowStatus(0); + dMw_capture_delete(); + + switch (menu_status) { + case COLLECT_CLOSE: + dMw_fade_in(); + dMw_collect_delete(true); + break; + case DMAP_CLOSE: + dMw_dmap_delete(true); + break; + case FMAP_CLOSE: + dMw_fmap_delete(true); + break; + case RING_CLOSE: + dMw_ring_delete(); + break; + case SAVE_CLOSE: + dMw_fade_in(); + dMw_save_delete(); + break; + case INSECT_AGITHA_CLOSE: + dMw_fade_in(); + dMw_insect_delete(); + break; + } + mpHeap->freeAll(); + dComIfGp_offHeapLockFlag(0); } -#pragma pop void dMw_c::ring_open_init(u8 param_0) { dMeter2Info_setWindowStatus(2); @@ -1309,83 +1181,88 @@ SECTION_SDATA2 static u8 lit_4152[4] = { 0x00, }; -/* 804544C4-804544C8 002AC4 0004+00 10/10 0/0 0/0 .sdata2 @4386 */ -SECTION_SDATA2 static f32 lit_4386 = 1.0f; - -/* 804544C8-804544CC 002AC8 0004+00 10/10 0/0 0/0 .sdata2 @4387 */ -SECTION_SDATA2 static f32 lit_4387 = -1.0f; - /* 801FA244-801FA2D0 1F4B84 008C+00 1/0 0/0 0/0 .text collect_open_init__5dMw_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::collect_open_init(u8 param_0) { - nofralloc -#include "asm/d/menu/d_menu_window/collect_open_init__5dMw_cFUc.s" +void dMw_c::collect_open_init(u8 param_0) { + field_0x144 = 3; + dMeter2Info_setWindowStatus(3); + Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MENU_IN, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + dMw_fade_out(); + dMw_capture_create(); + field_0x153 = 0; } -#pragma pop - -/* ############################################################################################## */ -/* 803BF014-803BF080 -00001 006C+00 1/1 0/0 0/0 .data @4418 */ -SECTION_DATA static void* lit_4418[27] = { - (void*)(((char*)collect_move_init__5dMw_cFUc) + 0x3C), - (void*)(((char*)collect_move_init__5dMw_cFUc) + 0x188), - (void*)(((char*)collect_move_init__5dMw_cFUc) + 0x188), - (void*)(((char*)collect_move_init__5dMw_cFUc) + 0x188), - (void*)(((char*)collect_move_init__5dMw_cFUc) + 0x188), - (void*)(((char*)collect_move_init__5dMw_cFUc) + 0x188), - (void*)(((char*)collect_move_init__5dMw_cFUc) + 0x188), - (void*)(((char*)collect_move_init__5dMw_cFUc) + 0x188), - (void*)(((char*)collect_move_init__5dMw_cFUc) + 0x188), - (void*)(((char*)collect_move_init__5dMw_cFUc) + 0x188), - (void*)(((char*)collect_move_init__5dMw_cFUc) + 0x188), - (void*)(((char*)collect_move_init__5dMw_cFUc) + 0x54), - (void*)(((char*)collect_move_init__5dMw_cFUc) + 0x188), - (void*)(((char*)collect_move_init__5dMw_cFUc) + 0x188), - (void*)(((char*)collect_move_init__5dMw_cFUc) + 0x88), - (void*)(((char*)collect_move_init__5dMw_cFUc) + 0x188), - (void*)(((char*)collect_move_init__5dMw_cFUc) + 0x188), - (void*)(((char*)collect_move_init__5dMw_cFUc) + 0xBC), - (void*)(((char*)collect_move_init__5dMw_cFUc) + 0x188), - (void*)(((char*)collect_move_init__5dMw_cFUc) + 0x188), - (void*)(((char*)collect_move_init__5dMw_cFUc) + 0xF0), - (void*)(((char*)collect_move_init__5dMw_cFUc) + 0x188), - (void*)(((char*)collect_move_init__5dMw_cFUc) + 0x188), - (void*)(((char*)collect_move_init__5dMw_cFUc) + 0x124), - (void*)(((char*)collect_move_init__5dMw_cFUc) + 0x188), - (void*)(((char*)collect_move_init__5dMw_cFUc) + 0x188), - (void*)(((char*)collect_move_init__5dMw_cFUc) + 0x158), -}; /* 801FA2D0-801FA46C 1F4C10 019C+00 2/0 0/0 0/0 .text collect_move_init__5dMw_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::collect_move_init(u8 param_0) { - nofralloc -#include "asm/d/menu/d_menu_window/collect_move_init__5dMw_cFUc.s" +void dMw_c::collect_move_init(u8 menu_status) { + switch (menu_status) { + case COLLECT_OPEN: + dMw_fade_in(); + dComIfGp_setHeapLockFlag(1); + dMw_collect_create(); + break; + case SAVE_CLOSE: + dMw_fade_in(); + dMw_save_delete(); + field_0x144 = 3; + dMeter2Info_setWindowStatus(3); + dMw_collect_create(); + break; + case OPTIONS_CLOSE: + dMw_fade_in(); + dMw_option_delete(); + field_0x144 = 3; + dMeter2Info_setWindowStatus(3); + dMw_collect_create(); + break; + case LETTER_CLOSE: + dMw_fade_in(); + dMw_letter_delete(); + field_0x144 = 3; + dMeter2Info_setWindowStatus(3); + dMw_collect_create(); + break; + case FISHING_CLOSE: + dMw_fade_in(); + dMw_fishing_delete(); + field_0x144 = 3; + dMeter2Info_setWindowStatus(3); + dMw_collect_create(); + break; + case SKILL_CLOSE: + dMw_fade_in(); + dMw_skill_delete(); + field_0x144 = 3; + dMeter2Info_setWindowStatus(3); + dMw_collect_create(); + break; + case INSECT_CLOSE: + dMw_fade_in(); + dMw_insect_delete(); + field_0x144 = 3; + dMeter2Info_setWindowStatus(3); + dMw_collect_create(); + break; + } } -#pragma pop /* 801FA46C-801FA538 1F4DAC 00CC+00 1/0 0/0 0/0 .text collect_close_init__5dMw_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::collect_close_init(u8 param_0) { - nofralloc -#include "asm/d/menu/d_menu_window/collect_close_init__5dMw_cFUc.s" +void dMw_c::collect_close_init(u8 param_0) { + if (mpMenuCollect->getSubWindowOpenCheck() != 1 && mpMenuCollect->getSubWindowOpenCheck() != 2) { + if (mpMenuCollect->getSubWindowOpenCheck() == 3 || mpMenuCollect->getSubWindowOpenCheck() == 4 || + mpMenuCollect->getSubWindowOpenCheck() == 5 || mpMenuCollect->getSubWindowOpenCheck() == 6) { + Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MENU_SUB_IN, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + } else { + Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MENU_OUT, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + dMeter2Info_set2DVibrationM(); + } + } + dMw_fade_out(); } -#pragma pop /* 801FA538-801FA55C 1F4E78 0024+00 1/0 0/0 0/0 .text fmap_open_init__5dMw_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::fmap_open_init(u8 param_0) { - nofralloc -#include "asm/d/menu/d_menu_window/fmap_open_init__5dMw_cFUc.s" +void dMw_c::fmap_open_init(u8 param_0) { + dMeter2Info_setWindowStatus(4); + field_0x153 = 0; } -#pragma pop /* 801FA55C-801FA560 1F4E9C 0004+00 1/0 0/0 0/0 .text fmap_move_init__5dMw_cFUc */ void dMw_c::fmap_move_init(u8 param_0) { @@ -1398,14 +1275,10 @@ void dMw_c::fmap_close_init(u8 param_0) { } /* 801FA564-801FA588 1F4EA4 0024+00 1/0 0/0 0/0 .text dmap_open_init__5dMw_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::dmap_open_init(u8 param_0) { - nofralloc -#include "asm/d/menu/d_menu_window/dmap_open_init__5dMw_cFUc.s" +void dMw_c::dmap_open_init(u8 param_0) { + dMeter2Info_setWindowStatus(5); + field_0x153 = 0; } -#pragma pop /* 801FA588-801FA58C 1F4EC8 0004+00 1/0 0/0 0/0 .text dmap_move_init__5dMw_cFUc */ void dMw_c::dmap_move_init(u8 param_0) { @@ -1419,14 +1292,12 @@ void dMw_c::dmap_close_init(u8 param_0) { /* 801FA590-801FA5E4 1F4ED0 0054+00 1/0 0/0 0/0 .text collect_save_open_init__5dMw_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::collect_save_open_init(u8 param_0) { - nofralloc -#include "asm/d/menu/d_menu_window/collect_save_open_init__5dMw_cFUc.s" +void dMw_c::collect_save_open_init(u8 param_0) { + field_0x144 = 10; + dMeter2Info_setWindowStatus(10); + dMw_collect_delete(true); + dMw_save_create(); } -#pragma pop /* 801FA5E4-801FA5E8 1F4F24 0004+00 1/0 0/0 0/0 .text collect_save_move_init__5dMw_cFUc */ @@ -1436,25 +1307,18 @@ void dMw_c::collect_save_move_init(u8 param_0) { /* 801FA5E8-801FA608 1F4F28 0020+00 1/0 0/0 0/0 .text collect_save_close_init__5dMw_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::collect_save_close_init(u8 param_0) { - nofralloc -#include "asm/d/menu/d_menu_window/collect_save_close_init__5dMw_cFUc.s" +void dMw_c::collect_save_close_init(u8 param_0) { + dMw_fade_out(); } -#pragma pop /* 801FA608-801FA65C 1F4F48 0054+00 1/0 0/0 0/0 .text collect_option_open_init__5dMw_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::collect_option_open_init(u8 param_0) { - nofralloc -#include "asm/d/menu/d_menu_window/collect_option_open_init__5dMw_cFUc.s" +void dMw_c::collect_option_open_init(u8 param_0) { + field_0x144 = 10; + dMeter2Info_setWindowStatus(10); + dMw_collect_delete(true); + dMw_option_create(); } -#pragma pop /* 801FA65C-801FA660 1F4F9C 0004+00 1/0 0/0 0/0 .text collect_option_move_init__5dMw_cFUc */ @@ -1463,25 +1327,19 @@ void dMw_c::collect_option_move_init(u8 param_0) { } /* 801FA660-801FA680 1F4FA0 0020+00 1/0 0/0 0/0 .text collect_option_close_init__5dMw_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::collect_option_close_init(u8 param_0) { - nofralloc -#include "asm/d/menu/d_menu_window/collect_option_close_init__5dMw_cFUc.s" +void dMw_c::collect_option_close_init(u8 param_0) { + dMw_fade_out(); } -#pragma pop /* 801FA680-801FA6DC 1F4FC0 005C+00 1/0 0/0 0/0 .text collect_letter_open_init__5dMw_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::collect_letter_open_init(u8 param_0) { - nofralloc -#include "asm/d/menu/d_menu_window/collect_letter_open_init__5dMw_cFUc.s" +void dMw_c::collect_letter_open_init(u8 param_0) { + field_0x144 = 10; + dMeter2Info_setWindowStatus(10); + field_0x152 = 0; + dMw_collect_delete(true); + dMw_letter_create(); } -#pragma pop /* 801FA6DC-801FA6E0 1F501C 0004+00 1/0 0/0 0/0 .text collect_letter_move_init__5dMw_cFUc */ @@ -1490,24 +1348,20 @@ void dMw_c::collect_letter_move_init(u8 param_0) { } /* 801FA6E0-801FA738 1F5020 0058+00 1/0 0/0 0/0 .text collect_letter_close_init__5dMw_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::collect_letter_close_init(u8 param_0) { - nofralloc -#include "asm/d/menu/d_menu_window/collect_letter_close_init__5dMw_cFUc.s" +void dMw_c::collect_letter_close_init(u8 param_0) { + Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MENU_SUB_OUT, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + dMeter2Info_set2DVibration(); + dMw_fade_out(); } -#pragma pop /* 801FA738-801FA794 1F5078 005C+00 1/0 0/0 0/0 .text collect_fishing_open_init__5dMw_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::collect_fishing_open_init(u8 param_0) { - nofralloc -#include "asm/d/menu/d_menu_window/collect_fishing_open_init__5dMw_cFUc.s" +void dMw_c::collect_fishing_open_init(u8 param_0) { + field_0x144 = 10; + dMeter2Info_setWindowStatus(10); + field_0x152 = 0; + dMw_collect_delete(true); + dMw_fishing_create(); } -#pragma pop /* 801FA794-801FA798 1F50D4 0004+00 1/0 0/0 0/0 .text collect_fishing_move_init__5dMw_cFUc */ void dMw_c::collect_fishing_move_init(u8 param_0) { @@ -1515,25 +1369,21 @@ void dMw_c::collect_fishing_move_init(u8 param_0) { } /* 801FA798-801FA7F0 1F50D8 0058+00 1/0 0/0 0/0 .text collect_fishing_close_init__5dMw_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::collect_fishing_close_init(u8 param_0) { - nofralloc -#include "asm/d/menu/d_menu_window/collect_fishing_close_init__5dMw_cFUc.s" +void dMw_c::collect_fishing_close_init(u8 param_0) { + Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MENU_SUB_OUT, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + dMeter2Info_set2DVibration(); + dMw_fade_out(); } -#pragma pop /* 801FA7F0-801FA84C 1F5130 005C+00 1/0 0/0 0/0 .text collect_skill_open_init__5dMw_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::collect_skill_open_init(u8 param_0) { - nofralloc -#include "asm/d/menu/d_menu_window/collect_skill_open_init__5dMw_cFUc.s" +void dMw_c::collect_skill_open_init(u8 param_0) { + field_0x144 = 10; + dMeter2Info_setWindowStatus(10); + field_0x152 = 0; + dMw_collect_delete(true); + dMw_skill_create(); } -#pragma pop /* 801FA84C-801FA850 1F518C 0004+00 1/0 0/0 0/0 .text collect_skill_move_init__5dMw_cFUc */ @@ -1543,25 +1393,21 @@ void dMw_c::collect_skill_move_init(u8 param_0) { /* 801FA850-801FA8A8 1F5190 0058+00 1/0 0/0 0/0 .text collect_skill_close_init__5dMw_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::collect_skill_close_init(u8 param_0) { - nofralloc -#include "asm/d/menu/d_menu_window/collect_skill_close_init__5dMw_cFUc.s" +void dMw_c::collect_skill_close_init(u8 param_0) { + Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MENU_SUB_OUT, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + dMeter2Info_set2DVibration(); + dMw_fade_out(); } -#pragma pop /* 801FA8A8-801FA908 1F51E8 0060+00 1/0 0/0 0/0 .text collect_insect_open_init__5dMw_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::collect_insect_open_init(u8 param_0) { - nofralloc -#include "asm/d/menu/d_menu_window/collect_insect_open_init__5dMw_cFUc.s" +void dMw_c::collect_insect_open_init(u8 param_0) { + field_0x144 = 10; + dMeter2Info_setWindowStatus(10); + field_0x152 = 0; + dMw_collect_delete(true); + dMw_insect_create(0); } -#pragma pop /* 801FA908-801FA90C 1F5248 0004+00 1/0 0/0 0/0 .text collect_insect_move_init__5dMw_cFUc */ @@ -1570,24 +1416,20 @@ void dMw_c::collect_insect_move_init(u8 param_0) { } /* 801FA90C-801FA964 1F524C 0058+00 1/0 0/0 0/0 .text collect_insect_close_init__5dMw_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::collect_insect_close_init(u8 param_0) { - nofralloc -#include "asm/d/menu/d_menu_window/collect_insect_close_init__5dMw_cFUc.s" +void dMw_c::collect_insect_close_init(u8 param_0) { + Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MENU_SUB_OUT, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + dMeter2Info_set2DVibration(); + dMw_fade_out(); } -#pragma pop /* 801FA964-801FA9E8 1F52A4 0084+00 1/0 0/0 0/0 .text insect_open_init__5dMw_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::insect_open_init(u8 param_0) { - nofralloc -#include "asm/d/menu/d_menu_window/insect_open_init__5dMw_cFUc.s" +void dMw_c::insect_open_init(u8 param_0) { + field_0x144 = 10; + dMeter2Info_setWindowStatus(10); + Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MENU_SUB_IN, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + dMw_fade_out(); + dMw_capture_create(); } -#pragma pop /* 801FA9E8-801FA9EC 1F5328 0004+00 1/0 0/0 0/0 .text insect_open2_init__5dMw_cFUc */ void dMw_c::insect_open2_init(u8 param_0) { @@ -1600,14 +1442,11 @@ void dMw_c::insect_move_init(u8 param_0) { } /* 801FA9F0-801FAA48 1F5330 0058+00 1/0 0/0 0/0 .text insect_close_init__5dMw_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::insect_close_init(u8 param_0) { - nofralloc -#include "asm/d/menu/d_menu_window/insect_close_init__5dMw_cFUc.s" +void dMw_c::insect_close_init(u8 param_0) { + Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MENU_SUB_OUT, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + dMeter2Info_set2DVibration(); + dMw_fade_out(); } -#pragma pop /* 801FAA48-801FAFDC 1F5388 0594+00 1/0 0/0 0/0 .text key_wait_proc__5dMw_cFv */ #pragma push @@ -1620,365 +1459,459 @@ asm void dMw_c::key_wait_proc() { #pragma pop /* 801FAFDC-801FB01C 1F591C 0040+00 1/0 0/0 0/0 .text ring_open_proc__5dMw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::ring_open_proc() { - nofralloc -#include "asm/d/menu/d_menu_window/ring_open_proc__5dMw_cFv.s" +void dMw_c::ring_open_proc() { + if (mpMenuRing->isOpen()) { + mMenuStatus = RING_MOVE; + } } -#pragma pop /* 801FB01C-801FB064 1F595C 0048+00 1/0 0/0 0/0 .text ring_move_proc__5dMw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::ring_move_proc() { - nofralloc -#include "asm/d/menu/d_menu_window/ring_move_proc__5dMw_cFv.s" +void dMw_c::ring_move_proc() { + mpMenuRing->_move(); + if (mpMenuRing->isMoveEnd()) { + mMenuStatus = RING_CLOSE; + } } -#pragma pop /* 801FB064-801FB0B8 1F59A4 0054+00 1/0 0/0 0/0 .text ring_close_proc__5dMw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::ring_close_proc() { - nofralloc -#include "asm/d/menu/d_menu_window/ring_close_proc__5dMw_cFv.s" +void dMw_c::ring_close_proc() { + if (mpMenuRing->isClose()) { + dMeter2Info_offMenuInForce(2); + mMenuStatus = NO_MENU; + } } -#pragma pop /* 801FB0B8-801FB110 1F59F8 0058+00 1/0 0/0 0/0 .text collect_open_proc__5dMw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::collect_open_proc() { - nofralloc -#include "asm/d/menu/d_menu_window/collect_open_proc__5dMw_cFv.s" +void dMw_c::collect_open_proc() { + if (field_0x153 == 0) { + field_0x153 = 1; + dMeter2Info_set2DVibrationM(); + } + + if (mDoGph_gInf_c::getFader()->getStatus() == JUTFader::UNKSTATUS_0) { + mMenuStatus = COLLECT_MOVE; + } } -#pragma pop /* 801FB110-801FB1A0 1F5A50 0090+00 1/0 0/0 0/0 .text collect_move_proc__5dMw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::collect_move_proc() { - nofralloc -#include "asm/d/menu/d_menu_window/collect_move_proc__5dMw_cFv.s" +void dMw_c::collect_move_proc() { + if (mpMenuCollect->getSubWindowOpenCheck()) { + mMenuStatus = COLLECT_CLOSE; + } else { + if ((dMw_isPush_S_Button() && !mpMenuCollect->isKeyCheck()) || mpMenuCollect->isOutCheck()) { + mMenuStatus = COLLECT_CLOSE; + } else { + mpMenuCollect->_move(); + } + } } -#pragma pop /* 801FB1A0-801FB240 1F5AE0 00A0+00 1/0 0/0 0/0 .text collect_close_proc__5dMw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::collect_close_proc() { - nofralloc -#include "asm/d/menu/d_menu_window/collect_close_proc__5dMw_cFv.s" +void dMw_c::collect_close_proc() { + if (mDoGph_gInf_c::getFader()->getStatus() == 0) { + if (mpMenuCollect->getSubWindowOpenCheck() == 1) { + mMenuStatus = SAVE_OPEN; + return; + } + + if (mpMenuCollect->getSubWindowOpenCheck() == 2) { + mMenuStatus = OPTIONS_OPEN; + return; + } + + if (mpMenuCollect->getSubWindowOpenCheck() == 3) { + mMenuStatus = LETTER_OPEN; + return; + } + + if (mpMenuCollect->getSubWindowOpenCheck() == 4) { + mMenuStatus = FISHING_OPEN; + return; + } + + if (mpMenuCollect->getSubWindowOpenCheck() == 5) { + mMenuStatus = SKILL_OPEN; + return; + } + + if (mpMenuCollect->getSubWindowOpenCheck() == 6) { + mMenuStatus = INSECT_OPEN; + return; + } + mMenuStatus = NO_MENU; + } } -#pragma pop /* 801FB240-801FB298 1F5B80 0058+00 1/0 0/0 0/0 .text fmap_open_proc__5dMw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::fmap_open_proc() { - nofralloc -#include "asm/d/menu/d_menu_window/fmap_open_proc__5dMw_cFv.s" +void dMw_c::fmap_open_proc() { + if (field_0x153 == 0) { + field_0x153 = 1; + dMeter2Info_set2DVibrationM(); + } + + if (mpMenuFmap->isOpen()) { + mMenuStatus = FMAP_MOVE; + } } -#pragma pop /* 801FB298-801FB36C 1F5BD8 00D4+00 1/0 0/0 0/0 .text fmap_move_proc__5dMw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::fmap_move_proc() { - nofralloc -#include "asm/d/menu/d_menu_window/fmap_move_proc__5dMw_cFv.s" +void dMw_c::fmap_move_proc() { + mpMenuFmap->_move(); + + if (mDoGph_gInf_c::getFader()->getStatus() == 1) { + mMenuStatus = mpMenuFmap->getNextStatus(&field_0x14B); + + if (g_fmapHIO.field_0x2f9 != 0) { + mMenuStatus = FMAP_CLOSE; + Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MAP_CLOSE_L, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + } + + if (dMeter2Info_getMeterMapClass() != NULL) { + if (dMeter2Info_getMapStatus() == 1) { + dMeter2Info_getMeterMapClass()->setDispPosInsideFlg_SE_On(); + } else if (dMeter2Info_getMapStatus() == 0) { + dMeter2Info_getMeterMapClass()->setDispPosOutsideFlg_SE_On(); + } + } + } } -#pragma pop /* 801FB36C-801FB3AC 1F5CAC 0040+00 1/0 0/0 0/0 .text fmap_close_proc__5dMw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::fmap_close_proc() { - nofralloc -#include "asm/d/menu/d_menu_window/fmap_close_proc__5dMw_cFv.s" +void dMw_c::fmap_close_proc() { + if (mpMenuFmap->isClose()) { + mMenuStatus = NO_MENU; + } } -#pragma pop /* 801FB3AC-801FB404 1F5CEC 0058+00 1/0 0/0 0/0 .text dmap_open_proc__5dMw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::dmap_open_proc() { - nofralloc -#include "asm/d/menu/d_menu_window/dmap_open_proc__5dMw_cFv.s" +void dMw_c::dmap_open_proc() { + if (field_0x153 == 0) { + field_0x153 = 1; + dMeter2Info_set2DVibrationM(); + } + + if (mpMenuDmap->isOpen()) { + mMenuStatus = DMAP_MOVE; + } } -#pragma pop /* 801FB404-801FB5DC 1F5D44 01D8+00 1/0 0/0 0/0 .text dmap_move_proc__5dMw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::dmap_move_proc() { - nofralloc -#include "asm/d/menu/d_menu_window/dmap_move_proc__5dMw_cFv.s" +void dMw_c::dmap_move_proc() { + u8 nextStatus = mpMenuDmap->getNextStatus(); + if (nextStatus == 1) { + if (dMeterMap_c::isEnableDispMapAndMapDispSizeTypeNo()) { + dMeter2Info_setMapStatus(1); + dMeter2Info_getMeterMapClass()->setDispPosInsideFlg_SE_On(); + } else { + dMeter2Info_setMapStatus(0); + dMeter2Info_getMeterMapClass()->setDispPosOutsideFlg_SE_On(); + } + dMeter2Info_setMapKeyDirection(0x200); + mMenuStatus = DMAP_CLOSE; + mpMenuDmap->setInOutDir(3); + Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MAP_CLOSE_L, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + } else if (nextStatus == 2) { + dMeter2Info_setMapStatus(0); + dMeter2Info_setMapKeyDirection(0x400); + mMenuStatus = DMAP_CLOSE; + dMeter2Info_getMeterMapClass()->setDispPosOutsideFlg_SE_On(); + mpMenuDmap->setInOutDir(1); + Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MAP_CLOSE_L, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + } else if (nextStatus == 3) { + if (dMeterMap_c::isEnableDispMapAndMapDispSizeTypeNo()) { + dMeter2Info_setMapStatus(1); + } else { + dMeter2Info_setMapStatus(0); + } + + mMenuStatus = DMAP_CLOSE; + mpMenuDmap->setInOutDir(2); + Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MAP_CLOSE_L, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + } else { + mpMenuDmap->_move(); + } } -#pragma pop /* 801FB5DC-801FB61C 1F5F1C 0040+00 1/0 0/0 0/0 .text dmap_close_proc__5dMw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::dmap_close_proc() { - nofralloc -#include "asm/d/menu/d_menu_window/dmap_close_proc__5dMw_cFv.s" +void dMw_c::dmap_close_proc() { + if (mpMenuDmap->isClose()) { + mMenuStatus = NO_MENU; + } } -#pragma pop /* 801FB61C-801FB67C 1F5F5C 0060+00 1/0 0/0 0/0 .text collect_save_open_proc__5dMw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::collect_save_open_proc() { - nofralloc -#include "asm/d/menu/d_menu_window/collect_save_open_proc__5dMw_cFv.s" +void dMw_c::collect_save_open_proc() { + if (mpMenuSave->getSaveStatus() == 1 && mpMenuSave->_open()) { + dMw_fade_in(); + } + + if (mpMenuSave->getSaveStatus() == 2) { + mMenuStatus = SAVE_MOVE; + } } -#pragma pop /* 801FB67C-801FB6D8 1F5FBC 005C+00 1/0 0/0 0/0 .text collect_save_move_proc__5dMw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::collect_save_move_proc() { - nofralloc -#include "asm/d/menu/d_menu_window/collect_save_move_proc__5dMw_cFv.s" +void dMw_c::collect_save_move_proc() { + if (mpMenuSave->getSaveStatus() == 2) { + mpMenuSave->_move(); + } + + if (mpMenuSave->getSaveStatus() == 3 || mpMenuSave->getSaveStatus() == 4) { + mMenuStatus = SAVE_CLOSE; + } } -#pragma pop /* 801FB6D8-801FB73C 1F6018 0064+00 1/0 0/0 0/0 .text collect_save_close_proc__5dMw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::collect_save_close_proc() { - nofralloc -#include "asm/d/menu/d_menu_window/collect_save_close_proc__5dMw_cFv.s" +void dMw_c::collect_save_close_proc() { + if (mDoGph_gInf_c::getFader()->getStatus() == 0) { + mpMenuSave->_move(); + + if (mpMenuSave->getSaveStatus() == 3) { + mMenuStatus = COLLECT_MOVE; + } else { + mMenuStatus = NO_MENU; + } + } } -#pragma pop /* 801FB73C-801FB7AC 1F607C 0070+00 1/0 0/0 0/0 .text collect_option_open_proc__5dMw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::collect_option_open_proc() { - nofralloc -#include "asm/d/menu/d_menu_window/collect_option_open_proc__5dMw_cFv.s" +void dMw_c::collect_option_open_proc() { + if (mpMenuOption->getQuitStatus() == 1 && mpMenuOption->_open()) { + dMw_fade_in(); + } + + if (mpMenuOption->getQuitStatus() == 2 && mDoGph_gInf_c::getFader()->getStatus() == 1) { + mMenuStatus = OPTIONS_MOVE; + } } -#pragma pop /* 801FB7AC-801FB800 1F60EC 0054+00 1/0 0/0 0/0 .text collect_option_move_proc__5dMw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::collect_option_move_proc() { - nofralloc -#include "asm/d/menu/d_menu_window/collect_option_move_proc__5dMw_cFv.s" +void dMw_c::collect_option_move_proc() { + if (mpMenuOption->getQuitStatus() == 2) { + mpMenuOption->_move(); + } + + if (mpMenuOption->getQuitStatus() == 3) { + mMenuStatus = OPTIONS_CLOSE; + } } -#pragma pop /* 801FB800-801FB81C 1F6140 001C+00 1/0 0/0 0/0 .text collect_option_close_proc__5dMw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::collect_option_close_proc() { - nofralloc -#include "asm/d/menu/d_menu_window/collect_option_close_proc__5dMw_cFv.s" +void dMw_c::collect_option_close_proc() { + if (mDoGph_gInf_c::getFader()->getStatus() != 0) { + return; + } + mMenuStatus = COLLECT_MOVE; } -#pragma pop /* 801FB81C-801FB8AC 1F615C 0090+00 1/0 0/0 0/0 .text collect_letter_open_proc__5dMw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::collect_letter_open_proc() { - nofralloc -#include "asm/d/menu/d_menu_window/collect_letter_open_proc__5dMw_cFv.s" +void dMw_c::collect_letter_open_proc() { + if (mpMenuLetter->getStatus() == 1) { + mpMenuLetter->_open(); + + if (field_0x152 == 0 && mpMenuLetter->isSync()) { + dMw_fade_in(); + field_0x152 = 1; + } + } + + if (mpMenuLetter->getStatus() == 2 && field_0x152 == 1) { + mMenuStatus = LETTER_MOVE; + field_0x152 = 0; + } } -#pragma pop /* 801FB8AC-801FB900 1F61EC 0054+00 1/0 0/0 0/0 .text collect_letter_move_proc__5dMw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::collect_letter_move_proc() { - nofralloc -#include "asm/d/menu/d_menu_window/collect_letter_move_proc__5dMw_cFv.s" +void dMw_c::collect_letter_move_proc() { + if (mpMenuLetter->getStatus() == 2) { + mpMenuLetter->_move(); + } + + if (mpMenuLetter->getStatus() == 3) { + mMenuStatus = LETTER_CLOSE; + } } -#pragma pop /* 801FB900-801FB91C 1F6240 001C+00 1/0 0/0 0/0 .text collect_letter_close_proc__5dMw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::collect_letter_close_proc() { - nofralloc -#include "asm/d/menu/d_menu_window/collect_letter_close_proc__5dMw_cFv.s" +void dMw_c::collect_letter_close_proc() { + if (mDoGph_gInf_c::getFader()->getStatus() != JUTFader::UNKSTATUS_0) { + return; + } + mMenuStatus = COLLECT_MOVE; } -#pragma pop /* 801FB91C-801FB9AC 1F625C 0090+00 1/0 0/0 0/0 .text collect_fishing_open_proc__5dMw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::collect_fishing_open_proc() { - nofralloc -#include "asm/d/menu/d_menu_window/collect_fishing_open_proc__5dMw_cFv.s" +void dMw_c::collect_fishing_open_proc() { + if (mpMenuFishing->getStatus() == 1) { + mpMenuFishing->_open(); + + if (field_0x152 == 0 && mpMenuFishing->isSync()) { + dMw_fade_in(); + field_0x152 = 1; + } + } + + if (mpMenuFishing->getStatus() == 2 && field_0x152 == 1) { + mMenuStatus = FISHING_MOVE; + field_0x152 = 0; + } } -#pragma pop /* 801FB9AC-801FBA00 1F62EC 0054+00 1/0 0/0 0/0 .text collect_fishing_move_proc__5dMw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::collect_fishing_move_proc() { - nofralloc -#include "asm/d/menu/d_menu_window/collect_fishing_move_proc__5dMw_cFv.s" +void dMw_c::collect_fishing_move_proc() { + if (mpMenuFishing->getStatus() == 2) { + mpMenuFishing->_move(); + } + + if (mpMenuFishing->getStatus() == 3) { + mMenuStatus = FISHING_CLOSE; + } } -#pragma pop /* 801FBA00-801FBA1C 1F6340 001C+00 1/0 0/0 0/0 .text collect_fishing_close_proc__5dMw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::collect_fishing_close_proc() { - nofralloc -#include "asm/d/menu/d_menu_window/collect_fishing_close_proc__5dMw_cFv.s" +void dMw_c::collect_fishing_close_proc() { + if (mDoGph_gInf_c::getFader()->getStatus() != JUTFader::UNKSTATUS_0) { + return; + } + mMenuStatus = COLLECT_MOVE; } -#pragma pop /* 801FBA1C-801FBAAC 1F635C 0090+00 1/0 0/0 0/0 .text collect_skill_open_proc__5dMw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::collect_skill_open_proc() { - nofralloc -#include "asm/d/menu/d_menu_window/collect_skill_open_proc__5dMw_cFv.s" +void dMw_c::collect_skill_open_proc() { + if (mpMenuSkill->getStatus() == 1) { + mpMenuSkill->_open(); + if (field_0x152 == 0 && mpMenuSkill->isSync()) { + dMw_fade_in(); + field_0x152 = 1; + } + } + + if (mpMenuSkill->getStatus() == 2 && field_0x152 == 1) { + mMenuStatus = SKILL_MOVE; + field_0x152 = 0; + } } -#pragma pop /* 801FBAAC-801FBB00 1F63EC 0054+00 1/0 0/0 0/0 .text collect_skill_move_proc__5dMw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::collect_skill_move_proc() { - nofralloc -#include "asm/d/menu/d_menu_window/collect_skill_move_proc__5dMw_cFv.s" +void dMw_c::collect_skill_move_proc() { + if (mpMenuSkill->getStatus() == 2) { + mpMenuSkill->_move(); + } + + if (mpMenuSkill->getStatus() == 3) { + mMenuStatus = SKILL_CLOSE; + } } -#pragma pop /* 801FBB00-801FBB1C 1F6440 001C+00 1/0 0/0 0/0 .text collect_skill_close_proc__5dMw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::collect_skill_close_proc() { - nofralloc -#include "asm/d/menu/d_menu_window/collect_skill_close_proc__5dMw_cFv.s" +void dMw_c::collect_skill_close_proc() { + if (mDoGph_gInf_c::getFader()->getStatus() != JUTFader::UNKSTATUS_0) { + return; + } + mMenuStatus = COLLECT_MOVE; } -#pragma pop /* 801FBB1C-801FBBAC 1F645C 0090+00 1/0 0/0 0/0 .text collect_insect_open_proc__5dMw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::collect_insect_open_proc() { - nofralloc -#include "asm/d/menu/d_menu_window/collect_insect_open_proc__5dMw_cFv.s" +void dMw_c::collect_insect_open_proc() { + if (mpMenuInsect->getStatus() == 1) { + mpMenuInsect->_open(); + if (field_0x152 == 0 && mpMenuInsect->isSync()) { + dMw_fade_in(); + field_0x152 = 1; + } + } + + if (mpMenuInsect->getStatus() == 2 && field_0x152 == 1) { + mMenuStatus = INSECT_MOVE; + field_0x152 = 0; + } } -#pragma pop /* 801FBBAC-801FBC00 1F64EC 0054+00 1/0 0/0 0/0 .text collect_insect_move_proc__5dMw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::collect_insect_move_proc() { - nofralloc -#include "asm/d/menu/d_menu_window/collect_insect_move_proc__5dMw_cFv.s" +void dMw_c::collect_insect_move_proc() { + if (mpMenuInsect->getStatus() == 2) { + mpMenuInsect->_move(); + } + + if (mpMenuInsect->getStatus() == 3) { + mMenuStatus = INSECT_CLOSE; + } } -#pragma pop /* 801FBC00-801FBC1C 1F6540 001C+00 1/0 0/0 0/0 .text collect_insect_close_proc__5dMw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::collect_insect_close_proc() { - nofralloc -#include "asm/d/menu/d_menu_window/collect_insect_close_proc__5dMw_cFv.s" +void dMw_c::collect_insect_close_proc() { + if (mDoGph_gInf_c::getFader()->getStatus() != JUTFader::UNKSTATUS_0) { + return; + } + mMenuStatus = COLLECT_MOVE; } -#pragma pop /* 801FBC1C-801FBC78 1F655C 005C+00 1/0 0/0 0/0 .text insect_open_proc__5dMw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::insect_open_proc() { - nofralloc -#include "asm/d/menu/d_menu_window/insect_open_proc__5dMw_cFv.s" +void dMw_c::insect_open_proc() { + if (mDoGph_gInf_c::getFader()->getStatus() == JUTFader::UNKSTATUS_0) { + field_0x152 = 0; + dComIfGp_setHeapLockFlag(1); + dMw_insect_create(1); + mMenuStatus = INSECT_AGITHA_OPEN2; + } } -#pragma pop /* 801FBC78-801FBD08 1F65B8 0090+00 1/0 0/0 0/0 .text insect_open2_proc__5dMw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::insect_open2_proc() { - nofralloc -#include "asm/d/menu/d_menu_window/insect_open2_proc__5dMw_cFv.s" +void dMw_c::insect_open2_proc() { + if (mpMenuInsect->getStatus() == 1) { + mpMenuInsect->_open(); + if (field_0x152 == 0 && mpMenuInsect->isSync()) { + dMw_fade_in(); + field_0x152 = 1; + } + } + + if (mpMenuInsect->getStatus() == 2 && field_0x152 == 1) { + mMenuStatus = INSECT_AGITHA_MOVE; + field_0x152 = 0; + } } -#pragma pop /* 801FBD08-801FBD64 1F6648 005C+00 1/0 0/0 0/0 .text insect_move_proc__5dMw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::insect_move_proc() { - nofralloc -#include "asm/d/menu/d_menu_window/insect_move_proc__5dMw_cFv.s" +void dMw_c::insect_move_proc() { + if (mpMenuInsect != NULL) { + if (mpMenuInsect->getStatus() == 2) { + mpMenuInsect->_move(); + } + + if (mpMenuInsect->getStatus() == 3) { + mMenuStatus = INSECT_AGITHA_CLOSE; + } + } } -#pragma pop /* 801FBD64-801FBD80 1F66A4 001C+00 1/0 0/0 0/0 .text insect_close_proc__5dMw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::insect_close_proc() { - nofralloc -#include "asm/d/menu/d_menu_window/insect_close_proc__5dMw_cFv.s" +void dMw_c::insect_close_proc() { + if (mDoGph_gInf_c::getFader()->getStatus() != JUTFader::UNKSTATUS_0) { + return; + } + mMenuStatus = NO_MENU; } -#pragma pop /* ############################################################################################## */ /* 803BF080-803BF094 -00001 0014+00 1/0 0/0 0/0 .data l_dMw_Method */ -SECTION_DATA static void* l_dMw_Method[5] = { - (void*)dMw_Create__FP9msg_class, (void*)dMw_Delete__FP5dMw_c, (void*)dMw_Execute__FP5dMw_c, - (void*)dMw_IsDelete__FP5dMw_c, (void*)dMw_Draw__FP5dMw_c, +static dMw_Method l_dMw_Method[5] = { + (dMw_Method)dMw_Create, dMw_Delete, dMw_Execute, dMw_IsDelete, dMw_Draw, }; /* 803BF094-803BF0D4 -00001 0028+18 0/0 0/0 1/0 .data g_profile_MENUWINDOW */ @@ -2013,276 +1946,425 @@ SECTION_DATA extern void* __vt__20dDlst_MENU_CAPTURE_c[4 + 1 /* padding */] = { }; /* 801FBD80-801FBE14 1F66C0 0094+00 2/2 0/0 0/0 .text dMw_capture_create__5dMw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::dMw_capture_create() { - nofralloc -#include "asm/d/menu/d_menu_window/dMw_capture_create__5dMw_cFv.s" +void dMw_c::dMw_capture_create() { + if (!dComIfGp_isPauseFlag() && mpCapture == NULL) { + mpCapture = new dDlst_MENU_CAPTURE_c(); + mpCapture->setCaptureFlag(); + } } -#pragma pop /* 801FBE14-801FBE94 1F6754 0080+00 2/2 0/0 0/0 .text dMw_capture_delete__5dMw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::dMw_capture_delete() { - nofralloc -#include "asm/d/menu/d_menu_window/dMw_capture_delete__5dMw_cFv.s" +void dMw_c::dMw_capture_delete() { + if (dComIfGp_isPauseFlag()) { + if (mpCapture != NULL) { + delete mpCapture; + mpCapture = NULL; + } + dComIfGp_offPauseFlag(); + field_0x151 = 2; + } } -#pragma pop /* 801FBE94-801FBF60 1F67D4 00CC+00 1/1 0/0 0/0 .text dMw_ring_create__5dMw_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::dMw_ring_create(u8 param_0) { - nofralloc -#include "asm/d/menu/d_menu_window/dMw_ring_create__5dMw_cFUc.s" +void dMw_c::dMw_ring_create(u8 param_0) { + markMemSize(); + dComIfGp_setHeapLockFlag(1); + + mpMenuRing = new dMenu_Ring_c(mpHeap, mpStick, mpCStick, param_0); + mpMenuRing->_create(); + + if (mpCapture == NULL) { + mpCapture = new dDlst_MENU_CAPTURE_c(); + } + + mpCapture->setCaptureFlag(); } -#pragma pop /* 801FBF60-801FBFF8 1F68A0 0098+00 2/2 0/0 0/0 .text dMw_ring_delete__5dMw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::dMw_ring_delete() { - nofralloc -#include "asm/d/menu/d_menu_window/dMw_ring_delete__5dMw_cFv.s" +bool dMw_c::dMw_ring_delete() { + if (mpMenuRing != NULL) { + mpMenuRing->_delete(); + delete mpMenuRing; + mpMenuRing = NULL; + } + + if (mpCapture != NULL) { + delete mpCapture; + mpCapture = NULL; + } + + checkMemSize(); + return true; } -#pragma pop /* 801FBFF8-801FC090 1F6938 0098+00 1/1 0/0 0/0 .text dMw_collect_create__5dMw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::dMw_collect_create() { - nofralloc -#include "asm/d/menu/d_menu_window/dMw_collect_create__5dMw_cFv.s" +void dMw_c::dMw_collect_create() { + markMemSize(); + + mpMenuCollect = new dMenu_Collect_c(mpHeap, mpStick, mpCStick); + mpMenuCollect->_create(); + + if (mDoCPd_c::getHoldLockL(mDoCPd_c::PAD_0)) { + dMw_onButtonBit(1); + } + else if (mDoCPd_c::getHoldLockR(mDoCPd_c::PAD_0)) { + dMw_onButtonBit(2); + } } -#pragma pop /* 801FC090-801FC0FC 1F69D0 006C+00 8/8 0/0 0/0 .text dMw_collect_delete__5dMw_cFb */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::dMw_collect_delete(bool param_0) { - nofralloc -#include "asm/d/menu/d_menu_window/dMw_collect_delete__5dMw_cFb.s" +bool dMw_c::dMw_collect_delete(bool param_0) { + if (mpMenuCollect != NULL) { + mpMenuCollect->_delete(); + delete mpMenuCollect; + mpMenuCollect = NULL; + } + checkMemSize(); + return true; } -#pragma pop /* 801FC0FC-801FC264 1F6A3C 0168+00 1/1 0/0 0/0 .text dMw_fmap_create__5dMw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::dMw_fmap_create() { - nofralloc -#include "asm/d/menu/d_menu_window/dMw_fmap_create__5dMw_cFv.s" +void dMw_c::dMw_fmap_create() { + markMemSize(); + dComIfGp_setHeapLockFlag(2); + + u8 tmp = 0; + if (dMeter2Info_getMapKeyDirection() == 0x400 || + dMeter2Info_getMapStatus() == 3 || + dMeter2Info_getMapStatus() == 4 || + dMeter2Info_getMapStatus() == 5 || + dMeter2Info_getMapStatus() == 7 || + dMeter2Info_getMapStatus() == 8 || + dMeter2Info_getMapStatus() == 9 || + dMeter2Info_getMapStatus() == 6) { + tmp = 1; + } else if (dMeter2Info_getMapKeyDirection() == 0x200) { + tmp = 3; + } else if (dMeter2Info_getMapKeyDirection() == 0x100) { + tmp = 2; + } else if (dMeter2Info_getMapKeyDirection() == 0x80) { + tmp = 3; + } + + mpMenuFmap = new dMenu_Fmap_c(mpHeap, mpStick, mpCStick, field_0x14E, field_0x14F, field_0x150, field_0x13c, field_0x140, tmp); + + if (mpCapture == NULL) { + mpCapture = new dDlst_MENU_CAPTURE_c(); + } + + mpCapture->setCaptureFlag(); + dMeter2Info_resetWarpStatus(); } -#pragma pop /* 801FC264-801FC350 1F6BA4 00EC+00 2/2 0/0 0/0 .text dMw_fmap_delete__5dMw_cFb */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::dMw_fmap_delete(bool param_0) { - nofralloc -#include "asm/d/menu/d_menu_window/dMw_fmap_delete__5dMw_cFb.s" +bool dMw_c::dMw_fmap_delete(bool param_0) { + if (mpMenuFmap != NULL) { + if (!mpMenuFmap->isSync()) { + return false; + } + + field_0x14E = mpMenuFmap->getProcess(); + field_0x14F = mpMenuFmap->getRegionCursor(); + field_0x150 = mpMenuFmap->getStageCursor(); + field_0x13c = mpMenuFmap->getStageTransX(); + field_0x140 = mpMenuFmap->getStageTransZ(); + + mpMenuFmap->_delete(); + delete mpMenuFmap; + mpMenuFmap = NULL; + } + + if (mpCapture != NULL) { + delete mpCapture; + mpCapture = NULL; + } + + checkMemSize(); + return true; } -#pragma pop /* 801FC350-801FC46C 1F6C90 011C+00 1/1 0/0 0/0 .text dMw_dmap_create__5dMw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::dMw_dmap_create() { - nofralloc -#include "asm/d/menu/d_menu_window/dMw_dmap_create__5dMw_cFv.s" +void dMw_c::dMw_dmap_create() { + markMemSize(); + dComIfGp_setHeapLockFlag(3); + + if (mpCapture == NULL) { + mpCapture = new dDlst_MENU_CAPTURE_c(); + } + + mpCapture->setCaptureFlag(); + + u8 tmp = 0; + if (dMeter2Info_getMapKeyDirection() == 0x200) { + tmp = 3; + } else if (dMeter2Info_getMapKeyDirection() == 0x400) { + tmp = 1; + } else if (dMeter2Info_getMapKeyDirection() == 0x100) { + tmp = 2; + } else if (dMeter2Info_getMapKeyDirection() == 0x80) { + tmp = 0; + } + + mpMenuDmap = new dMenu_Dmap_c(mpHeap, mpStick, mpCStick, field_0x14C, tmp); + + dMeter2Info_resetWarpStatus(); } -#pragma pop /* 801FC46C-801FC520 1F6DAC 00B4+00 2/2 0/0 0/0 .text dMw_dmap_delete__5dMw_cFb */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::dMw_dmap_delete(bool param_0) { - nofralloc -#include "asm/d/menu/d_menu_window/dMw_dmap_delete__5dMw_cFb.s" +bool dMw_c::dMw_dmap_delete(bool param_0) { + if (mpMenuDmap != NULL) { + if (!mpMenuDmap->isSync()) { + return false; + } + + field_0x14C = mpMenuDmap->getZoomState(); + + delete mpMenuDmap; + mpMenuDmap = NULL; + } + + if (mpCapture != NULL) { + delete mpCapture; + mpCapture = NULL; + } + + checkMemSize(); + return true; } -#pragma pop /* 801FC520-801FC5D0 1F6E60 00B0+00 1/1 0/0 0/0 .text dMw_save_create__5dMw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::dMw_save_create() { - nofralloc -#include "asm/d/menu/d_menu_window/dMw_save_create__5dMw_cFv.s" +void dMw_c::dMw_save_create() { + markMemSize(); + + mpMenuSave = new dMenu_save_c(); + mpMenuSave->setUseType(1); + mpMenuSave->_create(); + mpMenuSave->initialize(); + + if (mpCapture == NULL) { + mpCapture = new dDlst_MENU_CAPTURE_c(); + } } -#pragma pop /* 801FC5D0-801FC668 1F6F10 0098+00 3/3 0/0 0/0 .text dMw_save_delete__5dMw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::dMw_save_delete() { - nofralloc -#include "asm/d/menu/d_menu_window/dMw_save_delete__5dMw_cFv.s" +bool dMw_c::dMw_save_delete() { + if (mpMenuSave != NULL) { + mpMenuSave->_delete(); + delete mpMenuSave; + mpMenuSave = NULL; + } + + if (mpCapture != NULL) { + delete mpCapture; + mpCapture = NULL; + } + + checkMemSize(); + return true; } -#pragma pop /* 801FC668-801FC70C 1F6FA8 00A4+00 1/1 0/0 0/0 .text dMw_option_create__5dMw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::dMw_option_create() { - nofralloc -#include "asm/d/menu/d_menu_window/dMw_option_create__5dMw_cFv.s" +void dMw_c::dMw_option_create() { + markMemSize(); + + mpMenuOption = new dMenu_Option_c(dComIfGp_getCollectResArchive(), mpStick); + + if (mpCapture == NULL) { + mpCapture = new dDlst_MENU_CAPTURE_c(); + } } -#pragma pop /* 801FC70C-801FC7BC 1F704C 00B0+00 2/2 0/0 0/0 .text dMw_option_delete__5dMw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::dMw_option_delete() { - nofralloc -#include "asm/d/menu/d_menu_window/dMw_option_delete__5dMw_cFv.s" +bool dMw_c::dMw_option_delete() { + if (mpMenuOption != NULL) { + if (!mpMenuOption->isSync()) { + return false; + } + mpMenuOption->_delete(); + delete mpMenuOption; + mpMenuOption = NULL; + } + + if (mpCapture != NULL) { + delete mpCapture; + mpCapture = NULL; + } + + checkMemSize(); + return true; } -#pragma pop /* 801FC7BC-801FC85C 1F70FC 00A0+00 1/1 0/0 0/0 .text dMw_letter_create__5dMw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::dMw_letter_create() { - nofralloc -#include "asm/d/menu/d_menu_window/dMw_letter_create__5dMw_cFv.s" +void dMw_c::dMw_letter_create() { + markMemSize(); + + mpMenuLetter = new dMenu_Letter_c(mpHeap, mpStick, mpCStick); + + if (mpCapture == NULL) { + mpCapture = new dDlst_MENU_CAPTURE_c(); + } } -#pragma pop /* 801FC85C-801FC904 1F719C 00A8+00 2/2 0/0 0/0 .text dMw_letter_delete__5dMw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::dMw_letter_delete() { - nofralloc -#include "asm/d/menu/d_menu_window/dMw_letter_delete__5dMw_cFv.s" +bool dMw_c::dMw_letter_delete() { + if (mpMenuLetter != NULL) { + if (!mpMenuLetter->isSync()) { + return false; + } + delete mpMenuLetter; + mpMenuLetter = NULL; + } + + if (mpCapture != NULL) { + delete mpCapture; + mpCapture = NULL; + } + + checkMemSize(); + return true; } -#pragma pop /* 801FC904-801FC9A4 1F7244 00A0+00 1/1 0/0 0/0 .text dMw_fishing_create__5dMw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::dMw_fishing_create() { - nofralloc -#include "asm/d/menu/d_menu_window/dMw_fishing_create__5dMw_cFv.s" +void dMw_c::dMw_fishing_create() { + markMemSize(); + + mpMenuFishing = new dMenu_Fishing_c(mpHeap, mpStick, mpCStick); + + if (mpCapture == NULL) { + mpCapture = new dDlst_MENU_CAPTURE_c(); + } } -#pragma pop /* 801FC9A4-801FCA4C 1F72E4 00A8+00 2/2 0/0 0/0 .text dMw_fishing_delete__5dMw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::dMw_fishing_delete() { - nofralloc -#include "asm/d/menu/d_menu_window/dMw_fishing_delete__5dMw_cFv.s" +bool dMw_c::dMw_fishing_delete() { + if (mpMenuFishing != NULL) { + if (!mpMenuFishing->isSync()) { + return false; + } + delete mpMenuFishing; + mpMenuFishing = NULL; + } + + if (mpCapture != NULL) { + delete mpCapture; + mpCapture = NULL; + } + + checkMemSize(); + return true; } -#pragma pop /* 801FCA4C-801FCAEC 1F738C 00A0+00 1/1 0/0 0/0 .text dMw_skill_create__5dMw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::dMw_skill_create() { - nofralloc -#include "asm/d/menu/d_menu_window/dMw_skill_create__5dMw_cFv.s" +void dMw_c::dMw_skill_create() { + markMemSize(); + + mpMenuSkill = new dMenu_Skill_c(mpHeap, mpStick, mpCStick); + if (mpCapture == NULL) { + mpCapture = new dDlst_MENU_CAPTURE_c(); + } } -#pragma pop /* 801FCAEC-801FCB94 1F742C 00A8+00 2/2 0/0 0/0 .text dMw_skill_delete__5dMw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::dMw_skill_delete() { - nofralloc -#include "asm/d/menu/d_menu_window/dMw_skill_delete__5dMw_cFv.s" +bool dMw_c::dMw_skill_delete() { + if (mpMenuSkill != NULL) { + if (!mpMenuSkill->isSync()) { + return false; + } + delete mpMenuSkill; + mpMenuSkill = NULL; + } + + if (mpCapture != NULL) { + delete mpCapture; + mpCapture = NULL; + } + + checkMemSize(); + return true; } -#pragma pop /* 801FCB94-801FCC44 1F74D4 00B0+00 2/2 0/0 0/0 .text dMw_insect_create__5dMw_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::dMw_insect_create(u8 param_0) { - nofralloc -#include "asm/d/menu/d_menu_window/dMw_insect_create__5dMw_cFUc.s" +void dMw_c::dMw_insect_create(u8 param_0) { + markMemSize(); + + mpMenuInsect = new dMenu_Insect_c(mpHeap, mpStick, mpCStick, param_0); + if (mpCapture == NULL) { + mpCapture = new dDlst_MENU_CAPTURE_c(); + } } -#pragma pop /* 801FCC44-801FCCEC 1F7584 00A8+00 3/3 0/0 0/0 .text dMw_insect_delete__5dMw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::dMw_insect_delete() { - nofralloc -#include "asm/d/menu/d_menu_window/dMw_insect_delete__5dMw_cFv.s" +bool dMw_c::dMw_insect_delete() { + if (mpMenuInsect != NULL) { + if (!mpMenuInsect->isSync()) { + return false; + } + delete mpMenuInsect; + mpMenuInsect = NULL; + } + + if (mpCapture != NULL) { + delete mpCapture; + mpCapture = NULL; + } + + checkMemSize(); + return true; } -#pragma pop /* 801FCCEC-801FCCFC 1F762C 0010+00 1/1 0/0 0/0 .text dMw_onButtonBit__5dMw_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::dMw_onButtonBit(u8 param_0) { - nofralloc -#include "asm/d/menu/d_menu_window/dMw_onButtonBit__5dMw_cFUc.s" +void dMw_c::dMw_onButtonBit(u8 flags) { + mButtons |= flags; } -#pragma pop /* 801FCCFC-801FCD0C 1F763C 0010+00 1/1 0/0 0/0 .text dMw_offButtonBit__5dMw_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::dMw_offButtonBit(u8 param_0) { - nofralloc -#include "asm/d/menu/d_menu_window/dMw_offButtonBit__5dMw_cFUc.s" +void dMw_c::dMw_offButtonBit(u8 flags) { + mButtons &= ~flags; } -#pragma pop /* 801FCD0C-801FCD24 1F764C 0018+00 1/1 0/0 0/0 .text dMw_isButtonBit__5dMw_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::dMw_isButtonBit(u8 param_0) { - nofralloc -#include "asm/d/menu/d_menu_window/dMw_isButtonBit__5dMw_cFUc.s" +BOOL dMw_c::dMw_isButtonBit(u8 flags) { + return (mButtons & flags) ? 1 : 0; } -#pragma pop /* 801FCD24-801FCDD8 1F7664 00B4+00 1/1 0/0 0/0 .text dMw_isPush_S_Button__5dMw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::dMw_isPush_S_Button() { - nofralloc -#include "asm/d/menu/d_menu_window/dMw_isPush_S_Button__5dMw_cFv.s" +BOOL dMw_c::dMw_isPush_S_Button() { + if (isFadeNowCheck()) { + if (daPy_getLinkPlayerActorClass()->getClothesChangeWaitTimer() == 0 && + daPy_getLinkPlayerActorClass()->getShieldChangeWaitTimer() == 0 && + daPy_getLinkPlayerActorClass()->getSwordChangeWaitTimer() == 0) { + if (dMw_START_TRIGGER() || dMw_B_TRIGGER()) { + return true; + } + } + } + return false; +} + +inline dEvt_control_c& dComIfGp_getEvent() { + return g_dComIfG_gameInfo.play.getEvent(); +} + +inline u16 dComIfGs_getLife() { + return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().getLife(); } -#pragma pop /* 801FCDD8-801FCE08 1F7718 0030+00 1/1 0/0 0/0 .text isPauseReady__5dMw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::isPauseReady() { - nofralloc -#include "asm/d/menu/d_menu_window/isPauseReady__5dMw_cFv.s" +bool dMw_c::isPauseReady() { + if (dComIfGp_getEvent().checkCompulsory() || dComIfGs_getLife() == 0) { + return false; + } + return true; } -#pragma pop /* 801FCE08-801FCE78 1F7748 0070+00 10/10 3/3 0/0 .text dMw_fade_out__5dMw_cFv */ +// instructions switched +#ifdef NONMATCHING +void dMw_c::dMw_fade_out() { + mDoGph_gInf_c::startFadeOut(13); + mDoGph_gInf_c::setFadeColor(static_cast(g_blackColor)); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -2291,8 +2373,15 @@ asm void dMw_c::dMw_fade_out() { #include "asm/d/menu/d_menu_window/dMw_fade_out__5dMw_cFv.s" } #pragma pop +#endif /* 801FCE78-801FCEE8 1F77B8 0070+00 9/9 4/4 0/0 .text dMw_fade_in__5dMw_cFv */ +#ifdef NONMATCHING +void dMw_c::dMw_fade_in() { + mDoGph_gInf_c::startFadeIn(13); + mDoGph_gInf_c::setFadeColor(static_cast(g_blackColor)); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -2301,158 +2390,270 @@ asm void dMw_c::dMw_fade_in() { #include "asm/d/menu/d_menu_window/dMw_fade_in__5dMw_cFv.s" } #pragma pop - -/* ############################################################################################## */ -/* 804544CC-804544D0 002ACC 0004+00 1/1 0/0 0/0 .sdata2 @6000 */ -SECTION_SDATA2 static f32 lit_6000 = 4.0f / 5.0f; - -/* 804544D0-804544D4 002AD0 0004+00 1/1 0/0 0/0 .sdata2 @6001 */ -SECTION_SDATA2 static f32 lit_6001 = 3.0f / 20.0f; +#endif /* 801FCEE8-801FCF84 1F7828 009C+00 1/1 0/0 0/0 .text checkCStickTrigger__5dMw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::checkCStickTrigger() { - nofralloc -#include "asm/d/menu/d_menu_window/checkCStickTrigger__5dMw_cFv.s" +int dMw_c::checkCStickTrigger() { + field_0x14A = 0; + if (field_0x149 == 0) { + if (mpCStick->getValueStick() > 0.8f) { + field_0x149 = 1; + field_0x14A = 1; + return 1; + } + } else { + if (mpCStick->getValueStick() < 0.15f) { + field_0x149 = 0; + } + } + return 0; } -#pragma pop /* 801FCF84-801FD094 1F78C4 0110+00 1/1 0/0 0/0 .text isEventCheck__5dMw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::isEventCheck() { - nofralloc -#include "asm/d/menu/d_menu_window/isEventCheck__5dMw_cFv.s" +bool dMw_c::isEventCheck() { + if (field_0x151 != 0) { + return true; + } else { + if (dMeter2Info_getMapStatus() == 4 && field_0x148 > 0) { + field_0x148 = 0; + } + + if (dComIfGp_event_runCheck()) { + if (!dMsgObject_isTalkNowCheck() && + (dMeter2Info_getMapStatus() == 4 || + dMeter2Info_getMapStatus() == 5 || + dMeter2Info_getMapStatus() == 7 || + dMeter2Info_getMapStatus() == 8 || + dMeter2Info_getMapStatus() == 9 || + dMeter2Info_getMapStatus() == 6 || + dMeter2Info_getMapStatus() == 3 || + dMeter2Info_isMenuInForce(2) || dMeter2Info_getPauseStatus() == 8)) { + return false; + } + return true; + } + } + return field_0x148 > 0; } -#pragma pop /* 801FD094-801FD0D4 1F79D4 0040+00 10/10 0/0 0/0 .text markMemSize__5dMw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::markMemSize() { - nofralloc -#include "asm/d/menu/d_menu_window/markMemSize__5dMw_cFv.s" +void dMw_c::markMemSize() { + if (mMemSize == 0) { + mMemSize = mpHeap->getTotalFreeSize(); + } } -#pragma pop - -/* ############################################################################################## */ -/* 80397E38-80397E38 024498 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80397E38 = "memory free error!!\n"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_80397E4D = "\0\0"; -#pragma pop /* 801FD0D4-801FD140 1F7A14 006C+00 10/10 0/0 0/0 .text checkMemSize__5dMw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::checkMemSize() { - nofralloc -#include "asm/d/menu/d_menu_window/checkMemSize__5dMw_cFv.s" +void dMw_c::checkMemSize() { + if (mMemSize > 0) { + s32 diff = mpHeap->getTotalFreeSize() - mMemSize; + if (diff < 0) { + diff *= -1; + } + if (diff > 0x20) { + OSReport_Error("memory free error!!\n"); + } + mMemSize = 0; + } } -#pragma pop - -/* ############################################################################################## */ -/* 804544D4-804544D8 002AD4 0004+00 1/1 0/0 0/0 .sdata2 @6086 */ -SECTION_SDATA2 static f32 lit_6086 = 9.0f / 10.0f; - -/* 804544D8-804544E0 002AD8 0004+04 1/1 0/0 0/0 .sdata2 @6087 */ -SECTION_SDATA2 static f32 lit_6087[1 + 1 /* padding */] = { - 0.5f, - /* padding */ - 0.0f, -}; /* 801FD140-801FD2D8 1F7A80 0198+00 1/1 0/0 0/0 .text _create__5dMw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::_create() { - nofralloc -#include "asm/d/menu/d_menu_window/_create__5dMw_cFv.s" +int dMw_c::_create() { + mpHeap = dComIfGp_getExpHeap2D(); + + mpStick = new STControl(5, 2, 1, 1, 0.9f, 0.5f, 0, 0x800); + mpStick->setFirstWaitTime(8); + + mpCStick = new CSTControl(5, 2, 3, 2, 0.9f, 0.5f, 0, 0x2000); + mpCStick->setWaitParm(5, 2, 3, 2, 0.9f, 0.5f, 0, 0x2000); + + mButtons = 0; + mMenuStatus = NO_MENU; + mShowFlag = 1; + field_0x148 = 0; + field_0x14C = 0; + field_0x14D = 0; + field_0x14E = 0; + field_0x14F = 0; + field_0x150 = 0; + field_0x151 = 0; + field_0x152 = 0; + f32 tmp = FLOAT_LABEL(lit_4152); + field_0x13c = tmp; + field_0x140 = tmp; + field_0x153 = 0; + onPauseWindow(); + field_0x149 = 0; + field_0x14A = 0; + field_0x14B = 0; + + mpCapture = NULL; + mpMenuRing = NULL; + mpMenuCollect = NULL; + mpMenuDmap = NULL; + mpMenuFmap = NULL; + mpMenuSave = NULL; + mpMenuOption = NULL; + mpMenuLetter = NULL; + mpMenuFishing = NULL; + mpMenuSkill = NULL; + mpMenuInsect = NULL; + mMemSize = 0; + field_0x144 = 3; + + dMeter2Info_setWindowStatus(0); + return 4; } -#pragma pop /* 801FD2D8-801FD450 1F7C18 0178+00 1/1 0/0 0/0 .text _execute__5dMw_cFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMw_c::_execute() { +asm int dMw_c::_execute() { nofralloc #include "asm/d/menu/d_menu_window/_execute__5dMw_cFv.s" } #pragma pop /* 801FD450-801FD67C 1F7D90 022C+00 1/1 0/0 0/0 .text _draw__5dMw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::_draw() { - nofralloc -#include "asm/d/menu/d_menu_window/_draw__5dMw_cFv.s" +int dMw_c::_draw() { + if (mpCapture != NULL && mpCapture->checkDraw() && mpCapture->getAlpha() != 0) { + if (mpCapture->getTopFlag() != 0) { + dComIfGd_set2DOpaTop(mpCapture); + } else { + dComIfGd_set2DOpa(mpCapture); + } + } + + if (dComIfGp_isPauseFlag() == 1) { + if (dMeter2Info_getWindowStatus() == 3) { + if (mpMenuCollect != NULL) { + mpMenuCollect->draw(); + } + } else if (dMeter2Info_getWindowStatus() == 4) { + if (mpMenuFmap != NULL) { + mpMenuFmap->_draw(); + } + } else if (dMeter2Info_getWindowStatus() == 5) { + if (mpMenuDmap != NULL) { + mpMenuDmap->_draw(); + } + } else if (dMeter2Info_getWindowStatus() == 10) { + if (mpMenuSave != NULL) { + mpMenuSave->_draw2(); + } + + if (mpMenuOption != NULL) { + dComIfGd_set2DOpa(mpMenuOption); + } + + if (mpMenuLetter != NULL) { + dComIfGd_set2DOpa(mpMenuLetter); + } + + if (mpMenuFishing != NULL) { + dComIfGd_set2DOpa(mpMenuFishing); + } + + if (mpMenuSkill != NULL) { + dComIfGd_set2DOpa(mpMenuSkill); + } + + if (mpMenuInsect != NULL) { + dComIfGd_set2DOpa(mpMenuInsect); + } + } else if (dMeter2Info_getWindowStatus() == 2 && mpMenuRing != NULL) { + mpMenuRing->drawFlag0(); + dComIfGd_set2DOpa(mpMenuRing); + dComIfGd_set2DOpa(mpMenuRing); + } + } + return 1; } -#pragma pop /* 801FD67C-801FD840 1F7FBC 01C4+00 1/1 0/0 0/0 .text _delete__5dMw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::_delete() { - nofralloc -#include "asm/d/menu/d_menu_window/_delete__5dMw_cFv.s" +int dMw_c::_delete() { + JKRHeap* heap = mDoExt_getCurrentHeap(); + + delete mpStick; + mpStick = NULL; + + delete mpCStick; + mpCStick = NULL; + + mDoExt_setCurrentHeap(mpHeap); + + if (!dMw_collect_delete(false)) { + mDoExt_setCurrentHeap(heap); + return 0; + } else if (!dMw_dmap_delete(false)) { + mDoExt_setCurrentHeap(heap); + return 0; + } else if (!dMw_fmap_delete(false)) { + mDoExt_setCurrentHeap(heap); + return 0; + } else if (!dMw_save_delete()) { + mDoExt_setCurrentHeap(heap); + return 0; + } else if (!dMw_option_delete()) { + mDoExt_setCurrentHeap(heap); + return 0; + } else if (!dMw_letter_delete()) { + mDoExt_setCurrentHeap(heap); + return 0; + } else if (!dMw_fishing_delete()) { + mDoExt_setCurrentHeap(heap); + return 0; + } else if (!dMw_skill_delete()) { + mDoExt_setCurrentHeap(heap); + return 0; + } else if (!dMw_insect_delete()) { + mDoExt_setCurrentHeap(heap); + return 0; + } else if (!dMw_ring_delete()) { + mDoExt_setCurrentHeap(heap); + return 0; + } else { + dMw_capture_delete(); + mDoExt_setCurrentHeap(heap); + mDoExt_removeMesgFont(); + return 1; + } } -#pragma pop /* 801FD840-801FD860 1F8180 0020+00 1/0 0/0 0/0 .text dMw_Draw__FP5dMw_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dMw_Draw(dMw_c* param_0) { - nofralloc -#include "asm/d/menu/d_menu_window/dMw_Draw__FP5dMw_c.s" +static int dMw_Draw(dMw_c* p_menu) { + return p_menu->_draw(); } -#pragma pop /* 801FD860-801FD880 1F81A0 0020+00 1/0 0/0 0/0 .text dMw_Execute__FP5dMw_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dMw_Execute(dMw_c* param_0) { - nofralloc -#include "asm/d/menu/d_menu_window/dMw_Execute__FP5dMw_c.s" +static int dMw_Execute(dMw_c* p_menu) { + return p_menu->_execute(); } -#pragma pop /* 801FD880-801FD888 1F81C0 0008+00 1/0 0/0 0/0 .text dMw_IsDelete__FP5dMw_c */ -static bool dMw_IsDelete(dMw_c* param_0) { - return true; +static int dMw_IsDelete(dMw_c* p_menu) { + return 1; } /* 801FD888-801FD8C0 1F81C8 0038+00 1/0 0/0 0/0 .text dMw_Delete__FP5dMw_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dMw_Delete(dMw_c* param_0) { - nofralloc -#include "asm/d/menu/d_menu_window/dMw_Delete__FP5dMw_c.s" +static int dMw_Delete(dMw_c* p_menu) { + int isDelete = p_menu->_delete(); + if (isDelete) { + dMeter2Info_setMenuWindowClass(NULL); + } + return isDelete; } -#pragma pop /* 801FD8C0-801FD928 1F8200 0068+00 1/0 0/0 0/0 .text dMw_Create__FP9msg_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dMw_Create(msg_class* param_0) { - nofralloc -#include "asm/d/menu/d_menu_window/dMw_Create__FP9msg_class.s" +static int dMw_Create(msg_class* p_menu) { + dMeter2Info_setMenuWindowClass(static_cast(p_menu)); + g_mwHIO.field_0x4 = -1; + g_mwDHIO.field_0x4 = -1; + dComIfGp_offHeapLockFlag(0); + fopMsgM_setStageLayer(p_menu); + return static_cast(p_menu)->_create(); } -#pragma pop /* 801FD928-801FDFCC 1F8268 06A4+00 0/0 1/0 0/0 .text __sinit_d_menu_window_cpp */ #pragma push diff --git a/src/d/msg/d_msg_flow.cpp b/src/d/msg/d_msg_flow.cpp index e3ede349922..cfb752c2b84 100644 --- a/src/d/msg/d_msg_flow.cpp +++ b/src/d/msg/d_msg_flow.cpp @@ -12,10 +12,6 @@ // Types: // -struct mDoGph_gInf_c { - /* 80007FD8 */ void fadeOut(f32, _GXColor&); -}; - struct dShopSystem_c { /* 801975F8 */ void isFlag(int); /* 8019A354 */ void setSoldOutFlag(); diff --git a/src/m_Do/m_Do_graphic.cpp b/src/m_Do/m_Do_graphic.cpp index 8495a368deb..8f12cebe78c 100644 --- a/src/m_Do/m_Do_graphic.cpp +++ b/src/m_Do/m_Do_graphic.cpp @@ -23,39 +23,6 @@ struct mDoMch_render_c { static void* mRenderModeObj[1 + 1 /* padding */]; }; -struct _GXColor {}; - -struct mDoGph_gInf_c { - struct bloom_c { - /* 80009544 */ void create(); - /* 800095F8 */ void remove(); - /* 80009650 */ void draw(); - }; - - /* 80007E44 */ void create(); - /* 80007F90 */ void beginRender(); - /* 800080D0 */ void fadeOut(f32); - /* 80007FD8 */ void fadeOut(f32, _GXColor&); - /* 80008028 */ void fadeOut_f(f32, _GXColor&); - /* 800080A0 */ void onBlure(f32 const (*)[4]); - /* 80008078 */ void onBlure(); - /* 80008330 */ void calcFade(); - - static u8 mFrameBufferTexObj[32]; - static u8 mZbufferTexObj[32]; - static u8 m_bloom[20]; - static u8 mBlureMtx[48 + 4 /* padding */]; - static u8 mBackColor[4]; - static u8 mFadeColor[4]; - static u8 mFader[4]; - static u8 mFrameBufferTimg[4]; - static u8 mFrameBufferTex[4]; - static u8 mZbufferTimg[4]; - static u8 mZbufferTex[4]; - static f32 mFadeRate; - static f32 mFadeSpeed; -}; - struct daPy_py_c { /* 8000B1E4 */ s32 getAtnActorID() const; }; @@ -101,26 +68,6 @@ struct cXyz { static f32 Zero[3]; }; -struct _GXRenderModeObj {}; - -struct Vec {}; - -struct JUtility { - struct TColor {}; -}; - -struct JUTXfb { - struct EXfbNumber {}; - - static u8 sManager[4 + 4 /* padding */]; -}; - -struct JUTVideo { - /* 802E5198 */ void setRenderMode(_GXRenderModeObj const*); - - static u8 sManager[4]; -}; - struct JUTProcBar { static u8 sManager[4]; }; @@ -129,10 +76,6 @@ struct JUTGamePad { static u8 mPadStatus[48]; }; -struct JUTFader { - /* 802E5530 */ JUTFader(int, int, int, int, JUtility::TColor); -}; - struct JUTDbPrint { static u8 sDebugPrint[4 + 4 /* padding */]; }; @@ -143,31 +86,10 @@ struct JMath { struct JKRSolidHeap {}; -struct JKRHeap { - /* 802CE4D4 */ void alloc(u32, int); - /* 802CE474 */ void alloc(u32, int, JKRHeap*); - /* 802CE548 */ void free(void*); - - static u8 sCurrentHeap[4]; -}; - -struct JGeometry { - template - struct TBox2 {}; - /* TBox2 */ - struct TBox2__template0 {}; -}; - struct JFWSystem { static u8 systemConsole[4]; }; -struct JFWDisplay { - /* 802721DC */ void createManager(_GXRenderModeObj const*, JKRHeap*, JUTXfb::EXfbNumber, bool); - - static u8 sManager[4]; -}; - struct J3DSys { /* 803100BC */ void drawInit(); /* 8031073C */ void reinitGX(); @@ -278,72 +200,9 @@ extern "C" void setBuffer__8J2DPrintFUl(); extern "C" void drawInit__6J3DSysFv(); extern "C" void reinitGX__6J3DSysFv(); extern "C" void PPCSync(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void C_MTXLightPerspective(); -extern "C" void C_MTXLightOrtho(); -extern "C" void C_MTXPerspective(); -extern "C" void C_MTXOrtho(); -extern "C" void PSVECSquareDistance(); -extern "C" void VISetBlack(); -extern "C" void GXSetVtxDesc(); extern "C" void GXClearVtxDesc(); -extern "C" void GXSetVtxAttrFmt(); -extern "C" void GXSetTexCoordGen2(); -extern "C" void GXSetNumTexGens(); extern "C" void GXPixModeSync(); -extern "C" void GXBegin(); -extern "C" void GXSetCullMode(); -extern "C" void GXSetCoPlanar(); -extern "C" void GXSetTexCopySrc(); -extern "C" void GXSetTexCopyDst(); -extern "C" void GXSetCopyFilter(); -extern "C" void GXCopyTex(); -extern "C" void GXInitLightSpot(); -extern "C" void GXInitLightDistAttn(); -extern "C" void GXInitLightPos(); -extern "C" void GXInitLightDir(); -extern "C" void GXInitLightColor(); -extern "C" void GXLoadLightObjImm(); -extern "C" void GXSetChanMatColor(); -extern "C" void GXSetNumChans(); -extern "C" void GXSetChanCtrl(); -extern "C" void GXGetTexBufferSize(); -extern "C" void GXInitTexObj(); -extern "C" void GXInitTexObjLOD(); -extern "C" void GXLoadTexObj(); extern "C" void GXInvalidateTexAll(); -extern "C" void GXSetNumIndStages(); -extern "C" void GXSetTevColorIn(); -extern "C" void GXSetTevAlphaIn(); -extern "C" void GXSetTevColorOp(); -extern "C" void GXSetTevAlphaOp(); -extern "C" void GXSetTevColor(); -extern "C" void GXSetTevColorS10(); -extern "C" void GXSetTevKAlphaSel(); -extern "C" void GXSetTevSwapMode(); -extern "C" void GXSetTevSwapModeTable(); -extern "C" void GXSetAlphaCompare(); -extern "C" void GXSetZTexture(); -extern "C" void GXSetTevOrder(); -extern "C" void GXSetNumTevStages(); -extern "C" void GXSetFog(); -extern "C" void GXSetFogRangeAdj(); -extern "C" void GXSetBlendMode(); -extern "C" void GXSetAlphaUpdate(); -extern "C" void GXSetZMode(); -extern "C" void GXSetZCompLoc(); -extern "C" void GXSetDither(); -extern "C" void GXProject(); -extern "C" void GXSetProjection(); -extern "C" void GXGetProjectionv(); -extern "C" void GXLoadPosMtxImm(); -extern "C" void GXSetCurrentMtx(); -extern "C" void GXLoadTexMtxImm(); -extern "C" void GXSetViewport(); -extern "C" void GXGetViewportv(); -extern "C" void GXSetScissor(); -extern "C" void GXSetClipMode(); extern "C" void __cvt_fp2unsigned(); extern "C" void _savegpr_17(); extern "C" void _savegpr_21(); @@ -412,7 +271,7 @@ SECTION_SDATA u8 mDoGph_gInf_c::mFadeColor[4] = { }; /* 80450BC8-80450BCC 0000C8 0004+00 2/2 38/38 1/1 .sbss mFader__13mDoGph_gInf_c */ -u8 mDoGph_gInf_c::mFader[4]; +JUTFader* mDoGph_gInf_c::mFader; /* 80450BCC-80450BD0 0000CC 0004+00 3/3 8/8 1/1 .sbss mFrameBufferTimg__13mDoGph_gInf_c */ From 035a24092ee91139ab60d41fb5f8b4fb35053281 Mon Sep 17 00:00:00 2001 From: TakaRikka <38417346+TakaRikka@users.noreply.github.com> Date: Tue, 4 Jan 2022 05:37:27 -0800 Subject: [PATCH 2/7] format --- include/JSystem/JFramework/JFWDisplay.h | 8 +- include/JSystem/JGeometry.h | 4 +- include/JSystem/JParticle/JPABaseShape.h | 2 +- include/JSystem/JParticle/JPAChildShape.h | 2 +- include/d/com/d_com_inf_game.h | 2 +- include/d/d_lib.h | 6 +- include/d/d_select_cursor.h | 4 +- include/d/menu/d_menu_collect.h | 4 +- include/d/menu/d_menu_dmap.h | 2 +- include/d/menu/d_menu_fishing.h | 4 +- include/d/menu/d_menu_fmap.h | 6 +- include/d/menu/d_menu_insect.h | 4 +- include/d/menu/d_menu_letter.h | 4 +- include/d/menu/d_menu_option.h | 14 +-- include/d/menu/d_menu_ring.h | 4 +- include/d/menu/d_menu_save.h | 24 ++--- include/d/menu/d_menu_skill.h | 6 +- include/d/menu/d_menu_window.h | 20 +--- include/d/meter/d_meter2_info.h | 2 +- include/dolphin/gx/GX.h | 1 - include/dolphin/os/OS.h | 2 +- include/m_Do/m_Do_graphic.h | 4 +- libs/JSystem/JParticle/JPAChildShape.cpp | 2 +- libs/JSystem/JParticle/JPAExtraShape.cpp | 32 +++++-- libs/JSystem/JParticle/JPAResource.cpp | 2 +- src/d/com/d_com_inf_game.cpp | 2 +- src/d/menu/d_menu_ring.cpp | 1 - src/d/menu/d_menu_skill.cpp | 12 +-- src/d/menu/d_menu_window.cpp | 109 +++++++++++----------- 29 files changed, 138 insertions(+), 151 deletions(-) diff --git a/include/JSystem/JFramework/JFWDisplay.h b/include/JSystem/JFramework/JFWDisplay.h index b7fdb6c3ae3..b7fd742e168 100644 --- a/include/JSystem/JFramework/JFWDisplay.h +++ b/include/JSystem/JFramework/JFWDisplay.h @@ -1,12 +1,12 @@ #ifndef JFWDISPLAY_H #define JFWDISPLAY_H -#include "dolphin/types.h" -#include "dolphin/gx/GX.h" -#include "JSystem/JUtility/JUTXfb.h" #include "JSystem/JKernel/JKRHeap.h" -#include "JSystem/JUtility/TColor.h" #include "JSystem/JUtility/JUTFader.h" +#include "JSystem/JUtility/JUTXfb.h" +#include "JSystem/JUtility/TColor.h" +#include "dolphin/gx/GX.h" +#include "dolphin/types.h" class JFWDisplay { public: diff --git a/include/JSystem/JGeometry.h b/include/JSystem/JGeometry.h index a4c0ca50ed6..42e505a7b5a 100644 --- a/include/JSystem/JGeometry.h +++ b/include/JSystem/JGeometry.h @@ -40,9 +40,7 @@ struct TVec3 { z = z_; } - void zero() { - x = y = z = 0.0f; - } + void zero() { x = y = z = 0.0f; } void mul(const TVec3& a, const TVec3& b) { x = a.x * b.x; diff --git a/include/JSystem/JParticle/JPABaseShape.h b/include/JSystem/JParticle/JPABaseShape.h index a081b0c916d..af687cbe3c3 100644 --- a/include/JSystem/JParticle/JPABaseShape.h +++ b/include/JSystem/JParticle/JPABaseShape.h @@ -1,8 +1,8 @@ #ifndef JPABASESHAPE_H #define JPABASESHAPE_H -#include "dolphin/types.h" #include "dolphin/gx/GX.h" +#include "dolphin/types.h" class JPAEmitterWorkData; class JKRHeap; diff --git a/include/JSystem/JParticle/JPAChildShape.h b/include/JSystem/JParticle/JPAChildShape.h index 5f6edf0d303..d45b97a4e76 100644 --- a/include/JSystem/JParticle/JPAChildShape.h +++ b/include/JSystem/JParticle/JPAChildShape.h @@ -1,8 +1,8 @@ #ifndef JPACHILDSHAPE_H #define JPACHILDSHAPE_H -#include "dolphin/types.h" #include "dolphin/gx/GX.h" +#include "dolphin/types.h" struct JPAChildShapeData { // Common header. diff --git a/include/d/com/d_com_inf_game.h b/include/d/com/d_com_inf_game.h index 189f63bc53b..3e60349bfb2 100644 --- a/include/d/com/d_com_inf_game.h +++ b/include/d/com/d_com_inf_game.h @@ -1126,7 +1126,7 @@ inline daPy_py_c* dComIfGp_getLinkPlayer() { inline daPy_py_c* daPy_getLinkPlayerActorClass() { return dComIfGp_getLinkPlayer(); -} +} inline daAlink_c* daAlink_getAlinkActorClass() { return (daAlink_c*)g_dComIfG_gameInfo.play.getPlayerPtr(LINK_PTR); diff --git a/include/d/d_lib.h b/include/d/d_lib.h index 44ae4d2e45f..618d76138e5 100644 --- a/include/d/d_lib.h +++ b/include/d/d_lib.h @@ -42,11 +42,9 @@ struct STControl { }; // Size = 0x30 struct CSTControl : public STControl { - CSTControl(s16 param_0, s16 param_1, s16 param_2, - s16 param_3, f32 param_4, f32 param_5, + CSTControl(s16 param_0, s16 param_1, s16 param_2, s16 param_3, f32 param_4, f32 param_5, s16 param_6, s16 param_7) - : STControl(param_0, param_1, param_2, param_3, - param_4, param_5, param_6, param_7) {} + : STControl(param_0, param_1, param_2, param_3, param_4, param_5, param_6, param_7) {} virtual f32 getValueStick(); virtual s16 getAngleStick(); diff --git a/include/d/d_select_cursor.h b/include/d/d_select_cursor.h index 65c0cb8297f..5cb8af07a78 100644 --- a/include/d/d_select_cursor.h +++ b/include/d/d_select_cursor.h @@ -1,9 +1,9 @@ #ifndef D_D_SELECT_CURSOR_H #define D_D_SELECT_CURSOR_H -#include "dolphin/types.h" -#include "d/d_select_icon.h" #include "d/d_drawlist.h" +#include "d/d_select_icon.h" +#include "dolphin/types.h" class dSelect_cursorHIO_c { public: diff --git a/include/d/menu/d_menu_collect.h b/include/d/menu/d_menu_collect.h index a626bddb255..6629cdffda8 100644 --- a/include/d/menu/d_menu_collect.h +++ b/include/d/menu/d_menu_collect.h @@ -1,10 +1,10 @@ #ifndef D_MENU_D_MENU_COLLECT_H #define D_MENU_D_MENU_COLLECT_H -#include "dolphin/types.h" +#include "JSystem/J2DGraph/J2DPicture.h" #include "d/d_lib.h" #include "d/d_select_cursor.h" -#include "JSystem/J2DGraph/J2DPicture.h" +#include "dolphin/types.h" class dMsgString_c; class dMenu_save_c; diff --git a/include/d/menu/d_menu_dmap.h b/include/d/menu/d_menu_dmap.h index 09d9766da38..1bef68c63e8 100644 --- a/include/d/menu/d_menu_dmap.h +++ b/include/d/menu/d_menu_dmap.h @@ -1,10 +1,10 @@ #ifndef D_MENU_D_MENU_DMAP_H #define D_MENU_D_MENU_DMAP_H -#include "dolphin/types.h" #include "JSystem/J2DGraph/J2DOrthoGraph.h" #include "d/d_lib.h" #include "d/d_select_cursor.h" +#include "dolphin/types.h" class dMenu_DmapMapCtrl_c; class dMenu_DmapBg_c; diff --git a/include/d/menu/d_menu_fishing.h b/include/d/menu/d_menu_fishing.h index 551222cd58d..77e156dc90d 100644 --- a/include/d/menu/d_menu_fishing.h +++ b/include/d/menu/d_menu_fishing.h @@ -1,10 +1,10 @@ #ifndef D_MENU_D_MENU_FISHING_H #define D_MENU_D_MENU_FISHING_H -#include "dolphin/types.h" #include "JSystem/J2DGraph/J2DPicture.h" -#include "d/d_select_cursor.h" #include "d/d_lib.h" +#include "d/d_select_cursor.h" +#include "dolphin/types.h" class mDoDvdThd_mountArchive_c; class dMsgString_c; diff --git a/include/d/menu/d_menu_fmap.h b/include/d/menu/d_menu_fmap.h index df43e86ba45..fdd4e1228f0 100644 --- a/include/d/menu/d_menu_fmap.h +++ b/include/d/menu/d_menu_fmap.h @@ -1,11 +1,11 @@ #ifndef D_MENU_D_MENU_FMAP_H #define D_MENU_D_MENU_FMAP_H -#include "dolphin/types.h" -#include "d/pane/d_pane_class.h" -#include "d/d_lib.h" #include "d/d_drawlist.h" +#include "d/d_lib.h" #include "d/msg/d_msg_flow.h" +#include "d/pane/d_pane_class.h" +#include "dolphin/types.h" class dMenu_Fmap_stage_data_c; class dMenu_Fmap_world_data_c; diff --git a/include/d/menu/d_menu_insect.h b/include/d/menu/d_menu_insect.h index c0e7930dc24..84b4d2d3cc7 100644 --- a/include/d/menu/d_menu_insect.h +++ b/include/d/menu/d_menu_insect.h @@ -1,10 +1,10 @@ #ifndef D_MENU_D_MENU_INSECT_H #define D_MENU_D_MENU_INSECT_H -#include "dolphin/types.h" #include "JSystem/J2DGraph/J2DPicture.h" -#include "d/d_select_cursor.h" #include "d/d_lib.h" +#include "d/d_select_cursor.h" +#include "dolphin/types.h" class dMsgScrn3Select_c; class dMsgString_c; diff --git a/include/d/menu/d_menu_letter.h b/include/d/menu/d_menu_letter.h index d21d923d0f0..f4c553562b4 100644 --- a/include/d/menu/d_menu_letter.h +++ b/include/d/menu/d_menu_letter.h @@ -1,10 +1,10 @@ #ifndef D_MENU_D_MENU_LETTER_H #define D_MENU_D_MENU_LETTER_H -#include "dolphin/types.h" #include "JSystem/J2DGraph/J2DPicture.h" -#include "d/d_select_cursor.h" #include "d/d_lib.h" +#include "d/d_select_cursor.h" +#include "dolphin/types.h" class mDoDvdThd_mountArchive_c; class dMsgString_c; diff --git a/include/d/menu/d_menu_option.h b/include/d/menu/d_menu_option.h index 661e8897f82..7018bc75269 100644 --- a/include/d/menu/d_menu_option.h +++ b/include/d/menu/d_menu_option.h @@ -1,10 +1,10 @@ #ifndef D_MENU_D_MENU_OPTION_H #define D_MENU_D_MENU_OPTION_H -#include "dolphin/types.h" +#include "JSystem/J2DGraph/J2DPicture.h" #include "d/d_lib.h" #include "d/d_select_cursor.h" -#include "JSystem/J2DGraph/J2DPicture.h" +#include "dolphin/types.h" class dFile_warning_c; class dMenu_Calibration_c; @@ -97,11 +97,11 @@ private: /* 0x014 */ J2DScreen* mpTVScreen; /* 0x018 */ J2DScreen* mpScreenIcon; /* 0x01C */ J2DScreen* mpSelectScreen; - /* 0x020 */ void* field_0x20; // bck - /* 0x024 */ void* field_0x24; // bck - /* 0x028 */ void* field_0x28; // bck - /* 0x02C */ void* field_0x2c; // bpk - /* 0x030 */ void* field_0x30; // btk + /* 0x020 */ void* field_0x20; + /* 0x024 */ void* field_0x24; + /* 0x028 */ void* field_0x28; + /* 0x02C */ void* field_0x2c; + /* 0x030 */ void* field_0x30; /* 0x034 */ dFile_warning_c* mpWarning; /* 0x038 */ J2DPicture* mpBlackTex; /* 0x03C */ dMenu_Calibration_c* field_0x3c; diff --git a/include/d/menu/d_menu_ring.h b/include/d/menu/d_menu_ring.h index 9169f206387..fe7cd2e8a2d 100644 --- a/include/d/menu/d_menu_ring.h +++ b/include/d/menu/d_menu_ring.h @@ -1,10 +1,10 @@ #ifndef D_MENU_D_MENU_RING_H #define D_MENU_D_MENU_RING_H -#include "dolphin/types.h" #include "JSystem/J2DGraph/J2DPicture.h" -#include "d/d_select_cursor.h" #include "d/d_lib.h" +#include "d/d_select_cursor.h" +#include "dolphin/types.h" class dMsgString_c; class dKantera_icon_c; diff --git a/include/d/menu/d_menu_save.h b/include/d/menu/d_menu_save.h index f46ca98a96c..74c25cf4fba 100644 --- a/include/d/menu/d_menu_save.h +++ b/include/d/menu/d_menu_save.h @@ -3,8 +3,8 @@ #include "JSystem/J2DGraph/J2DScreen.h" #include "d/d_lib.h" -#include "dolphin/types.h" #include "d/d_select_cursor.h" +#include "dolphin/types.h" class dMsgString_c; class mDoDvdThd_command_c; @@ -173,14 +173,14 @@ private: /* 0x002C */ dSelect_cursor_c* mSelIcon; /* 0x0030 */ dFile_warning_c* field_0x30; /* 0x0034 */ dFile_info_c* field_0x34[3]; - /* 0x0040 */ void* field_0x40; // bck - /* 0x0044 */ void* field_0x44; // bck - /* 0x0048 */ void* field_0x48; // bck - /* 0x004C */ void* field_0x4c; // bck + /* 0x0040 */ void* field_0x40; + /* 0x0044 */ void* field_0x44; + /* 0x0048 */ void* field_0x48; + /* 0x004C */ void* field_0x4c; /* 0x0050 */ s32 field_0x50; /* 0x0054 */ u8 field_0x54; /* 0x0058 */ CPaneMgr* field_0x58; - /* 0x005C */ int field_0x5c; + /* 0x005C */ int field_0x5c; /* 0x0060 */ int field_0x60; /* 0x0064 */ u8 field_0x64; /* 0x0064 */ u8 field_0x65; @@ -215,15 +215,15 @@ private: /* 0x0132 */ u8 field_0x132[2]; /* 0x0134 */ u8 field_0x134[2]; /* 0x0138 */ CPaneMgr* field_0x138[2]; - /* 0x0140 */ void* field_0x140; // bpk + /* 0x0140 */ void* field_0x140; /* 0x0144 */ int field_0x144; - /* 0x0148 */ void* field_0x148; // btk + /* 0x0148 */ void* field_0x148; /* 0x014C */ int field_0x14c; /* 0x0150 */ void* field_0x150; /* 0x0154 */ int field_0x154; - /* 0x0158 */ void* field_0x158; // btk + /* 0x0158 */ void* field_0x158; /* 0x015C */ int field_0x15c; - /* 0x0160 */ void* field_0x160; // brk + /* 0x0160 */ void* field_0x160; /* 0x0164 */ int field_0x164; /* 0x0168 */ CPaneMgr* field_0x168[2]; /* 0x0170 */ u8 field_0x170[8]; @@ -260,8 +260,8 @@ private: /* 0x01C0 */ u8 field_0x1c0; /* 0x01C4 */ int field_0x1c4; /* 0x01C8 */ int field_0x1c8; - /* 0x01CC */ void* field_0x1cc; // func - /* 0x01D0 */ u8 field_0x1d0[0xA94 * 3]; // 3 savefiles buffer + /* 0x01CC */ void* field_0x1cc; + /* 0x01D0 */ u8 field_0x1d0[0xA94 * 3]; /* 0x218C */ dMsgScrnExplain_c* mpScrnExplain; /* 0x2190 */ u8 field_0x2190; /* 0x2192 */ u16 field_0x2192; diff --git a/include/d/menu/d_menu_skill.h b/include/d/menu/d_menu_skill.h index db40cf1b617..62a1f7a7d51 100644 --- a/include/d/menu/d_menu_skill.h +++ b/include/d/menu/d_menu_skill.h @@ -1,10 +1,10 @@ #ifndef D_MENU_D_MENU_SKILL_H #define D_MENU_D_MENU_SKILL_H -#include "dolphin/types.h" +#include "JSystem/J2DGraph/J2DPicture.h" #include "d/d_lib.h" #include "d/d_select_cursor.h" -#include "JSystem/J2DGraph/J2DPicture.h" +#include "dolphin/types.h" class mDoDvdThd_mountArchive_c; class dMsgString_c; @@ -39,7 +39,7 @@ public: /* 801F93C0 */ void setNameString(u16); /* 801F9470 */ void getSkillNum(); /* 801F9500 */ void setHIO(bool); - + /* 801F9A08 */ virtual void draw(); /* 801F7348 */ virtual ~dMenu_Skill_c(); diff --git a/include/d/menu/d_menu_window.h b/include/d/menu/d_menu_window.h index 4d0a5bbe46f..08ea875b532 100644 --- a/include/d/menu/d_menu_window.h +++ b/include/d/menu/d_menu_window.h @@ -1,13 +1,13 @@ #ifndef D_MENU_D_MENU_WINDOW_H #define D_MENU_D_MENU_WINDOW_H +#include "d/d_drawlist.h" +#include "d/menu/d_menu_collect.h" #include "d/meter/d_meter2_info.h" +#include "d/msg/d_msg_class.h" #include "dolphin/types.h" #include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_graphic.h" -#include "d/d_drawlist.h" -#include "d/menu/d_menu_collect.h" -#include "d/msg/d_msg_class.h" class dMenu_Ring_c; class dMenu_Dmap_c; @@ -238,18 +238,4 @@ static int dMw_Create(msg_class*); typedef int (*dMw_Method)(dMw_c*); -typedef void (dMw_c::*dMw_init_func)(u8); -struct dMw_init_proc { - /* 0x0 */ u32 field_0x0; - /* 0x4 */ u32 field_0x4; - /* 0x8 */ dMw_init_func init_func; -}; - -typedef void (dMw_c::*dMw_proc_func)(); -struct dMw_move_proc { - /* 0x0 */ u32 field_0x0; - /* 0x4 */ u32 field_0x4; - /* 0x8 */ dMw_proc_func proc_func; -}; - #endif /* D_MENU_D_MENU_WINDOW_H */ diff --git a/include/d/meter/d_meter2_info.h b/include/d/meter/d_meter2_info.h index 1744f32bee6..713613c1572 100644 --- a/include/d/meter/d_meter2_info.h +++ b/include/d/meter/d_meter2_info.h @@ -135,7 +135,7 @@ public: bool isGameStatus(int status) { return mGameStatus & status; } void setMapKeyDirection(u16 direction) { mMapKeyDirection = direction; } bool isSub2DStatus(int flag) { return mSub2DStatus & (1 << flag); } - void offMenuInForce(int flag) { unk152 &= ~(1 << flag); } + void offMenuInForce(int flag) { unk152 &= ~(1 << flag); } bool isMenuInForce(int flag) { return unk152 & (1 << flag); } u16 getMapKeyDirection() { return mMapKeyDirection; } u8 getWindowStatus() { return mWindowStatus; } diff --git a/include/dolphin/gx/GX.h b/include/dolphin/gx/GX.h index 9f24e2e7106..157ddaaebb9 100644 --- a/include/dolphin/gx/GX.h +++ b/include/dolphin/gx/GX.h @@ -928,7 +928,6 @@ inline void GXTexCoord2f32(f32 s, f32 t) { } inline void GXEnd() {} - }; #endif diff --git a/include/dolphin/os/OS.h b/include/dolphin/os/OS.h index 3bda004d8ae..7c94ec7bf0e 100644 --- a/include/dolphin/os/OS.h +++ b/include/dolphin/os/OS.h @@ -306,7 +306,7 @@ inline void* OSPhysicalToCached(u32 offset) { static inline u8 __OSf32tou8(register f32 src) { f32 tmp; - register f32 *p = &tmp; + register f32* p = &tmp; register u8 ret; asm diff --git a/include/m_Do/m_Do_graphic.h b/include/m_Do/m_Do_graphic.h index c7e5aaa77de..c5048a9af52 100644 --- a/include/m_Do/m_Do_graphic.h +++ b/include/m_Do/m_Do_graphic.h @@ -1,9 +1,9 @@ #ifndef M_DO_M_DO_GRAPHIC_H #define M_DO_M_DO_GRAPHIC_H -#include "dolphin/gx/GX.h" -#include "JSystem/JUtility/JUTFader.h" #include "JSystem/JFramework/JFWDisplay.h" +#include "JSystem/JUtility/JUTFader.h" +#include "dolphin/gx/GX.h" #include "dolphin/types.h" void mDoGph_Create(); diff --git a/libs/JSystem/JParticle/JPAChildShape.cpp b/libs/JSystem/JParticle/JPAChildShape.cpp index 8c982c3f556..962ed1ef237 100644 --- a/libs/JSystem/JParticle/JPAChildShape.cpp +++ b/libs/JSystem/JParticle/JPAChildShape.cpp @@ -6,8 +6,8 @@ #include "JSystem/JParticle/JPAChildShape.h" #include "JSystem/JParticle/JPAParticle.h" #include "dol2asm.h" -#include "dolphin/types.h" #include "dolphin/os/OS.h" +#include "dolphin/types.h" // // Types: diff --git a/libs/JSystem/JParticle/JPAExtraShape.cpp b/libs/JSystem/JParticle/JPAExtraShape.cpp index 49f599c0604..9d08e8ccf7f 100644 --- a/libs/JSystem/JParticle/JPAExtraShape.cpp +++ b/libs/JSystem/JParticle/JPAExtraShape.cpp @@ -4,13 +4,13 @@ // #include "JSystem/JParticle/JPAExtraShape.h" +#include "JSystem/JMath/JMATrigonometric.h" #include "JSystem/JParticle/JPAParticle.h" #include "JSystem/JParticle/JPAResource.h" #include "JSystem/JParticle/JPAResourceManager.h" -#include "JSystem/JMath/JMATrigonometric.h" #include "dol2asm.h" -#include "dolphin/types.h" #include "dolphin/os/OS.h" +#include "dolphin/types.h" // // Types: @@ -21,9 +21,12 @@ void JPACalcScaleX(JPAEmitterWorkData* work, JPABaseParticle* ptcl) { JPAExtraShape* esp = work->mpRes->getEsp(); if (work->mScaleAnm < esp->getScaleInTiming()) { - ptcl->mParticleScaleX = ptcl->mScaleOut * (esp->getScaleIncRateX() * work->mScaleAnm + esp->getScaleInValueX()); + ptcl->mParticleScaleX = + ptcl->mScaleOut * (esp->getScaleIncRateX() * work->mScaleAnm + esp->getScaleInValueX()); } else if (work->mScaleAnm > esp->getScaleOutTiming()) { - ptcl->mParticleScaleX = ptcl->mScaleOut * (esp->getScaleDecRateX() * (work->mScaleAnm - esp->getScaleOutTiming()) + 1.0f); + ptcl->mParticleScaleX = + ptcl->mScaleOut * + (esp->getScaleDecRateX() * (work->mScaleAnm - esp->getScaleOutTiming()) + 1.0f); } else { ptcl->mParticleScaleX = ptcl->mScaleOut; } @@ -34,9 +37,12 @@ void JPACalcScaleX(JPAEmitterWorkData* work, JPABaseParticle* ptcl) { void JPACalcScaleY(JPAEmitterWorkData* work, JPABaseParticle* ptcl) { JPAExtraShape* esp = work->mpRes->getEsp(); if (work->mScaleAnm < esp->getScaleInTiming()) { - ptcl->mParticleScaleY = ptcl->mScaleOut * (esp->getScaleIncRateY() * work->mScaleAnm + esp->getScaleInValueY()); + ptcl->mParticleScaleY = + ptcl->mScaleOut * (esp->getScaleIncRateY() * work->mScaleAnm + esp->getScaleInValueY()); } else if (work->mScaleAnm > esp->getScaleOutTiming()) { - ptcl->mParticleScaleY = ptcl->mScaleOut * (esp->getScaleDecRateY() * (work->mScaleAnm - esp->getScaleOutTiming()) + 1.0f); + ptcl->mParticleScaleY = + ptcl->mScaleOut * + (esp->getScaleDecRateY() * (work->mScaleAnm - esp->getScaleOutTiming()) + 1.0f); } else { ptcl->mParticleScaleY = ptcl->mScaleOut; } @@ -95,7 +101,8 @@ void JPACalcAlphaAnm(JPAEmitterWorkData* work, JPABaseParticle* ptcl) { if (ptcl->mTime < esp->getAlphaInTiming()) { alpha = 255.0f * (esp->getAlphaInValue() + esp->getAlphaIncRate() * ptcl->mTime); } else if (ptcl->mTime > esp->getAlphaOutTiming()) { - alpha = 255.0f * ((ptcl->mTime - esp->getAlphaOutTiming()) * esp->getAlphaDecRate() + esp->getAlphaBaseValue()); + alpha = 255.0f * ((ptcl->mTime - esp->getAlphaOutTiming()) * esp->getAlphaDecRate() + + esp->getAlphaBaseValue()); } else { alpha = 255.0f * esp->getAlphaBaseValue(); } @@ -110,7 +117,8 @@ void JPACalcAlphaFlickAnm(JPAEmitterWorkData* work, JPABaseParticle* ptcl) { if (ptcl->mTime < esp->getAlphaInTiming()) { alpha = (esp->getAlphaInValue() + esp->getAlphaIncRate() * ptcl->mTime); } else if (ptcl->mTime > esp->getAlphaOutTiming()) { - alpha = ((ptcl->mTime - esp->getAlphaOutTiming()) * esp->getAlphaDecRate() + esp->getAlphaBaseValue()); + alpha = ((ptcl->mTime - esp->getAlphaOutTiming()) * esp->getAlphaDecRate() + + esp->getAlphaBaseValue()); } else { alpha = esp->getAlphaBaseValue(); } @@ -128,8 +136,12 @@ JPAExtraShape::JPAExtraShape(u8 const* data) { /* 8027ADBC-8027AEBC 2756FC 0100+00 1/1 0/0 0/0 .text init__13JPAExtraShapeFv */ void JPAExtraShape::init() { - mAlphaIncRate = (getAlphaInTiming() != 0.0f) ? (getAlphaBaseValue() - getAlphaInValue()) / getAlphaInTiming() : 1.0f; - mAlphaDecRate = (getAlphaOutTiming() != 1.0f) ? (getAlphaOutValue() - getAlphaBaseValue()) / (1.0f - getAlphaOutTiming()) : 1.0f; + mAlphaIncRate = (getAlphaInTiming() != 0.0f) ? + (getAlphaBaseValue() - getAlphaInValue()) / getAlphaInTiming() : + 1.0f; + mAlphaDecRate = (getAlphaOutTiming() != 1.0f) ? + (getAlphaOutValue() - getAlphaBaseValue()) / (1.0f - getAlphaOutTiming()) : + 1.0f; if (getScaleInTiming() != 0.0f) { mScaleIncRateX = (1.0f - getScaleInValueX()) / getScaleInTiming(); diff --git a/libs/JSystem/JParticle/JPAResource.cpp b/libs/JSystem/JParticle/JPAResource.cpp index 64df9b337e1..e25ed1a06c5 100644 --- a/libs/JSystem/JParticle/JPAResource.cpp +++ b/libs/JSystem/JParticle/JPAResource.cpp @@ -4,8 +4,8 @@ // #include "JSystem/JParticle/JPAResource.h" -#include "JSystem/JParticle/JPAMath.h" #include "JSystem/JParticle/JPABaseShape.h" +#include "JSystem/JParticle/JPAMath.h" #include "JSystem/JParticle/JPAParticle.h" #include "dol2asm.h" #include "dolphin/mtx/mtx.h" diff --git a/src/d/com/d_com_inf_game.cpp b/src/d/com/d_com_inf_game.cpp index 7358966282d..be22bb86218 100644 --- a/src/d/com/d_com_inf_game.cpp +++ b/src/d/com/d_com_inf_game.cpp @@ -1356,7 +1356,7 @@ SECTION_SDATA extern u8 g_clearColor[4] = { }; /* 80450604-80450608 000084 0004+00 1/1 10/10 15/15 .sdata g_blackColor */ -SECTION_SDATA extern GXColor g_blackColor = { 0, 0, 0, 255 }; +SECTION_SDATA extern GXColor g_blackColor = {0, 0, 0, 255}; /* 8002CC54-8002CD44 027594 00F0+00 1/1 1/1 0/0 .text dComIfG_changeOpeningScene__FP11scene_classs */ diff --git a/src/d/menu/d_menu_ring.cpp b/src/d/menu/d_menu_ring.cpp index 9fb9ee4fa7d..19b10355543 100644 --- a/src/d/menu/d_menu_ring.cpp +++ b/src/d/menu/d_menu_ring.cpp @@ -11,7 +11,6 @@ // Types: // - struct mDoCPd_c { static u8 m_cpadInfo[256]; }; diff --git a/src/d/menu/d_menu_skill.cpp b/src/d/menu/d_menu_skill.cpp index 0c78b194ce8..14eb7a87496 100644 --- a/src/d/menu/d_menu_skill.cpp +++ b/src/d/menu/d_menu_skill.cpp @@ -738,21 +738,13 @@ asm void dMenu_Skill_c::screenSetLetter() { /* ############################################################################################## */ /* 80397D30-80397D58 024390 0028+00 1/1 0/0 0/0 .rodata text_a_tag$4365 */ SECTION_RODATA static u64 const text_a_tag[5] = { - 'atext1_1', - 'atext1_2', - 'atext1_3', - 'atext1_4', - 'atext1_5', + 'atext1_1', 'atext1_2', 'atext1_3', 'atext1_4', 'atext1_5', }; COMPILER_STRIP_GATE(0x80397D30, &text_a_tag); /* 80397D58-80397D80 0243B8 0028+00 1/1 0/0 0/0 .rodata text_b_tag$4366 */ SECTION_RODATA static u64 const text_b_tag[5] = { - 'btext1_1', - 'btext1_2', - 'btext1_3', - 'btext1_4', - 'btext1_5', + 'btext1_1', 'btext1_2', 'btext1_3', 'btext1_4', 'btext1_5', }; COMPILER_STRIP_GATE(0x80397D58, &text_b_tag); diff --git a/src/d/menu/d_menu_window.cpp b/src/d/menu/d_menu_window.cpp index f9ee19e1edd..5e5dbc971a4 100644 --- a/src/d/menu/d_menu_window.cpp +++ b/src/d/menu/d_menu_window.cpp @@ -4,24 +4,24 @@ // #include "d/menu/d_menu_window.h" +#include "Z2AudioLib/Z2AudioMgr.h" #include "d/com/d_com_inf_game.h" #include "d/menu/d_menu_collect.h" -#include "d/menu/d_menu_ring.h" -#include "d/menu/d_menu_skill.h" -#include "d/menu/d_menu_save.h" -#include "d/menu/d_menu_letter.h" -#include "d/menu/d_menu_fmap.h" #include "d/menu/d_menu_dmap.h" #include "d/menu/d_menu_fishing.h" +#include "d/menu/d_menu_fmap.h" #include "d/menu/d_menu_insect.h" +#include "d/menu/d_menu_letter.h" #include "d/menu/d_menu_option.h" +#include "d/menu/d_menu_ring.h" +#include "d/menu/d_menu_save.h" +#include "d/menu/d_menu_skill.h" #include "d/menu/d_menu_window_HIO.h" #include "d/meter/d_meter_HIO.h" #include "d/msg/d_msg_object.h" -#include "f_op/f_op_msg_mng.h" -#include "Z2AudioLib/Z2AudioMgr.h" #include "dol2asm.h" #include "dolphin/types.h" +#include "f_op/f_op_msg_mng.h" // // Forward References: @@ -1246,12 +1246,17 @@ void dMw_c::collect_move_init(u8 menu_status) { /* 801FA46C-801FA538 1F4DAC 00CC+00 1/0 0/0 0/0 .text collect_close_init__5dMw_cFUc */ void dMw_c::collect_close_init(u8 param_0) { - if (mpMenuCollect->getSubWindowOpenCheck() != 1 && mpMenuCollect->getSubWindowOpenCheck() != 2) { - if (mpMenuCollect->getSubWindowOpenCheck() == 3 || mpMenuCollect->getSubWindowOpenCheck() == 4 || - mpMenuCollect->getSubWindowOpenCheck() == 5 || mpMenuCollect->getSubWindowOpenCheck() == 6) { - Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MENU_SUB_IN, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + if (mpMenuCollect->getSubWindowOpenCheck() != 1 && + mpMenuCollect->getSubWindowOpenCheck() != 2) { + if (mpMenuCollect->getSubWindowOpenCheck() == 3 || + mpMenuCollect->getSubWindowOpenCheck() == 4 || + mpMenuCollect->getSubWindowOpenCheck() == 5 || + mpMenuCollect->getSubWindowOpenCheck() == 6) { + Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MENU_SUB_IN, NULL, 0, 0, 1.0f, 1.0f, -1.0f, + -1.0f, 0); } else { - Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MENU_OUT, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MENU_OUT, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, + 0); dMeter2Info_set2DVibrationM(); } } @@ -1498,7 +1503,8 @@ void dMw_c::collect_move_proc() { if (mpMenuCollect->getSubWindowOpenCheck()) { mMenuStatus = COLLECT_CLOSE; } else { - if ((dMw_isPush_S_Button() && !mpMenuCollect->isKeyCheck()) || mpMenuCollect->isOutCheck()) { + if ((dMw_isPush_S_Button() && !mpMenuCollect->isKeyCheck()) || + mpMenuCollect->isOutCheck()) { mMenuStatus = COLLECT_CLOSE; } else { mpMenuCollect->_move(); @@ -1563,7 +1569,8 @@ void dMw_c::fmap_move_proc() { if (g_fmapHIO.field_0x2f9 != 0) { mMenuStatus = FMAP_CLOSE; - Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MAP_CLOSE_L, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MAP_CLOSE_L, NULL, 0, 0, 1.0f, 1.0f, -1.0f, + -1.0f, 0); } if (dMeter2Info_getMeterMapClass() != NULL) { @@ -1609,24 +1616,27 @@ void dMw_c::dmap_move_proc() { dMeter2Info_setMapKeyDirection(0x200); mMenuStatus = DMAP_CLOSE; mpMenuDmap->setInOutDir(3); - Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MAP_CLOSE_L, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MAP_CLOSE_L, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, + 0); } else if (nextStatus == 2) { dMeter2Info_setMapStatus(0); dMeter2Info_setMapKeyDirection(0x400); mMenuStatus = DMAP_CLOSE; dMeter2Info_getMeterMapClass()->setDispPosOutsideFlg_SE_On(); mpMenuDmap->setInOutDir(1); - Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MAP_CLOSE_L, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MAP_CLOSE_L, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, + 0); } else if (nextStatus == 3) { if (dMeterMap_c::isEnableDispMapAndMapDispSizeTypeNo()) { dMeter2Info_setMapStatus(1); } else { dMeter2Info_setMapStatus(0); } - + mMenuStatus = DMAP_CLOSE; mpMenuDmap->setInOutDir(2); - Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MAP_CLOSE_L, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MAP_CLOSE_L, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, + 0); } else { mpMenuDmap->_move(); } @@ -1713,7 +1723,7 @@ void dMw_c::collect_option_close_proc() { void dMw_c::collect_letter_open_proc() { if (mpMenuLetter->getStatus() == 1) { mpMenuLetter->_open(); - + if (field_0x152 == 0 && mpMenuLetter->isSync()) { dMw_fade_in(); field_0x152 = 1; @@ -1752,7 +1762,7 @@ void dMw_c::collect_letter_close_proc() { void dMw_c::collect_fishing_open_proc() { if (mpMenuFishing->getStatus() == 1) { mpMenuFishing->_open(); - + if (field_0x152 == 0 && mpMenuFishing->isSync()) { dMw_fade_in(); field_0x152 = 1; @@ -1868,7 +1878,7 @@ void dMw_c::insect_open_proc() { dComIfGp_setHeapLockFlag(1); dMw_insect_create(1); mMenuStatus = INSECT_AGITHA_OPEN2; - } + } } /* 801FBC78-801FBD08 1F65B8 0090+00 1/0 0/0 0/0 .text insect_open2_proc__5dMw_cFv */ @@ -1969,7 +1979,7 @@ void dMw_c::dMw_capture_delete() { void dMw_c::dMw_ring_create(u8 param_0) { markMemSize(); dComIfGp_setHeapLockFlag(1); - + mpMenuRing = new dMenu_Ring_c(mpHeap, mpStick, mpCStick, param_0); mpMenuRing->_create(); @@ -2006,8 +2016,7 @@ void dMw_c::dMw_collect_create() { if (mDoCPd_c::getHoldLockL(mDoCPd_c::PAD_0)) { dMw_onButtonBit(1); - } - else if (mDoCPd_c::getHoldLockR(mDoCPd_c::PAD_0)) { + } else if (mDoCPd_c::getHoldLockR(mDoCPd_c::PAD_0)) { dMw_onButtonBit(2); } } @@ -2029,14 +2038,10 @@ void dMw_c::dMw_fmap_create() { dComIfGp_setHeapLockFlag(2); u8 tmp = 0; - if (dMeter2Info_getMapKeyDirection() == 0x400 || - dMeter2Info_getMapStatus() == 3 || - dMeter2Info_getMapStatus() == 4 || - dMeter2Info_getMapStatus() == 5 || - dMeter2Info_getMapStatus() == 7 || - dMeter2Info_getMapStatus() == 8 || - dMeter2Info_getMapStatus() == 9 || - dMeter2Info_getMapStatus() == 6) { + if (dMeter2Info_getMapKeyDirection() == 0x400 || dMeter2Info_getMapStatus() == 3 || + dMeter2Info_getMapStatus() == 4 || dMeter2Info_getMapStatus() == 5 || + dMeter2Info_getMapStatus() == 7 || dMeter2Info_getMapStatus() == 8 || + dMeter2Info_getMapStatus() == 9 || dMeter2Info_getMapStatus() == 6) { tmp = 1; } else if (dMeter2Info_getMapKeyDirection() == 0x200) { tmp = 3; @@ -2045,8 +2050,9 @@ void dMw_c::dMw_fmap_create() { } else if (dMeter2Info_getMapKeyDirection() == 0x80) { tmp = 3; } - - mpMenuFmap = new dMenu_Fmap_c(mpHeap, mpStick, mpCStick, field_0x14E, field_0x14F, field_0x150, field_0x13c, field_0x140, tmp); + + mpMenuFmap = new dMenu_Fmap_c(mpHeap, mpStick, mpCStick, field_0x14E, field_0x14F, field_0x150, + field_0x13c, field_0x140, tmp); if (mpCapture == NULL) { mpCapture = new dDlst_MENU_CAPTURE_c(); @@ -2104,9 +2110,9 @@ void dMw_c::dMw_dmap_create() { } else if (dMeter2Info_getMapKeyDirection() == 0x80) { tmp = 0; } - + mpMenuDmap = new dMenu_Dmap_c(mpHeap, mpStick, mpCStick, field_0x14C, tmp); - + dMeter2Info_resetWarpStatus(); } @@ -2135,7 +2141,7 @@ bool dMw_c::dMw_dmap_delete(bool param_0) { /* 801FC520-801FC5D0 1F6E60 00B0+00 1/1 0/0 0/0 .text dMw_save_create__5dMw_cFv */ void dMw_c::dMw_save_create() { markMemSize(); - + mpMenuSave = new dMenu_save_c(); mpMenuSave->setUseType(1); mpMenuSave->_create(); @@ -2166,7 +2172,7 @@ bool dMw_c::dMw_save_delete() { /* 801FC668-801FC70C 1F6FA8 00A4+00 1/1 0/0 0/0 .text dMw_option_create__5dMw_cFv */ void dMw_c::dMw_option_create() { markMemSize(); - + mpMenuOption = new dMenu_Option_c(dComIfGp_getCollectResArchive(), mpStick); if (mpCapture == NULL) { @@ -2197,7 +2203,7 @@ bool dMw_c::dMw_option_delete() { /* 801FC7BC-801FC85C 1F70FC 00A0+00 1/1 0/0 0/0 .text dMw_letter_create__5dMw_cFv */ void dMw_c::dMw_letter_create() { markMemSize(); - + mpMenuLetter = new dMenu_Letter_c(mpHeap, mpStick, mpCStick); if (mpCapture == NULL) { @@ -2227,7 +2233,7 @@ bool dMw_c::dMw_letter_delete() { /* 801FC904-801FC9A4 1F7244 00A0+00 1/1 0/0 0/0 .text dMw_fishing_create__5dMw_cFv */ void dMw_c::dMw_fishing_create() { markMemSize(); - + mpMenuFishing = new dMenu_Fishing_c(mpHeap, mpStick, mpCStick); if (mpCapture == NULL) { @@ -2257,7 +2263,7 @@ bool dMw_c::dMw_fishing_delete() { /* 801FCA4C-801FCAEC 1F738C 00A0+00 1/1 0/0 0/0 .text dMw_skill_create__5dMw_cFv */ void dMw_c::dMw_skill_create() { markMemSize(); - + mpMenuSkill = new dMenu_Skill_c(mpHeap, mpStick, mpCStick); if (mpCapture == NULL) { mpCapture = new dDlst_MENU_CAPTURE_c(); @@ -2286,7 +2292,7 @@ bool dMw_c::dMw_skill_delete() { /* 801FCB94-801FCC44 1F74D4 00B0+00 2/2 0/0 0/0 .text dMw_insect_create__5dMw_cFUc */ void dMw_c::dMw_insect_create(u8 param_0) { markMemSize(); - + mpMenuInsect = new dMenu_Insect_c(mpHeap, mpStick, mpCStick, param_0); if (mpCapture == NULL) { mpCapture = new dDlst_MENU_CAPTURE_c(); @@ -2420,15 +2426,12 @@ bool dMw_c::isEventCheck() { if (dComIfGp_event_runCheck()) { if (!dMsgObject_isTalkNowCheck() && - (dMeter2Info_getMapStatus() == 4 || - dMeter2Info_getMapStatus() == 5 || - dMeter2Info_getMapStatus() == 7 || - dMeter2Info_getMapStatus() == 8 || - dMeter2Info_getMapStatus() == 9 || - dMeter2Info_getMapStatus() == 6 || - dMeter2Info_getMapStatus() == 3 || - dMeter2Info_isMenuInForce(2) || dMeter2Info_getPauseStatus() == 8)) { - return false; + (dMeter2Info_getMapStatus() == 4 || dMeter2Info_getMapStatus() == 5 || + dMeter2Info_getMapStatus() == 7 || dMeter2Info_getMapStatus() == 8 || + dMeter2Info_getMapStatus() == 9 || dMeter2Info_getMapStatus() == 6 || + dMeter2Info_getMapStatus() == 3 || dMeter2Info_isMenuInForce(2) || + dMeter2Info_getPauseStatus() == 8)) { + return false; } return true; } @@ -2460,7 +2463,7 @@ void dMw_c::checkMemSize() { /* 801FD140-801FD2D8 1F7A80 0198+00 1/1 0/0 0/0 .text _create__5dMw_cFv */ int dMw_c::_create() { mpHeap = dComIfGp_getExpHeap2D(); - + mpStick = new STControl(5, 2, 1, 1, 0.9f, 0.5f, 0, 0x800); mpStick->setFirstWaitTime(8); @@ -2542,7 +2545,7 @@ int dMw_c::_draw() { if (mpMenuSave != NULL) { mpMenuSave->_draw2(); } - + if (mpMenuOption != NULL) { dComIfGd_set2DOpa(mpMenuOption); } From 37146dfed130ad271f552fc1bbfff4dde7958d53 Mon Sep 17 00:00:00 2001 From: TakaRikka <38417346+TakaRikka@users.noreply.github.com> Date: Sun, 9 Jan 2022 17:33:14 -0800 Subject: [PATCH 3/7] JFramework mostly ok --- include/JSystem/JFramework/JFWDisplay.h | 53 +- include/JSystem/JFramework/JFWSystem.h | 28 +- include/JSystem/JUtility/JUTConsole.h | 18 +- include/JSystem/JUtility/JUTProcBar.h | 85 +++ include/JSystem/JUtility/JUTVideo.h | 22 +- include/JSystem/JUtility/JUTXfb.h | 6 +- include/dolphin/gx/GX.h | 88 ++- include/dolphin/os/OS.h | 21 + libs/JSystem/JFramework/JFWDisplay.cpp | 915 +++++++++++++----------- libs/JSystem/JFramework/JFWSystem.cpp | 167 ++--- libs/JSystem/JParticle/JPAResource.cpp | 2 +- libs/JSystem/JUtility/JUTException.cpp | 2 +- libs/JSystem/JUtility/JUTProcBar.cpp | 40 +- libs/JSystem/JUtility/JUTVideo.cpp | 3 +- src/m_Do/m_Do_graphic.cpp | 4 - src/m_Do/m_Do_machine.cpp | 3 +- src/m_Do/m_Do_main.cpp | 4 +- 17 files changed, 878 insertions(+), 583 deletions(-) diff --git a/include/JSystem/JFramework/JFWDisplay.h b/include/JSystem/JFramework/JFWDisplay.h index b7fd742e168..ec61c69e860 100644 --- a/include/JSystem/JFramework/JFWDisplay.h +++ b/include/JSystem/JFramework/JFWDisplay.h @@ -2,21 +2,45 @@ #define JFWDISPLAY_H #include "JSystem/JKernel/JKRHeap.h" +#include "JSystem/JUtility/JUTDirectPrint.h" #include "JSystem/JUtility/JUTFader.h" +#include "JSystem/JUtility/JUTProcBar.h" #include "JSystem/JUtility/JUTXfb.h" #include "JSystem/JUtility/TColor.h" #include "dolphin/gx/GX.h" #include "dolphin/types.h" +typedef void (*UnkFunc)(void); + +class JFWAlarm : public OSAlarm { +public: + JFWAlarm() : mLink(this) {} + ~JFWAlarm() {} + void createAlarm() { OSCreateAlarm(this); } + void cancelAlarm() { OSCancelAlarm(this); } + void removeLink() { sList.remove(&mLink); } + void appendLink() { sList.append(&mLink); } + OSThread* getThread() const { return mThread; } + void setThread(OSThread* thread) { mThread = thread; } + + static JSUList sList; + +public: + /* 0x28 */ OSThread* mThread; + /* 0x2C */ JSULink mLink; +}; + class JFWDisplay { public: enum EDrawDone { + /* 0x0 */ UNK_METHOD_0 = 0, /* 0x1 */ UNK_METHOD_1 = 1 }; /* 80272040 */ void ctor_subroutine(bool); /* 802720F8 */ JFWDisplay(JKRHeap*, JUTXfb::EXfbNumber, bool); - /* 802721DC */ void createManager(_GXRenderModeObj const*, JKRHeap*, JUTXfb::EXfbNumber, bool); + /* 802721DC */ static JFWDisplay* createManager(_GXRenderModeObj const*, JKRHeap*, + JUTXfb::EXfbNumber, bool); /* 802722B8 */ void prepareCopyDisp(); /* 802723AC */ void drawendXfb_single(); /* 802723F4 */ void exchangeXfb_double(); @@ -58,23 +82,34 @@ public: private: /* 0x04 */ JUTFader* mFader; /* 0x08 */ JUtility::TColor mClearColor; - /* 0x0C */ u32 field_0xc; + /* 0x0C */ u32 mZClear; /* 0x10 */ JUTXfb* mXfbManager; - /* 0x14 */ u16 field_0x14; + /* 0x14 */ u16 mGamma; /* 0x18 */ EDrawDone mDrawDoneMethod; /* 0x1C */ u16 mFrameRate; /* 0x20 */ u32 mTickRate; - /* 0x24 */ bool field_0x24; + /* 0x24 */ bool mEnableAlpha; + /* 0x26 */ u16 mClamp; /* 0x28 */ f32 mCombinationRatio; /* 0x2C */ u32 field_0x2c; - /* 0x30 */ int field_0x30; - /* 0x34 */ int field_0x34; + /* 0x30 */ u32 field_0x30; + /* 0x34 */ u32 field_0x34; /* 0x38 */ int field_0x38; /* 0x3C */ int field_0x3c; - /* 0x40 */ u8 field_0x40; - /* 0x44 */ int field_0x44; - /* 0x48 */ u16 field_0x48; + /* 0x40 */ bool field_0x40; + /* 0x44 */ UnkFunc field_0x44; + /* 0x48 */ s16 field_0x48; /* 0x4A */ u8 field_0x4a; }; +inline void JUTChangeFrameBuffer(void* buffer, u16 height, u16 width) { + JUTDirectPrint::getManager()->changeFrameBuffer(buffer, width, height); +} + +static void JFWDrawDoneAlarm(); +static void JFWThreadAlarmHandler(OSAlarm*, OSContext*); +static void JFWGXAbortAlarmHandler(OSAlarm*, OSContext*); +static void waitForTick(u32, u16); +static void diagnoseGpHang(); + #endif /* JFWDISPLAY_H */ diff --git a/include/JSystem/JFramework/JFWSystem.h b/include/JSystem/JFramework/JFWSystem.h index a618ea68f65..b8af555edff 100644 --- a/include/JSystem/JFramework/JFWSystem.h +++ b/include/JSystem/JFramework/JFWSystem.h @@ -1,12 +1,16 @@ #ifndef JFWSYSTEM_H #define JFWSYSTEM_H +#include "JSystem/JKernel/JKRExpHeap.h" +#include "JSystem/JKernel/JKRThread.h" #include "JSystem/JUtility/JUTConsole.h" +#include "JSystem/JUtility/JUTDbPrint.h" +#include "JSystem/JUtility/JUTResFont.h" #include "dolphin/types.h" struct JFWSystem { struct CSetUpParam { - static u32 maxStdHeaps; + static s32 maxStdHeaps; static u32 sysHeapSize; static u32 fifoBufSize; static u32 aramAudioBufSize; @@ -14,22 +18,22 @@ struct JFWSystem { static u32 streamPriority; static u32 decompPriority; static u32 aPiecePriority; - static void* systemFontRes; - static void* renderMode; - static u32 exConsoleBufferSize[1 + 1 /* padding */]; + static ResFONT* systemFontRes; + static GXRenderModeObj* renderMode; + static u32 exConsoleBufferSize; }; - /* 80271CD0 */ void firstInit(); - /* 80271D18 */ void init(); + /* 80271CD0 */ static void firstInit(); + /* 80271D18 */ static void init(); static JUTConsole* getSystemConsole() { return systemConsole; } - static u8 rootHeap[4]; - static u8 systemHeap[4]; - static u8 mainThread[4]; - static u8 debugPrint[4]; - static u8 systemFont[4]; - static u8 systemConsoleManager[4]; + static JKRExpHeap* rootHeap; + static JKRExpHeap* systemHeap; + static JKRThread* mainThread; + static JUTDbPrint* debugPrint; + static JUTResFont* systemFont; + static JUTConsoleManager* systemConsoleManager; static JUTConsole* systemConsole; }; diff --git a/include/JSystem/JUtility/JUTConsole.h b/include/JSystem/JUtility/JUTConsole.h index 274e8de7e74..9377bf25fed 100644 --- a/include/JSystem/JUtility/JUTConsole.h +++ b/include/JSystem/JUtility/JUTConsole.h @@ -14,6 +14,12 @@ public: UNK_TYPE2 = 2, }; + enum OutputFlag { + /* 0x0 */ OUTPUT_NONE, + /* 0x1 */ OUTPUT_OSREPORT, + /* 0x2 */ OUTPUT_CONSOLE + }; + /* 802E73E4 */ static JUTConsole* create(unsigned int, void*, u32); /* 802E7354 */ static JUTConsole* create(unsigned int, unsigned int, JKRHeap*); /* 802E746C */ JUTConsole(unsigned int, unsigned int, bool); @@ -46,6 +52,11 @@ public: } } + void setFont(JUTFont* p_font) { + mFont = p_font; + setFontSize(p_font->getWidth(), p_font->getHeight()); + } + u32 getOutput() const { return mOutput; } int getPositionY() const { return mPositionY; } int getPositionX() const { return mPositionX; } @@ -115,10 +126,13 @@ private: /* 0x10 */ JUTConsole* mDirectConsole; }; // Size: 0x14 -void JUTConsole_print_f_va_(JUTConsole*, const char*, va_list); +extern "C" { void JUTSetReportConsole(JUTConsole*); -JUTConsole* JUTGetReportConsole(); void JUTSetWarningConsole(JUTConsole*); +}; + +void JUTConsole_print_f_va_(JUTConsole*, const char*, va_list); +JUTConsole* JUTGetReportConsole(); JUTConsole* JUTGetWarningConsole(); void JUTReportConsole_f_va(const char*, va_list); void JUTReportConsole_f(const char*, ...); diff --git a/include/JSystem/JUtility/JUTProcBar.h b/include/JSystem/JUtility/JUTProcBar.h index 1243be8ee6f..79e3b3538d7 100644 --- a/include/JSystem/JUtility/JUTProcBar.h +++ b/include/JSystem/JUtility/JUTProcBar.h @@ -1,6 +1,91 @@ #ifndef JUTPROCBAR_H #define JUTPROCBAR_H +#include "JSystem/JKernel/JKRHeap.h" +#include "JSystem/JUtility/TColor.h" #include "dolphin/types.h" +class JUTProcBar { +public: + class CTime { + public: + /* 802E7340 */ CTime(); + + void start(u8 param_0, u8 param_1, u8 param_2) { + field_0x10 = param_0; + field_0x11 = param_1; + field_0x12 = param_2; + mTick = OSGetTick(); + } + + void end() { + field_0x4 = ((OSGetTick() - mTick) * 8) / ((*(u32*)0x800000F8 >> 2) / 125000); + if (field_0x4 == 0) { + field_0x4 = 1; + } + } + + /* 0x00 */ u32 mTick; + /* 0x04 */ u32 field_0x4; + /* 0x08 */ u32 field_0x8; + /* 0x0C */ u32 field_0xc; + /* 0x10 */ u8 field_0x10; + /* 0x11 */ u8 field_0x11; + /* 0x12 */ u8 field_0x12; + }; + + class CParamSet { + public: + /* 0x00 */ int mBarWidth; + /* 0x04 */ int mPosX; + /* 0x08 */ int mPosY; + /* 0x0C */ int mWidth; + /* 0x10 */ int mUserPosition; + }; + + /* 802E5888 */ JUTProcBar(); + /* 802E599C */ ~JUTProcBar(); + /* 802E59E0 */ static void create(); + /* 802E5A28 */ static void destroy(); + /* 802E5A60 */ static void clear(); + /* 802E5B30 */ void bar_subroutine(int, int, int, int, int, int, int, JUtility::TColor, + JUtility::TColor); + /* 802E5CC4 */ void adjustMeterLength(u32, f32*, f32, f32, int*); + /* 802E5E08 */ void draw(); + /* 802E5E3C */ void drawProcessBar(); + /* 802E6FA0 */ void drawHeapBar(); + + void cpuStart() { mCpu.start(255, 129, 30); } + void cpuEnd() { mCpu.end(); } + void gpWaitStart() { mGpWait.start(255, 129, 30); } + void gpWaitEnd() { mGpWait.end(); } + void gpStart() { mGp.start(255, 129, 30); } + void gpEnd() { mGp.end(); } + void wholeLoopStart() { mWholeLoop.start(255, 129, 30); } + void wholeLoopEnd() { mWholeLoop.end(); } + void idleStart() { mIdle.start(255, 129, 30); } + void idleEnd() { mIdle.end(); } + void setCostFrame(int frame) { mCostFrame = frame; } + + static JUTProcBar* getManager() { return sManager; } + + static JUTProcBar* sManager; + +private: + /* 0x000 */ CTime mIdle; + /* 0x014 */ CTime mGp; + /* 0x028 */ CTime mCpu; + /* 0x03C */ CTime mGpWait; + /* 0x050 */ CTime mWholeLoop; + /* 0x064 */ CTime field_0x64[8]; + /* 0x104 */ int mCostFrame; + /* 0x108 */ int field_0x108; + /* 0x10C */ bool mVisible; + /* 0x110 */ int field_0x110; + /* 0x114 */ CParamSet field_0x114; + /* 0x128 */ int field_0x128; + /* 0x12C */ JKRHeap* mWatchHeap; + /* 0x130 */ bool mHeapBarVisible; +}; + #endif /* JUTPROCBAR_H */ diff --git a/include/JSystem/JUtility/JUTVideo.h b/include/JSystem/JUtility/JUTVideo.h index 537ee1dcf6e..319a8f2c7cc 100644 --- a/include/JSystem/JUtility/JUTVideo.h +++ b/include/JSystem/JUtility/JUTVideo.h @@ -6,6 +6,8 @@ #include "dolphin/types.h" #include "dolphin/vi/vi.h" +typedef u8 (*Pattern)[2]; + class JUTVideo { public: typedef void (*Callback)(u32); @@ -16,8 +18,8 @@ public: // TODO: return types not confirmed /* 802E4C54 */ static JUTVideo* createManager(GXRenderModeObj const*); /* 802E4CAC */ static void destroyManager(); - /* 802E5088 */ void drawDoneStart(); - /* 802E50B0 */ void dummyNoDrawWait(); + /* 802E5088 */ static void drawDoneStart(); + /* 802E50B0 */ static void dummyNoDrawWait(); /* 802E5198 */ void setRenderMode(GXRenderModeObj const*); /* 802E5210 */ void waitRetraceIfNeed(); @@ -25,10 +27,22 @@ public: /* 802E5144 */ static void postRetraceProc(u32); /* 802E50BC */ static void drawDoneCallback(); - u32 getFbWidth() const { return mRenderObj->fb_width; } - u32 getEfbHeight() const { return mRenderObj->efb_height; } + u16 getFbWidth() const { return mRenderObj->fb_width; } + u16 getEfbHeight() const { return mRenderObj->efb_height; } + void getBounds(u16& width, u16& height) const { + width = (u16)getFbWidth(); + height = (u16)getEfbHeight(); + } + u16 getXfbHeight() const { return mRenderObj->xfb_height; } + u32 isAntiAliasing() const { return mRenderObj->antialiasing; } + Pattern getSamplePattern() const { return mRenderObj->sample_pattern; } + u8* getVFilter() const { return mRenderObj->vfilter; } + OSMessageQueue* getMessageQueue() { return &mMessageQueue; } static JUTVideo* getManager() { return sManager; } + static OSTick getVideoInterval() { return sVideoInterval; } + static OSTick getVideoLastTick() { return sVideoLastTick; } + GXRenderModeObj* getRenderMode() const { return mRenderObj; } private: diff --git a/include/JSystem/JUtility/JUTXfb.h b/include/JSystem/JUtility/JUTXfb.h index 240fb27a08c..5d3933cc716 100644 --- a/include/JSystem/JUtility/JUTXfb.h +++ b/include/JSystem/JUtility/JUTXfb.h @@ -25,7 +25,7 @@ public: s32 getBufferNum() const { return mBufferNum; } s16 getDrawnXfbIndex() const { return mDrawnXfbIndex; } - s16 getDrawningXfbIndex() const { return mDrawingXfbIndex; } + s16 getDrawingXfbIndex() const { return mDrawingXfbIndex; } s16 getDisplayingXfbIndex() const { return mDisplayingXfbIndex; } s32 getSDrawingFlag() const { return mSDrawingFlag; } @@ -35,7 +35,7 @@ public: return NULL; } - void* getDrawningXfb() const { + void* getDrawingXfb() const { if (mDrawingXfbIndex >= 0) return mBuffer[mDrawingXfbIndex]; return NULL; @@ -49,6 +49,8 @@ public: void setDisplayingXfbIndex(s16 index) { mDisplayingXfbIndex = index; } void setSDrawingFlag(s32 flag) { mSDrawingFlag = flag; } + void setDrawnXfbIndex(s16 index) { mDrawnXfbIndex = index; } + void setDrawingXfbIndex(s16 index) { mDrawingXfbIndex = index; } static JUTXfb* getManager() { return sManager; } diff --git a/include/dolphin/gx/GX.h b/include/dolphin/gx/GX.h index 157ddaaebb9..f1eca18856e 100644 --- a/include/dolphin/gx/GX.h +++ b/include/dolphin/gx/GX.h @@ -40,7 +40,7 @@ typedef struct _GXRenderModeObj { u16 vi_height; s32 xfb_mode; u8 field_rendering; - u8 antialiasing; + bool antialiasing; u8 sample_pattern[12][2]; u8 vfilter[7]; } GXRenderModeObj; @@ -74,6 +74,21 @@ typedef struct _GXFogAdjTable { /* 0x0 */ u16 r[10]; } GXFogAdjTable; +typedef struct _GXFifoObj { + /* 0x00 */ void* base; + /* 0x04 */ u32 end; + /* 0x08 */ u32 size; + /* 0x0C */ u32 high_wtrmark; + /* 0x10 */ u32 low_wtrmark; + /* 0x14 */ void* read_ptr; + /* 0x18 */ void* write_ptr; + /* 0x1C */ void* rw_dst; + /* 0x20 */ u8 fifo_wrap; + /* 0x21 */ bool cpu_fifo_ready; + /* 0x22 */ bool gp_fifo_ready; + /* 0x23 */ u8 field_0x23[93]; +} GXFifoObj; // Size: 0x80 + typedef enum _GXPrimitive { /* 0x80 */ GX_QUADS = 0x80, /* 0x90 */ GX_TRIANGLES = 0x90, @@ -416,9 +431,15 @@ typedef enum _GXTexFmt { /* 0x8 */ GX_TF_CI8, /* 0x9 */ GX_TF_CI14, /* 0xE */ GX_TF_CMPR = 14, - /* 0x10 */ _GX_TF_ZTF = 0x10, - /* 0x20 */ _GX_TF_CTF = 0x20 + /* 0x11 */ GX_TF_Z8 = (0x1 | _GX_TF_ZTF), + /* 0x13 */ GX_TF_Z16 = (0x3 | _GX_TF_ZTF), + /* 0x16 */ GX_TF_Z24X8 = (0x6 | _GX_TF_ZTF), + /* 0x20 */ _GX_TF_CTF = 0x20, + /* 0x30 */ GX_CTF_Z4 = (0x0 | _GX_TF_ZTF | _GX_TF_CTF), + /* 0x39 */ GX_CTF_Z8M = (0x9 | _GX_TF_ZTF | _GX_TF_CTF), + /* 0x3A */ GX_CTF_Z8L = (0xA | _GX_TF_ZTF | _GX_TF_CTF), + /* 0x3C */ GX_CTF_Z16L = (0xC | _GX_TF_ZTF | _GX_TF_CTF), } GXTexFmt; typedef enum _GXGamma { @@ -470,16 +491,6 @@ typedef enum _GXTexFmt8 { /* 0x2C */ GX_CTF_GB8 = (0xC | _GX_TF_CTF), } GXTexFmt8; -typedef enum _GXZTexFmt { - /* 0x11 */ GX_TF_Z8 = (0x1 | _GX_TF_ZTF), - /* 0x13 */ GX_TF_Z16 = (0x3 | _GX_TF_ZTF), - /* 0x16 */ GX_TF_Z24X8 = (0x6 | _GX_TF_ZTF), - /* 0x30 */ GX_CTF_Z4 = (0x0 | _GX_TF_ZTF | _GX_TF_CTF), - /* 0x39 */ GX_CTF_Z8M = (0x9 | _GX_TF_ZTF | _GX_TF_CTF), - /* 0x3A */ GX_CTF_Z8L = (0xA | _GX_TF_ZTF | _GX_TF_CTF), - /* 0x3C */ GX_CTF_Z16L = (0xC | _GX_TF_ZTF | _GX_TF_CTF), -} GXZTexFmt; - typedef enum _GXTexWrapMode { /* 0x0 */ GX_CLAMP, /* 0x1 */ GX_REPEAT, @@ -816,6 +827,30 @@ typedef struct _GXVtxDescList { GXAttrType type; } GXVtxDescList; +typedef enum _GXFBClamp { + /* 0x0 */ GX_CLAMP_NONE, + /* 0x1 */ GX_CLAMP_TOP, + /* 0x2 */ GX_CLAMP_BOTTOM, +} GXFBClamp; + +typedef enum _GXPixelFmt { + /* 0x0 */ GX_PF_RGB8_Z24, + /* 0x1 */ GX_PF_RGBA6_Z24, + /* 0x2 */ GX_PF_RGB565_Z16, + /* 0x3 */ GX_PF_Z24, + /* 0x4 */ GX_PF_Y8, + /* 0x5 */ GX_PF_U8, + /* 0x6 */ GX_PF_V8, + /* 0x7 */ GX_PF_YUV420, +} GXPixelFmt; + +typedef enum _GXZFmt16 { + /* 0x0 */ GX_ZC_LINEAR, + /* 0x1 */ GX_ZC_NEAR, + /* 0x2 */ GX_ZC_MID, + /* 0x3 */ GX_ZC_FAR, +} GXZFmt16; + extern "C" { f32 GXGetYScaleFactor(u16 efb_height, u16 xfb_height); u16 GXGetNumXfbLines(u32 efb_height, f32 y_scale); @@ -852,6 +887,14 @@ void GXSetDrawDoneCallback(GXDrawDoneCallback); void GXDrawDone(void); void GXAbortFrame(void); void GXFlush(void); +void GXSetCopyClear(GXColor, u32); +void GXSetDispCopySrc(u16, u16, u16, u16); +void GXSetDispCopyDst(u16, u16); +u32 GXSetDispCopyYScale(f32); +void GXSetCopyClamp(GXFBClamp); +void GXSetDispCopyGamma(GXGamma); +void GXCopyDisp(void*, GXBool); +void GXSetPixelFmt(GXPixelFmt, GXZFmt16); struct OSThread; OSThread* GXSetCurrentGXThread(void); @@ -898,7 +941,7 @@ void GXSetTexCopySrc(u16, u16, u16, u16); void GXSetViewport(f32, f32, f32, f32, f32, f32); void GXSetZCompLoc(GXBool); void GXSetZMode(GXBool, GXCompare, GXBool); -void GXSetZTexture(GXZTexOp, GXZTexFmt, u32); +void GXSetZTexture(GXZTexOp, GXTexFmt, u32); void GXSetPointSize(u8, GXTexOffset); void GXSetLineWidth(u8, GXTexOffset); void GXSetTevDirect(GXTevStageID); @@ -909,6 +952,13 @@ void GXSetIndTexMtx(GXIndTexMtxID, Mtx23, s8); void GXSetIndTexCoordScale(GXIndTexStageID, GXIndTexScale, GXIndTexScale); void GXSetIndTexOrder(GXIndTexStageID, GXTexCoordID, GXTexMapID); void GXEnableTexOffsets(GXTexCoordID, GXBool, GXBool); +void GXSetDstAlpha(GXBool, u8); +u32 GXGetFifoSize(GXFifoObj*); +void* GXGetFifoBase(GXFifoObj*); +GXFifoObj* GXInit(void*, u32); +GXFifoObj* GXGetCPUFifo(void); +void GXGetGPStatus(GXBool*, GXBool*, GXBool*, GXBool*, GXBool*); +void GXReadXfRasMetric(u32*, u32*, u32*, u32*); #define GFX_FIFO(T) (*(volatile T*)0xCC008000) @@ -927,6 +977,16 @@ inline void GXTexCoord2f32(f32 s, f32 t) { GFX_FIFO(f32) = t; } +inline void GXTexCoord2u8(u8 s, u8 t) { + GFX_FIFO(u8) = s; + GFX_FIFO(u8) = t; +} + +inline void GXPosition2u16(u16 x, u16 y) { + GFX_FIFO(u16) = x; + GFX_FIFO(u16) = y; +} + inline void GXEnd() {} }; diff --git a/include/dolphin/os/OS.h b/include/dolphin/os/OS.h index 7c94ec7bf0e..b30dbbdf3a5 100644 --- a/include/dolphin/os/OS.h +++ b/include/dolphin/os/OS.h @@ -131,6 +131,23 @@ struct OSThread { void* data[2]; }; +struct OSAlarm; +struct OSAlarmLink { + /* 0x0 */ OSAlarm* prev; + /* 0x4 */ OSAlarm* next; +}; + +typedef void (*OSAlarmHandler)(OSAlarm*, OSContext*); + +struct OSAlarm { + /* 0x00 */ OSAlarmHandler handler; + /* 0x04 */ u32 tag; + /* 0x08 */ OSTime fire_time; + /* 0x10 */ OSAlarmLink link; + /* 0x18 */ OSTime period_time; + /* 0x20 */ OSTime start_time; +}; // Size: 0x28 + extern "C" { s32 OSEnableScheduler(void); s32 OSDisableScheduler(void); @@ -205,6 +222,10 @@ void LCDisable(void); void OSReportInit__Fv(void); // needed for inline asm u8* OSGetStackPointer(void); + +void OSCreateAlarm(OSAlarm*); +void OSCancelAlarm(OSAlarm*); +void OSSetAlarm(OSAlarm*, OSTime, OSAlarmHandler); }; // extern "C" void OSSwitchFiberEx(u32, u32, u32, u32, u32, u32); diff --git a/libs/JSystem/JFramework/JFWDisplay.cpp b/libs/JSystem/JFramework/JFWDisplay.cpp index d3b04a2376e..149572c9439 100644 --- a/libs/JSystem/JFramework/JFWDisplay.cpp +++ b/libs/JSystem/JFramework/JFWDisplay.cpp @@ -4,57 +4,14 @@ // #include "JSystem/JFramework/JFWDisplay.h" +#include "JSystem/J2DGraph/J2DOrthoGraph.h" +#include "JSystem/JUtility/JUTAssert.h" +#include "JSystem/JUtility/JUTConsole.h" +#include "JSystem/JUtility/JUTDbPrint.h" #include "dol2asm.h" #include "dolphin/mtx/mtx44.h" #include "dolphin/types.h" -// -// Types: -// - -struct OSAlarm {}; - -struct JUTProcBar { - /* 802E59E0 */ void create(); - /* 802E5A28 */ void destroy(); - /* 802E5A60 */ void clear(); - /* 802E5E08 */ void draw(); - - static u8 sManager[4]; -}; - -struct JUTDirectPrint { - /* 802E456C */ void changeFrameBuffer(void*, u16, u16); - - static u8 sDirectPrint[4 + 4 /* padding */]; -}; - -struct JUTDbPrint { - /* 802E02A4 */ void flush(); - - static u8 sDebugPrint[4 + 4 /* padding */]; -}; - -struct JUTConsoleManager { - /* 802E8384 */ void draw() const; - - static u8 sManager[4]; -}; - -struct JUTAssertion { - /* 802E499C */ void flushMessage(); - /* 802E4A54 */ void flushMessage_dbPrint(); -}; - -struct JFWAlarm { - static u8 sList[12]; -}; - -struct J2DOrthoGraph { - /* 802E96D0 */ J2DOrthoGraph(f32, f32, f32, f32, f32, f32); - /* 802E97B4 */ void setPort(); -}; - // // Forward References: // @@ -122,33 +79,14 @@ extern "C" void draw__10JUTProcBarFv(); extern "C" void draw__17JUTConsoleManagerCFv(); extern "C" void __ct__13J2DOrthoGraphFffffff(); extern "C" void setPort__13J2DOrthoGraphFv(); -extern "C" void OSCreateAlarm(); -extern "C" void OSSetAlarm(); -extern "C" void OSCancelAlarm(); extern "C" void VIFlush(); -extern "C" void GXInit(); -extern "C" void GXGetGPStatus(); -extern "C" void GXGetFifoBase(); -extern "C" void GXGetFifoSize(); -extern "C" void GXGetCPUFifo(); extern "C" void GXClearVtxDesc(); extern "C" void GXInvalidateVtxCache(); -extern "C" void GXFlush(); extern "C" void GXAbortFrame(); extern "C" void GXSetDrawDone(); extern "C" void GXDrawDone(); extern "C" void GXPixModeSync(); -extern "C" void GXSetDispCopySrc(); -extern "C" void GXSetDispCopyDst(); -extern "C" void GXSetCopyClamp(); -extern "C" void GXSetDispCopyYScale(); -extern "C" void GXSetCopyClear(); -extern "C" void GXSetDispCopyGamma(); -extern "C" void GXCopyDisp(); extern "C" void GXInvalidateTexAll(); -extern "C" void GXSetPixelFmt(); -extern "C" void GXSetDstAlpha(); -extern "C" void GXReadXfRasMetric(); extern "C" void __register_global_object(); extern "C" void _savegpr_24(); extern "C" void _savegpr_28(); @@ -172,136 +110,64 @@ extern "C" u8 sManager__17JUTConsoleManager[4]; // Declarations: // -/* ############################################################################################## */ -/* 80455250-80455254 003850 0004+00 4/4 0/0 0/0 .sdata2 @2198 */ -SECTION_SDATA2 static u8 lit_2198[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; - /* 80272040-802720F8 26C980 00B8+00 1/1 0/0 0/0 .text ctor_subroutine__10JFWDisplayFb */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JFWDisplay::ctor_subroutine(bool param_0) { - nofralloc -#include "asm/JSystem/JFramework/JFWDisplay/ctor_subroutine__10JFWDisplayFb.s" +void JFWDisplay::ctor_subroutine(bool enableAlpha) { + mEnableAlpha = enableAlpha; + mClamp = GX_CLAMP_TOP | GX_CLAMP_BOTTOM; + mClearColor.set(0, 0, 0, 0); + mZClear = 0xFFFFFF; + mGamma = 0; + mFader = NULL; + mFrameRate = 1; + mTickRate = 0; + mCombinationRatio = 0.0f; + field_0x30 = 0; + field_0x2c = OSGetTick(); + field_0x34 = 0; + field_0x48 = 0; + field_0x4a = 0; + mDrawDoneMethod = UNK_METHOD_0; + clearEfb_init(); + JUTProcBar::create(); + JUTProcBar::clear(); + field_0x38 = 1; + field_0x3c = 0; + field_0x40 = 0; + field_0x44 = 0; } -#pragma pop /* ############################################################################################## */ /* 803C4020-803C4060 021140 0030+10 1/1 0/0 0/0 .data e_mtx */ -SECTION_DATA static u8 e_mtx[48 + 16 /* padding */] ALIGN_DECL(32) = { - 0x3F, - 0x80, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x3F, - 0x80, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x3F, - 0x80, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - /* padding */ - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, +SECTION_DATA static Mtx e_mtx ALIGN_DECL(32) = { + {1.0f, 0.0f, 0.0f, 0.0f}, + {0.0f, 1.0f, 0.0f, 0.0f}, + {0.0f, 0.0f, 1.0f, 0.0f}, }; /* 803C4060-803C40A0 021180 0040+00 1/1 0/0 0/0 .data clear_z_TX */ -SECTION_DATA static u8 clear_z_TX[64] = { +SECTION_DATA static u8 clear_z_TX[64] ALIGN_DECL(32) = { 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, }; -/* 803C40A0-803C40C0 0211C0 0018+08 2/2 0/0 0/0 .data __vt__10JFWDisplay */ -SECTION_DATA extern void* __vt__10JFWDisplay[6 + 2 /* padding */] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)beginRender__10JFWDisplayFv, - (void*)endRender__10JFWDisplayFv, - (void*)endFrame__10JFWDisplayFv, - (void*)__dt__10JFWDisplayFv, - /* padding */ - NULL, - NULL, -}; - /* 802720F8-80272160 26CA38 0068+00 1/1 0/0 0/0 .text * __ct__10JFWDisplayFP7JKRHeapQ26JUTXfb10EXfbNumberb */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm JFWDisplay::JFWDisplay(JKRHeap* param_0, JUTXfb::EXfbNumber param_1, bool param_2) { - nofralloc -#include "asm/JSystem/JFramework/JFWDisplay/__ct__10JFWDisplayFP7JKRHeapQ26JUTXfb10EXfbNumberb.s" +JFWDisplay::JFWDisplay(JKRHeap* p_heap, JUTXfb::EXfbNumber xfb_num, bool enableAlpha) { + ctor_subroutine(enableAlpha); + mXfbManager = JUTXfb::createManager(p_heap, xfb_num); } -#pragma pop /* 80272160-802721DC 26CAA0 007C+00 1/0 0/0 0/0 .text __dt__10JFWDisplayFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm JFWDisplay::~JFWDisplay() { - nofralloc -#include "asm/JSystem/JFramework/JFWDisplay/__dt__10JFWDisplayFv.s" +JFWDisplay::~JFWDisplay() { + if (JUTVideo::getManager() != NULL) { + waitBlanking(2); + } + JUTProcBar::destroy(); + JUTXfb::destroyManager(); + mXfbManager = NULL; } -#pragma pop /* ############################################################################################## */ /* 804511C0-804511C4 0006C0 0004+00 2/2 40/40 1/1 .sbss sManager__10JFWDisplay */ @@ -309,178 +175,362 @@ JFWDisplay* JFWDisplay::sManager; /* 802721DC-80272260 26CB1C 0084+00 0/0 1/1 0/0 .text * createManager__10JFWDisplayFPC16_GXRenderModeObjP7JKRHeapQ26JUTXfb10EXfbNumberb */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JFWDisplay::createManager(_GXRenderModeObj const* param_0, JKRHeap* param_1, - JUTXfb::EXfbNumber param_2, bool param_3) { - nofralloc -#include "asm/JSystem/JFramework/JFWDisplay/createManager__10JFWDisplayFPC16_GXRenderModeObjP7JKRHeapQ26JUTXfb10EXfbNumberb.s" +JFWDisplay* JFWDisplay::createManager(_GXRenderModeObj const* p_rObj, JKRHeap* p_heap, + JUTXfb::EXfbNumber xfb_num, bool enableAlpha) { + if (p_rObj != NULL) { + JUTVideo::getManager()->setRenderMode(p_rObj); + } + + if (sManager == NULL) { + sManager = new JFWDisplay(p_heap, xfb_num, enableAlpha); + } + + return sManager; } -#pragma pop /* 80272260-802722B8 26CBA0 0058+00 2/2 0/0 0/0 .text callDirectDraw__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void callDirectDraw() { - nofralloc -#include "asm/JSystem/JFramework/JFWDisplay/callDirectDraw__Fv.s" +static void callDirectDraw() { + JUTChangeFrameBuffer(JUTXfb::getManager()->getDrawingXfb(), + JUTVideo::getManager()->getEfbHeight(), + JUTVideo::getManager()->getFbWidth()); + JUTAssertion::flushMessage(); } -#pragma pop /* 802722B8-802723AC 26CBF8 00F4+00 3/3 0/0 0/0 .text prepareCopyDisp__10JFWDisplayFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JFWDisplay::prepareCopyDisp() { - nofralloc -#include "asm/JSystem/JFramework/JFWDisplay/prepareCopyDisp__10JFWDisplayFv.s" +void JFWDisplay::prepareCopyDisp() { + u16 width = JUTVideo::getManager()->getFbWidth(); + u16 height = JUTVideo::getManager()->getEfbHeight(); + f32 y_scaleF = GXGetYScaleFactor(height, JUTVideo::getManager()->getXfbHeight()); + u16 line_num = GXGetNumXfbLines(height, y_scaleF); + + GXSetCopyClear(mClearColor, mZClear); + GXSetDispCopySrc(0, 0, width, height); + GXSetDispCopyDst(width, line_num); + GXSetDispCopyYScale(y_scaleF); + VIFlush(); + GXSetCopyFilter((GXBool)JUTVideo::getManager()->isAntiAliasing(), + JUTVideo::getManager()->getSamplePattern(), GX_ENABLE, + JUTVideo::getManager()->getVFilter()); + GXSetCopyClamp((GXFBClamp)mClamp); + GXSetDispCopyGamma((GXGamma)mGamma); + GXSetZMode(GX_ENABLE, GX_LEQUAL, GX_ENABLE); + if (mEnableAlpha) { + GXSetAlphaUpdate(GX_ENABLE); + } } -#pragma pop /* 802723AC-802723F4 26CCEC 0048+00 1/1 0/0 0/0 .text drawendXfb_single__10JFWDisplayFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JFWDisplay::drawendXfb_single() { - nofralloc -#include "asm/JSystem/JFramework/JFWDisplay/drawendXfb_single__10JFWDisplayFv.s" +void JFWDisplay::drawendXfb_single() { + JUTXfb* manager = JUTXfb::getManager(); + if (manager->getDrawingXfbIndex() >= 0) { + prepareCopyDisp(); + JFWDrawDoneAlarm(); + GXFlush(); + manager->setDrawnXfbIndex(manager->getDrawingXfbIndex()); + } } -#pragma pop /* 802723F4-802724FC 26CD34 0108+00 1/1 0/0 0/0 .text exchangeXfb_double__10JFWDisplayFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JFWDisplay::exchangeXfb_double() { - nofralloc -#include "asm/JSystem/JFramework/JFWDisplay/exchangeXfb_double__10JFWDisplayFv.s" +void JFWDisplay::exchangeXfb_double() { + JUTXfb* xfbMng = JUTXfb::getManager(); + + if (xfbMng->getDrawnXfbIndex() == xfbMng->getDisplayingXfbIndex()) { + if (xfbMng->getDrawingXfbIndex() >= 0) { + if (field_0x44 != NULL) { + field_0x44(); + } + + prepareCopyDisp(); + GXCopyDisp(xfbMng->getDrawingXfb(), GX_TRUE); + if (mDrawDoneMethod == UNK_METHOD_0) { + xfbMng->setDrawnXfbIndex(xfbMng->getDrawingXfbIndex()); + GXDrawDone(); + JUTVideo::dummyNoDrawWait(); + } else { + JUTVideo::drawDoneStart(); + } + + if (mDrawDoneMethod == UNK_METHOD_0) { + callDirectDraw(); + } + } + s16 cur_xfb_index = xfbMng->getDrawingXfbIndex(); + xfbMng->setDrawnXfbIndex(cur_xfb_index); + xfbMng->setDrawingXfbIndex(cur_xfb_index >= 0 ? cur_xfb_index ^ 1 : 0); + } else { + clearEfb(mClearColor); + if (xfbMng->getDrawingXfbIndex() < 0) { + xfbMng->setDrawingXfbIndex(0); + } + } } -#pragma pop /* 802724FC-80272574 26CE3C 0078+00 1/1 0/0 0/0 .text exchangeXfb_triple__10JFWDisplayFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JFWDisplay::exchangeXfb_triple() { - nofralloc -#include "asm/JSystem/JFramework/JFWDisplay/exchangeXfb_triple__10JFWDisplayFv.s" +void JFWDisplay::exchangeXfb_triple() { + JUTXfb* xfbMng = JUTXfb::getManager(); + + if (xfbMng->getDrawingXfbIndex() >= 0) { + callDirectDraw(); + } + + xfbMng->setDrawnXfbIndex(xfbMng->getDrawingXfbIndex()); + + s16 drawing_idx = xfbMng->getDrawingXfbIndex() + 1; + do { + if (drawing_idx >= 3 || drawing_idx < 0) { + drawing_idx = 0; + } + } while (drawing_idx == xfbMng->getDisplayingXfbIndex()); + xfbMng->setDrawingXfbIndex(drawing_idx); } -#pragma pop /* 80272574-802725F8 26CEB4 0084+00 1/1 0/0 0/0 .text copyXfb_triple__10JFWDisplayFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JFWDisplay::copyXfb_triple() { - nofralloc -#include "asm/JSystem/JFramework/JFWDisplay/copyXfb_triple__10JFWDisplayFv.s" +void JFWDisplay::copyXfb_triple() { + JUTXfb* xfbMng = JUTXfb::getManager(); + + if (xfbMng->getDrawingXfbIndex() >= 0) { + if (field_0x44 != NULL) { + field_0x44(); + } + prepareCopyDisp(); + GXCopyDisp(xfbMng->getDrawingXfb(), GX_TRUE); + GXPixModeSync(); + } } -#pragma pop /* 802725F8-8027268C 26CF38 0094+00 1/1 0/0 0/0 .text preGX__10JFWDisplayFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JFWDisplay::preGX() { - nofralloc -#include "asm/JSystem/JFramework/JFWDisplay/preGX__10JFWDisplayFv.s" +void JFWDisplay::preGX() { + GXInvalidateTexAll(); + GXInvalidateVtxCache(); + + if (JUTVideo::getManager()->isAntiAliasing()) { + GXSetPixelFmt(GX_PF_RGB565_Z16, GX_ZC_LINEAR); + GXSetDither(GX_ENABLE); + } else { + if (mEnableAlpha) { + GXSetPixelFmt(GX_PF_RGBA6_Z24, GX_ZC_LINEAR); + GXSetDither(GX_ENABLE); + } else { + GXSetPixelFmt(GX_PF_RGB8_Z24, GX_ZC_LINEAR); + GXSetDither(GX_DISABLE); + } + } } -#pragma pop - -/* ############################################################################################## */ -/* 80455254-80455258 003854 0004+00 1/1 0/0 0/0 .sdata2 @2497 */ -SECTION_SDATA2 static f32 lit_2497 = -1.0f; - -/* 80455258-80455260 003858 0004+04 3/3 0/0 0/0 .sdata2 @2498 */ -SECTION_SDATA2 static f32 lit_2498[1 + 1 /* padding */] = { - 1.0f, - /* padding */ - 0.0f, -}; - -/* 80455260-80455268 003860 0008+00 4/4 0/0 0/0 .sdata2 @2500 */ -SECTION_SDATA2 static f64 lit_2500 = 4503599627370496.0 /* cast u32 to float */; /* 8027268C-80272798 26CFCC 010C+00 1/1 0/0 0/0 .text endGX__10JFWDisplayFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JFWDisplay::endGX() { - nofralloc -#include "asm/JSystem/JFramework/JFWDisplay/endGX__10JFWDisplayFv.s" +void JFWDisplay::endGX() { + f32 width = JUTVideo::getManager()->getFbWidth(); + f32 height = JUTVideo::getManager()->getEfbHeight(); + + J2DOrthoGraph ortho(0.0f, 0.0f, width, height, -1.0f, 1.0f); + + if (mFader != NULL) { + ortho.setPort(); + mFader->control(); + } + ortho.setPort(); + JUTDbPrint::getManager()->flush(); + + if (JUTConsoleManager::getManager() != NULL) { + ortho.setPort(); + JUTConsoleManager::getManager()->draw(); + } + + ortho.setPort(); + JUTProcBar::getManager()->draw(); + + if (mDrawDoneMethod != UNK_METHOD_0 || JUTXfb::getManager()->getBufferNum() == 1) { + JUTAssertion::flushMessage_dbPrint(); + } + GXFlush(); } -#pragma pop /* 80272798-80272A04 26D0D8 026C+00 1/0 0/0 0/0 .text beginRender__10JFWDisplayFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm void JFWDisplay::beginRender() { -extern "C" asm void beginRender__10JFWDisplayFv() { - nofralloc -#include "asm/JSystem/JFramework/JFWDisplay/beginRender__10JFWDisplayFv.s" +void JFWDisplay::beginRender() { + if (field_0x40) { + JUTProcBar::getManager()->wholeLoopEnd(); + } + + if (field_0x40) { + JUTProcBar::getManager()->wholeLoopStart(); + JUTProcBar::getManager()->idleStart(); + } + + waitForTick(mTickRate, mFrameRate); + JUTVideo::getManager()->waitRetraceIfNeed(); + + OSTick tick = OSGetTick(); + field_0x30 = tick - field_0x2c; + field_0x2c = tick; + field_0x34 = field_0x2c - JUTVideo::getVideoLastTick(); + + if (field_0x40) { + JUTProcBar::getManager()->idleEnd(); + } + + if (field_0x40) { + JUTProcBar::getManager()->gpStart(); + + JUTXfb* xfbMng = JUTXfb::getManager(); + switch (xfbMng->getBufferNum()) { + case 1: + if (xfbMng->getSDrawingFlag() != 2) { + xfbMng->setSDrawingFlag(1); + clearEfb(mClearColor); + } else { + xfbMng->setSDrawingFlag(1); + } + xfbMng->setDrawingXfbIndex(field_0x48); + break; + case 2: + exchangeXfb_double(); + break; + case 3: + exchangeXfb_triple(); + break; + default: + break; + } + } + + field_0x3c++; + field_0x40 = field_0x3c >= field_0x38; + + if (field_0x40) { + field_0x3c = 0; + } + + if (field_0x40) { + clearEfb(); + preGX(); + } } -#pragma pop /* 80272A04-80272AB0 26D344 00AC+00 1/0 0/0 0/0 .text endRender__10JFWDisplayFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JFWDisplay::endRender() { - nofralloc -#include "asm/JSystem/JFramework/JFWDisplay/endRender__10JFWDisplayFv.s" +void JFWDisplay::endRender() { + endGX(); + + if (field_0x40) { + switch (JUTXfb::getManager()->getBufferNum()) { + case 1: + drawendXfb_single(); + case 2: + break; + case 3: + copyXfb_triple(); + default: + break; + } + } + + JUTProcBar::getManager()->cpuStart(); + calcCombinationRatio(); } -#pragma pop /* ############################################################################################## */ /* 804511C4-804511C8 0006C4 0004+00 1/1 0/0 0/0 .sbss prevFrame$2597 */ -static u8 prevFrame[4]; +static u32 prevFrame; /* 804511C8-804511D0 0006C8 0008+00 1/1 0/0 0/0 .sbss None */ -static u8 data_804511C8[8]; +static s8 data_804511C8; /* 80272AB0-80272C60 26D3F0 01B0+00 1/0 0/0 0/0 .text endFrame__10JFWDisplayFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JFWDisplay::endFrame() { - nofralloc -#include "asm/JSystem/JFramework/JFWDisplay/endFrame__10JFWDisplayFv.s" +void JFWDisplay::endFrame() { + JUTProcBar::getManager()->cpuEnd(); + + if (field_0x40) { + JUTProcBar::getManager()->gpWaitStart(); + switch (JUTXfb::getManager()->getBufferNum()) { + case 1: + break; + case 2: + JFWDrawDoneAlarm(); + GXFlush(); + break; + case 3: + JFWDrawDoneAlarm(); + GXFlush(); + break; + default: + break; + } + + JUTProcBar::getManager()->gpWaitEnd(); + JUTProcBar::getManager()->gpEnd(); + } + + if (field_0x40) { + if (data_804511C8 == 0) { + prevFrame = VIGetRetraceCount(); + data_804511C8 = 1; + } + u32 retrace_cnt = VIGetRetraceCount(); + JUTProcBar::getManager()->setCostFrame(retrace_cnt - prevFrame); + prevFrame = retrace_cnt; + } } -#pragma pop /* 80272C60-80272CB0 26D5A0 0050+00 1/1 1/1 0/0 .text waitBlanking__10JFWDisplayFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JFWDisplay::waitBlanking(int param_0) { - nofralloc -#include "asm/JSystem/JFramework/JFWDisplay/waitBlanking__10JFWDisplayFi.s" +void JFWDisplay::waitBlanking(int param_0) { + while (param_0-- > 0) { + waitForTick(mTickRate, mFrameRate); + } } -#pragma pop /* ############################################################################################## */ /* 804511D0-804511D4 0006D0 0004+00 1/1 0/0 0/0 .sbss nextTick$2642 */ -static u8 nextTick[4]; +static u8 nextTick[4] ALIGN_DECL(8); /* 804511D4-804511D8 0006D4 0004+00 1/1 0/0 0/0 .sbss None */ static u8 data_804511D4[4]; /* 804511D8-804511DC 0006D8 0004+00 1/1 0/0 0/0 .sbss None */ -static u8 data_804511D8[4]; +static s8 data_804511D8; /* 804511DC-804511E0 0006DC 0004+00 1/1 0/0 0/0 .sbss nextCount$2650 */ -static u8 nextCount[4]; +static u32 nextCount; /* 804511E0-804511E8 0006E0 0008+00 1/1 0/0 0/0 .sbss None */ -static u8 data_804511E0[8]; +static s8 data_804511E0; /* 80272CB0-80272DD0 26D5F0 0120+00 2/2 0/0 0/0 .text waitForTick__FUlUs */ +#ifdef NONMATCHING +static void waitForTick(u32 param_0, u16 param_1) { + if (param_0 != 0) { + if (!data_804511D8) { + nextTick = OSGetTime(); + data_804511D8 = true; + } + + while (OSGetTime() < nextTick) { + JFWDisplay::getManager()->threadSleep(nextTick - param_0); + } + nextTick += param_0; + } else { + if (!data_804511E0) { + nextCount = VIGetRetraceCount(); + data_804511E0 = true; + } + + int uvar4 = 1; + if (param_1 != 0) { + uvar4 = param_1; + } + + OSMessage msg; + do { + if (!OSReceiveMessage(JUTVideo::getManager()->getMessageQueue(), &msg, + OS_MESSAGE_BLOCKING)) { + msg = NULL; + } + } while ((int)msg - nextCount > 0); + nextCount = (int)msg + uvar4; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -489,166 +539,211 @@ static asm void waitForTick(u32 param_0, u16 param_1) { #include "asm/JSystem/JFramework/JFWDisplay/waitForTick__FUlUs.s" } #pragma pop - -/* ############################################################################################## */ -/* 80430FD8-80430FE4 05DCF8 000C+00 1/1 0/0 0/0 .bss @2184 */ -static u8 lit_2184[12]; +#endif /* 80430FE4-80430FF0 05DD04 000C+00 4/4 0/0 0/0 .bss sList__8JFWAlarm */ -u8 JFWAlarm::sList[12]; +JSUList JFWAlarm::sList(false); /* 80272DD0-80272E10 26D710 0040+00 1/1 0/0 0/0 .text JFWThreadAlarmHandler__FP7OSAlarmP9OSContext */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void JFWThreadAlarmHandler(OSAlarm* param_0, OSContext* param_1) { - nofralloc -#include "asm/JSystem/JFramework/JFWDisplay/JFWThreadAlarmHandler__FP7OSAlarmP9OSContext.s" +static void JFWThreadAlarmHandler(OSAlarm* p_alarm, OSContext* p_ctx) { + JFWAlarm* alarm = static_cast(p_alarm); + alarm->removeLink(); + OSResumeThread(alarm->getThread()); } -#pragma pop /* 80272E10-80272EB8 26D750 00A8+00 1/1 0/0 0/0 .text threadSleep__10JFWDisplayFx */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JFWDisplay::threadSleep(s64 param_0) { - nofralloc -#include "asm/JSystem/JFramework/JFWDisplay/threadSleep__10JFWDisplayFx.s" +void JFWDisplay::threadSleep(s64 time) { + JFWAlarm alarm; + alarm.createAlarm(); + alarm.setThread(OSGetCurrentThread()); + s32 status = OSDisableInterrupts(); + alarm.appendLink(); + + OSSetAlarm(&alarm, time, JFWThreadAlarmHandler); + OSSuspendThread(alarm.getThread()); + OSRestoreInterrupts(status); } -#pragma pop /* ############################################################################################## */ /* 80430FF0-80431010 05DD10 0020+00 2/2 0/0 0/0 .bss clear_z_tobj */ -static u8 clear_z_tobj[32]; +static GXTexObj clear_z_tobj; /* 80272EB8-80272F2C 26D7F8 0074+00 1/1 0/0 0/0 .text clearEfb_init__10JFWDisplayFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JFWDisplay::clearEfb_init() { - nofralloc -#include "asm/JSystem/JFramework/JFWDisplay/clearEfb_init__10JFWDisplayFv.s" +void JFWDisplay::clearEfb_init() { + GXInitTexObj(&clear_z_tobj, &clear_z_TX, 4, 4, GX_TF_Z24X8, GX_REPEAT, GX_REPEAT, GX_FALSE); + GXInitTexObjLOD(&clear_z_tobj, GX_NEAR, GX_NEAR, 0.0f, 0.0f, 0.0f, GX_FALSE, GX_FALSE, + GX_ANISO_1); } -#pragma pop /* 80272F2C-80272F58 26D86C 002C+00 1/1 0/0 0/0 .text clearEfb__10JFWDisplayFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JFWDisplay::clearEfb() { - nofralloc -#include "asm/JSystem/JFramework/JFWDisplay/clearEfb__10JFWDisplayFv.s" +void JFWDisplay::clearEfb() { + clearEfb(mClearColor); } -#pragma pop /* 80272F58-80272F9C 26D898 0044+00 3/3 0/0 0/0 .text clearEfb__10JFWDisplayF8_GXColor */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JFWDisplay::clearEfb(_GXColor param_0) { - nofralloc -#include "asm/JSystem/JFramework/JFWDisplay/clearEfb__10JFWDisplayF8_GXColor.s" +void JFWDisplay::clearEfb(GXColor color) { + int width = JUTVideo::getManager()->getFbWidth(); + int height = JUTVideo::getManager()->getEfbHeight(); + + clearEfb(0, 0, width, height, color); } -#pragma pop /* 80272F9C-8027331C 26D8DC 0380+00 1/1 0/0 0/0 .text clearEfb__10JFWDisplayFiiii8_GXColor */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JFWDisplay::clearEfb(int param_0, int param_1, int param_2, int param_3, - _GXColor param_4) { - nofralloc -#include "asm/JSystem/JFramework/JFWDisplay/clearEfb__10JFWDisplayFiiii8_GXColor.s" -} -#pragma pop +void JFWDisplay::clearEfb(int param_0, int param_1, int param_2, int param_3, GXColor color) { + u16 width; + u16 height; + Mtx44 mtx; -/* ############################################################################################## */ -/* 80455268-80455270 003868 0008+00 1/1 0/0 0/0 .sdata2 @2933 */ -SECTION_SDATA2 static f64 lit_2933 = 4503601774854144.0 /* cast s32 to float */; + JUTVideo::getManager()->getBounds(width, height); + + C_MTXOrtho(mtx, 0.0f, height, 0.0f, width, 0.0f, 1.0f); + GXSetProjection(mtx, GX_ORTHOGRAPHIC); + GXSetViewport(0.0f, 0.0f, width, height, 0.0f, 1.0f); + GXSetScissor(0, 0, width, height); + + GXLoadPosMtxImm(e_mtx, GX_PNMTX0); + GXSetCurrentMtx(0); + GXClearVtxDesc(); + GXSetVtxDesc(GX_VA_POS, GX_DIRECT); + GXSetVtxDesc(GX_VA_TEX0, GX_DIRECT); + GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_CLR_RGB, GX_RGBX8, 0); + GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX0, GX_CLR_RGBA, GX_RGB565, 0); + GXSetNumChans(0); + GXSetChanCtrl(GX_COLOR0A0, GX_DISABLE, GX_SRC_REG, GX_SRC_REG, GX_LIGHT_NULL, GX_DF_NONE, + GX_AF_NONE); + GXSetChanCtrl(GX_COLOR1A1, GX_DISABLE, GX_SRC_REG, GX_SRC_REG, GX_LIGHT_NULL, GX_DF_NONE, + GX_AF_NONE); + GXSetNumTexGens(1); + GXSetTexCoordGen2(GX_TEXCOORD0, GX_TG_MTX2x4, GX_TG_TEX0, 60, GX_DISABLE, 125); + GXLoadTexObj(&clear_z_tobj, GX_TEXMAP0); + GXSetNumTevStages(1); + GXSetTevColor(GX_TEVREG0, color); + GXSetTevOrder(GX_TEVSTAGE0, GX_TEXCOORD0, GX_TEXMAP0, GX_COLOR_NULL); + GXSetTevColorIn(GX_TEVSTAGE0, GX_CC_ZERO, GX_CC_ZERO, GX_CC_ZERO, GX_CC_C0); + GXSetTevColorOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_ENABLE, GX_TEVPREV); + GXSetTevAlphaIn(GX_TEVSTAGE0, GX_CA_ZERO, GX_CA_ZERO, GX_CA_ZERO, GX_CA_A0); + GXSetTevAlphaOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_ENABLE, GX_TEVPREV); + GXSetAlphaCompare(GX_ALWAYS, 0, GX_AOP_OR, GX_ALWAYS, 0); + GXSetZTexture(GX_ZT_REPLACE, GX_TF_Z24X8, 0); + GXSetZCompLoc(GX_DISABLE); + GXSetBlendMode(GX_BM_NONE, GX_BL_ZERO, GX_BL_ZERO, GX_LO_NOOP); + + if (mEnableAlpha) { + GXSetAlphaUpdate(GX_ENABLE); + GXSetDstAlpha(GX_ENABLE, color.a); + } + GXSetZMode(GX_ENABLE, GX_ALWAYS, GX_ENABLE); + GXSetCullMode(GX_CULL_BACK); + + GXBegin(GX_QUADS, GX_VTXFMT0, 4); + GXPosition2u16(param_0, param_1); + GXTexCoord2u8(0, 0); + + GXPosition2u16(param_0 + param_2, param_1); + GXTexCoord2u8(1, 0); + + GXPosition2u16(param_0 + param_2, param_1 + param_3); + GXTexCoord2u8(1, 1); + + GXPosition2u16(param_0, param_1 + param_3); + GXTexCoord2u8(0, 1); + + GXSetZTexture(GX_ZT_DISABLE, GX_TF_Z24X8, 0); + GXSetZCompLoc(GX_ENABLE); + if (mEnableAlpha) { + GXSetDstAlpha(GX_DISABLE, color.a); + } +} /* 8027331C-802733A8 26DC5C 008C+00 1/1 0/0 0/0 .text calcCombinationRatio__10JFWDisplayFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JFWDisplay::calcCombinationRatio() { - nofralloc -#include "asm/JSystem/JFramework/JFWDisplay/calcCombinationRatio__10JFWDisplayFv.s" -} -#pragma pop +void JFWDisplay::calcCombinationRatio() { + u32 vidInterval = JUTVideo::getVideoInterval(); + s32 unk30 = field_0x30 * 2; -/* ############################################################################################## */ -/* 80455270-80455278 003870 0008+00 1/1 0/0 0/0 .sdata2 @2964 */ -SECTION_SDATA2 static f64 lit_2964 = 0.5; + s32 i = vidInterval; + for (; i < unk30; i += vidInterval) { + } + + s32 tmp = (i - unk30) - field_0x34; + if (tmp < 0) { + tmp += vidInterval; + } + mCombinationRatio = (f32)tmp / (f32)field_0x30; + if (mCombinationRatio > 1.0f) { + mCombinationRatio = 1.0f; + } +} /* 802733A8-80273484 26DCE8 00DC+00 2/2 0/0 0/0 .text JFWDrawDoneAlarm__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void JFWDrawDoneAlarm() { - nofralloc -#include "asm/JSystem/JFramework/JFWDisplay/JFWDrawDoneAlarm__Fv.s" +static void JFWDrawDoneAlarm() { + JFWAlarm alarm; + s32 status = OSDisableInterrupts(); + alarm.createAlarm(); + alarm.appendLink(); + OSSetAlarm(&alarm, 0.5 * (*(u32*)0x800000F8 >> 2), JFWGXAbortAlarmHandler); + GXDrawDone(); + alarm.cancelAlarm(); + alarm.removeLink(); + OSRestoreInterrupts(status); } -#pragma pop /* 80273484-802734FC 26DDC4 0078+00 1/1 0/0 0/0 .text * JFWGXAbortAlarmHandler__FP7OSAlarmP9OSContext */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void JFWGXAbortAlarmHandler(OSAlarm* param_0, OSContext* param_1) { - nofralloc -#include "asm/JSystem/JFramework/JFWDisplay/JFWGXAbortAlarmHandler__FP7OSAlarmP9OSContext.s" -} -#pragma pop +static void JFWGXAbortAlarmHandler(OSAlarm* param_0, OSContext* param_1) { + diagnoseGpHang(); + GXAbortFrame(); + GFX_FIFO(u8) = 0x61; + GFX_FIFO(u32) = 0x5800000F; -/* ############################################################################################## */ -/* 8039A878-8039A878 026ED8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8039A878 = "GP status %d%d%d%d%d%d --> "; -SECTION_DEAD static char const* const stringBase_8039A894 = "GP hang due to XF stall bug.\n"; -SECTION_DEAD static char const* const stringBase_8039A8B2 = - "GP hang due to unterminated primitive.\n"; -SECTION_DEAD static char const* const stringBase_8039A8DA = "GP hang due to illegal instruction.\n"; -SECTION_DEAD static char const* const stringBase_8039A8FF = - "GP appears to be not hung (waiting for input).\n"; -SECTION_DEAD static char const* const stringBase_8039A92F = "GP is in unknown state.\n"; -#pragma pop + GXFifoObj* fifo = GXGetCPUFifo(); + if (fifo != NULL) { + void* base = GXGetFifoBase(fifo); + u32 size = GXGetFifoSize(fifo); + GXInit(base, size); + } + GXSetDrawDone(); +} /* 802734FC-802736DC 26DE3C 01E0+00 1/1 0/0 0/0 .text diagnoseGpHang__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void diagnoseGpHang() { - nofralloc -#include "asm/JSystem/JFramework/JFWDisplay/diagnoseGpHang__Fv.s" -} -#pragma pop +static void diagnoseGpHang() { + u32 sp28; + u32 sp24; + u32 sp20; + u32 sp1C; + u32 sp18; + u32 sp14; + u32 sp10; + u32 spC; + bool readIdle; + bool commandIdle; + bool sp8; -/* 802736DC-80273724 26E01C 0048+00 0/0 1/0 0/0 .text __sinit_JFWDisplay_cpp */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __sinit_JFWDisplay_cpp() { - nofralloc -#include "asm/JSystem/JFramework/JFWDisplay/__sinit_JFWDisplay_cpp.s" -} -#pragma pop + GXReadXfRasMetric(&sp24, &sp28, &sp1C, &sp20); + GXReadXfRasMetric(&sp14, &sp18, &spC, &sp10); -#pragma push -#pragma force_active on -REGISTER_CTORS(0x802736DC, __sinit_JFWDisplay_cpp); -#pragma pop + u32 temp_r31 = sp28 == sp18; + u32 temp_r30 = sp24 == sp14; + u32 temp_r0 = sp20 != sp10; + u32 temp_r0_2 = sp1C != spC; -/* 80273724-80273778 26E064 0054+00 1/1 0/0 0/0 .text __dt__18JSUList<8JFWAlarm>Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -extern "C" asm void func_80273724(void* _this) { - nofralloc -#include "asm/JSystem/JFramework/JFWDisplay/func_80273724.s" + GXGetGPStatus((GXBool*)&sp8, (GXBool*)&sp8, (GXBool*)&readIdle, (GXBool*)&commandIdle, + (GXBool*)&sp8); + + OSReport("GP status %d%d%d%d%d%d --> ", readIdle, commandIdle, temp_r31, temp_r30, temp_r0, + temp_r0_2); + + if (!temp_r30 && temp_r0) { + OSReport("GP hang due to XF stall bug.\n"); + } else if (!temp_r31 && temp_r30 && temp_r0) { + OSReport("GP hang due to unterminated primitive.\n"); + } else if (!commandIdle && temp_r31 && temp_r30 && temp_r0) { + OSReport("GP hang due to illegal instruction.\n"); + } else if (readIdle && commandIdle && temp_r31 && temp_r30 && temp_r0 && temp_r0_2) { + OSReport("GP appears to be not hung (waiting for input).\n"); + } else { + OSReport("GP is in unknown state.\n"); + } } -#pragma pop /* 8039A878-8039A878 026ED8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/libs/JSystem/JFramework/JFWSystem.cpp b/libs/JSystem/JFramework/JFWSystem.cpp index 3339bf57dfd..4405ffbf363 100644 --- a/libs/JSystem/JFramework/JFWSystem.cpp +++ b/libs/JSystem/JFramework/JFWSystem.cpp @@ -4,6 +4,12 @@ // #include "JSystem/JFramework/JFWSystem.h" +#include "JSystem/JKernel/JKRAram.h" +#include "JSystem/JUtility/JUTAssert.h" +#include "JSystem/JUtility/JUTDirectPrint.h" +#include "JSystem/JUtility/JUTException.h" +#include "JSystem/JUtility/JUTGamePad.h" +#include "JSystem/JUtility/JUTVideo.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -11,57 +17,10 @@ // Types: // -struct OSThread {}; - -struct JUTVideo { - /* 802E4C54 */ void createManager(_GXRenderModeObj const*); -}; - -struct JKRHeap { - /* 802CE4D4 */ void alloc(u32, int); -}; - -struct JUTResFont { - /* 802DEF94 */ JUTResFont(ResFONT const*, JKRHeap*); -}; - struct JUTGraphFifo { /* 802DEB58 */ JUTGraphFifo(u32); -}; -struct JUTGamePad { - /* 802E0898 */ void init(); -}; - -struct JUTDirectPrint { - /* 802E4240 */ void start(); -}; - -struct JUTException { - /* 802E1E40 */ void create(JUTDirectPrint*); - /* 802E3FEC */ void createConsole(void*, u32); -}; - -struct JUTDbPrint { - /* 802E0190 */ void start(JUTFont*, JKRHeap*); - /* 802E0204 */ void changeFont(JUTFont*); -}; - -struct JUTAssertion { - /* 802E495C */ void create(); -}; - -struct JKRThread { - /* 802D16B8 */ JKRThread(OSThread*, int); -}; - -struct JKRExpHeap { - /* 802CEDB4 */ void createRoot(int, bool); - /* 802CEE2C */ void create(u32, JKRHeap*, bool); -}; - -struct JKRAram { - /* 802D1FA4 */ void create(u32, u32, s32, s32, s32); + u8 field_0x0[0x1C]; }; // @@ -111,10 +70,7 @@ extern "C" void create__12JUTAssertionFv(); extern "C" void createManager__8JUTVideoFPC16_GXRenderModeObj(); extern "C" void create__10JUTConsoleFUiUiP7JKRHeap(); extern "C" void createManager__17JUTConsoleManagerFP7JKRHeap(); -extern "C" void JUTSetReportConsole(); -extern "C" void JUTSetWarningConsole(); extern "C" void OSInit(); -extern "C" void OSGetCurrentThread(); extern "C" void DVDInit(); extern "C" extern u8 const JUTResFONT_Ascfont_fix12[16736]; extern "C" extern u8 GXNtsc480IntDf[60]; @@ -125,82 +81,78 @@ extern "C" extern u8 GXNtsc480IntDf[60]; /* ############################################################################################## */ /* 80450770-80450774 0001F0 0004+00 1/1 1/1 0/0 .sdata maxStdHeaps__Q29JFWSystem11CSetUpParam */ -SECTION_SDATA u32 JFWSystem::CSetUpParam::maxStdHeaps = 0x00000002; +SECTION_SDATA s32 JFWSystem::CSetUpParam::maxStdHeaps = 2; /* 80450774-80450778 0001F4 0004+00 1/1 1/1 0/0 .sdata sysHeapSize__Q29JFWSystem11CSetUpParam */ -SECTION_SDATA u32 JFWSystem::CSetUpParam::sysHeapSize = 0x00400000; +SECTION_SDATA u32 JFWSystem::CSetUpParam::sysHeapSize = 0x400000; /* 804511A0-804511A4 0006A0 0004+00 2/2 0/0 0/0 .sbss rootHeap__9JFWSystem */ -u8 JFWSystem::rootHeap[4]; +JKRExpHeap* JFWSystem::rootHeap; /* 804511A4-804511A8 0006A4 0004+00 2/2 1/1 0/0 .sbss systemHeap__9JFWSystem */ -u8 JFWSystem::systemHeap[4]; +JKRExpHeap* JFWSystem::systemHeap; /* 80271CD0-80271D18 26C610 0048+00 1/1 1/1 0/0 .text firstInit__9JFWSystemFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JFWSystem::firstInit() { - nofralloc -#include "asm/JSystem/JFramework/JFWSystem/firstInit__9JFWSystemFv.s" +void JFWSystem::firstInit() { + OSInit(); + DVDInit(); + rootHeap = JKRExpHeap::createRoot(CSetUpParam::maxStdHeaps, false); + systemHeap = JKRExpHeap::create(CSetUpParam::sysHeapSize, rootHeap, false); } -#pragma pop /* ############################################################################################## */ /* 80450778-8045077C 0001F8 0004+00 1/1 1/1 0/0 .sdata fifoBufSize__Q29JFWSystem11CSetUpParam */ -SECTION_SDATA u32 JFWSystem::CSetUpParam::fifoBufSize = 0x00040000; +SECTION_SDATA u32 JFWSystem::CSetUpParam::fifoBufSize = 0x40000; /* 8045077C-80450780 0001FC 0004+00 1/1 1/1 0/0 .sdata aramAudioBufSize__Q29JFWSystem11CSetUpParam */ -SECTION_SDATA u32 JFWSystem::CSetUpParam::aramAudioBufSize = 0x00800000; +SECTION_SDATA u32 JFWSystem::CSetUpParam::aramAudioBufSize = 0x800000; /* 80450780-80450784 000200 0004+00 1/1 1/1 0/0 .sdata aramGraphBufSize__Q29JFWSystem11CSetUpParam */ -SECTION_SDATA u32 JFWSystem::CSetUpParam::aramGraphBufSize = 0x00600000; +SECTION_SDATA u32 JFWSystem::CSetUpParam::aramGraphBufSize = 0x600000; /* 80450784-80450788 000204 0004+00 1/1 0/0 0/0 .sdata streamPriority__Q29JFWSystem11CSetUpParam */ -SECTION_SDATA u32 JFWSystem::CSetUpParam::streamPriority = 0x00000008; +SECTION_SDATA u32 JFWSystem::CSetUpParam::streamPriority = 8; /* 80450788-8045078C 000208 0004+00 1/1 0/0 0/0 .sdata decompPriority__Q29JFWSystem11CSetUpParam */ -SECTION_SDATA u32 JFWSystem::CSetUpParam::decompPriority = 0x00000007; +SECTION_SDATA u32 JFWSystem::CSetUpParam::decompPriority = 7; /* 8045078C-80450790 00020C 0004+00 1/1 0/0 0/0 .sdata aPiecePriority__Q29JFWSystem11CSetUpParam */ -SECTION_SDATA u32 JFWSystem::CSetUpParam::aPiecePriority = 0x00000006; +SECTION_SDATA u32 JFWSystem::CSetUpParam::aPiecePriority = 6; /* 80450790-80450794 -00001 0004+00 1/1 0/0 0/0 .sdata systemFontRes__Q29JFWSystem11CSetUpParam */ -SECTION_SDATA void* JFWSystem::CSetUpParam::systemFontRes = (void*)&JUTResFONT_Ascfont_fix12; +SECTION_SDATA ResFONT* JFWSystem::CSetUpParam::systemFontRes = (ResFONT*)&JUTResFONT_Ascfont_fix12; /* 80450794-80450798 -00001 0004+00 1/1 1/1 0/0 .sdata renderMode__Q29JFWSystem11CSetUpParam */ -SECTION_SDATA void* JFWSystem::CSetUpParam::renderMode = (void*)&GXNtsc480IntDf; +SECTION_SDATA GXRenderModeObj* JFWSystem::CSetUpParam::renderMode = + (GXRenderModeObj*)&GXNtsc480IntDf; /* 80450798-804507A0 000218 0004+04 1/1 0/0 0/0 .sdata * exConsoleBufferSize__Q29JFWSystem11CSetUpParam */ -SECTION_SDATA u32 JFWSystem::CSetUpParam::exConsoleBufferSize[1 + 1 /* padding */] = { - 0x000024FC, - /* padding */ - 0x00000000, -}; +SECTION_SDATA u32 JFWSystem::CSetUpParam::exConsoleBufferSize = 0x24FC; /* 804511A8-804511AC 0006A8 0004+00 1/1 0/0 0/0 .sbss mainThread__9JFWSystem */ -u8 JFWSystem::mainThread[4]; +JKRThread* JFWSystem::mainThread; /* 804511AC-804511B0 0006AC 0004+00 1/1 0/0 0/0 .sbss debugPrint__9JFWSystem */ -u8 JFWSystem::debugPrint[4]; +JUTDbPrint* JFWSystem::debugPrint; /* 804511B0-804511B4 0006B0 0004+00 1/1 0/0 0/0 .sbss systemFont__9JFWSystem */ -u8 JFWSystem::systemFont[4]; +JUTResFont* JFWSystem::systemFont; /* 804511B4-804511B8 0006B4 0004+00 1/1 0/0 0/0 .sbss systemConsoleManager__9JFWSystem */ -u8 JFWSystem::systemConsoleManager[4]; +JUTConsoleManager* JFWSystem::systemConsoleManager; /* 804511B8-804511BC 0006B8 0004+00 1/1 7/7 0/0 .sbss systemConsole__9JFWSystem */ JUTConsole* JFWSystem::systemConsole; /* 804511BC-804511C0 0006BC 0004+00 1/1 0/0 0/0 .sbss None */ -static u8 data_804511BC[4]; +static u8 data_804511BC; +// static bool sInitCalled /* 80455240-80455244 003840 0004+00 1/1 0/0 0/0 .sdata2 @2242 */ SECTION_SDATA2 static f32 lit_2242 = 0.5f; @@ -212,6 +164,60 @@ SECTION_SDATA2 static f32 lit_2243 = 17.0f / 20.0f; SECTION_SDATA2 static f64 lit_2245 = 4503601774854144.0 /* cast s32 to float */; /* 80271D18-80272040 26C658 0328+00 0/0 1/1 0/0 .text init__9JFWSystemFv */ +// just regalloc in the beginning +#ifdef NONMATCHING +void JFWSystem::init() { + if (rootHeap == NULL) { + firstInit(); + } + sInitCalled = true; + + JKRAram::create(CSetUpParam::aramAudioBufSize, CSetUpParam::aramGraphBufSize, + CSetUpParam::streamPriority, CSetUpParam::decompPriority, + CSetUpParam::aPiecePriority); + mainThread = new JKRThread(OSGetCurrentThread(), 4); + + JUTVideo::createManager(CSetUpParam::renderMode); + + u32 fifoSize = CSetUpParam::fifoBufSize; + JUTGraphFifo* fifo = new JUTGraphFifo(fifoSize); + + JUTGamePad::init(); + + JUTDirectPrint* dbPrint = JUTDirectPrint::start(); + + JUTAssertion::create(); + + JUTException::create(dbPrint); + + systemFont = new JUTResFont(CSetUpParam::systemFontRes, NULL); + + debugPrint = JUTDbPrint::start(NULL, NULL); + debugPrint->changeFont(systemFont); + + systemConsoleManager = JUTConsoleManager::createManager(NULL); + + systemConsole = JUTConsole::create(60, 200, NULL); + systemConsole->setFont(systemFont); + + if (CSetUpParam::renderMode->efb_height < 300) { + systemConsole->setFontSize(systemFont->getWidth() * 0.85f, systemFont->getHeight() * 0.5f); + systemConsole->setPosition(20, 25); + } else { + systemConsole->setFontSize(systemFont->getWidth(), systemFont->getHeight()); + systemConsole->setPosition(20, 50); + } + + systemConsole->setHeight(25); + systemConsole->setVisible(false); + systemConsole->setOutput(JUTConsole::OUTPUT_OSREPORT | JUTConsole::OUTPUT_CONSOLE); + JUTSetReportConsole(systemConsole); + JUTSetWarningConsole(systemConsole); + + void* buffer = systemHeap->alloc(CSetUpParam::exConsoleBufferSize, 4); + JUTException::createConsole(buffer, CSetUpParam::exConsoleBufferSize); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -220,3 +226,4 @@ asm void JFWSystem::init() { #include "asm/JSystem/JFramework/JFWSystem/init__9JFWSystemFv.s" } #pragma pop +#endif diff --git a/libs/JSystem/JParticle/JPAResource.cpp b/libs/JSystem/JParticle/JPAResource.cpp index e25ed1a06c5..ab95ac473c8 100644 --- a/libs/JSystem/JParticle/JPAResource.cpp +++ b/libs/JSystem/JParticle/JPAResource.cpp @@ -180,7 +180,7 @@ JPAResource::JPAResource() { /* ############################################################################################## */ /* 803C40C0-803C4220 0211E0 0144+1C 2/2 0/0 0/0 .data jpa_pos */ -SECTION_DATA static u8 jpa_pos[324 + 28 /* padding */] = { +SECTION_DATA static u8 jpa_pos[324 + 28 /* padding */] ALIGN_DECL(32) = { 0x00, 0x00, 0x00, diff --git a/libs/JSystem/JUtility/JUTException.cpp b/libs/JSystem/JUtility/JUTException.cpp index ca000d5b106..de11b02146b 100644 --- a/libs/JSystem/JUtility/JUTException.cpp +++ b/libs/JSystem/JUtility/JUTException.cpp @@ -1126,7 +1126,7 @@ void JUTException::createConsole(void* console_buffer, u32 console_buffer_size) sConsole->setPosition(15, 26); sConsole->setHeight(23); sConsole->setVisible(true); - sConsole->setOutput(3); + sConsole->setOutput(JUTConsole::OUTPUT_OSREPORT | JUTConsole::OUTPUT_CONSOLE); } } diff --git a/libs/JSystem/JUtility/JUTProcBar.cpp b/libs/JSystem/JUtility/JUTProcBar.cpp index 8b73c30aeed..ed459566c6f 100644 --- a/libs/JSystem/JUtility/JUTProcBar.cpp +++ b/libs/JSystem/JUtility/JUTProcBar.cpp @@ -11,47 +11,10 @@ // Types: // -struct JUtility { - struct TColor {}; -}; - struct JUTVideo { static u8 sManager[4]; }; -struct JUTProcBar { - struct CTime { - /* 802E7340 */ CTime(); - }; - - /* 802E5888 */ JUTProcBar(); - /* 802E599C */ ~JUTProcBar(); - /* 802E59E0 */ void create(); - /* 802E5A28 */ void destroy(); - /* 802E5A60 */ void clear(); - /* 802E5B30 */ void bar_subroutine(int, int, int, int, int, int, int, JUtility::TColor, - JUtility::TColor); - /* 802E5CC4 */ void adjustMeterLength(u32, f32*, f32, f32, int*); - /* 802E5E08 */ void draw(); - /* 802E5E3C */ void drawProcessBar(); - /* 802E6FA0 */ void drawHeapBar(); - - static u8 sManager[4]; -}; - -struct JKRHeap { - /* 802CE784 */ void getTotalFreeSize(); - - static u8 sSystemHeap[4]; - static u8 sCurrentHeap[4]; - static u8 sRootHeap[4]; - static u8 mCodeStart[4]; - static u8 mCodeEnd[4]; - static u8 mUserRamStart[4]; - static u8 mUserRamEnd[4]; - static u8 mMemorySize[4]; -}; - // // Forward References: // @@ -82,7 +45,6 @@ extern "C" void __dl__FPv(); extern "C" void J2DDrawLine__FffffQ28JUtility6TColori(); extern "C" void J2DFillBox__FffffQ28JUtility6TColor(); extern "C" void J2DDrawFrame__FffffQ28JUtility6TColorUc(); -extern "C" void OSGetTick(); extern "C" void __construct_array(); extern "C" void _savegpr_21(); extern "C" void _savegpr_25(); @@ -118,7 +80,7 @@ asm JUTProcBar::JUTProcBar() { /* ############################################################################################## */ /* 80451558-8045155C 000A58 0004+00 4/4 6/6 0/0 .sbss sManager__10JUTProcBar */ -u8 JUTProcBar::sManager[4]; +JUTProcBar* JUTProcBar::sManager; /* 802E599C-802E59E0 2E02DC 0044+00 1/1 0/0 0/0 .text __dt__10JUTProcBarFv */ #pragma push diff --git a/libs/JSystem/JUtility/JUTVideo.cpp b/libs/JSystem/JUtility/JUTVideo.cpp index cff1fe483ed..99d30ede73a 100644 --- a/libs/JSystem/JUtility/JUTVideo.cpp +++ b/libs/JSystem/JUtility/JUTVideo.cpp @@ -15,7 +15,6 @@ // extern "C" void GXSetDrawDone(); -extern "C" void GXCopyDisp(void*, BOOL); // // Declarations: @@ -156,7 +155,7 @@ void JUTVideo::preRetraceProc(u32 retrace_count) { s16 index = xfb->getDrawnXfbIndex(); if (index >= 0) { xfb->setDisplayingXfbIndex(index); - GXCopyDisp(xfb->getDisplayingXfb(), 1); + GXCopyDisp(xfb->getDisplayingXfb(), GX_TRUE); GXFlush(); xfb->setSDrawingFlag(2); frameBuffer = xfb->getDisplayingXfb(); diff --git a/src/m_Do/m_Do_graphic.cpp b/src/m_Do/m_Do_graphic.cpp index 8f12cebe78c..e92b25e23a4 100644 --- a/src/m_Do/m_Do_graphic.cpp +++ b/src/m_Do/m_Do_graphic.cpp @@ -68,10 +68,6 @@ struct cXyz { static f32 Zero[3]; }; -struct JUTProcBar { - static u8 sManager[4]; -}; - struct JUTGamePad { static u8 mPadStatus[48]; }; diff --git a/src/m_Do/m_Do_machine.cpp b/src/m_Do/m_Do_machine.cpp index ff674456683..aea800a5a21 100644 --- a/src/m_Do/m_Do_machine.cpp +++ b/src/m_Do/m_Do_machine.cpp @@ -356,7 +356,8 @@ void myExceptionCallback(u16 param_0, OSContext* param_1, u32 param_2, u32 param OSReport("JUTAssertionを可視化しました\n"); JUTAssertion::setVisible(true); JUTDbPrint::getManager()->setVisible(true); - JFWSystem::getSystemConsole()->setOutput(3); + JFWSystem::getSystemConsole()->setOutput(JUTConsole::OUTPUT_OSREPORT | + JUTConsole::OUTPUT_CONSOLE); } else { PPCHalt(); } diff --git a/src/m_Do/m_Do_main.cpp b/src/m_Do/m_Do_main.cpp index c3286e0f649..5d77a1ec3d9 100644 --- a/src/m_Do/m_Do_main.cpp +++ b/src/m_Do/m_Do_main.cpp @@ -544,7 +544,7 @@ bool Debug_console(u32 i_padNo) { if (mDoCPd_c::getTrig(i_padNo) & CButton::A) { console->dumpToTerminal(0xFFFFFFFF); - console->setOutput(3); + console->setOutput(JUTConsole::OUTPUT_OSREPORT | JUTConsole::OUTPUT_CONSOLE); } JUTReport(0x1E, 0x186, 1, "Press X+Y+START to CLEAR console."); @@ -709,7 +709,7 @@ void main01(void) { JUTConsole* console = JFWSystem::getSystemConsole(); if (data_80450580 != 0) { - console->setOutput(3); + console->setOutput(JUTConsole::OUTPUT_OSREPORT | JUTConsole::OUTPUT_CONSOLE); } console->setPosition(32, 42); From 107f85a5f8a276b5ea24933c7eb42b4df8a1a03e Mon Sep 17 00:00:00 2001 From: TakaRikka <38417346+TakaRikka@users.noreply.github.com> Date: Sun, 9 Jan 2022 17:56:12 -0800 Subject: [PATCH 4/7] remove asm --- .../JFWDisplay/JFWDrawDoneAlarm__Fv.s | 57 ----- ...AbortAlarmHandler__FP7OSAlarmP9OSContext.s | 32 --- ...hreadAlarmHandler__FP7OSAlarmP9OSContext.s | 17 -- ...WDisplayFP7JKRHeapQ26JUTXfb10EXfbNumberb.s | 27 --- .../JFWDisplay/__dt__10JFWDisplayFv.s | 34 --- .../JFWDisplay/__sinit_JFWDisplay_cpp.s | 19 -- .../JFWDisplay/beginRender__10JFWDisplayFv.s | 168 ------------- .../calcCombinationRatio__10JFWDisplayFv.s | 40 --- .../JFWDisplay/callDirectDraw__Fv.s | 25 -- .../clearEfb__10JFWDisplayF8_GXColor.s | 18 -- .../clearEfb__10JFWDisplayFiiii8_GXColor.s | 227 ------------------ .../JFWDisplay/clearEfb__10JFWDisplayFv.s | 12 - .../clearEfb_init__10JFWDisplayFv.s | 30 --- .../copyXfb_triple__10JFWDisplayFv.s | 38 --- ...erModeObjP7JKRHeapQ26JUTXfb10EXfbNumberb.s | 37 --- .../ctor_subroutine__10JFWDisplayFb.s | 47 ---- .../JFWDisplay/diagnoseGpHang__Fv.s | 126 ---------- .../drawendXfb_single__10JFWDisplayFv.s | 20 -- .../JFWDisplay/endFrame__10JFWDisplayFv.s | 118 --------- .../JFWDisplay/endGX__10JFWDisplayFv.s | 72 ------ .../JFWDisplay/endRender__10JFWDisplayFv.s | 48 ---- .../exchangeXfb_double__10JFWDisplayFv.s | 75 ------ .../exchangeXfb_triple__10JFWDisplayFv.s | 35 --- .../JFramework/JFWDisplay/func_80273724.s | 23 -- .../JFWDisplay/preGX__10JFWDisplayFv.s | 41 ---- .../prepareCopyDisp__10JFWDisplayFv.s | 63 ----- .../JFWDisplay/threadSleep__10JFWDisplayFx.s | 44 ---- .../JFWDisplay/waitBlanking__10JFWDisplayFi.s | 23 -- .../JFWSystem/firstInit__9JFWSystemFv.s | 19 -- ...FP18JPAEmitterWorkDataP15JPABaseParticle.s | 18 -- ..._cFP10JKRExpHeapP9STControlP10CSTControl.s | 74 ------ asm/d/menu/d_menu_window/_create__5dMw_cFv.s | 105 -------- asm/d/menu/d_menu_window/_delete__5dMw_cFv.s | 125 ---------- asm/d/menu/d_menu_window/_draw__5dMw_cFv.s | 152 ------------ .../checkCStickTrigger__5dMw_cFv.s | 43 ---- .../d_menu_window/checkMemSize__5dMw_cFv.s | 31 --- .../collect_close_init__5dMw_cFUc.s | 55 ----- .../collect_close_proc__5dMw_cFv.s | 47 ---- .../collect_fishing_close_init__5dMw_cFUc.s | 23 -- .../collect_fishing_close_proc__5dMw_cFv.s | 8 - .../collect_fishing_move_proc__5dMw_cFv.s | 24 -- .../collect_fishing_open_init__5dMw_cFUc.s | 24 -- .../collect_fishing_open_proc__5dMw_cFv.s | 39 --- .../collect_insect_close_init__5dMw_cFUc.s | 23 -- .../collect_insect_close_proc__5dMw_cFv.s | 8 - .../collect_insect_move_proc__5dMw_cFv.s | 24 -- .../collect_insect_open_init__5dMw_cFUc.s | 25 -- .../collect_insect_open_proc__5dMw_cFv.s | 39 --- .../collect_letter_close_init__5dMw_cFUc.s | 23 -- .../collect_letter_close_proc__5dMw_cFv.s | 8 - .../collect_letter_move_proc__5dMw_cFv.s | 24 -- .../collect_letter_open_init__5dMw_cFUc.s | 24 -- .../collect_letter_open_proc__5dMw_cFv.s | 39 --- .../collect_move_init__5dMw_cFUc.s | 105 -------- .../collect_move_proc__5dMw_cFv.s | 42 ---- .../collect_open_init__5dMw_cFUc.s | 36 --- .../collect_open_proc__5dMw_cFv.s | 25 -- .../collect_option_close_init__5dMw_cFUc.s | 9 - .../collect_option_close_proc__5dMw_cFv.s | 8 - .../collect_option_move_proc__5dMw_cFv.s | 24 -- .../collect_option_open_init__5dMw_cFUc.s | 22 -- .../collect_option_open_proc__5dMw_cFv.s | 31 --- .../collect_save_close_init__5dMw_cFUc.s | 9 - .../collect_save_close_proc__5dMw_cFv.s | 28 --- .../collect_save_move_proc__5dMw_cFv.s | 27 --- .../collect_save_open_init__5dMw_cFUc.s | 22 -- .../collect_save_open_proc__5dMw_cFv.s | 27 --- .../collect_skill_close_init__5dMw_cFUc.s | 23 -- .../collect_skill_close_proc__5dMw_cFv.s | 8 - .../collect_skill_move_proc__5dMw_cFv.s | 24 -- .../collect_skill_open_init__5dMw_cFUc.s | 24 -- .../collect_skill_open_proc__5dMw_cFv.s | 39 --- .../d_menu_window/dMw_Create__FP9msg_class.s | 27 --- .../menu/d_menu_window/dMw_Delete__FP5dMw_c.s | 16 -- asm/d/menu/d_menu_window/dMw_Draw__FP5dMw_c.s | 9 - .../d_menu_window/dMw_Execute__FP5dMw_c.s | 9 - .../dMw_capture_create__5dMw_cFv.s | 40 --- .../dMw_capture_delete__5dMw_cFv.s | 36 --- .../dMw_collect_create__5dMw_cFv.s | 42 ---- .../dMw_collect_delete__5dMw_cFb.s | 30 --- .../d_menu_window/dMw_dmap_create__5dMw_cFv.s | 79 ------ .../d_menu_window/dMw_dmap_delete__5dMw_cFb.s | 52 ---- .../dMw_fishing_create__5dMw_cFv.s | 44 ---- .../dMw_fishing_delete__5dMw_cFv.s | 49 ---- .../d_menu_window/dMw_fmap_create__5dMw_cFv.s | 99 -------- .../d_menu_window/dMw_fmap_delete__5dMw_cFb.s | 66 ----- .../dMw_insect_create__5dMw_cFUc.s | 48 ---- .../dMw_insect_delete__5dMw_cFv.s | 49 ---- .../dMw_isButtonBit__5dMw_cFUc.s | 7 - .../dMw_isPush_S_Button__5dMw_cFv.s | 49 ---- .../dMw_letter_create__5dMw_cFv.s | 44 ---- .../dMw_letter_delete__5dMw_cFv.s | 49 ---- .../dMw_offButtonBit__5dMw_cFUc.s | 5 - .../dMw_onButtonBit__5dMw_cFUc.s | 5 - .../dMw_option_create__5dMw_cFv.s | 45 ---- .../dMw_option_delete__5dMw_cFv.s | 51 ---- .../dMw_ring_create__5dMw_cFUc.s | 55 ----- .../d_menu_window/dMw_ring_delete__5dMw_cFv.s | 43 ---- .../d_menu_window/dMw_save_create__5dMw_cFv.s | 48 ---- .../d_menu_window/dMw_save_delete__5dMw_cFv.s | 43 ---- .../dMw_skill_create__5dMw_cFv.s | 44 ---- .../dMw_skill_delete__5dMw_cFv.s | 49 ---- .../d_menu_window/dmap_close_proc__5dMw_cFv.s | 18 -- .../d_menu_window/dmap_move_proc__5dMw_cFv.s | 127 ---------- .../d_menu_window/dmap_open_init__5dMw_cFUc.s | 10 - .../d_menu_window/dmap_open_proc__5dMw_cFv.s | 25 -- .../d_menu_window/fmap_close_proc__5dMw_cFv.s | 18 -- .../d_menu_window/fmap_move_proc__5dMw_cFv.s | 57 ----- .../d_menu_window/fmap_open_init__5dMw_cFUc.s | 10 - .../d_menu_window/fmap_open_proc__5dMw_cFv.s | 25 -- .../insect_close_init__5dMw_cFUc.s | 23 -- .../insect_close_proc__5dMw_cFv.s | 8 - .../insect_move_proc__5dMw_cFv.s | 26 -- .../insect_open2_proc__5dMw_cFv.s | 39 --- .../insect_open_init__5dMw_cFUc.s | 34 --- .../insect_open_proc__5dMw_cFv.s | 25 -- .../d_menu_window/isEventCheck__5dMw_cFv.s | 75 ------ .../d_menu_window/isPauseReady__5dMw_cFv.s | 15 -- .../d_menu_window/key_wait_init__5dMw_cFUc.s | 59 ----- .../d_menu_window/markMemSize__5dMw_cFv.s | 18 -- .../d_menu_window/ring_close_proc__5dMw_cFv.s | 23 -- .../d_menu_window/ring_move_proc__5dMw_cFv.s | 20 -- .../d_menu_window/ring_open_proc__5dMw_cFv.s | 18 -- 123 files changed, 4978 deletions(-) delete mode 100644 asm/JSystem/JFramework/JFWDisplay/JFWDrawDoneAlarm__Fv.s delete mode 100644 asm/JSystem/JFramework/JFWDisplay/JFWGXAbortAlarmHandler__FP7OSAlarmP9OSContext.s delete mode 100644 asm/JSystem/JFramework/JFWDisplay/JFWThreadAlarmHandler__FP7OSAlarmP9OSContext.s delete mode 100644 asm/JSystem/JFramework/JFWDisplay/__ct__10JFWDisplayFP7JKRHeapQ26JUTXfb10EXfbNumberb.s delete mode 100644 asm/JSystem/JFramework/JFWDisplay/__dt__10JFWDisplayFv.s delete mode 100644 asm/JSystem/JFramework/JFWDisplay/__sinit_JFWDisplay_cpp.s delete mode 100644 asm/JSystem/JFramework/JFWDisplay/beginRender__10JFWDisplayFv.s delete mode 100644 asm/JSystem/JFramework/JFWDisplay/calcCombinationRatio__10JFWDisplayFv.s delete mode 100644 asm/JSystem/JFramework/JFWDisplay/callDirectDraw__Fv.s delete mode 100644 asm/JSystem/JFramework/JFWDisplay/clearEfb__10JFWDisplayF8_GXColor.s delete mode 100644 asm/JSystem/JFramework/JFWDisplay/clearEfb__10JFWDisplayFiiii8_GXColor.s delete mode 100644 asm/JSystem/JFramework/JFWDisplay/clearEfb__10JFWDisplayFv.s delete mode 100644 asm/JSystem/JFramework/JFWDisplay/clearEfb_init__10JFWDisplayFv.s delete mode 100644 asm/JSystem/JFramework/JFWDisplay/copyXfb_triple__10JFWDisplayFv.s delete mode 100644 asm/JSystem/JFramework/JFWDisplay/createManager__10JFWDisplayFPC16_GXRenderModeObjP7JKRHeapQ26JUTXfb10EXfbNumberb.s delete mode 100644 asm/JSystem/JFramework/JFWDisplay/ctor_subroutine__10JFWDisplayFb.s delete mode 100644 asm/JSystem/JFramework/JFWDisplay/diagnoseGpHang__Fv.s delete mode 100644 asm/JSystem/JFramework/JFWDisplay/drawendXfb_single__10JFWDisplayFv.s delete mode 100644 asm/JSystem/JFramework/JFWDisplay/endFrame__10JFWDisplayFv.s delete mode 100644 asm/JSystem/JFramework/JFWDisplay/endGX__10JFWDisplayFv.s delete mode 100644 asm/JSystem/JFramework/JFWDisplay/endRender__10JFWDisplayFv.s delete mode 100644 asm/JSystem/JFramework/JFWDisplay/exchangeXfb_double__10JFWDisplayFv.s delete mode 100644 asm/JSystem/JFramework/JFWDisplay/exchangeXfb_triple__10JFWDisplayFv.s delete mode 100644 asm/JSystem/JFramework/JFWDisplay/func_80273724.s delete mode 100644 asm/JSystem/JFramework/JFWDisplay/preGX__10JFWDisplayFv.s delete mode 100644 asm/JSystem/JFramework/JFWDisplay/prepareCopyDisp__10JFWDisplayFv.s delete mode 100644 asm/JSystem/JFramework/JFWDisplay/threadSleep__10JFWDisplayFx.s delete mode 100644 asm/JSystem/JFramework/JFWDisplay/waitBlanking__10JFWDisplayFi.s delete mode 100644 asm/JSystem/JFramework/JFWSystem/firstInit__9JFWSystemFv.s delete mode 100644 asm/JSystem/JParticle/JPABaseShape/JPADrawParticleCallBack__FP18JPAEmitterWorkDataP15JPABaseParticle.s delete mode 100644 asm/d/menu/d_menu_skill/__ct__13dMenu_Skill_cFP10JKRExpHeapP9STControlP10CSTControl.s delete mode 100644 asm/d/menu/d_menu_window/_create__5dMw_cFv.s delete mode 100644 asm/d/menu/d_menu_window/_delete__5dMw_cFv.s delete mode 100644 asm/d/menu/d_menu_window/_draw__5dMw_cFv.s delete mode 100644 asm/d/menu/d_menu_window/checkCStickTrigger__5dMw_cFv.s delete mode 100644 asm/d/menu/d_menu_window/checkMemSize__5dMw_cFv.s delete mode 100644 asm/d/menu/d_menu_window/collect_close_init__5dMw_cFUc.s delete mode 100644 asm/d/menu/d_menu_window/collect_close_proc__5dMw_cFv.s delete mode 100644 asm/d/menu/d_menu_window/collect_fishing_close_init__5dMw_cFUc.s delete mode 100644 asm/d/menu/d_menu_window/collect_fishing_close_proc__5dMw_cFv.s delete mode 100644 asm/d/menu/d_menu_window/collect_fishing_move_proc__5dMw_cFv.s delete mode 100644 asm/d/menu/d_menu_window/collect_fishing_open_init__5dMw_cFUc.s delete mode 100644 asm/d/menu/d_menu_window/collect_fishing_open_proc__5dMw_cFv.s delete mode 100644 asm/d/menu/d_menu_window/collect_insect_close_init__5dMw_cFUc.s delete mode 100644 asm/d/menu/d_menu_window/collect_insect_close_proc__5dMw_cFv.s delete mode 100644 asm/d/menu/d_menu_window/collect_insect_move_proc__5dMw_cFv.s delete mode 100644 asm/d/menu/d_menu_window/collect_insect_open_init__5dMw_cFUc.s delete mode 100644 asm/d/menu/d_menu_window/collect_insect_open_proc__5dMw_cFv.s delete mode 100644 asm/d/menu/d_menu_window/collect_letter_close_init__5dMw_cFUc.s delete mode 100644 asm/d/menu/d_menu_window/collect_letter_close_proc__5dMw_cFv.s delete mode 100644 asm/d/menu/d_menu_window/collect_letter_move_proc__5dMw_cFv.s delete mode 100644 asm/d/menu/d_menu_window/collect_letter_open_init__5dMw_cFUc.s delete mode 100644 asm/d/menu/d_menu_window/collect_letter_open_proc__5dMw_cFv.s delete mode 100644 asm/d/menu/d_menu_window/collect_move_init__5dMw_cFUc.s delete mode 100644 asm/d/menu/d_menu_window/collect_move_proc__5dMw_cFv.s delete mode 100644 asm/d/menu/d_menu_window/collect_open_init__5dMw_cFUc.s delete mode 100644 asm/d/menu/d_menu_window/collect_open_proc__5dMw_cFv.s delete mode 100644 asm/d/menu/d_menu_window/collect_option_close_init__5dMw_cFUc.s delete mode 100644 asm/d/menu/d_menu_window/collect_option_close_proc__5dMw_cFv.s delete mode 100644 asm/d/menu/d_menu_window/collect_option_move_proc__5dMw_cFv.s delete mode 100644 asm/d/menu/d_menu_window/collect_option_open_init__5dMw_cFUc.s delete mode 100644 asm/d/menu/d_menu_window/collect_option_open_proc__5dMw_cFv.s delete mode 100644 asm/d/menu/d_menu_window/collect_save_close_init__5dMw_cFUc.s delete mode 100644 asm/d/menu/d_menu_window/collect_save_close_proc__5dMw_cFv.s delete mode 100644 asm/d/menu/d_menu_window/collect_save_move_proc__5dMw_cFv.s delete mode 100644 asm/d/menu/d_menu_window/collect_save_open_init__5dMw_cFUc.s delete mode 100644 asm/d/menu/d_menu_window/collect_save_open_proc__5dMw_cFv.s delete mode 100644 asm/d/menu/d_menu_window/collect_skill_close_init__5dMw_cFUc.s delete mode 100644 asm/d/menu/d_menu_window/collect_skill_close_proc__5dMw_cFv.s delete mode 100644 asm/d/menu/d_menu_window/collect_skill_move_proc__5dMw_cFv.s delete mode 100644 asm/d/menu/d_menu_window/collect_skill_open_init__5dMw_cFUc.s delete mode 100644 asm/d/menu/d_menu_window/collect_skill_open_proc__5dMw_cFv.s delete mode 100644 asm/d/menu/d_menu_window/dMw_Create__FP9msg_class.s delete mode 100644 asm/d/menu/d_menu_window/dMw_Delete__FP5dMw_c.s delete mode 100644 asm/d/menu/d_menu_window/dMw_Draw__FP5dMw_c.s delete mode 100644 asm/d/menu/d_menu_window/dMw_Execute__FP5dMw_c.s delete mode 100644 asm/d/menu/d_menu_window/dMw_capture_create__5dMw_cFv.s delete mode 100644 asm/d/menu/d_menu_window/dMw_capture_delete__5dMw_cFv.s delete mode 100644 asm/d/menu/d_menu_window/dMw_collect_create__5dMw_cFv.s delete mode 100644 asm/d/menu/d_menu_window/dMw_collect_delete__5dMw_cFb.s delete mode 100644 asm/d/menu/d_menu_window/dMw_dmap_create__5dMw_cFv.s delete mode 100644 asm/d/menu/d_menu_window/dMw_dmap_delete__5dMw_cFb.s delete mode 100644 asm/d/menu/d_menu_window/dMw_fishing_create__5dMw_cFv.s delete mode 100644 asm/d/menu/d_menu_window/dMw_fishing_delete__5dMw_cFv.s delete mode 100644 asm/d/menu/d_menu_window/dMw_fmap_create__5dMw_cFv.s delete mode 100644 asm/d/menu/d_menu_window/dMw_fmap_delete__5dMw_cFb.s delete mode 100644 asm/d/menu/d_menu_window/dMw_insect_create__5dMw_cFUc.s delete mode 100644 asm/d/menu/d_menu_window/dMw_insect_delete__5dMw_cFv.s delete mode 100644 asm/d/menu/d_menu_window/dMw_isButtonBit__5dMw_cFUc.s delete mode 100644 asm/d/menu/d_menu_window/dMw_isPush_S_Button__5dMw_cFv.s delete mode 100644 asm/d/menu/d_menu_window/dMw_letter_create__5dMw_cFv.s delete mode 100644 asm/d/menu/d_menu_window/dMw_letter_delete__5dMw_cFv.s delete mode 100644 asm/d/menu/d_menu_window/dMw_offButtonBit__5dMw_cFUc.s delete mode 100644 asm/d/menu/d_menu_window/dMw_onButtonBit__5dMw_cFUc.s delete mode 100644 asm/d/menu/d_menu_window/dMw_option_create__5dMw_cFv.s delete mode 100644 asm/d/menu/d_menu_window/dMw_option_delete__5dMw_cFv.s delete mode 100644 asm/d/menu/d_menu_window/dMw_ring_create__5dMw_cFUc.s delete mode 100644 asm/d/menu/d_menu_window/dMw_ring_delete__5dMw_cFv.s delete mode 100644 asm/d/menu/d_menu_window/dMw_save_create__5dMw_cFv.s delete mode 100644 asm/d/menu/d_menu_window/dMw_save_delete__5dMw_cFv.s delete mode 100644 asm/d/menu/d_menu_window/dMw_skill_create__5dMw_cFv.s delete mode 100644 asm/d/menu/d_menu_window/dMw_skill_delete__5dMw_cFv.s delete mode 100644 asm/d/menu/d_menu_window/dmap_close_proc__5dMw_cFv.s delete mode 100644 asm/d/menu/d_menu_window/dmap_move_proc__5dMw_cFv.s delete mode 100644 asm/d/menu/d_menu_window/dmap_open_init__5dMw_cFUc.s delete mode 100644 asm/d/menu/d_menu_window/dmap_open_proc__5dMw_cFv.s delete mode 100644 asm/d/menu/d_menu_window/fmap_close_proc__5dMw_cFv.s delete mode 100644 asm/d/menu/d_menu_window/fmap_move_proc__5dMw_cFv.s delete mode 100644 asm/d/menu/d_menu_window/fmap_open_init__5dMw_cFUc.s delete mode 100644 asm/d/menu/d_menu_window/fmap_open_proc__5dMw_cFv.s delete mode 100644 asm/d/menu/d_menu_window/insect_close_init__5dMw_cFUc.s delete mode 100644 asm/d/menu/d_menu_window/insect_close_proc__5dMw_cFv.s delete mode 100644 asm/d/menu/d_menu_window/insect_move_proc__5dMw_cFv.s delete mode 100644 asm/d/menu/d_menu_window/insect_open2_proc__5dMw_cFv.s delete mode 100644 asm/d/menu/d_menu_window/insect_open_init__5dMw_cFUc.s delete mode 100644 asm/d/menu/d_menu_window/insect_open_proc__5dMw_cFv.s delete mode 100644 asm/d/menu/d_menu_window/isEventCheck__5dMw_cFv.s delete mode 100644 asm/d/menu/d_menu_window/isPauseReady__5dMw_cFv.s delete mode 100644 asm/d/menu/d_menu_window/key_wait_init__5dMw_cFUc.s delete mode 100644 asm/d/menu/d_menu_window/markMemSize__5dMw_cFv.s delete mode 100644 asm/d/menu/d_menu_window/ring_close_proc__5dMw_cFv.s delete mode 100644 asm/d/menu/d_menu_window/ring_move_proc__5dMw_cFv.s delete mode 100644 asm/d/menu/d_menu_window/ring_open_proc__5dMw_cFv.s diff --git a/asm/JSystem/JFramework/JFWDisplay/JFWDrawDoneAlarm__Fv.s b/asm/JSystem/JFramework/JFWDisplay/JFWDrawDoneAlarm__Fv.s deleted file mode 100644 index 54fb178a54f..00000000000 --- a/asm/JSystem/JFramework/JFWDisplay/JFWDrawDoneAlarm__Fv.s +++ /dev/null @@ -1,57 +0,0 @@ -lbl_802733A8: -/* 802733A8 94 21 FF A0 */ stwu r1, -0x60(r1) -/* 802733AC 7C 08 02 A6 */ mflr r0 -/* 802733B0 90 01 00 64 */ stw r0, 0x64(r1) -/* 802733B4 93 E1 00 5C */ stw r31, 0x5c(r1) -/* 802733B8 93 C1 00 58 */ stw r30, 0x58(r1) -/* 802733BC 3B E1 00 34 */ addi r31, r1, 0x34 -/* 802733C0 7F E3 FB 78 */ mr r3, r31 -/* 802733C4 38 81 00 08 */ addi r4, r1, 8 -/* 802733C8 48 06 8A 35 */ bl __ct__10JSUPtrLinkFPv -/* 802733CC 48 0C A3 29 */ bl OSDisableInterrupts -/* 802733D0 7C 7E 1B 78 */ mr r30, r3 -/* 802733D4 38 61 00 08 */ addi r3, r1, 8 -/* 802733D8 48 0C 75 21 */ bl OSCreateAlarm -/* 802733DC 3C 60 80 43 */ lis r3, sList__8JFWAlarm@ha /* 0x80430FE4@ha */ -/* 802733E0 38 63 0F E4 */ addi r3, r3, sList__8JFWAlarm@l /* 0x80430FE4@l */ -/* 802733E4 7F E4 FB 78 */ mr r4, r31 -/* 802733E8 48 06 8B 65 */ bl append__10JSUPtrListFP10JSUPtrLink -/* 802733EC C8 42 B8 70 */ lfd f2, lit_2964(r2) -/* 802733F0 3C 60 80 00 */ lis r3, 0x8000 /* 0x800000F8@ha */ -/* 802733F4 80 03 00 F8 */ lwz r0, 0x00F8(r3) /* 0x800000F8@l */ -/* 802733F8 54 00 F0 BE */ srwi r0, r0, 2 -/* 802733FC C8 22 B8 60 */ lfd f1, lit_2500(r2) -/* 80273400 90 01 00 4C */ stw r0, 0x4c(r1) -/* 80273404 3C 00 43 30 */ lis r0, 0x4330 -/* 80273408 90 01 00 48 */ stw r0, 0x48(r1) -/* 8027340C C8 01 00 48 */ lfd f0, 0x48(r1) -/* 80273410 FC 00 08 28 */ fsub f0, f0, f1 -/* 80273414 FC 22 00 32 */ fmul f1, f2, f0 -/* 80273418 48 0E F3 59 */ bl __cvt_dbl_usll -/* 8027341C 7C 65 1B 78 */ mr r5, r3 -/* 80273420 38 61 00 08 */ addi r3, r1, 8 -/* 80273424 7C 86 23 78 */ mr r6, r4 -/* 80273428 3C 80 80 27 */ lis r4, JFWGXAbortAlarmHandler__FP7OSAlarmP9OSContext@ha /* 0x80273484@ha */ -/* 8027342C 38 E4 34 84 */ addi r7, r4, JFWGXAbortAlarmHandler__FP7OSAlarmP9OSContext@l /* 0x80273484@l */ -/* 80273430 48 0C 77 29 */ bl OSSetAlarm -/* 80273434 48 0E 8E C1 */ bl GXDrawDone -/* 80273438 38 61 00 08 */ addi r3, r1, 8 -/* 8027343C 48 0C 78 01 */ bl OSCancelAlarm -/* 80273440 3C 60 80 43 */ lis r3, sList__8JFWAlarm@ha /* 0x80430FE4@ha */ -/* 80273444 38 63 0F E4 */ addi r3, r3, sList__8JFWAlarm@l /* 0x80430FE4@l */ -/* 80273448 7F E4 FB 78 */ mr r4, r31 -/* 8027344C 48 06 8D 11 */ bl remove__10JSUPtrListFP10JSUPtrLink -/* 80273450 7F C3 F3 78 */ mr r3, r30 -/* 80273454 48 0C A2 C9 */ bl OSRestoreInterrupts -/* 80273458 28 1F 00 00 */ cmplwi r31, 0 -/* 8027345C 41 82 00 10 */ beq lbl_8027346C -/* 80273460 7F E3 FB 78 */ mr r3, r31 -/* 80273464 38 80 00 00 */ li r4, 0 -/* 80273468 48 06 89 AD */ bl __dt__10JSUPtrLinkFv -lbl_8027346C: -/* 8027346C 83 E1 00 5C */ lwz r31, 0x5c(r1) -/* 80273470 83 C1 00 58 */ lwz r30, 0x58(r1) -/* 80273474 80 01 00 64 */ lwz r0, 0x64(r1) -/* 80273478 7C 08 03 A6 */ mtlr r0 -/* 8027347C 38 21 00 60 */ addi r1, r1, 0x60 -/* 80273480 4E 80 00 20 */ blr diff --git a/asm/JSystem/JFramework/JFWDisplay/JFWGXAbortAlarmHandler__FP7OSAlarmP9OSContext.s b/asm/JSystem/JFramework/JFWDisplay/JFWGXAbortAlarmHandler__FP7OSAlarmP9OSContext.s deleted file mode 100644 index 56e38b432ba..00000000000 --- a/asm/JSystem/JFramework/JFWDisplay/JFWGXAbortAlarmHandler__FP7OSAlarmP9OSContext.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_80273484: -/* 80273484 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80273488 7C 08 02 A6 */ mflr r0 -/* 8027348C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80273490 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80273494 93 C1 00 08 */ stw r30, 8(r1) -/* 80273498 48 00 00 65 */ bl diagnoseGpHang__Fv -/* 8027349C 48 0E 8B F9 */ bl GXAbortFrame -/* 802734A0 38 00 00 61 */ li r0, 0x61 -/* 802734A4 3C 80 CC 01 */ lis r4, 0xCC01 /* 0xCC008000@ha */ -/* 802734A8 98 04 80 00 */ stb r0, 0x8000(r4) /* 0xCC008000@l */ -/* 802734AC 3C 60 58 00 */ lis r3, 0x5800 /* 0x5800000F@ha */ -/* 802734B0 38 03 00 0F */ addi r0, r3, 0x000F /* 0x5800000F@l */ -/* 802734B4 90 04 80 00 */ stw r0, -0x8000(r4) -/* 802734B8 48 0E 79 F1 */ bl GXGetCPUFifo -/* 802734BC 7C 7F 1B 79 */ or. r31, r3, r3 -/* 802734C0 41 82 00 20 */ beq lbl_802734E0 -/* 802734C4 48 0E 77 15 */ bl GXGetFifoBase -/* 802734C8 7C 7E 1B 78 */ mr r30, r3 -/* 802734CC 7F E3 FB 78 */ mr r3, r31 -/* 802734D0 48 0E 77 11 */ bl GXGetFifoSize -/* 802734D4 7C 64 1B 78 */ mr r4, r3 -/* 802734D8 7F C3 F3 78 */ mr r3, r30 -/* 802734DC 48 0E 61 95 */ bl GXInit -lbl_802734E0: -/* 802734E0 48 0E 8D 7D */ bl GXSetDrawDone -/* 802734E4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802734E8 83 C1 00 08 */ lwz r30, 8(r1) -/* 802734EC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802734F0 7C 08 03 A6 */ mtlr r0 -/* 802734F4 38 21 00 10 */ addi r1, r1, 0x10 -/* 802734F8 4E 80 00 20 */ blr diff --git a/asm/JSystem/JFramework/JFWDisplay/JFWThreadAlarmHandler__FP7OSAlarmP9OSContext.s b/asm/JSystem/JFramework/JFWDisplay/JFWThreadAlarmHandler__FP7OSAlarmP9OSContext.s deleted file mode 100644 index b8a88a6eb79..00000000000 --- a/asm/JSystem/JFramework/JFWDisplay/JFWThreadAlarmHandler__FP7OSAlarmP9OSContext.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_80272DD0: -/* 80272DD0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80272DD4 7C 08 02 A6 */ mflr r0 -/* 80272DD8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80272DDC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80272DE0 7C 7F 1B 78 */ mr r31, r3 -/* 80272DE4 3C 60 80 43 */ lis r3, sList__8JFWAlarm@ha /* 0x80430FE4@ha */ -/* 80272DE8 38 63 0F E4 */ addi r3, r3, sList__8JFWAlarm@l /* 0x80430FE4@l */ -/* 80272DEC 38 9F 00 2C */ addi r4, r31, 0x2c -/* 80272DF0 48 06 93 6D */ bl remove__10JSUPtrListFP10JSUPtrLink -/* 80272DF4 80 7F 00 28 */ lwz r3, 0x28(r31) -/* 80272DF8 48 0C E9 BD */ bl OSResumeThread -/* 80272DFC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80272E00 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80272E04 7C 08 03 A6 */ mtlr r0 -/* 80272E08 38 21 00 10 */ addi r1, r1, 0x10 -/* 80272E0C 4E 80 00 20 */ blr diff --git a/asm/JSystem/JFramework/JFWDisplay/__ct__10JFWDisplayFP7JKRHeapQ26JUTXfb10EXfbNumberb.s b/asm/JSystem/JFramework/JFWDisplay/__ct__10JFWDisplayFP7JKRHeapQ26JUTXfb10EXfbNumberb.s deleted file mode 100644 index b0e182db0fa..00000000000 --- a/asm/JSystem/JFramework/JFWDisplay/__ct__10JFWDisplayFP7JKRHeapQ26JUTXfb10EXfbNumberb.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_802720F8: -/* 802720F8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802720FC 7C 08 02 A6 */ mflr r0 -/* 80272100 90 01 00 24 */ stw r0, 0x24(r1) -/* 80272104 39 61 00 20 */ addi r11, r1, 0x20 -/* 80272108 48 0F 00 D5 */ bl _savegpr_29 -/* 8027210C 7C 7D 1B 78 */ mr r29, r3 -/* 80272110 7C 9E 23 78 */ mr r30, r4 -/* 80272114 7C BF 2B 78 */ mr r31, r5 -/* 80272118 3C 80 80 3C */ lis r4, __vt__10JFWDisplay@ha /* 0x803C40A0@ha */ -/* 8027211C 38 04 40 A0 */ addi r0, r4, __vt__10JFWDisplay@l /* 0x803C40A0@l */ -/* 80272120 90 03 00 00 */ stw r0, 0(r3) -/* 80272124 38 00 FF FF */ li r0, -1 -/* 80272128 90 03 00 08 */ stw r0, 8(r3) -/* 8027212C 7C C4 33 78 */ mr r4, r6 -/* 80272130 4B FF FF 11 */ bl ctor_subroutine__10JFWDisplayFb -/* 80272134 7F C3 F3 78 */ mr r3, r30 -/* 80272138 7F E4 FB 78 */ mr r4, r31 -/* 8027213C 48 07 32 7D */ bl createManager__6JUTXfbFP7JKRHeapQ26JUTXfb10EXfbNumber -/* 80272140 90 7D 00 10 */ stw r3, 0x10(r29) -/* 80272144 7F A3 EB 78 */ mr r3, r29 -/* 80272148 39 61 00 20 */ addi r11, r1, 0x20 -/* 8027214C 48 0F 00 DD */ bl _restgpr_29 -/* 80272150 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80272154 7C 08 03 A6 */ mtlr r0 -/* 80272158 38 21 00 20 */ addi r1, r1, 0x20 -/* 8027215C 4E 80 00 20 */ blr diff --git a/asm/JSystem/JFramework/JFWDisplay/__dt__10JFWDisplayFv.s b/asm/JSystem/JFramework/JFWDisplay/__dt__10JFWDisplayFv.s deleted file mode 100644 index 8f4a474ebc5..00000000000 --- a/asm/JSystem/JFramework/JFWDisplay/__dt__10JFWDisplayFv.s +++ /dev/null @@ -1,34 +0,0 @@ -lbl_80272160: -/* 80272160 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80272164 7C 08 02 A6 */ mflr r0 -/* 80272168 90 01 00 14 */ stw r0, 0x14(r1) -/* 8027216C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80272170 93 C1 00 08 */ stw r30, 8(r1) -/* 80272174 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80272178 7C 9F 23 78 */ mr r31, r4 -/* 8027217C 41 82 00 44 */ beq lbl_802721C0 -/* 80272180 3C 80 80 3C */ lis r4, __vt__10JFWDisplay@ha /* 0x803C40A0@ha */ -/* 80272184 38 04 40 A0 */ addi r0, r4, __vt__10JFWDisplay@l /* 0x803C40A0@l */ -/* 80272188 90 1E 00 00 */ stw r0, 0(r30) -/* 8027218C 80 0D 8F B8 */ lwz r0, sManager__8JUTVideo(r13) -/* 80272190 28 00 00 00 */ cmplwi r0, 0 -/* 80272194 41 82 00 0C */ beq lbl_802721A0 -/* 80272198 38 80 00 02 */ li r4, 2 -/* 8027219C 48 00 0A C5 */ bl waitBlanking__10JFWDisplayFi -lbl_802721A0: -/* 802721A0 48 07 38 89 */ bl destroy__10JUTProcBarFv -/* 802721A4 48 07 32 81 */ bl destroyManager__6JUTXfbFv -/* 802721A8 38 00 00 00 */ li r0, 0 -/* 802721AC 90 1E 00 10 */ stw r0, 0x10(r30) -/* 802721B0 7F E0 07 35 */ extsh. r0, r31 -/* 802721B4 40 81 00 0C */ ble lbl_802721C0 -/* 802721B8 7F C3 F3 78 */ mr r3, r30 -/* 802721BC 48 05 CB 81 */ bl __dl__FPv -lbl_802721C0: -/* 802721C0 7F C3 F3 78 */ mr r3, r30 -/* 802721C4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802721C8 83 C1 00 08 */ lwz r30, 8(r1) -/* 802721CC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802721D0 7C 08 03 A6 */ mtlr r0 -/* 802721D4 38 21 00 10 */ addi r1, r1, 0x10 -/* 802721D8 4E 80 00 20 */ blr diff --git a/asm/JSystem/JFramework/JFWDisplay/__sinit_JFWDisplay_cpp.s b/asm/JSystem/JFramework/JFWDisplay/__sinit_JFWDisplay_cpp.s deleted file mode 100644 index 2ac40471eb9..00000000000 --- a/asm/JSystem/JFramework/JFWDisplay/__sinit_JFWDisplay_cpp.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_802736DC: -/* 802736DC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802736E0 7C 08 02 A6 */ mflr r0 -/* 802736E4 90 01 00 14 */ stw r0, 0x14(r1) -/* 802736E8 3C 60 80 43 */ lis r3, sList__8JFWAlarm@ha /* 0x80430FE4@ha */ -/* 802736EC 38 63 0F E4 */ addi r3, r3, sList__8JFWAlarm@l /* 0x80430FE4@l */ -/* 802736F0 38 80 00 00 */ li r4, 0 -/* 802736F4 48 06 87 81 */ bl __ct__10JSUPtrListFb -/* 802736F8 3C 60 80 43 */ lis r3, sList__8JFWAlarm@ha /* 0x80430FE4@ha */ -/* 802736FC 38 63 0F E4 */ addi r3, r3, sList__8JFWAlarm@l /* 0x80430FE4@l */ -/* 80273700 3C 80 80 27 */ lis r4, func_80273724@ha /* 0x80273724@ha */ -/* 80273704 38 84 37 24 */ addi r4, r4, func_80273724@l /* 0x80273724@l */ -/* 80273708 3C A0 80 43 */ lis r5, lit_2184@ha /* 0x80430FD8@ha */ -/* 8027370C 38 A5 0F D8 */ addi r5, r5, lit_2184@l /* 0x80430FD8@l */ -/* 80273710 48 0E E5 15 */ bl __register_global_object -/* 80273714 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80273718 7C 08 03 A6 */ mtlr r0 -/* 8027371C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80273720 4E 80 00 20 */ blr diff --git a/asm/JSystem/JFramework/JFWDisplay/beginRender__10JFWDisplayFv.s b/asm/JSystem/JFramework/JFWDisplay/beginRender__10JFWDisplayFv.s deleted file mode 100644 index 8130404032a..00000000000 --- a/asm/JSystem/JFramework/JFWDisplay/beginRender__10JFWDisplayFv.s +++ /dev/null @@ -1,168 +0,0 @@ -lbl_80272798: -/* 80272798 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8027279C 7C 08 02 A6 */ mflr r0 -/* 802727A0 90 01 00 24 */ stw r0, 0x24(r1) -/* 802727A4 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 802727A8 93 C1 00 18 */ stw r30, 0x18(r1) -/* 802727AC 7C 7F 1B 78 */ mr r31, r3 -/* 802727B0 88 03 00 40 */ lbz r0, 0x40(r3) -/* 802727B4 28 00 00 00 */ cmplwi r0, 0 -/* 802727B8 41 82 00 4C */ beq lbl_80272804 -/* 802727BC 83 CD 8F D8 */ lwz r30, sManager__10JUTProcBar(r13) -/* 802727C0 48 0C FF 55 */ bl OSGetTick -/* 802727C4 80 1E 00 50 */ lwz r0, 0x50(r30) -/* 802727C8 7C 00 18 50 */ subf r0, r0, r3 -/* 802727CC 54 05 18 38 */ slwi r5, r0, 3 -/* 802727D0 3C 60 80 00 */ lis r3, 0x8000 /* 0x800000F8@ha */ -/* 802727D4 80 03 00 F8 */ lwz r0, 0x00F8(r3) /* 0x800000F8@l */ -/* 802727D8 54 04 F0 BE */ srwi r4, r0, 2 -/* 802727DC 3C 60 00 02 */ lis r3, 0x0002 /* 0x0001E848@ha */ -/* 802727E0 38 03 E8 48 */ addi r0, r3, 0xE848 /* 0x0001E848@l */ -/* 802727E4 7C 04 03 96 */ divwu r0, r4, r0 -/* 802727E8 7C 05 03 96 */ divwu r0, r5, r0 -/* 802727EC 90 1E 00 54 */ stw r0, 0x54(r30) -/* 802727F0 80 1E 00 54 */ lwz r0, 0x54(r30) -/* 802727F4 28 00 00 00 */ cmplwi r0, 0 -/* 802727F8 40 82 00 0C */ bne lbl_80272804 -/* 802727FC 38 00 00 01 */ li r0, 1 -/* 80272800 90 1E 00 54 */ stw r0, 0x54(r30) -lbl_80272804: -/* 80272804 88 1F 00 40 */ lbz r0, 0x40(r31) -/* 80272808 28 00 00 00 */ cmplwi r0, 0 -/* 8027280C 41 82 00 4C */ beq lbl_80272858 -/* 80272810 83 CD 8F D8 */ lwz r30, sManager__10JUTProcBar(r13) -/* 80272814 38 00 00 FF */ li r0, 0xff -/* 80272818 98 1E 00 60 */ stb r0, 0x60(r30) -/* 8027281C 38 00 00 81 */ li r0, 0x81 -/* 80272820 98 1E 00 61 */ stb r0, 0x61(r30) -/* 80272824 38 00 00 1E */ li r0, 0x1e -/* 80272828 98 1E 00 62 */ stb r0, 0x62(r30) -/* 8027282C 48 0C FE E9 */ bl OSGetTick -/* 80272830 90 7E 00 50 */ stw r3, 0x50(r30) -/* 80272834 83 CD 8F D8 */ lwz r30, sManager__10JUTProcBar(r13) -/* 80272838 38 00 00 FF */ li r0, 0xff -/* 8027283C 98 1E 00 10 */ stb r0, 0x10(r30) -/* 80272840 38 00 00 81 */ li r0, 0x81 -/* 80272844 98 1E 00 11 */ stb r0, 0x11(r30) -/* 80272848 38 00 00 1E */ li r0, 0x1e -/* 8027284C 98 1E 00 12 */ stb r0, 0x12(r30) -/* 80272850 48 0C FE C5 */ bl OSGetTick -/* 80272854 90 7E 00 00 */ stw r3, 0(r30) -lbl_80272858: -/* 80272858 80 7F 00 20 */ lwz r3, 0x20(r31) -/* 8027285C A0 9F 00 1C */ lhz r4, 0x1c(r31) -/* 80272860 48 00 04 51 */ bl waitForTick__FUlUs -/* 80272864 80 6D 8F B8 */ lwz r3, sManager__8JUTVideo(r13) -/* 80272868 48 07 29 A9 */ bl waitRetraceIfNeed__8JUTVideoFv -/* 8027286C 48 0C FE A9 */ bl OSGetTick -/* 80272870 80 1F 00 2C */ lwz r0, 0x2c(r31) -/* 80272874 7C 00 18 50 */ subf r0, r0, r3 -/* 80272878 90 1F 00 30 */ stw r0, 0x30(r31) -/* 8027287C 90 7F 00 2C */ stw r3, 0x2c(r31) -/* 80272880 80 6D 8F BC */ lwz r3, sVideoLastTick__8JUTVideo(r13) -/* 80272884 80 1F 00 2C */ lwz r0, 0x2c(r31) -/* 80272888 7C 03 00 50 */ subf r0, r3, r0 -/* 8027288C 90 1F 00 34 */ stw r0, 0x34(r31) -/* 80272890 88 1F 00 40 */ lbz r0, 0x40(r31) -/* 80272894 28 00 00 00 */ cmplwi r0, 0 -/* 80272898 41 82 00 4C */ beq lbl_802728E4 -/* 8027289C 83 CD 8F D8 */ lwz r30, sManager__10JUTProcBar(r13) -/* 802728A0 48 0C FE 75 */ bl OSGetTick -/* 802728A4 80 1E 00 00 */ lwz r0, 0(r30) -/* 802728A8 7C 00 18 50 */ subf r0, r0, r3 -/* 802728AC 54 05 18 38 */ slwi r5, r0, 3 -/* 802728B0 3C 60 80 00 */ lis r3, 0x8000 /* 0x800000F8@ha */ -/* 802728B4 80 03 00 F8 */ lwz r0, 0x00F8(r3) /* 0x800000F8@l */ -/* 802728B8 54 04 F0 BE */ srwi r4, r0, 2 -/* 802728BC 3C 60 00 02 */ lis r3, 0x0002 /* 0x0001E848@ha */ -/* 802728C0 38 03 E8 48 */ addi r0, r3, 0xE848 /* 0x0001E848@l */ -/* 802728C4 7C 04 03 96 */ divwu r0, r4, r0 -/* 802728C8 7C 05 03 96 */ divwu r0, r5, r0 -/* 802728CC 90 1E 00 04 */ stw r0, 4(r30) -/* 802728D0 80 1E 00 04 */ lwz r0, 4(r30) -/* 802728D4 28 00 00 00 */ cmplwi r0, 0 -/* 802728D8 40 82 00 0C */ bne lbl_802728E4 -/* 802728DC 38 00 00 01 */ li r0, 1 -/* 802728E0 90 1E 00 04 */ stw r0, 4(r30) -lbl_802728E4: -/* 802728E4 88 1F 00 40 */ lbz r0, 0x40(r31) -/* 802728E8 28 00 00 00 */ cmplwi r0, 0 -/* 802728EC 41 82 00 A8 */ beq lbl_80272994 -/* 802728F0 83 CD 8F D8 */ lwz r30, sManager__10JUTProcBar(r13) -/* 802728F4 38 00 00 FF */ li r0, 0xff -/* 802728F8 98 1E 00 24 */ stb r0, 0x24(r30) -/* 802728FC 38 00 00 81 */ li r0, 0x81 -/* 80272900 98 1E 00 25 */ stb r0, 0x25(r30) -/* 80272904 38 00 00 1E */ li r0, 0x1e -/* 80272908 98 1E 00 26 */ stb r0, 0x26(r30) -/* 8027290C 48 0C FE 09 */ bl OSGetTick -/* 80272910 90 7E 00 14 */ stw r3, 0x14(r30) -/* 80272914 83 CD 8F D0 */ lwz r30, sManager__6JUTXfb(r13) -/* 80272918 80 1E 00 10 */ lwz r0, 0x10(r30) -/* 8027291C 2C 00 00 02 */ cmpwi r0, 2 -/* 80272920 41 82 00 60 */ beq lbl_80272980 -/* 80272924 40 80 00 10 */ bge lbl_80272934 -/* 80272928 2C 00 00 01 */ cmpwi r0, 1 -/* 8027292C 40 80 00 14 */ bge lbl_80272940 -/* 80272930 48 00 00 64 */ b lbl_80272994 -lbl_80272934: -/* 80272934 2C 00 00 04 */ cmpwi r0, 4 -/* 80272938 40 80 00 5C */ bge lbl_80272994 -/* 8027293C 48 00 00 50 */ b lbl_8027298C -lbl_80272940: -/* 80272940 80 1E 00 1C */ lwz r0, 0x1c(r30) -/* 80272944 2C 00 00 02 */ cmpwi r0, 2 -/* 80272948 41 82 00 24 */ beq lbl_8027296C -/* 8027294C 38 00 00 01 */ li r0, 1 -/* 80272950 90 1E 00 1C */ stw r0, 0x1c(r30) -/* 80272954 80 1F 00 08 */ lwz r0, 8(r31) -/* 80272958 90 01 00 08 */ stw r0, 8(r1) -/* 8027295C 7F E3 FB 78 */ mr r3, r31 -/* 80272960 38 81 00 08 */ addi r4, r1, 8 -/* 80272964 48 00 05 F5 */ bl clearEfb__10JFWDisplayF8_GXColor -/* 80272968 48 00 00 0C */ b lbl_80272974 -lbl_8027296C: -/* 8027296C 38 00 00 01 */ li r0, 1 -/* 80272970 90 1E 00 1C */ stw r0, 0x1c(r30) -lbl_80272974: -/* 80272974 A8 1F 00 48 */ lha r0, 0x48(r31) -/* 80272978 B0 1E 00 14 */ sth r0, 0x14(r30) -/* 8027297C 48 00 00 18 */ b lbl_80272994 -lbl_80272980: -/* 80272980 7F E3 FB 78 */ mr r3, r31 -/* 80272984 4B FF FA 71 */ bl exchangeXfb_double__10JFWDisplayFv -/* 80272988 48 00 00 0C */ b lbl_80272994 -lbl_8027298C: -/* 8027298C 7F E3 FB 78 */ mr r3, r31 -/* 80272990 4B FF FB 6D */ bl exchangeXfb_triple__10JFWDisplayFv -lbl_80272994: -/* 80272994 80 7F 00 3C */ lwz r3, 0x3c(r31) -/* 80272998 38 03 00 01 */ addi r0, r3, 1 -/* 8027299C 90 1F 00 3C */ stw r0, 0x3c(r31) -/* 802729A0 80 BF 00 3C */ lwz r5, 0x3c(r31) -/* 802729A4 80 1F 00 38 */ lwz r0, 0x38(r31) -/* 802729A8 7C A4 FE 70 */ srawi r4, r5, 0x1f -/* 802729AC 54 03 0F FE */ srwi r3, r0, 0x1f -/* 802729B0 7C 00 28 10 */ subfc r0, r0, r5 -/* 802729B4 7C 04 19 14 */ adde r0, r4, r3 -/* 802729B8 98 1F 00 40 */ stb r0, 0x40(r31) -/* 802729BC 88 1F 00 40 */ lbz r0, 0x40(r31) -/* 802729C0 28 00 00 00 */ cmplwi r0, 0 -/* 802729C4 41 82 00 0C */ beq lbl_802729D0 -/* 802729C8 38 00 00 00 */ li r0, 0 -/* 802729CC 90 1F 00 3C */ stw r0, 0x3c(r31) -lbl_802729D0: -/* 802729D0 88 1F 00 40 */ lbz r0, 0x40(r31) -/* 802729D4 28 00 00 00 */ cmplwi r0, 0 -/* 802729D8 41 82 00 14 */ beq lbl_802729EC -/* 802729DC 7F E3 FB 78 */ mr r3, r31 -/* 802729E0 48 00 05 4D */ bl clearEfb__10JFWDisplayFv -/* 802729E4 7F E3 FB 78 */ mr r3, r31 -/* 802729E8 4B FF FC 11 */ bl preGX__10JFWDisplayFv -lbl_802729EC: -/* 802729EC 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 802729F0 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 802729F4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802729F8 7C 08 03 A6 */ mtlr r0 -/* 802729FC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80272A00 4E 80 00 20 */ blr diff --git a/asm/JSystem/JFramework/JFWDisplay/calcCombinationRatio__10JFWDisplayFv.s b/asm/JSystem/JFramework/JFWDisplay/calcCombinationRatio__10JFWDisplayFv.s deleted file mode 100644 index 0d90eb9e869..00000000000 --- a/asm/JSystem/JFramework/JFWDisplay/calcCombinationRatio__10JFWDisplayFv.s +++ /dev/null @@ -1,40 +0,0 @@ -lbl_8027331C: -/* 8027331C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80273320 80 AD 8F C0 */ lwz r5, sVideoInterval__8JUTVideo(r13) -/* 80273324 80 C3 00 30 */ lwz r6, 0x30(r3) -/* 80273328 54 C0 08 3C */ slwi r0, r6, 1 -/* 8027332C 7C A7 2B 78 */ mr r7, r5 -/* 80273330 48 00 00 08 */ b lbl_80273338 -lbl_80273334: -/* 80273334 7C E7 2A 14 */ add r7, r7, r5 -lbl_80273338: -/* 80273338 7C 07 00 00 */ cmpw r7, r0 -/* 8027333C 41 80 FF F8 */ blt lbl_80273334 -/* 80273340 80 83 00 34 */ lwz r4, 0x34(r3) -/* 80273344 7C 00 38 50 */ subf r0, r0, r7 -/* 80273348 7C 04 00 51 */ subf. r0, r4, r0 -/* 8027334C 40 80 00 08 */ bge lbl_80273354 -/* 80273350 7C 00 2A 14 */ add r0, r0, r5 -lbl_80273354: -/* 80273354 C8 22 B8 68 */ lfd f1, lit_2933(r2) -/* 80273358 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 8027335C 90 01 00 0C */ stw r0, 0xc(r1) -/* 80273360 3C 00 43 30 */ lis r0, 0x4330 -/* 80273364 90 01 00 08 */ stw r0, 8(r1) -/* 80273368 C8 01 00 08 */ lfd f0, 8(r1) -/* 8027336C EC 40 08 28 */ fsubs f2, f0, f1 -/* 80273370 C8 22 B8 60 */ lfd f1, lit_2500(r2) -/* 80273374 90 C1 00 14 */ stw r6, 0x14(r1) -/* 80273378 90 01 00 10 */ stw r0, 0x10(r1) -/* 8027337C C8 01 00 10 */ lfd f0, 0x10(r1) -/* 80273380 EC 00 08 28 */ fsubs f0, f0, f1 -/* 80273384 EC 02 00 24 */ fdivs f0, f2, f0 -/* 80273388 D0 03 00 28 */ stfs f0, 0x28(r3) -/* 8027338C C0 23 00 28 */ lfs f1, 0x28(r3) -/* 80273390 C0 02 B8 58 */ lfs f0, lit_2498(r2) -/* 80273394 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80273398 40 81 00 08 */ ble lbl_802733A0 -/* 8027339C D0 03 00 28 */ stfs f0, 0x28(r3) -lbl_802733A0: -/* 802733A0 38 21 00 20 */ addi r1, r1, 0x20 -/* 802733A4 4E 80 00 20 */ blr diff --git a/asm/JSystem/JFramework/JFWDisplay/callDirectDraw__Fv.s b/asm/JSystem/JFramework/JFWDisplay/callDirectDraw__Fv.s deleted file mode 100644 index 00e9770a73a..00000000000 --- a/asm/JSystem/JFramework/JFWDisplay/callDirectDraw__Fv.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_80272260: -/* 80272260 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80272264 7C 08 02 A6 */ mflr r0 -/* 80272268 90 01 00 14 */ stw r0, 0x14(r1) -/* 8027226C 80 6D 8F B8 */ lwz r3, sManager__8JUTVideo(r13) -/* 80272270 80 63 00 04 */ lwz r3, 4(r3) -/* 80272274 A0 A3 00 04 */ lhz r5, 4(r3) -/* 80272278 A0 C3 00 06 */ lhz r6, 6(r3) -/* 8027227C 80 6D 8F D0 */ lwz r3, sManager__6JUTXfb(r13) -/* 80272280 A8 03 00 14 */ lha r0, 0x14(r3) -/* 80272284 2C 00 00 00 */ cmpwi r0, 0 -/* 80272288 41 80 00 10 */ blt lbl_80272298 -/* 8027228C 54 00 10 3A */ slwi r0, r0, 2 -/* 80272290 7C 83 00 2E */ lwzx r4, r3, r0 -/* 80272294 48 00 00 08 */ b lbl_8027229C -lbl_80272298: -/* 80272298 38 80 00 00 */ li r4, 0 -lbl_8027229C: -/* 8027229C 80 6D 8F A8 */ lwz r3, sDirectPrint__14JUTDirectPrint(r13) -/* 802722A0 48 07 22 CD */ bl changeFrameBuffer__14JUTDirectPrintFPvUsUs -/* 802722A4 48 07 26 F9 */ bl flushMessage__12JUTAssertionFv -/* 802722A8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802722AC 7C 08 03 A6 */ mtlr r0 -/* 802722B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802722B4 4E 80 00 20 */ blr diff --git a/asm/JSystem/JFramework/JFWDisplay/clearEfb__10JFWDisplayF8_GXColor.s b/asm/JSystem/JFramework/JFWDisplay/clearEfb__10JFWDisplayF8_GXColor.s deleted file mode 100644 index ec462a86559..00000000000 --- a/asm/JSystem/JFramework/JFWDisplay/clearEfb__10JFWDisplayF8_GXColor.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_80272F58: -/* 80272F58 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80272F5C 7C 08 02 A6 */ mflr r0 -/* 80272F60 90 01 00 14 */ stw r0, 0x14(r1) -/* 80272F64 80 AD 8F B8 */ lwz r5, sManager__8JUTVideo(r13) -/* 80272F68 80 A5 00 04 */ lwz r5, 4(r5) -/* 80272F6C A0 C5 00 04 */ lhz r6, 4(r5) -/* 80272F70 A0 E5 00 06 */ lhz r7, 6(r5) -/* 80272F74 80 04 00 00 */ lwz r0, 0(r4) -/* 80272F78 90 01 00 08 */ stw r0, 8(r1) -/* 80272F7C 38 80 00 00 */ li r4, 0 -/* 80272F80 38 A0 00 00 */ li r5, 0 -/* 80272F84 39 01 00 08 */ addi r8, r1, 8 -/* 80272F88 48 00 00 15 */ bl clearEfb__10JFWDisplayFiiii8_GXColor -/* 80272F8C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80272F90 7C 08 03 A6 */ mtlr r0 -/* 80272F94 38 21 00 10 */ addi r1, r1, 0x10 -/* 80272F98 4E 80 00 20 */ blr diff --git a/asm/JSystem/JFramework/JFWDisplay/clearEfb__10JFWDisplayFiiii8_GXColor.s b/asm/JSystem/JFramework/JFWDisplay/clearEfb__10JFWDisplayFiiii8_GXColor.s deleted file mode 100644 index bf8bb39ff81..00000000000 --- a/asm/JSystem/JFramework/JFWDisplay/clearEfb__10JFWDisplayFiiii8_GXColor.s +++ /dev/null @@ -1,227 +0,0 @@ -lbl_80272F9C: -/* 80272F9C 94 21 FF 70 */ stwu r1, -0x90(r1) -/* 80272FA0 7C 08 02 A6 */ mflr r0 -/* 80272FA4 90 01 00 94 */ stw r0, 0x94(r1) -/* 80272FA8 39 61 00 90 */ addi r11, r1, 0x90 -/* 80272FAC 48 0E F2 1D */ bl _savegpr_24 -/* 80272FB0 7C 7A 1B 78 */ mr r26, r3 -/* 80272FB4 7C 9B 23 78 */ mr r27, r4 -/* 80272FB8 7C BC 2B 78 */ mr r28, r5 -/* 80272FBC 7C DD 33 78 */ mr r29, r6 -/* 80272FC0 7C FE 3B 78 */ mr r30, r7 -/* 80272FC4 7D 1F 43 78 */ mr r31, r8 -/* 80272FC8 80 6D 8F B8 */ lwz r3, sManager__8JUTVideo(r13) -/* 80272FCC 80 63 00 04 */ lwz r3, 4(r3) -/* 80272FD0 A3 03 00 04 */ lhz r24, 4(r3) -/* 80272FD4 A3 23 00 06 */ lhz r25, 6(r3) -/* 80272FD8 38 61 00 0C */ addi r3, r1, 0xc -/* 80272FDC C0 22 B8 50 */ lfs f1, lit_2198(r2) -/* 80272FE0 C8 82 B8 60 */ lfd f4, lit_2500(r2) -/* 80272FE4 93 21 00 54 */ stw r25, 0x54(r1) -/* 80272FE8 3C 00 43 30 */ lis r0, 0x4330 -/* 80272FEC 90 01 00 50 */ stw r0, 0x50(r1) -/* 80272FF0 C8 01 00 50 */ lfd f0, 0x50(r1) -/* 80272FF4 EC 40 20 28 */ fsubs f2, f0, f4 -/* 80272FF8 FC 60 08 90 */ fmr f3, f1 -/* 80272FFC 93 01 00 5C */ stw r24, 0x5c(r1) -/* 80273000 90 01 00 58 */ stw r0, 0x58(r1) -/* 80273004 C8 01 00 58 */ lfd f0, 0x58(r1) -/* 80273008 EC 80 20 28 */ fsubs f4, f0, f4 -/* 8027300C FC A0 08 90 */ fmr f5, f1 -/* 80273010 C0 C2 B8 58 */ lfs f6, lit_2498(r2) -/* 80273014 48 0D 3F E5 */ bl C_MTXOrtho -/* 80273018 38 61 00 0C */ addi r3, r1, 0xc -/* 8027301C 38 80 00 01 */ li r4, 1 -/* 80273020 48 0E D0 B5 */ bl GXSetProjection -/* 80273024 C0 22 B8 50 */ lfs f1, lit_2198(r2) -/* 80273028 FC 40 08 90 */ fmr f2, f1 -/* 8027302C 57 00 04 3E */ clrlwi r0, r24, 0x10 -/* 80273030 C8 82 B8 60 */ lfd f4, lit_2500(r2) -/* 80273034 90 01 00 64 */ stw r0, 0x64(r1) -/* 80273038 3C 60 43 30 */ lis r3, 0x4330 -/* 8027303C 90 61 00 60 */ stw r3, 0x60(r1) -/* 80273040 C8 01 00 60 */ lfd f0, 0x60(r1) -/* 80273044 EC 60 20 28 */ fsubs f3, f0, f4 -/* 80273048 57 20 04 3E */ clrlwi r0, r25, 0x10 -/* 8027304C 90 01 00 6C */ stw r0, 0x6c(r1) -/* 80273050 90 61 00 68 */ stw r3, 0x68(r1) -/* 80273054 C8 01 00 68 */ lfd f0, 0x68(r1) -/* 80273058 EC 80 20 28 */ fsubs f4, f0, f4 -/* 8027305C FC A0 08 90 */ fmr f5, f1 -/* 80273060 C0 C2 B8 58 */ lfs f6, lit_2498(r2) -/* 80273064 48 0E D4 01 */ bl GXSetViewport -/* 80273068 38 60 00 00 */ li r3, 0 -/* 8027306C 38 80 00 00 */ li r4, 0 -/* 80273070 57 05 04 3E */ clrlwi r5, r24, 0x10 -/* 80273074 57 26 04 3E */ clrlwi r6, r25, 0x10 -/* 80273078 48 0E D4 59 */ bl GXSetScissor -/* 8027307C 3C 60 80 3C */ lis r3, e_mtx@ha /* 0x803C4020@ha */ -/* 80273080 38 63 40 20 */ addi r3, r3, e_mtx@l /* 0x803C4020@l */ -/* 80273084 38 80 00 00 */ li r4, 0 -/* 80273088 48 0E D1 C5 */ bl GXLoadPosMtxImm -/* 8027308C 38 60 00 00 */ li r3, 0 -/* 80273090 48 0E D2 5D */ bl GXSetCurrentMtx -/* 80273094 48 0E 84 F9 */ bl GXClearVtxDesc -/* 80273098 38 60 00 09 */ li r3, 9 -/* 8027309C 38 80 00 01 */ li r4, 1 -/* 802730A0 48 0E 7E 19 */ bl GXSetVtxDesc -/* 802730A4 38 60 00 0D */ li r3, 0xd -/* 802730A8 38 80 00 01 */ li r4, 1 -/* 802730AC 48 0E 7E 0D */ bl GXSetVtxDesc -/* 802730B0 38 60 00 00 */ li r3, 0 -/* 802730B4 38 80 00 09 */ li r4, 9 -/* 802730B8 38 A0 00 00 */ li r5, 0 -/* 802730BC 38 C0 00 02 */ li r6, 2 -/* 802730C0 38 E0 00 00 */ li r7, 0 -/* 802730C4 48 0E 85 01 */ bl GXSetVtxAttrFmt -/* 802730C8 38 60 00 00 */ li r3, 0 -/* 802730CC 38 80 00 0D */ li r4, 0xd -/* 802730D0 38 A0 00 01 */ li r5, 1 -/* 802730D4 38 C0 00 00 */ li r6, 0 -/* 802730D8 38 E0 00 00 */ li r7, 0 -/* 802730DC 48 0E 84 E9 */ bl GXSetVtxAttrFmt -/* 802730E0 38 60 00 00 */ li r3, 0 -/* 802730E4 48 0E AA 4D */ bl GXSetNumChans -/* 802730E8 38 60 00 04 */ li r3, 4 -/* 802730EC 38 80 00 00 */ li r4, 0 -/* 802730F0 38 A0 00 00 */ li r5, 0 -/* 802730F4 38 C0 00 00 */ li r6, 0 -/* 802730F8 38 E0 00 00 */ li r7, 0 -/* 802730FC 39 00 00 00 */ li r8, 0 -/* 80273100 39 20 00 02 */ li r9, 2 -/* 80273104 48 0E AA 69 */ bl GXSetChanCtrl -/* 80273108 38 60 00 05 */ li r3, 5 -/* 8027310C 38 80 00 00 */ li r4, 0 -/* 80273110 38 A0 00 00 */ li r5, 0 -/* 80273114 38 C0 00 00 */ li r6, 0 -/* 80273118 38 E0 00 00 */ li r7, 0 -/* 8027311C 39 00 00 00 */ li r8, 0 -/* 80273120 39 20 00 02 */ li r9, 2 -/* 80273124 48 0E AA 49 */ bl GXSetChanCtrl -/* 80273128 38 60 00 01 */ li r3, 1 -/* 8027312C 48 0E 8C D1 */ bl GXSetNumTexGens -/* 80273130 38 60 00 00 */ li r3, 0 -/* 80273134 38 80 00 01 */ li r4, 1 -/* 80273138 38 A0 00 04 */ li r5, 4 -/* 8027313C 38 C0 00 3C */ li r6, 0x3c -/* 80273140 38 E0 00 00 */ li r7, 0 -/* 80273144 39 00 00 7D */ li r8, 0x7d -/* 80273148 48 0E 8A 35 */ bl GXSetTexCoordGen2 -/* 8027314C 3C 60 80 43 */ lis r3, clear_z_tobj@ha /* 0x80430FF0@ha */ -/* 80273150 38 63 0F F0 */ addi r3, r3, clear_z_tobj@l /* 0x80430FF0@l */ -/* 80273154 38 80 00 00 */ li r4, 0 -/* 80273158 48 0E B2 BD */ bl GXLoadTexObj -/* 8027315C 38 60 00 01 */ li r3, 1 -/* 80273160 48 0E C7 31 */ bl GXSetNumTevStages -/* 80273164 80 1F 00 00 */ lwz r0, 0(r31) -/* 80273168 90 01 00 08 */ stw r0, 8(r1) -/* 8027316C 38 60 00 01 */ li r3, 1 -/* 80273170 38 81 00 08 */ addi r4, r1, 8 -/* 80273174 48 0E C2 09 */ bl GXSetTevColor -/* 80273178 38 60 00 00 */ li r3, 0 -/* 8027317C 38 80 00 00 */ li r4, 0 -/* 80273180 38 A0 00 00 */ li r5, 0 -/* 80273184 38 C0 00 FF */ li r6, 0xff -/* 80273188 48 0E C5 6D */ bl GXSetTevOrder -/* 8027318C 38 60 00 00 */ li r3, 0 -/* 80273190 38 80 00 0F */ li r4, 0xf -/* 80273194 38 A0 00 0F */ li r5, 0xf -/* 80273198 38 C0 00 0F */ li r6, 0xf -/* 8027319C 38 E0 00 02 */ li r7, 2 -/* 802731A0 48 0E C0 85 */ bl GXSetTevColorIn -/* 802731A4 38 60 00 00 */ li r3, 0 -/* 802731A8 38 80 00 00 */ li r4, 0 -/* 802731AC 38 A0 00 00 */ li r5, 0 -/* 802731B0 38 C0 00 00 */ li r6, 0 -/* 802731B4 38 E0 00 01 */ li r7, 1 -/* 802731B8 39 00 00 00 */ li r8, 0 -/* 802731BC 48 0E C0 F1 */ bl GXSetTevColorOp -/* 802731C0 38 60 00 00 */ li r3, 0 -/* 802731C4 38 80 00 07 */ li r4, 7 -/* 802731C8 38 A0 00 07 */ li r5, 7 -/* 802731CC 38 C0 00 07 */ li r6, 7 -/* 802731D0 38 E0 00 01 */ li r7, 1 -/* 802731D4 48 0E C0 95 */ bl GXSetTevAlphaIn -/* 802731D8 38 60 00 00 */ li r3, 0 -/* 802731DC 38 80 00 00 */ li r4, 0 -/* 802731E0 38 A0 00 00 */ li r5, 0 -/* 802731E4 38 C0 00 00 */ li r6, 0 -/* 802731E8 38 E0 00 01 */ li r7, 1 -/* 802731EC 39 00 00 00 */ li r8, 0 -/* 802731F0 48 0E C1 25 */ bl GXSetTevAlphaOp -/* 802731F4 38 60 00 07 */ li r3, 7 -/* 802731F8 38 80 00 00 */ li r4, 0 -/* 802731FC 38 A0 00 01 */ li r5, 1 -/* 80273200 38 C0 00 07 */ li r6, 7 -/* 80273204 38 E0 00 00 */ li r7, 0 -/* 80273208 48 0E C4 1D */ bl GXSetAlphaCompare -/* 8027320C 38 60 00 02 */ li r3, 2 -/* 80273210 38 80 00 16 */ li r4, 0x16 -/* 80273214 38 A0 00 00 */ li r5, 0 -/* 80273218 48 0E C4 51 */ bl GXSetZTexture -/* 8027321C 38 60 00 00 */ li r3, 0 -/* 80273220 48 0E CA B1 */ bl GXSetZCompLoc -/* 80273224 38 60 00 00 */ li r3, 0 -/* 80273228 38 80 00 00 */ li r4, 0 -/* 8027322C 38 A0 00 00 */ li r5, 0 -/* 80273230 38 C0 00 05 */ li r6, 5 -/* 80273234 48 0E C9 BD */ bl GXSetBlendMode -/* 80273238 88 1A 00 24 */ lbz r0, 0x24(r26) -/* 8027323C 28 00 00 00 */ cmplwi r0, 0 -/* 80273240 41 82 00 18 */ beq lbl_80273258 -/* 80273244 38 60 00 01 */ li r3, 1 -/* 80273248 48 0E CA 29 */ bl GXSetAlphaUpdate -/* 8027324C 38 60 00 01 */ li r3, 1 -/* 80273250 88 9F 00 03 */ lbz r4, 3(r31) -/* 80273254 48 0E CB B1 */ bl GXSetDstAlpha -lbl_80273258: -/* 80273258 38 60 00 01 */ li r3, 1 -/* 8027325C 38 80 00 07 */ li r4, 7 -/* 80273260 38 A0 00 01 */ li r5, 1 -/* 80273264 48 0E CA 39 */ bl GXSetZMode -/* 80273268 38 60 00 02 */ li r3, 2 -/* 8027326C 48 0E 97 19 */ bl GXSetCullMode -/* 80273270 38 60 00 80 */ li r3, 0x80 -/* 80273274 38 80 00 00 */ li r4, 0 -/* 80273278 38 A0 00 04 */ li r5, 4 -/* 8027327C 48 0E 94 E9 */ bl GXBegin -/* 80273280 3C 80 CC 01 */ lis r4, 0xCC01 /* 0xCC008000@ha */ -/* 80273284 B3 64 80 00 */ sth r27, 0x8000(r4) /* 0xCC008000@l */ -/* 80273288 B3 84 80 00 */ sth r28, -0x8000(r4) -/* 8027328C 38 60 00 00 */ li r3, 0 -/* 80273290 98 64 80 00 */ stb r3, -0x8000(r4) -/* 80273294 98 64 80 00 */ stb r3, -0x8000(r4) -/* 80273298 7C BB EA 14 */ add r5, r27, r29 -/* 8027329C B0 A4 80 00 */ sth r5, -0x8000(r4) -/* 802732A0 B3 84 80 00 */ sth r28, -0x8000(r4) -/* 802732A4 38 00 00 01 */ li r0, 1 -/* 802732A8 98 04 80 00 */ stb r0, -0x8000(r4) -/* 802732AC 98 64 80 00 */ stb r3, -0x8000(r4) -/* 802732B0 B0 A4 80 00 */ sth r5, -0x8000(r4) -/* 802732B4 7C BC F2 14 */ add r5, r28, r30 -/* 802732B8 B0 A4 80 00 */ sth r5, -0x8000(r4) -/* 802732BC 98 04 80 00 */ stb r0, -0x8000(r4) -/* 802732C0 98 04 80 00 */ stb r0, -0x8000(r4) -/* 802732C4 B3 64 80 00 */ sth r27, -0x8000(r4) -/* 802732C8 B0 A4 80 00 */ sth r5, -0x8000(r4) -/* 802732CC 98 64 80 00 */ stb r3, -0x8000(r4) -/* 802732D0 98 04 80 00 */ stb r0, -0x8000(r4) -/* 802732D4 38 60 00 00 */ li r3, 0 -/* 802732D8 38 80 00 16 */ li r4, 0x16 -/* 802732DC 38 A0 00 00 */ li r5, 0 -/* 802732E0 48 0E C3 89 */ bl GXSetZTexture -/* 802732E4 38 60 00 01 */ li r3, 1 -/* 802732E8 48 0E C9 E9 */ bl GXSetZCompLoc -/* 802732EC 88 1A 00 24 */ lbz r0, 0x24(r26) -/* 802732F0 28 00 00 00 */ cmplwi r0, 0 -/* 802732F4 41 82 00 10 */ beq lbl_80273304 -/* 802732F8 38 60 00 00 */ li r3, 0 -/* 802732FC 88 9F 00 03 */ lbz r4, 3(r31) -/* 80273300 48 0E CB 05 */ bl GXSetDstAlpha -lbl_80273304: -/* 80273304 39 61 00 90 */ addi r11, r1, 0x90 -/* 80273308 48 0E EF 0D */ bl _restgpr_24 -/* 8027330C 80 01 00 94 */ lwz r0, 0x94(r1) -/* 80273310 7C 08 03 A6 */ mtlr r0 -/* 80273314 38 21 00 90 */ addi r1, r1, 0x90 -/* 80273318 4E 80 00 20 */ blr diff --git a/asm/JSystem/JFramework/JFWDisplay/clearEfb__10JFWDisplayFv.s b/asm/JSystem/JFramework/JFWDisplay/clearEfb__10JFWDisplayFv.s deleted file mode 100644 index 9e36a4cb655..00000000000 --- a/asm/JSystem/JFramework/JFWDisplay/clearEfb__10JFWDisplayFv.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_80272F2C: -/* 80272F2C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80272F30 7C 08 02 A6 */ mflr r0 -/* 80272F34 90 01 00 14 */ stw r0, 0x14(r1) -/* 80272F38 80 03 00 08 */ lwz r0, 8(r3) -/* 80272F3C 90 01 00 08 */ stw r0, 8(r1) -/* 80272F40 38 81 00 08 */ addi r4, r1, 8 -/* 80272F44 48 00 00 15 */ bl clearEfb__10JFWDisplayF8_GXColor -/* 80272F48 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80272F4C 7C 08 03 A6 */ mtlr r0 -/* 80272F50 38 21 00 10 */ addi r1, r1, 0x10 -/* 80272F54 4E 80 00 20 */ blr diff --git a/asm/JSystem/JFramework/JFWDisplay/clearEfb_init__10JFWDisplayFv.s b/asm/JSystem/JFramework/JFWDisplay/clearEfb_init__10JFWDisplayFv.s deleted file mode 100644 index 729f04081f7..00000000000 --- a/asm/JSystem/JFramework/JFWDisplay/clearEfb_init__10JFWDisplayFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_80272EB8: -/* 80272EB8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80272EBC 7C 08 02 A6 */ mflr r0 -/* 80272EC0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80272EC4 3C 60 80 43 */ lis r3, clear_z_tobj@ha /* 0x80430FF0@ha */ -/* 80272EC8 38 63 0F F0 */ addi r3, r3, clear_z_tobj@l /* 0x80430FF0@l */ -/* 80272ECC 3C 80 80 3C */ lis r4, clear_z_TX@ha /* 0x803C4060@ha */ -/* 80272ED0 38 84 40 60 */ addi r4, r4, clear_z_TX@l /* 0x803C4060@l */ -/* 80272ED4 38 A0 00 04 */ li r5, 4 -/* 80272ED8 38 C0 00 04 */ li r6, 4 -/* 80272EDC 38 E0 00 16 */ li r7, 0x16 -/* 80272EE0 39 00 00 01 */ li r8, 1 -/* 80272EE4 39 20 00 01 */ li r9, 1 -/* 80272EE8 39 40 00 00 */ li r10, 0 -/* 80272EEC 48 0E AF 55 */ bl GXInitTexObj -/* 80272EF0 3C 60 80 43 */ lis r3, clear_z_tobj@ha /* 0x80430FF0@ha */ -/* 80272EF4 38 63 0F F0 */ addi r3, r3, clear_z_tobj@l /* 0x80430FF0@l */ -/* 80272EF8 38 80 00 00 */ li r4, 0 -/* 80272EFC 38 A0 00 00 */ li r5, 0 -/* 80272F00 C0 22 B8 50 */ lfs f1, lit_2198(r2) -/* 80272F04 FC 40 08 90 */ fmr f2, f1 -/* 80272F08 FC 60 08 90 */ fmr f3, f1 -/* 80272F0C 38 C0 00 00 */ li r6, 0 -/* 80272F10 38 E0 00 00 */ li r7, 0 -/* 80272F14 39 00 00 00 */ li r8, 0 -/* 80272F18 48 0E B1 BD */ bl GXInitTexObjLOD -/* 80272F1C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80272F20 7C 08 03 A6 */ mtlr r0 -/* 80272F24 38 21 00 10 */ addi r1, r1, 0x10 -/* 80272F28 4E 80 00 20 */ blr diff --git a/asm/JSystem/JFramework/JFWDisplay/copyXfb_triple__10JFWDisplayFv.s b/asm/JSystem/JFramework/JFWDisplay/copyXfb_triple__10JFWDisplayFv.s deleted file mode 100644 index a752b056eb1..00000000000 --- a/asm/JSystem/JFramework/JFWDisplay/copyXfb_triple__10JFWDisplayFv.s +++ /dev/null @@ -1,38 +0,0 @@ -lbl_80272574: -/* 80272574 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80272578 7C 08 02 A6 */ mflr r0 -/* 8027257C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80272580 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80272584 93 C1 00 08 */ stw r30, 8(r1) -/* 80272588 7C 7E 1B 78 */ mr r30, r3 -/* 8027258C 83 ED 8F D0 */ lwz r31, sManager__6JUTXfb(r13) -/* 80272590 A8 1F 00 14 */ lha r0, 0x14(r31) -/* 80272594 7C 00 07 35 */ extsh. r0, r0 -/* 80272598 41 80 00 48 */ blt lbl_802725E0 -/* 8027259C 81 9E 00 44 */ lwz r12, 0x44(r30) -/* 802725A0 28 0C 00 00 */ cmplwi r12, 0 -/* 802725A4 41 82 00 0C */ beq lbl_802725B0 -/* 802725A8 7D 89 03 A6 */ mtctr r12 -/* 802725AC 4E 80 04 21 */ bctrl -lbl_802725B0: -/* 802725B0 7F C3 F3 78 */ mr r3, r30 -/* 802725B4 4B FF FD 05 */ bl prepareCopyDisp__10JFWDisplayFv -/* 802725B8 A8 7F 00 14 */ lha r3, 0x14(r31) -/* 802725BC 7C 60 07 35 */ extsh. r0, r3 -/* 802725C0 41 80 00 10 */ blt lbl_802725D0 -/* 802725C4 54 60 10 3A */ slwi r0, r3, 2 -/* 802725C8 7C 7F 00 2E */ lwzx r3, r31, r0 -/* 802725CC 48 00 00 08 */ b lbl_802725D4 -lbl_802725D0: -/* 802725D0 38 60 00 00 */ li r3, 0 -lbl_802725D4: -/* 802725D4 38 80 00 01 */ li r4, 1 -/* 802725D8 48 0E AD 2D */ bl GXCopyDisp -/* 802725DC 48 0E 9D 99 */ bl GXPixModeSync -lbl_802725E0: -/* 802725E0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802725E4 83 C1 00 08 */ lwz r30, 8(r1) -/* 802725E8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802725EC 7C 08 03 A6 */ mtlr r0 -/* 802725F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802725F4 4E 80 00 20 */ blr diff --git a/asm/JSystem/JFramework/JFWDisplay/createManager__10JFWDisplayFPC16_GXRenderModeObjP7JKRHeapQ26JUTXfb10EXfbNumberb.s b/asm/JSystem/JFramework/JFWDisplay/createManager__10JFWDisplayFPC16_GXRenderModeObjP7JKRHeapQ26JUTXfb10EXfbNumberb.s deleted file mode 100644 index 2062128b261..00000000000 --- a/asm/JSystem/JFramework/JFWDisplay/createManager__10JFWDisplayFPC16_GXRenderModeObjP7JKRHeapQ26JUTXfb10EXfbNumberb.s +++ /dev/null @@ -1,37 +0,0 @@ -lbl_802721DC: -/* 802721DC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802721E0 7C 08 02 A6 */ mflr r0 -/* 802721E4 90 01 00 24 */ stw r0, 0x24(r1) -/* 802721E8 39 61 00 20 */ addi r11, r1, 0x20 -/* 802721EC 48 0E FF F1 */ bl _savegpr_29 -/* 802721F0 7C 60 1B 79 */ or. r0, r3, r3 -/* 802721F4 7C 9D 23 78 */ mr r29, r4 -/* 802721F8 7C BE 2B 78 */ mr r30, r5 -/* 802721FC 7C DF 33 78 */ mr r31, r6 -/* 80272200 41 82 00 10 */ beq lbl_80272210 -/* 80272204 80 6D 8F B8 */ lwz r3, sManager__8JUTVideo(r13) -/* 80272208 7C 04 03 78 */ mr r4, r0 -/* 8027220C 48 07 2F 8D */ bl setRenderMode__8JUTVideoFPC16_GXRenderModeObj -lbl_80272210: -/* 80272210 80 0D 8C 40 */ lwz r0, sManager__10JFWDisplay(r13) -/* 80272214 28 00 00 00 */ cmplwi r0, 0 -/* 80272218 40 82 00 2C */ bne lbl_80272244 -/* 8027221C 38 60 00 4C */ li r3, 0x4c -/* 80272220 48 05 CA 2D */ bl __nw__FUl -/* 80272224 7C 60 1B 79 */ or. r0, r3, r3 -/* 80272228 41 82 00 18 */ beq lbl_80272240 -/* 8027222C 7F A4 EB 78 */ mr r4, r29 -/* 80272230 7F C5 F3 78 */ mr r5, r30 -/* 80272234 7F E6 FB 78 */ mr r6, r31 -/* 80272238 4B FF FE C1 */ bl __ct__10JFWDisplayFP7JKRHeapQ26JUTXfb10EXfbNumberb -/* 8027223C 7C 60 1B 78 */ mr r0, r3 -lbl_80272240: -/* 80272240 90 0D 8C 40 */ stw r0, sManager__10JFWDisplay(r13) -lbl_80272244: -/* 80272244 80 6D 8C 40 */ lwz r3, sManager__10JFWDisplay(r13) -/* 80272248 39 61 00 20 */ addi r11, r1, 0x20 -/* 8027224C 48 0E FF DD */ bl _restgpr_29 -/* 80272250 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80272254 7C 08 03 A6 */ mtlr r0 -/* 80272258 38 21 00 20 */ addi r1, r1, 0x20 -/* 8027225C 4E 80 00 20 */ blr diff --git a/asm/JSystem/JFramework/JFWDisplay/ctor_subroutine__10JFWDisplayFb.s b/asm/JSystem/JFramework/JFWDisplay/ctor_subroutine__10JFWDisplayFb.s deleted file mode 100644 index 2b33bf55e44..00000000000 --- a/asm/JSystem/JFramework/JFWDisplay/ctor_subroutine__10JFWDisplayFb.s +++ /dev/null @@ -1,47 +0,0 @@ -lbl_80272040: -/* 80272040 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80272044 7C 08 02 A6 */ mflr r0 -/* 80272048 90 01 00 14 */ stw r0, 0x14(r1) -/* 8027204C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80272050 7C 7F 1B 78 */ mr r31, r3 -/* 80272054 98 83 00 24 */ stb r4, 0x24(r3) -/* 80272058 38 00 00 03 */ li r0, 3 -/* 8027205C B0 03 00 26 */ sth r0, 0x26(r3) -/* 80272060 38 80 00 00 */ li r4, 0 -/* 80272064 98 83 00 08 */ stb r4, 8(r3) -/* 80272068 98 83 00 09 */ stb r4, 9(r3) -/* 8027206C 98 83 00 0A */ stb r4, 0xa(r3) -/* 80272070 98 83 00 0B */ stb r4, 0xb(r3) -/* 80272074 3C 60 01 00 */ lis r3, 0x0100 /* 0x00FFFFFF@ha */ -/* 80272078 38 03 FF FF */ addi r0, r3, 0xFFFF /* 0x00FFFFFF@l */ -/* 8027207C 90 1F 00 0C */ stw r0, 0xc(r31) -/* 80272080 B0 9F 00 14 */ sth r4, 0x14(r31) -/* 80272084 90 9F 00 04 */ stw r4, 4(r31) -/* 80272088 38 00 00 01 */ li r0, 1 -/* 8027208C B0 1F 00 1C */ sth r0, 0x1c(r31) -/* 80272090 90 9F 00 20 */ stw r4, 0x20(r31) -/* 80272094 C0 02 B8 50 */ lfs f0, lit_2198(r2) -/* 80272098 D0 1F 00 28 */ stfs f0, 0x28(r31) -/* 8027209C 90 9F 00 30 */ stw r4, 0x30(r31) -/* 802720A0 48 0D 06 75 */ bl OSGetTick -/* 802720A4 90 7F 00 2C */ stw r3, 0x2c(r31) -/* 802720A8 38 00 00 00 */ li r0, 0 -/* 802720AC 90 1F 00 34 */ stw r0, 0x34(r31) -/* 802720B0 B0 1F 00 48 */ sth r0, 0x48(r31) -/* 802720B4 98 1F 00 4A */ stb r0, 0x4a(r31) -/* 802720B8 90 1F 00 18 */ stw r0, 0x18(r31) -/* 802720BC 7F E3 FB 78 */ mr r3, r31 -/* 802720C0 48 00 0D F9 */ bl clearEfb_init__10JFWDisplayFv -/* 802720C4 48 07 39 1D */ bl create__10JUTProcBarFv -/* 802720C8 48 07 39 99 */ bl clear__10JUTProcBarFv -/* 802720CC 38 00 00 01 */ li r0, 1 -/* 802720D0 90 1F 00 38 */ stw r0, 0x38(r31) -/* 802720D4 38 00 00 00 */ li r0, 0 -/* 802720D8 90 1F 00 3C */ stw r0, 0x3c(r31) -/* 802720DC 98 1F 00 40 */ stb r0, 0x40(r31) -/* 802720E0 90 1F 00 44 */ stw r0, 0x44(r31) -/* 802720E4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802720E8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802720EC 7C 08 03 A6 */ mtlr r0 -/* 802720F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802720F4 4E 80 00 20 */ blr diff --git a/asm/JSystem/JFramework/JFWDisplay/diagnoseGpHang__Fv.s b/asm/JSystem/JFramework/JFWDisplay/diagnoseGpHang__Fv.s deleted file mode 100644 index 41a7b3b7f7f..00000000000 --- a/asm/JSystem/JFramework/JFWDisplay/diagnoseGpHang__Fv.s +++ /dev/null @@ -1,126 +0,0 @@ -lbl_802734FC: -/* 802734FC 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 80273500 7C 08 02 A6 */ mflr r0 -/* 80273504 90 01 00 44 */ stw r0, 0x44(r1) -/* 80273508 39 61 00 40 */ addi r11, r1, 0x40 -/* 8027350C 48 0E EC CD */ bl _savegpr_28 -/* 80273510 38 61 00 24 */ addi r3, r1, 0x24 -/* 80273514 38 81 00 28 */ addi r4, r1, 0x28 -/* 80273518 38 A1 00 1C */ addi r5, r1, 0x1c -/* 8027351C 38 C1 00 20 */ addi r6, r1, 0x20 -/* 80273520 48 0E D9 B5 */ bl GXReadXfRasMetric -/* 80273524 38 61 00 14 */ addi r3, r1, 0x14 -/* 80273528 38 81 00 18 */ addi r4, r1, 0x18 -/* 8027352C 38 A1 00 0C */ addi r5, r1, 0xc -/* 80273530 38 C1 00 10 */ addi r6, r1, 0x10 -/* 80273534 48 0E D9 A1 */ bl GXReadXfRasMetric -/* 80273538 80 61 00 28 */ lwz r3, 0x28(r1) -/* 8027353C 80 01 00 18 */ lwz r0, 0x18(r1) -/* 80273540 7C 03 00 50 */ subf r0, r3, r0 -/* 80273544 7C 00 00 34 */ cntlzw r0, r0 -/* 80273548 54 1F DE 3E */ rlwinm r31, r0, 0x1b, 0x18, 0x1f -/* 8027354C 80 61 00 24 */ lwz r3, 0x24(r1) -/* 80273550 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80273554 7C 03 00 50 */ subf r0, r3, r0 -/* 80273558 7C 00 00 34 */ cntlzw r0, r0 -/* 8027355C 54 1E DE 3E */ rlwinm r30, r0, 0x1b, 0x18, 0x1f -/* 80273560 80 61 00 20 */ lwz r3, 0x20(r1) -/* 80273564 80 01 00 10 */ lwz r0, 0x10(r1) -/* 80273568 7C 63 00 50 */ subf r3, r3, r0 -/* 8027356C 30 03 FF FF */ addic r0, r3, -1 -/* 80273570 7C 00 19 10 */ subfe r0, r0, r3 -/* 80273574 54 1D 06 3E */ clrlwi r29, r0, 0x18 -/* 80273578 80 61 00 1C */ lwz r3, 0x1c(r1) -/* 8027357C 80 01 00 0C */ lwz r0, 0xc(r1) -/* 80273580 7C 63 00 50 */ subf r3, r3, r0 -/* 80273584 30 03 FF FF */ addic r0, r3, -1 -/* 80273588 7C 00 19 10 */ subfe r0, r0, r3 -/* 8027358C 54 1C 06 3E */ clrlwi r28, r0, 0x18 -/* 80273590 38 61 00 08 */ addi r3, r1, 8 -/* 80273594 7C 64 1B 78 */ mr r4, r3 -/* 80273598 38 A1 00 0A */ addi r5, r1, 0xa -/* 8027359C 38 C1 00 09 */ addi r6, r1, 9 -/* 802735A0 7C 67 1B 78 */ mr r7, r3 -/* 802735A4 48 0E 75 E5 */ bl GXGetGPStatus -/* 802735A8 3C 60 80 3A */ lis r3, JFWDisplay__stringBase0@ha /* 0x8039A878@ha */ -/* 802735AC 38 63 A8 78 */ addi r3, r3, JFWDisplay__stringBase0@l /* 0x8039A878@l */ -/* 802735B0 88 81 00 0A */ lbz r4, 0xa(r1) -/* 802735B4 88 A1 00 09 */ lbz r5, 9(r1) -/* 802735B8 7F E6 FB 78 */ mr r6, r31 -/* 802735BC 7F C7 F3 78 */ mr r7, r30 -/* 802735C0 7F A8 EB 78 */ mr r8, r29 -/* 802735C4 7F 89 E3 78 */ mr r9, r28 -/* 802735C8 4C C6 31 82 */ crclr 6 -/* 802735CC 4B D9 34 F1 */ bl OSReport -/* 802735D0 28 1E 00 00 */ cmplwi r30, 0 -/* 802735D4 40 82 00 24 */ bne lbl_802735F8 -/* 802735D8 28 1D 00 00 */ cmplwi r29, 0 -/* 802735DC 41 82 00 1C */ beq lbl_802735F8 -/* 802735E0 3C 60 80 3A */ lis r3, JFWDisplay__stringBase0@ha /* 0x8039A878@ha */ -/* 802735E4 38 63 A8 78 */ addi r3, r3, JFWDisplay__stringBase0@l /* 0x8039A878@l */ -/* 802735E8 38 63 00 1C */ addi r3, r3, 0x1c -/* 802735EC 4C C6 31 82 */ crclr 6 -/* 802735F0 4B D9 34 CD */ bl OSReport -/* 802735F4 48 00 00 D0 */ b lbl_802736C4 -lbl_802735F8: -/* 802735F8 28 1F 00 00 */ cmplwi r31, 0 -/* 802735FC 40 82 00 2C */ bne lbl_80273628 -/* 80273600 28 1E 00 00 */ cmplwi r30, 0 -/* 80273604 41 82 00 24 */ beq lbl_80273628 -/* 80273608 28 1D 00 00 */ cmplwi r29, 0 -/* 8027360C 41 82 00 1C */ beq lbl_80273628 -/* 80273610 3C 60 80 3A */ lis r3, JFWDisplay__stringBase0@ha /* 0x8039A878@ha */ -/* 80273614 38 63 A8 78 */ addi r3, r3, JFWDisplay__stringBase0@l /* 0x8039A878@l */ -/* 80273618 38 63 00 3A */ addi r3, r3, 0x3a -/* 8027361C 4C C6 31 82 */ crclr 6 -/* 80273620 4B D9 34 9D */ bl OSReport -/* 80273624 48 00 00 A0 */ b lbl_802736C4 -lbl_80273628: -/* 80273628 88 61 00 09 */ lbz r3, 9(r1) -/* 8027362C 28 03 00 00 */ cmplwi r3, 0 -/* 80273630 40 82 00 34 */ bne lbl_80273664 -/* 80273634 28 1F 00 00 */ cmplwi r31, 0 -/* 80273638 41 82 00 2C */ beq lbl_80273664 -/* 8027363C 28 1E 00 00 */ cmplwi r30, 0 -/* 80273640 41 82 00 24 */ beq lbl_80273664 -/* 80273644 28 1D 00 00 */ cmplwi r29, 0 -/* 80273648 41 82 00 1C */ beq lbl_80273664 -/* 8027364C 3C 60 80 3A */ lis r3, JFWDisplay__stringBase0@ha /* 0x8039A878@ha */ -/* 80273650 38 63 A8 78 */ addi r3, r3, JFWDisplay__stringBase0@l /* 0x8039A878@l */ -/* 80273654 38 63 00 62 */ addi r3, r3, 0x62 -/* 80273658 4C C6 31 82 */ crclr 6 -/* 8027365C 4B D9 34 61 */ bl OSReport -/* 80273660 48 00 00 64 */ b lbl_802736C4 -lbl_80273664: -/* 80273664 88 01 00 0A */ lbz r0, 0xa(r1) -/* 80273668 28 00 00 00 */ cmplwi r0, 0 -/* 8027366C 41 82 00 44 */ beq lbl_802736B0 -/* 80273670 28 03 00 00 */ cmplwi r3, 0 -/* 80273674 41 82 00 3C */ beq lbl_802736B0 -/* 80273678 28 1F 00 00 */ cmplwi r31, 0 -/* 8027367C 41 82 00 34 */ beq lbl_802736B0 -/* 80273680 28 1E 00 00 */ cmplwi r30, 0 -/* 80273684 41 82 00 2C */ beq lbl_802736B0 -/* 80273688 28 1D 00 00 */ cmplwi r29, 0 -/* 8027368C 41 82 00 24 */ beq lbl_802736B0 -/* 80273690 28 1C 00 00 */ cmplwi r28, 0 -/* 80273694 41 82 00 1C */ beq lbl_802736B0 -/* 80273698 3C 60 80 3A */ lis r3, JFWDisplay__stringBase0@ha /* 0x8039A878@ha */ -/* 8027369C 38 63 A8 78 */ addi r3, r3, JFWDisplay__stringBase0@l /* 0x8039A878@l */ -/* 802736A0 38 63 00 87 */ addi r3, r3, 0x87 -/* 802736A4 4C C6 31 82 */ crclr 6 -/* 802736A8 4B D9 34 15 */ bl OSReport -/* 802736AC 48 00 00 18 */ b lbl_802736C4 -lbl_802736B0: -/* 802736B0 3C 60 80 3A */ lis r3, JFWDisplay__stringBase0@ha /* 0x8039A878@ha */ -/* 802736B4 38 63 A8 78 */ addi r3, r3, JFWDisplay__stringBase0@l /* 0x8039A878@l */ -/* 802736B8 38 63 00 B7 */ addi r3, r3, 0xb7 -/* 802736BC 4C C6 31 82 */ crclr 6 -/* 802736C0 4B D9 33 FD */ bl OSReport -lbl_802736C4: -/* 802736C4 39 61 00 40 */ addi r11, r1, 0x40 -/* 802736C8 48 0E EB 5D */ bl _restgpr_28 -/* 802736CC 80 01 00 44 */ lwz r0, 0x44(r1) -/* 802736D0 7C 08 03 A6 */ mtlr r0 -/* 802736D4 38 21 00 40 */ addi r1, r1, 0x40 -/* 802736D8 4E 80 00 20 */ blr diff --git a/asm/JSystem/JFramework/JFWDisplay/drawendXfb_single__10JFWDisplayFv.s b/asm/JSystem/JFramework/JFWDisplay/drawendXfb_single__10JFWDisplayFv.s deleted file mode 100644 index b13c2dcb473..00000000000 --- a/asm/JSystem/JFramework/JFWDisplay/drawendXfb_single__10JFWDisplayFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_802723AC: -/* 802723AC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802723B0 7C 08 02 A6 */ mflr r0 -/* 802723B4 90 01 00 14 */ stw r0, 0x14(r1) -/* 802723B8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802723BC 83 ED 8F D0 */ lwz r31, sManager__6JUTXfb(r13) -/* 802723C0 A8 1F 00 14 */ lha r0, 0x14(r31) -/* 802723C4 7C 00 07 35 */ extsh. r0, r0 -/* 802723C8 41 80 00 18 */ blt lbl_802723E0 -/* 802723CC 4B FF FE ED */ bl prepareCopyDisp__10JFWDisplayFv -/* 802723D0 48 00 0F D9 */ bl JFWDrawDoneAlarm__Fv -/* 802723D4 48 0E 9A F9 */ bl GXFlush -/* 802723D8 A8 1F 00 14 */ lha r0, 0x14(r31) -/* 802723DC B0 1F 00 16 */ sth r0, 0x16(r31) -lbl_802723E0: -/* 802723E0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802723E4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802723E8 7C 08 03 A6 */ mtlr r0 -/* 802723EC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802723F0 4E 80 00 20 */ blr diff --git a/asm/JSystem/JFramework/JFWDisplay/endFrame__10JFWDisplayFv.s b/asm/JSystem/JFramework/JFWDisplay/endFrame__10JFWDisplayFv.s deleted file mode 100644 index 6d1fe310afe..00000000000 --- a/asm/JSystem/JFramework/JFWDisplay/endFrame__10JFWDisplayFv.s +++ /dev/null @@ -1,118 +0,0 @@ -lbl_80272AB0: -/* 80272AB0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80272AB4 7C 08 02 A6 */ mflr r0 -/* 80272AB8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80272ABC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80272AC0 93 C1 00 08 */ stw r30, 8(r1) -/* 80272AC4 7C 7F 1B 78 */ mr r31, r3 -/* 80272AC8 83 CD 8F D8 */ lwz r30, sManager__10JUTProcBar(r13) -/* 80272ACC 48 0C FC 49 */ bl OSGetTick -/* 80272AD0 80 1E 00 28 */ lwz r0, 0x28(r30) -/* 80272AD4 7C 00 18 50 */ subf r0, r0, r3 -/* 80272AD8 54 05 18 38 */ slwi r5, r0, 3 -/* 80272ADC 3C 60 80 00 */ lis r3, 0x8000 /* 0x800000F8@ha */ -/* 80272AE0 80 03 00 F8 */ lwz r0, 0x00F8(r3) /* 0x800000F8@l */ -/* 80272AE4 54 04 F0 BE */ srwi r4, r0, 2 -/* 80272AE8 3C 60 00 02 */ lis r3, 0x0002 /* 0x0001E848@ha */ -/* 80272AEC 38 03 E8 48 */ addi r0, r3, 0xE848 /* 0x0001E848@l */ -/* 80272AF0 7C 04 03 96 */ divwu r0, r4, r0 -/* 80272AF4 7C 05 03 96 */ divwu r0, r5, r0 -/* 80272AF8 90 1E 00 2C */ stw r0, 0x2c(r30) -/* 80272AFC 80 1E 00 2C */ lwz r0, 0x2c(r30) -/* 80272B00 28 00 00 00 */ cmplwi r0, 0 -/* 80272B04 40 82 00 0C */ bne lbl_80272B10 -/* 80272B08 38 00 00 01 */ li r0, 1 -/* 80272B0C 90 1E 00 2C */ stw r0, 0x2c(r30) -lbl_80272B10: -/* 80272B10 88 1F 00 40 */ lbz r0, 0x40(r31) -/* 80272B14 28 00 00 00 */ cmplwi r0, 0 -/* 80272B18 41 82 00 F0 */ beq lbl_80272C08 -/* 80272B1C 83 CD 8F D8 */ lwz r30, sManager__10JUTProcBar(r13) -/* 80272B20 38 00 00 FF */ li r0, 0xff -/* 80272B24 98 1E 00 4C */ stb r0, 0x4c(r30) -/* 80272B28 38 00 00 81 */ li r0, 0x81 -/* 80272B2C 98 1E 00 4D */ stb r0, 0x4d(r30) -/* 80272B30 38 00 00 1E */ li r0, 0x1e -/* 80272B34 98 1E 00 4E */ stb r0, 0x4e(r30) -/* 80272B38 48 0C FB DD */ bl OSGetTick -/* 80272B3C 90 7E 00 3C */ stw r3, 0x3c(r30) -/* 80272B40 80 6D 8F D0 */ lwz r3, sManager__6JUTXfb(r13) -/* 80272B44 80 03 00 10 */ lwz r0, 0x10(r3) -/* 80272B48 2C 00 00 02 */ cmpwi r0, 2 -/* 80272B4C 41 82 00 18 */ beq lbl_80272B64 -/* 80272B50 40 80 00 08 */ bge lbl_80272B58 -/* 80272B54 48 00 00 24 */ b lbl_80272B78 -lbl_80272B58: -/* 80272B58 2C 00 00 04 */ cmpwi r0, 4 -/* 80272B5C 40 80 00 1C */ bge lbl_80272B78 -/* 80272B60 48 00 00 10 */ b lbl_80272B70 -lbl_80272B64: -/* 80272B64 48 00 08 45 */ bl JFWDrawDoneAlarm__Fv -/* 80272B68 48 0E 93 65 */ bl GXFlush -/* 80272B6C 48 00 00 0C */ b lbl_80272B78 -lbl_80272B70: -/* 80272B70 48 00 08 39 */ bl JFWDrawDoneAlarm__Fv -/* 80272B74 48 0E 93 59 */ bl GXFlush -lbl_80272B78: -/* 80272B78 83 CD 8F D8 */ lwz r30, sManager__10JUTProcBar(r13) -/* 80272B7C 48 0C FB 99 */ bl OSGetTick -/* 80272B80 80 1E 00 3C */ lwz r0, 0x3c(r30) -/* 80272B84 7C 00 18 50 */ subf r0, r0, r3 -/* 80272B88 54 05 18 38 */ slwi r5, r0, 3 -/* 80272B8C 3C 60 80 00 */ lis r3, 0x8000 /* 0x800000F8@ha */ -/* 80272B90 80 03 00 F8 */ lwz r0, 0x00F8(r3) /* 0x800000F8@l */ -/* 80272B94 54 04 F0 BE */ srwi r4, r0, 2 -/* 80272B98 3C 60 00 02 */ lis r3, 0x0002 /* 0x0001E848@ha */ -/* 80272B9C 38 03 E8 48 */ addi r0, r3, 0xE848 /* 0x0001E848@l */ -/* 80272BA0 7C 04 03 96 */ divwu r0, r4, r0 -/* 80272BA4 7C 05 03 96 */ divwu r0, r5, r0 -/* 80272BA8 90 1E 00 40 */ stw r0, 0x40(r30) -/* 80272BAC 80 1E 00 40 */ lwz r0, 0x40(r30) -/* 80272BB0 28 00 00 00 */ cmplwi r0, 0 -/* 80272BB4 40 82 00 0C */ bne lbl_80272BC0 -/* 80272BB8 38 00 00 01 */ li r0, 1 -/* 80272BBC 90 1E 00 40 */ stw r0, 0x40(r30) -lbl_80272BC0: -/* 80272BC0 83 CD 8F D8 */ lwz r30, sManager__10JUTProcBar(r13) -/* 80272BC4 48 0C FB 51 */ bl OSGetTick -/* 80272BC8 80 1E 00 14 */ lwz r0, 0x14(r30) -/* 80272BCC 7C 00 18 50 */ subf r0, r0, r3 -/* 80272BD0 54 05 18 38 */ slwi r5, r0, 3 -/* 80272BD4 3C 60 80 00 */ lis r3, 0x8000 /* 0x800000F8@ha */ -/* 80272BD8 80 03 00 F8 */ lwz r0, 0x00F8(r3) /* 0x800000F8@l */ -/* 80272BDC 54 04 F0 BE */ srwi r4, r0, 2 -/* 80272BE0 3C 60 00 02 */ lis r3, 0x0002 /* 0x0001E848@ha */ -/* 80272BE4 38 03 E8 48 */ addi r0, r3, 0xE848 /* 0x0001E848@l */ -/* 80272BE8 7C 04 03 96 */ divwu r0, r4, r0 -/* 80272BEC 7C 05 03 96 */ divwu r0, r5, r0 -/* 80272BF0 90 1E 00 18 */ stw r0, 0x18(r30) -/* 80272BF4 80 1E 00 18 */ lwz r0, 0x18(r30) -/* 80272BF8 28 00 00 00 */ cmplwi r0, 0 -/* 80272BFC 40 82 00 0C */ bne lbl_80272C08 -/* 80272C00 38 00 00 01 */ li r0, 1 -/* 80272C04 90 1E 00 18 */ stw r0, 0x18(r30) -lbl_80272C08: -/* 80272C08 88 1F 00 40 */ lbz r0, 0x40(r31) -/* 80272C0C 28 00 00 00 */ cmplwi r0, 0 -/* 80272C10 41 82 00 38 */ beq lbl_80272C48 -/* 80272C14 88 0D 8C 48 */ lbz r0, data_804511C8(r13) -/* 80272C18 7C 00 07 75 */ extsb. r0, r0 -/* 80272C1C 40 82 00 14 */ bne lbl_80272C30 -/* 80272C20 48 0D AC 9D */ bl VIGetRetraceCount -/* 80272C24 90 6D 8C 44 */ stw r3, prevFrame(r13) -/* 80272C28 38 00 00 01 */ li r0, 1 -/* 80272C2C 98 0D 8C 48 */ stb r0, data_804511C8(r13) -lbl_80272C30: -/* 80272C30 48 0D AC 8D */ bl VIGetRetraceCount -/* 80272C34 80 0D 8C 44 */ lwz r0, prevFrame(r13) -/* 80272C38 7C 00 18 50 */ subf r0, r0, r3 -/* 80272C3C 80 8D 8F D8 */ lwz r4, sManager__10JUTProcBar(r13) -/* 80272C40 90 04 01 04 */ stw r0, 0x104(r4) -/* 80272C44 90 6D 8C 44 */ stw r3, prevFrame(r13) -lbl_80272C48: -/* 80272C48 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80272C4C 83 C1 00 08 */ lwz r30, 8(r1) -/* 80272C50 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80272C54 7C 08 03 A6 */ mtlr r0 -/* 80272C58 38 21 00 10 */ addi r1, r1, 0x10 -/* 80272C5C 4E 80 00 20 */ blr diff --git a/asm/JSystem/JFramework/JFWDisplay/endGX__10JFWDisplayFv.s b/asm/JSystem/JFramework/JFWDisplay/endGX__10JFWDisplayFv.s deleted file mode 100644 index 7eee0526c3f..00000000000 --- a/asm/JSystem/JFramework/JFWDisplay/endGX__10JFWDisplayFv.s +++ /dev/null @@ -1,72 +0,0 @@ -lbl_8027268C: -/* 8027268C 94 21 FF 00 */ stwu r1, -0x100(r1) -/* 80272690 7C 08 02 A6 */ mflr r0 -/* 80272694 90 01 01 04 */ stw r0, 0x104(r1) -/* 80272698 93 E1 00 FC */ stw r31, 0xfc(r1) -/* 8027269C 7C 7F 1B 78 */ mr r31, r3 -/* 802726A0 80 6D 8F B8 */ lwz r3, sManager__8JUTVideo(r13) -/* 802726A4 80 63 00 04 */ lwz r3, 4(r3) -/* 802726A8 A0 03 00 04 */ lhz r0, 4(r3) -/* 802726AC A0 83 00 06 */ lhz r4, 6(r3) -/* 802726B0 38 61 00 08 */ addi r3, r1, 8 -/* 802726B4 C0 22 B8 50 */ lfs f1, lit_2198(r2) -/* 802726B8 FC 40 08 90 */ fmr f2, f1 -/* 802726BC C8 82 B8 60 */ lfd f4, lit_2500(r2) -/* 802726C0 90 01 00 E4 */ stw r0, 0xe4(r1) -/* 802726C4 3C 00 43 30 */ lis r0, 0x4330 -/* 802726C8 90 01 00 E0 */ stw r0, 0xe0(r1) -/* 802726CC C8 01 00 E0 */ lfd f0, 0xe0(r1) -/* 802726D0 EC 60 20 28 */ fsubs f3, f0, f4 -/* 802726D4 90 81 00 EC */ stw r4, 0xec(r1) -/* 802726D8 90 01 00 E8 */ stw r0, 0xe8(r1) -/* 802726DC C8 01 00 E8 */ lfd f0, 0xe8(r1) -/* 802726E0 EC 80 20 28 */ fsubs f4, f0, f4 -/* 802726E4 C0 A2 B8 54 */ lfs f5, lit_2497(r2) -/* 802726E8 C0 C2 B8 58 */ lfs f6, lit_2498(r2) -/* 802726EC 48 07 6F E5 */ bl __ct__13J2DOrthoGraphFffffff -/* 802726F0 80 1F 00 04 */ lwz r0, 4(r31) -/* 802726F4 28 00 00 00 */ cmplwi r0, 0 -/* 802726F8 41 82 00 14 */ beq lbl_8027270C -/* 802726FC 38 61 00 08 */ addi r3, r1, 8 -/* 80272700 48 07 70 B5 */ bl setPort__13J2DOrthoGraphFv -/* 80272704 80 7F 00 04 */ lwz r3, 4(r31) -/* 80272708 48 07 2E D5 */ bl control__8JUTFaderFv -lbl_8027270C: -/* 8027270C 38 61 00 08 */ addi r3, r1, 8 -/* 80272710 48 07 70 A5 */ bl setPort__13J2DOrthoGraphFv -/* 80272714 80 6D 8F 48 */ lwz r3, sDebugPrint__10JUTDbPrint(r13) -/* 80272718 48 06 DB 8D */ bl flush__10JUTDbPrintFv -/* 8027271C 80 0D 8F F0 */ lwz r0, sManager__17JUTConsoleManager(r13) -/* 80272720 28 00 00 00 */ cmplwi r0, 0 -/* 80272724 41 82 00 14 */ beq lbl_80272738 -/* 80272728 38 61 00 08 */ addi r3, r1, 8 -/* 8027272C 48 07 70 89 */ bl setPort__13J2DOrthoGraphFv -/* 80272730 80 6D 8F F0 */ lwz r3, sManager__17JUTConsoleManager(r13) -/* 80272734 48 07 5C 51 */ bl draw__17JUTConsoleManagerCFv -lbl_80272738: -/* 80272738 38 61 00 08 */ addi r3, r1, 8 -/* 8027273C 48 07 70 79 */ bl setPort__13J2DOrthoGraphFv -/* 80272740 80 6D 8F D8 */ lwz r3, sManager__10JUTProcBar(r13) -/* 80272744 48 07 36 C5 */ bl draw__10JUTProcBarFv -/* 80272748 80 1F 00 18 */ lwz r0, 0x18(r31) -/* 8027274C 2C 00 00 00 */ cmpwi r0, 0 -/* 80272750 40 82 00 14 */ bne lbl_80272764 -/* 80272754 80 6D 8F D0 */ lwz r3, sManager__6JUTXfb(r13) -/* 80272758 80 03 00 10 */ lwz r0, 0x10(r3) -/* 8027275C 2C 00 00 01 */ cmpwi r0, 1 -/* 80272760 40 82 00 08 */ bne lbl_80272768 -lbl_80272764: -/* 80272764 48 07 22 F1 */ bl flushMessage_dbPrint__12JUTAssertionFv -lbl_80272768: -/* 80272768 48 0E 97 65 */ bl GXFlush -/* 8027276C 3C 60 80 3D */ lis r3, __vt__13J2DOrthoGraph@ha /* 0x803CC9E0@ha */ -/* 80272770 38 03 C9 E0 */ addi r0, r3, __vt__13J2DOrthoGraph@l /* 0x803CC9E0@l */ -/* 80272774 90 01 00 08 */ stw r0, 8(r1) -/* 80272778 3C 60 80 3D */ lis r3, __vt__14J2DGrafContext@ha /* 0x803CC9B8@ha */ -/* 8027277C 38 03 C9 B8 */ addi r0, r3, __vt__14J2DGrafContext@l /* 0x803CC9B8@l */ -/* 80272780 90 01 00 08 */ stw r0, 8(r1) -/* 80272784 83 E1 00 FC */ lwz r31, 0xfc(r1) -/* 80272788 80 01 01 04 */ lwz r0, 0x104(r1) -/* 8027278C 7C 08 03 A6 */ mtlr r0 -/* 80272790 38 21 01 00 */ addi r1, r1, 0x100 -/* 80272794 4E 80 00 20 */ blr diff --git a/asm/JSystem/JFramework/JFWDisplay/endRender__10JFWDisplayFv.s b/asm/JSystem/JFramework/JFWDisplay/endRender__10JFWDisplayFv.s deleted file mode 100644 index d560e6b2b86..00000000000 --- a/asm/JSystem/JFramework/JFWDisplay/endRender__10JFWDisplayFv.s +++ /dev/null @@ -1,48 +0,0 @@ -lbl_80272A04: -/* 80272A04 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80272A08 7C 08 02 A6 */ mflr r0 -/* 80272A0C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80272A10 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80272A14 93 C1 00 08 */ stw r30, 8(r1) -/* 80272A18 7C 7E 1B 78 */ mr r30, r3 -/* 80272A1C 4B FF FC 71 */ bl endGX__10JFWDisplayFv -/* 80272A20 88 1E 00 40 */ lbz r0, 0x40(r30) -/* 80272A24 28 00 00 00 */ cmplwi r0, 0 -/* 80272A28 41 82 00 44 */ beq lbl_80272A6C -/* 80272A2C 80 6D 8F D0 */ lwz r3, sManager__6JUTXfb(r13) -/* 80272A30 80 03 00 10 */ lwz r0, 0x10(r3) -/* 80272A34 2C 00 00 02 */ cmpwi r0, 2 -/* 80272A38 41 82 00 34 */ beq lbl_80272A6C -/* 80272A3C 40 80 00 10 */ bge lbl_80272A4C -/* 80272A40 2C 00 00 01 */ cmpwi r0, 1 -/* 80272A44 40 80 00 14 */ bge lbl_80272A58 -/* 80272A48 48 00 00 24 */ b lbl_80272A6C -lbl_80272A4C: -/* 80272A4C 2C 00 00 04 */ cmpwi r0, 4 -/* 80272A50 40 80 00 1C */ bge lbl_80272A6C -/* 80272A54 48 00 00 10 */ b lbl_80272A64 -lbl_80272A58: -/* 80272A58 7F C3 F3 78 */ mr r3, r30 -/* 80272A5C 4B FF F9 51 */ bl drawendXfb_single__10JFWDisplayFv -/* 80272A60 48 00 00 0C */ b lbl_80272A6C -lbl_80272A64: -/* 80272A64 7F C3 F3 78 */ mr r3, r30 -/* 80272A68 4B FF FB 0D */ bl copyXfb_triple__10JFWDisplayFv -lbl_80272A6C: -/* 80272A6C 83 ED 8F D8 */ lwz r31, sManager__10JUTProcBar(r13) -/* 80272A70 38 00 00 FF */ li r0, 0xff -/* 80272A74 98 1F 00 38 */ stb r0, 0x38(r31) -/* 80272A78 38 00 00 81 */ li r0, 0x81 -/* 80272A7C 98 1F 00 39 */ stb r0, 0x39(r31) -/* 80272A80 38 00 00 1E */ li r0, 0x1e -/* 80272A84 98 1F 00 3A */ stb r0, 0x3a(r31) -/* 80272A88 48 0C FC 8D */ bl OSGetTick -/* 80272A8C 90 7F 00 28 */ stw r3, 0x28(r31) -/* 80272A90 7F C3 F3 78 */ mr r3, r30 -/* 80272A94 48 00 08 89 */ bl calcCombinationRatio__10JFWDisplayFv -/* 80272A98 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80272A9C 83 C1 00 08 */ lwz r30, 8(r1) -/* 80272AA0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80272AA4 7C 08 03 A6 */ mtlr r0 -/* 80272AA8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80272AAC 4E 80 00 20 */ blr diff --git a/asm/JSystem/JFramework/JFWDisplay/exchangeXfb_double__10JFWDisplayFv.s b/asm/JSystem/JFramework/JFWDisplay/exchangeXfb_double__10JFWDisplayFv.s deleted file mode 100644 index ae5fd8e998e..00000000000 --- a/asm/JSystem/JFramework/JFWDisplay/exchangeXfb_double__10JFWDisplayFv.s +++ /dev/null @@ -1,75 +0,0 @@ -lbl_802723F4: -/* 802723F4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802723F8 7C 08 02 A6 */ mflr r0 -/* 802723FC 90 01 00 24 */ stw r0, 0x24(r1) -/* 80272400 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80272404 93 C1 00 18 */ stw r30, 0x18(r1) -/* 80272408 7C 7E 1B 78 */ mr r30, r3 -/* 8027240C 83 ED 8F D0 */ lwz r31, sManager__6JUTXfb(r13) -/* 80272410 A8 9F 00 16 */ lha r4, 0x16(r31) -/* 80272414 A8 1F 00 18 */ lha r0, 0x18(r31) -/* 80272418 7C 04 00 00 */ cmpw r4, r0 -/* 8027241C 40 82 00 A4 */ bne lbl_802724C0 -/* 80272420 A8 1F 00 14 */ lha r0, 0x14(r31) -/* 80272424 7C 00 07 35 */ extsh. r0, r0 -/* 80272428 41 80 00 78 */ blt lbl_802724A0 -/* 8027242C 81 9E 00 44 */ lwz r12, 0x44(r30) -/* 80272430 28 0C 00 00 */ cmplwi r12, 0 -/* 80272434 41 82 00 0C */ beq lbl_80272440 -/* 80272438 7D 89 03 A6 */ mtctr r12 -/* 8027243C 4E 80 04 21 */ bctrl -lbl_80272440: -/* 80272440 7F C3 F3 78 */ mr r3, r30 -/* 80272444 4B FF FE 75 */ bl prepareCopyDisp__10JFWDisplayFv -/* 80272448 A8 7F 00 14 */ lha r3, 0x14(r31) -/* 8027244C 7C 60 07 35 */ extsh. r0, r3 -/* 80272450 41 80 00 10 */ blt lbl_80272460 -/* 80272454 54 60 10 3A */ slwi r0, r3, 2 -/* 80272458 7C 7F 00 2E */ lwzx r3, r31, r0 -/* 8027245C 48 00 00 08 */ b lbl_80272464 -lbl_80272460: -/* 80272460 38 60 00 00 */ li r3, 0 -lbl_80272464: -/* 80272464 38 80 00 01 */ li r4, 1 -/* 80272468 48 0E AE 9D */ bl GXCopyDisp -/* 8027246C 80 1E 00 18 */ lwz r0, 0x18(r30) -/* 80272470 2C 00 00 00 */ cmpwi r0, 0 -/* 80272474 40 82 00 18 */ bne lbl_8027248C -/* 80272478 A8 1F 00 14 */ lha r0, 0x14(r31) -/* 8027247C B0 1F 00 16 */ sth r0, 0x16(r31) -/* 80272480 48 0E 9E 75 */ bl GXDrawDone -/* 80272484 48 07 2C 2D */ bl dummyNoDrawWait__8JUTVideoFv -/* 80272488 48 00 00 08 */ b lbl_80272490 -lbl_8027248C: -/* 8027248C 48 07 2B FD */ bl drawDoneStart__8JUTVideoFv -lbl_80272490: -/* 80272490 80 1E 00 18 */ lwz r0, 0x18(r30) -/* 80272494 2C 00 00 00 */ cmpwi r0, 0 -/* 80272498 40 82 00 08 */ bne lbl_802724A0 -/* 8027249C 4B FF FD C5 */ bl callDirectDraw__Fv -lbl_802724A0: -/* 802724A0 A8 1F 00 14 */ lha r0, 0x14(r31) -/* 802724A4 B0 1F 00 16 */ sth r0, 0x16(r31) -/* 802724A8 54 03 0F FE */ srwi r3, r0, 0x1f -/* 802724AC 38 63 FF FF */ addi r3, r3, -1 -/* 802724B0 68 00 00 01 */ xori r0, r0, 1 -/* 802724B4 7C 00 18 38 */ and r0, r0, r3 -/* 802724B8 B0 1F 00 14 */ sth r0, 0x14(r31) -/* 802724BC 48 00 00 28 */ b lbl_802724E4 -lbl_802724C0: -/* 802724C0 80 1E 00 08 */ lwz r0, 8(r30) -/* 802724C4 90 01 00 08 */ stw r0, 8(r1) -/* 802724C8 38 81 00 08 */ addi r4, r1, 8 -/* 802724CC 48 00 0A 8D */ bl clearEfb__10JFWDisplayF8_GXColor -/* 802724D0 A8 1F 00 14 */ lha r0, 0x14(r31) -/* 802724D4 7C 00 07 35 */ extsh. r0, r0 -/* 802724D8 40 80 00 0C */ bge lbl_802724E4 -/* 802724DC 38 00 00 00 */ li r0, 0 -/* 802724E0 B0 1F 00 14 */ sth r0, 0x14(r31) -lbl_802724E4: -/* 802724E4 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 802724E8 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 802724EC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802724F0 7C 08 03 A6 */ mtlr r0 -/* 802724F4 38 21 00 20 */ addi r1, r1, 0x20 -/* 802724F8 4E 80 00 20 */ blr diff --git a/asm/JSystem/JFramework/JFWDisplay/exchangeXfb_triple__10JFWDisplayFv.s b/asm/JSystem/JFramework/JFWDisplay/exchangeXfb_triple__10JFWDisplayFv.s deleted file mode 100644 index ef761721ff4..00000000000 --- a/asm/JSystem/JFramework/JFWDisplay/exchangeXfb_triple__10JFWDisplayFv.s +++ /dev/null @@ -1,35 +0,0 @@ -lbl_802724FC: -/* 802724FC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80272500 7C 08 02 A6 */ mflr r0 -/* 80272504 90 01 00 14 */ stw r0, 0x14(r1) -/* 80272508 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8027250C 83 ED 8F D0 */ lwz r31, sManager__6JUTXfb(r13) -/* 80272510 A8 1F 00 14 */ lha r0, 0x14(r31) -/* 80272514 7C 00 07 35 */ extsh. r0, r0 -/* 80272518 41 80 00 08 */ blt lbl_80272520 -/* 8027251C 4B FF FD 45 */ bl callDirectDraw__Fv -lbl_80272520: -/* 80272520 A8 1F 00 14 */ lha r0, 0x14(r31) -/* 80272524 B0 1F 00 16 */ sth r0, 0x16(r31) -/* 80272528 A8 7F 00 14 */ lha r3, 0x14(r31) -/* 8027252C 38 03 00 01 */ addi r0, r3, 1 -/* 80272530 7C 04 07 34 */ extsh r4, r0 -/* 80272534 A8 1F 00 18 */ lha r0, 0x18(r31) -lbl_80272538: -/* 80272538 7C 83 07 34 */ extsh r3, r4 -/* 8027253C 2C 03 00 03 */ cmpwi r3, 3 -/* 80272540 40 80 00 0C */ bge lbl_8027254C -/* 80272544 7C 83 07 35 */ extsh. r3, r4 -/* 80272548 40 80 00 08 */ bge lbl_80272550 -lbl_8027254C: -/* 8027254C 38 80 00 00 */ li r4, 0 -lbl_80272550: -/* 80272550 7C 83 07 34 */ extsh r3, r4 -/* 80272554 7C 03 00 00 */ cmpw r3, r0 -/* 80272558 41 82 FF E0 */ beq lbl_80272538 -/* 8027255C B0 9F 00 14 */ sth r4, 0x14(r31) -/* 80272560 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80272564 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80272568 7C 08 03 A6 */ mtlr r0 -/* 8027256C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80272570 4E 80 00 20 */ blr diff --git a/asm/JSystem/JFramework/JFWDisplay/func_80273724.s b/asm/JSystem/JFramework/JFWDisplay/func_80273724.s deleted file mode 100644 index f1cc21068cf..00000000000 --- a/asm/JSystem/JFramework/JFWDisplay/func_80273724.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_80273724: -/* 80273724 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80273728 7C 08 02 A6 */ mflr r0 -/* 8027372C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80273730 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80273734 93 C1 00 08 */ stw r30, 8(r1) -/* 80273738 7C 7E 1B 79 */ or. r30, r3, r3 -/* 8027373C 7C 9F 23 78 */ mr r31, r4 -/* 80273740 41 82 00 1C */ beq lbl_8027375C -/* 80273744 38 80 00 00 */ li r4, 0 -/* 80273748 48 06 87 65 */ bl __dt__10JSUPtrListFv -/* 8027374C 7F E0 07 35 */ extsh. r0, r31 -/* 80273750 40 81 00 0C */ ble lbl_8027375C -/* 80273754 7F C3 F3 78 */ mr r3, r30 -/* 80273758 48 05 B5 E5 */ bl __dl__FPv -lbl_8027375C: -/* 8027375C 7F C3 F3 78 */ mr r3, r30 -/* 80273760 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80273764 83 C1 00 08 */ lwz r30, 8(r1) -/* 80273768 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8027376C 7C 08 03 A6 */ mtlr r0 -/* 80273770 38 21 00 10 */ addi r1, r1, 0x10 -/* 80273774 4E 80 00 20 */ blr diff --git a/asm/JSystem/JFramework/JFWDisplay/preGX__10JFWDisplayFv.s b/asm/JSystem/JFramework/JFWDisplay/preGX__10JFWDisplayFv.s deleted file mode 100644 index 1ea0d2249e5..00000000000 --- a/asm/JSystem/JFramework/JFWDisplay/preGX__10JFWDisplayFv.s +++ /dev/null @@ -1,41 +0,0 @@ -lbl_802725F8: -/* 802725F8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802725FC 7C 08 02 A6 */ mflr r0 -/* 80272600 90 01 00 14 */ stw r0, 0x14(r1) -/* 80272604 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80272608 7C 7F 1B 78 */ mr r31, r3 -/* 8027260C 48 0E C0 59 */ bl GXInvalidateTexAll -/* 80272610 48 0E 95 5D */ bl GXInvalidateVtxCache -/* 80272614 80 6D 8F B8 */ lwz r3, sManager__8JUTVideo(r13) -/* 80272618 80 63 00 04 */ lwz r3, 4(r3) -/* 8027261C 88 03 00 19 */ lbz r0, 0x19(r3) -/* 80272620 28 00 00 00 */ cmplwi r0, 0 -/* 80272624 41 82 00 1C */ beq lbl_80272640 -/* 80272628 38 60 00 02 */ li r3, 2 -/* 8027262C 38 80 00 00 */ li r4, 0 -/* 80272630 48 0E D6 D5 */ bl GXSetPixelFmt -/* 80272634 38 60 00 01 */ li r3, 1 -/* 80272638 48 0E D7 A1 */ bl GXSetDither -/* 8027263C 48 00 00 3C */ b lbl_80272678 -lbl_80272640: -/* 80272640 88 1F 00 24 */ lbz r0, 0x24(r31) -/* 80272644 28 00 00 00 */ cmplwi r0, 0 -/* 80272648 41 82 00 1C */ beq lbl_80272664 -/* 8027264C 38 60 00 01 */ li r3, 1 -/* 80272650 38 80 00 00 */ li r4, 0 -/* 80272654 48 0E D6 B1 */ bl GXSetPixelFmt -/* 80272658 38 60 00 01 */ li r3, 1 -/* 8027265C 48 0E D7 7D */ bl GXSetDither -/* 80272660 48 00 00 18 */ b lbl_80272678 -lbl_80272664: -/* 80272664 38 60 00 00 */ li r3, 0 -/* 80272668 38 80 00 00 */ li r4, 0 -/* 8027266C 48 0E D6 99 */ bl GXSetPixelFmt -/* 80272670 38 60 00 00 */ li r3, 0 -/* 80272674 48 0E D7 65 */ bl GXSetDither -lbl_80272678: -/* 80272678 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8027267C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80272680 7C 08 03 A6 */ mtlr r0 -/* 80272684 38 21 00 10 */ addi r1, r1, 0x10 -/* 80272688 4E 80 00 20 */ blr diff --git a/asm/JSystem/JFramework/JFWDisplay/prepareCopyDisp__10JFWDisplayFv.s b/asm/JSystem/JFramework/JFWDisplay/prepareCopyDisp__10JFWDisplayFv.s deleted file mode 100644 index 1f21cefd404..00000000000 --- a/asm/JSystem/JFramework/JFWDisplay/prepareCopyDisp__10JFWDisplayFv.s +++ /dev/null @@ -1,63 +0,0 @@ -lbl_802722B8: -/* 802722B8 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 802722BC 7C 08 02 A6 */ mflr r0 -/* 802722C0 90 01 00 34 */ stw r0, 0x34(r1) -/* 802722C4 DB E1 00 28 */ stfd f31, 0x28(r1) -/* 802722C8 39 61 00 28 */ addi r11, r1, 0x28 -/* 802722CC 48 0E FF 0D */ bl _savegpr_28 -/* 802722D0 7C 7C 1B 78 */ mr r28, r3 -/* 802722D4 80 6D 8F B8 */ lwz r3, sManager__8JUTVideo(r13) -/* 802722D8 80 63 00 04 */ lwz r3, 4(r3) -/* 802722DC A3 E3 00 04 */ lhz r31, 4(r3) -/* 802722E0 A3 C3 00 06 */ lhz r30, 6(r3) -/* 802722E4 A0 83 00 08 */ lhz r4, 8(r3) -/* 802722E8 7F C3 F3 78 */ mr r3, r30 -/* 802722EC 48 0E AA 81 */ bl GXGetYScaleFactor -/* 802722F0 FF E0 08 90 */ fmr f31, f1 -/* 802722F4 7F C3 F3 78 */ mr r3, r30 -/* 802722F8 48 0E A9 E5 */ bl GXGetNumXfbLines -/* 802722FC 7C 7D 1B 78 */ mr r29, r3 -/* 80272300 80 1C 00 08 */ lwz r0, 8(r28) -/* 80272304 90 01 00 08 */ stw r0, 8(r1) -/* 80272308 38 61 00 08 */ addi r3, r1, 8 -/* 8027230C 80 9C 00 0C */ lwz r4, 0xc(r28) -/* 80272310 48 0E AD 61 */ bl GXSetCopyClear -/* 80272314 38 60 00 00 */ li r3, 0 -/* 80272318 38 80 00 00 */ li r4, 0 -/* 8027231C 7F E5 FB 78 */ mr r5, r31 -/* 80272320 7F C6 F3 78 */ mr r6, r30 -/* 80272324 48 0E A6 E1 */ bl GXSetDispCopySrc -/* 80272328 7F E3 FB 78 */ mr r3, r31 -/* 8027232C 7F A4 EB 78 */ mr r4, r29 -/* 80272330 48 0E A7 CD */ bl GXSetDispCopyDst -/* 80272334 FC 20 F8 90 */ fmr f1, f31 -/* 80272338 48 0E AC 6D */ bl GXSetDispCopyYScale -/* 8027233C 48 0D B3 59 */ bl VIFlush -/* 80272340 80 6D 8F B8 */ lwz r3, sManager__8JUTVideo(r13) -/* 80272344 80 63 00 04 */ lwz r3, 4(r3) -/* 80272348 38 C3 00 32 */ addi r6, r3, 0x32 -/* 8027234C 38 83 00 1A */ addi r4, r3, 0x1a -/* 80272350 88 63 00 19 */ lbz r3, 0x19(r3) -/* 80272354 38 A0 00 01 */ li r5, 1 -/* 80272358 48 0E AD 91 */ bl GXSetCopyFilter -/* 8027235C A0 7C 00 26 */ lhz r3, 0x26(r28) -/* 80272360 48 0E A9 25 */ bl GXSetCopyClamp -/* 80272364 A0 7C 00 14 */ lhz r3, 0x14(r28) -/* 80272368 48 0E AF 89 */ bl GXSetDispCopyGamma -/* 8027236C 38 60 00 01 */ li r3, 1 -/* 80272370 38 80 00 03 */ li r4, 3 -/* 80272374 38 A0 00 01 */ li r5, 1 -/* 80272378 48 0E D9 25 */ bl GXSetZMode -/* 8027237C 88 1C 00 24 */ lbz r0, 0x24(r28) -/* 80272380 28 00 00 00 */ cmplwi r0, 0 -/* 80272384 41 82 00 0C */ beq lbl_80272390 -/* 80272388 38 60 00 01 */ li r3, 1 -/* 8027238C 48 0E D8 E5 */ bl GXSetAlphaUpdate -lbl_80272390: -/* 80272390 CB E1 00 28 */ lfd f31, 0x28(r1) -/* 80272394 39 61 00 28 */ addi r11, r1, 0x28 -/* 80272398 48 0E FE 8D */ bl _restgpr_28 -/* 8027239C 80 01 00 34 */ lwz r0, 0x34(r1) -/* 802723A0 7C 08 03 A6 */ mtlr r0 -/* 802723A4 38 21 00 30 */ addi r1, r1, 0x30 -/* 802723A8 4E 80 00 20 */ blr diff --git a/asm/JSystem/JFramework/JFWDisplay/threadSleep__10JFWDisplayFx.s b/asm/JSystem/JFramework/JFWDisplay/threadSleep__10JFWDisplayFx.s deleted file mode 100644 index f0bf9567476..00000000000 --- a/asm/JSystem/JFramework/JFWDisplay/threadSleep__10JFWDisplayFx.s +++ /dev/null @@ -1,44 +0,0 @@ -lbl_80272E10: -/* 80272E10 94 21 FF A0 */ stwu r1, -0x60(r1) -/* 80272E14 7C 08 02 A6 */ mflr r0 -/* 80272E18 90 01 00 64 */ stw r0, 0x64(r1) -/* 80272E1C 39 61 00 60 */ addi r11, r1, 0x60 -/* 80272E20 48 0E F3 B9 */ bl _savegpr_28 -/* 80272E24 7C BD 2B 78 */ mr r29, r5 -/* 80272E28 7C DC 33 78 */ mr r28, r6 -/* 80272E2C 3B E1 00 34 */ addi r31, r1, 0x34 -/* 80272E30 7F E3 FB 78 */ mr r3, r31 -/* 80272E34 38 81 00 08 */ addi r4, r1, 8 -/* 80272E38 48 06 8F C5 */ bl __ct__10JSUPtrLinkFPv -/* 80272E3C 38 61 00 08 */ addi r3, r1, 8 -/* 80272E40 48 0C 7A B9 */ bl OSCreateAlarm -/* 80272E44 48 0C DE 41 */ bl OSGetCurrentThread -/* 80272E48 90 61 00 30 */ stw r3, 0x30(r1) -/* 80272E4C 48 0C A8 A9 */ bl OSDisableInterrupts -/* 80272E50 7C 7E 1B 78 */ mr r30, r3 -/* 80272E54 3C 60 80 43 */ lis r3, sList__8JFWAlarm@ha /* 0x80430FE4@ha */ -/* 80272E58 38 63 0F E4 */ addi r3, r3, sList__8JFWAlarm@l /* 0x80430FE4@l */ -/* 80272E5C 7F E4 FB 78 */ mr r4, r31 -/* 80272E60 48 06 90 ED */ bl append__10JSUPtrListFP10JSUPtrLink -/* 80272E64 38 61 00 08 */ addi r3, r1, 8 -/* 80272E68 7F 86 E3 78 */ mr r6, r28 -/* 80272E6C 7F A5 EB 78 */ mr r5, r29 -/* 80272E70 3C 80 80 27 */ lis r4, JFWThreadAlarmHandler__FP7OSAlarmP9OSContext@ha /* 0x80272DD0@ha */ -/* 80272E74 38 E4 2D D0 */ addi r7, r4, JFWThreadAlarmHandler__FP7OSAlarmP9OSContext@l /* 0x80272DD0@l */ -/* 80272E78 48 0C 7C E1 */ bl OSSetAlarm -/* 80272E7C 80 61 00 30 */ lwz r3, 0x30(r1) -/* 80272E80 48 0C EB BD */ bl OSSuspendThread -/* 80272E84 7F C3 F3 78 */ mr r3, r30 -/* 80272E88 48 0C A8 95 */ bl OSRestoreInterrupts -/* 80272E8C 28 1F 00 00 */ cmplwi r31, 0 -/* 80272E90 41 82 00 10 */ beq lbl_80272EA0 -/* 80272E94 7F E3 FB 78 */ mr r3, r31 -/* 80272E98 38 80 00 00 */ li r4, 0 -/* 80272E9C 48 06 8F 79 */ bl __dt__10JSUPtrLinkFv -lbl_80272EA0: -/* 80272EA0 39 61 00 60 */ addi r11, r1, 0x60 -/* 80272EA4 48 0E F3 81 */ bl _restgpr_28 -/* 80272EA8 80 01 00 64 */ lwz r0, 0x64(r1) -/* 80272EAC 7C 08 03 A6 */ mtlr r0 -/* 80272EB0 38 21 00 60 */ addi r1, r1, 0x60 -/* 80272EB4 4E 80 00 20 */ blr diff --git a/asm/JSystem/JFramework/JFWDisplay/waitBlanking__10JFWDisplayFi.s b/asm/JSystem/JFramework/JFWDisplay/waitBlanking__10JFWDisplayFi.s deleted file mode 100644 index 5f1be23f526..00000000000 --- a/asm/JSystem/JFramework/JFWDisplay/waitBlanking__10JFWDisplayFi.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_80272C60: -/* 80272C60 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80272C64 7C 08 02 A6 */ mflr r0 -/* 80272C68 90 01 00 14 */ stw r0, 0x14(r1) -/* 80272C6C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80272C70 93 C1 00 08 */ stw r30, 8(r1) -/* 80272C74 7C 7E 1B 78 */ mr r30, r3 -/* 80272C78 7C 9F 23 78 */ mr r31, r4 -/* 80272C7C 48 00 00 10 */ b lbl_80272C8C -lbl_80272C80: -/* 80272C80 80 7E 00 20 */ lwz r3, 0x20(r30) -/* 80272C84 A0 9E 00 1C */ lhz r4, 0x1c(r30) -/* 80272C88 48 00 00 29 */ bl waitForTick__FUlUs -lbl_80272C8C: -/* 80272C8C 2C 1F 00 00 */ cmpwi r31, 0 -/* 80272C90 3B FF FF FF */ addi r31, r31, -1 -/* 80272C94 41 81 FF EC */ bgt lbl_80272C80 -/* 80272C98 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80272C9C 83 C1 00 08 */ lwz r30, 8(r1) -/* 80272CA0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80272CA4 7C 08 03 A6 */ mtlr r0 -/* 80272CA8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80272CAC 4E 80 00 20 */ blr diff --git a/asm/JSystem/JFramework/JFWSystem/firstInit__9JFWSystemFv.s b/asm/JSystem/JFramework/JFWSystem/firstInit__9JFWSystemFv.s deleted file mode 100644 index 6291179ad46..00000000000 --- a/asm/JSystem/JFramework/JFWSystem/firstInit__9JFWSystemFv.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_80271CD0: -/* 80271CD0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80271CD4 7C 08 02 A6 */ mflr r0 -/* 80271CD8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80271CDC 48 0C 82 85 */ bl OSInit -/* 80271CE0 48 0D 74 11 */ bl DVDInit -/* 80271CE4 80 6D 81 F0 */ lwz r3, maxStdHeaps__Q29JFWSystem11CSetUpParam(r13) -/* 80271CE8 38 80 00 00 */ li r4, 0 -/* 80271CEC 48 05 D0 C9 */ bl createRoot__10JKRExpHeapFib -/* 80271CF0 7C 64 1B 78 */ mr r4, r3 -/* 80271CF4 90 8D 8C 20 */ stw r4, rootHeap__9JFWSystem(r13) -/* 80271CF8 80 6D 81 F4 */ lwz r3, sysHeapSize__Q29JFWSystem11CSetUpParam(r13) -/* 80271CFC 38 A0 00 00 */ li r5, 0 -/* 80271D00 48 05 D1 2D */ bl create__10JKRExpHeapFUlP7JKRHeapb -/* 80271D04 90 6D 8C 24 */ stw r3, systemHeap__9JFWSystem(r13) -/* 80271D08 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80271D0C 7C 08 03 A6 */ mtlr r0 -/* 80271D10 38 21 00 10 */ addi r1, r1, 0x10 -/* 80271D14 4E 80 00 20 */ blr diff --git a/asm/JSystem/JParticle/JPABaseShape/JPADrawParticleCallBack__FP18JPAEmitterWorkDataP15JPABaseParticle.s b/asm/JSystem/JParticle/JPABaseShape/JPADrawParticleCallBack__FP18JPAEmitterWorkDataP15JPABaseParticle.s deleted file mode 100644 index 149a87e1357..00000000000 --- a/asm/JSystem/JParticle/JPABaseShape/JPADrawParticleCallBack__FP18JPAEmitterWorkDataP15JPABaseParticle.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_8027A414: -/* 8027A414 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8027A418 7C 08 02 A6 */ mflr r0 -/* 8027A41C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8027A420 7C 85 23 78 */ mr r5, r4 -/* 8027A424 80 83 00 00 */ lwz r4, 0(r3) -/* 8027A428 80 64 00 F0 */ lwz r3, 0xf0(r4) -/* 8027A42C 28 03 00 00 */ cmplwi r3, 0 -/* 8027A430 41 82 00 14 */ beq lbl_8027A444 -/* 8027A434 81 83 00 00 */ lwz r12, 0(r3) -/* 8027A438 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 8027A43C 7D 89 03 A6 */ mtctr r12 -/* 8027A440 4E 80 04 21 */ bctrl -lbl_8027A444: -/* 8027A444 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8027A448 7C 08 03 A6 */ mtlr r0 -/* 8027A44C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8027A450 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_skill/__ct__13dMenu_Skill_cFP10JKRExpHeapP9STControlP10CSTControl.s b/asm/d/menu/d_menu_skill/__ct__13dMenu_Skill_cFP10JKRExpHeapP9STControlP10CSTControl.s deleted file mode 100644 index e499da4d756..00000000000 --- a/asm/d/menu/d_menu_skill/__ct__13dMenu_Skill_cFP10JKRExpHeapP9STControlP10CSTControl.s +++ /dev/null @@ -1,74 +0,0 @@ -lbl_801F7224: -/* 801F7224 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801F7228 7C 08 02 A6 */ mflr r0 -/* 801F722C 90 01 00 24 */ stw r0, 0x24(r1) -/* 801F7230 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F7234 48 16 AF A5 */ bl _savegpr_28 -/* 801F7238 7C 7F 1B 78 */ mr r31, r3 -/* 801F723C 7C 9C 23 78 */ mr r28, r4 -/* 801F7240 7C BD 2B 78 */ mr r29, r5 -/* 801F7244 7C DE 33 78 */ mr r30, r6 -/* 801F7248 3C 60 80 3A */ lis r3, __vt__12dDlst_base_c@ha /* 0x803A6F88@ha */ -/* 801F724C 38 03 6F 88 */ addi r0, r3, __vt__12dDlst_base_c@l /* 0x803A6F88@l */ -/* 801F7250 90 1F 00 00 */ stw r0, 0(r31) -/* 801F7254 3C 60 80 3C */ lis r3, __vt__13dMenu_Skill_c@ha /* 0x803BE8C0@ha */ -/* 801F7258 38 03 E8 C0 */ addi r0, r3, __vt__13dMenu_Skill_c@l /* 0x803BE8C0@l */ -/* 801F725C 90 1F 00 00 */ stw r0, 0(r31) -/* 801F7260 38 7F 01 A0 */ addi r3, r31, 0x1a0 -/* 801F7264 3C 80 80 19 */ lis r4, __ct__Q28JUtility6TColorFv@ha /* 0x80193960@ha */ -/* 801F7268 38 84 39 60 */ addi r4, r4, __ct__Q28JUtility6TColorFv@l /* 0x80193960@l */ -/* 801F726C 38 A0 00 00 */ li r5, 0 -/* 801F7270 38 C0 00 04 */ li r6, 4 -/* 801F7274 38 E0 00 05 */ li r7, 5 -/* 801F7278 48 16 AA E9 */ bl __construct_array -/* 801F727C 38 7F 01 B4 */ addi r3, r31, 0x1b4 -/* 801F7280 3C 80 80 19 */ lis r4, __ct__Q28JUtility6TColorFv@ha /* 0x80193960@ha */ -/* 801F7284 38 84 39 60 */ addi r4, r4, __ct__Q28JUtility6TColorFv@l /* 0x80193960@l */ -/* 801F7288 38 A0 00 00 */ li r5, 0 -/* 801F728C 38 C0 00 04 */ li r6, 4 -/* 801F7290 38 E0 00 05 */ li r7, 5 -/* 801F7294 48 16 AA CD */ bl __construct_array -/* 801F7298 38 7F 01 C8 */ addi r3, r31, 0x1c8 -/* 801F729C 3C 80 80 19 */ lis r4, __ct__Q28JUtility6TColorFv@ha /* 0x80193960@ha */ -/* 801F72A0 38 84 39 60 */ addi r4, r4, __ct__Q28JUtility6TColorFv@l /* 0x80193960@l */ -/* 801F72A4 38 A0 00 00 */ li r5, 0 -/* 801F72A8 38 C0 00 04 */ li r6, 4 -/* 801F72AC 38 E0 00 05 */ li r7, 5 -/* 801F72B0 48 16 AA B1 */ bl __construct_array -/* 801F72B4 38 7F 01 DC */ addi r3, r31, 0x1dc -/* 801F72B8 3C 80 80 19 */ lis r4, __ct__Q28JUtility6TColorFv@ha /* 0x80193960@ha */ -/* 801F72BC 38 84 39 60 */ addi r4, r4, __ct__Q28JUtility6TColorFv@l /* 0x80193960@l */ -/* 801F72C0 38 A0 00 00 */ li r5, 0 -/* 801F72C4 38 C0 00 04 */ li r6, 4 -/* 801F72C8 38 E0 00 05 */ li r7, 5 -/* 801F72CC 48 16 AA 95 */ bl __construct_array -/* 801F72D0 93 9F 00 04 */ stw r28, 4(r31) -/* 801F72D4 38 60 00 00 */ li r3, 0 -/* 801F72D8 90 7F 00 08 */ stw r3, 8(r31) -/* 801F72DC 90 7F 00 14 */ stw r3, 0x14(r31) -/* 801F72E0 93 BF 00 0C */ stw r29, 0xc(r31) -/* 801F72E4 93 DF 00 10 */ stw r30, 0x10(r31) -/* 801F72E8 38 00 00 01 */ li r0, 1 -/* 801F72EC 98 1F 02 04 */ stb r0, 0x204(r31) -/* 801F72F0 98 7F 02 05 */ stb r3, 0x205(r31) -/* 801F72F4 B0 7F 02 00 */ sth r3, 0x200(r31) -/* 801F72F8 90 7F 01 FC */ stw r3, 0x1fc(r31) -/* 801F72FC B0 7F 02 02 */ sth r3, 0x202(r31) -/* 801F7300 98 7F 02 06 */ stb r3, 0x206(r31) -/* 801F7304 38 00 00 FF */ li r0, 0xff -/* 801F7308 98 1F 02 09 */ stb r0, 0x209(r31) -/* 801F730C 98 1F 02 0A */ stb r0, 0x20a(r31) -/* 801F7310 7F E3 FB 78 */ mr r3, r31 -/* 801F7314 48 00 06 65 */ bl skill_init_calc__13dMenu_Skill_cFv -/* 801F7318 C0 02 AA 88 */ lfs f0, lit_3808(r2) -/* 801F731C D0 1F 01 F0 */ stfs f0, 0x1f0(r31) -/* 801F7320 C0 02 AA 8C */ lfs f0, lit_3809(r2) -/* 801F7324 D0 1F 01 F8 */ stfs f0, 0x1f8(r31) -/* 801F7328 D0 1F 01 F4 */ stfs f0, 0x1f4(r31) -/* 801F732C 7F E3 FB 78 */ mr r3, r31 -/* 801F7330 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F7334 48 16 AE F1 */ bl _restgpr_28 -/* 801F7338 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801F733C 7C 08 03 A6 */ mtlr r0 -/* 801F7340 38 21 00 20 */ addi r1, r1, 0x20 -/* 801F7344 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/_create__5dMw_cFv.s b/asm/d/menu/d_menu_window/_create__5dMw_cFv.s deleted file mode 100644 index 11294bdce46..00000000000 --- a/asm/d/menu/d_menu_window/_create__5dMw_cFv.s +++ /dev/null @@ -1,105 +0,0 @@ -lbl_801FD140: -/* 801FD140 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FD144 7C 08 02 A6 */ mflr r0 -/* 801FD148 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FD14C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FD150 93 C1 00 08 */ stw r30, 8(r1) -/* 801FD154 7C 7E 1B 78 */ mr r30, r3 -/* 801FD158 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801FD15C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801FD160 80 03 5E BC */ lwz r0, 0x5ebc(r3) -/* 801FD164 90 1E 01 00 */ stw r0, 0x100(r30) -/* 801FD168 38 60 00 30 */ li r3, 0x30 -/* 801FD16C 48 0D 1A E1 */ bl __nw__FUl -/* 801FD170 7C 60 1B 79 */ or. r0, r3, r3 -/* 801FD174 41 82 00 2C */ beq lbl_801FD1A0 -/* 801FD178 38 80 00 05 */ li r4, 5 -/* 801FD17C 38 A0 00 02 */ li r5, 2 -/* 801FD180 38 C0 00 01 */ li r6, 1 -/* 801FD184 38 E0 00 01 */ li r7, 1 -/* 801FD188 C0 22 AA D4 */ lfs f1, lit_6086(r2) -/* 801FD18C C0 42 AA D8 */ lfs f2, lit_6087(r2) -/* 801FD190 39 00 00 00 */ li r8, 0 -/* 801FD194 39 20 08 00 */ li r9, 0x800 -/* 801FD198 4B E3 4E AD */ bl __ct__9STControlFssssffss -/* 801FD19C 7C 60 1B 78 */ mr r0, r3 -lbl_801FD1A0: -/* 801FD1A0 90 1E 01 04 */ stw r0, 0x104(r30) -/* 801FD1A4 38 00 00 08 */ li r0, 8 -/* 801FD1A8 80 7E 01 04 */ lwz r3, 0x104(r30) -/* 801FD1AC B0 03 00 28 */ sth r0, 0x28(r3) -/* 801FD1B0 38 60 00 30 */ li r3, 0x30 -/* 801FD1B4 48 0D 1A 99 */ bl __nw__FUl -/* 801FD1B8 7C 7F 1B 79 */ or. r31, r3, r3 -/* 801FD1BC 41 82 00 34 */ beq lbl_801FD1F0 -/* 801FD1C0 38 80 00 05 */ li r4, 5 -/* 801FD1C4 38 A0 00 02 */ li r5, 2 -/* 801FD1C8 38 C0 00 03 */ li r6, 3 -/* 801FD1CC 38 E0 00 02 */ li r7, 2 -/* 801FD1D0 C0 22 AA D4 */ lfs f1, lit_6086(r2) -/* 801FD1D4 C0 42 AA D8 */ lfs f2, lit_6087(r2) -/* 801FD1D8 39 00 00 00 */ li r8, 0 -/* 801FD1DC 39 20 20 00 */ li r9, 0x2000 -/* 801FD1E0 4B E3 4E 65 */ bl __ct__9STControlFssssffss -/* 801FD1E4 3C 60 80 3A */ lis r3, __vt__10CSTControl@ha /* 0x803A7250@ha */ -/* 801FD1E8 38 03 72 50 */ addi r0, r3, __vt__10CSTControl@l /* 0x803A7250@l */ -/* 801FD1EC 90 1F 00 00 */ stw r0, 0(r31) -lbl_801FD1F0: -/* 801FD1F0 93 FE 01 08 */ stw r31, 0x108(r30) -/* 801FD1F4 80 7E 01 08 */ lwz r3, 0x108(r30) -/* 801FD1F8 38 80 00 05 */ li r4, 5 -/* 801FD1FC 38 A0 00 02 */ li r5, 2 -/* 801FD200 38 C0 00 03 */ li r6, 3 -/* 801FD204 38 E0 00 02 */ li r7, 2 -/* 801FD208 C0 22 AA D4 */ lfs f1, lit_6086(r2) -/* 801FD20C C0 42 AA D8 */ lfs f2, lit_6087(r2) -/* 801FD210 39 00 00 00 */ li r8, 0 -/* 801FD214 39 20 20 00 */ li r9, 0x2000 -/* 801FD218 4B E3 4E 71 */ bl setWaitParm__9STControlFssssffss -/* 801FD21C 38 80 00 00 */ li r4, 0 -/* 801FD220 98 9E 01 45 */ stb r4, 0x145(r30) -/* 801FD224 98 9E 01 46 */ stb r4, 0x146(r30) -/* 801FD228 38 00 00 01 */ li r0, 1 -/* 801FD22C 98 1E 01 47 */ stb r0, 0x147(r30) -/* 801FD230 98 9E 01 48 */ stb r4, 0x148(r30) -/* 801FD234 98 9E 01 4C */ stb r4, 0x14c(r30) -/* 801FD238 98 9E 01 4D */ stb r4, 0x14d(r30) -/* 801FD23C 98 9E 01 4E */ stb r4, 0x14e(r30) -/* 801FD240 98 9E 01 4F */ stb r4, 0x14f(r30) -/* 801FD244 98 9E 01 50 */ stb r4, 0x150(r30) -/* 801FD248 98 9E 01 51 */ stb r4, 0x151(r30) -/* 801FD24C 98 9E 01 52 */ stb r4, 0x152(r30) -/* 801FD250 C0 02 AA C0 */ lfs f0, lit_4152(r2) -/* 801FD254 D0 1E 01 3C */ stfs f0, 0x13c(r30) -/* 801FD258 D0 1E 01 40 */ stfs f0, 0x140(r30) -/* 801FD25C 98 9E 01 53 */ stb r4, 0x153(r30) -/* 801FD260 98 1E 01 54 */ stb r0, 0x154(r30) -/* 801FD264 98 9E 01 49 */ stb r4, 0x149(r30) -/* 801FD268 98 9E 01 4A */ stb r4, 0x14a(r30) -/* 801FD26C 98 9E 01 4B */ stb r4, 0x14b(r30) -/* 801FD270 90 9E 01 0C */ stw r4, 0x10c(r30) -/* 801FD274 90 9E 01 10 */ stw r4, 0x110(r30) -/* 801FD278 90 9E 01 14 */ stw r4, 0x114(r30) -/* 801FD27C 90 9E 01 18 */ stw r4, 0x118(r30) -/* 801FD280 90 9E 01 1C */ stw r4, 0x11c(r30) -/* 801FD284 90 9E 01 20 */ stw r4, 0x120(r30) -/* 801FD288 90 9E 01 24 */ stw r4, 0x124(r30) -/* 801FD28C 90 9E 01 28 */ stw r4, 0x128(r30) -/* 801FD290 90 9E 01 2C */ stw r4, 0x12c(r30) -/* 801FD294 90 9E 01 30 */ stw r4, 0x130(r30) -/* 801FD298 90 9E 01 34 */ stw r4, 0x134(r30) -/* 801FD29C 90 9E 01 38 */ stw r4, 0x138(r30) -/* 801FD2A0 38 00 00 03 */ li r0, 3 -/* 801FD2A4 98 1E 01 44 */ stb r0, 0x144(r30) -/* 801FD2A8 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801FD2AC 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801FD2B0 88 03 00 B9 */ lbz r0, 0xb9(r3) -/* 801FD2B4 98 03 00 BA */ stb r0, 0xba(r3) -/* 801FD2B8 98 83 00 B9 */ stb r4, 0xb9(r3) -/* 801FD2BC 38 60 00 04 */ li r3, 4 -/* 801FD2C0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FD2C4 83 C1 00 08 */ lwz r30, 8(r1) -/* 801FD2C8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FD2CC 7C 08 03 A6 */ mtlr r0 -/* 801FD2D0 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FD2D4 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/_delete__5dMw_cFv.s b/asm/d/menu/d_menu_window/_delete__5dMw_cFv.s deleted file mode 100644 index 37b26c435d0..00000000000 --- a/asm/d/menu/d_menu_window/_delete__5dMw_cFv.s +++ /dev/null @@ -1,125 +0,0 @@ -lbl_801FD67C: -/* 801FD67C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FD680 7C 08 02 A6 */ mflr r0 -/* 801FD684 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FD688 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FD68C 93 C1 00 08 */ stw r30, 8(r1) -/* 801FD690 7C 7E 1B 78 */ mr r30, r3 -/* 801FD694 4B E1 1B 59 */ bl mDoExt_getCurrentHeap__Fv -/* 801FD698 7C 7F 1B 78 */ mr r31, r3 -/* 801FD69C 80 7E 01 04 */ lwz r3, 0x104(r30) -/* 801FD6A0 48 0D 16 9D */ bl __dl__FPv -/* 801FD6A4 38 00 00 00 */ li r0, 0 -/* 801FD6A8 90 1E 01 04 */ stw r0, 0x104(r30) -/* 801FD6AC 80 7E 01 08 */ lwz r3, 0x108(r30) -/* 801FD6B0 48 0D 16 8D */ bl __dl__FPv -/* 801FD6B4 38 00 00 00 */ li r0, 0 -/* 801FD6B8 90 1E 01 08 */ stw r0, 0x108(r30) -/* 801FD6BC 80 7E 01 00 */ lwz r3, 0x100(r30) -/* 801FD6C0 4B E1 1B 0D */ bl mDoExt_setCurrentHeap__FP7JKRHeap -/* 801FD6C4 7F C3 F3 78 */ mr r3, r30 -/* 801FD6C8 38 80 00 00 */ li r4, 0 -/* 801FD6CC 4B FF E9 C5 */ bl dMw_collect_delete__5dMw_cFb -/* 801FD6D0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801FD6D4 40 82 00 14 */ bne lbl_801FD6E8 -/* 801FD6D8 7F E3 FB 78 */ mr r3, r31 -/* 801FD6DC 4B E1 1A F1 */ bl mDoExt_setCurrentHeap__FP7JKRHeap -/* 801FD6E0 38 60 00 00 */ li r3, 0 -/* 801FD6E4 48 00 01 44 */ b lbl_801FD828 -lbl_801FD6E8: -/* 801FD6E8 7F C3 F3 78 */ mr r3, r30 -/* 801FD6EC 38 80 00 00 */ li r4, 0 -/* 801FD6F0 4B FF ED 7D */ bl dMw_dmap_delete__5dMw_cFb -/* 801FD6F4 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801FD6F8 40 82 00 14 */ bne lbl_801FD70C -/* 801FD6FC 7F E3 FB 78 */ mr r3, r31 -/* 801FD700 4B E1 1A CD */ bl mDoExt_setCurrentHeap__FP7JKRHeap -/* 801FD704 38 60 00 00 */ li r3, 0 -/* 801FD708 48 00 01 20 */ b lbl_801FD828 -lbl_801FD70C: -/* 801FD70C 7F C3 F3 78 */ mr r3, r30 -/* 801FD710 38 80 00 00 */ li r4, 0 -/* 801FD714 4B FF EB 51 */ bl dMw_fmap_delete__5dMw_cFb -/* 801FD718 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801FD71C 40 82 00 14 */ bne lbl_801FD730 -/* 801FD720 7F E3 FB 78 */ mr r3, r31 -/* 801FD724 4B E1 1A A9 */ bl mDoExt_setCurrentHeap__FP7JKRHeap -/* 801FD728 38 60 00 00 */ li r3, 0 -/* 801FD72C 48 00 00 FC */ b lbl_801FD828 -lbl_801FD730: -/* 801FD730 7F C3 F3 78 */ mr r3, r30 -/* 801FD734 4B FF EE 9D */ bl dMw_save_delete__5dMw_cFv -/* 801FD738 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801FD73C 40 82 00 14 */ bne lbl_801FD750 -/* 801FD740 7F E3 FB 78 */ mr r3, r31 -/* 801FD744 4B E1 1A 89 */ bl mDoExt_setCurrentHeap__FP7JKRHeap -/* 801FD748 38 60 00 00 */ li r3, 0 -/* 801FD74C 48 00 00 DC */ b lbl_801FD828 -lbl_801FD750: -/* 801FD750 7F C3 F3 78 */ mr r3, r30 -/* 801FD754 4B FF EF B9 */ bl dMw_option_delete__5dMw_cFv -/* 801FD758 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801FD75C 40 82 00 14 */ bne lbl_801FD770 -/* 801FD760 7F E3 FB 78 */ mr r3, r31 -/* 801FD764 4B E1 1A 69 */ bl mDoExt_setCurrentHeap__FP7JKRHeap -/* 801FD768 38 60 00 00 */ li r3, 0 -/* 801FD76C 48 00 00 BC */ b lbl_801FD828 -lbl_801FD770: -/* 801FD770 7F C3 F3 78 */ mr r3, r30 -/* 801FD774 4B FF F0 E9 */ bl dMw_letter_delete__5dMw_cFv -/* 801FD778 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801FD77C 40 82 00 14 */ bne lbl_801FD790 -/* 801FD780 7F E3 FB 78 */ mr r3, r31 -/* 801FD784 4B E1 1A 49 */ bl mDoExt_setCurrentHeap__FP7JKRHeap -/* 801FD788 38 60 00 00 */ li r3, 0 -/* 801FD78C 48 00 00 9C */ b lbl_801FD828 -lbl_801FD790: -/* 801FD790 7F C3 F3 78 */ mr r3, r30 -/* 801FD794 4B FF F2 11 */ bl dMw_fishing_delete__5dMw_cFv -/* 801FD798 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801FD79C 40 82 00 14 */ bne lbl_801FD7B0 -/* 801FD7A0 7F E3 FB 78 */ mr r3, r31 -/* 801FD7A4 4B E1 1A 29 */ bl mDoExt_setCurrentHeap__FP7JKRHeap -/* 801FD7A8 38 60 00 00 */ li r3, 0 -/* 801FD7AC 48 00 00 7C */ b lbl_801FD828 -lbl_801FD7B0: -/* 801FD7B0 7F C3 F3 78 */ mr r3, r30 -/* 801FD7B4 4B FF F3 39 */ bl dMw_skill_delete__5dMw_cFv -/* 801FD7B8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801FD7BC 40 82 00 14 */ bne lbl_801FD7D0 -/* 801FD7C0 7F E3 FB 78 */ mr r3, r31 -/* 801FD7C4 4B E1 1A 09 */ bl mDoExt_setCurrentHeap__FP7JKRHeap -/* 801FD7C8 38 60 00 00 */ li r3, 0 -/* 801FD7CC 48 00 00 5C */ b lbl_801FD828 -lbl_801FD7D0: -/* 801FD7D0 7F C3 F3 78 */ mr r3, r30 -/* 801FD7D4 4B FF F4 71 */ bl dMw_insect_delete__5dMw_cFv -/* 801FD7D8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801FD7DC 40 82 00 14 */ bne lbl_801FD7F0 -/* 801FD7E0 7F E3 FB 78 */ mr r3, r31 -/* 801FD7E4 4B E1 19 E9 */ bl mDoExt_setCurrentHeap__FP7JKRHeap -/* 801FD7E8 38 60 00 00 */ li r3, 0 -/* 801FD7EC 48 00 00 3C */ b lbl_801FD828 -lbl_801FD7F0: -/* 801FD7F0 7F C3 F3 78 */ mr r3, r30 -/* 801FD7F4 4B FF E7 6D */ bl dMw_ring_delete__5dMw_cFv -/* 801FD7F8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801FD7FC 40 82 00 14 */ bne lbl_801FD810 -/* 801FD800 7F E3 FB 78 */ mr r3, r31 -/* 801FD804 4B E1 19 C9 */ bl mDoExt_setCurrentHeap__FP7JKRHeap -/* 801FD808 38 60 00 00 */ li r3, 0 -/* 801FD80C 48 00 00 1C */ b lbl_801FD828 -lbl_801FD810: -/* 801FD810 7F C3 F3 78 */ mr r3, r30 -/* 801FD814 4B FF E6 01 */ bl dMw_capture_delete__5dMw_cFv -/* 801FD818 7F E3 FB 78 */ mr r3, r31 -/* 801FD81C 4B E1 19 B1 */ bl mDoExt_setCurrentHeap__FP7JKRHeap -/* 801FD820 4B E1 72 0D */ bl mDoExt_removeMesgFont__Fv -/* 801FD824 38 60 00 01 */ li r3, 1 -lbl_801FD828: -/* 801FD828 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FD82C 83 C1 00 08 */ lwz r30, 8(r1) -/* 801FD830 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FD834 7C 08 03 A6 */ mtlr r0 -/* 801FD838 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FD83C 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/_draw__5dMw_cFv.s b/asm/d/menu/d_menu_window/_draw__5dMw_cFv.s deleted file mode 100644 index 9571d75f4a9..00000000000 --- a/asm/d/menu/d_menu_window/_draw__5dMw_cFv.s +++ /dev/null @@ -1,152 +0,0 @@ -lbl_801FD450: -/* 801FD450 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801FD454 7C 08 02 A6 */ mflr r0 -/* 801FD458 90 01 00 24 */ stw r0, 0x24(r1) -/* 801FD45C 39 61 00 20 */ addi r11, r1, 0x20 -/* 801FD460 48 16 4D 79 */ bl _savegpr_28 -/* 801FD464 7C 7F 1B 78 */ mr r31, r3 -/* 801FD468 80 C3 01 0C */ lwz r6, 0x10c(r3) -/* 801FD46C 28 06 00 00 */ cmplwi r6, 0 -/* 801FD470 41 82 00 5C */ beq lbl_801FD4CC -/* 801FD474 88 06 00 04 */ lbz r0, 4(r6) -/* 801FD478 28 00 00 00 */ cmplwi r0, 0 -/* 801FD47C 41 82 00 50 */ beq lbl_801FD4CC -/* 801FD480 88 06 00 05 */ lbz r0, 5(r6) -/* 801FD484 28 00 00 00 */ cmplwi r0, 0 -/* 801FD488 41 82 00 44 */ beq lbl_801FD4CC -/* 801FD48C 88 06 00 06 */ lbz r0, 6(r6) -/* 801FD490 28 00 00 00 */ cmplwi r0, 0 -/* 801FD494 41 82 00 20 */ beq lbl_801FD4B4 -/* 801FD498 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801FD49C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801FD4A0 38 63 5F 64 */ addi r3, r3, 0x5f64 -/* 801FD4A4 38 83 00 AC */ addi r4, r3, 0xac -/* 801FD4A8 38 A3 00 B0 */ addi r5, r3, 0xb0 -/* 801FD4AC 4B E5 92 E9 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c -/* 801FD4B0 48 00 00 1C */ b lbl_801FD4CC -lbl_801FD4B4: -/* 801FD4B4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801FD4B8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801FD4BC 38 63 5F 64 */ addi r3, r3, 0x5f64 -/* 801FD4C0 38 83 01 B4 */ addi r4, r3, 0x1b4 -/* 801FD4C4 38 A3 01 B8 */ addi r5, r3, 0x1b8 -/* 801FD4C8 4B E5 92 CD */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c -lbl_801FD4CC: -/* 801FD4CC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801FD4D0 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801FD4D4 88 04 5E B5 */ lbz r0, 0x5eb5(r4) -/* 801FD4D8 28 00 00 01 */ cmplwi r0, 1 -/* 801FD4DC 40 82 01 84 */ bne lbl_801FD660 -/* 801FD4E0 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801FD4E4 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801FD4E8 88 03 00 B9 */ lbz r0, 0xb9(r3) -/* 801FD4EC 28 00 00 03 */ cmplwi r0, 3 -/* 801FD4F0 40 82 00 18 */ bne lbl_801FD508 -/* 801FD4F4 80 7F 01 14 */ lwz r3, 0x114(r31) -/* 801FD4F8 28 03 00 00 */ cmplwi r3, 0 -/* 801FD4FC 41 82 01 64 */ beq lbl_801FD660 -/* 801FD500 4B FB A5 C1 */ bl draw__15dMenu_Collect_cFv -/* 801FD504 48 00 01 5C */ b lbl_801FD660 -lbl_801FD508: -/* 801FD508 28 00 00 04 */ cmplwi r0, 4 -/* 801FD50C 40 82 00 18 */ bne lbl_801FD524 -/* 801FD510 80 7F 01 1C */ lwz r3, 0x11c(r31) -/* 801FD514 28 03 00 00 */ cmplwi r3, 0 -/* 801FD518 41 82 01 48 */ beq lbl_801FD660 -/* 801FD51C 4B FC A1 35 */ bl _draw__12dMenu_Fmap_cFv -/* 801FD520 48 00 01 40 */ b lbl_801FD660 -lbl_801FD524: -/* 801FD524 28 00 00 05 */ cmplwi r0, 5 -/* 801FD528 40 82 00 18 */ bne lbl_801FD540 -/* 801FD52C 80 7F 01 18 */ lwz r3, 0x118(r31) -/* 801FD530 28 03 00 00 */ cmplwi r3, 0 -/* 801FD534 41 82 01 2C */ beq lbl_801FD660 -/* 801FD538 4B FC 12 A9 */ bl _draw__12dMenu_Dmap_cFv -/* 801FD53C 48 00 01 24 */ b lbl_801FD660 -lbl_801FD540: -/* 801FD540 28 00 00 0A */ cmplwi r0, 0xa -/* 801FD544 40 82 00 CC */ bne lbl_801FD610 -/* 801FD548 80 7F 01 20 */ lwz r3, 0x120(r31) -/* 801FD54C 28 03 00 00 */ cmplwi r3, 0 -/* 801FD550 41 82 00 08 */ beq lbl_801FD558 -/* 801FD554 4B FF 94 A9 */ bl _draw2__12dMenu_save_cFv -lbl_801FD558: -/* 801FD558 80 DF 01 24 */ lwz r6, 0x124(r31) -/* 801FD55C 28 06 00 00 */ cmplwi r6, 0 -/* 801FD560 41 82 00 1C */ beq lbl_801FD57C -/* 801FD564 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801FD568 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801FD56C 38 63 5F 64 */ addi r3, r3, 0x5f64 -/* 801FD570 38 83 01 B4 */ addi r4, r3, 0x1b4 -/* 801FD574 38 A3 01 B8 */ addi r5, r3, 0x1b8 -/* 801FD578 4B E5 92 1D */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c -lbl_801FD57C: -/* 801FD57C 80 DF 01 28 */ lwz r6, 0x128(r31) -/* 801FD580 28 06 00 00 */ cmplwi r6, 0 -/* 801FD584 41 82 00 1C */ beq lbl_801FD5A0 -/* 801FD588 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801FD58C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801FD590 38 63 5F 64 */ addi r3, r3, 0x5f64 -/* 801FD594 38 83 01 B4 */ addi r4, r3, 0x1b4 -/* 801FD598 38 A3 01 B8 */ addi r5, r3, 0x1b8 -/* 801FD59C 4B E5 91 F9 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c -lbl_801FD5A0: -/* 801FD5A0 80 DF 01 2C */ lwz r6, 0x12c(r31) -/* 801FD5A4 28 06 00 00 */ cmplwi r6, 0 -/* 801FD5A8 41 82 00 1C */ beq lbl_801FD5C4 -/* 801FD5AC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801FD5B0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801FD5B4 38 63 5F 64 */ addi r3, r3, 0x5f64 -/* 801FD5B8 38 83 01 B4 */ addi r4, r3, 0x1b4 -/* 801FD5BC 38 A3 01 B8 */ addi r5, r3, 0x1b8 -/* 801FD5C0 4B E5 91 D5 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c -lbl_801FD5C4: -/* 801FD5C4 80 DF 01 30 */ lwz r6, 0x130(r31) -/* 801FD5C8 28 06 00 00 */ cmplwi r6, 0 -/* 801FD5CC 41 82 00 1C */ beq lbl_801FD5E8 -/* 801FD5D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801FD5D4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801FD5D8 38 63 5F 64 */ addi r3, r3, 0x5f64 -/* 801FD5DC 38 83 01 B4 */ addi r4, r3, 0x1b4 -/* 801FD5E0 38 A3 01 B8 */ addi r5, r3, 0x1b8 -/* 801FD5E4 4B E5 91 B1 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c -lbl_801FD5E8: -/* 801FD5E8 80 DF 01 34 */ lwz r6, 0x134(r31) -/* 801FD5EC 28 06 00 00 */ cmplwi r6, 0 -/* 801FD5F0 41 82 00 70 */ beq lbl_801FD660 -/* 801FD5F4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801FD5F8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801FD5FC 38 63 5F 64 */ addi r3, r3, 0x5f64 -/* 801FD600 38 83 01 B4 */ addi r4, r3, 0x1b4 -/* 801FD604 38 A3 01 B8 */ addi r5, r3, 0x1b8 -/* 801FD608 4B E5 91 8D */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c -/* 801FD60C 48 00 00 54 */ b lbl_801FD660 -lbl_801FD610: -/* 801FD610 28 00 00 02 */ cmplwi r0, 2 -/* 801FD614 40 82 00 4C */ bne lbl_801FD660 -/* 801FD618 80 7F 01 10 */ lwz r3, 0x110(r31) -/* 801FD61C 28 03 00 00 */ cmplwi r3, 0 -/* 801FD620 41 82 00 40 */ beq lbl_801FD660 -/* 801FD624 38 00 00 00 */ li r0, 0 -/* 801FD628 98 03 06 BD */ stb r0, 0x6bd(r3) -/* 801FD62C 3B C4 5F 64 */ addi r30, r4, 0x5f64 -/* 801FD630 7F C3 F3 78 */ mr r3, r30 -/* 801FD634 3B 9E 01 B4 */ addi r28, r30, 0x1b4 -/* 801FD638 7F 84 E3 78 */ mr r4, r28 -/* 801FD63C 3B BE 01 B8 */ addi r29, r30, 0x1b8 -/* 801FD640 7F A5 EB 78 */ mr r5, r29 -/* 801FD644 80 DF 01 10 */ lwz r6, 0x110(r31) -/* 801FD648 4B E5 91 4D */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c -/* 801FD64C 7F C3 F3 78 */ mr r3, r30 -/* 801FD650 7F 84 E3 78 */ mr r4, r28 -/* 801FD654 7F A5 EB 78 */ mr r5, r29 -/* 801FD658 80 DF 01 10 */ lwz r6, 0x110(r31) -/* 801FD65C 4B E5 91 39 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c -lbl_801FD660: -/* 801FD660 38 60 00 01 */ li r3, 1 -/* 801FD664 39 61 00 20 */ addi r11, r1, 0x20 -/* 801FD668 48 16 4B BD */ bl _restgpr_28 -/* 801FD66C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801FD670 7C 08 03 A6 */ mtlr r0 -/* 801FD674 38 21 00 20 */ addi r1, r1, 0x20 -/* 801FD678 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/checkCStickTrigger__5dMw_cFv.s b/asm/d/menu/d_menu_window/checkCStickTrigger__5dMw_cFv.s deleted file mode 100644 index 16536d34e64..00000000000 --- a/asm/d/menu/d_menu_window/checkCStickTrigger__5dMw_cFv.s +++ /dev/null @@ -1,43 +0,0 @@ -lbl_801FCEE8: -/* 801FCEE8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FCEEC 7C 08 02 A6 */ mflr r0 -/* 801FCEF0 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FCEF4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FCEF8 7C 7F 1B 78 */ mr r31, r3 -/* 801FCEFC 38 00 00 00 */ li r0, 0 -/* 801FCF00 98 03 01 4A */ stb r0, 0x14a(r3) -/* 801FCF04 88 03 01 49 */ lbz r0, 0x149(r3) -/* 801FCF08 28 00 00 00 */ cmplwi r0, 0 -/* 801FCF0C 40 82 00 38 */ bne lbl_801FCF44 -/* 801FCF10 80 7F 01 08 */ lwz r3, 0x108(r31) -/* 801FCF14 81 83 00 00 */ lwz r12, 0(r3) -/* 801FCF18 81 8C 00 08 */ lwz r12, 8(r12) -/* 801FCF1C 7D 89 03 A6 */ mtctr r12 -/* 801FCF20 4E 80 04 21 */ bctrl -/* 801FCF24 C0 02 AA CC */ lfs f0, lit_6000(r2) -/* 801FCF28 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 801FCF2C 40 81 00 40 */ ble lbl_801FCF6C -/* 801FCF30 38 00 00 01 */ li r0, 1 -/* 801FCF34 98 1F 01 49 */ stb r0, 0x149(r31) -/* 801FCF38 98 1F 01 4A */ stb r0, 0x14a(r31) -/* 801FCF3C 38 60 00 01 */ li r3, 1 -/* 801FCF40 48 00 00 30 */ b lbl_801FCF70 -lbl_801FCF44: -/* 801FCF44 80 7F 01 08 */ lwz r3, 0x108(r31) -/* 801FCF48 81 83 00 00 */ lwz r12, 0(r3) -/* 801FCF4C 81 8C 00 08 */ lwz r12, 8(r12) -/* 801FCF50 7D 89 03 A6 */ mtctr r12 -/* 801FCF54 4E 80 04 21 */ bctrl -/* 801FCF58 C0 02 AA D0 */ lfs f0, lit_6001(r2) -/* 801FCF5C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 801FCF60 40 80 00 0C */ bge lbl_801FCF6C -/* 801FCF64 38 00 00 00 */ li r0, 0 -/* 801FCF68 98 1F 01 49 */ stb r0, 0x149(r31) -lbl_801FCF6C: -/* 801FCF6C 38 60 00 00 */ li r3, 0 -lbl_801FCF70: -/* 801FCF70 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FCF74 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FCF78 7C 08 03 A6 */ mtlr r0 -/* 801FCF7C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FCF80 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/checkMemSize__5dMw_cFv.s b/asm/d/menu/d_menu_window/checkMemSize__5dMw_cFv.s deleted file mode 100644 index 5e5b0fdce7b..00000000000 --- a/asm/d/menu/d_menu_window/checkMemSize__5dMw_cFv.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_801FD0D4: -/* 801FD0D4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FD0D8 7C 08 02 A6 */ mflr r0 -/* 801FD0DC 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FD0E0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FD0E4 7C 7F 1B 78 */ mr r31, r3 -/* 801FD0E8 80 03 01 38 */ lwz r0, 0x138(r3) -/* 801FD0EC 2C 00 00 00 */ cmpwi r0, 0 -/* 801FD0F0 40 81 00 3C */ ble lbl_801FD12C -/* 801FD0F4 80 7F 01 00 */ lwz r3, 0x100(r31) -/* 801FD0F8 48 0D 16 8D */ bl getTotalFreeSize__7JKRHeapFv -/* 801FD0FC 80 1F 01 38 */ lwz r0, 0x138(r31) -/* 801FD100 7C 00 18 51 */ subf. r0, r0, r3 -/* 801FD104 40 80 00 08 */ bge lbl_801FD10C -/* 801FD108 1C 00 FF FF */ mulli r0, r0, -1 -lbl_801FD10C: -/* 801FD10C 2C 00 00 20 */ cmpwi r0, 0x20 -/* 801FD110 40 81 00 14 */ ble lbl_801FD124 -/* 801FD114 3C 60 80 39 */ lis r3, d_menu_d_menu_window__stringBase0@ha /* 0x80397E38@ha */ -/* 801FD118 38 63 7E 38 */ addi r3, r3, d_menu_d_menu_window__stringBase0@l /* 0x80397E38@l */ -/* 801FD11C 4C C6 31 82 */ crclr 6 -/* 801FD120 4B E0 9A ED */ bl OSReport_Error -lbl_801FD124: -/* 801FD124 38 00 00 00 */ li r0, 0 -/* 801FD128 90 1F 01 38 */ stw r0, 0x138(r31) -lbl_801FD12C: -/* 801FD12C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FD130 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FD134 7C 08 03 A6 */ mtlr r0 -/* 801FD138 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FD13C 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/collect_close_init__5dMw_cFUc.s b/asm/d/menu/d_menu_window/collect_close_init__5dMw_cFUc.s deleted file mode 100644 index 66879e2a416..00000000000 --- a/asm/d/menu/d_menu_window/collect_close_init__5dMw_cFUc.s +++ /dev/null @@ -1,55 +0,0 @@ -lbl_801FA46C: -/* 801FA46C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FA470 7C 08 02 A6 */ mflr r0 -/* 801FA474 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FA478 80 63 01 14 */ lwz r3, 0x114(r3) -/* 801FA47C 80 63 00 04 */ lwz r3, 4(r3) -/* 801FA480 88 03 02 5E */ lbz r0, 0x25e(r3) -/* 801FA484 28 00 00 01 */ cmplwi r0, 1 -/* 801FA488 41 82 00 9C */ beq lbl_801FA524 -/* 801FA48C 28 00 00 02 */ cmplwi r0, 2 -/* 801FA490 41 82 00 94 */ beq lbl_801FA524 -/* 801FA494 28 00 00 03 */ cmplwi r0, 3 -/* 801FA498 41 82 00 1C */ beq lbl_801FA4B4 -/* 801FA49C 28 00 00 04 */ cmplwi r0, 4 -/* 801FA4A0 41 82 00 14 */ beq lbl_801FA4B4 -/* 801FA4A4 28 00 00 05 */ cmplwi r0, 5 -/* 801FA4A8 41 82 00 0C */ beq lbl_801FA4B4 -/* 801FA4AC 28 00 00 06 */ cmplwi r0, 6 -/* 801FA4B0 40 82 00 3C */ bne lbl_801FA4EC -lbl_801FA4B4: -/* 801FA4B4 38 00 00 A4 */ li r0, 0xa4 -/* 801FA4B8 90 01 00 0C */ stw r0, 0xc(r1) -/* 801FA4BC 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801FA4C0 38 81 00 0C */ addi r4, r1, 0xc -/* 801FA4C4 38 A0 00 00 */ li r5, 0 -/* 801FA4C8 38 C0 00 00 */ li r6, 0 -/* 801FA4CC 38 E0 00 00 */ li r7, 0 -/* 801FA4D0 C0 22 AA C4 */ lfs f1, lit_4386(r2) -/* 801FA4D4 FC 40 08 90 */ fmr f2, f1 -/* 801FA4D8 C0 62 AA C8 */ lfs f3, lit_4387(r2) -/* 801FA4DC FC 80 18 90 */ fmr f4, f3 -/* 801FA4E0 39 00 00 00 */ li r8, 0 -/* 801FA4E4 48 0B 14 A1 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801FA4E8 48 00 00 3C */ b lbl_801FA524 -lbl_801FA4EC: -/* 801FA4EC 38 00 00 5C */ li r0, 0x5c -/* 801FA4F0 90 01 00 08 */ stw r0, 8(r1) -/* 801FA4F4 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801FA4F8 38 81 00 08 */ addi r4, r1, 8 -/* 801FA4FC 38 A0 00 00 */ li r5, 0 -/* 801FA500 38 C0 00 00 */ li r6, 0 -/* 801FA504 38 E0 00 00 */ li r7, 0 -/* 801FA508 C0 22 AA C4 */ lfs f1, lit_4386(r2) -/* 801FA50C FC 40 08 90 */ fmr f2, f1 -/* 801FA510 C0 62 AA C8 */ lfs f3, lit_4387(r2) -/* 801FA514 FC 80 18 90 */ fmr f4, f3 -/* 801FA518 39 00 00 00 */ li r8, 0 -/* 801FA51C 48 0B 14 69 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801FA520 48 02 44 B5 */ bl dMeter2Info_set2DVibrationM__Fv -lbl_801FA524: -/* 801FA524 48 00 28 E5 */ bl dMw_fade_out__5dMw_cFv -/* 801FA528 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FA52C 7C 08 03 A6 */ mtlr r0 -/* 801FA530 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FA534 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/collect_close_proc__5dMw_cFv.s b/asm/d/menu/d_menu_window/collect_close_proc__5dMw_cFv.s deleted file mode 100644 index c06b90fb281..00000000000 --- a/asm/d/menu/d_menu_window/collect_close_proc__5dMw_cFv.s +++ /dev/null @@ -1,47 +0,0 @@ -lbl_801FB1A0: -/* 801FB1A0 80 8D 86 48 */ lwz r4, mFader__13mDoGph_gInf_c(r13) -/* 801FB1A4 80 04 00 04 */ lwz r0, 4(r4) -/* 801FB1A8 2C 00 00 00 */ cmpwi r0, 0 -/* 801FB1AC 4C 82 00 20 */ bnelr -/* 801FB1B0 80 83 01 14 */ lwz r4, 0x114(r3) -/* 801FB1B4 80 84 00 04 */ lwz r4, 4(r4) -/* 801FB1B8 88 04 02 5E */ lbz r0, 0x25e(r4) -/* 801FB1BC 28 00 00 01 */ cmplwi r0, 1 -/* 801FB1C0 40 82 00 10 */ bne lbl_801FB1D0 -/* 801FB1C4 38 00 00 0D */ li r0, 0xd -/* 801FB1C8 98 03 01 46 */ stb r0, 0x146(r3) -/* 801FB1CC 4E 80 00 20 */ blr -lbl_801FB1D0: -/* 801FB1D0 28 00 00 02 */ cmplwi r0, 2 -/* 801FB1D4 40 82 00 10 */ bne lbl_801FB1E4 -/* 801FB1D8 38 00 00 10 */ li r0, 0x10 -/* 801FB1DC 98 03 01 46 */ stb r0, 0x146(r3) -/* 801FB1E0 4E 80 00 20 */ blr -lbl_801FB1E4: -/* 801FB1E4 28 00 00 03 */ cmplwi r0, 3 -/* 801FB1E8 40 82 00 10 */ bne lbl_801FB1F8 -/* 801FB1EC 38 00 00 13 */ li r0, 0x13 -/* 801FB1F0 98 03 01 46 */ stb r0, 0x146(r3) -/* 801FB1F4 4E 80 00 20 */ blr -lbl_801FB1F8: -/* 801FB1F8 28 00 00 04 */ cmplwi r0, 4 -/* 801FB1FC 40 82 00 10 */ bne lbl_801FB20C -/* 801FB200 38 00 00 16 */ li r0, 0x16 -/* 801FB204 98 03 01 46 */ stb r0, 0x146(r3) -/* 801FB208 4E 80 00 20 */ blr -lbl_801FB20C: -/* 801FB20C 28 00 00 05 */ cmplwi r0, 5 -/* 801FB210 40 82 00 10 */ bne lbl_801FB220 -/* 801FB214 38 00 00 19 */ li r0, 0x19 -/* 801FB218 98 03 01 46 */ stb r0, 0x146(r3) -/* 801FB21C 4E 80 00 20 */ blr -lbl_801FB220: -/* 801FB220 28 00 00 06 */ cmplwi r0, 6 -/* 801FB224 40 82 00 10 */ bne lbl_801FB234 -/* 801FB228 38 00 00 1C */ li r0, 0x1c -/* 801FB22C 98 03 01 46 */ stb r0, 0x146(r3) -/* 801FB230 4E 80 00 20 */ blr -lbl_801FB234: -/* 801FB234 38 00 00 00 */ li r0, 0 -/* 801FB238 98 03 01 46 */ stb r0, 0x146(r3) -/* 801FB23C 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/collect_fishing_close_init__5dMw_cFUc.s b/asm/d/menu/d_menu_window/collect_fishing_close_init__5dMw_cFUc.s deleted file mode 100644 index d6537c6cfa7..00000000000 --- a/asm/d/menu/d_menu_window/collect_fishing_close_init__5dMw_cFUc.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_801FA798: -/* 801FA798 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FA79C 7C 08 02 A6 */ mflr r0 -/* 801FA7A0 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FA7A4 38 00 00 A5 */ li r0, 0xa5 -/* 801FA7A8 90 01 00 08 */ stw r0, 8(r1) -/* 801FA7AC 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801FA7B0 38 81 00 08 */ addi r4, r1, 8 -/* 801FA7B4 38 A0 00 00 */ li r5, 0 -/* 801FA7B8 38 C0 00 00 */ li r6, 0 -/* 801FA7BC 38 E0 00 00 */ li r7, 0 -/* 801FA7C0 C0 22 AA C4 */ lfs f1, lit_4386(r2) -/* 801FA7C4 FC 40 08 90 */ fmr f2, f1 -/* 801FA7C8 C0 62 AA C8 */ lfs f3, lit_4387(r2) -/* 801FA7CC FC 80 18 90 */ fmr f4, f3 -/* 801FA7D0 39 00 00 00 */ li r8, 0 -/* 801FA7D4 48 0B 11 B1 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801FA7D8 48 02 41 F9 */ bl dMeter2Info_set2DVibration__Fv -/* 801FA7DC 48 00 26 2D */ bl dMw_fade_out__5dMw_cFv -/* 801FA7E0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FA7E4 7C 08 03 A6 */ mtlr r0 -/* 801FA7E8 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FA7EC 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/collect_fishing_close_proc__5dMw_cFv.s b/asm/d/menu/d_menu_window/collect_fishing_close_proc__5dMw_cFv.s deleted file mode 100644 index 28d2cd55e30..00000000000 --- a/asm/d/menu/d_menu_window/collect_fishing_close_proc__5dMw_cFv.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_801FBA00: -/* 801FBA00 80 8D 86 48 */ lwz r4, mFader__13mDoGph_gInf_c(r13) -/* 801FBA04 80 04 00 04 */ lwz r0, 4(r4) -/* 801FBA08 2C 00 00 00 */ cmpwi r0, 0 -/* 801FBA0C 4C 82 00 20 */ bnelr -/* 801FBA10 38 00 00 05 */ li r0, 5 -/* 801FBA14 98 03 01 46 */ stb r0, 0x146(r3) -/* 801FBA18 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/collect_fishing_move_proc__5dMw_cFv.s b/asm/d/menu/d_menu_window/collect_fishing_move_proc__5dMw_cFv.s deleted file mode 100644 index 75f9f3b646f..00000000000 --- a/asm/d/menu/d_menu_window/collect_fishing_move_proc__5dMw_cFv.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_801FB9AC: -/* 801FB9AC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FB9B0 7C 08 02 A6 */ mflr r0 -/* 801FB9B4 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FB9B8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FB9BC 7C 7F 1B 78 */ mr r31, r3 -/* 801FB9C0 80 63 01 2C */ lwz r3, 0x12c(r3) -/* 801FB9C4 88 03 01 FA */ lbz r0, 0x1fa(r3) -/* 801FB9C8 28 00 00 02 */ cmplwi r0, 2 -/* 801FB9CC 40 82 00 08 */ bne lbl_801FB9D4 -/* 801FB9D0 4B FC 96 E5 */ bl _move__15dMenu_Fishing_cFv -lbl_801FB9D4: -/* 801FB9D4 80 7F 01 2C */ lwz r3, 0x12c(r31) -/* 801FB9D8 88 03 01 FA */ lbz r0, 0x1fa(r3) -/* 801FB9DC 28 00 00 03 */ cmplwi r0, 3 -/* 801FB9E0 40 82 00 0C */ bne lbl_801FB9EC -/* 801FB9E4 38 00 00 18 */ li r0, 0x18 -/* 801FB9E8 98 1F 01 46 */ stb r0, 0x146(r31) -lbl_801FB9EC: -/* 801FB9EC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FB9F0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FB9F4 7C 08 03 A6 */ mtlr r0 -/* 801FB9F8 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FB9FC 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/collect_fishing_open_init__5dMw_cFUc.s b/asm/d/menu/d_menu_window/collect_fishing_open_init__5dMw_cFUc.s deleted file mode 100644 index 69bae984c92..00000000000 --- a/asm/d/menu/d_menu_window/collect_fishing_open_init__5dMw_cFUc.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_801FA738: -/* 801FA738 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FA73C 7C 08 02 A6 */ mflr r0 -/* 801FA740 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FA744 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FA748 7C 7F 1B 78 */ mr r31, r3 -/* 801FA74C 38 A0 00 0A */ li r5, 0xa -/* 801FA750 98 A3 01 44 */ stb r5, 0x144(r3) -/* 801FA754 3C 80 80 43 */ lis r4, g_meter2_info@ha /* 0x80430188@ha */ -/* 801FA758 38 84 01 88 */ addi r4, r4, g_meter2_info@l /* 0x80430188@l */ -/* 801FA75C 88 04 00 B9 */ lbz r0, 0xb9(r4) -/* 801FA760 98 04 00 BA */ stb r0, 0xba(r4) -/* 801FA764 98 A4 00 B9 */ stb r5, 0xb9(r4) -/* 801FA768 38 00 00 00 */ li r0, 0 -/* 801FA76C 98 03 01 52 */ stb r0, 0x152(r3) -/* 801FA770 38 80 00 01 */ li r4, 1 -/* 801FA774 48 00 19 1D */ bl dMw_collect_delete__5dMw_cFb -/* 801FA778 7F E3 FB 78 */ mr r3, r31 -/* 801FA77C 48 00 21 89 */ bl dMw_fishing_create__5dMw_cFv -/* 801FA780 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FA784 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FA788 7C 08 03 A6 */ mtlr r0 -/* 801FA78C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FA790 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/collect_fishing_open_proc__5dMw_cFv.s b/asm/d/menu/d_menu_window/collect_fishing_open_proc__5dMw_cFv.s deleted file mode 100644 index 59e0769f372..00000000000 --- a/asm/d/menu/d_menu_window/collect_fishing_open_proc__5dMw_cFv.s +++ /dev/null @@ -1,39 +0,0 @@ -lbl_801FB91C: -/* 801FB91C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FB920 7C 08 02 A6 */ mflr r0 -/* 801FB924 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FB928 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FB92C 7C 7F 1B 78 */ mr r31, r3 -/* 801FB930 80 63 01 2C */ lwz r3, 0x12c(r3) -/* 801FB934 88 03 01 FA */ lbz r0, 0x1fa(r3) -/* 801FB938 28 00 00 01 */ cmplwi r0, 1 -/* 801FB93C 40 82 00 30 */ bne lbl_801FB96C -/* 801FB940 4B FC 99 A5 */ bl _open__15dMenu_Fishing_cFv -/* 801FB944 88 1F 01 52 */ lbz r0, 0x152(r31) -/* 801FB948 28 00 00 00 */ cmplwi r0, 0 -/* 801FB94C 40 82 00 20 */ bne lbl_801FB96C -/* 801FB950 80 7F 01 2C */ lwz r3, 0x12c(r31) -/* 801FB954 4B FC 98 B1 */ bl isSync__15dMenu_Fishing_cFv -/* 801FB958 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801FB95C 41 82 00 10 */ beq lbl_801FB96C -/* 801FB960 48 00 15 19 */ bl dMw_fade_in__5dMw_cFv -/* 801FB964 38 00 00 01 */ li r0, 1 -/* 801FB968 98 1F 01 52 */ stb r0, 0x152(r31) -lbl_801FB96C: -/* 801FB96C 80 7F 01 2C */ lwz r3, 0x12c(r31) -/* 801FB970 88 03 01 FA */ lbz r0, 0x1fa(r3) -/* 801FB974 28 00 00 02 */ cmplwi r0, 2 -/* 801FB978 40 82 00 20 */ bne lbl_801FB998 -/* 801FB97C 88 1F 01 52 */ lbz r0, 0x152(r31) -/* 801FB980 28 00 00 01 */ cmplwi r0, 1 -/* 801FB984 40 82 00 14 */ bne lbl_801FB998 -/* 801FB988 38 00 00 17 */ li r0, 0x17 -/* 801FB98C 98 1F 01 46 */ stb r0, 0x146(r31) -/* 801FB990 38 00 00 00 */ li r0, 0 -/* 801FB994 98 1F 01 52 */ stb r0, 0x152(r31) -lbl_801FB998: -/* 801FB998 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FB99C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FB9A0 7C 08 03 A6 */ mtlr r0 -/* 801FB9A4 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FB9A8 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/collect_insect_close_init__5dMw_cFUc.s b/asm/d/menu/d_menu_window/collect_insect_close_init__5dMw_cFUc.s deleted file mode 100644 index 4769caa0d93..00000000000 --- a/asm/d/menu/d_menu_window/collect_insect_close_init__5dMw_cFUc.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_801FA90C: -/* 801FA90C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FA910 7C 08 02 A6 */ mflr r0 -/* 801FA914 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FA918 38 00 00 A5 */ li r0, 0xa5 -/* 801FA91C 90 01 00 08 */ stw r0, 8(r1) -/* 801FA920 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801FA924 38 81 00 08 */ addi r4, r1, 8 -/* 801FA928 38 A0 00 00 */ li r5, 0 -/* 801FA92C 38 C0 00 00 */ li r6, 0 -/* 801FA930 38 E0 00 00 */ li r7, 0 -/* 801FA934 C0 22 AA C4 */ lfs f1, lit_4386(r2) -/* 801FA938 FC 40 08 90 */ fmr f2, f1 -/* 801FA93C C0 62 AA C8 */ lfs f3, lit_4387(r2) -/* 801FA940 FC 80 18 90 */ fmr f4, f3 -/* 801FA944 39 00 00 00 */ li r8, 0 -/* 801FA948 48 0B 10 3D */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801FA94C 48 02 40 85 */ bl dMeter2Info_set2DVibration__Fv -/* 801FA950 48 00 24 B9 */ bl dMw_fade_out__5dMw_cFv -/* 801FA954 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FA958 7C 08 03 A6 */ mtlr r0 -/* 801FA95C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FA960 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/collect_insect_close_proc__5dMw_cFv.s b/asm/d/menu/d_menu_window/collect_insect_close_proc__5dMw_cFv.s deleted file mode 100644 index baaea5e792c..00000000000 --- a/asm/d/menu/d_menu_window/collect_insect_close_proc__5dMw_cFv.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_801FBC00: -/* 801FBC00 80 8D 86 48 */ lwz r4, mFader__13mDoGph_gInf_c(r13) -/* 801FBC04 80 04 00 04 */ lwz r0, 4(r4) -/* 801FBC08 2C 00 00 00 */ cmpwi r0, 0 -/* 801FBC0C 4C 82 00 20 */ bnelr -/* 801FBC10 38 00 00 05 */ li r0, 5 -/* 801FBC14 98 03 01 46 */ stb r0, 0x146(r3) -/* 801FBC18 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/collect_insect_move_proc__5dMw_cFv.s b/asm/d/menu/d_menu_window/collect_insect_move_proc__5dMw_cFv.s deleted file mode 100644 index baea21ec507..00000000000 --- a/asm/d/menu/d_menu_window/collect_insect_move_proc__5dMw_cFv.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_801FBBAC: -/* 801FBBAC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FBBB0 7C 08 02 A6 */ mflr r0 -/* 801FBBB4 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FBBB8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FBBBC 7C 7F 1B 78 */ mr r31, r3 -/* 801FBBC0 80 63 01 34 */ lwz r3, 0x134(r3) -/* 801FBBC4 88 03 00 F2 */ lbz r0, 0xf2(r3) -/* 801FBBC8 28 00 00 02 */ cmplwi r0, 2 -/* 801FBBCC 40 82 00 08 */ bne lbl_801FBBD4 -/* 801FBBD0 4B FD CA F9 */ bl _move__14dMenu_Insect_cFv -lbl_801FBBD4: -/* 801FBBD4 80 7F 01 34 */ lwz r3, 0x134(r31) -/* 801FBBD8 88 03 00 F2 */ lbz r0, 0xf2(r3) -/* 801FBBDC 28 00 00 03 */ cmplwi r0, 3 -/* 801FBBE0 40 82 00 0C */ bne lbl_801FBBEC -/* 801FBBE4 38 00 00 1E */ li r0, 0x1e -/* 801FBBE8 98 1F 01 46 */ stb r0, 0x146(r31) -lbl_801FBBEC: -/* 801FBBEC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FBBF0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FBBF4 7C 08 03 A6 */ mtlr r0 -/* 801FBBF8 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FBBFC 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/collect_insect_open_init__5dMw_cFUc.s b/asm/d/menu/d_menu_window/collect_insect_open_init__5dMw_cFUc.s deleted file mode 100644 index 515011593a7..00000000000 --- a/asm/d/menu/d_menu_window/collect_insect_open_init__5dMw_cFUc.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_801FA8A8: -/* 801FA8A8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FA8AC 7C 08 02 A6 */ mflr r0 -/* 801FA8B0 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FA8B4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FA8B8 7C 7F 1B 78 */ mr r31, r3 -/* 801FA8BC 38 A0 00 0A */ li r5, 0xa -/* 801FA8C0 98 A3 01 44 */ stb r5, 0x144(r3) -/* 801FA8C4 3C 80 80 43 */ lis r4, g_meter2_info@ha /* 0x80430188@ha */ -/* 801FA8C8 38 84 01 88 */ addi r4, r4, g_meter2_info@l /* 0x80430188@l */ -/* 801FA8CC 88 04 00 B9 */ lbz r0, 0xb9(r4) -/* 801FA8D0 98 04 00 BA */ stb r0, 0xba(r4) -/* 801FA8D4 98 A4 00 B9 */ stb r5, 0xb9(r4) -/* 801FA8D8 38 00 00 00 */ li r0, 0 -/* 801FA8DC 98 03 01 52 */ stb r0, 0x152(r3) -/* 801FA8E0 38 80 00 01 */ li r4, 1 -/* 801FA8E4 48 00 17 AD */ bl dMw_collect_delete__5dMw_cFb -/* 801FA8E8 7F E3 FB 78 */ mr r3, r31 -/* 801FA8EC 38 80 00 00 */ li r4, 0 -/* 801FA8F0 48 00 22 A5 */ bl dMw_insect_create__5dMw_cFUc -/* 801FA8F4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FA8F8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FA8FC 7C 08 03 A6 */ mtlr r0 -/* 801FA900 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FA904 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/collect_insect_open_proc__5dMw_cFv.s b/asm/d/menu/d_menu_window/collect_insect_open_proc__5dMw_cFv.s deleted file mode 100644 index 6fff24be57b..00000000000 --- a/asm/d/menu/d_menu_window/collect_insect_open_proc__5dMw_cFv.s +++ /dev/null @@ -1,39 +0,0 @@ -lbl_801FBB1C: -/* 801FBB1C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FBB20 7C 08 02 A6 */ mflr r0 -/* 801FBB24 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FBB28 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FBB2C 7C 7F 1B 78 */ mr r31, r3 -/* 801FBB30 80 63 01 34 */ lwz r3, 0x134(r3) -/* 801FBB34 88 03 00 F2 */ lbz r0, 0xf2(r3) -/* 801FBB38 28 00 00 01 */ cmplwi r0, 1 -/* 801FBB3C 40 82 00 30 */ bne lbl_801FBB6C -/* 801FBB40 4B FD CE 0D */ bl _open__14dMenu_Insect_cFv -/* 801FBB44 88 1F 01 52 */ lbz r0, 0x152(r31) -/* 801FBB48 28 00 00 00 */ cmplwi r0, 0 -/* 801FBB4C 40 82 00 20 */ bne lbl_801FBB6C -/* 801FBB50 80 7F 01 34 */ lwz r3, 0x134(r31) -/* 801FBB54 4B FD CD 99 */ bl isSync__14dMenu_Insect_cFv -/* 801FBB58 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801FBB5C 41 82 00 10 */ beq lbl_801FBB6C -/* 801FBB60 48 00 13 19 */ bl dMw_fade_in__5dMw_cFv -/* 801FBB64 38 00 00 01 */ li r0, 1 -/* 801FBB68 98 1F 01 52 */ stb r0, 0x152(r31) -lbl_801FBB6C: -/* 801FBB6C 80 7F 01 34 */ lwz r3, 0x134(r31) -/* 801FBB70 88 03 00 F2 */ lbz r0, 0xf2(r3) -/* 801FBB74 28 00 00 02 */ cmplwi r0, 2 -/* 801FBB78 40 82 00 20 */ bne lbl_801FBB98 -/* 801FBB7C 88 1F 01 52 */ lbz r0, 0x152(r31) -/* 801FBB80 28 00 00 01 */ cmplwi r0, 1 -/* 801FBB84 40 82 00 14 */ bne lbl_801FBB98 -/* 801FBB88 38 00 00 1D */ li r0, 0x1d -/* 801FBB8C 98 1F 01 46 */ stb r0, 0x146(r31) -/* 801FBB90 38 00 00 00 */ li r0, 0 -/* 801FBB94 98 1F 01 52 */ stb r0, 0x152(r31) -lbl_801FBB98: -/* 801FBB98 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FBB9C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FBBA0 7C 08 03 A6 */ mtlr r0 -/* 801FBBA4 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FBBA8 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/collect_letter_close_init__5dMw_cFUc.s b/asm/d/menu/d_menu_window/collect_letter_close_init__5dMw_cFUc.s deleted file mode 100644 index 137c0c06d54..00000000000 --- a/asm/d/menu/d_menu_window/collect_letter_close_init__5dMw_cFUc.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_801FA6E0: -/* 801FA6E0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FA6E4 7C 08 02 A6 */ mflr r0 -/* 801FA6E8 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FA6EC 38 00 00 A5 */ li r0, 0xa5 -/* 801FA6F0 90 01 00 08 */ stw r0, 8(r1) -/* 801FA6F4 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801FA6F8 38 81 00 08 */ addi r4, r1, 8 -/* 801FA6FC 38 A0 00 00 */ li r5, 0 -/* 801FA700 38 C0 00 00 */ li r6, 0 -/* 801FA704 38 E0 00 00 */ li r7, 0 -/* 801FA708 C0 22 AA C4 */ lfs f1, lit_4386(r2) -/* 801FA70C FC 40 08 90 */ fmr f2, f1 -/* 801FA710 C0 62 AA C8 */ lfs f3, lit_4387(r2) -/* 801FA714 FC 80 18 90 */ fmr f4, f3 -/* 801FA718 39 00 00 00 */ li r8, 0 -/* 801FA71C 48 0B 12 69 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801FA720 48 02 42 B1 */ bl dMeter2Info_set2DVibration__Fv -/* 801FA724 48 00 26 E5 */ bl dMw_fade_out__5dMw_cFv -/* 801FA728 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FA72C 7C 08 03 A6 */ mtlr r0 -/* 801FA730 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FA734 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/collect_letter_close_proc__5dMw_cFv.s b/asm/d/menu/d_menu_window/collect_letter_close_proc__5dMw_cFv.s deleted file mode 100644 index 738c26eef41..00000000000 --- a/asm/d/menu/d_menu_window/collect_letter_close_proc__5dMw_cFv.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_801FB900: -/* 801FB900 80 8D 86 48 */ lwz r4, mFader__13mDoGph_gInf_c(r13) -/* 801FB904 80 04 00 04 */ lwz r0, 4(r4) -/* 801FB908 2C 00 00 00 */ cmpwi r0, 0 -/* 801FB90C 4C 82 00 20 */ bnelr -/* 801FB910 38 00 00 05 */ li r0, 5 -/* 801FB914 98 03 01 46 */ stb r0, 0x146(r3) -/* 801FB918 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/collect_letter_move_proc__5dMw_cFv.s b/asm/d/menu/d_menu_window/collect_letter_move_proc__5dMw_cFv.s deleted file mode 100644 index cf9b11967ef..00000000000 --- a/asm/d/menu/d_menu_window/collect_letter_move_proc__5dMw_cFv.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_801FB8AC: -/* 801FB8AC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FB8B0 7C 08 02 A6 */ mflr r0 -/* 801FB8B4 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FB8B8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FB8BC 7C 7F 1B 78 */ mr r31, r3 -/* 801FB8C0 80 63 01 28 */ lwz r3, 0x128(r3) -/* 801FB8C4 88 03 03 6C */ lbz r0, 0x36c(r3) -/* 801FB8C8 28 00 00 02 */ cmplwi r0, 2 -/* 801FB8CC 40 82 00 08 */ bne lbl_801FB8D4 -/* 801FB8D0 4B FE 1B A5 */ bl _move__14dMenu_Letter_cFv -lbl_801FB8D4: -/* 801FB8D4 80 7F 01 28 */ lwz r3, 0x128(r31) -/* 801FB8D8 88 03 03 6C */ lbz r0, 0x36c(r3) -/* 801FB8DC 28 00 00 03 */ cmplwi r0, 3 -/* 801FB8E0 40 82 00 0C */ bne lbl_801FB8EC -/* 801FB8E4 38 00 00 15 */ li r0, 0x15 -/* 801FB8E8 98 1F 01 46 */ stb r0, 0x146(r31) -lbl_801FB8EC: -/* 801FB8EC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FB8F0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FB8F4 7C 08 03 A6 */ mtlr r0 -/* 801FB8F8 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FB8FC 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/collect_letter_open_init__5dMw_cFUc.s b/asm/d/menu/d_menu_window/collect_letter_open_init__5dMw_cFUc.s deleted file mode 100644 index 61cbfbea0b7..00000000000 --- a/asm/d/menu/d_menu_window/collect_letter_open_init__5dMw_cFUc.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_801FA680: -/* 801FA680 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FA684 7C 08 02 A6 */ mflr r0 -/* 801FA688 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FA68C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FA690 7C 7F 1B 78 */ mr r31, r3 -/* 801FA694 38 A0 00 0A */ li r5, 0xa -/* 801FA698 98 A3 01 44 */ stb r5, 0x144(r3) -/* 801FA69C 3C 80 80 43 */ lis r4, g_meter2_info@ha /* 0x80430188@ha */ -/* 801FA6A0 38 84 01 88 */ addi r4, r4, g_meter2_info@l /* 0x80430188@l */ -/* 801FA6A4 88 04 00 B9 */ lbz r0, 0xb9(r4) -/* 801FA6A8 98 04 00 BA */ stb r0, 0xba(r4) -/* 801FA6AC 98 A4 00 B9 */ stb r5, 0xb9(r4) -/* 801FA6B0 38 00 00 00 */ li r0, 0 -/* 801FA6B4 98 03 01 52 */ stb r0, 0x152(r3) -/* 801FA6B8 38 80 00 01 */ li r4, 1 -/* 801FA6BC 48 00 19 D5 */ bl dMw_collect_delete__5dMw_cFb -/* 801FA6C0 7F E3 FB 78 */ mr r3, r31 -/* 801FA6C4 48 00 20 F9 */ bl dMw_letter_create__5dMw_cFv -/* 801FA6C8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FA6CC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FA6D0 7C 08 03 A6 */ mtlr r0 -/* 801FA6D4 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FA6D8 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/collect_letter_open_proc__5dMw_cFv.s b/asm/d/menu/d_menu_window/collect_letter_open_proc__5dMw_cFv.s deleted file mode 100644 index 9413e059441..00000000000 --- a/asm/d/menu/d_menu_window/collect_letter_open_proc__5dMw_cFv.s +++ /dev/null @@ -1,39 +0,0 @@ -lbl_801FB81C: -/* 801FB81C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FB820 7C 08 02 A6 */ mflr r0 -/* 801FB824 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FB828 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FB82C 7C 7F 1B 78 */ mr r31, r3 -/* 801FB830 80 63 01 28 */ lwz r3, 0x128(r3) -/* 801FB834 88 03 03 6C */ lbz r0, 0x36c(r3) -/* 801FB838 28 00 00 01 */ cmplwi r0, 1 -/* 801FB83C 40 82 00 30 */ bne lbl_801FB86C -/* 801FB840 4B FE 22 35 */ bl _open__14dMenu_Letter_cFv -/* 801FB844 88 1F 01 52 */ lbz r0, 0x152(r31) -/* 801FB848 28 00 00 00 */ cmplwi r0, 0 -/* 801FB84C 40 82 00 20 */ bne lbl_801FB86C -/* 801FB850 80 7F 01 28 */ lwz r3, 0x128(r31) -/* 801FB854 4B FE 20 E1 */ bl isSync__14dMenu_Letter_cFv -/* 801FB858 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801FB85C 41 82 00 10 */ beq lbl_801FB86C -/* 801FB860 48 00 16 19 */ bl dMw_fade_in__5dMw_cFv -/* 801FB864 38 00 00 01 */ li r0, 1 -/* 801FB868 98 1F 01 52 */ stb r0, 0x152(r31) -lbl_801FB86C: -/* 801FB86C 80 7F 01 28 */ lwz r3, 0x128(r31) -/* 801FB870 88 03 03 6C */ lbz r0, 0x36c(r3) -/* 801FB874 28 00 00 02 */ cmplwi r0, 2 -/* 801FB878 40 82 00 20 */ bne lbl_801FB898 -/* 801FB87C 88 1F 01 52 */ lbz r0, 0x152(r31) -/* 801FB880 28 00 00 01 */ cmplwi r0, 1 -/* 801FB884 40 82 00 14 */ bne lbl_801FB898 -/* 801FB888 38 00 00 14 */ li r0, 0x14 -/* 801FB88C 98 1F 01 46 */ stb r0, 0x146(r31) -/* 801FB890 38 00 00 00 */ li r0, 0 -/* 801FB894 98 1F 01 52 */ stb r0, 0x152(r31) -lbl_801FB898: -/* 801FB898 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FB89C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FB8A0 7C 08 03 A6 */ mtlr r0 -/* 801FB8A4 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FB8A8 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/collect_move_init__5dMw_cFUc.s b/asm/d/menu/d_menu_window/collect_move_init__5dMw_cFUc.s deleted file mode 100644 index 97379d22829..00000000000 --- a/asm/d/menu/d_menu_window/collect_move_init__5dMw_cFUc.s +++ /dev/null @@ -1,105 +0,0 @@ -lbl_801FA2D0: -/* 801FA2D0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FA2D4 7C 08 02 A6 */ mflr r0 -/* 801FA2D8 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FA2DC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FA2E0 7C 7F 1B 78 */ mr r31, r3 -/* 801FA2E4 54 83 06 3E */ clrlwi r3, r4, 0x18 -/* 801FA2E8 38 03 FF FC */ addi r0, r3, -4 -/* 801FA2EC 28 00 00 1A */ cmplwi r0, 0x1a -/* 801FA2F0 41 81 01 68 */ bgt lbl_801FA458 -/* 801FA2F4 3C 60 80 3C */ lis r3, lit_4418@ha /* 0x803BF014@ha */ -/* 801FA2F8 38 63 F0 14 */ addi r3, r3, lit_4418@l /* 0x803BF014@l */ -/* 801FA2FC 54 00 10 3A */ slwi r0, r0, 2 -/* 801FA300 7C 03 00 2E */ lwzx r0, r3, r0 -/* 801FA304 7C 09 03 A6 */ mtctr r0 -/* 801FA308 4E 80 04 20 */ bctr -/* 801FA30C 48 00 2B 6D */ bl dMw_fade_in__5dMw_cFv -/* 801FA310 38 60 00 01 */ li r3, 1 -/* 801FA314 4B E3 3D CD */ bl dComIfGp_setHeapLockFlag__FUc -/* 801FA318 7F E3 FB 78 */ mr r3, r31 -/* 801FA31C 48 00 1C DD */ bl dMw_collect_create__5dMw_cFv -/* 801FA320 48 00 01 38 */ b lbl_801FA458 -/* 801FA324 48 00 2B 55 */ bl dMw_fade_in__5dMw_cFv -/* 801FA328 7F E3 FB 78 */ mr r3, r31 -/* 801FA32C 48 00 22 A5 */ bl dMw_save_delete__5dMw_cFv -/* 801FA330 38 80 00 03 */ li r4, 3 -/* 801FA334 98 9F 01 44 */ stb r4, 0x144(r31) -/* 801FA338 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801FA33C 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801FA340 88 03 00 B9 */ lbz r0, 0xb9(r3) -/* 801FA344 98 03 00 BA */ stb r0, 0xba(r3) -/* 801FA348 98 83 00 B9 */ stb r4, 0xb9(r3) -/* 801FA34C 7F E3 FB 78 */ mr r3, r31 -/* 801FA350 48 00 1C A9 */ bl dMw_collect_create__5dMw_cFv -/* 801FA354 48 00 01 04 */ b lbl_801FA458 -/* 801FA358 48 00 2B 21 */ bl dMw_fade_in__5dMw_cFv -/* 801FA35C 7F E3 FB 78 */ mr r3, r31 -/* 801FA360 48 00 23 AD */ bl dMw_option_delete__5dMw_cFv -/* 801FA364 38 80 00 03 */ li r4, 3 -/* 801FA368 98 9F 01 44 */ stb r4, 0x144(r31) -/* 801FA36C 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801FA370 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801FA374 88 03 00 B9 */ lbz r0, 0xb9(r3) -/* 801FA378 98 03 00 BA */ stb r0, 0xba(r3) -/* 801FA37C 98 83 00 B9 */ stb r4, 0xb9(r3) -/* 801FA380 7F E3 FB 78 */ mr r3, r31 -/* 801FA384 48 00 1C 75 */ bl dMw_collect_create__5dMw_cFv -/* 801FA388 48 00 00 D0 */ b lbl_801FA458 -/* 801FA38C 48 00 2A ED */ bl dMw_fade_in__5dMw_cFv -/* 801FA390 7F E3 FB 78 */ mr r3, r31 -/* 801FA394 48 00 24 C9 */ bl dMw_letter_delete__5dMw_cFv -/* 801FA398 38 80 00 03 */ li r4, 3 -/* 801FA39C 98 9F 01 44 */ stb r4, 0x144(r31) -/* 801FA3A0 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801FA3A4 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801FA3A8 88 03 00 B9 */ lbz r0, 0xb9(r3) -/* 801FA3AC 98 03 00 BA */ stb r0, 0xba(r3) -/* 801FA3B0 98 83 00 B9 */ stb r4, 0xb9(r3) -/* 801FA3B4 7F E3 FB 78 */ mr r3, r31 -/* 801FA3B8 48 00 1C 41 */ bl dMw_collect_create__5dMw_cFv -/* 801FA3BC 48 00 00 9C */ b lbl_801FA458 -/* 801FA3C0 48 00 2A B9 */ bl dMw_fade_in__5dMw_cFv -/* 801FA3C4 7F E3 FB 78 */ mr r3, r31 -/* 801FA3C8 48 00 25 DD */ bl dMw_fishing_delete__5dMw_cFv -/* 801FA3CC 38 80 00 03 */ li r4, 3 -/* 801FA3D0 98 9F 01 44 */ stb r4, 0x144(r31) -/* 801FA3D4 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801FA3D8 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801FA3DC 88 03 00 B9 */ lbz r0, 0xb9(r3) -/* 801FA3E0 98 03 00 BA */ stb r0, 0xba(r3) -/* 801FA3E4 98 83 00 B9 */ stb r4, 0xb9(r3) -/* 801FA3E8 7F E3 FB 78 */ mr r3, r31 -/* 801FA3EC 48 00 1C 0D */ bl dMw_collect_create__5dMw_cFv -/* 801FA3F0 48 00 00 68 */ b lbl_801FA458 -/* 801FA3F4 48 00 2A 85 */ bl dMw_fade_in__5dMw_cFv -/* 801FA3F8 7F E3 FB 78 */ mr r3, r31 -/* 801FA3FC 48 00 26 F1 */ bl dMw_skill_delete__5dMw_cFv -/* 801FA400 38 80 00 03 */ li r4, 3 -/* 801FA404 98 9F 01 44 */ stb r4, 0x144(r31) -/* 801FA408 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801FA40C 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801FA410 88 03 00 B9 */ lbz r0, 0xb9(r3) -/* 801FA414 98 03 00 BA */ stb r0, 0xba(r3) -/* 801FA418 98 83 00 B9 */ stb r4, 0xb9(r3) -/* 801FA41C 7F E3 FB 78 */ mr r3, r31 -/* 801FA420 48 00 1B D9 */ bl dMw_collect_create__5dMw_cFv -/* 801FA424 48 00 00 34 */ b lbl_801FA458 -/* 801FA428 48 00 2A 51 */ bl dMw_fade_in__5dMw_cFv -/* 801FA42C 7F E3 FB 78 */ mr r3, r31 -/* 801FA430 48 00 28 15 */ bl dMw_insect_delete__5dMw_cFv -/* 801FA434 38 80 00 03 */ li r4, 3 -/* 801FA438 98 9F 01 44 */ stb r4, 0x144(r31) -/* 801FA43C 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801FA440 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801FA444 88 03 00 B9 */ lbz r0, 0xb9(r3) -/* 801FA448 98 03 00 BA */ stb r0, 0xba(r3) -/* 801FA44C 98 83 00 B9 */ stb r4, 0xb9(r3) -/* 801FA450 7F E3 FB 78 */ mr r3, r31 -/* 801FA454 48 00 1B A5 */ bl dMw_collect_create__5dMw_cFv -lbl_801FA458: -/* 801FA458 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FA45C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FA460 7C 08 03 A6 */ mtlr r0 -/* 801FA464 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FA468 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/collect_move_proc__5dMw_cFv.s b/asm/d/menu/d_menu_window/collect_move_proc__5dMw_cFv.s deleted file mode 100644 index 8a348071f5f..00000000000 --- a/asm/d/menu/d_menu_window/collect_move_proc__5dMw_cFv.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_801FB110: -/* 801FB110 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FB114 7C 08 02 A6 */ mflr r0 -/* 801FB118 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FB11C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FB120 7C 7F 1B 78 */ mr r31, r3 -/* 801FB124 80 83 01 14 */ lwz r4, 0x114(r3) -/* 801FB128 80 84 00 04 */ lwz r4, 4(r4) -/* 801FB12C 88 04 02 5E */ lbz r0, 0x25e(r4) -/* 801FB130 28 00 00 00 */ cmplwi r0, 0 -/* 801FB134 41 82 00 10 */ beq lbl_801FB144 -/* 801FB138 38 00 00 06 */ li r0, 6 -/* 801FB13C 98 1F 01 46 */ stb r0, 0x146(r31) -/* 801FB140 48 00 00 4C */ b lbl_801FB18C -lbl_801FB144: -/* 801FB144 48 00 1B E1 */ bl dMw_isPush_S_Button__5dMw_cFv -/* 801FB148 2C 03 00 00 */ cmpwi r3, 0 -/* 801FB14C 41 82 00 18 */ beq lbl_801FB164 -/* 801FB150 80 7F 01 14 */ lwz r3, 0x114(r31) -/* 801FB154 80 63 00 04 */ lwz r3, 4(r3) -/* 801FB158 4B FB AE 2D */ bl isKeyCheck__17dMenu_Collect2D_cFv -/* 801FB15C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801FB160 41 82 00 18 */ beq lbl_801FB178 -lbl_801FB164: -/* 801FB164 80 7F 01 14 */ lwz r3, 0x114(r31) -/* 801FB168 80 63 00 04 */ lwz r3, 4(r3) -/* 801FB16C 4B FB AE 41 */ bl isOutCheck__17dMenu_Collect2D_cFv -/* 801FB170 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801FB174 41 82 00 10 */ beq lbl_801FB184 -lbl_801FB178: -/* 801FB178 38 00 00 06 */ li r0, 6 -/* 801FB17C 98 1F 01 46 */ stb r0, 0x146(r31) -/* 801FB180 48 00 00 0C */ b lbl_801FB18C -lbl_801FB184: -/* 801FB184 80 7F 01 14 */ lwz r3, 0x114(r31) -/* 801FB188 4B FB C8 F5 */ bl _move__15dMenu_Collect_cFv -lbl_801FB18C: -/* 801FB18C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FB190 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FB194 7C 08 03 A6 */ mtlr r0 -/* 801FB198 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FB19C 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/collect_open_init__5dMw_cFUc.s b/asm/d/menu/d_menu_window/collect_open_init__5dMw_cFUc.s deleted file mode 100644 index 20ff7eab97c..00000000000 --- a/asm/d/menu/d_menu_window/collect_open_init__5dMw_cFUc.s +++ /dev/null @@ -1,36 +0,0 @@ -lbl_801FA244: -/* 801FA244 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801FA248 7C 08 02 A6 */ mflr r0 -/* 801FA24C 90 01 00 24 */ stw r0, 0x24(r1) -/* 801FA250 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 801FA254 7C 7F 1B 78 */ mr r31, r3 -/* 801FA258 38 80 00 03 */ li r4, 3 -/* 801FA25C 98 83 01 44 */ stb r4, 0x144(r3) -/* 801FA260 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801FA264 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801FA268 88 03 00 B9 */ lbz r0, 0xb9(r3) -/* 801FA26C 98 03 00 BA */ stb r0, 0xba(r3) -/* 801FA270 98 83 00 B9 */ stb r4, 0xb9(r3) -/* 801FA274 38 00 00 5B */ li r0, 0x5b -/* 801FA278 90 01 00 08 */ stw r0, 8(r1) -/* 801FA27C 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801FA280 38 81 00 08 */ addi r4, r1, 8 -/* 801FA284 38 A0 00 00 */ li r5, 0 -/* 801FA288 38 C0 00 00 */ li r6, 0 -/* 801FA28C 38 E0 00 00 */ li r7, 0 -/* 801FA290 C0 22 AA C4 */ lfs f1, lit_4386(r2) -/* 801FA294 FC 40 08 90 */ fmr f2, f1 -/* 801FA298 C0 62 AA C8 */ lfs f3, lit_4387(r2) -/* 801FA29C FC 80 18 90 */ fmr f4, f3 -/* 801FA2A0 39 00 00 00 */ li r8, 0 -/* 801FA2A4 48 0B 16 E1 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801FA2A8 48 00 2B 61 */ bl dMw_fade_out__5dMw_cFv -/* 801FA2AC 7F E3 FB 78 */ mr r3, r31 -/* 801FA2B0 48 00 1A D1 */ bl dMw_capture_create__5dMw_cFv -/* 801FA2B4 38 00 00 00 */ li r0, 0 -/* 801FA2B8 98 1F 01 53 */ stb r0, 0x153(r31) -/* 801FA2BC 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 801FA2C0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801FA2C4 7C 08 03 A6 */ mtlr r0 -/* 801FA2C8 38 21 00 20 */ addi r1, r1, 0x20 -/* 801FA2CC 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/collect_open_proc__5dMw_cFv.s b/asm/d/menu/d_menu_window/collect_open_proc__5dMw_cFv.s deleted file mode 100644 index 68f0f5bf095..00000000000 --- a/asm/d/menu/d_menu_window/collect_open_proc__5dMw_cFv.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_801FB0B8: -/* 801FB0B8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FB0BC 7C 08 02 A6 */ mflr r0 -/* 801FB0C0 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FB0C4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FB0C8 7C 7F 1B 78 */ mr r31, r3 -/* 801FB0CC 88 03 01 53 */ lbz r0, 0x153(r3) -/* 801FB0D0 28 00 00 00 */ cmplwi r0, 0 -/* 801FB0D4 40 82 00 10 */ bne lbl_801FB0E4 -/* 801FB0D8 38 00 00 01 */ li r0, 1 -/* 801FB0DC 98 1F 01 53 */ stb r0, 0x153(r31) -/* 801FB0E0 48 02 38 F5 */ bl dMeter2Info_set2DVibrationM__Fv -lbl_801FB0E4: -/* 801FB0E4 80 6D 86 48 */ lwz r3, mFader__13mDoGph_gInf_c(r13) -/* 801FB0E8 80 03 00 04 */ lwz r0, 4(r3) -/* 801FB0EC 2C 00 00 00 */ cmpwi r0, 0 -/* 801FB0F0 40 82 00 0C */ bne lbl_801FB0FC -/* 801FB0F4 38 00 00 05 */ li r0, 5 -/* 801FB0F8 98 1F 01 46 */ stb r0, 0x146(r31) -lbl_801FB0FC: -/* 801FB0FC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FB100 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FB104 7C 08 03 A6 */ mtlr r0 -/* 801FB108 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FB10C 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/collect_option_close_init__5dMw_cFUc.s b/asm/d/menu/d_menu_window/collect_option_close_init__5dMw_cFUc.s deleted file mode 100644 index 8e882623b7e..00000000000 --- a/asm/d/menu/d_menu_window/collect_option_close_init__5dMw_cFUc.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_801FA660: -/* 801FA660 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FA664 7C 08 02 A6 */ mflr r0 -/* 801FA668 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FA66C 48 00 27 9D */ bl dMw_fade_out__5dMw_cFv -/* 801FA670 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FA674 7C 08 03 A6 */ mtlr r0 -/* 801FA678 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FA67C 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/collect_option_close_proc__5dMw_cFv.s b/asm/d/menu/d_menu_window/collect_option_close_proc__5dMw_cFv.s deleted file mode 100644 index 95ec7181860..00000000000 --- a/asm/d/menu/d_menu_window/collect_option_close_proc__5dMw_cFv.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_801FB800: -/* 801FB800 80 8D 86 48 */ lwz r4, mFader__13mDoGph_gInf_c(r13) -/* 801FB804 80 04 00 04 */ lwz r0, 4(r4) -/* 801FB808 2C 00 00 00 */ cmpwi r0, 0 -/* 801FB80C 4C 82 00 20 */ bnelr -/* 801FB810 38 00 00 05 */ li r0, 5 -/* 801FB814 98 03 01 46 */ stb r0, 0x146(r3) -/* 801FB818 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/collect_option_move_proc__5dMw_cFv.s b/asm/d/menu/d_menu_window/collect_option_move_proc__5dMw_cFv.s deleted file mode 100644 index c2ab4929853..00000000000 --- a/asm/d/menu/d_menu_window/collect_option_move_proc__5dMw_cFv.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_801FB7AC: -/* 801FB7AC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FB7B0 7C 08 02 A6 */ mflr r0 -/* 801FB7B4 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FB7B8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FB7BC 7C 7F 1B 78 */ mr r31, r3 -/* 801FB7C0 80 63 01 24 */ lwz r3, 0x124(r3) -/* 801FB7C4 88 03 03 EC */ lbz r0, 0x3ec(r3) -/* 801FB7C8 28 00 00 02 */ cmplwi r0, 2 -/* 801FB7CC 40 82 00 08 */ bne lbl_801FB7D4 -/* 801FB7D0 4B FE 7C 39 */ bl _move__14dMenu_Option_cFv -lbl_801FB7D4: -/* 801FB7D4 80 7F 01 24 */ lwz r3, 0x124(r31) -/* 801FB7D8 88 03 03 EC */ lbz r0, 0x3ec(r3) -/* 801FB7DC 28 00 00 03 */ cmplwi r0, 3 -/* 801FB7E0 40 82 00 0C */ bne lbl_801FB7EC -/* 801FB7E4 38 00 00 12 */ li r0, 0x12 -/* 801FB7E8 98 1F 01 46 */ stb r0, 0x146(r31) -lbl_801FB7EC: -/* 801FB7EC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FB7F0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FB7F4 7C 08 03 A6 */ mtlr r0 -/* 801FB7F8 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FB7FC 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/collect_option_open_init__5dMw_cFUc.s b/asm/d/menu/d_menu_window/collect_option_open_init__5dMw_cFUc.s deleted file mode 100644 index 7935dded965..00000000000 --- a/asm/d/menu/d_menu_window/collect_option_open_init__5dMw_cFUc.s +++ /dev/null @@ -1,22 +0,0 @@ -lbl_801FA608: -/* 801FA608 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FA60C 7C 08 02 A6 */ mflr r0 -/* 801FA610 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FA614 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FA618 7C 7F 1B 78 */ mr r31, r3 -/* 801FA61C 38 A0 00 0A */ li r5, 0xa -/* 801FA620 98 A3 01 44 */ stb r5, 0x144(r3) -/* 801FA624 3C 80 80 43 */ lis r4, g_meter2_info@ha /* 0x80430188@ha */ -/* 801FA628 38 84 01 88 */ addi r4, r4, g_meter2_info@l /* 0x80430188@l */ -/* 801FA62C 88 04 00 B9 */ lbz r0, 0xb9(r4) -/* 801FA630 98 04 00 BA */ stb r0, 0xba(r4) -/* 801FA634 98 A4 00 B9 */ stb r5, 0xb9(r4) -/* 801FA638 38 80 00 01 */ li r4, 1 -/* 801FA63C 48 00 1A 55 */ bl dMw_collect_delete__5dMw_cFb -/* 801FA640 7F E3 FB 78 */ mr r3, r31 -/* 801FA644 48 00 20 25 */ bl dMw_option_create__5dMw_cFv -/* 801FA648 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FA64C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FA650 7C 08 03 A6 */ mtlr r0 -/* 801FA654 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FA658 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/collect_option_open_proc__5dMw_cFv.s b/asm/d/menu/d_menu_window/collect_option_open_proc__5dMw_cFv.s deleted file mode 100644 index 940e416e78c..00000000000 --- a/asm/d/menu/d_menu_window/collect_option_open_proc__5dMw_cFv.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_801FB73C: -/* 801FB73C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FB740 7C 08 02 A6 */ mflr r0 -/* 801FB744 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FB748 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FB74C 7C 7F 1B 78 */ mr r31, r3 -/* 801FB750 80 63 01 24 */ lwz r3, 0x124(r3) -/* 801FB754 88 03 03 EC */ lbz r0, 0x3ec(r3) -/* 801FB758 28 00 00 01 */ cmplwi r0, 1 -/* 801FB75C 40 82 00 14 */ bne lbl_801FB770 -/* 801FB760 4B FE 84 39 */ bl _open__14dMenu_Option_cFv -/* 801FB764 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801FB768 41 82 00 08 */ beq lbl_801FB770 -/* 801FB76C 48 00 17 0D */ bl dMw_fade_in__5dMw_cFv -lbl_801FB770: -/* 801FB770 80 7F 01 24 */ lwz r3, 0x124(r31) -/* 801FB774 88 03 03 EC */ lbz r0, 0x3ec(r3) -/* 801FB778 28 00 00 02 */ cmplwi r0, 2 -/* 801FB77C 40 82 00 1C */ bne lbl_801FB798 -/* 801FB780 80 6D 86 48 */ lwz r3, mFader__13mDoGph_gInf_c(r13) -/* 801FB784 80 03 00 04 */ lwz r0, 4(r3) -/* 801FB788 2C 00 00 01 */ cmpwi r0, 1 -/* 801FB78C 40 82 00 0C */ bne lbl_801FB798 -/* 801FB790 38 00 00 11 */ li r0, 0x11 -/* 801FB794 98 1F 01 46 */ stb r0, 0x146(r31) -lbl_801FB798: -/* 801FB798 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FB79C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FB7A0 7C 08 03 A6 */ mtlr r0 -/* 801FB7A4 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FB7A8 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/collect_save_close_init__5dMw_cFUc.s b/asm/d/menu/d_menu_window/collect_save_close_init__5dMw_cFUc.s deleted file mode 100644 index 23845d7b6bf..00000000000 --- a/asm/d/menu/d_menu_window/collect_save_close_init__5dMw_cFUc.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_801FA5E8: -/* 801FA5E8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FA5EC 7C 08 02 A6 */ mflr r0 -/* 801FA5F0 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FA5F4 48 00 28 15 */ bl dMw_fade_out__5dMw_cFv -/* 801FA5F8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FA5FC 7C 08 03 A6 */ mtlr r0 -/* 801FA600 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FA604 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/collect_save_close_proc__5dMw_cFv.s b/asm/d/menu/d_menu_window/collect_save_close_proc__5dMw_cFv.s deleted file mode 100644 index 60d9036e9b5..00000000000 --- a/asm/d/menu/d_menu_window/collect_save_close_proc__5dMw_cFv.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_801FB6D8: -/* 801FB6D8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FB6DC 7C 08 02 A6 */ mflr r0 -/* 801FB6E0 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FB6E4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FB6E8 7C 7F 1B 78 */ mr r31, r3 -/* 801FB6EC 80 6D 86 48 */ lwz r3, mFader__13mDoGph_gInf_c(r13) -/* 801FB6F0 80 03 00 04 */ lwz r0, 4(r3) -/* 801FB6F4 2C 00 00 00 */ cmpwi r0, 0 -/* 801FB6F8 40 82 00 30 */ bne lbl_801FB728 -/* 801FB6FC 80 7F 01 20 */ lwz r3, 0x120(r31) -/* 801FB700 4B FF 59 49 */ bl _move__12dMenu_save_cFv -/* 801FB704 80 7F 01 20 */ lwz r3, 0x120(r31) -/* 801FB708 88 03 01 BA */ lbz r0, 0x1ba(r3) -/* 801FB70C 28 00 00 03 */ cmplwi r0, 3 -/* 801FB710 40 82 00 10 */ bne lbl_801FB720 -/* 801FB714 38 00 00 05 */ li r0, 5 -/* 801FB718 98 1F 01 46 */ stb r0, 0x146(r31) -/* 801FB71C 48 00 00 0C */ b lbl_801FB728 -lbl_801FB720: -/* 801FB720 38 00 00 00 */ li r0, 0 -/* 801FB724 98 1F 01 46 */ stb r0, 0x146(r31) -lbl_801FB728: -/* 801FB728 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FB72C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FB730 7C 08 03 A6 */ mtlr r0 -/* 801FB734 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FB738 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/collect_save_move_proc__5dMw_cFv.s b/asm/d/menu/d_menu_window/collect_save_move_proc__5dMw_cFv.s deleted file mode 100644 index e0e4559d645..00000000000 --- a/asm/d/menu/d_menu_window/collect_save_move_proc__5dMw_cFv.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_801FB67C: -/* 801FB67C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FB680 7C 08 02 A6 */ mflr r0 -/* 801FB684 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FB688 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FB68C 7C 7F 1B 78 */ mr r31, r3 -/* 801FB690 80 63 01 20 */ lwz r3, 0x120(r3) -/* 801FB694 88 03 01 BA */ lbz r0, 0x1ba(r3) -/* 801FB698 28 00 00 02 */ cmplwi r0, 2 -/* 801FB69C 40 82 00 08 */ bne lbl_801FB6A4 -/* 801FB6A0 4B FF 59 A9 */ bl _move__12dMenu_save_cFv -lbl_801FB6A4: -/* 801FB6A4 80 7F 01 20 */ lwz r3, 0x120(r31) -/* 801FB6A8 88 03 01 BA */ lbz r0, 0x1ba(r3) -/* 801FB6AC 28 00 00 03 */ cmplwi r0, 3 -/* 801FB6B0 41 82 00 0C */ beq lbl_801FB6BC -/* 801FB6B4 28 00 00 04 */ cmplwi r0, 4 -/* 801FB6B8 40 82 00 0C */ bne lbl_801FB6C4 -lbl_801FB6BC: -/* 801FB6BC 38 00 00 0F */ li r0, 0xf -/* 801FB6C0 98 1F 01 46 */ stb r0, 0x146(r31) -lbl_801FB6C4: -/* 801FB6C4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FB6C8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FB6CC 7C 08 03 A6 */ mtlr r0 -/* 801FB6D0 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FB6D4 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/collect_save_open_init__5dMw_cFUc.s b/asm/d/menu/d_menu_window/collect_save_open_init__5dMw_cFUc.s deleted file mode 100644 index 83dd2110d8e..00000000000 --- a/asm/d/menu/d_menu_window/collect_save_open_init__5dMw_cFUc.s +++ /dev/null @@ -1,22 +0,0 @@ -lbl_801FA590: -/* 801FA590 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FA594 7C 08 02 A6 */ mflr r0 -/* 801FA598 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FA59C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FA5A0 7C 7F 1B 78 */ mr r31, r3 -/* 801FA5A4 38 A0 00 0A */ li r5, 0xa -/* 801FA5A8 98 A3 01 44 */ stb r5, 0x144(r3) -/* 801FA5AC 3C 80 80 43 */ lis r4, g_meter2_info@ha /* 0x80430188@ha */ -/* 801FA5B0 38 84 01 88 */ addi r4, r4, g_meter2_info@l /* 0x80430188@l */ -/* 801FA5B4 88 04 00 B9 */ lbz r0, 0xb9(r4) -/* 801FA5B8 98 04 00 BA */ stb r0, 0xba(r4) -/* 801FA5BC 98 A4 00 B9 */ stb r5, 0xb9(r4) -/* 801FA5C0 38 80 00 01 */ li r4, 1 -/* 801FA5C4 48 00 1A CD */ bl dMw_collect_delete__5dMw_cFb -/* 801FA5C8 7F E3 FB 78 */ mr r3, r31 -/* 801FA5CC 48 00 1F 55 */ bl dMw_save_create__5dMw_cFv -/* 801FA5D0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FA5D4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FA5D8 7C 08 03 A6 */ mtlr r0 -/* 801FA5DC 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FA5E0 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/collect_save_open_proc__5dMw_cFv.s b/asm/d/menu/d_menu_window/collect_save_open_proc__5dMw_cFv.s deleted file mode 100644 index 878eea00796..00000000000 --- a/asm/d/menu/d_menu_window/collect_save_open_proc__5dMw_cFv.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_801FB61C: -/* 801FB61C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FB620 7C 08 02 A6 */ mflr r0 -/* 801FB624 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FB628 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FB62C 7C 7F 1B 78 */ mr r31, r3 -/* 801FB630 80 63 01 20 */ lwz r3, 0x120(r3) -/* 801FB634 88 03 01 BA */ lbz r0, 0x1ba(r3) -/* 801FB638 28 00 00 01 */ cmplwi r0, 1 -/* 801FB63C 40 82 00 14 */ bne lbl_801FB650 -/* 801FB640 4B FF 53 6D */ bl _open__12dMenu_save_cFv -/* 801FB644 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801FB648 41 82 00 08 */ beq lbl_801FB650 -/* 801FB64C 48 00 18 2D */ bl dMw_fade_in__5dMw_cFv -lbl_801FB650: -/* 801FB650 80 7F 01 20 */ lwz r3, 0x120(r31) -/* 801FB654 88 03 01 BA */ lbz r0, 0x1ba(r3) -/* 801FB658 28 00 00 02 */ cmplwi r0, 2 -/* 801FB65C 40 82 00 0C */ bne lbl_801FB668 -/* 801FB660 38 00 00 0E */ li r0, 0xe -/* 801FB664 98 1F 01 46 */ stb r0, 0x146(r31) -lbl_801FB668: -/* 801FB668 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FB66C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FB670 7C 08 03 A6 */ mtlr r0 -/* 801FB674 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FB678 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/collect_skill_close_init__5dMw_cFUc.s b/asm/d/menu/d_menu_window/collect_skill_close_init__5dMw_cFUc.s deleted file mode 100644 index d24d1414549..00000000000 --- a/asm/d/menu/d_menu_window/collect_skill_close_init__5dMw_cFUc.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_801FA850: -/* 801FA850 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FA854 7C 08 02 A6 */ mflr r0 -/* 801FA858 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FA85C 38 00 00 A5 */ li r0, 0xa5 -/* 801FA860 90 01 00 08 */ stw r0, 8(r1) -/* 801FA864 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801FA868 38 81 00 08 */ addi r4, r1, 8 -/* 801FA86C 38 A0 00 00 */ li r5, 0 -/* 801FA870 38 C0 00 00 */ li r6, 0 -/* 801FA874 38 E0 00 00 */ li r7, 0 -/* 801FA878 C0 22 AA C4 */ lfs f1, lit_4386(r2) -/* 801FA87C FC 40 08 90 */ fmr f2, f1 -/* 801FA880 C0 62 AA C8 */ lfs f3, lit_4387(r2) -/* 801FA884 FC 80 18 90 */ fmr f4, f3 -/* 801FA888 39 00 00 00 */ li r8, 0 -/* 801FA88C 48 0B 10 F9 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801FA890 48 02 41 41 */ bl dMeter2Info_set2DVibration__Fv -/* 801FA894 48 00 25 75 */ bl dMw_fade_out__5dMw_cFv -/* 801FA898 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FA89C 7C 08 03 A6 */ mtlr r0 -/* 801FA8A0 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FA8A4 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/collect_skill_close_proc__5dMw_cFv.s b/asm/d/menu/d_menu_window/collect_skill_close_proc__5dMw_cFv.s deleted file mode 100644 index 96d2bfebd2b..00000000000 --- a/asm/d/menu/d_menu_window/collect_skill_close_proc__5dMw_cFv.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_801FBB00: -/* 801FBB00 80 8D 86 48 */ lwz r4, mFader__13mDoGph_gInf_c(r13) -/* 801FBB04 80 04 00 04 */ lwz r0, 4(r4) -/* 801FBB08 2C 00 00 00 */ cmpwi r0, 0 -/* 801FBB0C 4C 82 00 20 */ bnelr -/* 801FBB10 38 00 00 05 */ li r0, 5 -/* 801FBB14 98 03 01 46 */ stb r0, 0x146(r3) -/* 801FBB18 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/collect_skill_move_proc__5dMw_cFv.s b/asm/d/menu/d_menu_window/collect_skill_move_proc__5dMw_cFv.s deleted file mode 100644 index ba67a9c74fe..00000000000 --- a/asm/d/menu/d_menu_window/collect_skill_move_proc__5dMw_cFv.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_801FBAAC: -/* 801FBAAC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FBAB0 7C 08 02 A6 */ mflr r0 -/* 801FBAB4 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FBAB8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FBABC 7C 7F 1B 78 */ mr r31, r3 -/* 801FBAC0 80 63 01 30 */ lwz r3, 0x130(r3) -/* 801FBAC4 88 03 02 04 */ lbz r0, 0x204(r3) -/* 801FBAC8 28 00 00 02 */ cmplwi r0, 2 -/* 801FBACC 40 82 00 08 */ bne lbl_801FBAD4 -/* 801FBAD0 4B FF BC 49 */ bl _move__13dMenu_Skill_cFv -lbl_801FBAD4: -/* 801FBAD4 80 7F 01 30 */ lwz r3, 0x130(r31) -/* 801FBAD8 88 03 02 04 */ lbz r0, 0x204(r3) -/* 801FBADC 28 00 00 03 */ cmplwi r0, 3 -/* 801FBAE0 40 82 00 0C */ bne lbl_801FBAEC -/* 801FBAE4 38 00 00 1B */ li r0, 0x1b -/* 801FBAE8 98 1F 01 46 */ stb r0, 0x146(r31) -lbl_801FBAEC: -/* 801FBAEC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FBAF0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FBAF4 7C 08 03 A6 */ mtlr r0 -/* 801FBAF8 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FBAFC 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/collect_skill_open_init__5dMw_cFUc.s b/asm/d/menu/d_menu_window/collect_skill_open_init__5dMw_cFUc.s deleted file mode 100644 index 0822188e8c1..00000000000 --- a/asm/d/menu/d_menu_window/collect_skill_open_init__5dMw_cFUc.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_801FA7F0: -/* 801FA7F0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FA7F4 7C 08 02 A6 */ mflr r0 -/* 801FA7F8 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FA7FC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FA800 7C 7F 1B 78 */ mr r31, r3 -/* 801FA804 38 A0 00 0A */ li r5, 0xa -/* 801FA808 98 A3 01 44 */ stb r5, 0x144(r3) -/* 801FA80C 3C 80 80 43 */ lis r4, g_meter2_info@ha /* 0x80430188@ha */ -/* 801FA810 38 84 01 88 */ addi r4, r4, g_meter2_info@l /* 0x80430188@l */ -/* 801FA814 88 04 00 B9 */ lbz r0, 0xb9(r4) -/* 801FA818 98 04 00 BA */ stb r0, 0xba(r4) -/* 801FA81C 98 A4 00 B9 */ stb r5, 0xb9(r4) -/* 801FA820 38 00 00 00 */ li r0, 0 -/* 801FA824 98 03 01 52 */ stb r0, 0x152(r3) -/* 801FA828 38 80 00 01 */ li r4, 1 -/* 801FA82C 48 00 18 65 */ bl dMw_collect_delete__5dMw_cFb -/* 801FA830 7F E3 FB 78 */ mr r3, r31 -/* 801FA834 48 00 22 19 */ bl dMw_skill_create__5dMw_cFv -/* 801FA838 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FA83C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FA840 7C 08 03 A6 */ mtlr r0 -/* 801FA844 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FA848 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/collect_skill_open_proc__5dMw_cFv.s b/asm/d/menu/d_menu_window/collect_skill_open_proc__5dMw_cFv.s deleted file mode 100644 index 80554af9911..00000000000 --- a/asm/d/menu/d_menu_window/collect_skill_open_proc__5dMw_cFv.s +++ /dev/null @@ -1,39 +0,0 @@ -lbl_801FBA1C: -/* 801FBA1C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FBA20 7C 08 02 A6 */ mflr r0 -/* 801FBA24 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FBA28 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FBA2C 7C 7F 1B 78 */ mr r31, r3 -/* 801FBA30 80 63 01 30 */ lwz r3, 0x130(r3) -/* 801FBA34 88 03 02 04 */ lbz r0, 0x204(r3) -/* 801FBA38 28 00 00 01 */ cmplwi r0, 1 -/* 801FBA3C 40 82 00 30 */ bne lbl_801FBA6C -/* 801FBA40 4B FF C0 01 */ bl _open__13dMenu_Skill_cFv -/* 801FBA44 88 1F 01 52 */ lbz r0, 0x152(r31) -/* 801FBA48 28 00 00 00 */ cmplwi r0, 0 -/* 801FBA4C 40 82 00 20 */ bne lbl_801FBA6C -/* 801FBA50 80 7F 01 30 */ lwz r3, 0x130(r31) -/* 801FBA54 4B FF BE FD */ bl isSync__13dMenu_Skill_cFv -/* 801FBA58 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801FBA5C 41 82 00 10 */ beq lbl_801FBA6C -/* 801FBA60 48 00 14 19 */ bl dMw_fade_in__5dMw_cFv -/* 801FBA64 38 00 00 01 */ li r0, 1 -/* 801FBA68 98 1F 01 52 */ stb r0, 0x152(r31) -lbl_801FBA6C: -/* 801FBA6C 80 7F 01 30 */ lwz r3, 0x130(r31) -/* 801FBA70 88 03 02 04 */ lbz r0, 0x204(r3) -/* 801FBA74 28 00 00 02 */ cmplwi r0, 2 -/* 801FBA78 40 82 00 20 */ bne lbl_801FBA98 -/* 801FBA7C 88 1F 01 52 */ lbz r0, 0x152(r31) -/* 801FBA80 28 00 00 01 */ cmplwi r0, 1 -/* 801FBA84 40 82 00 14 */ bne lbl_801FBA98 -/* 801FBA88 38 00 00 1A */ li r0, 0x1a -/* 801FBA8C 98 1F 01 46 */ stb r0, 0x146(r31) -/* 801FBA90 38 00 00 00 */ li r0, 0 -/* 801FBA94 98 1F 01 52 */ stb r0, 0x152(r31) -lbl_801FBA98: -/* 801FBA98 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FBA9C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FBAA0 7C 08 03 A6 */ mtlr r0 -/* 801FBAA4 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FBAA8 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/dMw_Create__FP9msg_class.s b/asm/d/menu/d_menu_window/dMw_Create__FP9msg_class.s deleted file mode 100644 index 4a2c945e0a8..00000000000 --- a/asm/d/menu/d_menu_window/dMw_Create__FP9msg_class.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_801FD8C0: -/* 801FD8C0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FD8C4 7C 08 02 A6 */ mflr r0 -/* 801FD8C8 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FD8CC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FD8D0 7C 7F 1B 78 */ mr r31, r3 -/* 801FD8D4 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801FD8D8 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801FD8DC 93 E3 00 24 */ stw r31, 0x24(r3) -/* 801FD8E0 38 00 FF FF */ li r0, -1 -/* 801FD8E4 3C 60 80 43 */ lis r3, g_mwHIO@ha /* 0x8042E86C@ha */ -/* 801FD8E8 38 63 E8 6C */ addi r3, r3, g_mwHIO@l /* 0x8042E86C@l */ -/* 801FD8EC 98 03 00 04 */ stb r0, 4(r3) -/* 801FD8F0 3C 60 80 43 */ lis r3, g_mwDHIO@ha /* 0x8042E9A8@ha */ -/* 801FD8F4 38 63 E9 A8 */ addi r3, r3, g_mwDHIO@l /* 0x8042E9A8@l */ -/* 801FD8F8 98 03 00 04 */ stb r0, 4(r3) -/* 801FD8FC 38 60 00 00 */ li r3, 0 -/* 801FD900 4B E3 08 89 */ bl dComIfGp_offHeapLockFlag__Fi -/* 801FD904 7F E3 FB 78 */ mr r3, r31 -/* 801FD908 4B E2 20 AD */ bl fopMsgM_setStageLayer__FPv -/* 801FD90C 7F E3 FB 78 */ mr r3, r31 -/* 801FD910 4B FF F8 31 */ bl _create__5dMw_cFv -/* 801FD914 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FD918 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FD91C 7C 08 03 A6 */ mtlr r0 -/* 801FD920 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FD924 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/dMw_Delete__FP5dMw_c.s b/asm/d/menu/d_menu_window/dMw_Delete__FP5dMw_c.s deleted file mode 100644 index 34cee744b39..00000000000 --- a/asm/d/menu/d_menu_window/dMw_Delete__FP5dMw_c.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_801FD888: -/* 801FD888 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FD88C 7C 08 02 A6 */ mflr r0 -/* 801FD890 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FD894 4B FF FD E9 */ bl _delete__5dMw_cFv -/* 801FD898 2C 03 00 00 */ cmpwi r3, 0 -/* 801FD89C 41 82 00 14 */ beq lbl_801FD8B0 -/* 801FD8A0 38 00 00 00 */ li r0, 0 -/* 801FD8A4 3C 80 80 43 */ lis r4, g_meter2_info@ha /* 0x80430188@ha */ -/* 801FD8A8 38 84 01 88 */ addi r4, r4, g_meter2_info@l /* 0x80430188@l */ -/* 801FD8AC 90 04 00 24 */ stw r0, 0x24(r4) -lbl_801FD8B0: -/* 801FD8B0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FD8B4 7C 08 03 A6 */ mtlr r0 -/* 801FD8B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FD8BC 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/dMw_Draw__FP5dMw_c.s b/asm/d/menu/d_menu_window/dMw_Draw__FP5dMw_c.s deleted file mode 100644 index 942444ad249..00000000000 --- a/asm/d/menu/d_menu_window/dMw_Draw__FP5dMw_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_801FD840: -/* 801FD840 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FD844 7C 08 02 A6 */ mflr r0 -/* 801FD848 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FD84C 4B FF FC 05 */ bl _draw__5dMw_cFv -/* 801FD850 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FD854 7C 08 03 A6 */ mtlr r0 -/* 801FD858 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FD85C 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/dMw_Execute__FP5dMw_c.s b/asm/d/menu/d_menu_window/dMw_Execute__FP5dMw_c.s deleted file mode 100644 index bfc717f4603..00000000000 --- a/asm/d/menu/d_menu_window/dMw_Execute__FP5dMw_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_801FD860: -/* 801FD860 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FD864 7C 08 02 A6 */ mflr r0 -/* 801FD868 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FD86C 4B FF FA 6D */ bl _execute__5dMw_cFv -/* 801FD870 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FD874 7C 08 03 A6 */ mtlr r0 -/* 801FD878 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FD87C 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/dMw_capture_create__5dMw_cFv.s b/asm/d/menu/d_menu_window/dMw_capture_create__5dMw_cFv.s deleted file mode 100644 index 82aae8612b5..00000000000 --- a/asm/d/menu/d_menu_window/dMw_capture_create__5dMw_cFv.s +++ /dev/null @@ -1,40 +0,0 @@ -lbl_801FBD80: -/* 801FBD80 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FBD84 7C 08 02 A6 */ mflr r0 -/* 801FBD88 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FBD8C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FBD90 7C 7F 1B 78 */ mr r31, r3 -/* 801FBD94 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801FBD98 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801FBD9C 88 03 5E B5 */ lbz r0, 0x5eb5(r3) -/* 801FBDA0 28 00 00 00 */ cmplwi r0, 0 -/* 801FBDA4 40 82 00 5C */ bne lbl_801FBE00 -/* 801FBDA8 80 1F 01 0C */ lwz r0, 0x10c(r31) -/* 801FBDAC 28 00 00 00 */ cmplwi r0, 0 -/* 801FBDB0 40 82 00 50 */ bne lbl_801FBE00 -/* 801FBDB4 38 60 00 08 */ li r3, 8 -/* 801FBDB8 48 0D 2E 95 */ bl __nw__FUl -/* 801FBDBC 28 03 00 00 */ cmplwi r3, 0 -/* 801FBDC0 41 82 00 30 */ beq lbl_801FBDF0 -/* 801FBDC4 3C 80 80 3A */ lis r4, __vt__12dDlst_base_c@ha /* 0x803A6F88@ha */ -/* 801FBDC8 38 04 6F 88 */ addi r0, r4, __vt__12dDlst_base_c@l /* 0x803A6F88@l */ -/* 801FBDCC 90 03 00 00 */ stw r0, 0(r3) -/* 801FBDD0 3C 80 80 3C */ lis r4, __vt__20dDlst_MENU_CAPTURE_c@ha /* 0x803BF0D4@ha */ -/* 801FBDD4 38 04 F0 D4 */ addi r0, r4, __vt__20dDlst_MENU_CAPTURE_c@l /* 0x803BF0D4@l */ -/* 801FBDD8 90 03 00 00 */ stw r0, 0(r3) -/* 801FBDDC 38 80 00 00 */ li r4, 0 -/* 801FBDE0 98 83 00 04 */ stb r4, 4(r3) -/* 801FBDE4 38 00 00 FF */ li r0, 0xff -/* 801FBDE8 98 03 00 05 */ stb r0, 5(r3) -/* 801FBDEC 98 83 00 06 */ stb r4, 6(r3) -lbl_801FBDF0: -/* 801FBDF0 90 7F 01 0C */ stw r3, 0x10c(r31) -/* 801FBDF4 38 00 00 01 */ li r0, 1 -/* 801FBDF8 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 801FBDFC 98 03 00 04 */ stb r0, 4(r3) -lbl_801FBE00: -/* 801FBE00 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FBE04 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FBE08 7C 08 03 A6 */ mtlr r0 -/* 801FBE0C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FBE10 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/dMw_capture_delete__5dMw_cFv.s b/asm/d/menu/d_menu_window/dMw_capture_delete__5dMw_cFv.s deleted file mode 100644 index dc937b34348..00000000000 --- a/asm/d/menu/d_menu_window/dMw_capture_delete__5dMw_cFv.s +++ /dev/null @@ -1,36 +0,0 @@ -lbl_801FBE14: -/* 801FBE14 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FBE18 7C 08 02 A6 */ mflr r0 -/* 801FBE1C 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FBE20 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FBE24 93 C1 00 08 */ stw r30, 8(r1) -/* 801FBE28 7C 7E 1B 78 */ mr r30, r3 -/* 801FBE2C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801FBE30 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801FBE34 88 1F 5E B5 */ lbz r0, 0x5eb5(r31) -/* 801FBE38 28 00 00 00 */ cmplwi r0, 0 -/* 801FBE3C 41 82 00 40 */ beq lbl_801FBE7C -/* 801FBE40 80 7E 01 0C */ lwz r3, 0x10c(r30) -/* 801FBE44 28 03 00 00 */ cmplwi r3, 0 -/* 801FBE48 41 82 00 24 */ beq lbl_801FBE6C -/* 801FBE4C 41 82 00 18 */ beq lbl_801FBE64 -/* 801FBE50 38 80 00 01 */ li r4, 1 -/* 801FBE54 81 83 00 00 */ lwz r12, 0(r3) -/* 801FBE58 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 801FBE5C 7D 89 03 A6 */ mtctr r12 -/* 801FBE60 4E 80 04 21 */ bctrl -lbl_801FBE64: -/* 801FBE64 38 00 00 00 */ li r0, 0 -/* 801FBE68 90 1E 01 0C */ stw r0, 0x10c(r30) -lbl_801FBE6C: -/* 801FBE6C 38 00 00 00 */ li r0, 0 -/* 801FBE70 98 1F 5E B5 */ stb r0, 0x5eb5(r31) -/* 801FBE74 38 00 00 02 */ li r0, 2 -/* 801FBE78 98 1E 01 51 */ stb r0, 0x151(r30) -lbl_801FBE7C: -/* 801FBE7C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FBE80 83 C1 00 08 */ lwz r30, 8(r1) -/* 801FBE84 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FBE88 7C 08 03 A6 */ mtlr r0 -/* 801FBE8C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FBE90 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/dMw_collect_create__5dMw_cFv.s b/asm/d/menu/d_menu_window/dMw_collect_create__5dMw_cFv.s deleted file mode 100644 index 0811f369648..00000000000 --- a/asm/d/menu/d_menu_window/dMw_collect_create__5dMw_cFv.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_801FBFF8: -/* 801FBFF8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FBFFC 7C 08 02 A6 */ mflr r0 -/* 801FC000 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FC004 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FC008 7C 7F 1B 78 */ mr r31, r3 -/* 801FC00C 48 00 10 89 */ bl markMemSize__5dMw_cFv -/* 801FC010 38 60 00 0C */ li r3, 0xc -/* 801FC014 48 0D 2C 39 */ bl __nw__FUl -/* 801FC018 7C 60 1B 79 */ or. r0, r3, r3 -/* 801FC01C 41 82 00 18 */ beq lbl_801FC034 -/* 801FC020 80 9F 01 00 */ lwz r4, 0x100(r31) -/* 801FC024 80 BF 01 04 */ lwz r5, 0x104(r31) -/* 801FC028 80 DF 01 08 */ lwz r6, 0x108(r31) -/* 801FC02C 4B FB B8 95 */ bl __ct__15dMenu_Collect_cFP10JKRExpHeapP9STControlP10CSTControl -/* 801FC030 7C 60 1B 78 */ mr r0, r3 -lbl_801FC034: -/* 801FC034 90 1F 01 14 */ stw r0, 0x114(r31) -/* 801FC038 80 7F 01 14 */ lwz r3, 0x114(r31) -/* 801FC03C 4B FB B9 D1 */ bl _create__15dMenu_Collect_cFv -/* 801FC040 3C 60 80 3E */ lis r3, m_cpadInfo__8mDoCPd_c@ha /* 0x803DD2E8@ha */ -/* 801FC044 38 63 D2 E8 */ addi r3, r3, m_cpadInfo__8mDoCPd_c@l /* 0x803DD2E8@l */ -/* 801FC048 88 03 00 39 */ lbz r0, 0x39(r3) -/* 801FC04C 28 00 00 00 */ cmplwi r0, 0 -/* 801FC050 41 82 00 14 */ beq lbl_801FC064 -/* 801FC054 7F E3 FB 78 */ mr r3, r31 -/* 801FC058 38 80 00 01 */ li r4, 1 -/* 801FC05C 48 00 0C 91 */ bl dMw_onButtonBit__5dMw_cFUc -/* 801FC060 48 00 00 1C */ b lbl_801FC07C -lbl_801FC064: -/* 801FC064 88 03 00 3B */ lbz r0, 0x3b(r3) -/* 801FC068 28 00 00 00 */ cmplwi r0, 0 -/* 801FC06C 41 82 00 10 */ beq lbl_801FC07C -/* 801FC070 7F E3 FB 78 */ mr r3, r31 -/* 801FC074 38 80 00 02 */ li r4, 2 -/* 801FC078 48 00 0C 75 */ bl dMw_onButtonBit__5dMw_cFUc -lbl_801FC07C: -/* 801FC07C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FC080 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FC084 7C 08 03 A6 */ mtlr r0 -/* 801FC088 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FC08C 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/dMw_collect_delete__5dMw_cFb.s b/asm/d/menu/d_menu_window/dMw_collect_delete__5dMw_cFb.s deleted file mode 100644 index 7f83c0c0389..00000000000 --- a/asm/d/menu/d_menu_window/dMw_collect_delete__5dMw_cFb.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_801FC090: -/* 801FC090 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FC094 7C 08 02 A6 */ mflr r0 -/* 801FC098 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FC09C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FC0A0 7C 7F 1B 78 */ mr r31, r3 -/* 801FC0A4 80 63 01 14 */ lwz r3, 0x114(r3) -/* 801FC0A8 28 03 00 00 */ cmplwi r3, 0 -/* 801FC0AC 41 82 00 30 */ beq lbl_801FC0DC -/* 801FC0B0 4B FB B9 95 */ bl _delete__15dMenu_Collect_cFv -/* 801FC0B4 80 7F 01 14 */ lwz r3, 0x114(r31) -/* 801FC0B8 28 03 00 00 */ cmplwi r3, 0 -/* 801FC0BC 41 82 00 18 */ beq lbl_801FC0D4 -/* 801FC0C0 38 80 00 01 */ li r4, 1 -/* 801FC0C4 81 83 00 00 */ lwz r12, 0(r3) -/* 801FC0C8 81 8C 00 08 */ lwz r12, 8(r12) -/* 801FC0CC 7D 89 03 A6 */ mtctr r12 -/* 801FC0D0 4E 80 04 21 */ bctrl -lbl_801FC0D4: -/* 801FC0D4 38 00 00 00 */ li r0, 0 -/* 801FC0D8 90 1F 01 14 */ stw r0, 0x114(r31) -lbl_801FC0DC: -/* 801FC0DC 7F E3 FB 78 */ mr r3, r31 -/* 801FC0E0 48 00 0F F5 */ bl checkMemSize__5dMw_cFv -/* 801FC0E4 38 60 00 01 */ li r3, 1 -/* 801FC0E8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FC0EC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FC0F0 7C 08 03 A6 */ mtlr r0 -/* 801FC0F4 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FC0F8 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/dMw_dmap_create__5dMw_cFv.s b/asm/d/menu/d_menu_window/dMw_dmap_create__5dMw_cFv.s deleted file mode 100644 index aedbb5f499d..00000000000 --- a/asm/d/menu/d_menu_window/dMw_dmap_create__5dMw_cFv.s +++ /dev/null @@ -1,79 +0,0 @@ -lbl_801FC350: -/* 801FC350 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FC354 7C 08 02 A6 */ mflr r0 -/* 801FC358 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FC35C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FC360 93 C1 00 08 */ stw r30, 8(r1) -/* 801FC364 7C 7E 1B 78 */ mr r30, r3 -/* 801FC368 48 00 0D 2D */ bl markMemSize__5dMw_cFv -/* 801FC36C 38 60 00 03 */ li r3, 3 -/* 801FC370 4B E3 1D 71 */ bl dComIfGp_setHeapLockFlag__FUc -/* 801FC374 80 1E 01 0C */ lwz r0, 0x10c(r30) -/* 801FC378 28 00 00 00 */ cmplwi r0, 0 -/* 801FC37C 40 82 00 44 */ bne lbl_801FC3C0 -/* 801FC380 38 60 00 08 */ li r3, 8 -/* 801FC384 48 0D 28 C9 */ bl __nw__FUl -/* 801FC388 28 03 00 00 */ cmplwi r3, 0 -/* 801FC38C 41 82 00 30 */ beq lbl_801FC3BC -/* 801FC390 3C 80 80 3A */ lis r4, __vt__12dDlst_base_c@ha /* 0x803A6F88@ha */ -/* 801FC394 38 04 6F 88 */ addi r0, r4, __vt__12dDlst_base_c@l /* 0x803A6F88@l */ -/* 801FC398 90 03 00 00 */ stw r0, 0(r3) -/* 801FC39C 3C 80 80 3C */ lis r4, __vt__20dDlst_MENU_CAPTURE_c@ha /* 0x803BF0D4@ha */ -/* 801FC3A0 38 04 F0 D4 */ addi r0, r4, __vt__20dDlst_MENU_CAPTURE_c@l /* 0x803BF0D4@l */ -/* 801FC3A4 90 03 00 00 */ stw r0, 0(r3) -/* 801FC3A8 38 80 00 00 */ li r4, 0 -/* 801FC3AC 98 83 00 04 */ stb r4, 4(r3) -/* 801FC3B0 38 00 00 FF */ li r0, 0xff -/* 801FC3B4 98 03 00 05 */ stb r0, 5(r3) -/* 801FC3B8 98 83 00 06 */ stb r4, 6(r3) -lbl_801FC3BC: -/* 801FC3BC 90 7E 01 0C */ stw r3, 0x10c(r30) -lbl_801FC3C0: -/* 801FC3C0 38 00 00 01 */ li r0, 1 -/* 801FC3C4 80 7E 01 0C */ lwz r3, 0x10c(r30) -/* 801FC3C8 98 03 00 04 */ stb r0, 4(r3) -/* 801FC3CC 3B E0 00 00 */ li r31, 0 -/* 801FC3D0 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801FC3D4 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801FC3D8 A0 03 00 AA */ lhz r0, 0xaa(r3) -/* 801FC3DC 28 00 02 00 */ cmplwi r0, 0x200 -/* 801FC3E0 40 82 00 0C */ bne lbl_801FC3EC -/* 801FC3E4 3B E0 00 03 */ li r31, 3 -/* 801FC3E8 48 00 00 30 */ b lbl_801FC418 -lbl_801FC3EC: -/* 801FC3EC 28 00 04 00 */ cmplwi r0, 0x400 -/* 801FC3F0 40 82 00 0C */ bne lbl_801FC3FC -/* 801FC3F4 3B E0 00 01 */ li r31, 1 -/* 801FC3F8 48 00 00 20 */ b lbl_801FC418 -lbl_801FC3FC: -/* 801FC3FC 28 00 01 00 */ cmplwi r0, 0x100 -/* 801FC400 40 82 00 0C */ bne lbl_801FC40C -/* 801FC404 3B E0 00 02 */ li r31, 2 -/* 801FC408 48 00 00 10 */ b lbl_801FC418 -lbl_801FC40C: -/* 801FC40C 28 00 00 80 */ cmplwi r0, 0x80 -/* 801FC410 40 82 00 08 */ bne lbl_801FC418 -/* 801FC414 3B E0 00 00 */ li r31, 0 -lbl_801FC418: -/* 801FC418 38 60 01 88 */ li r3, 0x188 -/* 801FC41C 48 0D 28 31 */ bl __nw__FUl -/* 801FC420 7C 60 1B 79 */ or. r0, r3, r3 -/* 801FC424 41 82 00 20 */ beq lbl_801FC444 -/* 801FC428 80 9E 01 00 */ lwz r4, 0x100(r30) -/* 801FC42C 80 BE 01 04 */ lwz r5, 0x104(r30) -/* 801FC430 80 DE 01 08 */ lwz r6, 0x108(r30) -/* 801FC434 88 FE 01 4C */ lbz r7, 0x14c(r30) -/* 801FC438 7F E8 FB 78 */ mr r8, r31 -/* 801FC43C 4B FB F0 5D */ bl __ct__12dMenu_Dmap_cFP10JKRExpHeapP9STControlP10CSTControlUcUc -/* 801FC440 7C 60 1B 78 */ mr r0, r3 -lbl_801FC444: -/* 801FC444 90 1E 01 18 */ stw r0, 0x118(r30) -/* 801FC448 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801FC44C 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801FC450 48 02 05 8D */ bl resetWarpStatus__13dMeter2Info_cFv -/* 801FC454 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FC458 83 C1 00 08 */ lwz r30, 8(r1) -/* 801FC45C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FC460 7C 08 03 A6 */ mtlr r0 -/* 801FC464 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FC468 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/dMw_dmap_delete__5dMw_cFb.s b/asm/d/menu/d_menu_window/dMw_dmap_delete__5dMw_cFb.s deleted file mode 100644 index 67287288e55..00000000000 --- a/asm/d/menu/d_menu_window/dMw_dmap_delete__5dMw_cFb.s +++ /dev/null @@ -1,52 +0,0 @@ -lbl_801FC46C: -/* 801FC46C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FC470 7C 08 02 A6 */ mflr r0 -/* 801FC474 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FC478 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FC47C 7C 7F 1B 78 */ mr r31, r3 -/* 801FC480 80 63 01 18 */ lwz r3, 0x118(r3) -/* 801FC484 28 03 00 00 */ cmplwi r3, 0 -/* 801FC488 41 82 00 4C */ beq lbl_801FC4D4 -/* 801FC48C 4B FC 2F 85 */ bl isSync__12dMenu_Dmap_cFv -/* 801FC490 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801FC494 40 82 00 0C */ bne lbl_801FC4A0 -/* 801FC498 38 60 00 00 */ li r3, 0 -/* 801FC49C 48 00 00 70 */ b lbl_801FC50C -lbl_801FC4A0: -/* 801FC4A0 80 7F 01 18 */ lwz r3, 0x118(r31) -/* 801FC4A4 88 03 01 7F */ lbz r0, 0x17f(r3) -/* 801FC4A8 98 1F 01 4C */ stb r0, 0x14c(r31) -/* 801FC4AC 80 7F 01 18 */ lwz r3, 0x118(r31) -/* 801FC4B0 28 03 00 00 */ cmplwi r3, 0 -/* 801FC4B4 41 82 00 18 */ beq lbl_801FC4CC -/* 801FC4B8 38 80 00 01 */ li r4, 1 -/* 801FC4BC 81 83 00 00 */ lwz r12, 0(r3) -/* 801FC4C0 81 8C 00 08 */ lwz r12, 8(r12) -/* 801FC4C4 7D 89 03 A6 */ mtctr r12 -/* 801FC4C8 4E 80 04 21 */ bctrl -lbl_801FC4CC: -/* 801FC4CC 38 00 00 00 */ li r0, 0 -/* 801FC4D0 90 1F 01 18 */ stw r0, 0x118(r31) -lbl_801FC4D4: -/* 801FC4D4 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 801FC4D8 28 03 00 00 */ cmplwi r3, 0 -/* 801FC4DC 41 82 00 24 */ beq lbl_801FC500 -/* 801FC4E0 41 82 00 18 */ beq lbl_801FC4F8 -/* 801FC4E4 38 80 00 01 */ li r4, 1 -/* 801FC4E8 81 83 00 00 */ lwz r12, 0(r3) -/* 801FC4EC 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 801FC4F0 7D 89 03 A6 */ mtctr r12 -/* 801FC4F4 4E 80 04 21 */ bctrl -lbl_801FC4F8: -/* 801FC4F8 38 00 00 00 */ li r0, 0 -/* 801FC4FC 90 1F 01 0C */ stw r0, 0x10c(r31) -lbl_801FC500: -/* 801FC500 7F E3 FB 78 */ mr r3, r31 -/* 801FC504 48 00 0B D1 */ bl checkMemSize__5dMw_cFv -/* 801FC508 38 60 00 01 */ li r3, 1 -lbl_801FC50C: -/* 801FC50C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FC510 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FC514 7C 08 03 A6 */ mtlr r0 -/* 801FC518 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FC51C 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/dMw_fishing_create__5dMw_cFv.s b/asm/d/menu/d_menu_window/dMw_fishing_create__5dMw_cFv.s deleted file mode 100644 index 6d11fec867e..00000000000 --- a/asm/d/menu/d_menu_window/dMw_fishing_create__5dMw_cFv.s +++ /dev/null @@ -1,44 +0,0 @@ -lbl_801FC904: -/* 801FC904 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FC908 7C 08 02 A6 */ mflr r0 -/* 801FC90C 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FC910 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FC914 7C 7F 1B 78 */ mr r31, r3 -/* 801FC918 48 00 07 7D */ bl markMemSize__5dMw_cFv -/* 801FC91C 38 60 01 FC */ li r3, 0x1fc -/* 801FC920 48 0D 23 2D */ bl __nw__FUl -/* 801FC924 7C 60 1B 79 */ or. r0, r3, r3 -/* 801FC928 41 82 00 18 */ beq lbl_801FC940 -/* 801FC92C 80 9F 01 00 */ lwz r4, 0x100(r31) -/* 801FC930 80 BF 01 04 */ lwz r5, 0x104(r31) -/* 801FC934 80 DF 01 08 */ lwz r6, 0x108(r31) -/* 801FC938 4B FC 84 1D */ bl __ct__15dMenu_Fishing_cFP10JKRExpHeapP9STControlP10CSTControl -/* 801FC93C 7C 60 1B 78 */ mr r0, r3 -lbl_801FC940: -/* 801FC940 90 1F 01 2C */ stw r0, 0x12c(r31) -/* 801FC944 80 1F 01 0C */ lwz r0, 0x10c(r31) -/* 801FC948 28 00 00 00 */ cmplwi r0, 0 -/* 801FC94C 40 82 00 44 */ bne lbl_801FC990 -/* 801FC950 38 60 00 08 */ li r3, 8 -/* 801FC954 48 0D 22 F9 */ bl __nw__FUl -/* 801FC958 28 03 00 00 */ cmplwi r3, 0 -/* 801FC95C 41 82 00 30 */ beq lbl_801FC98C -/* 801FC960 3C 80 80 3A */ lis r4, __vt__12dDlst_base_c@ha /* 0x803A6F88@ha */ -/* 801FC964 38 04 6F 88 */ addi r0, r4, __vt__12dDlst_base_c@l /* 0x803A6F88@l */ -/* 801FC968 90 03 00 00 */ stw r0, 0(r3) -/* 801FC96C 3C 80 80 3C */ lis r4, __vt__20dDlst_MENU_CAPTURE_c@ha /* 0x803BF0D4@ha */ -/* 801FC970 38 04 F0 D4 */ addi r0, r4, __vt__20dDlst_MENU_CAPTURE_c@l /* 0x803BF0D4@l */ -/* 801FC974 90 03 00 00 */ stw r0, 0(r3) -/* 801FC978 38 80 00 00 */ li r4, 0 -/* 801FC97C 98 83 00 04 */ stb r4, 4(r3) -/* 801FC980 38 00 00 FF */ li r0, 0xff -/* 801FC984 98 03 00 05 */ stb r0, 5(r3) -/* 801FC988 98 83 00 06 */ stb r4, 6(r3) -lbl_801FC98C: -/* 801FC98C 90 7F 01 0C */ stw r3, 0x10c(r31) -lbl_801FC990: -/* 801FC990 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FC994 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FC998 7C 08 03 A6 */ mtlr r0 -/* 801FC99C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FC9A0 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/dMw_fishing_delete__5dMw_cFv.s b/asm/d/menu/d_menu_window/dMw_fishing_delete__5dMw_cFv.s deleted file mode 100644 index 01c64325bdc..00000000000 --- a/asm/d/menu/d_menu_window/dMw_fishing_delete__5dMw_cFv.s +++ /dev/null @@ -1,49 +0,0 @@ -lbl_801FC9A4: -/* 801FC9A4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FC9A8 7C 08 02 A6 */ mflr r0 -/* 801FC9AC 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FC9B0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FC9B4 7C 7F 1B 78 */ mr r31, r3 -/* 801FC9B8 80 63 01 2C */ lwz r3, 0x12c(r3) -/* 801FC9BC 28 03 00 00 */ cmplwi r3, 0 -/* 801FC9C0 41 82 00 40 */ beq lbl_801FCA00 -/* 801FC9C4 4B FC 88 41 */ bl isSync__15dMenu_Fishing_cFv -/* 801FC9C8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801FC9CC 40 82 00 0C */ bne lbl_801FC9D8 -/* 801FC9D0 38 60 00 00 */ li r3, 0 -/* 801FC9D4 48 00 00 64 */ b lbl_801FCA38 -lbl_801FC9D8: -/* 801FC9D8 80 7F 01 2C */ lwz r3, 0x12c(r31) -/* 801FC9DC 28 03 00 00 */ cmplwi r3, 0 -/* 801FC9E0 41 82 00 18 */ beq lbl_801FC9F8 -/* 801FC9E4 38 80 00 01 */ li r4, 1 -/* 801FC9E8 81 83 00 00 */ lwz r12, 0(r3) -/* 801FC9EC 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 801FC9F0 7D 89 03 A6 */ mtctr r12 -/* 801FC9F4 4E 80 04 21 */ bctrl -lbl_801FC9F8: -/* 801FC9F8 38 00 00 00 */ li r0, 0 -/* 801FC9FC 90 1F 01 2C */ stw r0, 0x12c(r31) -lbl_801FCA00: -/* 801FCA00 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 801FCA04 28 03 00 00 */ cmplwi r3, 0 -/* 801FCA08 41 82 00 24 */ beq lbl_801FCA2C -/* 801FCA0C 41 82 00 18 */ beq lbl_801FCA24 -/* 801FCA10 38 80 00 01 */ li r4, 1 -/* 801FCA14 81 83 00 00 */ lwz r12, 0(r3) -/* 801FCA18 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 801FCA1C 7D 89 03 A6 */ mtctr r12 -/* 801FCA20 4E 80 04 21 */ bctrl -lbl_801FCA24: -/* 801FCA24 38 00 00 00 */ li r0, 0 -/* 801FCA28 90 1F 01 0C */ stw r0, 0x10c(r31) -lbl_801FCA2C: -/* 801FCA2C 7F E3 FB 78 */ mr r3, r31 -/* 801FCA30 48 00 06 A5 */ bl checkMemSize__5dMw_cFv -/* 801FCA34 38 60 00 01 */ li r3, 1 -lbl_801FCA38: -/* 801FCA38 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FCA3C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FCA40 7C 08 03 A6 */ mtlr r0 -/* 801FCA44 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FCA48 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/dMw_fmap_create__5dMw_cFv.s b/asm/d/menu/d_menu_window/dMw_fmap_create__5dMw_cFv.s deleted file mode 100644 index 561e8a6e939..00000000000 --- a/asm/d/menu/d_menu_window/dMw_fmap_create__5dMw_cFv.s +++ /dev/null @@ -1,99 +0,0 @@ -lbl_801FC0FC: -/* 801FC0FC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FC100 7C 08 02 A6 */ mflr r0 -/* 801FC104 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FC108 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FC10C 93 C1 00 08 */ stw r30, 8(r1) -/* 801FC110 7C 7E 1B 78 */ mr r30, r3 -/* 801FC114 48 00 0F 81 */ bl markMemSize__5dMw_cFv -/* 801FC118 38 60 00 02 */ li r3, 2 -/* 801FC11C 4B E3 1F C5 */ bl dComIfGp_setHeapLockFlag__FUc -/* 801FC120 3B E0 00 00 */ li r31, 0 -/* 801FC124 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801FC128 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801FC12C A0 83 00 AA */ lhz r4, 0xaa(r3) -/* 801FC130 28 04 04 00 */ cmplwi r4, 0x400 -/* 801FC134 41 82 00 40 */ beq lbl_801FC174 -/* 801FC138 88 03 00 BF */ lbz r0, 0xbf(r3) -/* 801FC13C 28 00 00 03 */ cmplwi r0, 3 -/* 801FC140 41 82 00 34 */ beq lbl_801FC174 -/* 801FC144 28 00 00 04 */ cmplwi r0, 4 -/* 801FC148 41 82 00 2C */ beq lbl_801FC174 -/* 801FC14C 28 00 00 05 */ cmplwi r0, 5 -/* 801FC150 41 82 00 24 */ beq lbl_801FC174 -/* 801FC154 28 00 00 07 */ cmplwi r0, 7 -/* 801FC158 41 82 00 1C */ beq lbl_801FC174 -/* 801FC15C 28 00 00 08 */ cmplwi r0, 8 -/* 801FC160 41 82 00 14 */ beq lbl_801FC174 -/* 801FC164 28 00 00 09 */ cmplwi r0, 9 -/* 801FC168 41 82 00 0C */ beq lbl_801FC174 -/* 801FC16C 28 00 00 06 */ cmplwi r0, 6 -/* 801FC170 40 82 00 0C */ bne lbl_801FC17C -lbl_801FC174: -/* 801FC174 3B E0 00 01 */ li r31, 1 -/* 801FC178 48 00 00 30 */ b lbl_801FC1A8 -lbl_801FC17C: -/* 801FC17C 28 04 02 00 */ cmplwi r4, 0x200 -/* 801FC180 40 82 00 0C */ bne lbl_801FC18C -/* 801FC184 3B E0 00 03 */ li r31, 3 -/* 801FC188 48 00 00 20 */ b lbl_801FC1A8 -lbl_801FC18C: -/* 801FC18C 28 04 01 00 */ cmplwi r4, 0x100 -/* 801FC190 40 82 00 0C */ bne lbl_801FC19C -/* 801FC194 3B E0 00 02 */ li r31, 2 -/* 801FC198 48 00 00 10 */ b lbl_801FC1A8 -lbl_801FC19C: -/* 801FC19C 28 04 00 80 */ cmplwi r4, 0x80 -/* 801FC1A0 40 82 00 08 */ bne lbl_801FC1A8 -/* 801FC1A4 3B E0 00 03 */ li r31, 3 -lbl_801FC1A8: -/* 801FC1A8 38 60 03 14 */ li r3, 0x314 -/* 801FC1AC 48 0D 2A A1 */ bl __nw__FUl -/* 801FC1B0 7C 60 1B 79 */ or. r0, r3, r3 -/* 801FC1B4 41 82 00 30 */ beq lbl_801FC1E4 -/* 801FC1B8 80 9E 01 00 */ lwz r4, 0x100(r30) -/* 801FC1BC 80 BE 01 04 */ lwz r5, 0x104(r30) -/* 801FC1C0 80 DE 01 08 */ lwz r6, 0x108(r30) -/* 801FC1C4 88 FE 01 4E */ lbz r7, 0x14e(r30) -/* 801FC1C8 89 1E 01 4F */ lbz r8, 0x14f(r30) -/* 801FC1CC 89 3E 01 50 */ lbz r9, 0x150(r30) -/* 801FC1D0 C0 3E 01 3C */ lfs f1, 0x13c(r30) -/* 801FC1D4 C0 5E 01 40 */ lfs f2, 0x140(r30) -/* 801FC1D8 7F EA FB 78 */ mr r10, r31 -/* 801FC1DC 4B FC A5 09 */ bl __ct__12dMenu_Fmap_cFP10JKRExpHeapP9STControlP10CSTControlUcUcUcffUc -/* 801FC1E0 7C 60 1B 78 */ mr r0, r3 -lbl_801FC1E4: -/* 801FC1E4 90 1E 01 1C */ stw r0, 0x11c(r30) -/* 801FC1E8 80 1E 01 0C */ lwz r0, 0x10c(r30) -/* 801FC1EC 28 00 00 00 */ cmplwi r0, 0 -/* 801FC1F0 40 82 00 44 */ bne lbl_801FC234 -/* 801FC1F4 38 60 00 08 */ li r3, 8 -/* 801FC1F8 48 0D 2A 55 */ bl __nw__FUl -/* 801FC1FC 28 03 00 00 */ cmplwi r3, 0 -/* 801FC200 41 82 00 30 */ beq lbl_801FC230 -/* 801FC204 3C 80 80 3A */ lis r4, __vt__12dDlst_base_c@ha /* 0x803A6F88@ha */ -/* 801FC208 38 04 6F 88 */ addi r0, r4, __vt__12dDlst_base_c@l /* 0x803A6F88@l */ -/* 801FC20C 90 03 00 00 */ stw r0, 0(r3) -/* 801FC210 3C 80 80 3C */ lis r4, __vt__20dDlst_MENU_CAPTURE_c@ha /* 0x803BF0D4@ha */ -/* 801FC214 38 04 F0 D4 */ addi r0, r4, __vt__20dDlst_MENU_CAPTURE_c@l /* 0x803BF0D4@l */ -/* 801FC218 90 03 00 00 */ stw r0, 0(r3) -/* 801FC21C 38 80 00 00 */ li r4, 0 -/* 801FC220 98 83 00 04 */ stb r4, 4(r3) -/* 801FC224 38 00 00 FF */ li r0, 0xff -/* 801FC228 98 03 00 05 */ stb r0, 5(r3) -/* 801FC22C 98 83 00 06 */ stb r4, 6(r3) -lbl_801FC230: -/* 801FC230 90 7E 01 0C */ stw r3, 0x10c(r30) -lbl_801FC234: -/* 801FC234 38 00 00 01 */ li r0, 1 -/* 801FC238 80 7E 01 0C */ lwz r3, 0x10c(r30) -/* 801FC23C 98 03 00 04 */ stb r0, 4(r3) -/* 801FC240 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801FC244 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801FC248 48 02 07 95 */ bl resetWarpStatus__13dMeter2Info_cFv -/* 801FC24C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FC250 83 C1 00 08 */ lwz r30, 8(r1) -/* 801FC254 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FC258 7C 08 03 A6 */ mtlr r0 -/* 801FC25C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FC260 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/dMw_fmap_delete__5dMw_cFb.s b/asm/d/menu/d_menu_window/dMw_fmap_delete__5dMw_cFb.s deleted file mode 100644 index acafb1960d3..00000000000 --- a/asm/d/menu/d_menu_window/dMw_fmap_delete__5dMw_cFb.s +++ /dev/null @@ -1,66 +0,0 @@ -lbl_801FC264: -/* 801FC264 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FC268 7C 08 02 A6 */ mflr r0 -/* 801FC26C 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FC270 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FC274 7C 7F 1B 78 */ mr r31, r3 -/* 801FC278 80 63 01 1C */ lwz r3, 0x11c(r3) -/* 801FC27C 28 03 00 00 */ cmplwi r3, 0 -/* 801FC280 41 82 00 84 */ beq lbl_801FC304 -/* 801FC284 4B FC B8 79 */ bl isSync__12dMenu_Fmap_cFv -/* 801FC288 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801FC28C 40 82 00 0C */ bne lbl_801FC298 -/* 801FC290 38 60 00 00 */ li r3, 0 -/* 801FC294 48 00 00 A8 */ b lbl_801FC33C -lbl_801FC298: -/* 801FC298 80 7F 01 1C */ lwz r3, 0x11c(r31) -/* 801FC29C 4B FC EF 41 */ bl getProcess__12dMenu_Fmap_cFv -/* 801FC2A0 98 7F 01 4E */ stb r3, 0x14e(r31) -/* 801FC2A4 80 7F 01 1C */ lwz r3, 0x11c(r31) -/* 801FC2A8 4B FC EF 59 */ bl getRegionCursor__12dMenu_Fmap_cFv -/* 801FC2AC 98 7F 01 4F */ stb r3, 0x14f(r31) -/* 801FC2B0 80 7F 01 1C */ lwz r3, 0x11c(r31) -/* 801FC2B4 4B FC EF 7D */ bl getStageCursor__12dMenu_Fmap_cFv -/* 801FC2B8 98 7F 01 50 */ stb r3, 0x150(r31) -/* 801FC2BC 80 7F 01 1C */ lwz r3, 0x11c(r31) -/* 801FC2C0 4B FC EF A1 */ bl getStageTransX__12dMenu_Fmap_cFv -/* 801FC2C4 D0 3F 01 3C */ stfs f1, 0x13c(r31) -/* 801FC2C8 80 7F 01 1C */ lwz r3, 0x11c(r31) -/* 801FC2CC 4B FC EF C5 */ bl getStageTransZ__12dMenu_Fmap_cFv -/* 801FC2D0 D0 3F 01 40 */ stfs f1, 0x140(r31) -/* 801FC2D4 80 7F 01 1C */ lwz r3, 0x11c(r31) -/* 801FC2D8 4B FC B1 CD */ bl _delete__12dMenu_Fmap_cFv -/* 801FC2DC 80 7F 01 1C */ lwz r3, 0x11c(r31) -/* 801FC2E0 28 03 00 00 */ cmplwi r3, 0 -/* 801FC2E4 41 82 00 18 */ beq lbl_801FC2FC -/* 801FC2E8 38 80 00 01 */ li r4, 1 -/* 801FC2EC 81 83 00 00 */ lwz r12, 0(r3) -/* 801FC2F0 81 8C 00 08 */ lwz r12, 8(r12) -/* 801FC2F4 7D 89 03 A6 */ mtctr r12 -/* 801FC2F8 4E 80 04 21 */ bctrl -lbl_801FC2FC: -/* 801FC2FC 38 00 00 00 */ li r0, 0 -/* 801FC300 90 1F 01 1C */ stw r0, 0x11c(r31) -lbl_801FC304: -/* 801FC304 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 801FC308 28 03 00 00 */ cmplwi r3, 0 -/* 801FC30C 41 82 00 24 */ beq lbl_801FC330 -/* 801FC310 41 82 00 18 */ beq lbl_801FC328 -/* 801FC314 38 80 00 01 */ li r4, 1 -/* 801FC318 81 83 00 00 */ lwz r12, 0(r3) -/* 801FC31C 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 801FC320 7D 89 03 A6 */ mtctr r12 -/* 801FC324 4E 80 04 21 */ bctrl -lbl_801FC328: -/* 801FC328 38 00 00 00 */ li r0, 0 -/* 801FC32C 90 1F 01 0C */ stw r0, 0x10c(r31) -lbl_801FC330: -/* 801FC330 7F E3 FB 78 */ mr r3, r31 -/* 801FC334 48 00 0D A1 */ bl checkMemSize__5dMw_cFv -/* 801FC338 38 60 00 01 */ li r3, 1 -lbl_801FC33C: -/* 801FC33C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FC340 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FC344 7C 08 03 A6 */ mtlr r0 -/* 801FC348 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FC34C 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/dMw_insect_create__5dMw_cFUc.s b/asm/d/menu/d_menu_window/dMw_insect_create__5dMw_cFUc.s deleted file mode 100644 index 61db62a3b29..00000000000 --- a/asm/d/menu/d_menu_window/dMw_insect_create__5dMw_cFUc.s +++ /dev/null @@ -1,48 +0,0 @@ -lbl_801FCB94: -/* 801FCB94 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FCB98 7C 08 02 A6 */ mflr r0 -/* 801FCB9C 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FCBA0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FCBA4 93 C1 00 08 */ stw r30, 8(r1) -/* 801FCBA8 7C 7E 1B 78 */ mr r30, r3 -/* 801FCBAC 7C 9F 23 78 */ mr r31, r4 -/* 801FCBB0 48 00 04 E5 */ bl markMemSize__5dMw_cFv -/* 801FCBB4 38 60 01 00 */ li r3, 0x100 -/* 801FCBB8 48 0D 20 95 */ bl __nw__FUl -/* 801FCBBC 7C 60 1B 79 */ or. r0, r3, r3 -/* 801FCBC0 41 82 00 1C */ beq lbl_801FCBDC -/* 801FCBC4 80 9E 01 00 */ lwz r4, 0x100(r30) -/* 801FCBC8 80 BE 01 04 */ lwz r5, 0x104(r30) -/* 801FCBCC 80 DE 01 08 */ lwz r6, 0x108(r30) -/* 801FCBD0 7F E7 FB 78 */ mr r7, r31 -/* 801FCBD4 4B FD B5 41 */ bl __ct__14dMenu_Insect_cFP10JKRExpHeapP9STControlP10CSTControlUc -/* 801FCBD8 7C 60 1B 78 */ mr r0, r3 -lbl_801FCBDC: -/* 801FCBDC 90 1E 01 34 */ stw r0, 0x134(r30) -/* 801FCBE0 80 1E 01 0C */ lwz r0, 0x10c(r30) -/* 801FCBE4 28 00 00 00 */ cmplwi r0, 0 -/* 801FCBE8 40 82 00 44 */ bne lbl_801FCC2C -/* 801FCBEC 38 60 00 08 */ li r3, 8 -/* 801FCBF0 48 0D 20 5D */ bl __nw__FUl -/* 801FCBF4 28 03 00 00 */ cmplwi r3, 0 -/* 801FCBF8 41 82 00 30 */ beq lbl_801FCC28 -/* 801FCBFC 3C 80 80 3A */ lis r4, __vt__12dDlst_base_c@ha /* 0x803A6F88@ha */ -/* 801FCC00 38 04 6F 88 */ addi r0, r4, __vt__12dDlst_base_c@l /* 0x803A6F88@l */ -/* 801FCC04 90 03 00 00 */ stw r0, 0(r3) -/* 801FCC08 3C 80 80 3C */ lis r4, __vt__20dDlst_MENU_CAPTURE_c@ha /* 0x803BF0D4@ha */ -/* 801FCC0C 38 04 F0 D4 */ addi r0, r4, __vt__20dDlst_MENU_CAPTURE_c@l /* 0x803BF0D4@l */ -/* 801FCC10 90 03 00 00 */ stw r0, 0(r3) -/* 801FCC14 38 80 00 00 */ li r4, 0 -/* 801FCC18 98 83 00 04 */ stb r4, 4(r3) -/* 801FCC1C 38 00 00 FF */ li r0, 0xff -/* 801FCC20 98 03 00 05 */ stb r0, 5(r3) -/* 801FCC24 98 83 00 06 */ stb r4, 6(r3) -lbl_801FCC28: -/* 801FCC28 90 7E 01 0C */ stw r3, 0x10c(r30) -lbl_801FCC2C: -/* 801FCC2C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FCC30 83 C1 00 08 */ lwz r30, 8(r1) -/* 801FCC34 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FCC38 7C 08 03 A6 */ mtlr r0 -/* 801FCC3C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FCC40 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/dMw_insect_delete__5dMw_cFv.s b/asm/d/menu/d_menu_window/dMw_insect_delete__5dMw_cFv.s deleted file mode 100644 index 7ff7d8f520f..00000000000 --- a/asm/d/menu/d_menu_window/dMw_insect_delete__5dMw_cFv.s +++ /dev/null @@ -1,49 +0,0 @@ -lbl_801FCC44: -/* 801FCC44 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FCC48 7C 08 02 A6 */ mflr r0 -/* 801FCC4C 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FCC50 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FCC54 7C 7F 1B 78 */ mr r31, r3 -/* 801FCC58 80 63 01 34 */ lwz r3, 0x134(r3) -/* 801FCC5C 28 03 00 00 */ cmplwi r3, 0 -/* 801FCC60 41 82 00 40 */ beq lbl_801FCCA0 -/* 801FCC64 4B FD BC 89 */ bl isSync__14dMenu_Insect_cFv -/* 801FCC68 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801FCC6C 40 82 00 0C */ bne lbl_801FCC78 -/* 801FCC70 38 60 00 00 */ li r3, 0 -/* 801FCC74 48 00 00 64 */ b lbl_801FCCD8 -lbl_801FCC78: -/* 801FCC78 80 7F 01 34 */ lwz r3, 0x134(r31) -/* 801FCC7C 28 03 00 00 */ cmplwi r3, 0 -/* 801FCC80 41 82 00 18 */ beq lbl_801FCC98 -/* 801FCC84 38 80 00 01 */ li r4, 1 -/* 801FCC88 81 83 00 00 */ lwz r12, 0(r3) -/* 801FCC8C 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 801FCC90 7D 89 03 A6 */ mtctr r12 -/* 801FCC94 4E 80 04 21 */ bctrl -lbl_801FCC98: -/* 801FCC98 38 00 00 00 */ li r0, 0 -/* 801FCC9C 90 1F 01 34 */ stw r0, 0x134(r31) -lbl_801FCCA0: -/* 801FCCA0 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 801FCCA4 28 03 00 00 */ cmplwi r3, 0 -/* 801FCCA8 41 82 00 24 */ beq lbl_801FCCCC -/* 801FCCAC 41 82 00 18 */ beq lbl_801FCCC4 -/* 801FCCB0 38 80 00 01 */ li r4, 1 -/* 801FCCB4 81 83 00 00 */ lwz r12, 0(r3) -/* 801FCCB8 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 801FCCBC 7D 89 03 A6 */ mtctr r12 -/* 801FCCC0 4E 80 04 21 */ bctrl -lbl_801FCCC4: -/* 801FCCC4 38 00 00 00 */ li r0, 0 -/* 801FCCC8 90 1F 01 0C */ stw r0, 0x10c(r31) -lbl_801FCCCC: -/* 801FCCCC 7F E3 FB 78 */ mr r3, r31 -/* 801FCCD0 48 00 04 05 */ bl checkMemSize__5dMw_cFv -/* 801FCCD4 38 60 00 01 */ li r3, 1 -lbl_801FCCD8: -/* 801FCCD8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FCCDC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FCCE0 7C 08 03 A6 */ mtlr r0 -/* 801FCCE4 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FCCE8 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/dMw_isButtonBit__5dMw_cFUc.s b/asm/d/menu/d_menu_window/dMw_isButtonBit__5dMw_cFUc.s deleted file mode 100644 index 8d9e4d5a98f..00000000000 --- a/asm/d/menu/d_menu_window/dMw_isButtonBit__5dMw_cFUc.s +++ /dev/null @@ -1,7 +0,0 @@ -lbl_801FCD0C: -/* 801FCD0C 88 63 01 45 */ lbz r3, 0x145(r3) -/* 801FCD10 54 80 06 3E */ clrlwi r0, r4, 0x18 -/* 801FCD14 7C 63 00 38 */ and r3, r3, r0 -/* 801FCD18 30 03 FF FF */ addic r0, r3, -1 -/* 801FCD1C 7C 60 19 10 */ subfe r3, r0, r3 -/* 801FCD20 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/dMw_isPush_S_Button__5dMw_cFv.s b/asm/d/menu/d_menu_window/dMw_isPush_S_Button__5dMw_cFv.s deleted file mode 100644 index dc7360bc1a2..00000000000 --- a/asm/d/menu/d_menu_window/dMw_isPush_S_Button__5dMw_cFv.s +++ /dev/null @@ -1,49 +0,0 @@ -lbl_801FCD24: -/* 801FCD24 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FCD28 7C 08 02 A6 */ mflr r0 -/* 801FCD2C 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FCD30 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FCD34 80 6D 86 48 */ lwz r3, mFader__13mDoGph_gInf_c(r13) -/* 801FCD38 80 03 00 04 */ lwz r0, 4(r3) -/* 801FCD3C 2C 00 00 01 */ cmpwi r0, 1 -/* 801FCD40 40 82 00 80 */ bne lbl_801FCDC0 -/* 801FCD44 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801FCD48 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801FCD4C 80 7F 5D B4 */ lwz r3, 0x5db4(r31) -/* 801FCD50 81 83 06 28 */ lwz r12, 0x628(r3) -/* 801FCD54 81 8C 02 6C */ lwz r12, 0x26c(r12) -/* 801FCD58 7D 89 03 A6 */ mtctr r12 -/* 801FCD5C 4E 80 04 21 */ bctrl -/* 801FCD60 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801FCD64 40 82 00 5C */ bne lbl_801FCDC0 -/* 801FCD68 80 7F 5D B4 */ lwz r3, 0x5db4(r31) -/* 801FCD6C 81 83 06 28 */ lwz r12, 0x628(r3) -/* 801FCD70 81 8C 02 70 */ lwz r12, 0x270(r12) -/* 801FCD74 7D 89 03 A6 */ mtctr r12 -/* 801FCD78 4E 80 04 21 */ bctrl -/* 801FCD7C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801FCD80 40 82 00 40 */ bne lbl_801FCDC0 -/* 801FCD84 80 7F 5D B4 */ lwz r3, 0x5db4(r31) -/* 801FCD88 81 83 06 28 */ lwz r12, 0x628(r3) -/* 801FCD8C 81 8C 02 74 */ lwz r12, 0x274(r12) -/* 801FCD90 7D 89 03 A6 */ mtctr r12 -/* 801FCD94 4E 80 04 21 */ bctrl -/* 801FCD98 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801FCD9C 40 82 00 24 */ bne lbl_801FCDC0 -/* 801FCDA0 4B FF D2 D9 */ bl dMw_START_TRIGGER__Fv -/* 801FCDA4 2C 03 00 00 */ cmpwi r3, 0 -/* 801FCDA8 40 82 00 10 */ bne lbl_801FCDB8 -/* 801FCDAC 4B FF D2 A5 */ bl dMw_B_TRIGGER__Fv -/* 801FCDB0 2C 03 00 00 */ cmpwi r3, 0 -/* 801FCDB4 41 82 00 0C */ beq lbl_801FCDC0 -lbl_801FCDB8: -/* 801FCDB8 38 60 00 01 */ li r3, 1 -/* 801FCDBC 48 00 00 08 */ b lbl_801FCDC4 -lbl_801FCDC0: -/* 801FCDC0 38 60 00 00 */ li r3, 0 -lbl_801FCDC4: -/* 801FCDC4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FCDC8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FCDCC 7C 08 03 A6 */ mtlr r0 -/* 801FCDD0 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FCDD4 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/dMw_letter_create__5dMw_cFv.s b/asm/d/menu/d_menu_window/dMw_letter_create__5dMw_cFv.s deleted file mode 100644 index 3bcbcf9288d..00000000000 --- a/asm/d/menu/d_menu_window/dMw_letter_create__5dMw_cFv.s +++ /dev/null @@ -1,44 +0,0 @@ -lbl_801FC7BC: -/* 801FC7BC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FC7C0 7C 08 02 A6 */ mflr r0 -/* 801FC7C4 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FC7C8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FC7CC 7C 7F 1B 78 */ mr r31, r3 -/* 801FC7D0 48 00 08 C5 */ bl markMemSize__5dMw_cFv -/* 801FC7D4 38 60 03 E8 */ li r3, 0x3e8 -/* 801FC7D8 48 0D 24 75 */ bl __nw__FUl -/* 801FC7DC 7C 60 1B 79 */ or. r0, r3, r3 -/* 801FC7E0 41 82 00 18 */ beq lbl_801FC7F8 -/* 801FC7E4 80 9F 01 00 */ lwz r4, 0x100(r31) -/* 801FC7E8 80 BF 01 04 */ lwz r5, 0x104(r31) -/* 801FC7EC 80 DF 01 08 */ lwz r6, 0x108(r31) -/* 801FC7F0 4B FE 05 D1 */ bl __ct__14dMenu_Letter_cFP10JKRExpHeapP9STControlP10CSTControl -/* 801FC7F4 7C 60 1B 78 */ mr r0, r3 -lbl_801FC7F8: -/* 801FC7F8 90 1F 01 28 */ stw r0, 0x128(r31) -/* 801FC7FC 80 1F 01 0C */ lwz r0, 0x10c(r31) -/* 801FC800 28 00 00 00 */ cmplwi r0, 0 -/* 801FC804 40 82 00 44 */ bne lbl_801FC848 -/* 801FC808 38 60 00 08 */ li r3, 8 -/* 801FC80C 48 0D 24 41 */ bl __nw__FUl -/* 801FC810 28 03 00 00 */ cmplwi r3, 0 -/* 801FC814 41 82 00 30 */ beq lbl_801FC844 -/* 801FC818 3C 80 80 3A */ lis r4, __vt__12dDlst_base_c@ha /* 0x803A6F88@ha */ -/* 801FC81C 38 04 6F 88 */ addi r0, r4, __vt__12dDlst_base_c@l /* 0x803A6F88@l */ -/* 801FC820 90 03 00 00 */ stw r0, 0(r3) -/* 801FC824 3C 80 80 3C */ lis r4, __vt__20dDlst_MENU_CAPTURE_c@ha /* 0x803BF0D4@ha */ -/* 801FC828 38 04 F0 D4 */ addi r0, r4, __vt__20dDlst_MENU_CAPTURE_c@l /* 0x803BF0D4@l */ -/* 801FC82C 90 03 00 00 */ stw r0, 0(r3) -/* 801FC830 38 80 00 00 */ li r4, 0 -/* 801FC834 98 83 00 04 */ stb r4, 4(r3) -/* 801FC838 38 00 00 FF */ li r0, 0xff -/* 801FC83C 98 03 00 05 */ stb r0, 5(r3) -/* 801FC840 98 83 00 06 */ stb r4, 6(r3) -lbl_801FC844: -/* 801FC844 90 7F 01 0C */ stw r3, 0x10c(r31) -lbl_801FC848: -/* 801FC848 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FC84C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FC850 7C 08 03 A6 */ mtlr r0 -/* 801FC854 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FC858 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/dMw_letter_delete__5dMw_cFv.s b/asm/d/menu/d_menu_window/dMw_letter_delete__5dMw_cFv.s deleted file mode 100644 index 47481c4b660..00000000000 --- a/asm/d/menu/d_menu_window/dMw_letter_delete__5dMw_cFv.s +++ /dev/null @@ -1,49 +0,0 @@ -lbl_801FC85C: -/* 801FC85C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FC860 7C 08 02 A6 */ mflr r0 -/* 801FC864 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FC868 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FC86C 7C 7F 1B 78 */ mr r31, r3 -/* 801FC870 80 63 01 28 */ lwz r3, 0x128(r3) -/* 801FC874 28 03 00 00 */ cmplwi r3, 0 -/* 801FC878 41 82 00 40 */ beq lbl_801FC8B8 -/* 801FC87C 4B FE 10 B9 */ bl isSync__14dMenu_Letter_cFv -/* 801FC880 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801FC884 40 82 00 0C */ bne lbl_801FC890 -/* 801FC888 38 60 00 00 */ li r3, 0 -/* 801FC88C 48 00 00 64 */ b lbl_801FC8F0 -lbl_801FC890: -/* 801FC890 80 7F 01 28 */ lwz r3, 0x128(r31) -/* 801FC894 28 03 00 00 */ cmplwi r3, 0 -/* 801FC898 41 82 00 18 */ beq lbl_801FC8B0 -/* 801FC89C 38 80 00 01 */ li r4, 1 -/* 801FC8A0 81 83 00 00 */ lwz r12, 0(r3) -/* 801FC8A4 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 801FC8A8 7D 89 03 A6 */ mtctr r12 -/* 801FC8AC 4E 80 04 21 */ bctrl -lbl_801FC8B0: -/* 801FC8B0 38 00 00 00 */ li r0, 0 -/* 801FC8B4 90 1F 01 28 */ stw r0, 0x128(r31) -lbl_801FC8B8: -/* 801FC8B8 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 801FC8BC 28 03 00 00 */ cmplwi r3, 0 -/* 801FC8C0 41 82 00 24 */ beq lbl_801FC8E4 -/* 801FC8C4 41 82 00 18 */ beq lbl_801FC8DC -/* 801FC8C8 38 80 00 01 */ li r4, 1 -/* 801FC8CC 81 83 00 00 */ lwz r12, 0(r3) -/* 801FC8D0 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 801FC8D4 7D 89 03 A6 */ mtctr r12 -/* 801FC8D8 4E 80 04 21 */ bctrl -lbl_801FC8DC: -/* 801FC8DC 38 00 00 00 */ li r0, 0 -/* 801FC8E0 90 1F 01 0C */ stw r0, 0x10c(r31) -lbl_801FC8E4: -/* 801FC8E4 7F E3 FB 78 */ mr r3, r31 -/* 801FC8E8 48 00 07 ED */ bl checkMemSize__5dMw_cFv -/* 801FC8EC 38 60 00 01 */ li r3, 1 -lbl_801FC8F0: -/* 801FC8F0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FC8F4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FC8F8 7C 08 03 A6 */ mtlr r0 -/* 801FC8FC 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FC900 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/dMw_offButtonBit__5dMw_cFUc.s b/asm/d/menu/d_menu_window/dMw_offButtonBit__5dMw_cFUc.s deleted file mode 100644 index 269d00b181a..00000000000 --- a/asm/d/menu/d_menu_window/dMw_offButtonBit__5dMw_cFUc.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_801FCCFC: -/* 801FCCFC 88 03 01 45 */ lbz r0, 0x145(r3) -/* 801FCD00 7C 00 20 78 */ andc r0, r0, r4 -/* 801FCD04 98 03 01 45 */ stb r0, 0x145(r3) -/* 801FCD08 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/dMw_onButtonBit__5dMw_cFUc.s b/asm/d/menu/d_menu_window/dMw_onButtonBit__5dMw_cFUc.s deleted file mode 100644 index b763db50ac1..00000000000 --- a/asm/d/menu/d_menu_window/dMw_onButtonBit__5dMw_cFUc.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_801FCCEC: -/* 801FCCEC 88 03 01 45 */ lbz r0, 0x145(r3) -/* 801FCCF0 7C 00 23 78 */ or r0, r0, r4 -/* 801FCCF4 98 03 01 45 */ stb r0, 0x145(r3) -/* 801FCCF8 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/dMw_option_create__5dMw_cFv.s b/asm/d/menu/d_menu_window/dMw_option_create__5dMw_cFv.s deleted file mode 100644 index 197c36a44d6..00000000000 --- a/asm/d/menu/d_menu_window/dMw_option_create__5dMw_cFv.s +++ /dev/null @@ -1,45 +0,0 @@ -lbl_801FC668: -/* 801FC668 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FC66C 7C 08 02 A6 */ mflr r0 -/* 801FC670 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FC674 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FC678 7C 7F 1B 78 */ mr r31, r3 -/* 801FC67C 48 00 0A 19 */ bl markMemSize__5dMw_cFv -/* 801FC680 38 60 04 0C */ li r3, 0x40c -/* 801FC684 48 0D 25 C9 */ bl __nw__FUl -/* 801FC688 7C 60 1B 79 */ or. r0, r3, r3 -/* 801FC68C 41 82 00 1C */ beq lbl_801FC6A8 -/* 801FC690 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801FC694 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801FC698 80 84 5C B8 */ lwz r4, 0x5cb8(r4) -/* 801FC69C 80 BF 01 04 */ lwz r5, 0x104(r31) -/* 801FC6A0 4B FE 58 71 */ bl __ct__14dMenu_Option_cFP10JKRArchiveP9STControl -/* 801FC6A4 7C 60 1B 78 */ mr r0, r3 -lbl_801FC6A8: -/* 801FC6A8 90 1F 01 24 */ stw r0, 0x124(r31) -/* 801FC6AC 80 1F 01 0C */ lwz r0, 0x10c(r31) -/* 801FC6B0 28 00 00 00 */ cmplwi r0, 0 -/* 801FC6B4 40 82 00 44 */ bne lbl_801FC6F8 -/* 801FC6B8 38 60 00 08 */ li r3, 8 -/* 801FC6BC 48 0D 25 91 */ bl __nw__FUl -/* 801FC6C0 28 03 00 00 */ cmplwi r3, 0 -/* 801FC6C4 41 82 00 30 */ beq lbl_801FC6F4 -/* 801FC6C8 3C 80 80 3A */ lis r4, __vt__12dDlst_base_c@ha /* 0x803A6F88@ha */ -/* 801FC6CC 38 04 6F 88 */ addi r0, r4, __vt__12dDlst_base_c@l /* 0x803A6F88@l */ -/* 801FC6D0 90 03 00 00 */ stw r0, 0(r3) -/* 801FC6D4 3C 80 80 3C */ lis r4, __vt__20dDlst_MENU_CAPTURE_c@ha /* 0x803BF0D4@ha */ -/* 801FC6D8 38 04 F0 D4 */ addi r0, r4, __vt__20dDlst_MENU_CAPTURE_c@l /* 0x803BF0D4@l */ -/* 801FC6DC 90 03 00 00 */ stw r0, 0(r3) -/* 801FC6E0 38 80 00 00 */ li r4, 0 -/* 801FC6E4 98 83 00 04 */ stb r4, 4(r3) -/* 801FC6E8 38 00 00 FF */ li r0, 0xff -/* 801FC6EC 98 03 00 05 */ stb r0, 5(r3) -/* 801FC6F0 98 83 00 06 */ stb r4, 6(r3) -lbl_801FC6F4: -/* 801FC6F4 90 7F 01 0C */ stw r3, 0x10c(r31) -lbl_801FC6F8: -/* 801FC6F8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FC6FC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FC700 7C 08 03 A6 */ mtlr r0 -/* 801FC704 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FC708 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/dMw_option_delete__5dMw_cFv.s b/asm/d/menu/d_menu_window/dMw_option_delete__5dMw_cFv.s deleted file mode 100644 index 8907b6e5849..00000000000 --- a/asm/d/menu/d_menu_window/dMw_option_delete__5dMw_cFv.s +++ /dev/null @@ -1,51 +0,0 @@ -lbl_801FC70C: -/* 801FC70C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FC710 7C 08 02 A6 */ mflr r0 -/* 801FC714 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FC718 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FC71C 7C 7F 1B 78 */ mr r31, r3 -/* 801FC720 80 63 01 24 */ lwz r3, 0x124(r3) -/* 801FC724 28 03 00 00 */ cmplwi r3, 0 -/* 801FC728 41 82 00 48 */ beq lbl_801FC770 -/* 801FC72C 4B FE 73 51 */ bl isSync__14dMenu_Option_cFv -/* 801FC730 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801FC734 40 82 00 0C */ bne lbl_801FC740 -/* 801FC738 38 60 00 00 */ li r3, 0 -/* 801FC73C 48 00 00 6C */ b lbl_801FC7A8 -lbl_801FC740: -/* 801FC740 80 7F 01 24 */ lwz r3, 0x124(r31) -/* 801FC744 4B FE 64 D9 */ bl _delete__14dMenu_Option_cFv -/* 801FC748 80 7F 01 24 */ lwz r3, 0x124(r31) -/* 801FC74C 28 03 00 00 */ cmplwi r3, 0 -/* 801FC750 41 82 00 18 */ beq lbl_801FC768 -/* 801FC754 38 80 00 01 */ li r4, 1 -/* 801FC758 81 83 00 00 */ lwz r12, 0(r3) -/* 801FC75C 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 801FC760 7D 89 03 A6 */ mtctr r12 -/* 801FC764 4E 80 04 21 */ bctrl -lbl_801FC768: -/* 801FC768 38 00 00 00 */ li r0, 0 -/* 801FC76C 90 1F 01 24 */ stw r0, 0x124(r31) -lbl_801FC770: -/* 801FC770 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 801FC774 28 03 00 00 */ cmplwi r3, 0 -/* 801FC778 41 82 00 24 */ beq lbl_801FC79C -/* 801FC77C 41 82 00 18 */ beq lbl_801FC794 -/* 801FC780 38 80 00 01 */ li r4, 1 -/* 801FC784 81 83 00 00 */ lwz r12, 0(r3) -/* 801FC788 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 801FC78C 7D 89 03 A6 */ mtctr r12 -/* 801FC790 4E 80 04 21 */ bctrl -lbl_801FC794: -/* 801FC794 38 00 00 00 */ li r0, 0 -/* 801FC798 90 1F 01 0C */ stw r0, 0x10c(r31) -lbl_801FC79C: -/* 801FC79C 7F E3 FB 78 */ mr r3, r31 -/* 801FC7A0 48 00 09 35 */ bl checkMemSize__5dMw_cFv -/* 801FC7A4 38 60 00 01 */ li r3, 1 -lbl_801FC7A8: -/* 801FC7A8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FC7AC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FC7B0 7C 08 03 A6 */ mtlr r0 -/* 801FC7B4 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FC7B8 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/dMw_ring_create__5dMw_cFUc.s b/asm/d/menu/d_menu_window/dMw_ring_create__5dMw_cFUc.s deleted file mode 100644 index 7216235fedc..00000000000 --- a/asm/d/menu/d_menu_window/dMw_ring_create__5dMw_cFUc.s +++ /dev/null @@ -1,55 +0,0 @@ -lbl_801FBE94: -/* 801FBE94 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FBE98 7C 08 02 A6 */ mflr r0 -/* 801FBE9C 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FBEA0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FBEA4 93 C1 00 08 */ stw r30, 8(r1) -/* 801FBEA8 7C 7E 1B 78 */ mr r30, r3 -/* 801FBEAC 7C 9F 23 78 */ mr r31, r4 -/* 801FBEB0 48 00 11 E5 */ bl markMemSize__5dMw_cFv -/* 801FBEB4 38 60 00 01 */ li r3, 1 -/* 801FBEB8 4B E3 22 29 */ bl dComIfGp_setHeapLockFlag__FUc -/* 801FBEBC 38 60 06 D4 */ li r3, 0x6d4 -/* 801FBEC0 48 0D 2D 8D */ bl __nw__FUl -/* 801FBEC4 7C 60 1B 79 */ or. r0, r3, r3 -/* 801FBEC8 41 82 00 1C */ beq lbl_801FBEE4 -/* 801FBECC 80 9E 01 00 */ lwz r4, 0x100(r30) -/* 801FBED0 80 BE 01 04 */ lwz r5, 0x104(r30) -/* 801FBED4 80 DE 01 08 */ lwz r6, 0x108(r30) -/* 801FBED8 7F E7 FB 78 */ mr r7, r31 -/* 801FBEDC 4B FE D2 3D */ bl __ct__12dMenu_Ring_cFP10JKRExpHeapP9STControlP10CSTControlUc -/* 801FBEE0 7C 60 1B 78 */ mr r0, r3 -lbl_801FBEE4: -/* 801FBEE4 90 1E 01 10 */ stw r0, 0x110(r30) -/* 801FBEE8 80 7E 01 10 */ lwz r3, 0x110(r30) -/* 801FBEEC 4B FE EC 91 */ bl _create__12dMenu_Ring_cFv -/* 801FBEF0 80 1E 01 0C */ lwz r0, 0x10c(r30) -/* 801FBEF4 28 00 00 00 */ cmplwi r0, 0 -/* 801FBEF8 40 82 00 44 */ bne lbl_801FBF3C -/* 801FBEFC 38 60 00 08 */ li r3, 8 -/* 801FBF00 48 0D 2D 4D */ bl __nw__FUl -/* 801FBF04 28 03 00 00 */ cmplwi r3, 0 -/* 801FBF08 41 82 00 30 */ beq lbl_801FBF38 -/* 801FBF0C 3C 80 80 3A */ lis r4, __vt__12dDlst_base_c@ha /* 0x803A6F88@ha */ -/* 801FBF10 38 04 6F 88 */ addi r0, r4, __vt__12dDlst_base_c@l /* 0x803A6F88@l */ -/* 801FBF14 90 03 00 00 */ stw r0, 0(r3) -/* 801FBF18 3C 80 80 3C */ lis r4, __vt__20dDlst_MENU_CAPTURE_c@ha /* 0x803BF0D4@ha */ -/* 801FBF1C 38 04 F0 D4 */ addi r0, r4, __vt__20dDlst_MENU_CAPTURE_c@l /* 0x803BF0D4@l */ -/* 801FBF20 90 03 00 00 */ stw r0, 0(r3) -/* 801FBF24 38 80 00 00 */ li r4, 0 -/* 801FBF28 98 83 00 04 */ stb r4, 4(r3) -/* 801FBF2C 38 00 00 FF */ li r0, 0xff -/* 801FBF30 98 03 00 05 */ stb r0, 5(r3) -/* 801FBF34 98 83 00 06 */ stb r4, 6(r3) -lbl_801FBF38: -/* 801FBF38 90 7E 01 0C */ stw r3, 0x10c(r30) -lbl_801FBF3C: -/* 801FBF3C 38 00 00 01 */ li r0, 1 -/* 801FBF40 80 7E 01 0C */ lwz r3, 0x10c(r30) -/* 801FBF44 98 03 00 04 */ stb r0, 4(r3) -/* 801FBF48 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FBF4C 83 C1 00 08 */ lwz r30, 8(r1) -/* 801FBF50 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FBF54 7C 08 03 A6 */ mtlr r0 -/* 801FBF58 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FBF5C 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/dMw_ring_delete__5dMw_cFv.s b/asm/d/menu/d_menu_window/dMw_ring_delete__5dMw_cFv.s deleted file mode 100644 index 2e387b2ba5e..00000000000 --- a/asm/d/menu/d_menu_window/dMw_ring_delete__5dMw_cFv.s +++ /dev/null @@ -1,43 +0,0 @@ -lbl_801FBF60: -/* 801FBF60 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FBF64 7C 08 02 A6 */ mflr r0 -/* 801FBF68 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FBF6C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FBF70 7C 7F 1B 78 */ mr r31, r3 -/* 801FBF74 80 63 01 10 */ lwz r3, 0x110(r3) -/* 801FBF78 28 03 00 00 */ cmplwi r3, 0 -/* 801FBF7C 41 82 00 30 */ beq lbl_801FBFAC -/* 801FBF80 4B FE EC 69 */ bl _delete__12dMenu_Ring_cFv -/* 801FBF84 80 7F 01 10 */ lwz r3, 0x110(r31) -/* 801FBF88 28 03 00 00 */ cmplwi r3, 0 -/* 801FBF8C 41 82 00 18 */ beq lbl_801FBFA4 -/* 801FBF90 38 80 00 01 */ li r4, 1 -/* 801FBF94 81 83 00 00 */ lwz r12, 0(r3) -/* 801FBF98 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 801FBF9C 7D 89 03 A6 */ mtctr r12 -/* 801FBFA0 4E 80 04 21 */ bctrl -lbl_801FBFA4: -/* 801FBFA4 38 00 00 00 */ li r0, 0 -/* 801FBFA8 90 1F 01 10 */ stw r0, 0x110(r31) -lbl_801FBFAC: -/* 801FBFAC 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 801FBFB0 28 03 00 00 */ cmplwi r3, 0 -/* 801FBFB4 41 82 00 24 */ beq lbl_801FBFD8 -/* 801FBFB8 41 82 00 18 */ beq lbl_801FBFD0 -/* 801FBFBC 38 80 00 01 */ li r4, 1 -/* 801FBFC0 81 83 00 00 */ lwz r12, 0(r3) -/* 801FBFC4 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 801FBFC8 7D 89 03 A6 */ mtctr r12 -/* 801FBFCC 4E 80 04 21 */ bctrl -lbl_801FBFD0: -/* 801FBFD0 38 00 00 00 */ li r0, 0 -/* 801FBFD4 90 1F 01 0C */ stw r0, 0x10c(r31) -lbl_801FBFD8: -/* 801FBFD8 7F E3 FB 78 */ mr r3, r31 -/* 801FBFDC 48 00 10 F9 */ bl checkMemSize__5dMw_cFv -/* 801FBFE0 38 60 00 01 */ li r3, 1 -/* 801FBFE4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FBFE8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FBFEC 7C 08 03 A6 */ mtlr r0 -/* 801FBFF0 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FBFF4 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/dMw_save_create__5dMw_cFv.s b/asm/d/menu/d_menu_window/dMw_save_create__5dMw_cFv.s deleted file mode 100644 index e2ed9eedd78..00000000000 --- a/asm/d/menu/d_menu_window/dMw_save_create__5dMw_cFv.s +++ /dev/null @@ -1,48 +0,0 @@ -lbl_801FC520: -/* 801FC520 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FC524 7C 08 02 A6 */ mflr r0 -/* 801FC528 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FC52C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FC530 7C 7F 1B 78 */ mr r31, r3 -/* 801FC534 48 00 0B 61 */ bl markMemSize__5dMw_cFv -/* 801FC538 38 60 21 A4 */ li r3, 0x21a4 -/* 801FC53C 48 0D 27 11 */ bl __nw__FUl -/* 801FC540 7C 60 1B 79 */ or. r0, r3, r3 -/* 801FC544 41 82 00 0C */ beq lbl_801FC550 -/* 801FC548 4B FF 31 59 */ bl __ct__12dMenu_save_cFv -/* 801FC54C 7C 60 1B 78 */ mr r0, r3 -lbl_801FC550: -/* 801FC550 90 1F 01 20 */ stw r0, 0x120(r31) -/* 801FC554 38 00 00 01 */ li r0, 1 -/* 801FC558 80 7F 01 20 */ lwz r3, 0x120(r31) -/* 801FC55C 98 03 01 BC */ stb r0, 0x1bc(r3) -/* 801FC560 80 7F 01 20 */ lwz r3, 0x120(r31) -/* 801FC564 4B FF 32 49 */ bl _create__12dMenu_save_cFv -/* 801FC568 80 7F 01 20 */ lwz r3, 0x120(r31) -/* 801FC56C 4B FF 43 CD */ bl initialize__12dMenu_save_cFv -/* 801FC570 80 1F 01 0C */ lwz r0, 0x10c(r31) -/* 801FC574 28 00 00 00 */ cmplwi r0, 0 -/* 801FC578 40 82 00 44 */ bne lbl_801FC5BC -/* 801FC57C 38 60 00 08 */ li r3, 8 -/* 801FC580 48 0D 26 CD */ bl __nw__FUl -/* 801FC584 28 03 00 00 */ cmplwi r3, 0 -/* 801FC588 41 82 00 30 */ beq lbl_801FC5B8 -/* 801FC58C 3C 80 80 3A */ lis r4, __vt__12dDlst_base_c@ha /* 0x803A6F88@ha */ -/* 801FC590 38 04 6F 88 */ addi r0, r4, __vt__12dDlst_base_c@l /* 0x803A6F88@l */ -/* 801FC594 90 03 00 00 */ stw r0, 0(r3) -/* 801FC598 3C 80 80 3C */ lis r4, __vt__20dDlst_MENU_CAPTURE_c@ha /* 0x803BF0D4@ha */ -/* 801FC59C 38 04 F0 D4 */ addi r0, r4, __vt__20dDlst_MENU_CAPTURE_c@l /* 0x803BF0D4@l */ -/* 801FC5A0 90 03 00 00 */ stw r0, 0(r3) -/* 801FC5A4 38 80 00 00 */ li r4, 0 -/* 801FC5A8 98 83 00 04 */ stb r4, 4(r3) -/* 801FC5AC 38 00 00 FF */ li r0, 0xff -/* 801FC5B0 98 03 00 05 */ stb r0, 5(r3) -/* 801FC5B4 98 83 00 06 */ stb r4, 6(r3) -lbl_801FC5B8: -/* 801FC5B8 90 7F 01 0C */ stw r3, 0x10c(r31) -lbl_801FC5BC: -/* 801FC5BC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FC5C0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FC5C4 7C 08 03 A6 */ mtlr r0 -/* 801FC5C8 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FC5CC 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/dMw_save_delete__5dMw_cFv.s b/asm/d/menu/d_menu_window/dMw_save_delete__5dMw_cFv.s deleted file mode 100644 index 48d2889a6a2..00000000000 --- a/asm/d/menu/d_menu_window/dMw_save_delete__5dMw_cFv.s +++ /dev/null @@ -1,43 +0,0 @@ -lbl_801FC5D0: -/* 801FC5D0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FC5D4 7C 08 02 A6 */ mflr r0 -/* 801FC5D8 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FC5DC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FC5E0 7C 7F 1B 78 */ mr r31, r3 -/* 801FC5E4 80 63 01 20 */ lwz r3, 0x120(r3) -/* 801FC5E8 28 03 00 00 */ cmplwi r3, 0 -/* 801FC5EC 41 82 00 30 */ beq lbl_801FC61C -/* 801FC5F0 4B FF 45 39 */ bl _delete__12dMenu_save_cFv -/* 801FC5F4 80 7F 01 20 */ lwz r3, 0x120(r31) -/* 801FC5F8 28 03 00 00 */ cmplwi r3, 0 -/* 801FC5FC 41 82 00 18 */ beq lbl_801FC614 -/* 801FC600 38 80 00 01 */ li r4, 1 -/* 801FC604 81 83 00 00 */ lwz r12, 0(r3) -/* 801FC608 81 8C 00 08 */ lwz r12, 8(r12) -/* 801FC60C 7D 89 03 A6 */ mtctr r12 -/* 801FC610 4E 80 04 21 */ bctrl -lbl_801FC614: -/* 801FC614 38 00 00 00 */ li r0, 0 -/* 801FC618 90 1F 01 20 */ stw r0, 0x120(r31) -lbl_801FC61C: -/* 801FC61C 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 801FC620 28 03 00 00 */ cmplwi r3, 0 -/* 801FC624 41 82 00 24 */ beq lbl_801FC648 -/* 801FC628 41 82 00 18 */ beq lbl_801FC640 -/* 801FC62C 38 80 00 01 */ li r4, 1 -/* 801FC630 81 83 00 00 */ lwz r12, 0(r3) -/* 801FC634 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 801FC638 7D 89 03 A6 */ mtctr r12 -/* 801FC63C 4E 80 04 21 */ bctrl -lbl_801FC640: -/* 801FC640 38 00 00 00 */ li r0, 0 -/* 801FC644 90 1F 01 0C */ stw r0, 0x10c(r31) -lbl_801FC648: -/* 801FC648 7F E3 FB 78 */ mr r3, r31 -/* 801FC64C 48 00 0A 89 */ bl checkMemSize__5dMw_cFv -/* 801FC650 38 60 00 01 */ li r3, 1 -/* 801FC654 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FC658 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FC65C 7C 08 03 A6 */ mtlr r0 -/* 801FC660 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FC664 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/dMw_skill_create__5dMw_cFv.s b/asm/d/menu/d_menu_window/dMw_skill_create__5dMw_cFv.s deleted file mode 100644 index c36ad4e3646..00000000000 --- a/asm/d/menu/d_menu_window/dMw_skill_create__5dMw_cFv.s +++ /dev/null @@ -1,44 +0,0 @@ -lbl_801FCA4C: -/* 801FCA4C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FCA50 7C 08 02 A6 */ mflr r0 -/* 801FCA54 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FCA58 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FCA5C 7C 7F 1B 78 */ mr r31, r3 -/* 801FCA60 48 00 06 35 */ bl markMemSize__5dMw_cFv -/* 801FCA64 38 60 02 0C */ li r3, 0x20c -/* 801FCA68 48 0D 21 E5 */ bl __nw__FUl -/* 801FCA6C 7C 60 1B 79 */ or. r0, r3, r3 -/* 801FCA70 41 82 00 18 */ beq lbl_801FCA88 -/* 801FCA74 80 9F 01 00 */ lwz r4, 0x100(r31) -/* 801FCA78 80 BF 01 04 */ lwz r5, 0x104(r31) -/* 801FCA7C 80 DF 01 08 */ lwz r6, 0x108(r31) -/* 801FCA80 4B FF A7 A5 */ bl __ct__13dMenu_Skill_cFP10JKRExpHeapP9STControlP10CSTControl -/* 801FCA84 7C 60 1B 78 */ mr r0, r3 -lbl_801FCA88: -/* 801FCA88 90 1F 01 30 */ stw r0, 0x130(r31) -/* 801FCA8C 80 1F 01 0C */ lwz r0, 0x10c(r31) -/* 801FCA90 28 00 00 00 */ cmplwi r0, 0 -/* 801FCA94 40 82 00 44 */ bne lbl_801FCAD8 -/* 801FCA98 38 60 00 08 */ li r3, 8 -/* 801FCA9C 48 0D 21 B1 */ bl __nw__FUl -/* 801FCAA0 28 03 00 00 */ cmplwi r3, 0 -/* 801FCAA4 41 82 00 30 */ beq lbl_801FCAD4 -/* 801FCAA8 3C 80 80 3A */ lis r4, __vt__12dDlst_base_c@ha /* 0x803A6F88@ha */ -/* 801FCAAC 38 04 6F 88 */ addi r0, r4, __vt__12dDlst_base_c@l /* 0x803A6F88@l */ -/* 801FCAB0 90 03 00 00 */ stw r0, 0(r3) -/* 801FCAB4 3C 80 80 3C */ lis r4, __vt__20dDlst_MENU_CAPTURE_c@ha /* 0x803BF0D4@ha */ -/* 801FCAB8 38 04 F0 D4 */ addi r0, r4, __vt__20dDlst_MENU_CAPTURE_c@l /* 0x803BF0D4@l */ -/* 801FCABC 90 03 00 00 */ stw r0, 0(r3) -/* 801FCAC0 38 80 00 00 */ li r4, 0 -/* 801FCAC4 98 83 00 04 */ stb r4, 4(r3) -/* 801FCAC8 38 00 00 FF */ li r0, 0xff -/* 801FCACC 98 03 00 05 */ stb r0, 5(r3) -/* 801FCAD0 98 83 00 06 */ stb r4, 6(r3) -lbl_801FCAD4: -/* 801FCAD4 90 7F 01 0C */ stw r3, 0x10c(r31) -lbl_801FCAD8: -/* 801FCAD8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FCADC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FCAE0 7C 08 03 A6 */ mtlr r0 -/* 801FCAE4 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FCAE8 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/dMw_skill_delete__5dMw_cFv.s b/asm/d/menu/d_menu_window/dMw_skill_delete__5dMw_cFv.s deleted file mode 100644 index f4f8eadf528..00000000000 --- a/asm/d/menu/d_menu_window/dMw_skill_delete__5dMw_cFv.s +++ /dev/null @@ -1,49 +0,0 @@ -lbl_801FCAEC: -/* 801FCAEC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FCAF0 7C 08 02 A6 */ mflr r0 -/* 801FCAF4 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FCAF8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FCAFC 7C 7F 1B 78 */ mr r31, r3 -/* 801FCB00 80 63 01 30 */ lwz r3, 0x130(r3) -/* 801FCB04 28 03 00 00 */ cmplwi r3, 0 -/* 801FCB08 41 82 00 40 */ beq lbl_801FCB48 -/* 801FCB0C 4B FF AE 45 */ bl isSync__13dMenu_Skill_cFv -/* 801FCB10 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801FCB14 40 82 00 0C */ bne lbl_801FCB20 -/* 801FCB18 38 60 00 00 */ li r3, 0 -/* 801FCB1C 48 00 00 64 */ b lbl_801FCB80 -lbl_801FCB20: -/* 801FCB20 80 7F 01 30 */ lwz r3, 0x130(r31) -/* 801FCB24 28 03 00 00 */ cmplwi r3, 0 -/* 801FCB28 41 82 00 18 */ beq lbl_801FCB40 -/* 801FCB2C 38 80 00 01 */ li r4, 1 -/* 801FCB30 81 83 00 00 */ lwz r12, 0(r3) -/* 801FCB34 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 801FCB38 7D 89 03 A6 */ mtctr r12 -/* 801FCB3C 4E 80 04 21 */ bctrl -lbl_801FCB40: -/* 801FCB40 38 00 00 00 */ li r0, 0 -/* 801FCB44 90 1F 01 30 */ stw r0, 0x130(r31) -lbl_801FCB48: -/* 801FCB48 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 801FCB4C 28 03 00 00 */ cmplwi r3, 0 -/* 801FCB50 41 82 00 24 */ beq lbl_801FCB74 -/* 801FCB54 41 82 00 18 */ beq lbl_801FCB6C -/* 801FCB58 38 80 00 01 */ li r4, 1 -/* 801FCB5C 81 83 00 00 */ lwz r12, 0(r3) -/* 801FCB60 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 801FCB64 7D 89 03 A6 */ mtctr r12 -/* 801FCB68 4E 80 04 21 */ bctrl -lbl_801FCB6C: -/* 801FCB6C 38 00 00 00 */ li r0, 0 -/* 801FCB70 90 1F 01 0C */ stw r0, 0x10c(r31) -lbl_801FCB74: -/* 801FCB74 7F E3 FB 78 */ mr r3, r31 -/* 801FCB78 48 00 05 5D */ bl checkMemSize__5dMw_cFv -/* 801FCB7C 38 60 00 01 */ li r3, 1 -lbl_801FCB80: -/* 801FCB80 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FCB84 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FCB88 7C 08 03 A6 */ mtlr r0 -/* 801FCB8C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FCB90 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/dmap_close_proc__5dMw_cFv.s b/asm/d/menu/d_menu_window/dmap_close_proc__5dMw_cFv.s deleted file mode 100644 index a86231b3bbb..00000000000 --- a/asm/d/menu/d_menu_window/dmap_close_proc__5dMw_cFv.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_801FB5DC: -/* 801FB5DC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FB5E0 7C 08 02 A6 */ mflr r0 -/* 801FB5E4 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FB5E8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FB5EC 7C 7F 1B 78 */ mr r31, r3 -/* 801FB5F0 80 63 01 18 */ lwz r3, 0x118(r3) -/* 801FB5F4 4B FC 30 7D */ bl isClose__12dMenu_Dmap_cFv -/* 801FB5F8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801FB5FC 41 82 00 0C */ beq lbl_801FB608 -/* 801FB600 38 00 00 00 */ li r0, 0 -/* 801FB604 98 1F 01 46 */ stb r0, 0x146(r31) -lbl_801FB608: -/* 801FB608 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FB60C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FB610 7C 08 03 A6 */ mtlr r0 -/* 801FB614 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FB618 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/dmap_move_proc__5dMw_cFv.s b/asm/d/menu/d_menu_window/dmap_move_proc__5dMw_cFv.s deleted file mode 100644 index b01c86cadc6..00000000000 --- a/asm/d/menu/d_menu_window/dmap_move_proc__5dMw_cFv.s +++ /dev/null @@ -1,127 +0,0 @@ -lbl_801FB404: -/* 801FB404 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801FB408 7C 08 02 A6 */ mflr r0 -/* 801FB40C 90 01 00 24 */ stw r0, 0x24(r1) -/* 801FB410 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 801FB414 7C 7F 1B 78 */ mr r31, r3 -/* 801FB418 80 63 01 18 */ lwz r3, 0x118(r3) -/* 801FB41C 4B FC 3F 19 */ bl getNextStatus__12dMenu_Dmap_cFv -/* 801FB420 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 801FB424 28 00 00 01 */ cmplwi r0, 1 -/* 801FB428 40 82 00 A0 */ bne lbl_801FB4C8 -/* 801FB42C 48 01 22 25 */ bl isEnableDispMapAndMapDispSizeTypeNo__11dMeterMap_cFv -/* 801FB430 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801FB434 41 82 00 20 */ beq lbl_801FB454 -/* 801FB438 38 00 00 01 */ li r0, 1 -/* 801FB43C 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801FB440 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801FB444 98 03 00 BF */ stb r0, 0xbf(r3) -/* 801FB448 80 63 00 20 */ lwz r3, 0x20(r3) -/* 801FB44C 48 01 24 29 */ bl setDispPosInsideFlg_SE_On__11dMeterMap_cFv -/* 801FB450 48 00 00 1C */ b lbl_801FB46C -lbl_801FB454: -/* 801FB454 38 00 00 00 */ li r0, 0 -/* 801FB458 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801FB45C 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801FB460 98 03 00 BF */ stb r0, 0xbf(r3) -/* 801FB464 80 63 00 20 */ lwz r3, 0x20(r3) -/* 801FB468 48 01 24 55 */ bl setDispPosOutsideFlg_SE_On__11dMeterMap_cFv -lbl_801FB46C: -/* 801FB46C 38 00 02 00 */ li r0, 0x200 -/* 801FB470 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801FB474 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801FB478 B0 03 00 AA */ sth r0, 0xaa(r3) -/* 801FB47C 38 00 00 0C */ li r0, 0xc -/* 801FB480 98 1F 01 46 */ stb r0, 0x146(r31) -/* 801FB484 38 00 00 03 */ li r0, 3 -/* 801FB488 80 7F 01 18 */ lwz r3, 0x118(r31) -/* 801FB48C 98 03 01 7A */ stb r0, 0x17a(r3) -/* 801FB490 38 00 00 BB */ li r0, 0xbb -/* 801FB494 90 01 00 10 */ stw r0, 0x10(r1) -/* 801FB498 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801FB49C 38 81 00 10 */ addi r4, r1, 0x10 -/* 801FB4A0 38 A0 00 00 */ li r5, 0 -/* 801FB4A4 38 C0 00 00 */ li r6, 0 -/* 801FB4A8 38 E0 00 00 */ li r7, 0 -/* 801FB4AC C0 22 AA C4 */ lfs f1, lit_4386(r2) -/* 801FB4B0 FC 40 08 90 */ fmr f2, f1 -/* 801FB4B4 C0 62 AA C8 */ lfs f3, lit_4387(r2) -/* 801FB4B8 FC 80 18 90 */ fmr f4, f3 -/* 801FB4BC 39 00 00 00 */ li r8, 0 -/* 801FB4C0 48 0B 04 C5 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801FB4C4 48 00 01 04 */ b lbl_801FB5C8 -lbl_801FB4C8: -/* 801FB4C8 28 00 00 02 */ cmplwi r0, 2 -/* 801FB4CC 40 82 00 70 */ bne lbl_801FB53C -/* 801FB4D0 38 00 00 00 */ li r0, 0 -/* 801FB4D4 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801FB4D8 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801FB4DC 98 03 00 BF */ stb r0, 0xbf(r3) -/* 801FB4E0 38 00 04 00 */ li r0, 0x400 -/* 801FB4E4 B0 03 00 AA */ sth r0, 0xaa(r3) -/* 801FB4E8 38 00 00 0C */ li r0, 0xc -/* 801FB4EC 98 1F 01 46 */ stb r0, 0x146(r31) -/* 801FB4F0 80 63 00 20 */ lwz r3, 0x20(r3) -/* 801FB4F4 48 01 23 C9 */ bl setDispPosOutsideFlg_SE_On__11dMeterMap_cFv -/* 801FB4F8 38 00 00 01 */ li r0, 1 -/* 801FB4FC 80 7F 01 18 */ lwz r3, 0x118(r31) -/* 801FB500 98 03 01 7A */ stb r0, 0x17a(r3) -/* 801FB504 38 00 00 BB */ li r0, 0xbb -/* 801FB508 90 01 00 0C */ stw r0, 0xc(r1) -/* 801FB50C 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801FB510 38 81 00 0C */ addi r4, r1, 0xc -/* 801FB514 38 A0 00 00 */ li r5, 0 -/* 801FB518 38 C0 00 00 */ li r6, 0 -/* 801FB51C 38 E0 00 00 */ li r7, 0 -/* 801FB520 C0 22 AA C4 */ lfs f1, lit_4386(r2) -/* 801FB524 FC 40 08 90 */ fmr f2, f1 -/* 801FB528 C0 62 AA C8 */ lfs f3, lit_4387(r2) -/* 801FB52C FC 80 18 90 */ fmr f4, f3 -/* 801FB530 39 00 00 00 */ li r8, 0 -/* 801FB534 48 0B 04 51 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801FB538 48 00 00 90 */ b lbl_801FB5C8 -lbl_801FB53C: -/* 801FB53C 28 00 00 03 */ cmplwi r0, 3 -/* 801FB540 40 82 00 80 */ bne lbl_801FB5C0 -/* 801FB544 48 01 21 0D */ bl isEnableDispMapAndMapDispSizeTypeNo__11dMeterMap_cFv -/* 801FB548 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801FB54C 41 82 00 18 */ beq lbl_801FB564 -/* 801FB550 38 00 00 01 */ li r0, 1 -/* 801FB554 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801FB558 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801FB55C 98 03 00 BF */ stb r0, 0xbf(r3) -/* 801FB560 48 00 00 14 */ b lbl_801FB574 -lbl_801FB564: -/* 801FB564 38 00 00 00 */ li r0, 0 -/* 801FB568 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801FB56C 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801FB570 98 03 00 BF */ stb r0, 0xbf(r3) -lbl_801FB574: -/* 801FB574 38 00 00 0C */ li r0, 0xc -/* 801FB578 98 1F 01 46 */ stb r0, 0x146(r31) -/* 801FB57C 38 00 00 02 */ li r0, 2 -/* 801FB580 80 7F 01 18 */ lwz r3, 0x118(r31) -/* 801FB584 98 03 01 7A */ stb r0, 0x17a(r3) -/* 801FB588 38 00 00 BB */ li r0, 0xbb -/* 801FB58C 90 01 00 08 */ stw r0, 8(r1) -/* 801FB590 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801FB594 38 81 00 08 */ addi r4, r1, 8 -/* 801FB598 38 A0 00 00 */ li r5, 0 -/* 801FB59C 38 C0 00 00 */ li r6, 0 -/* 801FB5A0 38 E0 00 00 */ li r7, 0 -/* 801FB5A4 C0 22 AA C4 */ lfs f1, lit_4386(r2) -/* 801FB5A8 FC 40 08 90 */ fmr f2, f1 -/* 801FB5AC C0 62 AA C8 */ lfs f3, lit_4387(r2) -/* 801FB5B0 FC 80 18 90 */ fmr f4, f3 -/* 801FB5B4 39 00 00 00 */ li r8, 0 -/* 801FB5B8 48 0B 03 CD */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801FB5BC 48 00 00 0C */ b lbl_801FB5C8 -lbl_801FB5C0: -/* 801FB5C0 80 7F 01 18 */ lwz r3, 0x118(r31) -/* 801FB5C4 4B FC 27 E1 */ bl _move__12dMenu_Dmap_cFv -lbl_801FB5C8: -/* 801FB5C8 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 801FB5CC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801FB5D0 7C 08 03 A6 */ mtlr r0 -/* 801FB5D4 38 21 00 20 */ addi r1, r1, 0x20 -/* 801FB5D8 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/dmap_open_init__5dMw_cFUc.s b/asm/d/menu/d_menu_window/dmap_open_init__5dMw_cFUc.s deleted file mode 100644 index 9d4b9521c59..00000000000 --- a/asm/d/menu/d_menu_window/dmap_open_init__5dMw_cFUc.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_801FA564: -/* 801FA564 3C 80 80 43 */ lis r4, g_meter2_info@ha /* 0x80430188@ha */ -/* 801FA568 38 84 01 88 */ addi r4, r4, g_meter2_info@l /* 0x80430188@l */ -/* 801FA56C 88 04 00 B9 */ lbz r0, 0xb9(r4) -/* 801FA570 98 04 00 BA */ stb r0, 0xba(r4) -/* 801FA574 38 00 00 05 */ li r0, 5 -/* 801FA578 98 04 00 B9 */ stb r0, 0xb9(r4) -/* 801FA57C 38 00 00 00 */ li r0, 0 -/* 801FA580 98 03 01 53 */ stb r0, 0x153(r3) -/* 801FA584 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/dmap_open_proc__5dMw_cFv.s b/asm/d/menu/d_menu_window/dmap_open_proc__5dMw_cFv.s deleted file mode 100644 index 32fd84fb024..00000000000 --- a/asm/d/menu/d_menu_window/dmap_open_proc__5dMw_cFv.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_801FB3AC: -/* 801FB3AC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FB3B0 7C 08 02 A6 */ mflr r0 -/* 801FB3B4 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FB3B8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FB3BC 7C 7F 1B 78 */ mr r31, r3 -/* 801FB3C0 88 03 01 53 */ lbz r0, 0x153(r3) -/* 801FB3C4 28 00 00 00 */ cmplwi r0, 0 -/* 801FB3C8 40 82 00 10 */ bne lbl_801FB3D8 -/* 801FB3CC 38 00 00 01 */ li r0, 1 -/* 801FB3D0 98 1F 01 53 */ stb r0, 0x153(r31) -/* 801FB3D4 48 02 36 01 */ bl dMeter2Info_set2DVibrationM__Fv -lbl_801FB3D8: -/* 801FB3D8 80 7F 01 18 */ lwz r3, 0x118(r31) -/* 801FB3DC 4B FC 2F 4D */ bl isOpen__12dMenu_Dmap_cFv -/* 801FB3E0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801FB3E4 41 82 00 0C */ beq lbl_801FB3F0 -/* 801FB3E8 38 00 00 0B */ li r0, 0xb -/* 801FB3EC 98 1F 01 46 */ stb r0, 0x146(r31) -lbl_801FB3F0: -/* 801FB3F0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FB3F4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FB3F8 7C 08 03 A6 */ mtlr r0 -/* 801FB3FC 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FB400 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/fmap_close_proc__5dMw_cFv.s b/asm/d/menu/d_menu_window/fmap_close_proc__5dMw_cFv.s deleted file mode 100644 index 32fc0c0f5b3..00000000000 --- a/asm/d/menu/d_menu_window/fmap_close_proc__5dMw_cFv.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_801FB36C: -/* 801FB36C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FB370 7C 08 02 A6 */ mflr r0 -/* 801FB374 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FB378 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FB37C 7C 7F 1B 78 */ mr r31, r3 -/* 801FB380 80 63 01 1C */ lwz r3, 0x11c(r3) -/* 801FB384 4B FC FC B5 */ bl isClose__12dMenu_Fmap_cFv -/* 801FB388 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801FB38C 41 82 00 0C */ beq lbl_801FB398 -/* 801FB390 38 00 00 00 */ li r0, 0 -/* 801FB394 98 1F 01 46 */ stb r0, 0x146(r31) -lbl_801FB398: -/* 801FB398 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FB39C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FB3A0 7C 08 03 A6 */ mtlr r0 -/* 801FB3A4 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FB3A8 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/fmap_move_proc__5dMw_cFv.s b/asm/d/menu/d_menu_window/fmap_move_proc__5dMw_cFv.s deleted file mode 100644 index 75c45786fb1..00000000000 --- a/asm/d/menu/d_menu_window/fmap_move_proc__5dMw_cFv.s +++ /dev/null @@ -1,57 +0,0 @@ -lbl_801FB298: -/* 801FB298 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801FB29C 7C 08 02 A6 */ mflr r0 -/* 801FB2A0 90 01 00 24 */ stw r0, 0x24(r1) -/* 801FB2A4 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 801FB2A8 7C 7F 1B 78 */ mr r31, r3 -/* 801FB2AC 80 63 01 1C */ lwz r3, 0x11c(r3) -/* 801FB2B0 4B FC C1 F9 */ bl _move__12dMenu_Fmap_cFv -/* 801FB2B4 80 6D 86 48 */ lwz r3, mFader__13mDoGph_gInf_c(r13) -/* 801FB2B8 80 03 00 04 */ lwz r0, 4(r3) -/* 801FB2BC 2C 00 00 01 */ cmpwi r0, 1 -/* 801FB2C0 40 82 00 98 */ bne lbl_801FB358 -/* 801FB2C4 80 7F 01 1C */ lwz r3, 0x11c(r31) -/* 801FB2C8 38 9F 01 4B */ addi r4, r31, 0x14b -/* 801FB2CC 4B FC C5 25 */ bl getNextStatus__12dMenu_Fmap_cFPUc -/* 801FB2D0 98 7F 01 46 */ stb r3, 0x146(r31) -/* 801FB2D4 3C 60 80 43 */ lis r3, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801FB2D8 38 63 FC 60 */ addi r3, r3, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801FB2DC 88 03 02 F9 */ lbz r0, 0x2f9(r3) -/* 801FB2E0 28 00 00 00 */ cmplwi r0, 0 -/* 801FB2E4 41 82 00 40 */ beq lbl_801FB324 -/* 801FB2E8 38 00 00 09 */ li r0, 9 -/* 801FB2EC 98 1F 01 46 */ stb r0, 0x146(r31) -/* 801FB2F0 38 00 00 BB */ li r0, 0xbb -/* 801FB2F4 90 01 00 08 */ stw r0, 8(r1) -/* 801FB2F8 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801FB2FC 38 81 00 08 */ addi r4, r1, 8 -/* 801FB300 38 A0 00 00 */ li r5, 0 -/* 801FB304 38 C0 00 00 */ li r6, 0 -/* 801FB308 38 E0 00 00 */ li r7, 0 -/* 801FB30C C0 22 AA C4 */ lfs f1, lit_4386(r2) -/* 801FB310 FC 40 08 90 */ fmr f2, f1 -/* 801FB314 C0 62 AA C8 */ lfs f3, lit_4387(r2) -/* 801FB318 FC 80 18 90 */ fmr f4, f3 -/* 801FB31C 39 00 00 00 */ li r8, 0 -/* 801FB320 48 0B 06 65 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_801FB324: -/* 801FB324 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801FB328 38 83 01 88 */ addi r4, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801FB32C 80 64 00 20 */ lwz r3, 0x20(r4) -/* 801FB330 28 03 00 00 */ cmplwi r3, 0 -/* 801FB334 41 82 00 24 */ beq lbl_801FB358 -/* 801FB338 88 04 00 BF */ lbz r0, 0xbf(r4) -/* 801FB33C 28 00 00 01 */ cmplwi r0, 1 -/* 801FB340 40 82 00 0C */ bne lbl_801FB34C -/* 801FB344 48 01 25 31 */ bl setDispPosInsideFlg_SE_On__11dMeterMap_cFv -/* 801FB348 48 00 00 10 */ b lbl_801FB358 -lbl_801FB34C: -/* 801FB34C 28 00 00 00 */ cmplwi r0, 0 -/* 801FB350 40 82 00 08 */ bne lbl_801FB358 -/* 801FB354 48 01 25 69 */ bl setDispPosOutsideFlg_SE_On__11dMeterMap_cFv -lbl_801FB358: -/* 801FB358 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 801FB35C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801FB360 7C 08 03 A6 */ mtlr r0 -/* 801FB364 38 21 00 20 */ addi r1, r1, 0x20 -/* 801FB368 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/fmap_open_init__5dMw_cFUc.s b/asm/d/menu/d_menu_window/fmap_open_init__5dMw_cFUc.s deleted file mode 100644 index 62ebd2b1f71..00000000000 --- a/asm/d/menu/d_menu_window/fmap_open_init__5dMw_cFUc.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_801FA538: -/* 801FA538 3C 80 80 43 */ lis r4, g_meter2_info@ha /* 0x80430188@ha */ -/* 801FA53C 38 84 01 88 */ addi r4, r4, g_meter2_info@l /* 0x80430188@l */ -/* 801FA540 88 04 00 B9 */ lbz r0, 0xb9(r4) -/* 801FA544 98 04 00 BA */ stb r0, 0xba(r4) -/* 801FA548 38 00 00 04 */ li r0, 4 -/* 801FA54C 98 04 00 B9 */ stb r0, 0xb9(r4) -/* 801FA550 38 00 00 00 */ li r0, 0 -/* 801FA554 98 03 01 53 */ stb r0, 0x153(r3) -/* 801FA558 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/fmap_open_proc__5dMw_cFv.s b/asm/d/menu/d_menu_window/fmap_open_proc__5dMw_cFv.s deleted file mode 100644 index 3598bcc4e23..00000000000 --- a/asm/d/menu/d_menu_window/fmap_open_proc__5dMw_cFv.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_801FB240: -/* 801FB240 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FB244 7C 08 02 A6 */ mflr r0 -/* 801FB248 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FB24C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FB250 7C 7F 1B 78 */ mr r31, r3 -/* 801FB254 88 03 01 53 */ lbz r0, 0x153(r3) -/* 801FB258 28 00 00 00 */ cmplwi r0, 0 -/* 801FB25C 40 82 00 10 */ bne lbl_801FB26C -/* 801FB260 38 00 00 01 */ li r0, 1 -/* 801FB264 98 1F 01 53 */ stb r0, 0x153(r31) -/* 801FB268 48 02 37 6D */ bl dMeter2Info_set2DVibrationM__Fv -lbl_801FB26C: -/* 801FB26C 80 7F 01 1C */ lwz r3, 0x11c(r31) -/* 801FB270 4B FC FB 55 */ bl isOpen__12dMenu_Fmap_cFv -/* 801FB274 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801FB278 41 82 00 0C */ beq lbl_801FB284 -/* 801FB27C 38 00 00 08 */ li r0, 8 -/* 801FB280 98 1F 01 46 */ stb r0, 0x146(r31) -lbl_801FB284: -/* 801FB284 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FB288 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FB28C 7C 08 03 A6 */ mtlr r0 -/* 801FB290 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FB294 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/insect_close_init__5dMw_cFUc.s b/asm/d/menu/d_menu_window/insect_close_init__5dMw_cFUc.s deleted file mode 100644 index e04605654db..00000000000 --- a/asm/d/menu/d_menu_window/insect_close_init__5dMw_cFUc.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_801FA9F0: -/* 801FA9F0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FA9F4 7C 08 02 A6 */ mflr r0 -/* 801FA9F8 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FA9FC 38 00 00 A5 */ li r0, 0xa5 -/* 801FAA00 90 01 00 08 */ stw r0, 8(r1) -/* 801FAA04 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801FAA08 38 81 00 08 */ addi r4, r1, 8 -/* 801FAA0C 38 A0 00 00 */ li r5, 0 -/* 801FAA10 38 C0 00 00 */ li r6, 0 -/* 801FAA14 38 E0 00 00 */ li r7, 0 -/* 801FAA18 C0 22 AA C4 */ lfs f1, lit_4386(r2) -/* 801FAA1C FC 40 08 90 */ fmr f2, f1 -/* 801FAA20 C0 62 AA C8 */ lfs f3, lit_4387(r2) -/* 801FAA24 FC 80 18 90 */ fmr f4, f3 -/* 801FAA28 39 00 00 00 */ li r8, 0 -/* 801FAA2C 48 0B 0F 59 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801FAA30 48 02 3F A1 */ bl dMeter2Info_set2DVibration__Fv -/* 801FAA34 48 00 23 D5 */ bl dMw_fade_out__5dMw_cFv -/* 801FAA38 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FAA3C 7C 08 03 A6 */ mtlr r0 -/* 801FAA40 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FAA44 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/insect_close_proc__5dMw_cFv.s b/asm/d/menu/d_menu_window/insect_close_proc__5dMw_cFv.s deleted file mode 100644 index 5b7ac84feed..00000000000 --- a/asm/d/menu/d_menu_window/insect_close_proc__5dMw_cFv.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_801FBD64: -/* 801FBD64 80 8D 86 48 */ lwz r4, mFader__13mDoGph_gInf_c(r13) -/* 801FBD68 80 04 00 04 */ lwz r0, 4(r4) -/* 801FBD6C 2C 00 00 00 */ cmpwi r0, 0 -/* 801FBD70 4C 82 00 20 */ bnelr -/* 801FBD74 38 00 00 00 */ li r0, 0 -/* 801FBD78 98 03 01 46 */ stb r0, 0x146(r3) -/* 801FBD7C 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/insect_move_proc__5dMw_cFv.s b/asm/d/menu/d_menu_window/insect_move_proc__5dMw_cFv.s deleted file mode 100644 index b92161a41ce..00000000000 --- a/asm/d/menu/d_menu_window/insect_move_proc__5dMw_cFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_801FBD08: -/* 801FBD08 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FBD0C 7C 08 02 A6 */ mflr r0 -/* 801FBD10 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FBD14 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FBD18 7C 7F 1B 78 */ mr r31, r3 -/* 801FBD1C 80 63 01 34 */ lwz r3, 0x134(r3) -/* 801FBD20 28 03 00 00 */ cmplwi r3, 0 -/* 801FBD24 41 82 00 2C */ beq lbl_801FBD50 -/* 801FBD28 88 03 00 F2 */ lbz r0, 0xf2(r3) -/* 801FBD2C 28 00 00 02 */ cmplwi r0, 2 -/* 801FBD30 40 82 00 08 */ bne lbl_801FBD38 -/* 801FBD34 4B FD C9 95 */ bl _move__14dMenu_Insect_cFv -lbl_801FBD38: -/* 801FBD38 80 7F 01 34 */ lwz r3, 0x134(r31) -/* 801FBD3C 88 03 00 F2 */ lbz r0, 0xf2(r3) -/* 801FBD40 28 00 00 03 */ cmplwi r0, 3 -/* 801FBD44 40 82 00 0C */ bne lbl_801FBD50 -/* 801FBD48 38 00 00 22 */ li r0, 0x22 -/* 801FBD4C 98 1F 01 46 */ stb r0, 0x146(r31) -lbl_801FBD50: -/* 801FBD50 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FBD54 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FBD58 7C 08 03 A6 */ mtlr r0 -/* 801FBD5C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FBD60 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/insect_open2_proc__5dMw_cFv.s b/asm/d/menu/d_menu_window/insect_open2_proc__5dMw_cFv.s deleted file mode 100644 index 8684ec06e6d..00000000000 --- a/asm/d/menu/d_menu_window/insect_open2_proc__5dMw_cFv.s +++ /dev/null @@ -1,39 +0,0 @@ -lbl_801FBC78: -/* 801FBC78 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FBC7C 7C 08 02 A6 */ mflr r0 -/* 801FBC80 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FBC84 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FBC88 7C 7F 1B 78 */ mr r31, r3 -/* 801FBC8C 80 63 01 34 */ lwz r3, 0x134(r3) -/* 801FBC90 88 03 00 F2 */ lbz r0, 0xf2(r3) -/* 801FBC94 28 00 00 01 */ cmplwi r0, 1 -/* 801FBC98 40 82 00 30 */ bne lbl_801FBCC8 -/* 801FBC9C 4B FD CC B1 */ bl _open__14dMenu_Insect_cFv -/* 801FBCA0 88 1F 01 52 */ lbz r0, 0x152(r31) -/* 801FBCA4 28 00 00 00 */ cmplwi r0, 0 -/* 801FBCA8 40 82 00 20 */ bne lbl_801FBCC8 -/* 801FBCAC 80 7F 01 34 */ lwz r3, 0x134(r31) -/* 801FBCB0 4B FD CC 3D */ bl isSync__14dMenu_Insect_cFv -/* 801FBCB4 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801FBCB8 41 82 00 10 */ beq lbl_801FBCC8 -/* 801FBCBC 48 00 11 BD */ bl dMw_fade_in__5dMw_cFv -/* 801FBCC0 38 00 00 01 */ li r0, 1 -/* 801FBCC4 98 1F 01 52 */ stb r0, 0x152(r31) -lbl_801FBCC8: -/* 801FBCC8 80 7F 01 34 */ lwz r3, 0x134(r31) -/* 801FBCCC 88 03 00 F2 */ lbz r0, 0xf2(r3) -/* 801FBCD0 28 00 00 02 */ cmplwi r0, 2 -/* 801FBCD4 40 82 00 20 */ bne lbl_801FBCF4 -/* 801FBCD8 88 1F 01 52 */ lbz r0, 0x152(r31) -/* 801FBCDC 28 00 00 01 */ cmplwi r0, 1 -/* 801FBCE0 40 82 00 14 */ bne lbl_801FBCF4 -/* 801FBCE4 38 00 00 21 */ li r0, 0x21 -/* 801FBCE8 98 1F 01 46 */ stb r0, 0x146(r31) -/* 801FBCEC 38 00 00 00 */ li r0, 0 -/* 801FBCF0 98 1F 01 52 */ stb r0, 0x152(r31) -lbl_801FBCF4: -/* 801FBCF4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FBCF8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FBCFC 7C 08 03 A6 */ mtlr r0 -/* 801FBD00 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FBD04 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/insect_open_init__5dMw_cFUc.s b/asm/d/menu/d_menu_window/insect_open_init__5dMw_cFUc.s deleted file mode 100644 index 7a0ce403c4d..00000000000 --- a/asm/d/menu/d_menu_window/insect_open_init__5dMw_cFUc.s +++ /dev/null @@ -1,34 +0,0 @@ -lbl_801FA964: -/* 801FA964 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801FA968 7C 08 02 A6 */ mflr r0 -/* 801FA96C 90 01 00 24 */ stw r0, 0x24(r1) -/* 801FA970 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 801FA974 7C 7F 1B 78 */ mr r31, r3 -/* 801FA978 38 80 00 0A */ li r4, 0xa -/* 801FA97C 98 83 01 44 */ stb r4, 0x144(r3) -/* 801FA980 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801FA984 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801FA988 88 03 00 B9 */ lbz r0, 0xb9(r3) -/* 801FA98C 98 03 00 BA */ stb r0, 0xba(r3) -/* 801FA990 98 83 00 B9 */ stb r4, 0xb9(r3) -/* 801FA994 38 00 00 A4 */ li r0, 0xa4 -/* 801FA998 90 01 00 08 */ stw r0, 8(r1) -/* 801FA99C 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801FA9A0 38 81 00 08 */ addi r4, r1, 8 -/* 801FA9A4 38 A0 00 00 */ li r5, 0 -/* 801FA9A8 38 C0 00 00 */ li r6, 0 -/* 801FA9AC 38 E0 00 00 */ li r7, 0 -/* 801FA9B0 C0 22 AA C4 */ lfs f1, lit_4386(r2) -/* 801FA9B4 FC 40 08 90 */ fmr f2, f1 -/* 801FA9B8 C0 62 AA C8 */ lfs f3, lit_4387(r2) -/* 801FA9BC FC 80 18 90 */ fmr f4, f3 -/* 801FA9C0 39 00 00 00 */ li r8, 0 -/* 801FA9C4 48 0B 0F C1 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801FA9C8 48 00 24 41 */ bl dMw_fade_out__5dMw_cFv -/* 801FA9CC 7F E3 FB 78 */ mr r3, r31 -/* 801FA9D0 48 00 13 B1 */ bl dMw_capture_create__5dMw_cFv -/* 801FA9D4 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 801FA9D8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801FA9DC 7C 08 03 A6 */ mtlr r0 -/* 801FA9E0 38 21 00 20 */ addi r1, r1, 0x20 -/* 801FA9E4 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/insect_open_proc__5dMw_cFv.s b/asm/d/menu/d_menu_window/insect_open_proc__5dMw_cFv.s deleted file mode 100644 index cb71a8488d7..00000000000 --- a/asm/d/menu/d_menu_window/insect_open_proc__5dMw_cFv.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_801FBC1C: -/* 801FBC1C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FBC20 7C 08 02 A6 */ mflr r0 -/* 801FBC24 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FBC28 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FBC2C 7C 7F 1B 78 */ mr r31, r3 -/* 801FBC30 80 6D 86 48 */ lwz r3, mFader__13mDoGph_gInf_c(r13) -/* 801FBC34 80 03 00 04 */ lwz r0, 4(r3) -/* 801FBC38 2C 00 00 00 */ cmpwi r0, 0 -/* 801FBC3C 40 82 00 28 */ bne lbl_801FBC64 -/* 801FBC40 38 00 00 00 */ li r0, 0 -/* 801FBC44 98 1F 01 52 */ stb r0, 0x152(r31) -/* 801FBC48 38 60 00 01 */ li r3, 1 -/* 801FBC4C 4B E3 24 95 */ bl dComIfGp_setHeapLockFlag__FUc -/* 801FBC50 7F E3 FB 78 */ mr r3, r31 -/* 801FBC54 38 80 00 01 */ li r4, 1 -/* 801FBC58 48 00 0F 3D */ bl dMw_insect_create__5dMw_cFUc -/* 801FBC5C 38 00 00 20 */ li r0, 0x20 -/* 801FBC60 98 1F 01 46 */ stb r0, 0x146(r31) -lbl_801FBC64: -/* 801FBC64 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FBC68 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FBC6C 7C 08 03 A6 */ mtlr r0 -/* 801FBC70 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FBC74 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/isEventCheck__5dMw_cFv.s b/asm/d/menu/d_menu_window/isEventCheck__5dMw_cFv.s deleted file mode 100644 index fb25994bd98..00000000000 --- a/asm/d/menu/d_menu_window/isEventCheck__5dMw_cFv.s +++ /dev/null @@ -1,75 +0,0 @@ -lbl_801FCF84: -/* 801FCF84 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FCF88 7C 08 02 A6 */ mflr r0 -/* 801FCF8C 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FCF90 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FCF94 88 03 01 51 */ lbz r0, 0x151(r3) -/* 801FCF98 28 00 00 00 */ cmplwi r0, 0 -/* 801FCF9C 41 82 00 0C */ beq lbl_801FCFA8 -/* 801FCFA0 38 60 00 01 */ li r3, 1 -/* 801FCFA4 48 00 00 DC */ b lbl_801FD080 -lbl_801FCFA8: -/* 801FCFA8 3C 80 80 43 */ lis r4, g_meter2_info@ha /* 0x80430188@ha */ -/* 801FCFAC 3B E4 01 88 */ addi r31, r4, g_meter2_info@l /* 0x80430188@l */ -/* 801FCFB0 88 1F 00 BF */ lbz r0, 0xbf(r31) -/* 801FCFB4 28 00 00 04 */ cmplwi r0, 4 -/* 801FCFB8 40 82 00 18 */ bne lbl_801FCFD0 -/* 801FCFBC 88 03 01 48 */ lbz r0, 0x148(r3) -/* 801FCFC0 7C 00 07 75 */ extsb. r0, r0 -/* 801FCFC4 40 81 00 0C */ ble lbl_801FCFD0 -/* 801FCFC8 38 00 00 00 */ li r0, 0 -/* 801FCFCC 98 03 01 48 */ stb r0, 0x148(r3) -lbl_801FCFD0: -/* 801FCFD0 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801FCFD4 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801FCFD8 88 04 4F AD */ lbz r0, 0x4fad(r4) -/* 801FCFDC 28 00 00 00 */ cmplwi r0, 0 -/* 801FCFE0 41 82 00 8C */ beq lbl_801FD06C -/* 801FCFE4 48 03 B2 49 */ bl getStatus__12dMsgObject_cFv -/* 801FCFE8 54 60 04 3E */ clrlwi r0, r3, 0x10 -/* 801FCFEC 20 60 00 01 */ subfic r3, r0, 1 -/* 801FCFF0 30 03 FF FF */ addic r0, r3, -1 -/* 801FCFF4 7C 00 19 10 */ subfe r0, r0, r3 -/* 801FCFF8 54 00 06 3F */ clrlwi. r0, r0, 0x18 -/* 801FCFFC 40 82 00 68 */ bne lbl_801FD064 -/* 801FD000 88 1F 00 BF */ lbz r0, 0xbf(r31) -/* 801FD004 28 00 00 04 */ cmplwi r0, 4 -/* 801FD008 41 82 00 54 */ beq lbl_801FD05C -/* 801FD00C 28 00 00 05 */ cmplwi r0, 5 -/* 801FD010 41 82 00 4C */ beq lbl_801FD05C -/* 801FD014 28 00 00 07 */ cmplwi r0, 7 -/* 801FD018 41 82 00 44 */ beq lbl_801FD05C -/* 801FD01C 28 00 00 08 */ cmplwi r0, 8 -/* 801FD020 41 82 00 3C */ beq lbl_801FD05C -/* 801FD024 28 00 00 09 */ cmplwi r0, 9 -/* 801FD028 41 82 00 34 */ beq lbl_801FD05C -/* 801FD02C 28 00 00 06 */ cmplwi r0, 6 -/* 801FD030 41 82 00 2C */ beq lbl_801FD05C -/* 801FD034 28 00 00 03 */ cmplwi r0, 3 -/* 801FD038 41 82 00 24 */ beq lbl_801FD05C -/* 801FD03C 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801FD040 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801FD044 A0 03 00 98 */ lhz r0, 0x98(r3) -/* 801FD048 54 00 07 7B */ rlwinm. r0, r0, 0, 0x1d, 0x1d -/* 801FD04C 40 82 00 10 */ bne lbl_801FD05C -/* 801FD050 88 03 00 C1 */ lbz r0, 0xc1(r3) -/* 801FD054 28 00 00 08 */ cmplwi r0, 8 -/* 801FD058 40 82 00 0C */ bne lbl_801FD064 -lbl_801FD05C: -/* 801FD05C 38 60 00 00 */ li r3, 0 -/* 801FD060 48 00 00 20 */ b lbl_801FD080 -lbl_801FD064: -/* 801FD064 38 60 00 01 */ li r3, 1 -/* 801FD068 48 00 00 18 */ b lbl_801FD080 -lbl_801FD06C: -/* 801FD06C 88 03 01 48 */ lbz r0, 0x148(r3) -/* 801FD070 7C 03 07 74 */ extsb r3, r0 -/* 801FD074 7C 03 00 D0 */ neg r0, r3 -/* 801FD078 7C 00 18 78 */ andc r0, r0, r3 -/* 801FD07C 54 03 0F FE */ srwi r3, r0, 0x1f -lbl_801FD080: -/* 801FD080 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FD084 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FD088 7C 08 03 A6 */ mtlr r0 -/* 801FD08C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FD090 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/isPauseReady__5dMw_cFv.s b/asm/d/menu/d_menu_window/isPauseReady__5dMw_cFv.s deleted file mode 100644 index f166375c1f6..00000000000 --- a/asm/d/menu/d_menu_window/isPauseReady__5dMw_cFv.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_801FCDD8: -/* 801FCDD8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801FCDDC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801FCDE0 88 03 4F F0 */ lbz r0, 0x4ff0(r3) -/* 801FCDE4 28 00 00 00 */ cmplwi r0, 0 -/* 801FCDE8 40 82 00 10 */ bne lbl_801FCDF8 -/* 801FCDEC A0 03 00 02 */ lhz r0, 2(r3) -/* 801FCDF0 28 00 00 00 */ cmplwi r0, 0 -/* 801FCDF4 40 82 00 0C */ bne lbl_801FCE00 -lbl_801FCDF8: -/* 801FCDF8 38 60 00 00 */ li r3, 0 -/* 801FCDFC 4E 80 00 20 */ blr -lbl_801FCE00: -/* 801FCE00 38 60 00 01 */ li r3, 1 -/* 801FCE04 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/key_wait_init__5dMw_cFUc.s b/asm/d/menu/d_menu_window/key_wait_init__5dMw_cFUc.s deleted file mode 100644 index 0bc5705b8c3..00000000000 --- a/asm/d/menu/d_menu_window/key_wait_init__5dMw_cFUc.s +++ /dev/null @@ -1,59 +0,0 @@ -lbl_801FA13C: -/* 801FA13C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FA140 7C 08 02 A6 */ mflr r0 -/* 801FA144 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FA148 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FA14C 93 C1 00 08 */ stw r30, 8(r1) -/* 801FA150 7C 7E 1B 78 */ mr r30, r3 -/* 801FA154 7C 9F 23 78 */ mr r31, r4 -/* 801FA158 3C 80 80 43 */ lis r4, g_meter2_info@ha /* 0x80430188@ha */ -/* 801FA15C 38 84 01 88 */ addi r4, r4, g_meter2_info@l /* 0x80430188@l */ -/* 801FA160 88 04 00 B9 */ lbz r0, 0xb9(r4) -/* 801FA164 98 04 00 BA */ stb r0, 0xba(r4) -/* 801FA168 38 00 00 00 */ li r0, 0 -/* 801FA16C 98 04 00 B9 */ stb r0, 0xb9(r4) -/* 801FA170 48 00 1C A5 */ bl dMw_capture_delete__5dMw_cFv -/* 801FA174 57 E3 06 3E */ clrlwi r3, r31, 0x18 -/* 801FA178 38 03 FF FD */ addi r0, r3, -3 -/* 801FA17C 28 00 00 1F */ cmplwi r0, 0x1f -/* 801FA180 41 81 00 78 */ bgt lbl_801FA1F8 -/* 801FA184 3C 60 80 3C */ lis r3, lit_4360@ha /* 0x803BEF94@ha */ -/* 801FA188 38 63 EF 94 */ addi r3, r3, lit_4360@l /* 0x803BEF94@l */ -/* 801FA18C 54 00 10 3A */ slwi r0, r0, 2 -/* 801FA190 7C 03 00 2E */ lwzx r0, r3, r0 -/* 801FA194 7C 09 03 A6 */ mtctr r0 -/* 801FA198 4E 80 04 20 */ bctr -/* 801FA19C 48 00 2C DD */ bl dMw_fade_in__5dMw_cFv -/* 801FA1A0 7F C3 F3 78 */ mr r3, r30 -/* 801FA1A4 38 80 00 01 */ li r4, 1 -/* 801FA1A8 48 00 1E E9 */ bl dMw_collect_delete__5dMw_cFb -/* 801FA1AC 48 00 00 4C */ b lbl_801FA1F8 -/* 801FA1B0 7F C3 F3 78 */ mr r3, r30 -/* 801FA1B4 38 80 00 01 */ li r4, 1 -/* 801FA1B8 48 00 22 B5 */ bl dMw_dmap_delete__5dMw_cFb -/* 801FA1BC 48 00 00 3C */ b lbl_801FA1F8 -/* 801FA1C0 7F C3 F3 78 */ mr r3, r30 -/* 801FA1C4 38 80 00 01 */ li r4, 1 -/* 801FA1C8 48 00 20 9D */ bl dMw_fmap_delete__5dMw_cFb -/* 801FA1CC 48 00 00 2C */ b lbl_801FA1F8 -/* 801FA1D0 7F C3 F3 78 */ mr r3, r30 -/* 801FA1D4 48 00 1D 8D */ bl dMw_ring_delete__5dMw_cFv -/* 801FA1D8 48 00 00 20 */ b lbl_801FA1F8 -/* 801FA1DC 48 00 2C 9D */ bl dMw_fade_in__5dMw_cFv -/* 801FA1E0 7F C3 F3 78 */ mr r3, r30 -/* 801FA1E4 48 00 23 ED */ bl dMw_save_delete__5dMw_cFv -/* 801FA1E8 48 00 00 10 */ b lbl_801FA1F8 -/* 801FA1EC 48 00 2C 8D */ bl dMw_fade_in__5dMw_cFv -/* 801FA1F0 7F C3 F3 78 */ mr r3, r30 -/* 801FA1F4 48 00 2A 51 */ bl dMw_insect_delete__5dMw_cFv -lbl_801FA1F8: -/* 801FA1F8 80 7E 01 00 */ lwz r3, 0x100(r30) -/* 801FA1FC 48 0D 43 D1 */ bl freeAll__7JKRHeapFv -/* 801FA200 38 60 00 00 */ li r3, 0 -/* 801FA204 4B E3 3F 85 */ bl dComIfGp_offHeapLockFlag__Fi -/* 801FA208 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FA20C 83 C1 00 08 */ lwz r30, 8(r1) -/* 801FA210 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FA214 7C 08 03 A6 */ mtlr r0 -/* 801FA218 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FA21C 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/markMemSize__5dMw_cFv.s b/asm/d/menu/d_menu_window/markMemSize__5dMw_cFv.s deleted file mode 100644 index 05ac05c0d56..00000000000 --- a/asm/d/menu/d_menu_window/markMemSize__5dMw_cFv.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_801FD094: -/* 801FD094 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FD098 7C 08 02 A6 */ mflr r0 -/* 801FD09C 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FD0A0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FD0A4 7C 7F 1B 78 */ mr r31, r3 -/* 801FD0A8 80 03 01 38 */ lwz r0, 0x138(r3) -/* 801FD0AC 2C 00 00 00 */ cmpwi r0, 0 -/* 801FD0B0 40 82 00 10 */ bne lbl_801FD0C0 -/* 801FD0B4 80 7F 01 00 */ lwz r3, 0x100(r31) -/* 801FD0B8 48 0D 16 CD */ bl getTotalFreeSize__7JKRHeapFv -/* 801FD0BC 90 7F 01 38 */ stw r3, 0x138(r31) -lbl_801FD0C0: -/* 801FD0C0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FD0C4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FD0C8 7C 08 03 A6 */ mtlr r0 -/* 801FD0CC 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FD0D0 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/ring_close_proc__5dMw_cFv.s b/asm/d/menu/d_menu_window/ring_close_proc__5dMw_cFv.s deleted file mode 100644 index ed74f24a078..00000000000 --- a/asm/d/menu/d_menu_window/ring_close_proc__5dMw_cFv.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_801FB064: -/* 801FB064 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FB068 7C 08 02 A6 */ mflr r0 -/* 801FB06C 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FB070 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FB074 7C 7F 1B 78 */ mr r31, r3 -/* 801FB078 80 63 01 10 */ lwz r3, 0x110(r3) -/* 801FB07C 4B FF 03 51 */ bl isClose__12dMenu_Ring_cFv -/* 801FB080 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801FB084 41 82 00 20 */ beq lbl_801FB0A4 -/* 801FB088 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801FB08C 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801FB090 A0 03 00 98 */ lhz r0, 0x98(r3) -/* 801FB094 54 00 07 B8 */ rlwinm r0, r0, 0, 0x1e, 0x1c -/* 801FB098 B0 03 00 98 */ sth r0, 0x98(r3) -/* 801FB09C 38 00 00 00 */ li r0, 0 -/* 801FB0A0 98 1F 01 46 */ stb r0, 0x146(r31) -lbl_801FB0A4: -/* 801FB0A4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FB0A8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FB0AC 7C 08 03 A6 */ mtlr r0 -/* 801FB0B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FB0B4 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/ring_move_proc__5dMw_cFv.s b/asm/d/menu/d_menu_window/ring_move_proc__5dMw_cFv.s deleted file mode 100644 index 986f8955e15..00000000000 --- a/asm/d/menu/d_menu_window/ring_move_proc__5dMw_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_801FB01C: -/* 801FB01C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FB020 7C 08 02 A6 */ mflr r0 -/* 801FB024 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FB028 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FB02C 7C 7F 1B 78 */ mr r31, r3 -/* 801FB030 80 63 01 10 */ lwz r3, 0x110(r3) -/* 801FB034 4B FE FB B9 */ bl _move__12dMenu_Ring_cFv -/* 801FB038 80 7F 01 10 */ lwz r3, 0x110(r31) -/* 801FB03C 4B FF 02 79 */ bl isMoveEnd__12dMenu_Ring_cFv -/* 801FB040 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801FB044 41 82 00 0C */ beq lbl_801FB050 -/* 801FB048 38 00 00 03 */ li r0, 3 -/* 801FB04C 98 1F 01 46 */ stb r0, 0x146(r31) -lbl_801FB050: -/* 801FB050 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FB054 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FB058 7C 08 03 A6 */ mtlr r0 -/* 801FB05C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FB060 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/ring_open_proc__5dMw_cFv.s b/asm/d/menu/d_menu_window/ring_open_proc__5dMw_cFv.s deleted file mode 100644 index 2aab6a9c859..00000000000 --- a/asm/d/menu/d_menu_window/ring_open_proc__5dMw_cFv.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_801FAFDC: -/* 801FAFDC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FAFE0 7C 08 02 A6 */ mflr r0 -/* 801FAFE4 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FAFE8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FAFEC 7C 7F 1B 78 */ mr r31, r3 -/* 801FAFF0 80 63 01 10 */ lwz r3, 0x110(r3) -/* 801FAFF4 4B FF 00 B1 */ bl isOpen__12dMenu_Ring_cFv -/* 801FAFF8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801FAFFC 41 82 00 0C */ beq lbl_801FB008 -/* 801FB000 38 00 00 02 */ li r0, 2 -/* 801FB004 98 1F 01 46 */ stb r0, 0x146(r31) -lbl_801FB008: -/* 801FB008 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FB00C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FB010 7C 08 03 A6 */ mtlr r0 -/* 801FB014 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FB018 4E 80 00 20 */ blr From 32fc4e2944b053485b03845d387bd28ffe267cbb Mon Sep 17 00:00:00 2001 From: TakaRikka <38417346+TakaRikka@users.noreply.github.com> Date: Mon, 10 Jan 2022 04:07:06 -0800 Subject: [PATCH 5/7] JUTAssert --- .../flushMessage__12JUTAssertionFv.s | 48 ------ .../flushMessage_dbPrint__12JUTAssertionFv.s | 122 --------------- .../flush_subroutine__12JUTAssertionFv.s | 18 --- .../setMessageCount__12JUTAssertionFi.s | 7 - .../JUTAssert/setVisible__12JUTAssertionFb.s | 3 - include/JSystem/JUtility/JUTAssert.h | 4 +- include/JSystem/JUtility/JUTDbPrint.h | 2 + include/JSystem/JUtility/JUTDirectPrint.h | 1 + include/JSystem/JUtility/JUTFont.h | 9 ++ libs/JSystem/J2DGraph/J2DMaterialFactory.cpp | 1 - libs/JSystem/J2DGraph/J2DPrint.cpp | 1 - libs/JSystem/JUtility/JUTAssert.cpp | 147 +++++------------- libs/JSystem/JUtility/JUTConsole.cpp | 1 - libs/JSystem/JUtility/JUTException.cpp | 6 +- src/d/d_select_cursor.cpp | 1 - src/d/menu/d_menu_collect.cpp | 1 - src/d/menu/d_menu_dmap.cpp | 3 - src/d/menu/d_menu_fishing.cpp | 1 - src/d/menu/d_menu_fmap.cpp | 2 - src/d/menu/d_menu_insect.cpp | 2 - src/d/menu/d_menu_letter.cpp | 1 - src/d/menu/d_menu_option.cpp | 1 - src/d/menu/d_menu_ring.cpp | 1 - src/d/menu/d_menu_save.cpp | 1 - src/d/menu/d_menu_skill.cpp | 1 - 25 files changed, 60 insertions(+), 325 deletions(-) delete mode 100644 asm/JSystem/JUtility/JUTAssert/flushMessage__12JUTAssertionFv.s delete mode 100644 asm/JSystem/JUtility/JUTAssert/flushMessage_dbPrint__12JUTAssertionFv.s delete mode 100644 asm/JSystem/JUtility/JUTAssert/flush_subroutine__12JUTAssertionFv.s delete mode 100644 asm/JSystem/JUtility/JUTAssert/setMessageCount__12JUTAssertionFi.s delete mode 100644 asm/JSystem/JUtility/JUTAssert/setVisible__12JUTAssertionFb.s diff --git a/asm/JSystem/JUtility/JUTAssert/flushMessage__12JUTAssertionFv.s b/asm/JSystem/JUtility/JUTAssert/flushMessage__12JUTAssertionFv.s deleted file mode 100644 index 9d9495aa97d..00000000000 --- a/asm/JSystem/JUtility/JUTAssert/flushMessage__12JUTAssertionFv.s +++ /dev/null @@ -1,48 +0,0 @@ -lbl_802E499C: -/* 802E499C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802E49A0 7C 08 02 A6 */ mflr r0 -/* 802E49A4 90 01 00 24 */ stw r0, 0x24(r1) -/* 802E49A8 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 802E49AC 4B FF FF B5 */ bl flush_subroutine__12JUTAssertionFv -/* 802E49B0 28 03 00 00 */ cmplwi r3, 0 -/* 802E49B4 41 82 00 8C */ beq lbl_802E4A40 -/* 802E49B8 88 0D 83 78 */ lbz r0, data_804508F8(r13) -/* 802E49BC 28 00 00 01 */ cmplwi r0, 1 -/* 802E49C0 40 82 00 80 */ bne lbl_802E4A40 -/* 802E49C4 83 ED 8F A8 */ lwz r31, sDirectPrint__14JUTDirectPrint(r13) -/* 802E49C8 80 1F 00 18 */ lwz r0, 0x18(r31) -/* 802E49CC 90 01 00 14 */ stw r0, 0x14(r1) -/* 802E49D0 38 60 00 FF */ li r3, 0xff -/* 802E49D4 98 61 00 0C */ stb r3, 0xc(r1) -/* 802E49D8 38 00 00 C8 */ li r0, 0xc8 -/* 802E49DC 98 01 00 0D */ stb r0, 0xd(r1) -/* 802E49E0 98 01 00 0E */ stb r0, 0xe(r1) -/* 802E49E4 98 61 00 0F */ stb r3, 0xf(r1) -/* 802E49E8 80 01 00 0C */ lwz r0, 0xc(r1) -/* 802E49EC 90 01 00 10 */ stw r0, 0x10(r1) -/* 802E49F0 7F E3 FB 78 */ mr r3, r31 -/* 802E49F4 38 81 00 10 */ addi r4, r1, 0x10 -/* 802E49F8 4B FF FD A1 */ bl setCharColor__14JUTDirectPrintFQ28JUtility6TColor -/* 802E49FC 7F E3 FB 78 */ mr r3, r31 -/* 802E4A00 38 80 00 10 */ li r4, 0x10 -/* 802E4A04 38 A0 00 10 */ li r5, 0x10 -/* 802E4A08 3C C0 80 43 */ lis r6, data_80434870@ha /* 0x80434870@ha */ -/* 802E4A0C 38 C6 48 70 */ addi r6, r6, data_80434870@l /* 0x80434870@l */ -/* 802E4A10 4B FF FC C9 */ bl drawString__14JUTDirectPrintFUsUsPc -/* 802E4A14 7F E3 FB 78 */ mr r3, r31 -/* 802E4A18 38 80 00 10 */ li r4, 0x10 -/* 802E4A1C 38 A0 00 18 */ li r5, 0x18 -/* 802E4A20 3C C0 80 43 */ lis r6, data_804348B0@ha /* 0x804348B0@ha */ -/* 802E4A24 38 C6 48 B0 */ addi r6, r6, data_804348B0@l /* 0x804348B0@l */ -/* 802E4A28 4B FF FC B1 */ bl drawString__14JUTDirectPrintFUsUsPc -/* 802E4A2C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802E4A30 90 01 00 08 */ stw r0, 8(r1) -/* 802E4A34 7F E3 FB 78 */ mr r3, r31 -/* 802E4A38 38 81 00 08 */ addi r4, r1, 8 -/* 802E4A3C 4B FF FD 5D */ bl setCharColor__14JUTDirectPrintFQ28JUtility6TColor -lbl_802E4A40: -/* 802E4A40 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 802E4A44 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802E4A48 7C 08 03 A6 */ mtlr r0 -/* 802E4A4C 38 21 00 20 */ addi r1, r1, 0x20 -/* 802E4A50 4E 80 00 20 */ blr diff --git a/asm/JSystem/JUtility/JUTAssert/flushMessage_dbPrint__12JUTAssertionFv.s b/asm/JSystem/JUtility/JUTAssert/flushMessage_dbPrint__12JUTAssertionFv.s deleted file mode 100644 index 7a8edb9c656..00000000000 --- a/asm/JSystem/JUtility/JUTAssert/flushMessage_dbPrint__12JUTAssertionFv.s +++ /dev/null @@ -1,122 +0,0 @@ -lbl_802E4A54: -/* 802E4A54 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 802E4A58 7C 08 02 A6 */ mflr r0 -/* 802E4A5C 90 01 00 54 */ stw r0, 0x54(r1) -/* 802E4A60 DB E1 00 40 */ stfd f31, 0x40(r1) -/* 802E4A64 F3 E1 00 48 */ psq_st f31, 72(r1), 0, 0 /* qr0 */ -/* 802E4A68 93 E1 00 3C */ stw r31, 0x3c(r1) -/* 802E4A6C 93 C1 00 38 */ stw r30, 0x38(r1) -/* 802E4A70 4B FF FE F1 */ bl flush_subroutine__12JUTAssertionFv -/* 802E4A74 28 03 00 00 */ cmplwi r3, 0 -/* 802E4A78 41 82 01 9C */ beq lbl_802E4C14 -/* 802E4A7C 88 0D 83 78 */ lbz r0, data_804508F8(r13) -/* 802E4A80 28 00 00 01 */ cmplwi r0, 1 -/* 802E4A84 40 82 01 90 */ bne lbl_802E4C14 -/* 802E4A88 80 6D 8F 48 */ lwz r3, sDebugPrint__10JUTDbPrint(r13) -/* 802E4A8C 28 03 00 00 */ cmplwi r3, 0 -/* 802E4A90 41 82 01 84 */ beq lbl_802E4C14 -/* 802E4A94 83 E3 00 04 */ lwz r31, 4(r3) -/* 802E4A98 28 1F 00 00 */ cmplwi r31, 0 -/* 802E4A9C 41 82 01 78 */ beq lbl_802E4C14 -/* 802E4AA0 48 06 8E 1D */ bl VIGetRetraceCount -/* 802E4AA4 54 60 16 36 */ rlwinm r0, r3, 2, 0x18, 0x1b -/* 802E4AA8 60 00 00 0F */ ori r0, r0, 0xf -/* 802E4AAC 54 1E 06 3E */ clrlwi r30, r0, 0x18 -/* 802E4AB0 7F E3 FB 78 */ mr r3, r31 -/* 802E4AB4 81 9F 00 00 */ lwz r12, 0(r31) -/* 802E4AB8 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 802E4ABC 7D 89 03 A6 */ mtctr r12 -/* 802E4AC0 4E 80 04 21 */ bctrl -/* 802E4AC4 38 00 00 FF */ li r0, 0xff -/* 802E4AC8 98 01 00 08 */ stb r0, 8(r1) -/* 802E4ACC 9B C1 00 09 */ stb r30, 9(r1) -/* 802E4AD0 9B C1 00 0A */ stb r30, 0xa(r1) -/* 802E4AD4 98 01 00 0B */ stb r0, 0xb(r1) -/* 802E4AD8 80 01 00 08 */ lwz r0, 8(r1) -/* 802E4ADC 90 01 00 0C */ stw r0, 0xc(r1) -/* 802E4AE0 7F E3 FB 78 */ mr r3, r31 -/* 802E4AE4 38 81 00 0C */ addi r4, r1, 0xc -/* 802E4AE8 4B FF A2 89 */ bl setCharColor__7JUTFontFQ28JUtility6TColor -/* 802E4AEC 3C 60 80 43 */ lis r3, data_80434870@ha /* 0x80434870@ha */ -/* 802E4AF0 38 63 48 70 */ addi r3, r3, data_80434870@l /* 0x80434870@l */ -/* 802E4AF4 48 08 40 F1 */ bl strlen -/* 802E4AF8 7C 7E 1B 78 */ mr r30, r3 -/* 802E4AFC 7F E3 FB 78 */ mr r3, r31 -/* 802E4B00 81 9F 00 00 */ lwz r12, 0(r31) -/* 802E4B04 81 8C 00 24 */ lwz r12, 0x24(r12) -/* 802E4B08 7D 89 03 A6 */ mtctr r12 -/* 802E4B0C 4E 80 04 21 */ bctrl -/* 802E4B10 C8 22 C6 C8 */ lfd f1, lit_728(r2) -/* 802E4B14 6C 60 80 00 */ xoris r0, r3, 0x8000 -/* 802E4B18 90 01 00 14 */ stw r0, 0x14(r1) -/* 802E4B1C 3C 00 43 30 */ lis r0, 0x4330 -/* 802E4B20 90 01 00 10 */ stw r0, 0x10(r1) -/* 802E4B24 C8 01 00 10 */ lfd f0, 0x10(r1) -/* 802E4B28 EF E0 08 28 */ fsubs f31, f0, f1 -/* 802E4B2C 7F E3 FB 78 */ mr r3, r31 -/* 802E4B30 81 9F 00 00 */ lwz r12, 0(r31) -/* 802E4B34 81 8C 00 28 */ lwz r12, 0x28(r12) -/* 802E4B38 7D 89 03 A6 */ mtctr r12 -/* 802E4B3C 4E 80 04 21 */ bctrl -/* 802E4B40 C8 22 C6 C8 */ lfd f1, lit_728(r2) -/* 802E4B44 6C 60 80 00 */ xoris r0, r3, 0x8000 -/* 802E4B48 90 01 00 1C */ stw r0, 0x1c(r1) -/* 802E4B4C 3C 00 43 30 */ lis r0, 0x4330 -/* 802E4B50 90 01 00 18 */ stw r0, 0x18(r1) -/* 802E4B54 C8 01 00 18 */ lfd f0, 0x18(r1) -/* 802E4B58 EC 60 08 28 */ fsubs f3, f0, f1 -/* 802E4B5C 7F E3 FB 78 */ mr r3, r31 -/* 802E4B60 C0 22 C6 B8 */ lfs f1, lit_724(r2) -/* 802E4B64 C0 42 C6 BC */ lfs f2, lit_725(r2) -/* 802E4B68 FC 80 F8 90 */ fmr f4, f31 -/* 802E4B6C 3C 80 80 43 */ lis r4, data_80434870@ha /* 0x80434870@ha */ -/* 802E4B70 38 84 48 70 */ addi r4, r4, data_80434870@l /* 0x80434870@l */ -/* 802E4B74 7F C5 F3 78 */ mr r5, r30 -/* 802E4B78 38 C0 00 01 */ li r6, 1 -/* 802E4B7C 4B FF A2 AD */ bl drawString_size_scale__7JUTFontFffffPCcUlb -/* 802E4B80 3C 60 80 43 */ lis r3, data_804348B0@ha /* 0x804348B0@ha */ -/* 802E4B84 38 63 48 B0 */ addi r3, r3, data_804348B0@l /* 0x804348B0@l */ -/* 802E4B88 48 08 40 5D */ bl strlen -/* 802E4B8C 7C 7E 1B 78 */ mr r30, r3 -/* 802E4B90 7F E3 FB 78 */ mr r3, r31 -/* 802E4B94 81 9F 00 00 */ lwz r12, 0(r31) -/* 802E4B98 81 8C 00 24 */ lwz r12, 0x24(r12) -/* 802E4B9C 7D 89 03 A6 */ mtctr r12 -/* 802E4BA0 4E 80 04 21 */ bctrl -/* 802E4BA4 C8 22 C6 C8 */ lfd f1, lit_728(r2) -/* 802E4BA8 6C 60 80 00 */ xoris r0, r3, 0x8000 -/* 802E4BAC 90 01 00 24 */ stw r0, 0x24(r1) -/* 802E4BB0 3C 00 43 30 */ lis r0, 0x4330 -/* 802E4BB4 90 01 00 20 */ stw r0, 0x20(r1) -/* 802E4BB8 C8 01 00 20 */ lfd f0, 0x20(r1) -/* 802E4BBC EF E0 08 28 */ fsubs f31, f0, f1 -/* 802E4BC0 7F E3 FB 78 */ mr r3, r31 -/* 802E4BC4 81 9F 00 00 */ lwz r12, 0(r31) -/* 802E4BC8 81 8C 00 28 */ lwz r12, 0x28(r12) -/* 802E4BCC 7D 89 03 A6 */ mtctr r12 -/* 802E4BD0 4E 80 04 21 */ bctrl -/* 802E4BD4 C8 22 C6 C8 */ lfd f1, lit_728(r2) -/* 802E4BD8 6C 60 80 00 */ xoris r0, r3, 0x8000 -/* 802E4BDC 90 01 00 2C */ stw r0, 0x2c(r1) -/* 802E4BE0 3C 00 43 30 */ lis r0, 0x4330 -/* 802E4BE4 90 01 00 28 */ stw r0, 0x28(r1) -/* 802E4BE8 C8 01 00 28 */ lfd f0, 0x28(r1) -/* 802E4BEC EC 60 08 28 */ fsubs f3, f0, f1 -/* 802E4BF0 7F E3 FB 78 */ mr r3, r31 -/* 802E4BF4 C0 22 C6 B8 */ lfs f1, lit_724(r2) -/* 802E4BF8 C0 42 C6 C0 */ lfs f2, lit_726(r2) -/* 802E4BFC FC 80 F8 90 */ fmr f4, f31 -/* 802E4C00 3C 80 80 43 */ lis r4, data_804348B0@ha /* 0x804348B0@ha */ -/* 802E4C04 38 84 48 B0 */ addi r4, r4, data_804348B0@l /* 0x804348B0@l */ -/* 802E4C08 7F C5 F3 78 */ mr r5, r30 -/* 802E4C0C 38 C0 00 01 */ li r6, 1 -/* 802E4C10 4B FF A2 19 */ bl drawString_size_scale__7JUTFontFffffPCcUlb -lbl_802E4C14: -/* 802E4C14 E3 E1 00 48 */ psq_l f31, 72(r1), 0, 0 /* qr0 */ -/* 802E4C18 CB E1 00 40 */ lfd f31, 0x40(r1) -/* 802E4C1C 83 E1 00 3C */ lwz r31, 0x3c(r1) -/* 802E4C20 83 C1 00 38 */ lwz r30, 0x38(r1) -/* 802E4C24 80 01 00 54 */ lwz r0, 0x54(r1) -/* 802E4C28 7C 08 03 A6 */ mtlr r0 -/* 802E4C2C 38 21 00 50 */ addi r1, r1, 0x50 -/* 802E4C30 4E 80 00 20 */ blr diff --git a/asm/JSystem/JUtility/JUTAssert/flush_subroutine__12JUTAssertionFv.s b/asm/JSystem/JUtility/JUTAssert/flush_subroutine__12JUTAssertionFv.s deleted file mode 100644 index 7f1397d64cc..00000000000 --- a/asm/JSystem/JUtility/JUTAssert/flush_subroutine__12JUTAssertionFv.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_802E4960: -/* 802E4960 80 6D 8F B0 */ lwz r3, data_80451530(r13) -/* 802E4964 28 03 00 00 */ cmplwi r3, 0 -/* 802E4968 40 82 00 0C */ bne lbl_802E4974 -/* 802E496C 38 60 00 00 */ li r3, 0 -/* 802E4970 4E 80 00 20 */ blr -lbl_802E4974: -/* 802E4974 3C 03 00 01 */ addis r0, r3, 1 -/* 802E4978 28 00 FF FF */ cmplwi r0, 0xffff -/* 802E497C 41 82 00 0C */ beq lbl_802E4988 -/* 802E4980 38 03 FF FF */ addi r0, r3, -1 -/* 802E4984 90 0D 8F B0 */ stw r0, data_80451530(r13) -lbl_802E4988: -/* 802E4988 80 6D 8F B0 */ lwz r3, data_80451530(r13) -/* 802E498C 28 03 00 05 */ cmplwi r3, 5 -/* 802E4990 4C 80 00 20 */ bgelr -/* 802E4994 38 60 00 00 */ li r3, 0 -/* 802E4998 4E 80 00 20 */ blr diff --git a/asm/JSystem/JUtility/JUTAssert/setMessageCount__12JUTAssertionFi.s b/asm/JSystem/JUtility/JUTAssert/setMessageCount__12JUTAssertionFi.s deleted file mode 100644 index aed5a198edd..00000000000 --- a/asm/JSystem/JUtility/JUTAssert/setMessageCount__12JUTAssertionFi.s +++ /dev/null @@ -1,7 +0,0 @@ -lbl_802E4C3C: -/* 802E4C3C 7C 03 00 D0 */ neg r0, r3 -/* 802E4C40 7C 60 03 38 */ orc r0, r3, r0 -/* 802E4C44 7C 00 FE 70 */ srawi r0, r0, 0x1f -/* 802E4C48 7C 60 00 78 */ andc r0, r3, r0 -/* 802E4C4C 90 0D 8F B0 */ stw r0, data_80451530(r13) -/* 802E4C50 4E 80 00 20 */ blr diff --git a/asm/JSystem/JUtility/JUTAssert/setVisible__12JUTAssertionFb.s b/asm/JSystem/JUtility/JUTAssert/setVisible__12JUTAssertionFb.s deleted file mode 100644 index f17c0b4fd02..00000000000 --- a/asm/JSystem/JUtility/JUTAssert/setVisible__12JUTAssertionFb.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_802E4C34: -/* 802E4C34 98 6D 83 78 */ stb r3, data_804508F8(r13) -/* 802E4C38 4E 80 00 20 */ blr diff --git a/include/JSystem/JUtility/JUTAssert.h b/include/JSystem/JUtility/JUTAssert.h index 26f1afec9c7..c9d9f3c86f6 100644 --- a/include/JSystem/JUtility/JUTAssert.h +++ b/include/JSystem/JUtility/JUTAssert.h @@ -26,11 +26,13 @@ // TODO: make it a namespace struct JUTAssertion { /* 802E495C */ static void create(); - /* 802E4960 */ static void flush_subroutine(); + /* 802E4960 */ static u32 flush_subroutine(); /* 802E499C */ static void flushMessage(); /* 802E4A54 */ static void flushMessage_dbPrint(); /* 802E4C34 */ static void setVisible(bool); /* 802E4C3C */ static void setMessageCount(int); }; +extern bool sAssertVisible; + #endif /* JUTASSERT_H */ diff --git a/include/JSystem/JUtility/JUTDbPrint.h b/include/JSystem/JUtility/JUTDbPrint.h index 18f951784a1..30b325183d7 100644 --- a/include/JSystem/JUtility/JUTDbPrint.h +++ b/include/JSystem/JUtility/JUTDbPrint.h @@ -26,7 +26,9 @@ public: /* 802E0440 */ void drawString(int, int, int, u8 const*); static JUTDbPrint* getManager() { return sDebugPrint; } + void setVisible(bool visible) { mVisible = visible; } + JUTFont* getFont() const { return mFont; } static JUTDbPrint* sDebugPrint; diff --git a/include/JSystem/JUtility/JUTDirectPrint.h b/include/JSystem/JUtility/JUTDirectPrint.h index 53927bea726..a24dfac7065 100644 --- a/include/JSystem/JUtility/JUTDirectPrint.h +++ b/include/JSystem/JUtility/JUTDirectPrint.h @@ -23,6 +23,7 @@ public: /* 802E4240 */ static JUTDirectPrint* start(); bool isActive() const { return field_0x00 != 0; } + JUtility::TColor getCharColor() const { return mCharColor; } static JUTDirectPrint* getManager() { return sDirectPrint; } diff --git a/include/JSystem/JUtility/JUTFont.h b/include/JSystem/JUtility/JUTFont.h index ab47155562d..fcf49010769 100644 --- a/include/JSystem/JUtility/JUTFont.h +++ b/include/JSystem/JUtility/JUTFont.h @@ -2,6 +2,7 @@ #define JUTFONT_H #include "JSystem/JUtility/TColor.h" +#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/string.h" #include "dolphin/gx/GX.h" #include "dolphin/types.h" @@ -88,6 +89,14 @@ public: void setGradColor(JUtility::TColor col1, JUtility::TColor col2); f32 drawString_size_scale(f32 a1, f32 a2, f32 a3, f32 a4, const char* a5, u32 usz, bool a7); + void drawString(int param_0, int param_1, const char* str, bool param_3) { + drawString_size(param_0, param_1, str, strlen(str), param_3); + } + + void drawString_size(int param_0, int param_1, const char* str, u32 len, bool param_4) { + drawString_size_scale(param_0, param_1, getWidth(), getHeight(), str, len, param_4); + } + /* 0x04 */ bool mValid; /* 0x05 */ bool mFixed; /* 0x08 */ int mFixedWidth; diff --git a/libs/JSystem/J2DGraph/J2DMaterialFactory.cpp b/libs/JSystem/J2DGraph/J2DMaterialFactory.cpp index 99e01d25dbf..4c44330343e 100644 --- a/libs/JSystem/J2DGraph/J2DMaterialFactory.cpp +++ b/libs/JSystem/J2DGraph/J2DMaterialFactory.cpp @@ -86,7 +86,6 @@ extern "C" void _savegpr_19(); extern "C" void _savegpr_29(); extern "C" void _restgpr_19(); extern "C" void _restgpr_29(); -extern "C" void strcpy(); extern "C" extern u8 const j2dDefaultTexCoordInfo[32]; extern "C" extern u8 const j2dDefaultIndTexMtxInfo[28]; extern "C" extern u8 const j2dDefaultIndTevStageInfo[12]; diff --git a/libs/JSystem/J2DGraph/J2DPrint.cpp b/libs/JSystem/J2DGraph/J2DPrint.cpp index a209638370d..c72d6656486 100644 --- a/libs/JSystem/J2DGraph/J2DPrint.cpp +++ b/libs/JSystem/J2DGraph/J2DPrint.cpp @@ -48,7 +48,6 @@ extern "C" void _restgpr_25(); extern "C" void _restgpr_26(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" void strlen(); extern "C" void strtol(); extern "C" void strtoul(); extern "C" u8 sSystemHeap__7JKRHeap[4]; diff --git a/libs/JSystem/JUtility/JUTAssert.cpp b/libs/JSystem/JUtility/JUTAssert.cpp index e91214818e4..94b47865ff8 100644 --- a/libs/JSystem/JUtility/JUTAssert.cpp +++ b/libs/JSystem/JUtility/JUTAssert.cpp @@ -4,57 +4,11 @@ // #include "JSystem/JUtility/JUTAssert.h" +#include "JSystem/JUtility/JUTDbPrint.h" +#include "JSystem/JUtility/JUTDirectPrint.h" #include "dol2asm.h" #include "dolphin/types.h" - -// -// Types: -// - -struct JUtility { - struct TColor {}; -}; - -struct JUTFont { - /* 802DED70 */ void setCharColor(JUtility::TColor); - /* 802DEE28 */ void drawString_size_scale(f32, f32, f32, f32, char const*, u32, bool); -}; - -struct JUTDirectPrint { - /* 802E46D8 */ void drawString(u16, u16, char*); - /* 802E4798 */ void setCharColor(JUtility::TColor); - - static u8 sDirectPrint[4 + 4 /* padding */]; -}; - -struct JUTDbPrint { - static u8 sDebugPrint[4 + 4 /* padding */]; -}; - -// -// Forward References: -// - -extern "C" void create__12JUTAssertionFv(); -extern "C" void flush_subroutine__12JUTAssertionFv(); -extern "C" void flushMessage__12JUTAssertionFv(); -extern "C" void flushMessage_dbPrint__12JUTAssertionFv(); -extern "C" void setVisible__12JUTAssertionFb(); -extern "C" void setMessageCount__12JUTAssertionFi(); - -// -// External References: -// - -extern "C" void setCharColor__7JUTFontFQ28JUtility6TColor(); -extern "C" void drawString_size_scale__7JUTFontFffffPCcUlb(); -extern "C" void drawString__14JUTDirectPrintFUsUsPc(); -extern "C" void setCharColor__14JUTDirectPrintFQ28JUtility6TColor(); -extern "C" void VIGetRetraceCount(); -extern "C" void strlen(); -extern "C" extern u8 data_804508F8[8]; -extern "C" u8 sDebugPrint__10JUTDbPrint[4 + 4 /* padding */]; -extern "C" u8 sDirectPrint__14JUTDirectPrint[4 + 4 /* padding */]; +#include "dolphin/vi/vi.h" // // Declarations: @@ -68,82 +22,67 @@ void JUTAssertion::create() { /* ############################################################################################## */ /* 80451530-80451538 000A30 0004+04 2/2 0/0 0/0 .sbss * sMessageLife__Q212JUTAssertion23@unnamed@JUTAssert_cpp@ */ -static s32 data_80451530; +static u32 sMessageLife; /* 802E4960-802E499C 2DF2A0 003C+00 2/2 0/0 0/0 .text flush_subroutine__12JUTAssertionFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JUTAssertion::flush_subroutine() { - nofralloc -#include "asm/JSystem/JUtility/JUTAssert/flush_subroutine__12JUTAssertionFv.s" +u32 JUTAssertion::flush_subroutine() { + if (sMessageLife == 0) { + return 0; + } + + if (sMessageLife != -1) { + sMessageLife--; + } + + if (sMessageLife >= 5) { + return sMessageLife; + } + return 0; } -#pragma pop /* ############################################################################################## */ /* 80434870-804348B0 061590 0040+00 2/2 0/0 0/0 .bss * sMessageFileLine__Q212JUTAssertion23@unnamed@JUTAssert_cpp@ */ -static u8 data_80434870[64]; +static char sMessageFileLine[64]; /* 804348B0-804349B0 0615D0 0100+00 2/2 0/0 0/0 .bss * sMessageString__Q212JUTAssertion23@unnamed@JUTAssert_cpp@ */ -static u8 data_804348B0[256]; +static char sMessageString[256]; /* 802E499C-802E4A54 2DF2DC 00B8+00 0/0 1/1 0/0 .text flushMessage__12JUTAssertionFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JUTAssertion::flushMessage() { - nofralloc -#include "asm/JSystem/JUtility/JUTAssert/flushMessage__12JUTAssertionFv.s" +void JUTAssertion::flushMessage() { + if (flush_subroutine() && sAssertVisible == true) { + JUTDirectPrint* manager = JUTDirectPrint::getManager(); + JUtility::TColor color = manager->getCharColor(); + manager->setCharColor(JUtility::TColor(255, 200, 200, 255)); + manager->drawString(16, 16, sMessageFileLine); + manager->drawString(16, 24, sMessageString); + manager->setCharColor(color); + } } -#pragma pop - -/* ############################################################################################## */ -/* 804560B8-804560BC 0046B8 0004+00 1/1 0/0 0/0 .sdata2 @724 */ -SECTION_SDATA2 static f32 lit_724 = 30.0f; - -/* 804560BC-804560C0 0046BC 0004+00 1/1 0/0 0/0 .sdata2 @725 */ -SECTION_SDATA2 static f32 lit_725 = 36.0f; - -/* 804560C0-804560C8 0046C0 0004+04 1/1 0/0 0/0 .sdata2 @726 */ -SECTION_SDATA2 static f32 lit_726[1 + 1 /* padding */] = { - 54.0f, - /* padding */ - 0.0f, -}; - -/* 804560C8-804560D0 0046C8 0008+00 1/1 0/0 0/0 .sdata2 @728 */ -SECTION_SDATA2 static f64 lit_728 = 4503601774854144.0 /* cast s32 to float */; /* 802E4A54-802E4C34 2DF394 01E0+00 0/0 1/1 0/0 .text flushMessage_dbPrint__12JUTAssertionFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JUTAssertion::flushMessage_dbPrint() { - nofralloc -#include "asm/JSystem/JUtility/JUTAssert/flushMessage_dbPrint__12JUTAssertionFv.s" +void JUTAssertion::flushMessage_dbPrint() { + if (flush_subroutine() && sAssertVisible == true && JUTDbPrint::getManager() != NULL) { + JUTFont* font = JUTDbPrint::getManager()->getFont(); + if (font != NULL) { + u8 tmp = ((VIGetRetraceCount() & 0x3C) << 2) | 0xF; + font->setGX(); + font->setCharColor(JUtility::TColor(255, tmp, tmp, 255)); + font->drawString(30, 36, sMessageFileLine, true); + font->drawString(30, 54, sMessageString, true); + } + } } -#pragma pop /* 802E4C34-802E4C3C 2DF574 0008+00 0/0 2/2 0/0 .text setVisible__12JUTAssertionFb */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JUTAssertion::setVisible(bool param_0) { - nofralloc -#include "asm/JSystem/JUtility/JUTAssert/setVisible__12JUTAssertionFb.s" +void JUTAssertion::setVisible(bool visible) { + sAssertVisible = visible; } -#pragma pop /* 802E4C3C-802E4C54 2DF57C 0018+00 0/0 2/2 0/0 .text setMessageCount__12JUTAssertionFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JUTAssertion::setMessageCount(int param_0) { - nofralloc -#include "asm/JSystem/JUtility/JUTAssert/setMessageCount__12JUTAssertionFi.s" +void JUTAssertion::setMessageCount(int msg_count) { + sMessageLife = msg_count <= 0 ? 0 : msg_count; } -#pragma pop diff --git a/libs/JSystem/JUtility/JUTConsole.cpp b/libs/JSystem/JUtility/JUTConsole.cpp index b881a4e5080..e65a9f8dceb 100644 --- a/libs/JSystem/JUtility/JUTConsole.cpp +++ b/libs/JSystem/JUtility/JUTConsole.cpp @@ -90,7 +90,6 @@ extern "C" void _restgpr_20(); extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" void strlen(); extern "C" extern void* __vt__14J2DGrafContext[10]; extern "C" extern void* __vt__13J2DOrthoGraph[10]; extern "C" u8 sCurrentHeap__7JKRHeap[4]; diff --git a/libs/JSystem/JUtility/JUTException.cpp b/libs/JSystem/JUtility/JUTException.cpp index de11b02146b..921d0266a7c 100644 --- a/libs/JSystem/JUtility/JUTException.cpp +++ b/libs/JSystem/JUtility/JUTException.cpp @@ -7,10 +7,10 @@ #include "JSystem/JUtility/JUTConsole.h" #include "JSystem/JUtility/JUTDirectPrint.h" #include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/float.h" +#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf.h" #include "Runtime.PPCEABI.H/__va_arg.h" #include "dol2asm.h" #include "dolphin/types.h" -#include "msl_c/string.h" // // Forward References: @@ -1146,8 +1146,6 @@ JUTException::~JUTException() {} /* ############################################################################################## */ /* 804508F8-80450900 000378 0008+00 0/0 3/3 0/0 .sdata None */ -SECTION_SDATA extern u8 data_804508F8[8] = { - 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA extern bool sAssertVisible = true; /* 8039D490-8039D490 029AF0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/d_select_cursor.cpp b/src/d/d_select_cursor.cpp index fb6da31781f..28a646cc835 100644 --- a/src/d/d_select_cursor.cpp +++ b/src/d/d_select_cursor.cpp @@ -70,7 +70,6 @@ extern "C" void _restgpr_23(); extern "C" void _restgpr_26(); extern "C" void _restgpr_27(); extern "C" void _restgpr_29(); -extern "C" void strcmp(); extern "C" extern void* __vt__12dDlst_base_c[3]; extern "C" extern void* __vt__10J2DAnmBase[4]; extern "C" extern void* __vt__15J2DAnmTransform[5 + 4 /* padding */]; diff --git a/src/d/menu/d_menu_collect.cpp b/src/d/menu/d_menu_collect.cpp index 64f0ac856b8..d79e83d1181 100644 --- a/src/d/menu/d_menu_collect.cpp +++ b/src/d/menu/d_menu_collect.cpp @@ -430,7 +430,6 @@ extern "C" void _restgpr_26(); extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" void strcpy(); extern "C" extern void* __vt__12J3DFrameCtrl[3]; extern "C" extern void* __vt__12dDlst_base_c[3]; extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; diff --git a/src/d/menu/d_menu_dmap.cpp b/src/d/menu/d_menu_dmap.cpp index 231777b8272..f672982e0a6 100644 --- a/src/d/menu/d_menu_dmap.cpp +++ b/src/d/menu/d_menu_dmap.cpp @@ -285,8 +285,6 @@ extern "C" u8 myclass__12dMenu_Dmap_c[4 + 4 /* padding */]; // External References: // -SECTION_INIT void memset(); -SECTION_INIT void memcpy(); extern "C" void mDoExt_getJ2dHeap__Fv(); extern "C" void mDoExt_destroyExpHeap__FP10JKRExpHeap(); extern "C" void mDoExt_setCurrentHeap__FP7JKRHeap(); @@ -420,7 +418,6 @@ extern "C" void _restgpr_26(); extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" void strcpy(); extern "C" extern void* __vt__12dDlst_base_c[3]; extern "C" extern void* __vt__28dDrawPathWithNormalPattern_c[16]; extern "C" extern void* __vt__15dRenderingMap_c[23]; diff --git a/src/d/menu/d_menu_fishing.cpp b/src/d/menu/d_menu_fishing.cpp index 4d87bb6f4e9..457a8d34c58 100644 --- a/src/d/menu/d_menu_fishing.cpp +++ b/src/d/menu/d_menu_fishing.cpp @@ -100,7 +100,6 @@ extern "C" void _restgpr_25(); extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" void strcpy(); extern "C" extern void* __vt__12dDlst_base_c[3]; extern "C" u8 m_cpadInfo__8mDoCPd_c[256]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; diff --git a/src/d/menu/d_menu_fmap.cpp b/src/d/menu/d_menu_fmap.cpp index ac1db58a5ee..4e63663e93a 100644 --- a/src/d/menu/d_menu_fmap.cpp +++ b/src/d/menu/d_menu_fmap.cpp @@ -453,8 +453,6 @@ extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); extern "C" void sprintf(); -extern "C" void strcmp(); -extern "C" void strcpy(); extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; extern "C" extern void* __vt__19dMenuFmapIconDisp_c[3]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; diff --git a/src/d/menu/d_menu_insect.cpp b/src/d/menu/d_menu_insect.cpp index 6ba895e2b17..81282c73a51 100644 --- a/src/d/menu/d_menu_insect.cpp +++ b/src/d/menu/d_menu_insect.cpp @@ -190,8 +190,6 @@ extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); extern "C" void snprintf(); -extern "C" void strcat(); -extern "C" void strcpy(); extern "C" extern void* __vt__12dDlst_base_c[3]; extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; extern "C" u8 m_cpadInfo__8mDoCPd_c[256]; diff --git a/src/d/menu/d_menu_letter.cpp b/src/d/menu/d_menu_letter.cpp index 79f15c44d60..5b4751f6844 100644 --- a/src/d/menu/d_menu_letter.cpp +++ b/src/d/menu/d_menu_letter.cpp @@ -200,7 +200,6 @@ extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); extern "C" void sprintf(); -extern "C" void strcpy(); extern "C" extern void* __vt__12dDlst_base_c[3]; extern "C" u8 letter_data__12dMenu_Letter[512]; extern "C" u8 m_cpadInfo__8mDoCPd_c[256]; diff --git a/src/d/menu/d_menu_option.cpp b/src/d/menu/d_menu_option.cpp index ce562e8322b..f16ff8f1341 100644 --- a/src/d/menu/d_menu_option.cpp +++ b/src/d/menu/d_menu_option.cpp @@ -260,7 +260,6 @@ extern "C" void _restgpr_26(); extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" void strcpy(); extern "C" extern void* __vt__12dDlst_base_c[3]; extern "C" u8 m_gamePad__8mDoCPd_c[16]; extern "C" u8 m_cpadInfo__8mDoCPd_c[256]; diff --git a/src/d/menu/d_menu_ring.cpp b/src/d/menu/d_menu_ring.cpp index 19b10355543..8bcd53e40c4 100644 --- a/src/d/menu/d_menu_ring.cpp +++ b/src/d/menu/d_menu_ring.cpp @@ -247,7 +247,6 @@ extern "C" void _restgpr_26(); extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" void strcpy(); extern "C" extern void* __vt__12dDlst_base_c[3]; extern "C" void* item_resource__10dItem_data[1530]; extern "C" u8 m_cpadInfo__8mDoCPd_c[256]; diff --git a/src/d/menu/d_menu_save.cpp b/src/d/menu/d_menu_save.cpp index a8f52f73045..2db66924abc 100644 --- a/src/d/menu/d_menu_save.cpp +++ b/src/d/menu/d_menu_save.cpp @@ -354,7 +354,6 @@ extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); extern "C" void printf(); -extern "C" void strcpy(); extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; extern "C" extern void* __vt__12dDlst_base_c[3]; extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; diff --git a/src/d/menu/d_menu_skill.cpp b/src/d/menu/d_menu_skill.cpp index 14eb7a87496..0c92b021bc6 100644 --- a/src/d/menu/d_menu_skill.cpp +++ b/src/d/menu/d_menu_skill.cpp @@ -140,7 +140,6 @@ extern "C" void _restgpr_26(); extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" void strcpy(); extern "C" extern void* __vt__12dDlst_base_c[3]; extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; extern "C" u8 m_cpadInfo__8mDoCPd_c[256]; From a08f84abd508ddf6cbdddcd994a300a16be0e46f Mon Sep 17 00:00:00 2001 From: TakaRikka <38417346+TakaRikka@users.noreply.github.com> Date: Mon, 10 Jan 2022 06:10:00 -0800 Subject: [PATCH 6/7] JUTGraphFifo --- .../JUTGraphFifo/__ct__12JUTGraphFifoFUl.s | 58 ----------- .../JUTGraphFifo/__dt__12JUTGraphFifoFv.s | 53 ---------- include/JSystem/JUtility/JUTGraphFifo.h | 29 ++++++ include/dolphin/gx/GX.h | 3 + libs/JSystem/JFramework/JFWSystem.cpp | 11 +-- libs/JSystem/JUtility/JUTGraphFifo.cpp | 99 ++++++------------- 6 files changed, 61 insertions(+), 192 deletions(-) delete mode 100644 asm/JSystem/JUtility/JUTGraphFifo/__ct__12JUTGraphFifoFUl.s delete mode 100644 asm/JSystem/JUtility/JUTGraphFifo/__dt__12JUTGraphFifoFv.s diff --git a/asm/JSystem/JUtility/JUTGraphFifo/__ct__12JUTGraphFifoFUl.s b/asm/JSystem/JUtility/JUTGraphFifo/__ct__12JUTGraphFifoFUl.s deleted file mode 100644 index c96c2ca71a4..00000000000 --- a/asm/JSystem/JUtility/JUTGraphFifo/__ct__12JUTGraphFifoFUl.s +++ /dev/null @@ -1,58 +0,0 @@ -lbl_802DEB58: -/* 802DEB58 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802DEB5C 7C 08 02 A6 */ mflr r0 -/* 802DEB60 90 01 00 14 */ stw r0, 0x14(r1) -/* 802DEB64 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802DEB68 7C 7F 1B 78 */ mr r31, r3 -/* 802DEB6C 3C 60 80 3D */ lis r3, __vt__12JUTGraphFifo@ha /* 0x803CC590@ha */ -/* 802DEB70 38 03 C5 90 */ addi r0, r3, __vt__12JUTGraphFifo@l /* 0x803CC590@l */ -/* 802DEB74 90 1F 00 00 */ stw r0, 0(r31) -/* 802DEB78 38 04 00 1F */ addi r0, r4, 0x1f -/* 802DEB7C 54 00 00 34 */ rlwinm r0, r0, 0, 0, 0x1a -/* 802DEB80 90 1F 00 0C */ stw r0, 0xc(r31) -/* 802DEB84 88 0D 8F 38 */ lbz r0, data_804514B8(r13) -/* 802DEB88 28 00 00 00 */ cmplwi r0, 0 -/* 802DEB8C 41 82 00 4C */ beq lbl_802DEBD8 -/* 802DEB90 80 6D 8D F0 */ lwz r3, sSystemHeap__7JKRHeap(r13) -/* 802DEB94 80 9F 00 0C */ lwz r4, 0xc(r31) -/* 802DEB98 38 84 00 80 */ addi r4, r4, 0x80 -/* 802DEB9C 38 A0 00 20 */ li r5, 0x20 -/* 802DEBA0 4B FE F9 35 */ bl alloc__7JKRHeapFUli -/* 802DEBA4 90 7F 00 04 */ stw r3, 4(r31) -/* 802DEBA8 80 7F 00 04 */ lwz r3, 4(r31) -/* 802DEBAC 38 03 00 80 */ addi r0, r3, 0x80 -/* 802DEBB0 90 1F 00 08 */ stw r0, 8(r31) -/* 802DEBB4 80 7F 00 04 */ lwz r3, 4(r31) -/* 802DEBB8 80 9F 00 08 */ lwz r4, 8(r31) -/* 802DEBBC 80 BF 00 0C */ lwz r5, 0xc(r31) -/* 802DEBC0 48 07 BB 1D */ bl GXInitFifoBase -/* 802DEBC4 80 9F 00 08 */ lwz r4, 8(r31) -/* 802DEBC8 80 7F 00 04 */ lwz r3, 4(r31) -/* 802DEBCC 7C 85 23 78 */ mr r5, r4 -/* 802DEBD0 48 07 BB 79 */ bl GXInitFifoPtrs -/* 802DEBD4 48 00 00 48 */ b lbl_802DEC1C -lbl_802DEBD8: -/* 802DEBD8 80 6D 8D F0 */ lwz r3, sSystemHeap__7JKRHeap(r13) -/* 802DEBDC 80 9F 00 0C */ lwz r4, 0xc(r31) -/* 802DEBE0 38 84 00 A0 */ addi r4, r4, 0xa0 -/* 802DEBE4 38 A0 00 20 */ li r5, 0x20 -/* 802DEBE8 4B FE F8 ED */ bl alloc__7JKRHeapFUli -/* 802DEBEC 90 7F 00 08 */ stw r3, 8(r31) -/* 802DEBF0 80 7F 00 08 */ lwz r3, 8(r31) -/* 802DEBF4 38 03 00 1F */ addi r0, r3, 0x1f -/* 802DEBF8 54 00 00 34 */ rlwinm r0, r0, 0, 0, 0x1a -/* 802DEBFC 90 1F 00 08 */ stw r0, 8(r31) -/* 802DEC00 80 7F 00 08 */ lwz r3, 8(r31) -/* 802DEC04 80 9F 00 0C */ lwz r4, 0xc(r31) -/* 802DEC08 48 07 AA 69 */ bl GXInit -/* 802DEC0C 90 7F 00 04 */ stw r3, 4(r31) -/* 802DEC10 38 00 00 01 */ li r0, 1 -/* 802DEC14 98 0D 8F 38 */ stb r0, data_804514B8(r13) -/* 802DEC18 93 ED 8F 3C */ stw r31, sCurrentFifo__12JUTGraphFifo(r13) -lbl_802DEC1C: -/* 802DEC1C 7F E3 FB 78 */ mr r3, r31 -/* 802DEC20 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802DEC24 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802DEC28 7C 08 03 A6 */ mtlr r0 -/* 802DEC2C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802DEC30 4E 80 00 20 */ blr diff --git a/asm/JSystem/JUtility/JUTGraphFifo/__dt__12JUTGraphFifoFv.s b/asm/JSystem/JUtility/JUTGraphFifo/__dt__12JUTGraphFifoFv.s deleted file mode 100644 index c8da413345a..00000000000 --- a/asm/JSystem/JUtility/JUTGraphFifo/__dt__12JUTGraphFifoFv.s +++ /dev/null @@ -1,53 +0,0 @@ -lbl_802DEC34: -/* 802DEC34 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802DEC38 7C 08 02 A6 */ mflr r0 -/* 802DEC3C 90 01 00 24 */ stw r0, 0x24(r1) -/* 802DEC40 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DEC44 48 08 35 8D */ bl _savegpr_26 -/* 802DEC48 7C 7A 1B 79 */ or. r26, r3, r3 -/* 802DEC4C 7C 9B 23 78 */ mr r27, r4 -/* 802DEC50 41 82 00 8C */ beq lbl_802DECDC -/* 802DEC54 3C 60 80 3D */ lis r3, __vt__12JUTGraphFifo@ha /* 0x803CC590@ha */ -/* 802DEC58 38 03 C5 90 */ addi r0, r3, __vt__12JUTGraphFifo@l /* 0x803CC590@l */ -/* 802DEC5C 90 1A 00 00 */ stw r0, 0(r26) -/* 802DEC60 80 6D 8F 3C */ lwz r3, sCurrentFifo__12JUTGraphFifo(r13) -/* 802DEC64 80 63 00 04 */ lwz r3, 4(r3) -/* 802DEC68 48 07 BE 25 */ bl GXSaveCPUFifo -/* 802DEC6C 3B ED 8F 40 */ la r31, mGpStatus__12JUTGraphFifo(r13) /* 804514C0-_SDA_BASE_ */ -/* 802DEC70 7F FE FB 78 */ mr r30, r31 -/* 802DEC74 7F FD FB 78 */ mr r29, r31 -/* 802DEC78 3B 9F 00 01 */ addi r28, r31, 1 -/* 802DEC7C 3B FF 00 04 */ addi r31, r31, 4 -/* 802DEC80 3B DE 00 03 */ addi r30, r30, 3 -/* 802DEC84 3B BD 00 02 */ addi r29, r29, 2 -lbl_802DEC88: -/* 802DEC88 38 6D 8F 40 */ la r3, mGpStatus__12JUTGraphFifo(r13) /* 804514C0-_SDA_BASE_ */ -/* 802DEC8C 7F 84 E3 78 */ mr r4, r28 -/* 802DEC90 7F A5 EB 78 */ mr r5, r29 -/* 802DEC94 7F C6 F3 78 */ mr r6, r30 -/* 802DEC98 7F E7 FB 78 */ mr r7, r31 -/* 802DEC9C 48 07 BE ED */ bl GXGetGPStatus -/* 802DECA0 88 1D 00 00 */ lbz r0, 0(r29) -/* 802DECA4 28 00 00 00 */ cmplwi r0, 0 -/* 802DECA8 41 82 FF E0 */ beq lbl_802DEC88 -/* 802DECAC 80 0D 8F 3C */ lwz r0, sCurrentFifo__12JUTGraphFifo(r13) -/* 802DECB0 7C 00 D0 40 */ cmplw r0, r26 -/* 802DECB4 40 82 00 0C */ bne lbl_802DECC0 -/* 802DECB8 38 00 00 00 */ li r0, 0 -/* 802DECBC 90 0D 8F 3C */ stw r0, sCurrentFifo__12JUTGraphFifo(r13) -lbl_802DECC0: -/* 802DECC0 80 6D 8D F0 */ lwz r3, sSystemHeap__7JKRHeap(r13) -/* 802DECC4 80 9A 00 08 */ lwz r4, 8(r26) -/* 802DECC8 4B FE F8 81 */ bl free__7JKRHeapFPv -/* 802DECCC 7F 60 07 35 */ extsh. r0, r27 -/* 802DECD0 40 81 00 0C */ ble lbl_802DECDC -/* 802DECD4 7F 43 D3 78 */ mr r3, r26 -/* 802DECD8 4B FF 00 65 */ bl __dl__FPv -lbl_802DECDC: -/* 802DECDC 7F 43 D3 78 */ mr r3, r26 -/* 802DECE0 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DECE4 48 08 35 39 */ bl _restgpr_26 -/* 802DECE8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802DECEC 7C 08 03 A6 */ mtlr r0 -/* 802DECF0 38 21 00 20 */ addi r1, r1, 0x20 -/* 802DECF4 4E 80 00 20 */ blr diff --git a/include/JSystem/JUtility/JUTGraphFifo.h b/include/JSystem/JUtility/JUTGraphFifo.h index 393b232adb7..8dae2c7b907 100644 --- a/include/JSystem/JUtility/JUTGraphFifo.h +++ b/include/JSystem/JUtility/JUTGraphFifo.h @@ -1,6 +1,35 @@ #ifndef JUTGRAPHFIFO_H #define JUTGRAPHFIFO_H +#include "dolphin/gx/GX.h" #include "dolphin/types.h" +class JUTGraphFifo { +public: + /* 802DEB58 */ JUTGraphFifo(u32); + + /* 802DEC34 */ virtual ~JUTGraphFifo(); + + void getGpStatus() { + GXGetGPStatus((GXBool*)&mGpStatus[0], (GXBool*)&mGpStatus[1], (GXBool*)&mGpStatus[2], + (GXBool*)&mGpStatus[3], (GXBool*)&mGpStatus[4]); + } + + bool isGPActive() { + getGpStatus(); + return mGpStatus[2] == false; + } + + void save() { GXSaveCPUFifo(this->mFifo); } + + static JUTGraphFifo* sCurrentFifo; + static bool mGpStatus[5]; + +private: + /* 0x04 */ GXFifoObj* mFifo; + /* 0x08 */ void* mBase; + /* 0x0C */ u32 mSize; + /* 0x10 */ u8 field_0x10[0xC]; +}; + #endif /* JUTGRAPHFIFO_H */ diff --git a/include/dolphin/gx/GX.h b/include/dolphin/gx/GX.h index f1eca18856e..d7aeb521c6c 100644 --- a/include/dolphin/gx/GX.h +++ b/include/dolphin/gx/GX.h @@ -959,6 +959,9 @@ GXFifoObj* GXInit(void*, u32); GXFifoObj* GXGetCPUFifo(void); void GXGetGPStatus(GXBool*, GXBool*, GXBool*, GXBool*, GXBool*); void GXReadXfRasMetric(u32*, u32*, u32*, u32*); +void GXInitFifoBase(GXFifoObj*, void*, u32); +void GXInitFifoPtrs(GXFifoObj*, void*, void*); +void GXSaveCPUFifo(GXFifoObj*); #define GFX_FIFO(T) (*(volatile T*)0xCC008000) diff --git a/libs/JSystem/JFramework/JFWSystem.cpp b/libs/JSystem/JFramework/JFWSystem.cpp index 4405ffbf363..329a6f23568 100644 --- a/libs/JSystem/JFramework/JFWSystem.cpp +++ b/libs/JSystem/JFramework/JFWSystem.cpp @@ -9,20 +9,11 @@ #include "JSystem/JUtility/JUTDirectPrint.h" #include "JSystem/JUtility/JUTException.h" #include "JSystem/JUtility/JUTGamePad.h" +#include "JSystem/JUtility/JUTGraphFifo.h" #include "JSystem/JUtility/JUTVideo.h" #include "dol2asm.h" #include "dolphin/types.h" -// -// Types: -// - -struct JUTGraphFifo { - /* 802DEB58 */ JUTGraphFifo(u32); - - u8 field_0x0[0x1C]; -}; - // // Forward References: // diff --git a/libs/JSystem/JUtility/JUTGraphFifo.cpp b/libs/JSystem/JUtility/JUTGraphFifo.cpp index b32ebf1ddbf..782708926bc 100644 --- a/libs/JSystem/JUtility/JUTGraphFifo.cpp +++ b/libs/JSystem/JUtility/JUTGraphFifo.cpp @@ -4,93 +4,50 @@ // #include "JSystem/JUtility/JUTGraphFifo.h" +#include "JSystem/JKernel/JKRHeap.h" #include "dol2asm.h" #include "dolphin/types.h" -// -// Types: -// - -struct JUTGraphFifo { - /* 802DEB58 */ JUTGraphFifo(u32); - /* 802DEC34 */ ~JUTGraphFifo(); - - static u8 sCurrentFifo[4]; - static u8 mGpStatus[5 + 3 /* padding */]; -}; - -struct JKRHeap { - /* 802CE4D4 */ void alloc(u32, int); - /* 802CE548 */ void free(void*); - - static u8 sSystemHeap[4]; -}; - -// -// Forward References: -// - -extern "C" void __ct__12JUTGraphFifoFUl(); -extern "C" void __dt__12JUTGraphFifoFv(); -extern "C" u8 sCurrentFifo__12JUTGraphFifo[4]; -extern "C" u8 mGpStatus__12JUTGraphFifo[5 + 3 /* padding */]; - -// -// External References: -// - -extern "C" void alloc__7JKRHeapFUli(); -extern "C" void free__7JKRHeapFPv(); -extern "C" void __dl__FPv(); -extern "C" void GXInit(); -extern "C" void GXInitFifoBase(); -extern "C" void GXInitFifoPtrs(); -extern "C" void GXSaveCPUFifo(); -extern "C" void GXGetGPStatus(); -extern "C" void _savegpr_26(); -extern "C" void _restgpr_26(); -extern "C" u8 sSystemHeap__7JKRHeap[4]; - // // Declarations: // -/* ############################################################################################## */ -/* 803CC590-803CC5A0 0296B0 000C+04 2/2 0/0 0/0 .data __vt__12JUTGraphFifo */ -SECTION_DATA extern void* __vt__12JUTGraphFifo[3 + 1 /* padding */] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12JUTGraphFifoFv, - /* padding */ - NULL, -}; - /* 804514B8-804514BC 0009B8 0004+00 1/1 0/0 0/0 .sbss None */ -static u8 data_804514B8[4]; +static bool data_804514B8; /* 804514BC-804514C0 0009BC 0004+00 2/2 0/0 0/0 .sbss sCurrentFifo__12JUTGraphFifo */ -u8 JUTGraphFifo::sCurrentFifo[4]; +JUTGraphFifo* JUTGraphFifo::sCurrentFifo; /* 802DEB58-802DEC34 2D9498 00DC+00 0/0 1/1 0/0 .text __ct__12JUTGraphFifoFUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm JUTGraphFifo::JUTGraphFifo(u32 param_0) { - nofralloc -#include "asm/JSystem/JUtility/JUTGraphFifo/__ct__12JUTGraphFifoFUl.s" +JUTGraphFifo::JUTGraphFifo(u32 size) { + mSize = size + 0x1F & ~0x1F; + if (data_804514B8) { + mFifo = (GXFifoObj*)JKRAllocFromSysHeap(mSize + 0x80, 32); + mBase = mFifo + 1; + GXInitFifoBase(mFifo, mBase, mSize); + GXInitFifoPtrs(mFifo, mBase, mBase); + } else { + mBase = JKRAllocFromSysHeap(mSize + 0xA0, 32); + mBase = (void*)((int)mBase + 0x1F & ~0x1F); + mFifo = GXInit(mBase, mSize); + data_804514B8 = true; + sCurrentFifo = this; + } } -#pragma pop /* ############################################################################################## */ /* 804514C0-804514C8 0009C0 0005+03 1/1 0/0 0/0 .sbss mGpStatus__12JUTGraphFifo */ -u8 JUTGraphFifo::mGpStatus[5 + 3 /* padding */]; +bool JUTGraphFifo::mGpStatus[5]; /* 802DEC34-802DECF8 2D9574 00C4+00 1/0 0/0 0/0 .text __dt__12JUTGraphFifoFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm JUTGraphFifo::~JUTGraphFifo() { - nofralloc -#include "asm/JSystem/JUtility/JUTGraphFifo/__dt__12JUTGraphFifoFv.s" +JUTGraphFifo::~JUTGraphFifo() { + sCurrentFifo->save(); + + do { + } while (isGPActive()); + + if (sCurrentFifo == this) { + sCurrentFifo = NULL; + } + JKRFreeToSysHeap(mBase); } -#pragma pop From ec0a057c82e56c4648b4acd29e752e2947d19cda Mon Sep 17 00:00:00 2001 From: TakaRikka <38417346+TakaRikka@users.noreply.github.com> Date: Mon, 10 Jan 2022 19:17:42 -0800 Subject: [PATCH 7/7] fixes --- include/JSystem/JFramework/JFWDisplay.h | 4 ++-- include/JSystem/JUtility/JUTProcBar.h | 2 +- libs/JSystem/JFramework/JFWDisplay.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/JSystem/JFramework/JFWDisplay.h b/include/JSystem/JFramework/JFWDisplay.h index ec61c69e860..925954c2458 100644 --- a/include/JSystem/JFramework/JFWDisplay.h +++ b/include/JSystem/JFramework/JFWDisplay.h @@ -10,7 +10,7 @@ #include "dolphin/gx/GX.h" #include "dolphin/types.h" -typedef void (*UnkFunc)(void); +typedef void (*JFWDisplayUnkFunc)(void); class JFWAlarm : public OSAlarm { public: @@ -97,7 +97,7 @@ private: /* 0x38 */ int field_0x38; /* 0x3C */ int field_0x3c; /* 0x40 */ bool field_0x40; - /* 0x44 */ UnkFunc field_0x44; + /* 0x44 */ JFWDisplayUnkFunc field_0x44; /* 0x48 */ s16 field_0x48; /* 0x4A */ u8 field_0x4a; }; diff --git a/include/JSystem/JUtility/JUTProcBar.h b/include/JSystem/JUtility/JUTProcBar.h index 79e3b3538d7..d3028409276 100644 --- a/include/JSystem/JUtility/JUTProcBar.h +++ b/include/JSystem/JUtility/JUTProcBar.h @@ -19,7 +19,7 @@ public: } void end() { - field_0x4 = ((OSGetTick() - mTick) * 8) / ((*(u32*)0x800000F8 >> 2) / 125000); + field_0x4 = ((OSGetTick() - mTick) * 8) / ((*(u32*)0x800000F8 / 4) / 125000); if (field_0x4 == 0) { field_0x4 = 1; } diff --git a/libs/JSystem/JFramework/JFWDisplay.cpp b/libs/JSystem/JFramework/JFWDisplay.cpp index 149572c9439..b169903d44c 100644 --- a/libs/JSystem/JFramework/JFWDisplay.cpp +++ b/libs/JSystem/JFramework/JFWDisplay.cpp @@ -681,7 +681,7 @@ static void JFWDrawDoneAlarm() { s32 status = OSDisableInterrupts(); alarm.createAlarm(); alarm.appendLink(); - OSSetAlarm(&alarm, 0.5 * (*(u32*)0x800000F8 >> 2), JFWGXAbortAlarmHandler); + OSSetAlarm(&alarm, 0.5 * (*(u32*)0x800000F8 / 4), JFWGXAbortAlarmHandler); GXDrawDone(); alarm.cancelAlarm(); alarm.removeLink();